Repository: kubernetes-sigs/kueue

Issue:
Preemption: commonize code for checking if candidates satisfy preemption policy
<!-- Please only use this template for submitting clean up requests -->

**What would you like to be cleaned**:

Commonize the logic responsible for determining if candidates satisfy the preemption policy:
- [findCandidates](https://github.com/kubernetes-sigs/kueue/blob/d9645bd2be2ed7d767a3e71c2f6c3e8906c9eccf/pkg/scheduler/preemption/preemption.go#L417) used for fair sharing
- [satisfiesPreemptionPolicy](https://github.com/kubernetes-sigs/kueue/blob/d9645bd2be2ed7d767a3e71c2f6c3e8906c9eccf/pkg/scheduler/preemption/classical/hierarchical_preemption.go#L105-L122) used for classical preemption

**Why is this needed**:

The logic for filtering candidates is the same for all modes, yet non-trivial, especially when it comes to LowerOrNewerEqualPriority and so we don't want to duplicate the code.



Discussion:
@mimowo: cc @gabesaba @pajakd @PBundyra @j-skiba: /assign

Solution patch:
diff --git a/.golangci.yaml b/.golangci.yaml
index 5c873a09c..e43fff907 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -71,6 +71,7 @@ linters:
         - name: var-naming
         - name: redundant-import-alias
         - name: use-any
+        - name: use-waitgroup-go
     forbidigo:
       forbid:
         - pattern: ^sort\.Slice$
@@ -83,10 +84,6 @@ linters:
       - legacy
       - std-error-handling
     rules:
-      - linters:
-          - staticcheck
-        # TODO(#768): Drop when incrementing the API version.
-        text: 'SA1019: constants.QueueAnnotation is deprecated'
       - linters:
           - staticcheck
         text: 'SA1019: j.Status.State is deprecated: the State field is replaced by the Conditions field.'
diff --git a/Makefile b/Makefile
index 890a72519..ad0470cd5 100644
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ generate-code: controller-gen ## Generate code containing DeepCopy, DeepCopyInto
 generate-mocks: mockgen ## Generate mockgen mocks
 	# Clean up previously generated mocks to keep generated mocks up-to-date.
 	rm -rf $(MOCKS_DIR)
-	$(MOCKGEN) -destination=$(MOCKS_DIR)/controller/jobframework/interface.go -package mocks sigs.k8s.io/kueue/pkg/controller/jobframework GenericJob,JobWithCustomValidation,JobWithManagedBy
+	$(MOCKGEN) -destination=$(MOCKS_DIR)/controller/jobframework/interface.go -package mocks sigs.k8s.io/kueue/pkg/controller/jobframework GenericJob,JobWithCustomValidation,JobWithManagedBy,JobWithCustomWorkloadActivation
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.
diff --git a/charts/kueue/templates/rbac/manager_secrets_role.yaml b/charts/kueue/templates/rbac/manager_secrets_role.yaml
new file mode 100644
index 000000000..b1869f62f
--- /dev/null
+++ b/charts/kueue/templates/rbac/manager_secrets_role.yaml
@@ -0,0 +1,19 @@
+{{/* Code generated by yaml-processor. DO NOT EDIT. */}}
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+  {{- include "kueue.labels" . | nindent 4 }}
+  name: '{{ include "kueue.fullname" . }}-manager-secrets-role'
+  namespace: '{{ .Release.Namespace }}'
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+    verbs:
+      - get
+      - list
+      - update
+      - watch
diff --git a/charts/kueue/templates/rbac/manager_secrets_role_binding.yaml b/charts/kueue/templates/rbac/manager_secrets_role_binding.yaml
new file mode 100644
index 000000000..c71c0d906
--- /dev/null
+++ b/charts/kueue/templates/rbac/manager_secrets_role_binding.yaml
@@ -0,0 +1,17 @@
+{{/* Code generated by yaml-processor. DO NOT EDIT. */}}
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+  {{- include "kueue.labels" . | nindent 4 }}
+  name: '{{ include "kueue.fullname" . }}-manager-secrets-rolebinding'
+  namespace: '{{ .Release.Namespace }}'
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: '{{ include "kueue.fullname" . }}-manager-secrets-role'
+subjects:
+  - kind: ServiceAccount
+    name: '{{ include "kueue.fullname" . }}-controller-manager'
+    namespace: '{{ .Release.Namespace }}'
diff --git a/charts/kueue/templates/rbac/role.yaml b/charts/kueue/templates/rbac/role.yaml
index 756094e8d..0c01e1917 100644
--- a/charts/kueue/templates/rbac/role.yaml
+++ b/charts/kueue/templates/rbac/role.yaml
@@ -62,15 +62,6 @@ rules:
       - list
       - update
       - watch
-  - apiGroups:
-      - ""
-    resources:
-      - secrets
-    verbs:
-      - get
-      - list
-      - update
-      - watch
   - apiGroups:
       - admissionregistration.k8s.io
     resources:
diff --git a/cmd/kueuectl/app/completion/completion.go b/cmd/kueuectl/app/completion/completion.go
index b0c1c435c..8dfa22eaf 100644
--- a/cmd/kueuectl/app/completion/completion.go
+++ b/cmd/kueuectl/app/completion/completion.go
@@ -24,7 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app/util"
 )
 
@@ -117,7 +117,7 @@ func WorkloadNameFunc(clientGetter util.ClientGetter, activeStatus *bool) func(*
 		}
 
 		if activeStatus != nil {
-			filteredItems := make([]v1beta1.Workload, 0, len(list.Items))
+			filteredItems := make([]kueue.Workload, 0, len(list.Items))
 			for _, wl := range list.Items {
 				if ptr.Deref(wl.Spec.Active, true) == *activeStatus {
 					filteredItems = append(filteredItems, wl)
@@ -154,12 +154,12 @@ func ClusterQueueNameFunc(clientGetter util.ClientGetter, activeStatus *bool) fu
 		}
 
 		if activeStatus != nil {
-			filteredItems := make([]v1beta1.ClusterQueue, 0, len(list.Items))
+			filteredItems := make([]kueue.ClusterQueue, 0, len(list.Items))
 			for _, cq := range list.Items {
-				stopPolicy := ptr.Deref(cq.Spec.StopPolicy, v1beta1.None)
-				if *activeStatus && stopPolicy == v1beta1.None {
+				stopPolicy := ptr.Deref(cq.Spec.StopPolicy, kueue.None)
+				if *activeStatus && stopPolicy == kueue.None {
 					filteredItems = append(filteredItems, cq)
-				} else if !*activeStatus && stopPolicy != v1beta1.None {
+				} else if !*activeStatus && stopPolicy != kueue.None {
 					filteredItems = append(filteredItems, cq)
 				}
 			}
@@ -197,12 +197,12 @@ func LocalQueueNameFunc(clientGetter util.ClientGetter, activeStatus *bool) func
 		}
 
 		if activeStatus != nil {
-			filteredItems := make([]v1beta1.LocalQueue, 0, len(list.Items))
+			filteredItems := make([]kueue.LocalQueue, 0, len(list.Items))
 			for _, lq := range list.Items {
-				stopPolicy := ptr.Deref(lq.Spec.StopPolicy, v1beta1.None)
-				if *activeStatus && stopPolicy == v1beta1.None {
+				stopPolicy := ptr.Deref(lq.Spec.StopPolicy, kueue.None)
+				if *activeStatus && stopPolicy == kueue.None {
 					filteredItems = append(filteredItems, lq)
-				} else if !*activeStatus && stopPolicy != v1beta1.None {
+				} else if !*activeStatus && stopPolicy != kueue.None {
 					filteredItems = append(filteredItems, lq)
 				}
 			}
diff --git a/cmd/kueuectl/app/create/create_clusterqueue.go b/cmd/kueuectl/app/create/create_clusterqueue.go
index 9d5dbc08a..5cb124856 100644
--- a/cmd/kueuectl/app/create/create_clusterqueue.go
+++ b/cmd/kueuectl/app/create/create_clusterqueue.go
@@ -33,7 +33,7 @@ import (
 	"k8s.io/kubectl/pkg/util/templates"
 	"k8s.io/utils/ptr"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/scheme"
 	kueuev1beta1 "sigs.k8s.io/kueue/client-go/clientset/versioned/typed/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app/util"
@@ -91,11 +91,11 @@ type ClusterQueueOptions struct {
 	DryRunStrategy               util.DryRunStrategy
 	Name                         string
 	Cohort                       string
-	QueueingStrategy             v1beta1.QueueingStrategy
+	QueueingStrategy             kueue.QueueingStrategy
 	NamespaceSelector            metav1.LabelSelector
-	ReclaimWithinCohort          v1beta1.PreemptionPolicy
-	PreemptionWithinClusterQueue v1beta1.PreemptionPolicy
-	ResourceGroups               []v1beta1.ResourceGroup
+	ReclaimWithinCohort          kueue.PreemptionPolicy
+	PreemptionWithinClusterQueue kueue.PreemptionPolicy
+	ResourceGroups               []kueue.ResourceGroup
 
 	UserSpecifiedQueueingStrategy             string
 	UserSpecifiedNamespaceSelector            map[string]string
@@ -116,9 +116,9 @@ func NewClusterQueueOptions(streams genericiooptions.IOStreams) *ClusterQueueOpt
 	return &ClusterQueueOptions{
 		PrintFlags:                   genericclioptions.NewPrintFlags("created").WithTypeSetter(scheme.Scheme),
 		IOStreams:                    streams,
-		QueueingStrategy:             v1beta1.BestEffortFIFO,
-		ReclaimWithinCohort:          v1beta1.PreemptionPolicyNever,
-		PreemptionWithinClusterQueue: v1beta1.PreemptionPolicyNever,
+		QueueingStrategy:             kueue.BestEffortFIFO,
+		ReclaimWithinCohort:          kueue.PreemptionPolicyNever,
+		PreemptionWithinClusterQueue: kueue.PreemptionPolicyNever,
 	}
 }
 
@@ -184,7 +184,7 @@ func (o *ClusterQueueOptions) Complete(clientGetter util.ClientGetter, cmd *cobr
 	o.Name = args[0]
 
 	if cmd.Flags().Changed(queuingStrategy) {
-		o.QueueingStrategy = v1beta1.QueueingStrategy(o.UserSpecifiedQueueingStrategy)
+		o.QueueingStrategy = kueue.QueueingStrategy(o.UserSpecifiedQueueingStrategy)
 	}
 
 	if cmd.Flags().Changed(namespaceSelector) {
@@ -194,11 +194,11 @@ func (o *ClusterQueueOptions) Complete(clientGetter util.ClientGetter, cmd *cobr
 	}
 
 	if cmd.Flags().Changed(reclaimWithinCohort) {
-		o.ReclaimWithinCohort = v1beta1.PreemptionPolicy(o.UserSpecifiedReclaimWithinCohort)
+		o.ReclaimWithinCohort = kueue.PreemptionPolicy(o.UserSpecifiedReclaimWithinCohort)
 	}
 
 	if cmd.Flags().Changed(preemptionWithinClusterQueue) {
-		o.PreemptionWithinClusterQueue = v1beta1.PreemptionPolicy(o.UserSpecifiedPreemptionWithinClusterQueue)
+		o.PreemptionWithinClusterQueue = kueue.PreemptionPolicy(o.UserSpecifiedPreemptionWithinClusterQueue)
 	}
 
 	var err error
@@ -264,15 +264,15 @@ func (o *ClusterQueueOptions) Run(ctx context.Context) error {
 	return o.PrintObj(cq, o.Out)
 }
 
-func (o *ClusterQueueOptions) createClusterQueue() *v1beta1.ClusterQueue {
-	return &v1beta1.ClusterQueue{
-		TypeMeta:   metav1.TypeMeta{APIVersion: v1beta1.SchemeGroupVersion.String(), Kind: "ClusterQueue"},
+func (o *ClusterQueueOptions) createClusterQueue() *kueue.ClusterQueue {
+	return &kueue.ClusterQueue{
+		TypeMeta:   metav1.TypeMeta{APIVersion: kueue.SchemeGroupVersion.String(), Kind: "ClusterQueue"},
 		ObjectMeta: metav1.ObjectMeta{Name: o.Name},
-		Spec: v1beta1.ClusterQueueSpec{
-			Cohort:            v1beta1.CohortReference(o.Cohort),
+		Spec: kueue.ClusterQueueSpec{
+			Cohort:            kueue.CohortReference(o.Cohort),
 			QueueingStrategy:  o.QueueingStrategy,
 			NamespaceSelector: &o.NamespaceSelector,
-			Preemption: &v1beta1.ClusterQueuePreemption{
+			Preemption: &kueue.ClusterQueuePreemption{
 				ReclaimWithinCohort: o.ReclaimWithinCohort,
 				WithinClusterQueue:  o.PreemptionWithinClusterQueue,
 			},
@@ -312,8 +312,8 @@ func (o *ClusterQueueOptions) parseResourceGroups() error {
 	return nil
 }
 
-func parseUserSpecifiedResourceQuotas(resources []string, quotaType string) ([]v1beta1.ResourceGroup, error) {
-	var resourceGroups []v1beta1.ResourceGroup
+func parseUserSpecifiedResourceQuotas(resources []string, quotaType string) ([]kueue.ResourceGroup, error) {
+	var resourceGroups []kueue.ResourceGroup
 
 	regex := regexp.MustCompile(`^([a-z0-9][a-z0-9\-\.]{0,252}):((\w+[\.-]?)*\/?\w+=\w+;)*(\w+[\.-]?)*\/?\w+=\w+;?$`)
 	for _, r := range resources {
@@ -332,17 +332,17 @@ func parseUserSpecifiedResourceQuotas(resources []string, quotaType string) ([]v
 	return resourceGroups, nil
 }
 
-func toResourceGroup(spec, quotaType string) (v1beta1.ResourceGroup, error) {
+func toResourceGroup(spec, quotaType string) (kueue.ResourceGroup, error) {
 	flavorName, userSpecifiedResources := parseKeyValue(spec, ":")
 	resourceSpecs := strings.Split(userSpecifiedResources, ";")
 	flavorQuotas, err := toFlavorQuotas(flavorName, resourceSpecs, quotaType)
 	if err != nil {
-		return v1beta1.ResourceGroup{}, err
+		return kueue.ResourceGroup{}, err
 	}
 
-	return v1beta1.ResourceGroup{
+	return kueue.ResourceGroup{
 		CoveredResources: getCoveredResources(resourceSpecs),
-		Flavors: []v1beta1.FlavorQuotas{
+		Flavors: []kueue.FlavorQuotas{
 			flavorQuotas,
 		},
 	}, nil
@@ -358,32 +358,32 @@ func getCoveredResources(resourceSpecs []string) []corev1.ResourceName {
 	return coveredResources
 }
 
-func toFlavorQuotas(name string, resourceSpecs []string, quotaType string) (v1beta1.FlavorQuotas, error) {
-	resourceQuotas := make([]v1beta1.ResourceQuota, 0, len(resourceSpecs))
+func toFlavorQuotas(name string, resourceSpecs []string, quotaType string) (kueue.FlavorQuotas, error) {
+	resourceQuotas := make([]kueue.ResourceQuota, 0, len(resourceSpecs))
 	for _, spec := range resourceSpecs {
 		rq, err := toResourceQuota(spec, quotaType)
 		if err != nil {
-			return v1beta1.FlavorQuotas{}, err
+			return kueue.FlavorQuotas{}, err
 		}
 
 		resourceQuotas = append(resourceQuotas, rq)
 	}
 
-	return v1beta1.FlavorQuotas{
-		Name:      v1beta1.ResourceFlavorReference(name),
+	return kueue.FlavorQuotas{
+		Name:      kueue.ResourceFlavorReference(name),
 		Resources: resourceQuotas,
 	}, nil
 }
 
-func toResourceQuota(spec, quotaType string) (v1beta1.ResourceQuota, error) {
+func toResourceQuota(spec, quotaType string) (kueue.ResourceQuota, error) {
 	name, quota := parseKeyValue(spec, "=")
-	rq := v1beta1.ResourceQuota{
+	rq := kueue.ResourceQuota{
 		Name: corev1.ResourceName(name),
 	}
 
 	quantity, err := resource.ParseQuantity(quota)
 	if err != nil {
-		return v1beta1.ResourceQuota{}, errInvalidResourceQuota
+		return kueue.ResourceQuota{}, errInvalidResourceQuota
 	}
 
 	switch quotaType {
@@ -406,10 +406,10 @@ func parseKeyValue(str, sep string) (string, string) {
 	return strings.TrimSpace(pair[0]), strings.TrimSpace(pair[1])
 }
 
-func mergeResourcesByFlavor(resourceGroups []v1beta1.ResourceGroup) ([]v1beta1.ResourceGroup, error) {
-	var mergedResources []v1beta1.ResourceGroup
+func mergeResourcesByFlavor(resourceGroups []kueue.ResourceGroup) ([]kueue.ResourceGroup, error) {
+	var mergedResources []kueue.ResourceGroup
 
-	indexByFlavor := make(map[v1beta1.ResourceFlavorReference]int)
+	indexByFlavor := make(map[kueue.ResourceFlavorReference]int)
 	var index int
 	for _, rg := range resourceGroups {
 		flavorName := rg.Flavors[0].Name
@@ -432,11 +432,11 @@ func mergeResourcesByFlavor(resourceGroups []v1beta1.ResourceGroup) ([]v1beta1.R
 	return mergedResources, nil
 }
 
-func mergeResourceQuotas(rQuotas1, rQuotas2 []v1beta1.ResourceQuota) ([]v1beta1.ResourceQuota, error) {
-	var mergedResourceQuotas []v1beta1.ResourceQuota
+func mergeResourceQuotas(rQuotas1, rQuotas2 []kueue.ResourceQuota) ([]kueue.ResourceQuota, error) {
+	var mergedResourceQuotas []kueue.ResourceQuota
 
 	for _, rq1 := range rQuotas1 {
-		idx := slices.IndexFunc(rQuotas2, func(rq v1beta1.ResourceQuota) bool { return rq.Name == rq1.Name })
+		idx := slices.IndexFunc(rQuotas2, func(rq kueue.ResourceQuota) bool { return rq.Name == rq1.Name })
 		if idx == -1 {
 			// both ResourceQuota lists should contain exactly the same resource names
 			return mergedResourceQuotas, errResourceQuotaNotFound
@@ -459,8 +459,8 @@ func mergeResourceQuotas(rQuotas1, rQuotas2 []v1beta1.ResourceQuota) ([]v1beta1.
 	return mergedResourceQuotas, nil
 }
 
-func mergeFlavorsByCoveredResources(resourceGroups []v1beta1.ResourceGroup) ([]v1beta1.ResourceGroup, error) {
-	var mergedResources []v1beta1.ResourceGroup
+func mergeFlavorsByCoveredResources(resourceGroups []kueue.ResourceGroup) ([]kueue.ResourceGroup, error) {
+	var mergedResources []kueue.ResourceGroup
 
 	indexByResourceGroupID := make(map[string]int)
 	var index int
diff --git a/cmd/kueuectl/app/create/create_localqueue.go b/cmd/kueuectl/app/create/create_localqueue.go
index d760995e3..df6c7c37c 100644
--- a/cmd/kueuectl/app/create/create_localqueue.go
+++ b/cmd/kueuectl/app/create/create_localqueue.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/cli-runtime/pkg/printers"
 	"k8s.io/kubectl/pkg/util/templates"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/scheme"
 	kueuev1beta1 "sigs.k8s.io/kueue/client-go/clientset/versioned/typed/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app/completion"
@@ -52,7 +52,7 @@ type LocalQueueOptions struct {
 	Name             string
 	Namespace        string
 	EnforceNamespace bool
-	ClusterQueue     v1beta1.ClusterQueueReference
+	ClusterQueue     kueue.ClusterQueueReference
 	IgnoreUnknownCq  bool
 
 	UserSpecifiedClusterQueue string
@@ -122,7 +122,7 @@ func (o *LocalQueueOptions) Complete(clientGetter util.ClientGetter, cmd *cobra.
 		return err
 	}
 
-	o.ClusterQueue = v1beta1.ClusterQueueReference(o.UserSpecifiedClusterQueue)
+	o.ClusterQueue = kueue.ClusterQueueReference(o.UserSpecifiedClusterQueue)
 
 	clientset, err := clientGetter.KueueClientSet()
 	if err != nil {
@@ -190,10 +190,10 @@ func (o *LocalQueueOptions) Run(ctx context.Context) error {
 	return o.PrintObj(lq, o.Out)
 }
 
-func (o *LocalQueueOptions) createLocalQueue() *v1beta1.LocalQueue {
-	return &v1beta1.LocalQueue{
-		TypeMeta:   metav1.TypeMeta{APIVersion: v1beta1.SchemeGroupVersion.String(), Kind: "LocalQueue"},
+func (o *LocalQueueOptions) createLocalQueue() *kueue.LocalQueue {
+	return &kueue.LocalQueue{
+		TypeMeta:   metav1.TypeMeta{APIVersion: kueue.SchemeGroupVersion.String(), Kind: "LocalQueue"},
 		ObjectMeta: metav1.ObjectMeta{Name: o.Name, Namespace: o.Namespace},
-		Spec:       v1beta1.LocalQueueSpec{ClusterQueue: o.ClusterQueue},
+		Spec:       kueue.LocalQueueSpec{ClusterQueue: o.ClusterQueue},
 	}
 }
diff --git a/cmd/kueuectl/app/create/create_resourceflavor.go b/cmd/kueuectl/app/create/create_resourceflavor.go
index 3286df5bd..d8048afdb 100644
--- a/cmd/kueuectl/app/create/create_resourceflavor.go
+++ b/cmd/kueuectl/app/create/create_resourceflavor.go
@@ -32,7 +32,7 @@ import (
 	"k8s.io/cli-runtime/pkg/printers"
 	"k8s.io/kubectl/pkg/util/templates"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/scheme"
 	kueuev1beta1 "sigs.k8s.io/kueue/client-go/clientset/versioned/typed/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app/util"
@@ -186,11 +186,11 @@ func (o *ResourceFlavorOptions) Run(ctx context.Context) error {
 	return o.PrintObj(rf, o.Out)
 }
 
-func (o *ResourceFlavorOptions) createResourceFlavor() *v1beta1.ResourceFlavor {
-	return &v1beta1.ResourceFlavor{
-		TypeMeta:   metav1.TypeMeta{APIVersion: v1beta1.SchemeGroupVersion.String(), Kind: "ResourceFlavor"},
+func (o *ResourceFlavorOptions) createResourceFlavor() *kueue.ResourceFlavor {
+	return &kueue.ResourceFlavor{
+		TypeMeta:   metav1.TypeMeta{APIVersion: kueue.SchemeGroupVersion.String(), Kind: "ResourceFlavor"},
 		ObjectMeta: metav1.ObjectMeta{Name: o.Name},
-		Spec: v1beta1.ResourceFlavorSpec{
+		Spec: kueue.ResourceFlavorSpec{
 			NodeLabels:  o.NodeLabels,
 			NodeTaints:  o.NodeTaints,
 			Tolerations: o.Tolerations,
diff --git a/cmd/kueuectl/app/delete/delete_workload.go b/cmd/kueuectl/app/delete/delete_workload.go
index bf911fd47..3285371fd 100644
--- a/cmd/kueuectl/app/delete/delete_workload.go
+++ b/cmd/kueuectl/app/delete/delete_workload.go
@@ -34,7 +34,7 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/scheme"
 	kueuev1beta1 "sigs.k8s.io/kueue/client-go/clientset/versioned/typed/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app/completion"
@@ -189,7 +189,7 @@ func GroupVersionResourceWithName(gvr schema.GroupVersionResource, name string)
 // Run delete a resource
 func (o *WorkloadOptions) Run(ctx context.Context) error {
 	var (
-		workloads               []*v1beta1.Workload
+		workloads               []*kueue.Workload
 		haveAssociatedResources bool
 		err                     error
 	)
@@ -233,7 +233,7 @@ func (o *WorkloadOptions) Run(ctx context.Context) error {
 	return nil
 }
 
-func (o *WorkloadOptions) getAllWorkloads(ctx context.Context) ([]*v1beta1.Workload, bool, error) {
+func (o *WorkloadOptions) getAllWorkloads(ctx context.Context) ([]*kueue.Workload, bool, error) {
 	var namespace string
 	if !o.AllNamespaces {
 		namespace = o.Namespace
@@ -246,7 +246,7 @@ func (o *WorkloadOptions) getAllWorkloads(ctx context.Context) ([]*v1beta1.Workl
 
 	var haveAssociatedWorkloads bool
 
-	workloads := make([]*v1beta1.Workload, 0, len(list.Items))
+	workloads := make([]*kueue.Workload, 0, len(list.Items))
 	for index := range list.Items {
 		wl := &list.Items[index]
 		workloads = append(workloads, wl)
@@ -258,10 +258,10 @@ func (o *WorkloadOptions) getAllWorkloads(ctx context.Context) ([]*v1beta1.Workl
 	return workloads, haveAssociatedWorkloads, nil
 }
 
-func (o *WorkloadOptions) getWorkloads(ctx context.Context) ([]*v1beta1.Workload, bool, error) {
+func (o *WorkloadOptions) getWorkloads(ctx context.Context) ([]*kueue.Workload, bool, error) {
 	var haveAssociatedWorkloads bool
 
-	workloads := make([]*v1beta1.Workload, 0, len(o.Names))
+	workloads := make([]*kueue.Workload, 0, len(o.Names))
 
 	for _, name := range o.Names {
 		wl, err := o.Client.Workloads(o.Namespace).Get(ctx, name, metav1.GetOptions{})
@@ -282,8 +282,8 @@ func (o *WorkloadOptions) getWorkloads(ctx context.Context) ([]*v1beta1.Workload
 	return workloads, haveAssociatedWorkloads, nil
 }
 
-func (o *WorkloadOptions) getWorkloadResources(workloads []*v1beta1.Workload) (map[*v1beta1.Workload][]GroupVersionResourceName, error) {
-	workloadResources := make(map[*v1beta1.Workload][]GroupVersionResourceName, len(workloads))
+func (o *WorkloadOptions) getWorkloadResources(workloads []*kueue.Workload) (map[*kueue.Workload][]GroupVersionResourceName, error) {
+	workloadResources := make(map[*kueue.Workload][]GroupVersionResourceName, len(workloads))
 
 	for _, wl := range workloads {
 		workloadResources[wl] = make([]GroupVersionResourceName, 0, len(wl.OwnerReferences))
@@ -306,7 +306,7 @@ func (o *WorkloadOptions) getWorkloadResources(workloads []*v1beta1.Workload) (m
 	return workloadResources, nil
 }
 
-func (o *WorkloadOptions) generateConfirmationMessage(workloadResources map[*v1beta1.Workload][]GroupVersionResourceName) string {
+func (o *WorkloadOptions) generateConfirmationMessage(workloadResources map[*kueue.Workload][]GroupVersionResourceName) string {
 	associatedResources := make([]string, 0, len(workloadResources))
 
 	for wl, resources := range workloadResources {
@@ -341,7 +341,7 @@ func (o *WorkloadOptions) confirmation(message string) bool {
 	return strings.EqualFold(input, "y")
 }
 
-func (o *WorkloadOptions) deleteWorkloads(ctx context.Context, workloadNameResources map[*v1beta1.Workload][]GroupVersionResourceName) error {
+func (o *WorkloadOptions) deleteWorkloads(ctx context.Context, workloadNameResources map[*kueue.Workload][]GroupVersionResourceName) error {
 	for wl, nrs := range workloadNameResources {
 		deleteOptions := metav1.DeleteOptions{}
 
diff --git a/cmd/kueuectl/app/list/list_clusterqueue.go b/cmd/kueuectl/app/list/list_clusterqueue.go
index 13885db68..1d4629a38 100644
--- a/cmd/kueuectl/app/list/list_clusterqueue.go
+++ b/cmd/kueuectl/app/list/list_clusterqueue.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/kubectl/pkg/util/templates"
 	"k8s.io/utils/clock"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/scheme"
 	kueuev1beta1 "sigs.k8s.io/kueue/client-go/clientset/versioned/typed/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app/util"
@@ -207,12 +207,12 @@ func (o *ClusterQueueOptions) Run(ctx context.Context) error {
 	}
 }
 
-func (o *ClusterQueueOptions) filterList(cql *v1beta1.ClusterQueueList) {
+func (o *ClusterQueueOptions) filterList(cql *kueue.ClusterQueueList) {
 	if len(o.Active) == 0 {
 		return
 	}
 
-	filtered := make([]v1beta1.ClusterQueue, 0, len(cql.Items))
+	filtered := make([]kueue.ClusterQueue, 0, len(cql.Items))
 	for _, cq := range cql.Items {
 		if o.Active[0] && isActiveStatus(&cq) {
 			filtered = append(filtered, cq)
@@ -224,6 +224,6 @@ func (o *ClusterQueueOptions) filterList(cql *v1beta1.ClusterQueueList) {
 	cql.Items = filtered
 }
 
-func isActiveStatus(cq *v1beta1.ClusterQueue) bool {
-	return meta.IsStatusConditionTrue(cq.Status.Conditions, v1beta1.ClusterQueueActive)
+func isActiveStatus(cq *kueue.ClusterQueue) bool {
+	return meta.IsStatusConditionTrue(cq.Status.Conditions, kueue.ClusterQueueActive)
 }
diff --git a/cmd/kueuectl/app/list/list_clusterqueue_printer.go b/cmd/kueuectl/app/list/list_clusterqueue_printer.go
index bb71f3327..7730760df 100644
--- a/cmd/kueuectl/app/list/list_clusterqueue_printer.go
+++ b/cmd/kueuectl/app/list/list_clusterqueue_printer.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/cli-runtime/pkg/printers"
 	"k8s.io/utils/clock"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 )
 
 type listClusterQueuePrinter struct {
@@ -39,7 +39,7 @@ var _ printers.ResourcePrinter = (*listClusterQueuePrinter)(nil)
 func (p *listClusterQueuePrinter) PrintObj(obj runtime.Object, out io.Writer) error {
 	printer := printers.NewTablePrinter(p.printOptions)
 
-	list, ok := obj.(*v1beta1.ClusterQueueList)
+	list, ok := obj.(*kueue.ClusterQueueList)
 	if !ok {
 		return errors.New("invalid object type")
 	}
@@ -75,7 +75,7 @@ func newClusterQueueTablePrinter() *listClusterQueuePrinter {
 	}
 }
 
-func (p *listClusterQueuePrinter) printClusterQueueList(list *v1beta1.ClusterQueueList) []metav1.TableRow {
+func (p *listClusterQueuePrinter) printClusterQueueList(list *kueue.ClusterQueueList) []metav1.TableRow {
 	rows := make([]metav1.TableRow, len(list.Items))
 	for index := range list.Items {
 		rows[index] = p.printClusterQueue(&list.Items[index])
@@ -83,7 +83,7 @@ func (p *listClusterQueuePrinter) printClusterQueueList(list *v1beta1.ClusterQue
 	return rows
 }
 
-func (p *listClusterQueuePrinter) printClusterQueue(clusterQueue *v1beta1.ClusterQueue) metav1.TableRow {
+func (p *listClusterQueuePrinter) printClusterQueue(clusterQueue *kueue.ClusterQueue) metav1.TableRow {
 	row := metav1.TableRow{
 		Object: runtime.RawExtension{Object: clusterQueue},
 	}
diff --git a/cmd/kueuectl/app/list/list_localqueue.go b/cmd/kueuectl/app/list/list_localqueue.go
index fdce02bd8..d9d55cc6b 100644
--- a/cmd/kueuectl/app/list/list_localqueue.go
+++ b/cmd/kueuectl/app/list/list_localqueue.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/kubectl/pkg/util/templates"
 	"k8s.io/utils/clock"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/scheme"
 	kueuev1beta1 "sigs.k8s.io/kueue/client-go/clientset/versioned/typed/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app/completion"
@@ -205,11 +205,11 @@ func (o *LocalQueueOptions) Run(ctx context.Context) error {
 	}
 }
 
-func (o *LocalQueueOptions) filterList(list *v1beta1.LocalQueueList) {
+func (o *LocalQueueOptions) filterList(list *kueue.LocalQueueList) {
 	if len(o.ClusterQueueFilter) > 0 {
-		filteredItems := make([]v1beta1.LocalQueue, 0, len(o.ClusterQueueFilter))
+		filteredItems := make([]kueue.LocalQueue, 0, len(o.ClusterQueueFilter))
 		for _, lq := range list.Items {
-			if lq.Spec.ClusterQueue == v1beta1.ClusterQueueReference(o.ClusterQueueFilter) {
+			if lq.Spec.ClusterQueue == kueue.ClusterQueueReference(o.ClusterQueueFilter) {
 				filteredItems = append(filteredItems, lq)
 			}
 		}
diff --git a/cmd/kueuectl/app/list/list_localqueue_printer.go b/cmd/kueuectl/app/list/list_localqueue_printer.go
index 616cb9ded..f5bc3bd15 100644
--- a/cmd/kueuectl/app/list/list_localqueue_printer.go
+++ b/cmd/kueuectl/app/list/list_localqueue_printer.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/cli-runtime/pkg/printers"
 	"k8s.io/utils/clock"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 )
 
 type listLocalQueuePrinter struct {
@@ -39,7 +39,7 @@ var _ printers.ResourcePrinter = (*listLocalQueuePrinter)(nil)
 func (p *listLocalQueuePrinter) PrintObj(obj runtime.Object, out io.Writer) error {
 	printer := printers.NewTablePrinter(p.printOptions)
 
-	list, ok := obj.(*v1beta1.LocalQueueList)
+	list, ok := obj.(*kueue.LocalQueueList)
 	if !ok {
 		return errors.New("invalid object type")
 	}
@@ -79,7 +79,7 @@ func newLocalQueueTablePrinter() *listLocalQueuePrinter {
 	}
 }
 
-func (p *listLocalQueuePrinter) printLocalQueueList(list *v1beta1.LocalQueueList) []metav1.TableRow {
+func (p *listLocalQueuePrinter) printLocalQueueList(list *kueue.LocalQueueList) []metav1.TableRow {
 	rows := make([]metav1.TableRow, len(list.Items))
 	for index := range list.Items {
 		rows[index] = p.printLocalQueue(&list.Items[index])
@@ -87,7 +87,7 @@ func (p *listLocalQueuePrinter) printLocalQueueList(list *v1beta1.LocalQueueList
 	return rows
 }
 
-func (p *listLocalQueuePrinter) printLocalQueue(localQueue *v1beta1.LocalQueue) metav1.TableRow {
+func (p *listLocalQueuePrinter) printLocalQueue(localQueue *kueue.LocalQueue) metav1.TableRow {
 	row := metav1.TableRow{
 		Object: runtime.RawExtension{Object: localQueue},
 	}
diff --git a/cmd/kueuectl/app/list/list_resourceflavor_printer.go b/cmd/kueuectl/app/list/list_resourceflavor_printer.go
index 2c29c861b..c70cc1d32 100644
--- a/cmd/kueuectl/app/list/list_resourceflavor_printer.go
+++ b/cmd/kueuectl/app/list/list_resourceflavor_printer.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/cli-runtime/pkg/printers"
 	"k8s.io/utils/clock"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 )
 
 type listResourceFlavorPrinter struct {
@@ -42,7 +42,7 @@ var _ printers.ResourcePrinter = (*listResourceFlavorPrinter)(nil)
 func (p *listResourceFlavorPrinter) PrintObj(obj runtime.Object, out io.Writer) error {
 	printer := printers.NewTablePrinter(p.printOptions)
 
-	list, ok := obj.(*v1beta1.ResourceFlavorList)
+	list, ok := obj.(*kueue.ResourceFlavorList)
 	if !ok {
 		return errors.New("invalid object type")
 	}
@@ -75,7 +75,7 @@ func newResourceFlavorTablePrinter() *listResourceFlavorPrinter {
 	}
 }
 
-func (p *listResourceFlavorPrinter) printResourceFlavorList(list *v1beta1.ResourceFlavorList) []metav1.TableRow {
+func (p *listResourceFlavorPrinter) printResourceFlavorList(list *kueue.ResourceFlavorList) []metav1.TableRow {
 	rows := make([]metav1.TableRow, len(list.Items))
 	for index := range list.Items {
 		rows[index] = p.printResourceFlavor(&list.Items[index])
@@ -83,7 +83,7 @@ func (p *listResourceFlavorPrinter) printResourceFlavorList(list *v1beta1.Resour
 	return rows
 }
 
-func (p *listResourceFlavorPrinter) printResourceFlavor(resourceFlavor *v1beta1.ResourceFlavor) metav1.TableRow {
+func (p *listResourceFlavorPrinter) printResourceFlavor(resourceFlavor *kueue.ResourceFlavor) metav1.TableRow {
 	row := metav1.TableRow{Object: runtime.RawExtension{Object: resourceFlavor}}
 	nodeLabels := make([]string, 0, len(resourceFlavor.Spec.NodeLabels))
 	for key, value := range resourceFlavor.Spec.NodeLabels {
diff --git a/cmd/kueuectl/app/list/list_workload.go b/cmd/kueuectl/app/list/list_workload.go
index 322f0f9e8..db67f35f0 100644
--- a/cmd/kueuectl/app/list/list_workload.go
+++ b/cmd/kueuectl/app/list/list_workload.go
@@ -35,7 +35,7 @@ import (
 	"k8s.io/utils/clock"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	visibility "sigs.k8s.io/kueue/apis/visibility/v1beta1"
 	clientset "sigs.k8s.io/kueue/client-go/clientset/versioned"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/scheme"
@@ -346,11 +346,11 @@ func (o *WorkloadOptions) Run(ctx context.Context) error {
 	}
 }
 
-func (o *WorkloadOptions) filterList(list *v1beta1.WorkloadList, enableOwnerReferenceFilter bool, uid types.UID) {
+func (o *WorkloadOptions) filterList(list *kueue.WorkloadList, enableOwnerReferenceFilter bool, uid types.UID) {
 	if len(list.Items) == 0 {
 		return
 	}
-	filteredItems := make([]v1beta1.Workload, 0, len(o.LocalQueueFilter))
+	filteredItems := make([]kueue.Workload, 0, len(o.LocalQueueFilter))
 	for _, wl := range list.Items {
 		if o.filterByLocalQueue(&wl) && o.filterByClusterQueue(&wl) && o.filterByStatuses(&wl) &&
 			o.filterByOwnerReference(&wl, enableOwnerReferenceFilter, uid) {
@@ -360,16 +360,16 @@ func (o *WorkloadOptions) filterList(list *v1beta1.WorkloadList, enableOwnerRefe
 	list.Items = filteredItems
 }
 
-func (o *WorkloadOptions) filterByLocalQueue(wl *v1beta1.Workload) bool {
+func (o *WorkloadOptions) filterByLocalQueue(wl *kueue.Workload) bool {
 	return len(o.LocalQueueFilter) == 0 || string(wl.Spec.QueueName) == o.LocalQueueFilter
 }
 
-func (o *WorkloadOptions) filterByClusterQueue(wl *v1beta1.Workload) bool {
+func (o *WorkloadOptions) filterByClusterQueue(wl *kueue.Workload) bool {
 	return len(o.ClusterQueueFilter) == 0 || wl.Status.Admission != nil &&
-		wl.Status.Admission.ClusterQueue == v1beta1.ClusterQueueReference(o.ClusterQueueFilter)
+		wl.Status.Admission.ClusterQueue == kueue.ClusterQueueReference(o.ClusterQueueFilter)
 }
 
-func (o *WorkloadOptions) filterByStatuses(wl *v1beta1.Workload) bool {
+func (o *WorkloadOptions) filterByStatuses(wl *kueue.Workload) bool {
 	if o.StatusesFilter.Len() == 0 || o.StatusesFilter.Has(workloadStatusAll) {
 		return true
 	}
@@ -395,7 +395,7 @@ func (o *WorkloadOptions) filterByStatuses(wl *v1beta1.Workload) bool {
 	return false
 }
 
-func (o *WorkloadOptions) filterByOwnerReference(wl *v1beta1.Workload, isEnabled bool, uid types.UID) bool {
+func (o *WorkloadOptions) filterByOwnerReference(wl *kueue.Workload, isEnabled bool, uid types.UID) bool {
 	if !isEnabled {
 		return true
 	}
@@ -409,8 +409,8 @@ func (o *WorkloadOptions) filterByOwnerReference(wl *v1beta1.Workload, isEnabled
 	return false
 }
 
-func (o *WorkloadOptions) localQueues(ctx context.Context, list *v1beta1.WorkloadList) (map[string]*v1beta1.LocalQueue, error) {
-	localQueues := make(map[string]*v1beta1.LocalQueue)
+func (o *WorkloadOptions) localQueues(ctx context.Context, list *kueue.WorkloadList) (map[string]*kueue.LocalQueue, error) {
+	localQueues := make(map[string]*kueue.LocalQueue)
 	for _, wl := range list.Items {
 		// It's not necessary to get localqueue if we have clusterqueue name on Admission status.
 		if wl.Status.Admission != nil && len(wl.Status.Admission.ClusterQueue) > 0 {
@@ -430,17 +430,17 @@ func (o *WorkloadOptions) localQueues(ctx context.Context, list *v1beta1.Workloa
 	return localQueues, nil
 }
 
-func (o *WorkloadOptions) pendingWorkloads(ctx context.Context, list *v1beta1.WorkloadList, localQueues map[string]*v1beta1.LocalQueue) (map[workload.Reference]*visibility.PendingWorkload, error) {
+func (o *WorkloadOptions) pendingWorkloads(ctx context.Context, list *kueue.WorkloadList, localQueues map[string]*kueue.LocalQueue) (map[workload.Reference]*visibility.PendingWorkload, error) {
 	var err error
 
 	pendingWorkloads := make(map[workload.Reference]*visibility.PendingWorkload)
-	pendingWorkloadsSummaries := make(map[v1beta1.ClusterQueueReference]*visibility.PendingWorkloadsSummary)
+	pendingWorkloadsSummaries := make(map[kueue.ClusterQueueReference]*visibility.PendingWorkloadsSummary)
 
 	for _, wl := range list.Items {
 		if !workloadPending(&wl) {
 			continue
 		}
-		var clusterQueueName v1beta1.ClusterQueueReference
+		var clusterQueueName kueue.ClusterQueueReference
 		if wl.Status.Admission != nil && len(wl.Status.Admission.ClusterQueue) > 0 {
 			clusterQueueName = wl.Status.Admission.ClusterQueue
 		} else if lq := localQueues[localQueueKeyForWorkload(&wl)]; lq != nil {
@@ -474,7 +474,7 @@ func (o *WorkloadOptions) pendingWorkloads(ctx context.Context, list *v1beta1.Wo
 	return pendingWorkloads, nil
 }
 
-func (o *WorkloadOptions) apiResources(list *v1beta1.WorkloadList) (map[string]*metav1.APIResourceList, error) {
+func (o *WorkloadOptions) apiResources(list *kueue.WorkloadList) (map[string]*metav1.APIResourceList, error) {
 	apiResourceLists := make(map[string]*metav1.APIResourceList)
 	for _, wl := range list.Items {
 		for _, ref := range wl.OwnerReferences {
@@ -493,10 +493,10 @@ func (o *WorkloadOptions) apiResources(list *v1beta1.WorkloadList) (map[string]*
 	return apiResourceLists, nil
 }
 
-func workloadPending(wl *v1beta1.Workload) bool {
+func workloadPending(wl *kueue.Workload) bool {
 	return workload.Status(wl) == workload.StatusPending
 }
 
-func localQueueKeyForWorkload(wl *v1beta1.Workload) string {
+func localQueueKeyForWorkload(wl *kueue.Workload) string {
 	return fmt.Sprintf("%s/%s", wl.Namespace, wl.Spec.QueueName)
 }
diff --git a/cmd/kueuectl/app/list/list_workload_printer.go b/cmd/kueuectl/app/list/list_workload_printer.go
index e2bd8dc8e..09346a5eb 100644
--- a/cmd/kueuectl/app/list/list_workload_printer.go
+++ b/cmd/kueuectl/app/list/list_workload_printer.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/cli-runtime/pkg/printers"
 	"k8s.io/utils/clock"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	visibility "sigs.k8s.io/kueue/apis/visibility/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
@@ -38,14 +38,14 @@ import (
 const crdTypeMaxLength = 20
 
 type listWorkloadResources struct {
-	localQueues      map[string]*v1beta1.LocalQueue
+	localQueues      map[string]*kueue.LocalQueue
 	pendingWorkloads map[workload.Reference]*visibility.PendingWorkload
 	apiResourceLists map[string]*metav1.APIResourceList
 }
 
 func newListWorkloadResources() *listWorkloadResources {
 	return &listWorkloadResources{
-		localQueues:      make(map[string]*v1beta1.LocalQueue),
+		localQueues:      make(map[string]*kueue.LocalQueue),
 		pendingWorkloads: make(map[workload.Reference]*visibility.PendingWorkload),
 		apiResourceLists: make(map[string]*metav1.APIResourceList),
 	}
@@ -62,7 +62,7 @@ var _ printers.ResourcePrinter = (*listWorkloadPrinter)(nil)
 func (p *listWorkloadPrinter) PrintObj(obj runtime.Object, out io.Writer) error {
 	printer := printers.NewTablePrinter(p.printOptions)
 
-	list, ok := obj.(*v1beta1.WorkloadList)
+	list, ok := obj.(*kueue.WorkloadList)
 	if !ok {
 		return errors.New("invalid object type")
 	}
@@ -115,7 +115,7 @@ func newWorkloadTablePrinter() *listWorkloadPrinter {
 	}
 }
 
-func (p *listWorkloadPrinter) printWorkloadList(list *v1beta1.WorkloadList) []metav1.TableRow {
+func (p *listWorkloadPrinter) printWorkloadList(list *kueue.WorkloadList) []metav1.TableRow {
 	rows := make([]metav1.TableRow, len(list.Items))
 	for index := range list.Items {
 		rows[index] = p.printWorkload(&list.Items[index])
@@ -123,7 +123,7 @@ func (p *listWorkloadPrinter) printWorkloadList(list *v1beta1.WorkloadList) []me
 	return rows
 }
 
-func (p *listWorkloadPrinter) printWorkload(wl *v1beta1.Workload) metav1.TableRow {
+func (p *listWorkloadPrinter) printWorkload(wl *kueue.Workload) metav1.TableRow {
 	row := metav1.TableRow{
 		Object: runtime.RawExtension{Object: wl},
 	}
@@ -141,11 +141,11 @@ func (p *listWorkloadPrinter) printWorkload(wl *v1beta1.Workload) metav1.TableRo
 	}
 
 	var execTime string
-	if admittedCond := apimeta.FindStatusCondition(wl.Status.Conditions, v1beta1.WorkloadAdmitted); admittedCond != nil &&
+	if admittedCond := apimeta.FindStatusCondition(wl.Status.Conditions, kueue.WorkloadAdmitted); admittedCond != nil &&
 		admittedCond.Status == metav1.ConditionTrue {
 		finishedTime := p.clock.Now()
 
-		if finishedCond := apimeta.FindStatusCondition(wl.Status.Conditions, v1beta1.WorkloadFinished); finishedCond != nil &&
+		if finishedCond := apimeta.FindStatusCondition(wl.Status.Conditions, kueue.WorkloadFinished); finishedCond != nil &&
 			finishedCond.Status == metav1.ConditionTrue {
 			finishedTime = finishedCond.LastTransitionTime.Time
 		}
@@ -168,7 +168,7 @@ func (p *listWorkloadPrinter) printWorkload(wl *v1beta1.Workload) metav1.TableRo
 	return row
 }
 
-func (p *listWorkloadPrinter) crdTypes(wl *v1beta1.Workload) []string {
+func (p *listWorkloadPrinter) crdTypes(wl *kueue.Workload) []string {
 	crdTypes := sets.New[string]()
 
 	for _, ref := range wl.OwnerReferences {
@@ -191,7 +191,7 @@ func (p *listWorkloadPrinter) crdTypes(wl *v1beta1.Workload) []string {
 	return crdTypes.UnsortedList()
 }
 
-func (p *listWorkloadPrinter) crdNames(wl *v1beta1.Workload) []string {
+func (p *listWorkloadPrinter) crdNames(wl *kueue.Workload) []string {
 	crdNames := sets.New[string]()
 
 	for _, ref := range wl.OwnerReferences {
diff --git a/cmd/kueuectl/app/resume/resume_clusterqueue.go b/cmd/kueuectl/app/resume/resume_clusterqueue.go
index 581d97546..02806f2a8 100644
--- a/cmd/kueuectl/app/resume/resume_clusterqueue.go
+++ b/cmd/kueuectl/app/resume/resume_clusterqueue.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/scheme"
 	kueuev1beta1 "sigs.k8s.io/kueue/client-go/clientset/versioned/typed/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app/completion"
@@ -115,7 +115,7 @@ func (o *ClusterQueueOptions) Run(ctx context.Context) error {
 	}
 
 	cqOriginal := cq.DeepCopy()
-	cq.Spec.StopPolicy = ptr.To(v1beta1.None)
+	cq.Spec.StopPolicy = ptr.To(kueue.None)
 
 	opts := metav1.PatchOptions{}
 	patch := client.MergeFrom(cqOriginal)
diff --git a/cmd/kueuectl/app/resume/resume_localqueue.go b/cmd/kueuectl/app/resume/resume_localqueue.go
index 4c58f89f1..55dce5666 100644
--- a/cmd/kueuectl/app/resume/resume_localqueue.go
+++ b/cmd/kueuectl/app/resume/resume_localqueue.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/scheme"
 	kueuev1beta1 "sigs.k8s.io/kueue/client-go/clientset/versioned/typed/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app/completion"
@@ -126,7 +126,7 @@ func (o *LocalQueueOptions) Run(ctx context.Context) error {
 	}
 
 	lqOriginal := lq.DeepCopy()
-	lq.Spec.StopPolicy = ptr.To(v1beta1.None)
+	lq.Spec.StopPolicy = ptr.To(kueue.None)
 
 	opts := metav1.PatchOptions{}
 	patch := client.MergeFrom(lqOriginal)
diff --git a/cmd/kueuectl/app/stop/stop_clusterqueue.go b/cmd/kueuectl/app/stop/stop_clusterqueue.go
index 3e5e77436..d7794ae59 100644
--- a/cmd/kueuectl/app/stop/stop_clusterqueue.go
+++ b/cmd/kueuectl/app/stop/stop_clusterqueue.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/scheme"
 	kueuev1beta1 "sigs.k8s.io/kueue/client-go/clientset/versioned/typed/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app/completion"
@@ -139,10 +139,10 @@ func (o *ClusterQueueOptions) Run(ctx context.Context) error {
 	return o.PrintObj(cq, o.Out)
 }
 
-func (o *ClusterQueueOptions) stopClusterQueue(cq *v1beta1.ClusterQueue) {
+func (o *ClusterQueueOptions) stopClusterQueue(cq *kueue.ClusterQueue) {
 	if o.KeepAlreadyRunning {
-		cq.Spec.StopPolicy = ptr.To(v1beta1.Hold)
+		cq.Spec.StopPolicy = ptr.To(kueue.Hold)
 	} else {
-		cq.Spec.StopPolicy = ptr.To(v1beta1.HoldAndDrain)
+		cq.Spec.StopPolicy = ptr.To(kueue.HoldAndDrain)
 	}
 }
diff --git a/cmd/kueuectl/app/stop/stop_localqueue.go b/cmd/kueuectl/app/stop/stop_localqueue.go
index e4634ccd5..6532a8c17 100644
--- a/cmd/kueuectl/app/stop/stop_localqueue.go
+++ b/cmd/kueuectl/app/stop/stop_localqueue.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/scheme"
 	kueuev1beta1 "sigs.k8s.io/kueue/client-go/clientset/versioned/typed/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app/completion"
@@ -150,10 +150,10 @@ func (o *LocalQueueOptions) Run(ctx context.Context) error {
 	return o.PrintObj(lq, o.Out)
 }
 
-func (o *LocalQueueOptions) stopLocalQueue(lq *v1beta1.LocalQueue) {
+func (o *LocalQueueOptions) stopLocalQueue(lq *kueue.LocalQueue) {
 	if o.KeepAlreadyRunning {
-		lq.Spec.StopPolicy = ptr.To(v1beta1.Hold)
+		lq.Spec.StopPolicy = ptr.To(kueue.Hold)
 	} else {
-		lq.Spec.StopPolicy = ptr.To(v1beta1.HoldAndDrain)
+		lq.Spec.StopPolicy = ptr.To(kueue.HoldAndDrain)
 	}
 }
diff --git a/config/components/rbac/kustomization.yaml b/config/components/rbac/kustomization.yaml
index 807bfa850..1897e3768 100644
--- a/config/components/rbac/kustomization.yaml
+++ b/config/components/rbac/kustomization.yaml
@@ -9,6 +9,8 @@ resources:
 - role_binding.yaml
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
+- manager_secrets_role.yaml
+- manager_secrets_role_binding.yaml
 # The following RBAC configurations are used to protect
 # the metrics endpoint with authn/authz. These configurations
 # ensure that only authorized users and service accounts
diff --git a/config/components/rbac/manager_secrets_role.yaml b/config/components/rbac/manager_secrets_role.yaml
new file mode 100644
index 000000000..3e8943a40
--- /dev/null
+++ b/config/components/rbac/manager_secrets_role.yaml
@@ -0,0 +1,16 @@
+# permissions for the manager to access secrets.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: manager-secrets-role
+  namespace: system
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+  - list
+  - update
+  - watch
diff --git a/config/components/rbac/manager_secrets_role_binding.yaml b/config/components/rbac/manager_secrets_role_binding.yaml
new file mode 100644
index 000000000..e78e1b947
--- /dev/null
+++ b/config/components/rbac/manager_secrets_role_binding.yaml
@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: manager-secrets-rolebinding
+  namespace: system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: manager-secrets-role
+subjects:
+- kind: ServiceAccount
+  name: controller-manager
+  namespace: system
diff --git a/config/components/rbac/role.yaml b/config/components/rbac/role.yaml
index 5aceec15d..cbe4c80a0 100644
--- a/config/components/rbac/role.yaml
+++ b/config/components/rbac/role.yaml
@@ -59,15 +59,6 @@ rules:
   - list
   - update
   - watch
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - list
-  - update
-  - watch
 - apiGroups:
   - admissionregistration.k8s.io
   resources:
diff --git a/internal/mocks/controller/jobframework/interface.go b/internal/mocks/controller/jobframework/interface.go
index 874865ec4..b12fdcd5f 100644
--- a/internal/mocks/controller/jobframework/interface.go
+++ b/internal/mocks/controller/jobframework/interface.go
@@ -1,9 +1,9 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: sigs.k8s.io/kueue/pkg/controller/jobframework (interfaces: GenericJob,JobWithCustomValidation,JobWithManagedBy)
+// Source: sigs.k8s.io/kueue/pkg/controller/jobframework (interfaces: GenericJob,JobWithCustomValidation,JobWithManagedBy,JobWithCustomWorkloadActivation)
 //
 // Generated by this command:
 //
-//	mockgen -destination=internal/mocks/controller/jobframework/interface.go -package mocks sigs.k8s.io/kueue/pkg/controller/jobframework GenericJob,JobWithCustomValidation,JobWithManagedBy
+//	mockgen -destination=internal/mocks/controller/jobframework/interface.go -package mocks sigs.k8s.io/kueue/pkg/controller/jobframework GenericJob,JobWithCustomValidation,JobWithManagedBy,JobWithCustomWorkloadActivation
 //
 
 // Package mocks is a generated GoMock package.
@@ -304,3 +304,41 @@ func (mr *MockJobWithManagedByMockRecorder) SetManagedBy(arg0 any) *gomock.Call
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetManagedBy", reflect.TypeOf((*MockJobWithManagedBy)(nil).SetManagedBy), arg0)
 }
+
+// MockJobWithCustomWorkloadActivation is a mock of JobWithCustomWorkloadActivation interface.
+type MockJobWithCustomWorkloadActivation struct {
+	ctrl     *gomock.Controller
+	recorder *MockJobWithCustomWorkloadActivationMockRecorder
+	isgomock struct{}
+}
+
+// MockJobWithCustomWorkloadActivationMockRecorder is the mock recorder for MockJobWithCustomWorkloadActivation.
+type MockJobWithCustomWorkloadActivationMockRecorder struct {
+	mock *MockJobWithCustomWorkloadActivation
+}
+
+// NewMockJobWithCustomWorkloadActivation creates a new mock instance.
+func NewMockJobWithCustomWorkloadActivation(ctrl *gomock.Controller) *MockJobWithCustomWorkloadActivation {
+	mock := &MockJobWithCustomWorkloadActivation{ctrl: ctrl}
+	mock.recorder = &MockJobWithCustomWorkloadActivationMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockJobWithCustomWorkloadActivation) EXPECT() *MockJobWithCustomWorkloadActivationMockRecorder {
+	return m.recorder
+}
+
+// IsWorkloadActive mocks base method.
+func (m *MockJobWithCustomWorkloadActivation) IsWorkloadActive() bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "IsWorkloadActive")
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// IsWorkloadActive indicates an expected call of IsWorkloadActive.
+func (mr *MockJobWithCustomWorkloadActivationMockRecorder) IsWorkloadActive() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsWorkloadActive", reflect.TypeOf((*MockJobWithCustomWorkloadActivation)(nil).IsWorkloadActive))
+}
diff --git a/keps/77-dynamically-sized-jobs/README.md b/keps/77-dynamically-sized-jobs/README.md
index bbad83b87..bbee5d7a1 100644
--- a/keps/77-dynamically-sized-jobs/README.md
+++ b/keps/77-dynamically-sized-jobs/README.md
@@ -444,7 +444,7 @@ Integration tests will be executed against mocked clients for `batchv1/Job` reso
 
 ```yaml
 - lastTransitionTime: "2025-06-12T21:32:56Z"
-  message: "couldn't assign flavors to pod set main: couldn't change flavor from: smaller-flavor to: larger-flavor, insufficient quota for cpu in flavor smaller-flavor, request > maximum capacity (1100m > 1)"
+  message: "couldn't assign flavors to pod set main: couldn't change flavor from: smaller-flavor to: larger-flavor, previously considered podsets requests (0) + current podset request (1100m) > maximum capacity (1)
   observedGeneration: 1
   reason: Pending
   status: "False"
diff --git a/pkg/cache/scheduler/tas_flavor_snapshot.go b/pkg/cache/scheduler/tas_flavor_snapshot.go
index cf7ab519a..347338f4b 100644
--- a/pkg/cache/scheduler/tas_flavor_snapshot.go
+++ b/pkg/cache/scheduler/tas_flavor_snapshot.go
@@ -1084,7 +1084,7 @@ func (s *TASFlavorSnapshot) consumeWithLeadersGeneric(domain *domain, remainingD
 	if *withLeader >= *remainingPrimary && domain.leaderState >= *remainingLeaderCount {
 		*primary = *remainingPrimary
 		domain.leaderState = *remainingLeaderCount
-		domain.state = (*remainingPrimary) * sliceSize
+		domain.state = *remainingPrimary * sliceSize
 		return domain, true
 	}
 
@@ -1096,7 +1096,7 @@ func (s *TASFlavorSnapshot) consumeWithLeadersGeneric(domain *domain, remainingD
 		if domain.leaderState > *remainingLeaderCount {
 			domain.leaderState = *remainingLeaderCount
 		}
-		domain.state = (*withLeader) * sliceSize
+		domain.state = *withLeader * sliceSize
 		*remainingLeaderCount -= domain.leaderState
 		*remainingPrimary -= *withLeader
 		return domain, false
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 2e809cb8c..b84741dc4 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -21,16 +21,23 @@ import (
 	"fmt"
 	"os"
 
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	ctrl "sigs.k8s.io/controller-runtime"
+	ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache"
+	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	configapi "sigs.k8s.io/kueue/apis/config/v1beta1"
 )
 
+var (
+	objectKeySecret = new(corev1.Secret)
+)
+
 // fromFile provides an alternative to the deprecated ctrl.ConfigFile().AtPath(path).OfKind(&cfg)
 func fromFile(path string, scheme *runtime.Scheme, cfg *configapi.Configuration) error {
 	content, err := os.ReadFile(path)
@@ -48,6 +55,8 @@ func fromFile(path string, scheme *runtime.Scheme, cfg *configapi.Configuration)
 // addTo provides an alternative to the deprecated o.AndFrom(&cfg)
 func addTo(o *ctrl.Options, cfg *configapi.Configuration) {
 	addLeaderElectionTo(o, cfg)
+	addCacheByObjectTo(o, cfg)
+
 	if o.Metrics.BindAddress == "" && cfg.Metrics.BindAddress != "" {
 		o.Metrics.BindAddress = cfg.Metrics.BindAddress
 	}
@@ -94,6 +103,24 @@ func addTo(o *ctrl.Options, cfg *configapi.Configuration) {
 	}
 }
 
+func addCacheByObjectTo(o *ctrl.Options, cfg *configapi.Configuration) {
+	if cfg.Namespace == nil {
+		// Invalid source; noop. This should not be reached
+		// due to prior defaulting/validation.
+		return
+	}
+
+	if o.Cache.ByObject == nil {
+		o.Cache.ByObject = make(map[ctrlclient.Object]ctrlcache.ByObject)
+	}
+
+	o.Cache.ByObject[objectKeySecret] = ctrlcache.ByObject{
+		Namespaces: map[string]ctrlcache.Config{
+			*cfg.Namespace: {},
+		},
+	}
+}
+
 func addLeaderElectionTo(o *ctrl.Options, cfg *configapi.Configuration) {
 	if cfg.LeaderElection == nil {
 		// The source does not have any configuration; noop
diff --git a/pkg/controller/constants/constants.go b/pkg/controller/constants/constants.go
index a5246afd3..c1b258e7b 100644
--- a/pkg/controller/constants/constants.go
+++ b/pkg/controller/constants/constants.go
@@ -26,11 +26,6 @@ const (
 	// if the feature LocalQueueDefaulting is enabled and QueueLabel is not specified.
 	DefaultLocalQueueName kueue.LocalQueueName = "default"
 
-	// QueueAnnotation is the annotation key in the workload that holds the queue name.
-	//
-	// Deprecated: Use QueueLabel as a label key.
-	QueueAnnotation = QueueLabel
-
 	// PrebuiltWorkloadLabel is the label key of the job holding the name of the pre-built workload to use.
 	PrebuiltWorkloadLabel = "kueue.x-k8s.io/prebuilt-workload-name"
 
diff --git a/pkg/controller/jobframework/interface.go b/pkg/controller/jobframework/interface.go
index 28293f4c4..ef7176886 100644
--- a/pkg/controller/jobframework/interface.go
+++ b/pkg/controller/jobframework/interface.go
@@ -153,6 +153,12 @@ type JobWithCustomWorkloadConditions interface {
 	CustomWorkloadConditions(wl *kueue.Workload) ([]metav1.Condition, bool)
 }
 
+// JobWithCustomWorkloadActivation interface should be implemented by generic jobs,
+// when custom logic is needed to determine if the workload is active.
+type JobWithCustomWorkloadActivation interface {
+	IsWorkloadActive() bool
+}
+
 // JobWithManagedBy interface should be implemented by generic jobs
 // that implement the managedBy protocol for Multi-Kueue
 type JobWithManagedBy interface {
@@ -177,11 +183,7 @@ func QueueName(job GenericJob) kueue.LocalQueueName {
 }
 
 func QueueNameForObject(object client.Object) kueue.LocalQueueName {
-	if queueLabel := object.GetLabels()[constants.QueueLabel]; queueLabel != "" {
-		return kueue.LocalQueueName(queueLabel)
-	}
-	// fallback to the annotation (deprecated)
-	return kueue.LocalQueueName(object.GetAnnotations()[constants.QueueAnnotation])
+	return kueue.LocalQueueName(object.GetLabels()[constants.QueueLabel])
 }
 
 func MaximumExecutionTimeSeconds(job GenericJob) *int32 {
diff --git a/pkg/controller/jobframework/reconciler.go b/pkg/controller/jobframework/reconciler.go
index 8a5823755..16214e44d 100644
--- a/pkg/controller/jobframework/reconciler.go
+++ b/pkg/controller/jobframework/reconciler.go
@@ -409,6 +409,16 @@ func (r *JobReconciler) ReconcileGenericJob(ctx context.Context, req ctrl.Reques
 		}
 	}
 
+	if jobact, ok := job.(JobWithCustomWorkloadActivation); wl != nil && ok {
+		active := jobact.IsWorkloadActive()
+		if workload.IsActive(wl) != active {
+			wl.Spec.Active = ptr.To(active)
+			if err := r.client.Update(ctx, wl); err != nil {
+				return ctrl.Result{}, err
+			}
+		}
+	}
+
 	if wl != nil && apimeta.IsStatusConditionTrue(wl.Status.Conditions, kueue.WorkloadFinished) {
 		if err := r.finalizeJob(ctx, job); err != nil {
 			return ctrl.Result{}, err
diff --git a/pkg/controller/jobframework/validation.go b/pkg/controller/jobframework/validation.go
index bcd8d4a02..a3a94cb7c 100644
--- a/pkg/controller/jobframework/validation.go
+++ b/pkg/controller/jobframework/validation.go
@@ -120,7 +120,6 @@ func ValidateLabelAsCRDName(obj client.Object, crdNameLabel string) field.ErrorL
 func ValidateQueueName(obj client.Object) field.ErrorList {
 	var allErrs field.ErrorList
 	allErrs = append(allErrs, ValidateLabelAsCRDName(obj, constants.QueueLabel)...)
-	allErrs = append(allErrs, ValidateAnnotationAsCRDName(obj, constants.QueueAnnotation)...)
 	return allErrs
 }
 
diff --git a/pkg/controller/jobs/mpijob/mpijob_webhook.go b/pkg/controller/jobs/mpijob/mpijob_webhook.go
index 4db0f3c95..346f05f69 100644
--- a/pkg/controller/jobs/mpijob/mpijob_webhook.go
+++ b/pkg/controller/jobs/mpijob/mpijob_webhook.go
@@ -29,7 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	qcache "sigs.k8s.io/kueue/pkg/cache/queue"
 	schdcache "sigs.k8s.io/kueue/pkg/cache/scheduler"
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
@@ -43,9 +43,9 @@ var (
 	mpiReplicaSpecsPath         = field.NewPath("spec", "mpiReplicaSpecs")
 	launcherAnnotationsPath     = mpiReplicaSpecsPath.Key(string(v2beta1.MPIReplicaTypeLauncher)).Child("template", "metadata", "annotations")
 	workerAnnotationsPath       = mpiReplicaSpecsPath.Key(string(v2beta1.MPIReplicaTypeWorker)).Child("template", "metadata", "annotations")
-	podSetAnnotationsPathByName = map[v1beta1.PodSetReference]*field.Path{
-		v1beta1.NewPodSetReference(string(v2beta1.MPIReplicaTypeLauncher)): launcherAnnotationsPath,
-		v1beta1.NewPodSetReference(string(v2beta1.MPIReplicaTypeWorker)):   workerAnnotationsPath,
+	podSetAnnotationsPathByName = map[kueue.PodSetReference]*field.Path{
+		kueue.NewPodSetReference(string(v2beta1.MPIReplicaTypeLauncher)): launcherAnnotationsPath,
+		kueue.NewPodSetReference(string(v2beta1.MPIReplicaTypeWorker)):   workerAnnotationsPath,
 	}
 )
 
@@ -169,7 +169,7 @@ func (w *MpiJobWebhook) validateTopologyRequest(ctx context.Context, mpiJob *MPI
 			continue
 		}
 
-		podSet := podset.FindPodSetByName(podSets, v1beta1.NewPodSetReference(string(replicaType)))
+		podSet := podset.FindPodSetByName(podSets, kueue.NewPodSetReference(string(replicaType)))
 		allErrs = append(allErrs, jobframework.ValidateSliceSizeAnnotationUpperBound(replicaMetaPath, &replicaSpec.Template.ObjectMeta, podSet)...)
 	}
 
diff --git a/pkg/controller/jobs/pod/pod_webhook.go b/pkg/controller/jobs/pod/pod_webhook.go
index d0ac38e67..b15d43c8d 100644
--- a/pkg/controller/jobs/pod/pod_webhook.go
+++ b/pkg/controller/jobs/pod/pod_webhook.go
@@ -33,7 +33,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	configapi "sigs.k8s.io/kueue/apis/config/v1beta1"
-	kueuealpha "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	qcache "sigs.k8s.io/kueue/pkg/cache/queue"
 	"sigs.k8s.io/kueue/pkg/constants"
 	ctrlconstants "sigs.k8s.io/kueue/pkg/controller/constants"
@@ -192,13 +192,13 @@ func (w *PodWebhook) Default(ctx context.Context, obj runtime.Object) error {
 		gate(&pod.pod)
 
 		if features.Enabled(features.TopologyAwareScheduling) {
-			if val, ok := pod.pod.Annotations[kueuealpha.PodGroupPodIndexLabelAnnotation]; ok {
+			if val, ok := pod.pod.Annotations[kueue.PodGroupPodIndexLabelAnnotation]; ok {
 				if pod.pod.Labels == nil {
 					pod.pod.Labels = make(map[string]string, 1)
 				}
-				pod.pod.Labels[kueuealpha.PodGroupPodIndexLabel] = pod.pod.Labels[val]
+				pod.pod.Labels[kueue.PodGroupPodIndexLabel] = pod.pod.Labels[val]
 			}
-			utilpod.Gate(&pod.pod, kueuealpha.TopologySchedulingGate)
+			utilpod.Gate(&pod.pod, kueue.TopologySchedulingGate)
 		}
 		if err := pod.addRoleHash(); err != nil {
 			return err
diff --git a/pkg/controller/jobs/statefulset/statefulset_webhook.go b/pkg/controller/jobs/statefulset/statefulset_webhook.go
index eacaae068..6377de190 100644
--- a/pkg/controller/jobs/statefulset/statefulset_webhook.go
+++ b/pkg/controller/jobs/statefulset/statefulset_webhook.go
@@ -31,7 +31,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	kueuealpha "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	qcache "sigs.k8s.io/kueue/pkg/cache/queue"
 	"sigs.k8s.io/kueue/pkg/constants"
 	controllerconstants "sigs.k8s.io/kueue/pkg/controller/constants"
@@ -95,7 +95,7 @@ func (wh *Webhook) Default(ctx context.Context, obj runtime.Object) error {
 		ss.Spec.Template.Annotations[podconstants.GroupTotalCountAnnotation] = fmt.Sprint(ptr.Deref(ss.Spec.Replicas, 1))
 		ss.Spec.Template.Annotations[podconstants.GroupFastAdmissionAnnotationKey] = podconstants.GroupFastAdmissionAnnotationValue
 		ss.Spec.Template.Annotations[podconstants.GroupServingAnnotationKey] = podconstants.GroupServingAnnotationValue
-		ss.Spec.Template.Annotations[kueuealpha.PodGroupPodIndexLabelAnnotation] = appsv1.PodIndexLabel
+		ss.Spec.Template.Annotations[kueue.PodGroupPodIndexLabelAnnotation] = appsv1.PodIndexLabel
 	}
 
 	return nil
diff --git a/pkg/scheduler/flavorassigner/flavorassigner.go b/pkg/scheduler/flavorassigner/flavorassigner.go
index 96171c323..eb06c8867 100644
--- a/pkg/scheduler/flavorassigner/flavorassigner.go
+++ b/pkg/scheduler/flavorassigner/flavorassigner.go
@@ -734,7 +734,8 @@ func (a *FlavorAssigner) findFlavorForPodSets(
 			resQuota := a.cq.QuotaFor(resources.FlavorResource{Flavor: fName, Resource: rName})
 			// Check considering the flavor usage by previous pod sets.
 			fr := resources.FlavorResource{Flavor: fName, Resource: rName}
-			preemptionMode, borrow, s := a.fitsResourceQuota(log, fr, val+assignmentUsage[fr], resQuota)
+
+			preemptionMode, borrow, s := a.fitsResourceQuota(log, fr, assignmentUsage[fr], val, resQuota)
 			if s != nil {
 				status.reasons = append(status.reasons, s.reasons...)
 			}
@@ -905,16 +906,17 @@ func flavorSelector(spec *corev1.PodSpec, allowedKeys sets.Set[string]) nodeaffi
 // if borrowing is required when preempting.
 // If the flavor doesn't satisfy limits immediately (when waiting or preemption
 // could help), it returns a Status with reasons.
-func (a *FlavorAssigner) fitsResourceQuota(log logr.Logger, fr resources.FlavorResource, val int64, rQuota schdcache.ResourceQuota) (preemptionMode, int, *Status) {
+func (a *FlavorAssigner) fitsResourceQuota(log logr.Logger, fr resources.FlavorResource, assumedUsage int64, requestUsage int64, rQuota schdcache.ResourceQuota) (preemptionMode, int, *Status) {
 	var status Status
 
 	available := a.cq.Available(fr)
 	maxCapacity := a.cq.PotentialAvailable(fr)
+	val := assumedUsage + requestUsage
 
 	// No Fit
 	if val > maxCapacity {
-		status.appendf("insufficient quota for %s in flavor %s, request > maximum capacity (%s > %s)",
-			fr.Resource, fr.Flavor, resources.ResourceQuantityString(fr.Resource, val), resources.ResourceQuantityString(fr.Resource, maxCapacity))
+		status.appendf("insufficient quota for %s in flavor %s, previously considered podsets requests (%s) + current podset request (%s) > maximum capacity (%s)",
+			fr.Resource, fr.Flavor, resources.ResourceQuantityString(fr.Resource, assumedUsage), resources.ResourceQuantityString(fr.Resource, requestUsage), resources.ResourceQuantityString(fr.Resource, maxCapacity))
 		return noFit, 0, &status
 	}
 
diff --git a/pkg/scheduler/preemption/classical/hierarchical_preemption.go b/pkg/scheduler/preemption/classical/hierarchical_preemption.go
index 3ebd03133..4bc0402ee 100644
--- a/pkg/scheduler/preemption/classical/hierarchical_preemption.go
+++ b/pkg/scheduler/preemption/classical/hierarchical_preemption.go
@@ -23,6 +23,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	schdcache "sigs.k8s.io/kueue/pkg/cache/scheduler"
 	"sigs.k8s.io/kueue/pkg/resources"
+	preemptioncommon "sigs.k8s.io/kueue/pkg/scheduler/preemption/common"
 	"sigs.k8s.io/kueue/pkg/util/priority"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
@@ -81,11 +82,18 @@ func classifyPreemptionVariant(ctx *HierarchicalPreemptionCtx, wl *workload.Info
 	if !WorkloadUsesResources(wl, ctx.FrsNeedPreemption) {
 		return Never
 	}
-	incomingPriority := priority.Priority(ctx.Wl)
-	candidatePriority := priority.Priority(wl.Obj)
-	if !satisfiesPreemptionPolicy(ctx, wl, incomingPriority, candidatePriority) {
+
+	var preemptionPolicy kueue.PreemptionPolicy
+	if wl.ClusterQueue == ctx.Cq.Name {
+		preemptionPolicy = ctx.Cq.Preemption.WithinClusterQueue
+	} else {
+		preemptionPolicy = ctx.Cq.Preemption.ReclaimWithinCohort
+	}
+
+	if !preemptioncommon.SatisfiesPreemptionPolicy(ctx.Wl, wl.Obj, ctx.WorkloadOrdering, preemptionPolicy) {
 		return Never
 	}
+
 	if wl.ClusterQueue == ctx.Cq.Name {
 		return WithinCQ
 	}
@@ -96,31 +104,14 @@ func classifyPreemptionVariant(ctx *HierarchicalPreemptionCtx, wl *workload.Info
 	if borrowWithinCohortForbidden {
 		return ReclaimWithoutBorrowing
 	}
+	candidatePriority := priority.Priority(wl.Obj)
+	incomingPriority := priority.Priority(ctx.Wl)
 	if isAboveBorrowingThreshold(candidatePriority, incomingPriority, borrowWithinCohortThreshold) {
 		return ReclaimWithoutBorrowing
 	}
 	return ReclaimWhileBorrowing
 }
 
-func satisfiesPreemptionPolicy(ctx *HierarchicalPreemptionCtx, wl *workload.Info, incomingPriority, candidatePriority int32) bool {
-	var preemptionPolicy kueue.PreemptionPolicy
-	if wl.ClusterQueue == ctx.Cq.Name {
-		preemptionPolicy = ctx.Cq.Preemption.WithinClusterQueue
-	} else {
-		preemptionPolicy = ctx.Cq.Preemption.ReclaimWithinCohort
-	}
-	lowerPriority := incomingPriority > candidatePriority
-	if preemptionPolicy == kueue.PreemptionPolicyLowerPriority {
-		return lowerPriority
-	}
-	if preemptionPolicy == kueue.PreemptionPolicyLowerOrNewerEqualPriority {
-		preemptorTS := ctx.WorkloadOrdering.GetQueueOrderTimestamp(ctx.Wl)
-		newerEqualPriority := (incomingPriority == candidatePriority) && preemptorTS.Before(ctx.WorkloadOrdering.GetQueueOrderTimestamp(wl.Obj))
-		return (lowerPriority || newerEqualPriority)
-	}
-	return preemptionPolicy == kueue.PreemptionPolicyAny
-}
-
 func isAboveBorrowingThreshold(candidatePriority, incomingPriority int32, borrowWithinCohortThreshold *int32) bool {
 	if candidatePriority >= incomingPriority {
 		return true
diff --git a/pkg/scheduler/preemption/common/preemption_policy.go b/pkg/scheduler/preemption/common/preemption_policy.go
new file mode 100644
index 000000000..0064be221
--- /dev/null
+++ b/pkg/scheduler/preemption/common/preemption_policy.go
@@ -0,0 +1,40 @@
+/*
+Copyright The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package preemptioncommon
+
+import (
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	"sigs.k8s.io/kueue/pkg/util/priority"
+	"sigs.k8s.io/kueue/pkg/workload"
+)
+
+func SatisfiesPreemptionPolicy(preemptor, candidate *kueue.Workload, workloadOrdering workload.Ordering, policy kueue.PreemptionPolicy) bool {
+	preemptorPriority := priority.Priority(preemptor)
+	candidatePriority := priority.Priority(candidate)
+
+	lowerPriority := preemptorPriority > candidatePriority
+	if policy == kueue.PreemptionPolicyLowerPriority {
+		return lowerPriority
+	}
+	if policy == kueue.PreemptionPolicyLowerOrNewerEqualPriority {
+		preemptorTS := workloadOrdering.GetQueueOrderTimestamp(preemptor)
+		candidateTS := workloadOrdering.GetQueueOrderTimestamp(candidate)
+		newerEqualPriority := (preemptorPriority == candidatePriority) && preemptorTS.Before(candidateTS)
+		return lowerPriority || newerEqualPriority
+	}
+	return policy == kueue.PreemptionPolicyAny
+}
diff --git a/pkg/scheduler/preemption/preemption.go b/pkg/scheduler/preemption/preemption.go
index 3a08230cf..f20387fe1 100644
--- a/pkg/scheduler/preemption/preemption.go
+++ b/pkg/scheduler/preemption/preemption.go
@@ -43,7 +43,6 @@ import (
 	preemptioncommon "sigs.k8s.io/kueue/pkg/scheduler/preemption/common"
 	"sigs.k8s.io/kueue/pkg/scheduler/preemption/fairsharing"
 	"sigs.k8s.io/kueue/pkg/util/logging"
-	"sigs.k8s.io/kueue/pkg/util/priority"
 	"sigs.k8s.io/kueue/pkg/util/routine"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
@@ -444,36 +443,34 @@ func flavorResourcesNeedPreemption(assignment flavorassigner.Assignment) sets.Se
 	return resPerFlavor
 }
 
+func findCandidatesForPolicy(wl *kueue.Workload, workloadsToFilter map[workload.Reference]*workload.Info, policy kueue.PreemptionPolicy, frsNeedPreemption sets.Set[resources.FlavorResource], workloadOrdering workload.Ordering) []*workload.Info {
+	var candidates []*workload.Info
+	for _, candidateWl := range workloadsToFilter {
+		if !preemptioncommon.SatisfiesPreemptionPolicy(
+			wl,
+			candidateWl.Obj,
+			workloadOrdering,
+			policy) {
+			continue
+		}
+
+		if !classical.WorkloadUsesResources(candidateWl, frsNeedPreemption) {
+			continue
+		}
+		candidates = append(candidates, candidateWl)
+	}
+	return candidates
+}
+
 // findCandidates obtains candidates for preemption within the ClusterQueue and
 // cohort that respect the preemption policy and are using a resource that the
 // preempting workload needs.
 func (p *Preemptor) findCandidates(wl *kueue.Workload, cq *schdcache.ClusterQueueSnapshot, frsNeedPreemption sets.Set[resources.FlavorResource]) []*workload.Info {
 	var candidates []*workload.Info
-	wlPriority := priority.Priority(wl)
-	preemptorTS := p.workloadOrdering.GetQueueOrderTimestamp(wl)
 
 	if cq.Preemption.WithinClusterQueue != kueue.PreemptionPolicyNever {
-		for _, candidateWl := range cq.Workloads {
-			candidatePriority := priority.Priority(candidateWl.Obj)
-			switch cq.Preemption.WithinClusterQueue {
-			case kueue.PreemptionPolicyLowerPriority:
-				if candidatePriority >= wlPriority {
-					continue
-				}
-			case kueue.PreemptionPolicyLowerOrNewerEqualPriority:
-				if candidatePriority > wlPriority {
-					continue
-				}
-				if candidatePriority == wlPriority && !preemptorTS.Before(p.workloadOrdering.GetQueueOrderTimestamp(candidateWl.Obj)) {
-					continue
-				}
-			}
-
-			if !classical.WorkloadUsesResources(candidateWl, frsNeedPreemption) {
-				continue
-			}
-			candidates = append(candidates, candidateWl)
-		}
+		newCandidates := findCandidatesForPolicy(wl, cq.Workloads, cq.Preemption.WithinClusterQueue, frsNeedPreemption, p.workloadOrdering)
+		candidates = append(candidates, newCandidates...)
 	}
 
 	if cq.HasParent() && cq.Preemption.ReclaimWithinCohort != kueue.PreemptionPolicyNever {
@@ -482,26 +479,8 @@ func (p *Preemptor) findCandidates(wl *kueue.Workload, cq *schdcache.ClusterQueu
 				// Can't reclaim quota from itself or ClusterQueues that are not borrowing.
 				continue
 			}
-			for _, candidateWl := range cohortCQ.Workloads {
-				candidatePriority := priority.Priority(candidateWl.Obj)
-				switch cq.Preemption.ReclaimWithinCohort {
-				case kueue.PreemptionPolicyLowerPriority:
-					if candidatePriority >= wlPriority {
-						continue
-					}
-				case kueue.PreemptionPolicyLowerOrNewerEqualPriority:
-					if candidatePriority > wlPriority {
-						continue
-					}
-					if candidatePriority == wlPriority && !preemptorTS.Before(p.workloadOrdering.GetQueueOrderTimestamp(candidateWl.Obj)) {
-						continue
-					}
-				}
-				if !classical.WorkloadUsesResources(candidateWl, frsNeedPreemption) {
-					continue
-				}
-				candidates = append(candidates, candidateWl)
-			}
+			newCandidates := findCandidatesForPolicy(wl, cohortCQ.Workloads, cq.Preemption.ReclaimWithinCohort, frsNeedPreemption, p.workloadOrdering)
+			candidates = append(candidates, newCandidates...)
 		}
 	}
 	return candidates
diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
index 45b06bcde..38e14e479 100644
--- a/pkg/scheduler/scheduler.go
+++ b/pkg/scheduler/scheduler.go
@@ -314,7 +314,7 @@ func (s *Scheduler) schedule(ctx context.Context) wait.SpeedSignal {
 			wl := e.Obj.DeepCopy()
 			if err := workload.PatchAdmissionStatus(ctx, s.client, wl, s.clock, func() (*kueue.Workload, bool, error) {
 				return wl, workload.UnsetQuotaReservationWithCondition(wl, "Waiting", "waiting for all admitted workloads to be in PodsReady condition", s.clock.Now()), nil
-			}, workload.WithLoose()); err != nil {
+			}, workload.WithLooseOnApply()); err != nil {
 				log.Error(err, "Could not update Workload status")
 			}
 			s.cache.WaitForPodsReady(ctx)
@@ -644,7 +644,7 @@ func (s *Scheduler) admit(ctx context.Context, e *entry, cq *schdcache.ClusterQu
 	s.admissionRoutineWrapper.Run(func() {
 		err := workload.PatchAdmissionStatus(ctx, s.client, origWorkload, s.clock, func() (*kueue.Workload, bool, error) {
 			return newWorkload, true, nil
-		}, workload.WithLoose())
+		}, workload.WithLooseOnApply())
 		if err == nil {
 			// Record metrics and events for quota reservation and admission
 			s.recordWorkloadAdmissionMetrics(newWorkload, e.Obj, admission)
diff --git a/pkg/util/cert/cert.go b/pkg/util/cert/cert.go
index 502496d82..308c72a20 100644
--- a/pkg/util/cert/cert.go
+++ b/pkg/util/cert/cert.go
@@ -34,7 +34,6 @@ const (
 	webhookServiceSuffix = "-webhook-service"
 )
 
-// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;update
 // +kubebuilder:rbac:groups="admissionregistration.k8s.io",resources=mutatingwebhookconfigurations,verbs=get;list;watch;update
 // +kubebuilder:rbac:groups="admissionregistration.k8s.io",resources=validatingwebhookconfigurations,verbs=get;list;watch;update
 
diff --git a/pkg/visibility/api/install.go b/pkg/visibility/api/install.go
index 19938e0ed..4d75ae40f 100644
--- a/pkg/visibility/api/install.go
+++ b/pkg/visibility/api/install.go
@@ -24,9 +24,9 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 
-	visibilityv1beta1 "sigs.k8s.io/kueue/apis/visibility/v1beta1"
+	visibility "sigs.k8s.io/kueue/apis/visibility/v1beta1"
 	qcache "sigs.k8s.io/kueue/pkg/cache/queue"
-	apiv1beta1 "sigs.k8s.io/kueue/pkg/visibility/api/v1beta1"
+	visibilityapi "sigs.k8s.io/kueue/pkg/visibility/api/v1beta1"
 )
 
 var (
@@ -36,14 +36,14 @@ var (
 )
 
 func init() {
-	utilruntime.Must(visibilityv1beta1.AddToScheme(Scheme))
-	utilruntime.Must(Scheme.SetVersionPriority(visibilityv1beta1.GroupVersion))
+	utilruntime.Must(visibility.AddToScheme(Scheme))
+	utilruntime.Must(Scheme.SetVersionPriority(visibility.GroupVersion))
 	metav1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
 }
 
 // Install installs API scheme and registers storages
 func Install(server *genericapiserver.GenericAPIServer, kueueMgr *qcache.Manager) error {
-	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(visibilityv1beta1.GroupVersion.Group, Scheme, ParameterCodec, Codecs)
-	apiGroupInfo.VersionedResourcesStorageMap[visibilityv1beta1.GroupVersion.Version] = apiv1beta1.NewStorage(kueueMgr)
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(visibility.GroupVersion.Group, Scheme, ParameterCodec, Codecs)
+	apiGroupInfo.VersionedResourcesStorageMap[visibility.GroupVersion.Version] = visibilityapi.NewStorage(kueueMgr)
 	return server.InstallAPIGroups(&apiGroupInfo)
 }
diff --git a/pkg/visibility/server.go b/pkg/visibility/server.go
index bbab279e2..4fe37c1a4 100644
--- a/pkg/visibility/server.go
+++ b/pkg/visibility/server.go
@@ -34,7 +34,7 @@ import (
 	"k8s.io/component-base/version"
 
 	generatedopenapi "sigs.k8s.io/kueue/apis/visibility/openapi"
-	visibilityv1beta1 "sigs.k8s.io/kueue/apis/visibility/v1beta1"
+	visibility "sigs.k8s.io/kueue/apis/visibility/v1beta1"
 	qcache "sigs.k8s.io/kueue/pkg/cache/queue"
 	"sigs.k8s.io/kueue/pkg/visibility/api"
 
@@ -81,7 +81,7 @@ func CreateAndStartVisibilityServer(ctx context.Context, kueueMgr *qcache.Manage
 }
 
 func applyVisibilityServerOptions(config *genericapiserver.RecommendedConfig, enableInternalCertManagement bool) error {
-	o := genericoptions.NewRecommendedOptions("", api.Codecs.LegacyCodec(visibilityv1beta1.SchemeGroupVersion))
+	o := genericoptions.NewRecommendedOptions("", api.Codecs.LegacyCodec(visibility.SchemeGroupVersion))
 	o.Etcd = nil
 	o.SecureServing.BindPort = 8082
 	if enableInternalCertManagement {
diff --git a/pkg/workload/workload.go b/pkg/workload/workload.go
index a59f1f061..bf38b9438 100644
--- a/pkg/workload/workload.go
+++ b/pkg/workload/workload.go
@@ -909,32 +909,39 @@ type PatchAdmissionStatusOption func(*PatchAdmissionStatusOptions)
 // are generated and applied.
 //
 // Fields:
-//   - Strict: Controls whether ResourceVersion should always be cleared
+//   - StrictPatch: Controls whether ResourceVersion should always be cleared
 //     from the "original" object to ensure its inclusion in the generated
-//     patch. Defaults to true. Setting Strict=false preserves the current
+//     patch. Defaults to true. Setting StrictPatch=false preserves the current
+//     ResourceVersion.
+//   - StrictApply: When using Patch Apply, controls whether ResourceVersion should always be cleared
+//     from the "original" object to ensure its inclusion in the generated
+//     patch. Defaults to true. Setting StrictPatch=false preserves the current
 //     ResourceVersion.
 //
 // Typically, PatchAdmissionStatusOptions are constructed via DefaultPatchAdmissionStatusOptions and
 // modified using PatchAdmissionStatusOption functions (e.g., WithLoose).
 type PatchAdmissionStatusOptions struct {
-	Strict bool
+	StrictPatch bool
+	StrictApply bool
 }
 
 // DefaultPatchAdmissionStatusOptions returns a new PatchAdmissionStatusOptions instance configured with
 // default settings.
 //
-// By default, Strict is set to true, meaning ResourceVersion is cleared
+// By default, StrictPatch and StrictApply is set to true, meaning ResourceVersion is cleared
 // from the original object so it will always be included in the generated
 // patch. This ensures stricter version handling during patch application.
 func DefaultPatchAdmissionStatusOptions() *PatchAdmissionStatusOptions {
 	return &PatchAdmissionStatusOptions{
-		Strict: true, // default is strict
+		StrictPatch: true, // default is strict
+		StrictApply: true, // default is strict
 	}
 }
 
-// WithLoose returns a PatchAdmissionStatusOption that sets the Strict field on PatchAdmissionStatusOptions.
+// WithLoose returns a PatchAdmissionStatusOption that resets both the StrictPatch and StrictApply
+// fields on PatchAdmissionStatusOptions.
 //
-// By default, Strict is true. In strict mode, generated patches enforce stricter
+// By default, StrictPatch and StrictApply are true. In strict mode, generated patches enforce stricter
 // behavior by clearing the ResourceVersion field from the "original" object.
 // This ensures that the ResourceVersion is always included in the generated patch
 // and taken into account during patch application.
@@ -946,7 +953,26 @@ func DefaultPatchAdmissionStatusOptions() *PatchAdmissionStatusOptions {
 //	}, WithLoose()) // disables strict mode
 func WithLoose() PatchAdmissionStatusOption {
 	return func(o *PatchAdmissionStatusOptions) {
-		o.Strict = false
+		o.StrictPatch = false
+		o.StrictApply = false
+	}
+}
+
+// WithLooseOnApply returns a PatchAdmissionStatusOption that resets the StrictApply field on PatchAdmissionStatusOptions.
+//
+// When using Patch Apply, setting StrictApply to false enforces looser
+// version handling only for Patch Apply.
+// This is useful when the update function already handles version conflicts
+// and we want to avoid additional conflicts during Patch Apply.
+//
+// Example:
+//	patch := clientutil.Patch(ctx, c, w, clk, func() (bool, error) {
+//	    return updateFn(obj), nil
+//	}, WithLooseOnApply()) // disables strict mode for Patch Apply
+
+func WithLooseOnApply() PatchAdmissionStatusOption {
+	return func(o *PatchAdmissionStatusOptions) {
+		o.StrictApply = false
 	}
 }
 
@@ -961,7 +987,7 @@ func PatchAdmissionStatus(ctx context.Context, c client.Client, w *kueue.Workloa
 
 	if features.Enabled(features.WorkloadRequestUseMergePatch) {
 		var patchOptions []clientutil.PatchOption
-		if !opts.Strict {
+		if !opts.StrictPatch {
 			patchOptions = append(patchOptions, clientutil.WithLoose())
 		}
 		return clientutil.PatchStatus(ctx, c, w, func() (client.Object, bool, error) {
@@ -973,7 +999,7 @@ func PatchAdmissionStatus(ctx context.Context, c client.Client, w *kueue.Workloa
 		return err
 	}
 
-	return ApplyAdmissionStatus(ctx, c, wPatched, opts.Strict, clk)
+	return ApplyAdmissionStatus(ctx, c, wPatched, opts.StrictApply, clk)
 }
 
 type Ordering struct {
diff --git a/site/content/en/docs/reference/labels-and-annotations.md b/site/content/en/docs/reference/labels-and-annotations.md
index 2957698f5..afaef113c 100644
--- a/site/content/en/docs/reference/labels-and-annotations.md
+++ b/site/content/en/docs/reference/labels-and-annotations.md
@@ -199,21 +199,6 @@ The label key in the workload holds the queue name.
 Note: Read more about [Setup LocalQueueDefauling](/docs/tasks/manage/enforce_job_management/setup_default_local_queue/)
 in order to automatically set the `kueue.x-k8s.io/queue-name` label.
 
-### kueue.x-k8s.io/queue-name (deprecated)
-
-Type: Annotation
-
-Example: `kueue.x-k8s.io/queue-name: "my-local-queue"`
-
-Used on: Kueue-managed Jobs.
-
-The annotation key in the workload holds the queue name.
-
-{{% alert title="Warning" color="warning" %}}
-Starting from `v1beta1` this annotation is deprecated.
-Please use [kueue.x-k8s.io/queue-name label](#kueuex-k8sioqueue-name) instead.
-{{% /alert %}}
-
 ### kueue.x-k8s.io/retriable-in-group
 
 Type: Annotation
diff --git a/site/content/zh-CN/docs/reference/labels-and-annotations.md b/site/content/zh-CN/docs/reference/labels-and-annotations.md
index 2957698f5..afaef113c 100644
--- a/site/content/zh-CN/docs/reference/labels-and-annotations.md
+++ b/site/content/zh-CN/docs/reference/labels-and-annotations.md
@@ -199,21 +199,6 @@ The label key in the workload holds the queue name.
 Note: Read more about [Setup LocalQueueDefauling](/docs/tasks/manage/enforce_job_management/setup_default_local_queue/)
 in order to automatically set the `kueue.x-k8s.io/queue-name` label.
 
-### kueue.x-k8s.io/queue-name (deprecated)
-
-Type: Annotation
-
-Example: `kueue.x-k8s.io/queue-name: "my-local-queue"`
-
-Used on: Kueue-managed Jobs.
-
-The annotation key in the workload holds the queue name.
-
-{{% alert title="Warning" color="warning" %}}
-Starting from `v1beta1` this annotation is deprecated.
-Please use [kueue.x-k8s.io/queue-name label](#kueuex-k8sioqueue-name) instead.
-{{% /alert %}}
-
 ### kueue.x-k8s.io/retriable-in-group
 
 Type: Annotation



Test patch:
diff --git a/cmd/importer/pod/check_test.go b/cmd/importer/pod/check_test.go
index e202dadd7..b439f79df 100644
--- a/cmd/importer/pod/check_test.go
+++ b/cmd/importer/pod/check_test.go
@@ -26,6 +26,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/importer/util"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 )
 
@@ -38,8 +39,8 @@ func TestCheckNamespace(t *testing.T) {
 	basePodWrapper := testingpod.MakePod("pod", testingNamespace).
 		Label(testingQueueLabel, "q1")
 
-	baseLocalQueue := utiltesting.MakeLocalQueue("lq1", testingNamespace).ClusterQueue("cq1")
-	baseClusterQueue := utiltesting.MakeClusterQueue("cq1")
+	baseLocalQueue := utiltestingapi.MakeLocalQueue("lq1", testingNamespace).ClusterQueue("cq1")
+	baseClusterQueue := utiltestingapi.MakeClusterQueue("cq1")
 
 	cases := map[string]struct {
 		pods          []corev1.Pod
@@ -136,10 +137,10 @@ func TestCheckNamespace(t *testing.T) {
 				*baseLocalQueue.Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cq1").ResourceGroup(*utiltesting.MakeFlavorQuotas("rf1").Resource(corev1.ResourceCPU, "1").Obj()).Obj(),
+				*utiltestingapi.MakeClusterQueue("cq1").ResourceGroup(*utiltestingapi.MakeFlavorQuotas("rf1").Resource(corev1.ResourceCPU, "1").Obj()).Obj(),
 			},
 			flavors: []kueue.ResourceFlavor{
-				*utiltesting.MakeResourceFlavor("rf1").Obj(),
+				*utiltestingapi.MakeResourceFlavor("rf1").Obj(),
 			},
 		},
 	}
diff --git a/cmd/importer/pod/import_test.go b/cmd/importer/pod/import_test.go
index f7cd0b8d7..982762170 100644
--- a/cmd/importer/pod/import_test.go
+++ b/cmd/importer/pod/import_test.go
@@ -30,6 +30,7 @@ import (
 	"sigs.k8s.io/kueue/cmd/importer/util"
 	controllerconstants "sigs.k8s.io/kueue/pkg/controller/constants"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 )
 
@@ -40,18 +41,18 @@ func TestImportNamespace(t *testing.T) {
 		Image("img", nil).
 		Request(corev1.ResourceCPU, "1")
 
-	baseWlWrapper := utiltesting.MakeWorkload("pod-pod-b17ab", testingNamespace).
+	baseWlWrapper := utiltestingapi.MakeWorkload("pod-pod-b17ab", testingNamespace).
 		ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "pod").
 		Label(controllerconstants.JobUIDLabel, "pod").
 		Finalizers(kueue.ResourceInUseFinalizerName).
 		Queue("lq1").
-		PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+		PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 			Image("img").
 			Request(corev1.ResourceCPU, "1").
 			PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
 			Obj()).
-		ReserveQuota(utiltesting.MakeAdmission("cq1").
-			PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+		ReserveQuota(utiltestingapi.MakeAdmission("cq1").
+			PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 				Assignment(corev1.ResourceCPU, "f1", "1").
 				Obj()).
 			Obj()).
@@ -68,10 +69,10 @@ func TestImportNamespace(t *testing.T) {
 			Message: "Imported into ClusterQueue cq1",
 		})
 
-	baseLocalQueue := utiltesting.MakeLocalQueue("lq1", testingNamespace).ClusterQueue("cq1")
-	baseClusterQueue := utiltesting.MakeClusterQueue("cq1").
+	baseLocalQueue := utiltestingapi.MakeLocalQueue("lq1", testingNamespace).ClusterQueue("cq1")
+	baseClusterQueue := utiltestingapi.MakeClusterQueue("cq1").
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "1", "0").Obj())
+			*utiltestingapi.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "1", "0").Obj())
 
 	podCmpOpts := cmp.Options{
 		cmpopts.EquateEmpty(),
diff --git a/cmd/kueuectl/app/completion/completion_test.go b/cmd/kueuectl/app/completion/completion_test.go
index 7c548777f..bba87c851 100644
--- a/cmd/kueuectl/app/completion/completion_test.go
+++ b/cmd/kueuectl/app/completion/completion_test.go
@@ -25,10 +25,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/ptr"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/fake"
 	cmdtesting "sigs.k8s.io/kueue/cmd/kueuectl/app/testing"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestWorkloadNameCompletionFunc(t *testing.T) {
@@ -43,8 +43,8 @@ func TestWorkloadNameCompletionFunc(t *testing.T) {
 	}{
 		"should return workload names": {
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).Active(true).Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).Active(false).Obj(),
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).Active(true).Obj(),
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).Active(false).Obj(),
 			},
 			wantNames:     []string{"wl1", "wl2"},
 			wantDirective: cobra.ShellCompDirectiveNoFileComp,
@@ -52,8 +52,8 @@ func TestWorkloadNameCompletionFunc(t *testing.T) {
 		"should return active workload names": {
 			status: ptr.To(true),
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).Active(true).Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).Active(false).Obj(),
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).Active(true).Obj(),
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).Active(false).Obj(),
 			},
 			wantNames:     []string{"wl1"},
 			wantDirective: cobra.ShellCompDirectiveNoFileComp,
@@ -61,16 +61,16 @@ func TestWorkloadNameCompletionFunc(t *testing.T) {
 		"should return inactive workload names": {
 			status: ptr.To(false),
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).Active(true).Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).Active(false).Obj(),
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).Active(true).Obj(),
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).Active(false).Obj(),
 			},
 			wantNames:     []string{"wl2"},
 			wantDirective: cobra.ShellCompDirectiveNoFileComp,
 		},
 		"should filter workload names": {
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).Active(true).Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).Active(false).Obj(),
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).Active(true).Obj(),
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).Active(false).Obj(),
 			},
 			args:          []string{"wl2"},
 			wantNames:     []string{"wl1"},
@@ -109,9 +109,9 @@ func TestClusterQueueNameCompletionFunc(t *testing.T) {
 	}{
 		"should return active cluster queue names": {
 			objs: []runtime.Object{
-				utiltesting.MakeClusterQueue("cq1").StopPolicy(v1beta1.None).Obj(),
-				utiltesting.MakeClusterQueue("cq2").StopPolicy(v1beta1.Hold).Obj(),
-				utiltesting.MakeClusterQueue("cq3").StopPolicy(v1beta1.HoldAndDrain).Obj(),
+				utiltestingapi.MakeClusterQueue("cq1").StopPolicy(kueue.None).Obj(),
+				utiltestingapi.MakeClusterQueue("cq2").StopPolicy(kueue.Hold).Obj(),
+				utiltestingapi.MakeClusterQueue("cq3").StopPolicy(kueue.HoldAndDrain).Obj(),
 			},
 			wantNames:     []string{"cq1", "cq2", "cq3"},
 			wantDirective: cobra.ShellCompDirectiveNoFileComp,
@@ -119,9 +119,9 @@ func TestClusterQueueNameCompletionFunc(t *testing.T) {
 		"should return cluster queue names": {
 			status: ptr.To(true),
 			objs: []runtime.Object{
-				utiltesting.MakeClusterQueue("cq1").StopPolicy(v1beta1.None).Obj(),
-				utiltesting.MakeClusterQueue("cq2").StopPolicy(v1beta1.Hold).Obj(),
-				utiltesting.MakeClusterQueue("cq3").StopPolicy(v1beta1.HoldAndDrain).Obj(),
+				utiltestingapi.MakeClusterQueue("cq1").StopPolicy(kueue.None).Obj(),
+				utiltestingapi.MakeClusterQueue("cq2").StopPolicy(kueue.Hold).Obj(),
+				utiltestingapi.MakeClusterQueue("cq3").StopPolicy(kueue.HoldAndDrain).Obj(),
 			},
 			wantNames:     []string{"cq1"},
 			wantDirective: cobra.ShellCompDirectiveNoFileComp,
@@ -129,18 +129,18 @@ func TestClusterQueueNameCompletionFunc(t *testing.T) {
 		"should return inactive cluster queue names": {
 			status: ptr.To(false),
 			objs: []runtime.Object{
-				utiltesting.MakeClusterQueue("cq1").StopPolicy(v1beta1.None).Obj(),
-				utiltesting.MakeClusterQueue("cq2").StopPolicy(v1beta1.Hold).Obj(),
-				utiltesting.MakeClusterQueue("cq3").StopPolicy(v1beta1.HoldAndDrain).Obj(),
+				utiltestingapi.MakeClusterQueue("cq1").StopPolicy(kueue.None).Obj(),
+				utiltestingapi.MakeClusterQueue("cq2").StopPolicy(kueue.Hold).Obj(),
+				utiltestingapi.MakeClusterQueue("cq3").StopPolicy(kueue.HoldAndDrain).Obj(),
 			},
 			wantNames:     []string{"cq2", "cq3"},
 			wantDirective: cobra.ShellCompDirectiveNoFileComp,
 		},
 		"shouldn't return cluster queue names because only one argument can be passed": {
 			objs: []runtime.Object{
-				utiltesting.MakeClusterQueue("cq1").StopPolicy(v1beta1.None).Obj(),
-				utiltesting.MakeClusterQueue("cq2").StopPolicy(v1beta1.Hold).Obj(),
-				utiltesting.MakeClusterQueue("cq3").StopPolicy(v1beta1.HoldAndDrain).Obj(),
+				utiltestingapi.MakeClusterQueue("cq1").StopPolicy(kueue.None).Obj(),
+				utiltestingapi.MakeClusterQueue("cq2").StopPolicy(kueue.Hold).Obj(),
+				utiltestingapi.MakeClusterQueue("cq3").StopPolicy(kueue.HoldAndDrain).Obj(),
 			},
 			args:          []string{"cq2"},
 			wantDirective: cobra.ShellCompDirectiveNoFileComp,
@@ -178,9 +178,9 @@ func TestLocalQueueNameCompletionFunc(t *testing.T) {
 	}{
 		"should return local queue names": {
 			objs: []runtime.Object{
-				utiltesting.MakeLocalQueue("lq1", metav1.NamespaceDefault).StopPolicy(v1beta1.None).Obj(),
-				utiltesting.MakeLocalQueue("lq2", metav1.NamespaceDefault).StopPolicy(v1beta1.Hold).Obj(),
-				utiltesting.MakeLocalQueue("lq3", metav1.NamespaceDefault).StopPolicy(v1beta1.HoldAndDrain).Obj(),
+				utiltestingapi.MakeLocalQueue("lq1", metav1.NamespaceDefault).StopPolicy(kueue.None).Obj(),
+				utiltestingapi.MakeLocalQueue("lq2", metav1.NamespaceDefault).StopPolicy(kueue.Hold).Obj(),
+				utiltestingapi.MakeLocalQueue("lq3", metav1.NamespaceDefault).StopPolicy(kueue.HoldAndDrain).Obj(),
 			},
 			wantNames:     []string{"lq1", "lq2", "lq3"},
 			wantDirective: cobra.ShellCompDirectiveNoFileComp,
@@ -188,9 +188,9 @@ func TestLocalQueueNameCompletionFunc(t *testing.T) {
 		"should return active local queue names": {
 			status: ptr.To(true),
 			objs: []runtime.Object{
-				utiltesting.MakeLocalQueue("lq1", metav1.NamespaceDefault).StopPolicy(v1beta1.None).Obj(),
-				utiltesting.MakeLocalQueue("lq2", metav1.NamespaceDefault).StopPolicy(v1beta1.Hold).Obj(),
-				utiltesting.MakeLocalQueue("lq3", metav1.NamespaceDefault).StopPolicy(v1beta1.HoldAndDrain).Obj(),
+				utiltestingapi.MakeLocalQueue("lq1", metav1.NamespaceDefault).StopPolicy(kueue.None).Obj(),
+				utiltestingapi.MakeLocalQueue("lq2", metav1.NamespaceDefault).StopPolicy(kueue.Hold).Obj(),
+				utiltestingapi.MakeLocalQueue("lq3", metav1.NamespaceDefault).StopPolicy(kueue.HoldAndDrain).Obj(),
 			},
 			wantNames:     []string{"lq1"},
 			wantDirective: cobra.ShellCompDirectiveNoFileComp,
@@ -198,17 +198,17 @@ func TestLocalQueueNameCompletionFunc(t *testing.T) {
 		"should return inactive local queue names": {
 			status: ptr.To(false),
 			objs: []runtime.Object{
-				utiltesting.MakeLocalQueue("lq1", metav1.NamespaceDefault).StopPolicy(v1beta1.None).Obj(),
-				utiltesting.MakeLocalQueue("lq2", metav1.NamespaceDefault).StopPolicy(v1beta1.Hold).Obj(),
-				utiltesting.MakeLocalQueue("lq3", metav1.NamespaceDefault).StopPolicy(v1beta1.HoldAndDrain).Obj(),
+				utiltestingapi.MakeLocalQueue("lq1", metav1.NamespaceDefault).StopPolicy(kueue.None).Obj(),
+				utiltestingapi.MakeLocalQueue("lq2", metav1.NamespaceDefault).StopPolicy(kueue.Hold).Obj(),
+				utiltestingapi.MakeLocalQueue("lq3", metav1.NamespaceDefault).StopPolicy(kueue.HoldAndDrain).Obj(),
 			},
 			wantNames:     []string{"lq2", "lq3"},
 			wantDirective: cobra.ShellCompDirectiveNoFileComp,
 		},
 		"shouldn't return local queue names because only one argument can be passed": {
 			objs: []runtime.Object{
-				utiltesting.MakeLocalQueue("lq1", metav1.NamespaceDefault).Obj(),
-				utiltesting.MakeLocalQueue("lq2", metav1.NamespaceDefault).Obj(),
+				utiltestingapi.MakeLocalQueue("lq1", metav1.NamespaceDefault).Obj(),
+				utiltestingapi.MakeLocalQueue("lq2", metav1.NamespaceDefault).Obj(),
 			},
 			args:          []string{"lq1"},
 			wantDirective: cobra.ShellCompDirectiveNoFileComp,
diff --git a/cmd/kueuectl/app/create/create_clusterqueue_test.go b/cmd/kueuectl/app/create/create_clusterqueue_test.go
index dd0a6de8c..31260ab03 100644
--- a/cmd/kueuectl/app/create/create_clusterqueue_test.go
+++ b/cmd/kueuectl/app/create/create_clusterqueue_test.go
@@ -24,14 +24,14 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestCreateClusterQueue(t *testing.T) {
 	testCases := map[string]struct {
 		options  *ClusterQueueOptions
-		expected *v1beta1.ClusterQueue
+		expected *kueue.ClusterQueue
 	}{
 		"success_create": {
 			options: &ClusterQueueOptions{
@@ -43,11 +43,11 @@ func TestCreateClusterQueue(t *testing.T) {
 				},
 				ReclaimWithinCohort:          "Any",
 				PreemptionWithinClusterQueue: "LowerPriority",
-				ResourceGroups: []v1beta1.ResourceGroup{
+				ResourceGroups: []kueue.ResourceGroup{
 					{
 						CoveredResources: []corev1.ResourceName{},
-						Flavors: []v1beta1.FlavorQuotas{
-							*utiltesting.MakeFlavorQuotas("alpha").
+						Flavors: []kueue.FlavorQuotas{
+							*utiltestingapi.MakeFlavorQuotas("alpha").
 								Resource("cpu", "0", "0", "0").
 								Resource("memory", "0", "0", "0").
 								Obj(),
@@ -55,24 +55,24 @@ func TestCreateClusterQueue(t *testing.T) {
 					},
 				},
 			},
-			expected: &v1beta1.ClusterQueue{
+			expected: &kueue.ClusterQueue{
 				TypeMeta:   metav1.TypeMeta{APIVersion: "kueue.x-k8s.io/v1beta1", Kind: "ClusterQueue"},
 				ObjectMeta: metav1.ObjectMeta{Name: "cq1"},
-				Spec: v1beta1.ClusterQueueSpec{
+				Spec: kueue.ClusterQueueSpec{
 					Cohort:           "cohort",
-					QueueingStrategy: v1beta1.StrictFIFO,
+					QueueingStrategy: kueue.StrictFIFO,
 					NamespaceSelector: &metav1.LabelSelector{
 						MatchLabels: map[string]string{"foo": "bar"},
 					},
-					Preemption: &v1beta1.ClusterQueuePreemption{
-						ReclaimWithinCohort: v1beta1.PreemptionPolicyAny,
-						WithinClusterQueue:  v1beta1.PreemptionPolicyLowerPriority,
+					Preemption: &kueue.ClusterQueuePreemption{
+						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
+						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					},
-					ResourceGroups: []v1beta1.ResourceGroup{
+					ResourceGroups: []kueue.ResourceGroup{
 						{
 							CoveredResources: []corev1.ResourceName{},
-							Flavors: []v1beta1.FlavorQuotas{
-								*utiltesting.MakeFlavorQuotas("alpha").
+							Flavors: []kueue.FlavorQuotas{
+								*utiltestingapi.MakeFlavorQuotas("alpha").
 									Resource("cpu", "0", "0", "0").
 									Resource("memory", "0", "0", "0").
 									Obj(),
@@ -99,15 +99,15 @@ func TestParseResourceQuotas(t *testing.T) {
 		borrowingArgs      []string
 		lendingArgs        []string
 		wantErr            error
-		wantResourceGroups []v1beta1.ResourceGroup
+		wantResourceGroups []kueue.ResourceGroup
 	}{
 		"should create one resource group with one flavor and nominalQuota set": {
 			quotaArgs: []string{"alpha-2.0:cpu=1;memory=1;example-1.org/memory=5Gi"},
-			wantResourceGroups: []v1beta1.ResourceGroup{
+			wantResourceGroups: []kueue.ResourceGroup{
 				{
 					CoveredResources: []corev1.ResourceName{"cpu", "memory", "example-1.org/memory"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("alpha-2.0").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("alpha-2.0").
 							Resource("cpu", "1").
 							Resource("memory", "1").
 							Resource("example-1.org/memory", "5Gi").
@@ -118,11 +118,11 @@ func TestParseResourceQuotas(t *testing.T) {
 		},
 		"should create one resource group with one flavor and borrowingLimit set": {
 			borrowingArgs: []string{"alpha:cpu=1;memory=1"},
-			wantResourceGroups: []v1beta1.ResourceGroup{
+			wantResourceGroups: []kueue.ResourceGroup{
 				{
 					CoveredResources: []corev1.ResourceName{"cpu", "memory"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("alpha").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource("cpu", "0", "1").
 							Resource("memory", "0", "1").
 							Obj(),
@@ -132,11 +132,11 @@ func TestParseResourceQuotas(t *testing.T) {
 		},
 		"should create one resource group with one flavor and lendingLimit set": {
 			lendingArgs: []string{"alpha:cpu=1;memory=1"},
-			wantResourceGroups: []v1beta1.ResourceGroup{
+			wantResourceGroups: []kueue.ResourceGroup{
 				{
 					CoveredResources: []corev1.ResourceName{"cpu", "memory"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("alpha").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource("cpu", "0", "", "1").
 							Resource("memory", "0", "", "1").
 							Obj(),
@@ -146,14 +146,14 @@ func TestParseResourceQuotas(t *testing.T) {
 		},
 		"should create one resource group with two flavors and nominalQuota set": {
 			quotaArgs: []string{"alpha:example.com/gpu=1", "beta:example.com/gpu=2"},
-			wantResourceGroups: []v1beta1.ResourceGroup{
+			wantResourceGroups: []kueue.ResourceGroup{
 				{
 					CoveredResources: []corev1.ResourceName{"example.com/gpu"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("alpha").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource("example.com/gpu", "1").
 							Obj(),
-						*utiltesting.MakeFlavorQuotas("beta").
+						*utiltestingapi.MakeFlavorQuotas("beta").
 							Resource("example.com/gpu", "2").
 							Obj(),
 					},
@@ -162,15 +162,15 @@ func TestParseResourceQuotas(t *testing.T) {
 		},
 		"should create one resource group when flavors listing resources in different order": {
 			quotaArgs: []string{"alpha:cpu=1;memory=1", "beta:memory=2;cpu=2"},
-			wantResourceGroups: []v1beta1.ResourceGroup{
+			wantResourceGroups: []kueue.ResourceGroup{
 				{
 					CoveredResources: []corev1.ResourceName{"cpu", "memory"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("alpha").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource("cpu", "1").
 							Resource("memory", "1").
 							Obj(),
-						*utiltesting.MakeFlavorQuotas("beta").
+						*utiltestingapi.MakeFlavorQuotas("beta").
 							Resource("memory", "2").
 							Resource("cpu", "2").
 							Obj(),
@@ -180,11 +180,11 @@ func TestParseResourceQuotas(t *testing.T) {
 		},
 		"should create two resource groups with one flavor each and nominalQuota set": {
 			quotaArgs: []string{"alpha:cpu=1;memory=1", "beta:example.com/gpu=2"},
-			wantResourceGroups: []v1beta1.ResourceGroup{
+			wantResourceGroups: []kueue.ResourceGroup{
 				{
 					CoveredResources: []corev1.ResourceName{"cpu", "memory"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("alpha").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource("cpu", "1").
 							Resource("memory", "1").
 							Obj(),
@@ -192,8 +192,8 @@ func TestParseResourceQuotas(t *testing.T) {
 				},
 				{
 					CoveredResources: []corev1.ResourceName{"example.com/gpu"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("beta").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("beta").
 							Resource("example.com/gpu", "2").
 							Obj(),
 					},
@@ -202,15 +202,15 @@ func TestParseResourceQuotas(t *testing.T) {
 		},
 		"should create two resource groups with multiple flavors and nominalQuota set": {
 			quotaArgs: []string{"alpha:cpu=1;memory=1", "beta:example.com/gpu=2", "gamma:cpu=2;memory=2"},
-			wantResourceGroups: []v1beta1.ResourceGroup{
+			wantResourceGroups: []kueue.ResourceGroup{
 				{
 					CoveredResources: []corev1.ResourceName{"cpu", "memory"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("alpha").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource("cpu", "1").
 							Resource("memory", "1").
 							Obj(),
-						*utiltesting.MakeFlavorQuotas("gamma").
+						*utiltestingapi.MakeFlavorQuotas("gamma").
 							Resource("cpu", "2").
 							Resource("memory", "2").
 							Obj(),
@@ -218,8 +218,8 @@ func TestParseResourceQuotas(t *testing.T) {
 				},
 				{
 					CoveredResources: []corev1.ResourceName{"example.com/gpu"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("beta").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("beta").
 							Resource("example.com/gpu", "2").
 							Obj(),
 					},
@@ -230,11 +230,11 @@ func TestParseResourceQuotas(t *testing.T) {
 			quotaArgs:     []string{"alpha:cpu=1;memory=2"},
 			borrowingArgs: []string{"alpha:cpu=1;memory=2"},
 			lendingArgs:   []string{"alpha:cpu=1;memory=2"},
-			wantResourceGroups: []v1beta1.ResourceGroup{
+			wantResourceGroups: []kueue.ResourceGroup{
 				{
 					CoveredResources: []corev1.ResourceName{"cpu", "memory"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("alpha").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource("cpu", "1", "1", "1").
 							Resource("memory", "2", "2", "2").
 							Obj(),
@@ -246,14 +246,14 @@ func TestParseResourceQuotas(t *testing.T) {
 			quotaArgs:     []string{"alpha:example.com/gpu=1", "beta:example.com/gpu=2"},
 			borrowingArgs: []string{"alpha:example.com/gpu=1", "beta:example.com/gpu=2"},
 			lendingArgs:   []string{"alpha:example.com/gpu=1", "beta:example.com/gpu=2"},
-			wantResourceGroups: []v1beta1.ResourceGroup{
+			wantResourceGroups: []kueue.ResourceGroup{
 				{
 					CoveredResources: []corev1.ResourceName{"example.com/gpu"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("alpha").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource("example.com/gpu", "1", "1", "1").
 							Obj(),
-						*utiltesting.MakeFlavorQuotas("beta").
+						*utiltestingapi.MakeFlavorQuotas("beta").
 							Resource("example.com/gpu", "2", "2", "2").
 							Obj(),
 					},
@@ -264,11 +264,11 @@ func TestParseResourceQuotas(t *testing.T) {
 			quotaArgs:     []string{"alpha:cpu=1;memory=1", "beta:example.com/gpu=2"},
 			borrowingArgs: []string{"alpha:cpu=1;memory=1", "beta:example.com/gpu=2"},
 			lendingArgs:   []string{"alpha:cpu=1;memory=1", "beta:example.com/gpu=2"},
-			wantResourceGroups: []v1beta1.ResourceGroup{
+			wantResourceGroups: []kueue.ResourceGroup{
 				{
 					CoveredResources: []corev1.ResourceName{"cpu", "memory"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("alpha").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource("cpu", "1", "1", "1").
 							Resource("memory", "1", "1", "1").
 							Obj(),
@@ -276,8 +276,8 @@ func TestParseResourceQuotas(t *testing.T) {
 				},
 				{
 					CoveredResources: []corev1.ResourceName{"example.com/gpu"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("beta").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("beta").
 							Resource("example.com/gpu", "2", "2", "2").
 							Obj(),
 					},
@@ -288,15 +288,15 @@ func TestParseResourceQuotas(t *testing.T) {
 			quotaArgs:     []string{"alpha:cpu=1;memory=1", "beta:example.com/gpu=2", "gamma:cpu=2;memory=2"},
 			borrowingArgs: []string{"alpha:cpu=1;memory=1", "beta:example.com/gpu=2", "gamma:cpu=2;memory=2"},
 			lendingArgs:   []string{"alpha:cpu=1;memory=1", "beta:example.com/gpu=2", "gamma:cpu=2;memory=2"},
-			wantResourceGroups: []v1beta1.ResourceGroup{
+			wantResourceGroups: []kueue.ResourceGroup{
 				{
 					CoveredResources: []corev1.ResourceName{"cpu", "memory"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("alpha").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource("cpu", "1", "1", "1").
 							Resource("memory", "1", "1", "1").
 							Obj(),
-						*utiltesting.MakeFlavorQuotas("gamma").
+						*utiltestingapi.MakeFlavorQuotas("gamma").
 							Resource("cpu", "2", "2", "2").
 							Resource("memory", "2", "2", "2").
 							Obj(),
@@ -304,8 +304,8 @@ func TestParseResourceQuotas(t *testing.T) {
 				},
 				{
 					CoveredResources: []corev1.ResourceName{"example.com/gpu"},
-					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("beta").
+					Flavors: []kueue.FlavorQuotas{
+						*utiltestingapi.MakeFlavorQuotas("beta").
 							Resource("example.com/gpu", "2", "2", "2").
 							Obj(),
 					},
diff --git a/cmd/kueuectl/app/create/create_localqueue_test.go b/cmd/kueuectl/app/create/create_localqueue_test.go
index 7bf02d629..f459d8790 100644
--- a/cmd/kueuectl/app/create/create_localqueue_test.go
+++ b/cmd/kueuectl/app/create/create_localqueue_test.go
@@ -22,13 +22,13 @@ import (
 	"github.com/google/go-cmp/cmp"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 )
 
 func TestCreateLocalQueue(t *testing.T) {
 	testCases := map[string]struct {
 		options  *LocalQueueOptions
-		expected *v1beta1.LocalQueue
+		expected *kueue.LocalQueue
 	}{
 		"success_create": {
 			options: &LocalQueueOptions{
@@ -36,10 +36,10 @@ func TestCreateLocalQueue(t *testing.T) {
 				Namespace:    "ns1",
 				ClusterQueue: "cq1",
 			},
-			expected: &v1beta1.LocalQueue{
+			expected: &kueue.LocalQueue{
 				TypeMeta:   metav1.TypeMeta{APIVersion: "kueue.x-k8s.io/v1beta1", Kind: "LocalQueue"},
 				ObjectMeta: metav1.ObjectMeta{Name: "lq1", Namespace: "ns1"},
-				Spec:       v1beta1.LocalQueueSpec{ClusterQueue: "cq1"},
+				Spec:       kueue.LocalQueueSpec{ClusterQueue: "cq1"},
 			},
 		},
 	}
diff --git a/cmd/kueuectl/app/create/create_resourceflavor_test.go b/cmd/kueuectl/app/create/create_resourceflavor_test.go
index 95f132fd7..8f1fd0b71 100644
--- a/cmd/kueuectl/app/create/create_resourceflavor_test.go
+++ b/cmd/kueuectl/app/create/create_resourceflavor_test.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/fake"
 	cmdtesting "sigs.k8s.io/kueue/cmd/kueuectl/app/testing"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
@@ -205,7 +205,7 @@ func TestResourceFlavorOptions_parseTolerations(t *testing.T) {
 func TestResourceFlavorOptions_createResourceFlavor(t *testing.T) {
 	testCases := map[string]struct {
 		options  *ResourceFlavorOptions
-		expected *v1beta1.ResourceFlavor
+		expected *kueue.ResourceFlavor
 	}{
 		"success create": {
 			options: &ResourceFlavorOptions{
@@ -213,10 +213,10 @@ func TestResourceFlavorOptions_createResourceFlavor(t *testing.T) {
 				NodeLabels: map[string]string{"key1": "value"},
 				NodeTaints: []corev1.Taint{{Key: "key1", Value: "value", Effect: corev1.TaintEffectNoSchedule}},
 			},
-			expected: &v1beta1.ResourceFlavor{
+			expected: &kueue.ResourceFlavor{
 				TypeMeta:   metav1.TypeMeta{APIVersion: "kueue.x-k8s.io/v1beta1", Kind: "ResourceFlavor"},
 				ObjectMeta: metav1.ObjectMeta{Name: "rf"},
-				Spec: v1beta1.ResourceFlavorSpec{
+				Spec: kueue.ResourceFlavorSpec{
 					NodeLabels: map[string]string{"key1": "value"},
 					NodeTaints: []corev1.Taint{{Key: "key1", Value: "value", Effect: corev1.TaintEffectNoSchedule}},
 				},
@@ -237,7 +237,7 @@ func TestResourceFlavorCmd(t *testing.T) {
 	testCases := map[string]struct {
 		rfName     string
 		args       []string
-		wantRf     *v1beta1.ResourceFlavor
+		wantRf     *kueue.ResourceFlavor
 		wantOut    string
 		wantOutErr string
 		wantErr    string
@@ -250,25 +250,25 @@ func TestResourceFlavorCmd(t *testing.T) {
 		"shouldn't create resource flavor with dry-run client": {
 			rfName:  "rf",
 			args:    []string{"--dry-run", "client"},
-			wantRf:  &v1beta1.ResourceFlavor{},
+			wantRf:  &kueue.ResourceFlavor{},
 			wantOut: "resourceflavor.kueue.x-k8s.io/rf created (client dry run)\n",
 		},
 		"should create resource flavor": {
 			rfName: "rf",
-			wantRf: &v1beta1.ResourceFlavor{
-				TypeMeta:   metav1.TypeMeta{APIVersion: v1beta1.SchemeGroupVersion.String(), Kind: "ResourceFlavor"},
+			wantRf: &kueue.ResourceFlavor{
+				TypeMeta:   metav1.TypeMeta{APIVersion: kueue.SchemeGroupVersion.String(), Kind: "ResourceFlavor"},
 				ObjectMeta: metav1.ObjectMeta{Name: "rf"},
-				Spec:       v1beta1.ResourceFlavorSpec{},
+				Spec:       kueue.ResourceFlavorSpec{},
 			},
 			wantOut: "resourceflavor.kueue.x-k8s.io/rf created\n",
 		},
 		"should create resource flavor with node labels": {
 			rfName: "rf",
 			args:   []string{"--node-labels", "kubernetes.io/arch=arm64,kubernetes.io/os=linux"},
-			wantRf: &v1beta1.ResourceFlavor{
-				TypeMeta:   metav1.TypeMeta{APIVersion: v1beta1.SchemeGroupVersion.String(), Kind: "ResourceFlavor"},
+			wantRf: &kueue.ResourceFlavor{
+				TypeMeta:   metav1.TypeMeta{APIVersion: kueue.SchemeGroupVersion.String(), Kind: "ResourceFlavor"},
 				ObjectMeta: metav1.ObjectMeta{Name: "rf"},
-				Spec: v1beta1.ResourceFlavorSpec{
+				Spec: kueue.ResourceFlavorSpec{
 					NodeLabels: map[string]string{
 						corev1.LabelArchStable: "arm64",
 						corev1.LabelOSStable:   "linux",
@@ -280,10 +280,10 @@ func TestResourceFlavorCmd(t *testing.T) {
 		"should create resource flavor with node taints": {
 			rfName: "rf",
 			args:   []string{"--node-taints", "key1=value:NoSchedule,key1=value:PreferNoSchedule,key2=value:NoSchedule,key3=value:NoSchedule"},
-			wantRf: &v1beta1.ResourceFlavor{
-				TypeMeta:   metav1.TypeMeta{APIVersion: v1beta1.SchemeGroupVersion.String(), Kind: "ResourceFlavor"},
+			wantRf: &kueue.ResourceFlavor{
+				TypeMeta:   metav1.TypeMeta{APIVersion: kueue.SchemeGroupVersion.String(), Kind: "ResourceFlavor"},
 				ObjectMeta: metav1.ObjectMeta{Name: "rf"},
-				Spec: v1beta1.ResourceFlavorSpec{
+				Spec: kueue.ResourceFlavorSpec{
 					NodeTaints: []corev1.Taint{
 						{Key: "key1", Value: "value", Effect: corev1.TaintEffectNoSchedule},
 						{Key: "key1", Value: "value", Effect: corev1.TaintEffectPreferNoSchedule},
@@ -302,10 +302,10 @@ func TestResourceFlavorCmd(t *testing.T) {
 		"should create resource flavor with toleration": {
 			rfName: "rf",
 			args:   []string{"--tolerations", "key1=value:NoSchedule,key2:NoSchedule"},
-			wantRf: &v1beta1.ResourceFlavor{
-				TypeMeta:   metav1.TypeMeta{APIVersion: v1beta1.SchemeGroupVersion.String(), Kind: "ResourceFlavor"},
+			wantRf: &kueue.ResourceFlavor{
+				TypeMeta:   metav1.TypeMeta{APIVersion: kueue.SchemeGroupVersion.String(), Kind: "ResourceFlavor"},
 				ObjectMeta: metav1.ObjectMeta{Name: "rf"},
-				Spec: v1beta1.ResourceFlavorSpec{
+				Spec: kueue.ResourceFlavorSpec{
 					Tolerations: []corev1.Toleration{
 						{Key: "key1", Value: "value", Effect: corev1.TaintEffectNoSchedule, Operator: corev1.TolerationOpEqual},
 						{Key: "key2", Effect: corev1.TaintEffectNoSchedule, Operator: corev1.TolerationOpExists},
diff --git a/cmd/kueuectl/app/delete/delete_workload_test.go b/cmd/kueuectl/app/delete/delete_workload_test.go
index 8a894effe..69e0cbd90 100644
--- a/cmd/kueuectl/app/delete/delete_workload_test.go
+++ b/cmd/kueuectl/app/delete/delete_workload_test.go
@@ -31,10 +31,11 @@ import (
 	k8sscheme "k8s.io/client-go/kubernetes/scheme"
 	kubetesting "k8s.io/client-go/testing"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/fake"
 	cmdtesting "sigs.k8s.io/kueue/cmd/kueuectl/app/testing"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestWorkloadCmd(t *testing.T) {
@@ -47,7 +48,7 @@ func TestWorkloadCmd(t *testing.T) {
 		workloads     []runtime.Object
 		jobs          []runtime.Object
 		gvk           schema.GroupVersionKind
-		wantWorkloads []v1beta1.Workload
+		wantWorkloads []kueue.Workload
 		wantJobList   runtime.Object
 		ignoreOut     bool
 		wantOut       string
@@ -61,14 +62,14 @@ func TestWorkloadCmd(t *testing.T) {
 		"shouldn't delete a workload and its corresponding job without confirmation": {
 			args: []string{"wl1"},
 			workloads: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
 			},
 			jobs: []runtime.Object{
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j1", Namespace: metav1.NamespaceDefault}},
 			},
 			gvk: schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"},
-			wantWorkloads: []v1beta1.Workload{
-				*utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+			wantWorkloads: []kueue.Workload{
+				*utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
 			},
 			wantJobList: &bactchv1.JobList{
 				TypeMeta: metav1.TypeMeta{Kind: "JobList", APIVersion: "batch/v1"},
@@ -87,16 +88,16 @@ Do you want to proceed (y/n)? Deletion is canceled
 		"should delete just a workload without confirmation because there is no associated job requiring it": {
 			args: []string{"wl2"},
 			workloads: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
 			},
 			jobs: []runtime.Object{
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j1", Namespace: metav1.NamespaceDefault}},
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j2", Namespace: metav1.NamespaceDefault}},
 			},
 			gvk: schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"},
-			wantWorkloads: []v1beta1.Workload{
-				*utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+			wantWorkloads: []kueue.Workload{
+				*utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
 			},
 			wantJobList: &bactchv1.JobList{
 				TypeMeta: metav1.TypeMeta{Kind: "JobList", APIVersion: "batch/v1"},
@@ -121,17 +122,17 @@ Do you want to proceed (y/n)? Deletion is canceled
 			args:  []string{"wl1"},
 			input: "y\n",
 			workloads: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
 			},
 			jobs: []runtime.Object{
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j1", Namespace: metav1.NamespaceDefault}},
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j2", Namespace: metav1.NamespaceDefault}},
 			},
 			gvk: schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"},
-			wantWorkloads: []v1beta1.Workload{
-				*utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
-				*utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
+			wantWorkloads: []kueue.Workload{
+				*utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+				*utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
 			},
 			wantJobList: &bactchv1.JobList{
 				TypeMeta: metav1.TypeMeta{Kind: "JobList", APIVersion: "batch/v1"},
@@ -150,17 +151,17 @@ Do you want to proceed (y/n)? jobs.batch/j1 deleted
 		"should delete jobs corresponding to the workload with yes flag": {
 			args: []string{"wl1", "--yes"},
 			workloads: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
 			},
 			jobs: []runtime.Object{
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j1", Namespace: metav1.NamespaceDefault}},
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j2", Namespace: metav1.NamespaceDefault}},
 			},
 			gvk: schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"},
-			wantWorkloads: []v1beta1.Workload{
-				*utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
-				*utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
+			wantWorkloads: []kueue.Workload{
+				*utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+				*utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
 			},
 			wantJobList: &bactchv1.JobList{
 				TypeMeta: metav1.TypeMeta{Kind: "JobList", APIVersion: "batch/v1"},
@@ -176,18 +177,18 @@ Do you want to proceed (y/n)? jobs.batch/j1 deleted
 		"should delete all jobs corresponding to the workloads and any workloads without corresponding jobs in default namespace": {
 			args: []string{"--all", "--yes"},
 			workloads: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
-				utiltesting.MakeWorkload("wl3", "test").Obj(),
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
+				utiltestingapi.MakeWorkload("wl3", "test").Obj(),
 			},
 			jobs: []runtime.Object{
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j1", Namespace: metav1.NamespaceDefault}},
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j2", Namespace: metav1.NamespaceDefault}},
 			},
 			gvk: schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"},
-			wantWorkloads: []v1beta1.Workload{
-				*utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
-				*utiltesting.MakeWorkload("wl3", "test").Obj(),
+			wantWorkloads: []kueue.Workload{
+				*utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+				*utiltestingapi.MakeWorkload("wl3", "test").Obj(),
 			},
 			wantJobList: &bactchv1.JobList{
 				TypeMeta: metav1.TypeMeta{Kind: "JobList", APIVersion: "batch/v1"},
@@ -204,17 +205,17 @@ Do you want to proceed (y/n)? jobs.batch/j1 deleted
 		"should delete all jobs corresponding to the workloads and any workloads without corresponding jobs in all namespaces": {
 			args: []string{"--all", "-y", "-A"},
 			workloads: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
-				utiltesting.MakeWorkload("wl3", "test").Obj(),
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).Obj(),
+				utiltestingapi.MakeWorkload("wl3", "test").Obj(),
 			},
 			jobs: []runtime.Object{
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j1", Namespace: metav1.NamespaceDefault}},
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j2", Namespace: metav1.NamespaceDefault}},
 			},
 			gvk: schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"},
-			wantWorkloads: []v1beta1.Workload{
-				*utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+			wantWorkloads: []kueue.Workload{
+				*utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
 			},
 			wantJobList: &bactchv1.JobList{
 				TypeMeta: metav1.TypeMeta{Kind: "JobList", APIVersion: "batch/v1"},
@@ -231,14 +232,14 @@ Do you want to proceed (y/n)? jobs.batch/j1 deleted
 		"shouldn't delete the jobs corresponding to the workloads jobs when using client dry-run flag": {
 			args: []string{"wl1", "--dry-run", "client"},
 			workloads: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
 			},
 			jobs: []runtime.Object{
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j1", Namespace: metav1.NamespaceDefault}},
 			},
 			gvk: schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"},
-			wantWorkloads: []v1beta1.Workload{
-				*utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+			wantWorkloads: []kueue.Workload{
+				*utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
 			},
 			wantJobList: &bactchv1.JobList{
 				TypeMeta: metav1.TypeMeta{Kind: "JobList", APIVersion: "batch/v1"},
@@ -254,14 +255,14 @@ Do you want to proceed (y/n)? jobs.batch/j1 deleted
 		"shouldn't delete the jobs corresponding to the workloads jobs when using server dry-run flag": {
 			args: []string{"wl1", "--dry-run", "server"},
 			workloads: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
 			},
 			jobs: []runtime.Object{
 				&bactchv1.Job{ObjectMeta: metav1.ObjectMeta{Name: "j1", Namespace: metav1.NamespaceDefault}},
 			},
 			gvk: schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"},
-			wantWorkloads: []v1beta1.Workload{
-				*utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
+			wantWorkloads: []kueue.Workload{
+				*utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).OwnerReference(jobGVK, "j1", "").Obj(),
 			},
 			wantJobList: &bactchv1.JobList{
 				TypeMeta: metav1.TypeMeta{Kind: "JobList", APIVersion: "batch/v1"},
diff --git a/cmd/kueuectl/app/list/list_clusterqueue_test.go b/cmd/kueuectl/app/list/list_clusterqueue_test.go
index 53c18504a..20503f3f8 100644
--- a/cmd/kueuectl/app/list/list_clusterqueue_test.go
+++ b/cmd/kueuectl/app/list/list_clusterqueue_test.go
@@ -27,10 +27,10 @@ import (
 	"k8s.io/cli-runtime/pkg/genericiooptions"
 	testingclock "k8s.io/utils/clock/testing"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/fake"
 	cmdtesting "sigs.k8s.io/kueue/cmd/kueuectl/app/testing"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestClusterQueueRun(t *testing.T) {
@@ -47,19 +47,19 @@ func TestClusterQueueRun(t *testing.T) {
 		"should print active cluster queue list": {
 			args: []string{"--active", "true"},
 			objs: []runtime.Object{
-				utiltesting.MakeClusterQueue("cq1").
+				utiltestingapi.MakeClusterQueue("cq1").
 					Creation(testStartTime.Add(-1*time.Hour).Truncate(time.Second)).
 					Cohort("cohort1").
 					PendingWorkloads(1).
 					AdmittedWorkloads(2).
-					Condition(v1beta1.ClusterQueueActive, metav1.ConditionTrue, "", "").
+					Condition(kueue.ClusterQueueActive, metav1.ConditionTrue, "", "").
 					Obj(),
-				utiltesting.MakeClusterQueue("cq2").
+				utiltestingapi.MakeClusterQueue("cq2").
 					Creation(testStartTime.Add(-2*time.Hour).Truncate(time.Second)).
 					Cohort("cohort2").
 					PendingWorkloads(3).
 					AdmittedWorkloads(4).
-					Condition(v1beta1.ClusterQueueActive, metav1.ConditionFalse, "", "").
+					Condition(kueue.ClusterQueueActive, metav1.ConditionFalse, "", "").
 					Obj(),
 			},
 			wantOut: `NAME   COHORT    PENDING WORKLOADS   ADMITTED WORKLOADS   ACTIVE   AGE
@@ -69,19 +69,19 @@ cq1    cohort1   1                   2                    true     60m
 		"should print inactive cluster queue list": {
 			args: []string{"--active", "false"},
 			objs: []runtime.Object{
-				utiltesting.MakeClusterQueue("cq1").
+				utiltestingapi.MakeClusterQueue("cq1").
 					Creation(testStartTime.Add(-1*time.Hour).Truncate(time.Second)).
 					Cohort("cohort1").
 					PendingWorkloads(1).
 					AdmittedWorkloads(2).
-					Condition(v1beta1.ClusterQueueActive, metav1.ConditionTrue, "", "").
+					Condition(kueue.ClusterQueueActive, metav1.ConditionTrue, "", "").
 					Obj(),
-				utiltesting.MakeClusterQueue("cq2").
+				utiltestingapi.MakeClusterQueue("cq2").
 					Creation(testStartTime.Add(-2*time.Hour).Truncate(time.Second)).
 					Cohort("cohort2").
 					PendingWorkloads(3).
 					AdmittedWorkloads(4).
-					Condition(v1beta1.ClusterQueueActive, metav1.ConditionFalse, "", "").
+					Condition(kueue.ClusterQueueActive, metav1.ConditionFalse, "", "").
 					Obj(),
 			},
 			wantOut: `NAME   COHORT    PENDING WORKLOADS   ADMITTED WORKLOADS   ACTIVE   AGE
@@ -91,20 +91,20 @@ cq2    cohort2   3                   4                    false    120m
 		"should print cluster queue list with label selector": {
 			args: []string{"--selector", "key=value1"},
 			objs: []runtime.Object{
-				utiltesting.MakeClusterQueue("cq1").
+				utiltestingapi.MakeClusterQueue("cq1").
 					Creation(testStartTime.Add(-1*time.Hour).Truncate(time.Second)).
 					Cohort("cohort1").
 					PendingWorkloads(1).
 					AdmittedWorkloads(2).
-					Condition(v1beta1.ClusterQueueActive, metav1.ConditionTrue, "", "").
+					Condition(kueue.ClusterQueueActive, metav1.ConditionTrue, "", "").
 					Label("key", "value1").
 					Obj(),
-				utiltesting.MakeClusterQueue("cq2").
+				utiltestingapi.MakeClusterQueue("cq2").
 					Creation(testStartTime.Add(-2*time.Hour).Truncate(time.Second)).
 					Cohort("cohort2").
 					PendingWorkloads(3).
 					AdmittedWorkloads(4).
-					Condition(v1beta1.ClusterQueueActive, metav1.ConditionFalse, "", "").
+					Condition(kueue.ClusterQueueActive, metav1.ConditionFalse, "", "").
 					Label("key", "value2").
 					Obj(),
 			},
@@ -115,20 +115,20 @@ cq1    cohort1   1                   2                    true     60m
 		"should print cluster queue list with label selector (short flag)": {
 			args: []string{"-l", "key=value1"},
 			objs: []runtime.Object{
-				utiltesting.MakeClusterQueue("cq1").
+				utiltestingapi.MakeClusterQueue("cq1").
 					Creation(testStartTime.Add(-1*time.Hour).Truncate(time.Second)).
 					Cohort("cohort1").
 					PendingWorkloads(1).
 					AdmittedWorkloads(2).
-					Condition(v1beta1.ClusterQueueActive, metav1.ConditionTrue, "", "").
+					Condition(kueue.ClusterQueueActive, metav1.ConditionTrue, "", "").
 					Label("key", "value1").
 					Obj(),
-				utiltesting.MakeClusterQueue("cq2").
+				utiltestingapi.MakeClusterQueue("cq2").
 					Creation(testStartTime.Add(-2*time.Hour).Truncate(time.Second)).
 					Cohort("cohort2").
 					PendingWorkloads(3).
 					AdmittedWorkloads(4).
-					Condition(v1beta1.ClusterQueueActive, metav1.ConditionFalse, "", "").
+					Condition(kueue.ClusterQueueActive, metav1.ConditionFalse, "", "").
 					Label("key", "value2").
 					Obj(),
 			},
diff --git a/cmd/kueuectl/app/list/list_localqueue_printer_test.go b/cmd/kueuectl/app/list/list_localqueue_printer_test.go
index 9471e4286..b11dfe080 100644
--- a/cmd/kueuectl/app/list/list_localqueue_printer_test.go
+++ b/cmd/kueuectl/app/list/list_localqueue_printer_test.go
@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	testingclock "k8s.io/utils/clock/testing"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 )
 
 func TestLocalQueuePrint(t *testing.T) {
@@ -33,21 +33,21 @@ func TestLocalQueuePrint(t *testing.T) {
 
 	testCases := map[string]struct {
 		options *LocalQueueOptions
-		in      *v1beta1.LocalQueueList
+		in      *kueue.LocalQueueList
 		out     []metav1.TableRow
 	}{
 		"should print local queue list": {
 			options: &LocalQueueOptions{},
-			in: &v1beta1.LocalQueueList{
-				Items: []v1beta1.LocalQueue{
+			in: &kueue.LocalQueueList{
+				Items: []kueue.LocalQueue{
 					{
 						TypeMeta: metav1.TypeMeta{},
 						ObjectMeta: metav1.ObjectMeta{
 							Name:              "lq",
 							CreationTimestamp: metav1.NewTime(testStartTime.Add(-time.Hour).Truncate(time.Second)),
 						},
-						Spec: v1beta1.LocalQueueSpec{ClusterQueue: "cq1"},
-						Status: v1beta1.LocalQueueStatus{
+						Spec: kueue.LocalQueueSpec{ClusterQueue: "cq1"},
+						Status: kueue.LocalQueueStatus{
 							PendingWorkloads:  1,
 							AdmittedWorkloads: 2,
 						},
@@ -56,16 +56,16 @@ func TestLocalQueuePrint(t *testing.T) {
 			},
 			out: []metav1.TableRow{
 				{
-					Cells: []any{"lq", v1beta1.ClusterQueueReference("cq1"), int32(1), int32(2), "60m"},
+					Cells: []any{"lq", kueue.ClusterQueueReference("cq1"), int32(1), int32(2), "60m"},
 					Object: runtime.RawExtension{
-						Object: &v1beta1.LocalQueue{
+						Object: &kueue.LocalQueue{
 							TypeMeta: metav1.TypeMeta{},
 							ObjectMeta: metav1.ObjectMeta{
 								Name:              "lq",
 								CreationTimestamp: metav1.NewTime(testStartTime.Add(-time.Hour).Truncate(time.Second)),
 							},
-							Spec: v1beta1.LocalQueueSpec{ClusterQueue: "cq1"},
-							Status: v1beta1.LocalQueueStatus{
+							Spec: kueue.LocalQueueSpec{ClusterQueue: "cq1"},
+							Status: kueue.LocalQueueStatus{
 								PendingWorkloads:  1,
 								AdmittedWorkloads: 2,
 							},
diff --git a/cmd/kueuectl/app/list/list_localqueue_test.go b/cmd/kueuectl/app/list/list_localqueue_test.go
index ba8414bb3..50df78362 100644
--- a/cmd/kueuectl/app/list/list_localqueue_test.go
+++ b/cmd/kueuectl/app/list/list_localqueue_test.go
@@ -28,37 +28,37 @@ import (
 	"k8s.io/cli-runtime/pkg/genericiooptions"
 	testingclock "k8s.io/utils/clock/testing"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/fake"
 	cmdtesting "sigs.k8s.io/kueue/cmd/kueuectl/app/testing"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestLocalQueueFilter(t *testing.T) {
 	testCases := map[string]struct {
 		options *LocalQueueOptions
-		in      *v1beta1.LocalQueueList
-		out     *v1beta1.LocalQueueList
+		in      *kueue.LocalQueueList
+		out     *kueue.LocalQueueList
 	}{
 		"shouldn't filter": {
 			options: &LocalQueueOptions{},
-			in: &v1beta1.LocalQueueList{
-				Items: []v1beta1.LocalQueue{
+			in: &kueue.LocalQueueList{
+				Items: []kueue.LocalQueue{
 					{
-						Spec: v1beta1.LocalQueueSpec{ClusterQueue: "cq1"},
+						Spec: kueue.LocalQueueSpec{ClusterQueue: "cq1"},
 					},
 					{
-						Spec: v1beta1.LocalQueueSpec{ClusterQueue: "cq2"},
+						Spec: kueue.LocalQueueSpec{ClusterQueue: "cq2"},
 					},
 				},
 			},
-			out: &v1beta1.LocalQueueList{
-				Items: []v1beta1.LocalQueue{
+			out: &kueue.LocalQueueList{
+				Items: []kueue.LocalQueue{
 					{
-						Spec: v1beta1.LocalQueueSpec{ClusterQueue: "cq1"},
+						Spec: kueue.LocalQueueSpec{ClusterQueue: "cq1"},
 					},
 					{
-						Spec: v1beta1.LocalQueueSpec{ClusterQueue: "cq2"},
+						Spec: kueue.LocalQueueSpec{ClusterQueue: "cq2"},
 					},
 				},
 			},
@@ -67,20 +67,20 @@ func TestLocalQueueFilter(t *testing.T) {
 			options: &LocalQueueOptions{
 				ClusterQueueFilter: "cq1",
 			},
-			in: &v1beta1.LocalQueueList{
-				Items: []v1beta1.LocalQueue{
+			in: &kueue.LocalQueueList{
+				Items: []kueue.LocalQueue{
 					{
-						Spec: v1beta1.LocalQueueSpec{ClusterQueue: "cq1"},
+						Spec: kueue.LocalQueueSpec{ClusterQueue: "cq1"},
 					},
 					{
-						Spec: v1beta1.LocalQueueSpec{ClusterQueue: "cq2"},
+						Spec: kueue.LocalQueueSpec{ClusterQueue: "cq2"},
 					},
 				},
 			},
-			out: &v1beta1.LocalQueueList{
-				Items: []v1beta1.LocalQueue{
+			out: &kueue.LocalQueueList{
+				Items: []kueue.LocalQueue{
 					{
-						Spec: v1beta1.LocalQueueSpec{ClusterQueue: "cq1"},
+						Spec: kueue.LocalQueueSpec{ClusterQueue: "cq1"},
 					},
 				},
 			},
@@ -110,13 +110,13 @@ func TestLocalQueueCmd(t *testing.T) {
 		"should print local queue list with namespace filter": {
 			ns: "ns1",
 			objs: []runtime.Object{
-				utiltesting.MakeLocalQueue("lq1", "ns1").
+				utiltestingapi.MakeLocalQueue("lq1", "ns1").
 					ClusterQueue("cq1").
 					PendingWorkloads(1).
 					AdmittedWorkloads(1).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeLocalQueue("lq2", "ns2").
+				utiltestingapi.MakeLocalQueue("lq2", "ns2").
 					ClusterQueue("cq2").
 					PendingWorkloads(2).
 					AdmittedWorkloads(2).
@@ -130,13 +130,13 @@ lq1    cq1            1                   1                    60m
 		"should print local queue list with clusterqueue filter": {
 			args: []string{"--clusterqueue", "cq1"},
 			objs: []runtime.Object{
-				utiltesting.MakeLocalQueue("lq1", metav1.NamespaceDefault).
+				utiltestingapi.MakeLocalQueue("lq1", metav1.NamespaceDefault).
 					ClusterQueue("cq1").
 					PendingWorkloads(1).
 					AdmittedWorkloads(1).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeLocalQueue("lq2", metav1.NamespaceDefault).
+				utiltestingapi.MakeLocalQueue("lq2", metav1.NamespaceDefault).
 					ClusterQueue("cq2").
 					PendingWorkloads(2).
 					AdmittedWorkloads(2).
@@ -150,14 +150,14 @@ lq1    cq1            1                   1                    60m
 		"should print local queue list with label selector filter": {
 			args: []string{"--selector", "key=value1"},
 			objs: []runtime.Object{
-				utiltesting.MakeLocalQueue("lq1", metav1.NamespaceDefault).
+				utiltestingapi.MakeLocalQueue("lq1", metav1.NamespaceDefault).
 					ClusterQueue("cq1").
 					PendingWorkloads(1).
 					AdmittedWorkloads(1).
 					Label("key", "value1").
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeLocalQueue("lq2", metav1.NamespaceDefault).
+				utiltestingapi.MakeLocalQueue("lq2", metav1.NamespaceDefault).
 					ClusterQueue("cq2").
 					PendingWorkloads(2).
 					AdmittedWorkloads(2).
@@ -172,14 +172,14 @@ lq1    cq1            1                   1                    60m
 		"should print local queue list with label selector filter (short flag)": {
 			args: []string{"-l", "foo=bar"},
 			objs: []runtime.Object{
-				utiltesting.MakeLocalQueue("lq1", metav1.NamespaceDefault).
+				utiltestingapi.MakeLocalQueue("lq1", metav1.NamespaceDefault).
 					ClusterQueue("cq1").
 					PendingWorkloads(1).
 					AdmittedWorkloads(1).
 					Label("foo", "bar").
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeLocalQueue("lq2", metav1.NamespaceDefault).
+				utiltestingapi.MakeLocalQueue("lq2", metav1.NamespaceDefault).
 					ClusterQueue("cq2").
 					PendingWorkloads(2).
 					AdmittedWorkloads(2).
diff --git a/cmd/kueuectl/app/list/list_resourceflavor_printer_test.go b/cmd/kueuectl/app/list/list_resourceflavor_printer_test.go
index ccbd577ad..54ff1a2e7 100644
--- a/cmd/kueuectl/app/list/list_resourceflavor_printer_test.go
+++ b/cmd/kueuectl/app/list/list_resourceflavor_printer_test.go
@@ -25,8 +25,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	testingclock "k8s.io/utils/clock/testing"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestResourceFlavorPrint(t *testing.T) {
@@ -34,14 +34,14 @@ func TestResourceFlavorPrint(t *testing.T) {
 
 	testCases := map[string]struct {
 		options *ResourceFlavorOptions
-		in      *v1beta1.ResourceFlavorList
+		in      *kueue.ResourceFlavorList
 		out     []metav1.TableRow
 	}{
 		"should print resource flavor list": {
 			options: &ResourceFlavorOptions{},
-			in: &v1beta1.ResourceFlavorList{
-				Items: []v1beta1.ResourceFlavor{
-					*utiltesting.MakeResourceFlavor("rf").
+			in: &kueue.ResourceFlavorList{
+				Items: []kueue.ResourceFlavor{
+					*utiltestingapi.MakeResourceFlavor("rf").
 						Creation(testStartTime.Add(-time.Hour).Truncate(time.Second)).
 						NodeLabel("key1", "value").
 						NodeLabel("key2", "value").
@@ -52,7 +52,7 @@ func TestResourceFlavorPrint(t *testing.T) {
 				{
 					Cells: []any{"rf", "key1=value, key2=value", "60m"},
 					Object: runtime.RawExtension{
-						Object: utiltesting.MakeResourceFlavor("rf").
+						Object: utiltestingapi.MakeResourceFlavor("rf").
 							Creation(testStartTime.Add(-time.Hour).Truncate(time.Second)).
 							NodeLabel("key1", "value").
 							NodeLabel("key2", "value").
diff --git a/cmd/kueuectl/app/list/list_resourceflavor_test.go b/cmd/kueuectl/app/list/list_resourceflavor_test.go
index 80571a147..0eb8b8d38 100644
--- a/cmd/kueuectl/app/list/list_resourceflavor_test.go
+++ b/cmd/kueuectl/app/list/list_resourceflavor_test.go
@@ -28,7 +28,7 @@ import (
 
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/fake"
 	cmdtesting "sigs.k8s.io/kueue/cmd/kueuectl/app/testing"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestResourceFlavorCmd(t *testing.T) {
@@ -43,10 +43,10 @@ func TestResourceFlavorCmd(t *testing.T) {
 	}{
 		"should print resource flavor list": {
 			objs: []runtime.Object{
-				utiltesting.MakeResourceFlavor("rf1").
+				utiltestingapi.MakeResourceFlavor("rf1").
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeResourceFlavor("rf2").
+				utiltestingapi.MakeResourceFlavor("rf2").
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
@@ -57,12 +57,12 @@ rf2                  120m
 		},
 		"should print resource flavor list with node labels": {
 			objs: []runtime.Object{
-				utiltesting.MakeResourceFlavor("rf1").
+				utiltestingapi.MakeResourceFlavor("rf1").
 					Creation(testStartTime.Add(-1*time.Hour).Truncate(time.Second)).
 					NodeLabel("key1", "value1").
 					NodeLabel("key2", "value2").
 					Obj(),
-				utiltesting.MakeResourceFlavor("rf2").
+				utiltestingapi.MakeResourceFlavor("rf2").
 					Creation(testStartTime.Add(-2*time.Hour).Truncate(time.Second)).
 					NodeLabel("key3", "value3").
 					NodeLabel("key4", "value4").
@@ -76,11 +76,11 @@ rf2    key3=value3, key4=value4   120m
 		"should print resource flavor list with label selector filter": {
 			args: []string{"--selector", "key=value1"},
 			objs: []runtime.Object{
-				utiltesting.MakeResourceFlavor("rf1").
+				utiltestingapi.MakeResourceFlavor("rf1").
 					Label("key", "value1").
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeResourceFlavor("rf2").
+				utiltestingapi.MakeResourceFlavor("rf2").
 					Creation(testStartTime.Add(-2*time.Hour).Truncate(time.Second)).
 					Label("key", "value2").
 					Obj(),
@@ -92,11 +92,11 @@ rf1                  60m
 		"should print resource flavor list with label selector filter (short flag)": {
 			args: []string{"-l", "foo=bar"},
 			objs: []runtime.Object{
-				utiltesting.MakeResourceFlavor("rf1").
+				utiltestingapi.MakeResourceFlavor("rf1").
 					Label("foo", "bar").
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeResourceFlavor("rf2").
+				utiltestingapi.MakeResourceFlavor("rf2").
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
diff --git a/cmd/kueuectl/app/list/list_test.go b/cmd/kueuectl/app/list/list_test.go
index 44b6e97f9..5832395b1 100644
--- a/cmd/kueuectl/app/list/list_test.go
+++ b/cmd/kueuectl/app/list/list_test.go
@@ -29,10 +29,10 @@ import (
 	"k8s.io/cli-runtime/pkg/genericiooptions"
 	testingclock "k8s.io/utils/clock/testing"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/fake"
 	cmdtesting "sigs.k8s.io/kueue/cmd/kueuectl/app/testing"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestListCmd(t *testing.T) {
@@ -49,13 +49,13 @@ func TestListCmd(t *testing.T) {
 		"should print local queue list with all namespaces": {
 			args: []string{"localqueue", "--all-namespaces"},
 			objs: []runtime.Object{
-				utiltesting.MakeLocalQueue("lq1", "ns1").
+				utiltestingapi.MakeLocalQueue("lq1", "ns1").
 					ClusterQueue("cq1").
 					PendingWorkloads(1).
 					AdmittedWorkloads(1).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeLocalQueue("lq2", "ns2").
+				utiltestingapi.MakeLocalQueue("lq2", "ns2").
 					ClusterQueue("cq2").
 					PendingWorkloads(2).
 					AdmittedWorkloads(2).
@@ -70,13 +70,13 @@ ns2         lq2    cq2            2                   2                    120m
 		"should print local queue list with all namespaces (short command and flag)": {
 			args: []string{"lq", "-A"},
 			objs: []runtime.Object{
-				utiltesting.MakeLocalQueue("lq1", "ns1").
+				utiltestingapi.MakeLocalQueue("lq1", "ns1").
 					ClusterQueue("cq1").
 					PendingWorkloads(1).
 					AdmittedWorkloads(1).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeLocalQueue("lq2", "ns2").
+				utiltestingapi.MakeLocalQueue("lq2", "ns2").
 					ClusterQueue("cq2").
 					PendingWorkloads(2).
 					AdmittedWorkloads(2).
@@ -91,13 +91,13 @@ ns2         lq2    cq2            2                   2                    120m
 		"should print cluster queue list": {
 			args: []string{"clusterqueue"},
 			objs: []runtime.Object{
-				utiltesting.MakeClusterQueue("cq1").
-					Condition(v1beta1.ClusterQueueActive, metav1.ConditionTrue, "", "").
+				utiltestingapi.MakeClusterQueue("cq1").
+					Condition(kueue.ClusterQueueActive, metav1.ConditionTrue, "", "").
 					Cohort("cohort1").
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeClusterQueue("cq2").
-					Condition(v1beta1.ClusterQueueActive, metav1.ConditionFalse, "", "").
+				utiltestingapi.MakeClusterQueue("cq2").
+					Condition(kueue.ClusterQueueActive, metav1.ConditionFalse, "", "").
 					Cohort("cohort2").
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
@@ -110,18 +110,18 @@ cq2    cohort2   0                   0                    false    120m
 		"should print workload list with all namespaces": {
 			args: []string{"workload", "--all-namespaces"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", "ns1").
+				utiltestingapi.MakeWorkload("wl1", "ns1").
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", "ns2").
+				utiltestingapi.MakeWorkload("wl2", "ns2").
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
@@ -133,18 +133,18 @@ ns2         wl2               j2         lq2          cq2            PENDING
 		"should print workload list with all namespaces (short command and flag)": {
 			args: []string{"wl", "-A"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", "ns1").
+				utiltestingapi.MakeWorkload("wl1", "ns1").
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", "ns2").
+				utiltestingapi.MakeWorkload("wl2", "ns2").
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
diff --git a/cmd/kueuectl/app/list/list_workload_test.go b/cmd/kueuectl/app/list/list_workload_test.go
index 488884f14..332ee656d 100644
--- a/cmd/kueuectl/app/list/list_workload_test.go
+++ b/cmd/kueuectl/app/list/list_workload_test.go
@@ -48,7 +48,7 @@ import (
 	"sigs.k8s.io/kueue/client-go/clientset/versioned/fake"
 	cmdtesting "sigs.k8s.io/kueue/cmd/kueuectl/app/testing"
 	"sigs.k8s.io/kueue/pkg/controller/constants"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 )
 
@@ -70,18 +70,18 @@ func TestWorkloadCmd(t *testing.T) {
 		"should print workload list with namespace filter": {
 			ns: "ns1",
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", "ns1").
+				utiltestingapi.MakeWorkload("wl1", "ns1").
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", "ns2").
+				utiltestingapi.MakeWorkload("wl2", "ns2").
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
@@ -92,18 +92,18 @@ wl1               j1         lq1          cq1            PENDING
 		"should print workload list with localqueue filter": {
 			args: []string{"--localqueue", "lq1"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
@@ -114,18 +114,18 @@ wl1               j1         lq1          cq1            PENDING
 		"should print workload list with localqueue filter (short flag)": {
 			args: []string{"-q", "lq1"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
@@ -136,18 +136,18 @@ wl1               j1         lq1          cq1            PENDING
 		"should print workload list with clusterqueue filter": {
 			args: []string{"--clusterqueue", "cq1"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
@@ -158,18 +158,18 @@ wl1               j1         lq1          cq1            PENDING
 		"should print workload list with clusterqueue filter (short flag)": {
 			args: []string{"-c", "cq1"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
@@ -180,18 +180,18 @@ wl1               j1         lq1          cq1            PENDING
 		"should print workload list with all status flag": {
 			args: []string{"--status", "all"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -201,11 +201,11 @@ wl1               j1         lq1          cq1            PENDING
 						},
 					}...).
 					Obj(),
-				utiltesting.MakeWorkload("wl3", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl3", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j3", "test-uid").
 					Queue("lq3").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq3").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq3").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -215,11 +215,11 @@ wl1               j1         lq1          cq1            PENDING
 						},
 					}...).
 					Obj(),
-				utiltesting.MakeWorkload("wl4", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl4", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j4", "test-uid").
 					Queue("lq4").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq4").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq4").Obj()).
 					Creation(testStartTime.Add(-3 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -234,11 +234,11 @@ wl1               j1         lq1          cq1            PENDING
 						},
 					}...).
 					Obj(),
-				utiltesting.MakeWorkload("wl5", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl5", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j5", "test-uid").
 					Queue("lq5").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq5").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq5").Obj()).
 					Creation(testStartTime.Add(-3 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -265,18 +265,18 @@ wl5               j5         lq5          cq5            ADMITTED
 		"should print workload list with only admitted and finished status flags": {
 			args: []string{"--status", "admitted", "--status", "finished"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -286,11 +286,11 @@ wl5               j5         lq5          cq5            ADMITTED
 						},
 					}...).
 					Obj(),
-				utiltesting.MakeWorkload("wl3", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl3", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j3", "test-uid").
 					Queue("lq3").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq3").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq3").Obj()).
 					Creation(testStartTime.Add(-3 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -314,18 +314,18 @@ wl3               j3         lq3          cq3            FINISHED
 		"should print workload list with only pending filter": {
 			args: []string{"--status", "pending"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -342,11 +342,11 @@ wl1               j1         lq1          cq1            PENDING
 		"should print workload list with only quotareserved filter": {
 			args: []string{"--status", "quotareserved"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -355,11 +355,11 @@ wl1               j1         lq1          cq1            PENDING
 						},
 					}...).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -376,11 +376,11 @@ wl1               j1         lq1          cq1            QUOTARESERVED
 		"should print workload list with only admitted filter": {
 			args: []string{"--status", "admitted"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -390,11 +390,11 @@ wl1               j1         lq1          cq1            QUOTARESERVED
 						},
 					}...).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -412,11 +412,11 @@ wl1               j1         lq1          cq1            ADMITTED
 		"should print workload list with only finished status filter": {
 			args: []string{"--status", "finished"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -431,11 +431,11 @@ wl1               j1         lq1          cq1            ADMITTED
 						},
 					}...).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Conditions([]metav1.Condition{
 						{
@@ -458,19 +458,19 @@ wl1               j1         lq1          cq1            FINISHED
 		"should print workload list with label selector filter": {
 			args: []string{"--selector", "key=value1"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1*time.Hour).Truncate(time.Second)).
 					Label("key", "value1").
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2*time.Hour).Truncate(time.Second)).
 					Label("key", "value2").
 					Obj(),
@@ -482,19 +482,19 @@ wl1               j1         lq1          cq1            PENDING
 		"should print workload list with label selector filter (short flag)": {
 			args: []string{"-l", "key=value1"},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1*time.Hour).Truncate(time.Second)).
 					Label("key", "value1").
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2*time.Hour).Truncate(time.Second)).
 					Label("key", "value2").
 					Obj(),
@@ -536,25 +536,25 @@ wl1               j1         lq1          cq1            PENDING
 				},
 			},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl3", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl3", metav1.NamespaceDefault).
 					OwnerReference(kftraining.SchemeGroupVersion.WithKind(kftraining.PyTorchJobKind), "j3", "test-uid").
 					Queue("lq3").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq3").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq3").Obj()).
 					Creation(testStartTime.Add(-3 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
@@ -579,12 +579,12 @@ wl3    pytorchjob.kubeflow....   j3         lq3          cq3            PENDING
 				},
 			},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					Label(constants.JobUIDLabel, "job-test-uid").
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job-test", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadQuotaReserved,
 						Status: metav1.ConditionFalse,
@@ -592,11 +592,11 @@ wl3    pytorchjob.kubeflow....   j3         lq3          cq3            PENDING
 					}).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(kftraining.SchemeGroupVersion.WithKind(kftraining.PyTorchJobKind), "job-test", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadQuotaReserved,
 						Status: metav1.ConditionFalse,
@@ -645,12 +645,12 @@ wl1    job.batch   job-test   lq1          cq1            PENDING
 				},
 			},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					Label(constants.JobUIDLabel, "job-test-uid").
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job-test", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadQuotaReserved,
 						Status: metav1.ConditionFalse,
@@ -658,11 +658,11 @@ wl1    job.batch   job-test   lq1          cq1            PENDING
 					}).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod-test-1", "pod-test-uid-1").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadQuotaReserved,
 						Status: metav1.ConditionFalse,
@@ -708,12 +708,12 @@ wl2    pod        pod-test-1   lq2          cq2            PENDING
 				},
 			},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					Label(constants.JobUIDLabel, "job-test-uid-1").
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "job-test", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadQuotaReserved,
 						Status: metav1.ConditionFalse,
@@ -721,12 +721,12 @@ wl2    pod        pod-test-1   lq2          cq2            PENDING
 					}).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					Label(constants.JobUIDLabel, "job-test-uid-2").
 					OwnerReference(kftraining.SchemeGroupVersion.WithKind(kftraining.PyTorchJobKind), "job-test", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadQuotaReserved,
 						Status: metav1.ConditionFalse,
@@ -776,12 +776,12 @@ wl1    rayjob.ray.io   job-test   lq1          cq1            PENDING
 				},
 			},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					Label(constants.JobUIDLabel, "job-test-uid-1").
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "job-test", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadQuotaReserved,
 						Status: metav1.ConditionFalse,
@@ -789,12 +789,12 @@ wl1    rayjob.ray.io   job-test   lq1          cq1            PENDING
 					}).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					Label(constants.JobUIDLabel, "job-test-uid-2").
 					OwnerReference(kftraining.SchemeGroupVersion.WithKind(kftraining.PyTorchJobKind), "job-test", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadQuotaReserved,
 						Status: metav1.ConditionFalse,
@@ -843,18 +843,18 @@ wl1    rayjob.ray.io   job-test   lq1          cq1            PENDING
 				},
 			},
 			objs: []runtime.Object{
-				utiltesting.MakeWorkload("wl1", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl1", metav1.NamespaceDefault).
 					OwnerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "j1", "test-uid").
 					Queue("lq1").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq1").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq1").Obj()).
 					Creation(testStartTime.Add(-1 * time.Hour).Truncate(time.Second)).
 					Obj(),
-				utiltesting.MakeWorkload("wl2", metav1.NamespaceDefault).
+				utiltestingapi.MakeWorkload("wl2", metav1.NamespaceDefault).
 					OwnerReference(rayv1.GroupVersion.WithKind("RayJob"), "j2", "test-uid").
 					Queue("lq2").
 					Active(true).
-					Admission(utiltesting.MakeAdmission("cq2").Obj()).
+					Admission(utiltestingapi.MakeAdmission("cq2").Obj()).
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
diff --git a/pkg/cache/queue/cluster_queue_test.go b/pkg/cache/queue/cluster_queue_test.go
index 85293b782..bc93ef9bf 100644
--- a/pkg/cache/queue/cluster_queue_test.go
+++ b/pkg/cache/queue/cluster_queue_test.go
@@ -34,6 +34,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
 
@@ -64,10 +65,10 @@ func Test_PushOrUpdate(t *testing.T) {
 		cmpopts.EquateEmpty(),
 		cmpopts.IgnoreFields(metav1.Condition{}, "LastTransitionTime"),
 	}
-	wlBase := utiltesting.MakeWorkload("workload-1", defaultNamespace).Clone()
+	wlBase := utiltestingapi.MakeWorkload("workload-1", defaultNamespace).Clone()
 
 	cases := map[string]struct {
-		workload                  *utiltesting.WorkloadWrapper
+		workload                  *utiltestingapi.WorkloadWrapper
 		wantWorkload              *workload.Info
 		wantInAdmissibleWorkloads map[workload.Reference]*workload.Info
 	}{
@@ -188,8 +189,8 @@ func Test_Pop(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	now := time.Now()
 	cq := newClusterQueueImpl(ctx, nil, defaultOrdering, testingclock.NewFakeClock(now), nil, false, nil)
-	wl1 := workload.NewInfo(utiltesting.MakeWorkload("workload-1", defaultNamespace).Creation(now).Obj())
-	wl2 := workload.NewInfo(utiltesting.MakeWorkload("workload-2", defaultNamespace).Creation(now.Add(time.Second)).Obj())
+	wl1 := workload.NewInfo(utiltestingapi.MakeWorkload("workload-1", defaultNamespace).Creation(now).Obj())
+	wl2 := workload.NewInfo(utiltestingapi.MakeWorkload("workload-2", defaultNamespace).Creation(now.Add(time.Second)).Obj())
 	if cq.Pop() != nil {
 		t.Error("ClusterQueue should be empty")
 	}
@@ -211,8 +212,8 @@ func Test_Pop(t *testing.T) {
 func Test_Delete(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	cq := newClusterQueueImpl(ctx, nil, defaultOrdering, testingclock.NewFakeClock(time.Now()), nil, false, nil)
-	wl1 := utiltesting.MakeWorkload("workload-1", defaultNamespace).Obj()
-	wl2 := utiltesting.MakeWorkload("workload-2", defaultNamespace).Obj()
+	wl1 := utiltestingapi.MakeWorkload("workload-1", defaultNamespace).Obj()
+	wl2 := utiltestingapi.MakeWorkload("workload-2", defaultNamespace).Obj()
 	cq.PushOrUpdate(workload.NewInfo(wl1))
 	cq.PushOrUpdate(workload.NewInfo(wl2))
 	if cq.Pending() != 2 {
@@ -233,7 +234,7 @@ func Test_Delete(t *testing.T) {
 func Test_Info(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	cq := newClusterQueueImpl(ctx, nil, defaultOrdering, testingclock.NewFakeClock(time.Now()), nil, false, nil)
-	wl := utiltesting.MakeWorkload("workload-1", defaultNamespace).Obj()
+	wl := utiltestingapi.MakeWorkload("workload-1", defaultNamespace).Obj()
 	if info := cq.Info(workload.Key(wl)); info != nil {
 		t.Error("Workload should not exist")
 	}
@@ -246,7 +247,7 @@ func Test_Info(t *testing.T) {
 func Test_AddFromLocalQueue(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	cq := newClusterQueueImpl(ctx, nil, defaultOrdering, testingclock.NewFakeClock(time.Now()), nil, false, nil)
-	wl := utiltesting.MakeWorkload("workload-1", defaultNamespace).Obj()
+	wl := utiltestingapi.MakeWorkload("workload-1", defaultNamespace).Obj()
 	queue := &LocalQueue{
 		items: map[workload.Reference]*workload.Info{
 			workload.Reference(wl.Name): workload.NewInfo(wl),
@@ -265,12 +266,12 @@ func Test_AddFromLocalQueue(t *testing.T) {
 func Test_DeleteFromLocalQueue(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	cq := newClusterQueueImpl(ctx, nil, defaultOrdering, testingclock.NewFakeClock(time.Now()), nil, false, nil)
-	q := utiltesting.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj()
+	q := utiltestingapi.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj()
 	qImpl := newLocalQueue(q)
-	wl1 := utiltesting.MakeWorkload("wl1", "").Queue(kueue.LocalQueueName(q.Name)).Obj()
-	wl2 := utiltesting.MakeWorkload("wl2", "").Queue(kueue.LocalQueueName(q.Name)).Obj()
-	wl3 := utiltesting.MakeWorkload("wl3", "").Queue(kueue.LocalQueueName(q.Name)).Obj()
-	wl4 := utiltesting.MakeWorkload("wl4", "").Queue(kueue.LocalQueueName(q.Name)).Obj()
+	wl1 := utiltestingapi.MakeWorkload("wl1", "").Queue(kueue.LocalQueueName(q.Name)).Obj()
+	wl2 := utiltestingapi.MakeWorkload("wl2", "").Queue(kueue.LocalQueueName(q.Name)).Obj()
+	wl3 := utiltestingapi.MakeWorkload("wl3", "").Queue(kueue.LocalQueueName(q.Name)).Obj()
+	wl4 := utiltestingapi.MakeWorkload("wl4", "").Queue(kueue.LocalQueueName(q.Name)).Obj()
 	admissibleworkloads := []*kueue.Workload{wl1, wl2}
 	inadmissibleWorkloads := []*kueue.Workload{wl3, wl4}
 
@@ -312,10 +313,10 @@ func TestClusterQueueImpl(t *testing.T) {
 	fakeClock := testingclock.NewFakeClock(now)
 
 	var workloads = []*kueue.Workload{
-		utiltesting.MakeWorkload("w1", "ns1").Queue("q1").Obj(),
-		utiltesting.MakeWorkload("w2", "ns2").Queue("q2").Obj(),
-		utiltesting.MakeWorkload("w3", "ns3").Queue("q3").Obj(),
-		utiltesting.MakeWorkload("w4-requeue-state", "ns1").
+		utiltestingapi.MakeWorkload("w1", "ns1").Queue("q1").Obj(),
+		utiltestingapi.MakeWorkload("w2", "ns2").Queue("q2").Obj(),
+		utiltestingapi.MakeWorkload("w3", "ns3").Queue("q3").Obj(),
+		utiltestingapi.MakeWorkload("w4-requeue-state", "ns1").
 			RequeueState(ptr.To[int32](1), ptr.To(metav1.NewTime(minuteLater))).
 			Queue("q1").
 			Condition(metav1.Condition{
@@ -405,10 +406,10 @@ func TestClusterQueueImpl(t *testing.T) {
 		},
 		"update reclaimable pods in inadmissible": {
 			inadmissibleWorkloadsToRequeue: []*workload.Info{
-				workload.NewInfo(utiltesting.MakeWorkload("w", "").PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).Obj()),
+				workload.NewInfo(utiltestingapi.MakeWorkload("w", "").PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).Obj()),
 			},
 			workloadsToUpdate: []*kueue.Workload{
-				utiltesting.MakeWorkload("w", "").PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
+				utiltestingapi.MakeWorkload("w", "").PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
 					ReclaimablePods(kueue.ReclaimablePod{Name: kueue.DefaultPodSetName, Count: 1}).
 					Obj(),
 			},
@@ -421,7 +422,7 @@ func TestClusterQueueImpl(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			ctx, _ := utiltesting.ContextWithLog(t)
 			cq := newClusterQueueImpl(ctx, nil, defaultOrdering, fakeClock, nil, false, nil)
-			err := cq.Update(utiltesting.MakeClusterQueue("cq").
+			err := cq.Update(utiltestingapi.MakeClusterQueue("cq").
 				NamespaceSelector(&metav1.LabelSelector{
 					MatchExpressions: []metav1.LabelSelectorRequirement{
 						{
@@ -476,7 +477,7 @@ func TestQueueInadmissibleWorkloadsDuringScheduling(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	cq := newClusterQueueImpl(ctx, nil, defaultOrdering, testingclock.NewFakeClock(time.Now()), nil, false, nil)
 	cq.namespaceSelector = labels.Everything()
-	wl := utiltesting.MakeWorkload("workload-1", defaultNamespace).Obj()
+	wl := utiltestingapi.MakeWorkload("workload-1", defaultNamespace).Obj()
 	cl := utiltesting.NewFakeClient(wl, utiltesting.MakeNamespace(defaultNamespace))
 	cq.PushOrUpdate(workload.NewInfo(wl))
 
@@ -519,23 +520,23 @@ func TestBackoffWaitingTimeExpired(t *testing.T) {
 		want         bool
 	}{
 		"workload still have Requeued=false": {
-			workloadInfo: workload.NewInfo(utiltesting.MakeWorkload("wl", "ns").Condition(metav1.Condition{
+			workloadInfo: workload.NewInfo(utiltestingapi.MakeWorkload("wl", "ns").Condition(metav1.Condition{
 				Type:   kueue.WorkloadRequeued,
 				Status: metav1.ConditionFalse,
 			}).Obj()),
 			want: false,
 		},
 		"workload doesn't have requeueState": {
-			workloadInfo: workload.NewInfo(utiltesting.MakeWorkload("wl", "ns").Obj()),
+			workloadInfo: workload.NewInfo(utiltestingapi.MakeWorkload("wl", "ns").Obj()),
 			want:         true,
 		},
 		"workload doesn't have an evicted condition with reason=PodsReadyTimeout": {
-			workloadInfo: workload.NewInfo(utiltesting.MakeWorkload("wl", "ns").
+			workloadInfo: workload.NewInfo(utiltestingapi.MakeWorkload("wl", "ns").
 				RequeueState(ptr.To[int32](10), nil).Obj()),
 			want: true,
 		},
 		"now already has exceeded requeueAt": {
-			workloadInfo: workload.NewInfo(utiltesting.MakeWorkload("wl", "ns").
+			workloadInfo: workload.NewInfo(utiltestingapi.MakeWorkload("wl", "ns").
 				RequeueState(ptr.To[int32](10), ptr.To(metav1.NewTime(minuteAgo))).
 				Condition(metav1.Condition{
 					Type:   kueue.WorkloadEvicted,
@@ -545,7 +546,7 @@ func TestBackoffWaitingTimeExpired(t *testing.T) {
 			want: true,
 		},
 		"now hasn't yet exceeded requeueAt": {
-			workloadInfo: workload.NewInfo(utiltesting.MakeWorkload("wl", "ns").
+			workloadInfo: workload.NewInfo(utiltestingapi.MakeWorkload("wl", "ns").
 				RequeueState(ptr.To[int32](10), ptr.To(metav1.NewTime(minuteLater))).
 				Condition(metav1.Condition{
 					Type:   kueue.WorkloadEvicted,
@@ -624,7 +625,7 @@ func TestBestEffortFIFORequeueIfNotPresent(t *testing.T) {
 				},
 				workload.Ordering{PodsReadyRequeuingTimestamp: config.EvictionTimestamp},
 				nil, nil)
-			wl := utiltesting.MakeWorkload("workload-1", defaultNamespace).Obj()
+			wl := utiltestingapi.MakeWorkload("workload-1", defaultNamespace).Obj()
 			info := workload.NewInfo(wl)
 			info.LastAssignment = tc.lastAssignment
 			if ok := cq.RequeueIfNotPresent(ctx, info, tc.reason); !ok {
@@ -903,7 +904,7 @@ func TestStrictFIFORequeueIfNotPresent(t *testing.T) {
 				},
 				workload.Ordering{PodsReadyRequeuingTimestamp: config.EvictionTimestamp},
 				nil, nil)
-			wl := utiltesting.MakeWorkload("workload-1", defaultNamespace).Obj()
+			wl := utiltestingapi.MakeWorkload("workload-1", defaultNamespace).Obj()
 			if ok := cq.RequeueIfNotPresent(ctx, workload.NewInfo(wl), reason); !ok {
 				t.Error("failed to requeue nonexistent workload")
 			}
@@ -935,11 +936,11 @@ func TestFsAdmission(t *testing.T) {
 		wantWl    kueue.Workload
 	}{
 		"workloads are ordered by LQ usage, instead of priorities": {
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				AdmissionMode(kueue.UsageBasedAdmissionFairSharing).
 				Obj(),
 			lqs: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lqA", "default").
+				*utiltestingapi.MakeLocalQueue("lqA", "default").
 					FairSharing(&kueue.FairSharing{
 						Weight: ptr.To(resource.MustParse("1")),
 					}).
@@ -953,7 +954,7 @@ func TestFsAdmission(t *testing.T) {
 						},
 					).
 					Obj(),
-				*utiltesting.MakeLocalQueue("lqB", "default").
+				*utiltestingapi.MakeLocalQueue("lqB", "default").
 					FairSharing(&kueue.FairSharing{
 						Weight: ptr.To(resource.MustParse("1")),
 					}).
@@ -969,17 +970,17 @@ func TestFsAdmission(t *testing.T) {
 			},
 			afsConfig: &config.AdmissionFairSharing{},
 			wls: []kueue.Workload{
-				*utiltesting.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
-				*utiltesting.MakeWorkload("wlB-low", "default").Queue("lqB").Priority(1).Obj(),
+				*utiltestingapi.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
+				*utiltestingapi.MakeWorkload("wlB-low", "default").Queue("lqB").Priority(1).Obj(),
 			},
-			wantWl: *utiltesting.MakeWorkload("wlB-low", "default").Queue("lqB").Priority(1).Obj(),
+			wantWl: *utiltestingapi.MakeWorkload("wlB-low", "default").Queue("lqB").Priority(1).Obj(),
 		},
 		"workloads are ordered by LQ usage with respect to resource weights": {
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				AdmissionMode(kueue.UsageBasedAdmissionFairSharing).
 				Obj(),
 			lqs: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lqA", "default").
+				*utiltestingapi.MakeLocalQueue("lqA", "default").
 					FairSharing(&kueue.FairSharing{
 						Weight: ptr.To(resource.MustParse("1")),
 					}).
@@ -994,7 +995,7 @@ func TestFsAdmission(t *testing.T) {
 						},
 					).
 					Obj(),
-				*utiltesting.MakeLocalQueue("lqB", "default").
+				*utiltestingapi.MakeLocalQueue("lqB", "default").
 					FairSharing(&kueue.FairSharing{
 						Weight: ptr.To(resource.MustParse("1")),
 					}).
@@ -1016,17 +1017,17 @@ func TestFsAdmission(t *testing.T) {
 				},
 			},
 			wls: []kueue.Workload{
-				*utiltesting.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
-				*utiltesting.MakeWorkload("wlB-low", "default").Queue("lqB").Priority(1).Obj(),
+				*utiltestingapi.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
+				*utiltestingapi.MakeWorkload("wlB-low", "default").Queue("lqB").Priority(1).Obj(),
 			},
-			wantWl: *utiltesting.MakeWorkload("wlB-low", "default").Queue("lqB").Priority(1).Obj(),
+			wantWl: *utiltestingapi.MakeWorkload("wlB-low", "default").Queue("lqB").Priority(1).Obj(),
 		},
 		"workloads are ordered by LQ usage with respect to LQs' fair sharing weights": {
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				AdmissionMode(kueue.UsageBasedAdmissionFairSharing).
 				Obj(),
 			lqs: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lqA", "default").
+				*utiltestingapi.MakeLocalQueue("lqA", "default").
 					FairSharing(&kueue.FairSharing{
 						Weight: ptr.To(resource.MustParse("1")),
 					}).
@@ -1040,7 +1041,7 @@ func TestFsAdmission(t *testing.T) {
 						},
 					).
 					Obj(),
-				*utiltesting.MakeLocalQueue("lqB", "default").
+				*utiltestingapi.MakeLocalQueue("lqB", "default").
 					FairSharing(&kueue.FairSharing{
 						Weight: ptr.To(resource.MustParse("2")),
 					}).
@@ -1056,17 +1057,17 @@ func TestFsAdmission(t *testing.T) {
 			},
 			afsConfig: &config.AdmissionFairSharing{},
 			wls: []kueue.Workload{
-				*utiltesting.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
-				*utiltesting.MakeWorkload("wlB-low", "default").Queue("lqB").Priority(1).Obj(),
+				*utiltestingapi.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
+				*utiltestingapi.MakeWorkload("wlB-low", "default").Queue("lqB").Priority(1).Obj(),
 			},
-			wantWl: *utiltesting.MakeWorkload("wlB-low", "default").Queue("lqB").Priority(1).Obj(),
+			wantWl: *utiltestingapi.MakeWorkload("wlB-low", "default").Queue("lqB").Priority(1).Obj(),
 		},
 		"workloads with the same LQ usage are ordered by priority": {
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				AdmissionMode(kueue.UsageBasedAdmissionFairSharing).
 				Obj(),
 			lqs: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lqA", "default").
+				*utiltestingapi.MakeLocalQueue("lqA", "default").
 					FairSharing(&kueue.FairSharing{
 						Weight: ptr.To(resource.MustParse("1")),
 					}).
@@ -1082,37 +1083,37 @@ func TestFsAdmission(t *testing.T) {
 			},
 			afsConfig: &config.AdmissionFairSharing{},
 			wls: []kueue.Workload{
-				*utiltesting.MakeWorkload("wlA-low", "default").Queue("lqA").Priority(1).Obj(),
-				*utiltesting.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
+				*utiltestingapi.MakeWorkload("wlA-low", "default").Queue("lqA").Priority(1).Obj(),
+				*utiltestingapi.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
 			},
-			wantWl: *utiltesting.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
+			wantWl: *utiltestingapi.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
 		},
 		"workloads with NoFairSharing CQ are ordered by priority": {
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				AdmissionMode(kueue.NoAdmissionFairSharing).
 				Obj(),
 			lqs: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lqA", "default").Obj(),
+				*utiltestingapi.MakeLocalQueue("lqA", "default").Obj(),
 			},
 			afsConfig: &config.AdmissionFairSharing{},
 			wls: []kueue.Workload{
-				*utiltesting.MakeWorkload("wlA-low", "default").Queue("lqA").Priority(1).Obj(),
-				*utiltesting.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
+				*utiltestingapi.MakeWorkload("wlA-low", "default").Queue("lqA").Priority(1).Obj(),
+				*utiltestingapi.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
 			},
-			wantWl: *utiltesting.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
+			wantWl: *utiltestingapi.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
 		},
 		"workloads with no FS config are ordered by priority": {
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				AdmissionMode(kueue.NoAdmissionFairSharing).
 				Obj(),
 			lqs: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lqA", "default").Obj(),
+				*utiltestingapi.MakeLocalQueue("lqA", "default").Obj(),
 			},
 			wls: []kueue.Workload{
-				*utiltesting.MakeWorkload("wlA-low", "default").Queue("lqA").Priority(1).Obj(),
-				*utiltesting.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
+				*utiltestingapi.MakeWorkload("wlA-low", "default").Queue("lqA").Priority(1).Obj(),
+				*utiltestingapi.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
 			},
-			wantWl: *utiltesting.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
+			wantWl: *utiltestingapi.MakeWorkload("wlA-high", "default").Queue("lqA").Priority(2).Obj(),
 		},
 	}
 	for name, tc := range cases {
diff --git a/pkg/cache/queue/manager_test.go b/pkg/cache/queue/manager_test.go
index 25de917df..3cec975c9 100644
--- a/pkg/cache/queue/manager_test.go
+++ b/pkg/cache/queue/manager_test.go
@@ -35,6 +35,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/queue"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
 
@@ -49,15 +50,15 @@ var cmpDump = cmp.Options{
 // present when the queue is added.
 func TestAddLocalQueueOrphans(t *testing.T) {
 	kClient := utiltesting.NewFakeClient(
-		utiltesting.MakeWorkload("a", "earth").Queue("foo").Obj(),
-		utiltesting.MakeWorkload("b", "earth").Queue("bar").Obj(),
-		utiltesting.MakeWorkload("c", "earth").Queue("foo").Obj(),
-		utiltesting.MakeWorkload("d", "earth").Queue("foo").
-			ReserveQuota(utiltesting.MakeAdmission("cq").Obj()).Obj(),
-		utiltesting.MakeWorkload("a", "moon").Queue("foo").Obj(),
+		utiltestingapi.MakeWorkload("a", "earth").Queue("foo").Obj(),
+		utiltestingapi.MakeWorkload("b", "earth").Queue("bar").Obj(),
+		utiltestingapi.MakeWorkload("c", "earth").Queue("foo").Obj(),
+		utiltestingapi.MakeWorkload("d", "earth").Queue("foo").
+			ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).Obj(),
+		utiltestingapi.MakeWorkload("a", "moon").Queue("foo").Obj(),
 	)
 	manager := NewManager(kClient, nil)
-	q := utiltesting.MakeLocalQueue("foo", "earth").Obj()
+	q := utiltestingapi.MakeLocalQueue("foo", "earth").Obj()
 	ctx, _ := utiltesting.ContextWithLog(t)
 	if err := manager.AddLocalQueue(ctx, q); err != nil {
 		t.Fatalf("Failed adding queue: %v", err)
@@ -75,20 +76,20 @@ func TestAddClusterQueueOrphans(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	now := time.Now()
 	queues := []*kueue.LocalQueue{
-		utiltesting.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
-		utiltesting.MakeLocalQueue("bar", "").ClusterQueue("cq").Obj(),
+		utiltestingapi.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
+		utiltestingapi.MakeLocalQueue("bar", "").ClusterQueue("cq").Obj(),
 	}
 	kClient := utiltesting.NewFakeClient(
-		utiltesting.MakeWorkload("a", "").Queue("foo").Creation(now.Add(time.Second)).Obj(),
-		utiltesting.MakeWorkload("b", "").Queue("bar").Creation(now).Obj(),
-		utiltesting.MakeWorkload("c", "").Queue("foo").
-			ReserveQuota(utiltesting.MakeAdmission("cq").Obj()).Obj(),
-		utiltesting.MakeWorkload("d", "").Queue("baz").Obj(),
+		utiltestingapi.MakeWorkload("a", "").Queue("foo").Creation(now.Add(time.Second)).Obj(),
+		utiltestingapi.MakeWorkload("b", "").Queue("bar").Creation(now).Obj(),
+		utiltestingapi.MakeWorkload("c", "").Queue("foo").
+			ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).Obj(),
+		utiltestingapi.MakeWorkload("d", "").Queue("baz").Obj(),
 		queues[0],
 		queues[1],
 	)
 	manager := NewManager(kClient, nil)
-	cq := utiltesting.MakeClusterQueue("cq").Obj()
+	cq := utiltestingapi.MakeClusterQueue("cq").Obj()
 	if err := manager.AddClusterQueue(ctx, cq); err != nil {
 		t.Fatalf("Failed adding cluster queue %s: %v", cq.Name, err)
 	}
@@ -127,17 +128,17 @@ func TestAddClusterQueueOrphans(t *testing.T) {
 func TestUpdateClusterQueue(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	clusterQueues := []*kueue.ClusterQueue{
-		utiltesting.MakeClusterQueue("cq1").Cohort("alpha").Obj(),
-		utiltesting.MakeClusterQueue("cq2").Cohort("beta").Obj(),
+		utiltestingapi.MakeClusterQueue("cq1").Cohort("alpha").Obj(),
+		utiltestingapi.MakeClusterQueue("cq2").Cohort("beta").Obj(),
 	}
 	queues := []*kueue.LocalQueue{
-		utiltesting.MakeLocalQueue("foo", defaultNamespace).ClusterQueue("cq1").Obj(),
-		utiltesting.MakeLocalQueue("bar", defaultNamespace).ClusterQueue("cq2").Obj(),
+		utiltestingapi.MakeLocalQueue("foo", defaultNamespace).ClusterQueue("cq1").Obj(),
+		utiltestingapi.MakeLocalQueue("bar", defaultNamespace).ClusterQueue("cq2").Obj(),
 	}
 	now := time.Now()
 	workloads := []*kueue.Workload{
-		utiltesting.MakeWorkload("a", defaultNamespace).Queue("foo").Creation(now.Add(time.Second)).Obj(),
-		utiltesting.MakeWorkload("b", defaultNamespace).Queue("bar").Creation(now).Obj(),
+		utiltestingapi.MakeWorkload("a", defaultNamespace).Queue("foo").Creation(now.Add(time.Second)).Obj(),
+		utiltestingapi.MakeWorkload("b", defaultNamespace).Queue("bar").Creation(now).Obj(),
 	}
 	// Setup.
 	cl := utiltesting.NewFakeClient(utiltesting.MakeNamespace(defaultNamespace))
@@ -214,13 +215,13 @@ func TestUpdateClusterQueue(t *testing.T) {
 func TestRequeueWorkloadsCohortCycle(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	cohorts := []*kueue.Cohort{
-		utiltesting.MakeCohort("cohort-a").Parent("cohort-b").Obj(),
-		utiltesting.MakeCohort("cohort-b").Parent("cohort-c").Obj(),
-		utiltesting.MakeCohort("cohort-c").Parent("cohort-a").Obj(),
+		utiltestingapi.MakeCohort("cohort-a").Parent("cohort-b").Obj(),
+		utiltestingapi.MakeCohort("cohort-b").Parent("cohort-c").Obj(),
+		utiltestingapi.MakeCohort("cohort-c").Parent("cohort-a").Obj(),
 	}
-	cq := utiltesting.MakeClusterQueue("cq1").Cohort("cohort-a").Obj()
-	lq := utiltesting.MakeLocalQueue("foo", defaultNamespace).ClusterQueue("cq1").Obj()
-	wl := utiltesting.MakeWorkload("a", defaultNamespace).Queue("foo").Creation(time.Now()).Obj()
+	cq := utiltestingapi.MakeClusterQueue("cq1").Cohort("cohort-a").Obj()
+	lq := utiltestingapi.MakeLocalQueue("foo", defaultNamespace).ClusterQueue("cq1").Obj()
+	wl := utiltestingapi.MakeWorkload("a", defaultNamespace).Queue("foo").Creation(time.Now()).Obj()
 	// Setup.
 	cl := utiltesting.NewFakeClient(utiltesting.MakeNamespace(defaultNamespace))
 	manager := NewManager(cl, nil)
@@ -251,8 +252,8 @@ func TestRequeueWorkloadsCohortCycle(t *testing.T) {
 // a cluster queue becomes active.
 func TestClusterQueueToActive(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
-	stoppedCq := utiltesting.MakeClusterQueue("cq1").Cohort("alpha").Condition(kueue.ClusterQueueActive, metav1.ConditionFalse, "ByTest", "by test").Obj()
-	runningCq := utiltesting.MakeClusterQueue("cq1").Cohort("alpha").Condition(kueue.ClusterQueueActive, metav1.ConditionTrue, "ByTest", "by test").Obj()
+	stoppedCq := utiltestingapi.MakeClusterQueue("cq1").Cohort("alpha").Condition(kueue.ClusterQueueActive, metav1.ConditionFalse, "ByTest", "by test").Obj()
+	runningCq := utiltestingapi.MakeClusterQueue("cq1").Cohort("alpha").Condition(kueue.ClusterQueueActive, metav1.ConditionTrue, "ByTest", "by test").Obj()
 	cl := utiltesting.NewFakeClient(utiltesting.MakeNamespace(defaultNamespace))
 	manager := NewManager(cl, nil)
 
@@ -308,17 +309,17 @@ func TestClusterQueueToActive(t *testing.T) {
 func TestUpdateLocalQueue(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	clusterQueues := []*kueue.ClusterQueue{
-		utiltesting.MakeClusterQueue("cq1").Obj(),
-		utiltesting.MakeClusterQueue("cq2").Obj(),
+		utiltestingapi.MakeClusterQueue("cq1").Obj(),
+		utiltestingapi.MakeClusterQueue("cq2").Obj(),
 	}
 	queues := []*kueue.LocalQueue{
-		utiltesting.MakeLocalQueue("foo", "").ClusterQueue("cq1").Obj(),
-		utiltesting.MakeLocalQueue("bar", "").ClusterQueue("cq2").Obj(),
+		utiltestingapi.MakeLocalQueue("foo", "").ClusterQueue("cq1").Obj(),
+		utiltestingapi.MakeLocalQueue("bar", "").ClusterQueue("cq2").Obj(),
 	}
 	now := time.Now()
 	workloads := []*kueue.Workload{
-		utiltesting.MakeWorkload("a", "").Queue("foo").Creation(now.Add(time.Second)).Obj(),
-		utiltesting.MakeWorkload("b", "").Queue("bar").Creation(now).Obj(),
+		utiltestingapi.MakeWorkload("a", "").Queue("foo").Creation(now.Add(time.Second)).Obj(),
+		utiltestingapi.MakeWorkload("b", "").Queue("bar").Creation(now).Obj(),
 	}
 	manager := NewManager(utiltesting.NewFakeClient(), nil)
 	for _, cq := range clusterQueues {
@@ -361,9 +362,9 @@ func TestUpdateLocalQueue(t *testing.T) {
 // workloads are not listed in the ClusterQueue.
 func TestDeleteLocalQueue(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
-	cq := utiltesting.MakeClusterQueue("cq").Obj()
-	q := utiltesting.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj()
-	wl := utiltesting.MakeWorkload("a", "").Queue("foo").Obj()
+	cq := utiltestingapi.MakeClusterQueue("cq").Obj()
+	q := utiltestingapi.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj()
+	wl := utiltestingapi.MakeWorkload("a", "").Queue("foo").Obj()
 
 	cl := utiltesting.NewFakeClient(wl)
 	manager := NewManager(cl, nil)
@@ -392,13 +393,13 @@ func TestDeleteLocalQueue(t *testing.T) {
 func TestAddWorkload(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	manager := NewManager(utiltesting.NewFakeClient(), nil)
-	cq := utiltesting.MakeClusterQueue("cq").Obj()
+	cq := utiltestingapi.MakeClusterQueue("cq").Obj()
 	if err := manager.AddClusterQueue(ctx, cq); err != nil {
 		t.Fatalf("Failed adding clusterQueue %s: %v", cq.Name, err)
 	}
 	queues := []*kueue.LocalQueue{
-		utiltesting.MakeLocalQueue("foo", "earth").ClusterQueue("cq").Obj(),
-		utiltesting.MakeLocalQueue("bar", "mars").Obj(),
+		utiltestingapi.MakeLocalQueue("foo", "earth").ClusterQueue("cq").Obj(),
+		utiltestingapi.MakeLocalQueue("bar", "mars").Obj(),
 	}
 	for _, q := range queues {
 		if err := manager.AddLocalQueue(ctx, q); err != nil {
@@ -557,10 +558,10 @@ func TestStatus(t *testing.T) {
 }
 
 func TestRequeueWorkloadStrictFIFO(t *testing.T) {
-	cq := utiltesting.MakeClusterQueue("cq").Obj()
+	cq := utiltestingapi.MakeClusterQueue("cq").Obj()
 	queues := []*kueue.LocalQueue{
-		utiltesting.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
-		utiltesting.MakeLocalQueue("bar", "").Obj(),
+		utiltestingapi.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
+		utiltestingapi.MakeLocalQueue("bar", "").Obj(),
 	}
 	cases := []struct {
 		workload     *kueue.Workload
@@ -663,14 +664,14 @@ func TestUpdateWorkload(t *testing.T) {
 	}{
 		"in queue": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("cq").Obj(),
+				utiltestingapi.MakeClusterQueue("cq").Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
+				utiltestingapi.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", "").Queue("foo").Creation(now).Obj(),
-				utiltesting.MakeWorkload("b", "").Queue("foo").Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("a", "").Queue("foo").Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("b", "").Queue("foo").Creation(now.Add(time.Second)).Obj(),
 			},
 			update: func(w *kueue.Workload) {
 				w.CreationTimestamp = metav1.NewTime(now.Add(time.Minute))
@@ -685,14 +686,14 @@ func TestUpdateWorkload(t *testing.T) {
 		},
 		"between queues": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("cq").Obj(),
+				utiltestingapi.MakeClusterQueue("cq").Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
-				utiltesting.MakeLocalQueue("bar", "").ClusterQueue("cq").Obj(),
+				utiltestingapi.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
+				utiltestingapi.MakeLocalQueue("bar", "").ClusterQueue("cq").Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", "").Queue("foo").Obj(),
+				utiltestingapi.MakeWorkload("a", "").Queue("foo").Obj(),
 			},
 			update: func(w *kueue.Workload) {
 				w.Spec.QueueName = "bar"
@@ -708,15 +709,15 @@ func TestUpdateWorkload(t *testing.T) {
 		},
 		"between cluster queues": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("cq1").Obj(),
-				utiltesting.MakeClusterQueue("cq2").Obj(),
+				utiltestingapi.MakeClusterQueue("cq1").Obj(),
+				utiltestingapi.MakeClusterQueue("cq2").Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue("foo", "").ClusterQueue("cq1").Obj(),
-				utiltesting.MakeLocalQueue("bar", "").ClusterQueue("cq2").Obj(),
+				utiltestingapi.MakeLocalQueue("foo", "").ClusterQueue("cq1").Obj(),
+				utiltestingapi.MakeLocalQueue("bar", "").ClusterQueue("cq2").Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", "").Queue("foo").Obj(),
+				utiltestingapi.MakeWorkload("a", "").Queue("foo").Obj(),
 			},
 			update: func(w *kueue.Workload) {
 				w.Spec.QueueName = "bar"
@@ -733,13 +734,13 @@ func TestUpdateWorkload(t *testing.T) {
 		},
 		"to non existent queue": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("cq").Obj(),
+				utiltestingapi.MakeClusterQueue("cq").Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
+				utiltestingapi.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", "").Queue("foo").Obj(),
+				utiltestingapi.MakeWorkload("a", "").Queue("foo").Obj(),
 			},
 			update: func(w *kueue.Workload) {
 				w.Spec.QueueName = "bar"
@@ -754,13 +755,13 @@ func TestUpdateWorkload(t *testing.T) {
 		},
 		"from non existing queue": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("cq").Obj(),
+				utiltestingapi.MakeClusterQueue("cq").Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
+				utiltestingapi.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", "").Queue("bar").Obj(),
+				utiltestingapi.MakeWorkload("a", "").Queue("bar").Obj(),
 			},
 			update: func(w *kueue.Workload) {
 				w.Spec.QueueName = "foo"
@@ -838,14 +839,14 @@ func TestHeads(t *testing.T) {
 	now := time.Now().Truncate(time.Second)
 
 	clusterQueues := []*kueue.ClusterQueue{
-		utiltesting.MakeClusterQueue("active-fooCq").Obj(),
-		utiltesting.MakeClusterQueue("active-barCq").Obj(),
-		utiltesting.MakeClusterQueue("pending-bazCq").Obj(),
+		utiltestingapi.MakeClusterQueue("active-fooCq").Obj(),
+		utiltestingapi.MakeClusterQueue("active-barCq").Obj(),
+		utiltestingapi.MakeClusterQueue("pending-bazCq").Obj(),
 	}
 	queues := []*kueue.LocalQueue{
-		utiltesting.MakeLocalQueue("foo", "").ClusterQueue("active-fooCq").Obj(),
-		utiltesting.MakeLocalQueue("bar", "").ClusterQueue("active-barCq").Obj(),
-		utiltesting.MakeLocalQueue("baz", "").ClusterQueue("pending-bazCq").Obj(),
+		utiltestingapi.MakeLocalQueue("foo", "").ClusterQueue("active-fooCq").Obj(),
+		utiltestingapi.MakeLocalQueue("bar", "").ClusterQueue("active-barCq").Obj(),
+		utiltestingapi.MakeLocalQueue("baz", "").ClusterQueue("pending-bazCq").Obj(),
 	}
 	tests := []struct {
 		name          string
@@ -860,26 +861,26 @@ func TestHeads(t *testing.T) {
 		{
 			name: "active clusterQueues",
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", "").Creation(now).Queue("foo").Obj(),
-				utiltesting.MakeWorkload("b", "").Creation(now).Queue("bar").Obj(),
+				utiltestingapi.MakeWorkload("a", "").Creation(now).Queue("foo").Obj(),
+				utiltestingapi.MakeWorkload("b", "").Creation(now).Queue("bar").Obj(),
 			},
 			wantWorkloads: sets.New("a", "b"),
 		},
 		{
 			name: "active clusterQueues with multiple workloads",
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a1", "").Creation(now).Queue("foo").Obj(),
-				utiltesting.MakeWorkload("a2", "").Creation(now.Add(time.Hour)).Queue("foo").Obj(),
-				utiltesting.MakeWorkload("b", "").Creation(now).Queue("bar").Obj(),
+				utiltestingapi.MakeWorkload("a1", "").Creation(now).Queue("foo").Obj(),
+				utiltestingapi.MakeWorkload("a2", "").Creation(now.Add(time.Hour)).Queue("foo").Obj(),
+				utiltestingapi.MakeWorkload("b", "").Creation(now).Queue("bar").Obj(),
 			},
 			wantWorkloads: sets.New("a1", "b"),
 		},
 		{
 			name: "inactive clusterQueues",
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", "").Creation(now).Queue("foo").Obj(),
-				utiltesting.MakeWorkload("b", "").Creation(now).Queue("bar").Obj(),
-				utiltesting.MakeWorkload("c", "").Creation(now.Add(time.Hour)).Queue("baz").Obj(),
+				utiltestingapi.MakeWorkload("a", "").Creation(now).Queue("foo").Obj(),
+				utiltestingapi.MakeWorkload("b", "").Creation(now).Queue("bar").Obj(),
+				utiltestingapi.MakeWorkload("c", "").Creation(now.Add(time.Hour)).Queue("baz").Obj(),
 			},
 			wantWorkloads: sets.New("a", "b"),
 		},
@@ -928,8 +929,8 @@ var ignoreTypeMeta = cmpopts.IgnoreTypes(metav1.TypeMeta{})
 func TestHeadsAsync(t *testing.T) {
 	now := time.Now().Truncate(time.Second)
 	clusterQueues := []*kueue.ClusterQueue{
-		utiltesting.MakeClusterQueue("fooCq").Obj(),
-		utiltesting.MakeClusterQueue("barCq").Obj(),
+		utiltestingapi.MakeClusterQueue("fooCq").Obj(),
+		utiltestingapi.MakeClusterQueue("barCq").Obj(),
 	}
 	wl := kueue.Workload{
 		ObjectMeta: metav1.ObjectMeta{
@@ -1188,14 +1189,14 @@ func TestGetPendingWorkloadsInfo(t *testing.T) {
 	now := time.Now().Truncate(time.Second)
 
 	clusterQueues := []*kueue.ClusterQueue{
-		utiltesting.MakeClusterQueue("cq").Obj(),
+		utiltestingapi.MakeClusterQueue("cq").Obj(),
 	}
 	queues := []*kueue.LocalQueue{
-		utiltesting.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
+		utiltestingapi.MakeLocalQueue("foo", "").ClusterQueue("cq").Obj(),
 	}
 	workloads := []*kueue.Workload{
-		utiltesting.MakeWorkload("a", "").Queue("foo").Creation(now).Obj(),
-		utiltesting.MakeWorkload("b", "").Queue("foo").Creation(now.Add(time.Second)).Obj(),
+		utiltestingapi.MakeWorkload("a", "").Queue("foo").Creation(now).Obj(),
+		utiltestingapi.MakeWorkload("b", "").Queue("foo").Creation(now.Add(time.Second)).Obj(),
 	}
 
 	manager := NewManager(utiltesting.NewFakeClient(), nil)
@@ -1269,17 +1270,17 @@ func TestGetPendingWorkloadsInfo(t *testing.T) {
 func TestQueueSecondPassIfNeeded(t *testing.T) {
 	now := time.Now()
 
-	baseWorkloadBuilder := utiltesting.MakeWorkload("foo", "default").
+	baseWorkloadBuilder := utiltestingapi.MakeWorkload("foo", "default").
 		Queue("tas-main").
-		PodSets(*utiltesting.MakePodSet("one", 1).
+		PodSets(*utiltestingapi.MakePodSet("one", 1).
 			RequiredTopologyRequest(corev1.LabelHostname).
 			Request(corev1.ResourceCPU, "1").
 			Obj())
 	baseWorkloadNeedingSecondPass := baseWorkloadBuilder.Clone().
 		ReserveQuota(
-			utiltesting.MakeAdmission("tas-main").
+			utiltestingapi.MakeAdmission("tas-main").
 				PodSets(
-					utiltesting.MakePodSetAssignment("one").
+					utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
 						DelayedTopologyRequest(kueue.DelayedTopologyRequestStatePending).
 						Obj(),
diff --git a/pkg/cache/scheduler/cache_test.go b/pkg/cache/scheduler/cache_test.go
index 50dd92f2a..54e3802e1 100644
--- a/pkg/cache/scheduler/cache_test.go
+++ b/pkg/cache/scheduler/cache_test.go
@@ -43,41 +43,42 @@ import (
 	"sigs.k8s.io/kueue/pkg/resources"
 	"sigs.k8s.io/kueue/pkg/util/queue"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
 
 func TestCacheClusterQueueOperations(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	initialClusterQueues := []kueue.ClusterQueue{
-		*utiltesting.MakeClusterQueue("a").
+		*utiltestingapi.MakeClusterQueue("a").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("default").
+				*utiltestingapi.MakeFlavorQuotas("default").
 					Resource(corev1.ResourceCPU, "10", "10").Obj()).
 			Cohort("one").
 			NamespaceSelector(nil).
 			Obj(),
-		*utiltesting.MakeClusterQueue("b").
+		*utiltestingapi.MakeClusterQueue("b").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("default").
+				*utiltestingapi.MakeFlavorQuotas("default").
 					Resource(corev1.ResourceCPU, "15").Obj()).
 			Cohort("one").
 			NamespaceSelector(nil).
 			Obj(),
-		*utiltesting.MakeClusterQueue("c").
+		*utiltestingapi.MakeClusterQueue("c").
 			Cohort("two").
 			NamespaceSelector(nil).
 			Obj(),
-		*utiltesting.MakeClusterQueue("d").
+		*utiltestingapi.MakeClusterQueue("d").
 			NamespaceSelector(nil).
 			Obj(),
-		*utiltesting.MakeClusterQueue("e").
+		*utiltestingapi.MakeClusterQueue("e").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("nonexistent-flavor").
+				*utiltestingapi.MakeFlavorQuotas("nonexistent-flavor").
 					Resource(corev1.ResourceCPU, "15").Obj()).
 			Cohort("two").
 			NamespaceSelector(nil).
 			Obj(),
-		*utiltesting.MakeClusterQueue("f").
+		*utiltestingapi.MakeClusterQueue("f").
 			Cohort("two").
 			NamespaceSelector(nil).
 			FlavorFungibility(kueue.FlavorFungibility{
@@ -87,7 +88,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 	}
 	setup := func(log logr.Logger, cache *Cache) error {
 		cache.AddOrUpdateResourceFlavor(log,
-			utiltesting.MakeResourceFlavor("default").
+			utiltestingapi.MakeResourceFlavor("default").
 				NodeLabel("cpuType", "default").
 				Obj())
 		for _, c := range initialClusterQueues {
@@ -177,7 +178,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 		{
 			name: "add ClusterQueue with preemption policies",
 			operation: func(log logr.Logger, cache *Cache) error {
-				cq := utiltesting.MakeClusterQueue("foo").Preemption(kueue.ClusterQueuePreemption{
+				cq := utiltestingapi.MakeClusterQueue("foo").Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 				}).Obj()
@@ -204,7 +205,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 		{
 			name: "add ClusterQueue with fair sharing weight",
 			operation: func(log logr.Logger, cache *Cache) error {
-				cq := utiltesting.MakeClusterQueue("foo").FairWeight(resource.MustParse("2")).Obj()
+				cq := utiltestingapi.MakeClusterQueue("foo").FairWeight(resource.MustParse("2")).Obj()
 				if err := cache.AddClusterQueue(ctx, cq); err != nil {
 					return fmt.Errorf("failed to add ClusterQueue: %w", err)
 				}
@@ -231,7 +232,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 					}
 				}
 				cache.AddOrUpdateResourceFlavor(log,
-					utiltesting.MakeResourceFlavor("default").
+					utiltestingapi.MakeResourceFlavor("default").
 						NodeLabel("cpuType", "default").
 						Obj())
 				return nil
@@ -308,17 +309,17 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 					return err
 				}
 				clusterQueues := []kueue.ClusterQueue{
-					*utiltesting.MakeClusterQueue("a").
+					*utiltestingapi.MakeClusterQueue("a").
 						ResourceGroup(
-							*utiltesting.MakeFlavorQuotas("default").
+							*utiltestingapi.MakeFlavorQuotas("default").
 								Resource(corev1.ResourceCPU, "5", "5").Obj()).
 						Cohort("two").
 						NamespaceSelector(nil).
 						Obj(),
-					*utiltesting.MakeClusterQueue("b").Cohort("one").Obj(), // remove the only resource group and set a namespace selector.
-					*utiltesting.MakeClusterQueue("e").
+					*utiltestingapi.MakeClusterQueue("b").Cohort("one").Obj(), // remove the only resource group and set a namespace selector.
+					*utiltestingapi.MakeClusterQueue("e").
 						ResourceGroup(
-							*utiltesting.MakeFlavorQuotas("default").
+							*utiltestingapi.MakeFlavorQuotas("default").
 								Resource(corev1.ResourceCPU, "5", "5", "4").
 								Obj()).
 						Cohort("two").
@@ -331,7 +332,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 					}
 				}
 				cache.AddOrUpdateResourceFlavor(log,
-					utiltesting.MakeResourceFlavor("default").
+					utiltestingapi.MakeResourceFlavor("default").
 						NodeLabel("cpuType", "default").
 						NodeLabel("region", "central").
 						Obj())
@@ -405,13 +406,13 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 			name: "shouldn't delete usage resources on update ClusterQueue",
 			operation: func(log logr.Logger, cache *Cache) error {
 				cache.AddOrUpdateResourceFlavor(log,
-					utiltesting.MakeResourceFlavor("default").
+					utiltestingapi.MakeResourceFlavor("default").
 						NodeLabel("cpuType", "default").
 						Obj())
 
-				cq := utiltesting.MakeClusterQueue("a").
+				cq := utiltestingapi.MakeClusterQueue("a").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "10", "10").Obj()).
 					Cohort("one").
 					NamespaceSelector(nil).
@@ -421,10 +422,10 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 					return fmt.Errorf("failed adding ClusterQueue: %w", err)
 				}
 
-				wl := utiltesting.MakeWorkload("one", "").
+				wl := utiltestingapi.MakeWorkload("one", "").
 					Request(corev1.ResourceCPU, "5").
-					ReserveQuota(utiltesting.MakeAdmission("a").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("a").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "5000m").
 							Obj()).Obj()).
 					Condition(metav1.Condition{Type: kueue.WorkloadAdmitted, Status: metav1.ConditionTrue}).
@@ -432,8 +433,8 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 
 				cache.AddOrUpdateWorkload(log, wl)
 
-				cq = utiltesting.MakeClusterQueue("a").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").Obj()).
+				cq = utiltestingapi.MakeClusterQueue("a").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Cohort("one").
 					NamespaceSelector(nil).
 					Obj()
@@ -463,10 +464,10 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 					FairWeight: defaultWeight,
 					Workloads: map[workload.Reference]*workload.Info{
 						"/one": {
-							Obj: utiltesting.MakeWorkload("one", "").
+							Obj: utiltestingapi.MakeWorkload("one", "").
 								Request(corev1.ResourceCPU, "5").
-								ReserveQuota(utiltesting.MakeAdmission("a").
-									PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+								ReserveQuota(utiltestingapi.MakeAdmission("a").
+									PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 										Assignment(corev1.ResourceCPU, "default", "5000m").
 										Obj()).Obj()).
 								Condition(metav1.Condition{Type: kueue.WorkloadAdmitted, Status: metav1.ConditionTrue}).
@@ -496,17 +497,17 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 			operation: func(log logr.Logger, cache *Cache) error {
 				_ = setup(log, cache)
 				updateCqs := []kueue.ClusterQueue{
-					*utiltesting.MakeClusterQueue("a").NamespaceSelector(nil).Cohort("three").Obj(),
-					*utiltesting.MakeClusterQueue("b").NamespaceSelector(nil).Obj(),
-					*utiltesting.MakeClusterQueue("c").NamespaceSelector(nil).Cohort("three").Obj(),
+					*utiltestingapi.MakeClusterQueue("a").NamespaceSelector(nil).Cohort("three").Obj(),
+					*utiltestingapi.MakeClusterQueue("b").NamespaceSelector(nil).Obj(),
+					*utiltestingapi.MakeClusterQueue("c").NamespaceSelector(nil).Cohort("three").Obj(),
 				}
 				for _, c := range updateCqs {
 					_ = cache.UpdateClusterQueue(log, &c)
 				}
 				deleteCqs := []kueue.ClusterQueue{
-					*utiltesting.MakeClusterQueue("d").Cohort("two").Obj(),
-					*utiltesting.MakeClusterQueue("e").Cohort("two").Obj(),
-					*utiltesting.MakeClusterQueue("f").Cohort("two").Obj(),
+					*utiltestingapi.MakeClusterQueue("d").Cohort("two").Obj(),
+					*utiltestingapi.MakeClusterQueue("e").Cohort("two").Obj(),
+					*utiltestingapi.MakeClusterQueue("f").Cohort("two").Obj(),
 				}
 				for _, c := range deleteCqs {
 					cache.DeleteClusterQueue(&c)
@@ -618,7 +619,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 				if err != nil {
 					return err
 				}
-				cache.AddOrUpdateResourceFlavor(log, utiltesting.MakeResourceFlavor("nonexistent-flavor").Obj())
+				cache.AddOrUpdateResourceFlavor(log, utiltestingapi.MakeResourceFlavor("nonexistent-flavor").Obj())
 				return nil
 			},
 			wantClusterQueues: map[kueue.ClusterQueueReference]*clusterQueue{
@@ -689,20 +690,20 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 			name: "Add ClusterQueue with multiple resource groups",
 			operation: func(log logr.Logger, cache *Cache) error {
 				err := cache.AddClusterQueue(ctx,
-					utiltesting.MakeClusterQueue("foo").
+					utiltestingapi.MakeClusterQueue("foo").
 						ResourceGroup(
-							*utiltesting.MakeFlavorQuotas("foo").
+							*utiltestingapi.MakeFlavorQuotas("foo").
 								Resource("cpu").
 								Resource("memory").
 								Obj(),
-							*utiltesting.MakeFlavorQuotas("bar").
+							*utiltestingapi.MakeFlavorQuotas("bar").
 								Resource("cpu").
 								Resource("memory").
 								Obj(),
 						).
 						ResourceGroup(
-							*utiltesting.MakeFlavorQuotas("theta").Resource("example.com/gpu").Obj(),
-							*utiltesting.MakeFlavorQuotas("gamma").Resource("example.com/gpu").Obj(),
+							*utiltestingapi.MakeFlavorQuotas("theta").Resource("example.com/gpu").Obj(),
+							*utiltestingapi.MakeFlavorQuotas("gamma").Resource("example.com/gpu").Obj(),
 						).
 						Obj())
 				if err != nil {
@@ -726,7 +727,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 			name: "add cluster queue with missing check",
 			operation: func(log logr.Logger, cache *Cache) error {
 				err := cache.AddClusterQueue(ctx,
-					utiltesting.MakeClusterQueue("foo").
+					utiltestingapi.MakeClusterQueue("foo").
 						AdmissionChecks("check1", "check2").
 						Obj())
 				if err != nil {
@@ -755,15 +756,15 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 			name: "add check after queue creation",
 			operation: func(log logr.Logger, cache *Cache) error {
 				err := cache.AddClusterQueue(ctx,
-					utiltesting.MakeClusterQueue("foo").
+					utiltestingapi.MakeClusterQueue("foo").
 						AdmissionChecks("check1", "check2").
 						Obj())
 				if err != nil {
 					return fmt.Errorf("adding ClusterQueue: %w", err)
 				}
 
-				cache.AddOrUpdateAdmissionCheck(log, utiltesting.MakeAdmissionCheck("check1").Active(metav1.ConditionTrue).Obj())
-				cache.AddOrUpdateAdmissionCheck(log, utiltesting.MakeAdmissionCheck("check2").Active(metav1.ConditionTrue).Obj())
+				cache.AddOrUpdateAdmissionCheck(log, utiltestingapi.MakeAdmissionCheck("check1").Active(metav1.ConditionTrue).Obj())
+				cache.AddOrUpdateAdmissionCheck(log, utiltestingapi.MakeAdmissionCheck("check2").Active(metav1.ConditionTrue).Obj())
 				return nil
 			},
 			wantClusterQueues: map[kueue.ClusterQueueReference]*clusterQueue{
@@ -786,17 +787,17 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 		{
 			name: "remove check after queue creation",
 			operation: func(log logr.Logger, cache *Cache) error {
-				cache.AddOrUpdateAdmissionCheck(log, utiltesting.MakeAdmissionCheck("check1").Active(metav1.ConditionTrue).Obj())
-				cache.AddOrUpdateAdmissionCheck(log, utiltesting.MakeAdmissionCheck("check2").Active(metav1.ConditionTrue).Obj())
+				cache.AddOrUpdateAdmissionCheck(log, utiltestingapi.MakeAdmissionCheck("check1").Active(metav1.ConditionTrue).Obj())
+				cache.AddOrUpdateAdmissionCheck(log, utiltestingapi.MakeAdmissionCheck("check2").Active(metav1.ConditionTrue).Obj())
 				err := cache.AddClusterQueue(ctx,
-					utiltesting.MakeClusterQueue("foo").
+					utiltestingapi.MakeClusterQueue("foo").
 						AdmissionChecks("check1", "check2").
 						Obj())
 				if err != nil {
 					return fmt.Errorf("adding ClusterQueue: %w", err)
 				}
 
-				cache.DeleteAdmissionCheck(log, utiltesting.MakeAdmissionCheck("check2").Obj())
+				cache.DeleteAdmissionCheck(log, utiltestingapi.MakeAdmissionCheck("check2").Obj())
 				return nil
 			},
 			wantClusterQueues: map[kueue.ClusterQueueReference]*clusterQueue{
@@ -819,17 +820,17 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 		{
 			name: "inactivate check after queue creation",
 			operation: func(log logr.Logger, cache *Cache) error {
-				cache.AddOrUpdateAdmissionCheck(log, utiltesting.MakeAdmissionCheck("check1").Active(metav1.ConditionTrue).Obj())
-				cache.AddOrUpdateAdmissionCheck(log, utiltesting.MakeAdmissionCheck("check2").Active(metav1.ConditionTrue).Obj())
+				cache.AddOrUpdateAdmissionCheck(log, utiltestingapi.MakeAdmissionCheck("check1").Active(metav1.ConditionTrue).Obj())
+				cache.AddOrUpdateAdmissionCheck(log, utiltestingapi.MakeAdmissionCheck("check2").Active(metav1.ConditionTrue).Obj())
 				err := cache.AddClusterQueue(ctx,
-					utiltesting.MakeClusterQueue("foo").
+					utiltestingapi.MakeClusterQueue("foo").
 						AdmissionChecks("check1", "check2").
 						Obj())
 				if err != nil {
 					return fmt.Errorf("adding ClusterQueue: %w", err)
 				}
 
-				cache.AddOrUpdateAdmissionCheck(log, utiltesting.MakeAdmissionCheck("check2").Active(metav1.ConditionFalse).Obj())
+				cache.AddOrUpdateAdmissionCheck(log, utiltestingapi.MakeAdmissionCheck("check2").Active(metav1.ConditionFalse).Obj())
 				return nil
 			},
 			wantClusterQueues: map[kueue.ClusterQueueReference]*clusterQueue{
@@ -852,34 +853,34 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 		{
 			name: "add cluster queue after finished workloads",
 			clientObjects: []client.Object{
-				utiltesting.MakeLocalQueue("lq1", "ns").ClusterQueue("cq1").Obj(),
-				utiltesting.MakeWorkload("pending", "ns").Obj(),
-				utiltesting.MakeWorkload("reserving", "ns").ReserveQuota(
-					utiltesting.MakeAdmission("cq1").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeLocalQueue("lq1", "ns").ClusterQueue("cq1").Obj(),
+				utiltestingapi.MakeWorkload("pending", "ns").Obj(),
+				utiltestingapi.MakeWorkload("reserving", "ns").ReserveQuota(
+					utiltestingapi.MakeAdmission("cq1").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "f1", "1").
 							Obj()).
 						Obj(),
 				).Obj(),
-				utiltesting.MakeWorkload("admitted", "ns").ReserveQuota(
-					utiltesting.MakeAdmission("cq1").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeWorkload("admitted", "ns").ReserveQuota(
+					utiltestingapi.MakeAdmission("cq1").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "f1", "1").
 							Obj()).
 						Obj(),
 				).Admitted(true).Obj(),
-				utiltesting.MakeWorkload("finished", "ns").ReserveQuota(
-					utiltesting.MakeAdmission("cq1").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeWorkload("finished", "ns").ReserveQuota(
+					utiltestingapi.MakeAdmission("cq1").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "f1", "1").
 							Obj()).
 						Obj(),
 				).Admitted(true).Finished().Obj(),
 			},
 			operation: func(log logr.Logger, cache *Cache) error {
-				cache.AddOrUpdateResourceFlavor(log, utiltesting.MakeResourceFlavor("f1").Obj())
+				cache.AddOrUpdateResourceFlavor(log, utiltestingapi.MakeResourceFlavor("f1").Obj())
 				err := cache.AddClusterQueue(ctx,
-					utiltesting.MakeClusterQueue("cq1").
+					utiltestingapi.MakeClusterQueue("cq1").
 						ResourceGroup(kueue.FlavorQuotas{
 							Name: "f1",
 							Resources: []kueue.ResourceQuota{
@@ -947,7 +948,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 		{
 			name: "add CQ with multiple resource groups and flavors",
 			operation: func(log logr.Logger, cache *Cache) error {
-				cq := utiltesting.MakeClusterQueue("foo").
+				cq := utiltestingapi.MakeClusterQueue("foo").
 					ResourceGroup(
 						kueue.FlavorQuotas{
 							Name: "on-demand",
@@ -1011,7 +1012,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 			name:                "should not populate the fields with lendingLimit when feature disabled",
 			disableLendingLimit: true,
 			operation: func(log logr.Logger, cache *Cache) error {
-				cq := utiltesting.MakeClusterQueue("foo").
+				cq := utiltestingapi.MakeClusterQueue("foo").
 					ResourceGroup(
 						kueue.FlavorQuotas{
 							Name: "on-demand",
@@ -1074,7 +1075,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 		{
 			name: "create cohort",
 			operation: func(log logr.Logger, cache *Cache) error {
-				cohort := utiltesting.MakeCohort("cohort").Obj()
+				cohort := utiltestingapi.MakeCohort("cohort").Obj()
 				return cache.AddOrUpdateCohort(cohort)
 			},
 			wantCohorts: map[kueue.CohortReference]sets.Set[kueue.ClusterQueueReference]{
@@ -1084,7 +1085,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 		{
 			name: "create and delete cohort",
 			operation: func(log logr.Logger, cache *Cache) error {
-				cohort := utiltesting.MakeCohort("cohort").Obj()
+				cohort := utiltestingapi.MakeCohort("cohort").Obj()
 				_ = cache.AddOrUpdateCohort(cohort)
 				cache.DeleteCohort(kueue.CohortReference(cohort.Name))
 				return nil
@@ -1094,11 +1095,11 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 		{
 			name: "cohort remains after deletion when child exists",
 			operation: func(log logr.Logger, cache *Cache) error {
-				cohort := utiltesting.MakeCohort("cohort").Obj()
+				cohort := utiltestingapi.MakeCohort("cohort").Obj()
 				_ = cache.AddOrUpdateCohort(cohort)
 
 				_ = cache.AddClusterQueue(ctx,
-					utiltesting.MakeClusterQueue("cq").Cohort("cohort").Obj())
+					utiltestingapi.MakeClusterQueue("cq").Cohort("cohort").Obj())
 				cache.DeleteCohort(kueue.CohortReference(cohort.Name))
 				return nil
 			},
@@ -1155,27 +1156,27 @@ func TestCacheClusterQueueOperations(t *testing.T) {
 
 func TestCacheWorkloadOperations(t *testing.T) {
 	clusterQueues := []kueue.ClusterQueue{
-		*utiltesting.MakeClusterQueue("one").
+		*utiltestingapi.MakeClusterQueue("one").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("on-demand").Resource("cpu").Obj(),
-				*utiltesting.MakeFlavorQuotas("spot").Resource("cpu").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("cpu").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot").Resource("cpu").Obj(),
 			).
 			NamespaceSelector(nil).
 			Obj(),
-		*utiltesting.MakeClusterQueue("two").
+		*utiltestingapi.MakeClusterQueue("two").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("on-demand").Resource("cpu").Obj(),
-				*utiltesting.MakeFlavorQuotas("spot").Resource("cpu").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("cpu").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot").Resource("cpu").Obj(),
 			).
 			NamespaceSelector(nil).
 			Obj(),
 	}
 	podSets := []kueue.PodSet{
-		*utiltesting.MakePodSet("driver", 1).
+		*utiltestingapi.MakePodSet("driver", 1).
 			Request(corev1.ResourceCPU, "10m").
 			Request(corev1.ResourceMemory, "512Ki").
 			Obj(),
-		*utiltesting.MakePodSet("workers", 3).
+		*utiltestingapi.MakePodSet("workers", 3).
 			Request(corev1.ResourceCPU, "5m").
 			Obj(),
 	}
@@ -1200,14 +1201,14 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		},
 	}
 	cl := utiltesting.NewFakeClient(
-		utiltesting.MakeWorkload("a", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
+		utiltestingapi.MakeWorkload("a", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
 			ClusterQueue:      "one",
 			PodSetAssignments: psAssignments,
 		}).Obj(),
-		utiltesting.MakeWorkload("b", "").ReserveQuota(&kueue.Admission{
+		utiltestingapi.MakeWorkload("b", "").ReserveQuota(&kueue.Admission{
 			ClusterQueue: "one",
 		}).Obj(),
-		utiltesting.MakeWorkload("c", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
+		utiltestingapi.MakeWorkload("c", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
 			ClusterQueue: "two",
 		}).Obj())
 
@@ -1228,14 +1229,14 @@ func TestCacheWorkloadOperations(t *testing.T) {
 			name: "add",
 			operation: func(log logr.Logger, cache *Cache) error {
 				workloads := []*kueue.Workload{
-					utiltesting.MakeWorkload("a", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
+					utiltestingapi.MakeWorkload("a", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
 						ClusterQueue:      "one",
 						PodSetAssignments: psAssignments,
 					}).Obj(),
-					utiltesting.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
+					utiltestingapi.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
 						ClusterQueue: "two",
 					}).Obj(),
-					utiltesting.MakeWorkload("pending", "").Obj(),
+					utiltestingapi.MakeWorkload("pending", "").Obj(),
 				}
 				for i := range workloads {
 					cache.AddOrUpdateWorkload(log, workloads[i])
@@ -1258,7 +1259,7 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "add error clusterQueue doesn't exist",
 			operation: func(log logr.Logger, cache *Cache) error {
-				w := utiltesting.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
+				w := utiltestingapi.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "three",
 				}).Obj()
 				if !cache.AddOrUpdateWorkload(log, w) {
@@ -1283,7 +1284,7 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "add already exists",
 			operation: func(log logr.Logger, cache *Cache) error {
-				w := utiltesting.MakeWorkload("b", "").ReserveQuota(&kueue.Admission{
+				w := utiltestingapi.MakeWorkload("b", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Obj()
 				if !cache.AddOrUpdateWorkload(log, w) {
@@ -1307,10 +1308,10 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "update cluster queue for a workload",
 			operation: func(log logr.Logger, cache *Cache) error {
-				old := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				old := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Obj()
-				latest := utiltesting.MakeWorkload("a", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
+				latest := utiltestingapi.MakeWorkload("a", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
 					ClusterQueue:      "two",
 					PodSetAssignments: psAssignments,
 				}).Obj()
@@ -1336,10 +1337,10 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "update error old clusterQueue doesn't exist",
 			operation: func(log logr.Logger, cache *Cache) error {
-				old := utiltesting.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
+				old := utiltestingapi.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "three",
 				}).Obj()
-				latest := utiltesting.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
+				latest := utiltestingapi.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Obj()
 				return cache.UpdateWorkload(log, old, latest)
@@ -1361,10 +1362,10 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "update error new clusterQueue doesn't exist",
 			operation: func(log logr.Logger, cache *Cache) error {
-				old := utiltesting.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
+				old := utiltestingapi.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Obj()
-				latest := utiltesting.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
+				latest := utiltestingapi.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "three",
 				}).Obj()
 				return cache.UpdateWorkload(log, old, latest)
@@ -1386,10 +1387,10 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "update workload which doesn't exist.",
 			operation: func(log logr.Logger, cache *Cache) error {
-				old := utiltesting.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
+				old := utiltestingapi.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Obj()
-				latest := utiltesting.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
+				latest := utiltestingapi.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "two",
 				}).Obj()
 				return cache.UpdateWorkload(log, old, latest)
@@ -1410,7 +1411,7 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "delete",
 			operation: func(log logr.Logger, cache *Cache) error {
-				w := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				w := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Obj()
 				return cache.DeleteWorkload(log, w)
@@ -1431,7 +1432,7 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "delete workload with cancelled admission",
 			operation: func(log logr.Logger, cache *Cache) error {
-				w := utiltesting.MakeWorkload("a", "").Obj()
+				w := utiltestingapi.MakeWorkload("a", "").Obj()
 				return cache.DeleteWorkload(log, w)
 			},
 			wantResults: map[kueue.ClusterQueueReference]result{
@@ -1450,7 +1451,7 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "attempt deleting non-existing workload with cancelled admission",
 			operation: func(log logr.Logger, cache *Cache) error {
-				w := utiltesting.MakeWorkload("d", "").Obj()
+				w := utiltestingapi.MakeWorkload("d", "").Obj()
 				return cache.DeleteWorkload(log, w)
 			},
 			wantError: "cluster queue not found",
@@ -1470,7 +1471,7 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "delete error clusterQueue doesn't exist",
 			operation: func(log logr.Logger, cache *Cache) error {
-				w := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				w := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "three",
 				}).Obj()
 				return cache.DeleteWorkload(log, w)
@@ -1492,7 +1493,7 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "delete workload which doesn't exist",
 			operation: func(log logr.Logger, cache *Cache) error {
-				w := utiltesting.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
+				w := utiltestingapi.MakeWorkload("d", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Obj()
 				return cache.DeleteWorkload(log, w)
@@ -1514,11 +1515,11 @@ func TestCacheWorkloadOperations(t *testing.T) {
 			name: "assume",
 			operation: func(log logr.Logger, cache *Cache) error {
 				workloads := []*kueue.Workload{
-					utiltesting.MakeWorkload("d", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
+					utiltestingapi.MakeWorkload("d", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
 						ClusterQueue:      "one",
 						PodSetAssignments: psAssignments,
 					}).Obj(),
-					utiltesting.MakeWorkload("e", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
+					utiltestingapi.MakeWorkload("e", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
 						ClusterQueue:      "two",
 						PodSetAssignments: psAssignments,
 					}).Obj(),
@@ -1554,7 +1555,7 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "assume error clusterQueue doesn't exist",
 			operation: func(log logr.Logger, cache *Cache) error {
-				w := utiltesting.MakeWorkload("d", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
+				w := utiltestingapi.MakeWorkload("d", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
 					ClusterQueue: "three",
 				}).Obj()
 				if err := cache.AssumeWorkload(log, w); err != nil {
@@ -1581,11 +1582,11 @@ func TestCacheWorkloadOperations(t *testing.T) {
 			name: "forget",
 			operation: func(log logr.Logger, cache *Cache) error {
 				workloads := []*kueue.Workload{
-					utiltesting.MakeWorkload("d", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
+					utiltestingapi.MakeWorkload("d", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
 						ClusterQueue:      "one",
 						PodSetAssignments: psAssignments,
 					}).Obj(),
-					utiltesting.MakeWorkload("e", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
+					utiltestingapi.MakeWorkload("e", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
 						ClusterQueue:      "two",
 						PodSetAssignments: psAssignments,
 					}).Obj(),
@@ -1622,7 +1623,7 @@ func TestCacheWorkloadOperations(t *testing.T) {
 		{
 			name: "forget error workload is not assumed",
 			operation: func(log logr.Logger, cache *Cache) error {
-				w := utiltesting.MakeWorkload("b", "").ReserveQuota(&kueue.Admission{
+				w := utiltestingapi.MakeWorkload("b", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Obj()
 				if err := cache.ForgetWorkload(log, w); err != nil {
@@ -1648,11 +1649,11 @@ func TestCacheWorkloadOperations(t *testing.T) {
 			name: "add assumed workload",
 			operation: func(log logr.Logger, cache *Cache) error {
 				workloads := []*kueue.Workload{
-					utiltesting.MakeWorkload("d", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
+					utiltestingapi.MakeWorkload("d", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
 						ClusterQueue:      "one",
 						PodSetAssignments: psAssignments,
 					}).Obj(),
-					utiltesting.MakeWorkload("e", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
+					utiltestingapi.MakeWorkload("e", "").PodSets(podSets...).ReserveQuota(&kueue.Admission{
 						ClusterQueue:      "two",
 						PodSetAssignments: psAssignments,
 					}).Obj(),
@@ -1726,22 +1727,22 @@ func TestCacheWorkloadOperations(t *testing.T) {
 }
 
 func TestClusterQueueUsage(t *testing.T) {
-	cq := utiltesting.MakeClusterQueue("foo").
+	cq := utiltestingapi.MakeClusterQueue("foo").
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("default").
+			*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "10", "10").
 				Obj(),
 		).
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("model_a").
+			*utiltestingapi.MakeFlavorQuotas("model_a").
 				Resource("example.com/gpu", "5", "5").
 				Obj(),
-			*utiltesting.MakeFlavorQuotas("model_b").
+			*utiltestingapi.MakeFlavorQuotas("model_b").
 				Resource("example.com/gpu", "5").
 				Obj(),
 		).
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("interconnect_a").
+			*utiltestingapi.MakeFlavorQuotas("interconnect_a").
 				Resource("example.com/vf-0", "5", "5").
 				Resource("example.com/vf-1", "5", "5").
 				Resource("example.com/vf-2", "5", "5").
@@ -1751,22 +1752,22 @@ func TestClusterQueueUsage(t *testing.T) {
 	cqWithOutCohort := cq.DeepCopy()
 	cqWithOutCohort.Spec.Cohort = ""
 	workloads := []kueue.Workload{
-		*utiltesting.MakeWorkload("one", "").
+		*utiltestingapi.MakeWorkload("one", "").
 			Request(corev1.ResourceCPU, "8").
 			Request("example.com/gpu", "5").
-			ReserveQuota(utiltesting.MakeAdmission("foo").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			ReserveQuota(utiltestingapi.MakeAdmission("foo").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceCPU, "default", "8000m").
 					Assignment("example.com/gpu", "model_a", "5").
 					Obj()).
 				Obj()).
 			Condition(metav1.Condition{Type: kueue.WorkloadAdmitted, Status: metav1.ConditionTrue}).
 			Obj(),
-		*utiltesting.MakeWorkload("two", "").
+		*utiltestingapi.MakeWorkload("two", "").
 			Request(corev1.ResourceCPU, "5").
 			Request("example.com/gpu", "6").
-			ReserveQuota(utiltesting.MakeAdmission("foo").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			ReserveQuota(utiltestingapi.MakeAdmission("foo").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceCPU, "default", "5000m").
 					Assignment("example.com/gpu", "model_b", "6").
 					Obj()).
@@ -1988,14 +1989,14 @@ func TestClusterQueueUsage(t *testing.T) {
 		"clusterQueue with cohort; partial admission": {
 			clusterQueue: cq,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("partial-one", "").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "2").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("foo").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "4000m").Count(2).Obj()).Obj()).
+				*utiltestingapi.MakeWorkload("partial-one", "").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "2").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("foo").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "4000m").Count(2).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
-				*utiltesting.MakeWorkload("partial-two", "").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "2").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("foo").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "4000m").Count(2).Obj()).Obj()).
+				*utiltestingapi.MakeWorkload("partial-two", "").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "2").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("foo").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "4000m").Count(2).Obj()).Obj()).
 					Obj(),
 			},
 			wantReservedResources: []kueue.FlavorUsage{
@@ -2097,26 +2098,26 @@ func TestClusterQueueUsage(t *testing.T) {
 }
 
 func TestLocalQueueUsage(t *testing.T) {
-	cq := *utiltesting.MakeClusterQueue("foo").
+	cq := *utiltestingapi.MakeClusterQueue("foo").
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("default").
+			*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "10", "10").Obj(),
 		).
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("model-a").
+			*utiltestingapi.MakeFlavorQuotas("model-a").
 				Resource("example.com/gpu", "5").Obj(),
-			*utiltesting.MakeFlavorQuotas("model-b").
+			*utiltestingapi.MakeFlavorQuotas("model-b").
 				Resource("example.com/gpu", "5").Obj(),
 		).
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("interconnect-a").
+			*utiltestingapi.MakeFlavorQuotas("interconnect-a").
 				Resource("example.com/vf-0", "5", "5").
 				Resource("example.com/vf-1", "5", "5").
 				Resource("example.com/vf-2", "5", "5").
 				Obj(),
 		).
 		Obj()
-	localQueue := *utiltesting.MakeLocalQueue("test", "ns1").
+	localQueue := *utiltestingapi.MakeLocalQueue("test", "ns1").
 		ClusterQueue("foo").Obj()
 	cases := map[string]struct {
 		cq             *kueue.ClusterQueue
@@ -2126,7 +2127,7 @@ func TestLocalQueueUsage(t *testing.T) {
 	}{
 		"clusterQueue is missing": {
 			wls: []kueue.Workload{
-				*utiltesting.MakeWorkload("one", "ns1").
+				*utiltestingapi.MakeWorkload("one", "ns1").
 					Queue("test").
 					Request(corev1.ResourceCPU, "5").Obj(),
 			},
@@ -2175,24 +2176,24 @@ func TestLocalQueueUsage(t *testing.T) {
 		"all workloads are admitted": {
 			cq: &cq,
 			wls: []kueue.Workload{
-				*utiltesting.MakeWorkload("one", "ns1").
+				*utiltestingapi.MakeWorkload("one", "ns1").
 					Queue("test").
 					Request(corev1.ResourceCPU, "5").
 					Request("example.com/gpu", "5").
 					ReserveQuota(
-						utiltesting.MakeAdmission("foo").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("foo").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "5000m").
 								Assignment("example.com/gpu", "model-a", "5").Obj()).Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("two", "ns1").
+				*utiltestingapi.MakeWorkload("two", "ns1").
 					Queue("test").
 					Request(corev1.ResourceCPU, "3").
 					Request("example.com/gpu", "3").
 					ReserveQuota(
-						utiltesting.MakeAdmission("foo").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("foo").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Assignment("example.com/gpu", "model-b", "3").Obj()).Obj(),
 					).
@@ -2239,17 +2240,17 @@ func TestLocalQueueUsage(t *testing.T) {
 		"some workloads are inadmissible": {
 			cq: &cq,
 			wls: []kueue.Workload{
-				*utiltesting.MakeWorkload("one", "ns1").
+				*utiltestingapi.MakeWorkload("one", "ns1").
 					Queue("test").
 					Request(corev1.ResourceCPU, "5").
 					Request("example.com/gpu", "5").
 					ReserveQuota(
-						utiltesting.MakeAdmission("foo").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("foo").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "5000m").
 								Assignment("example.com/gpu", "model-a", "5").Obj()).Obj(),
 					).Obj(),
-				*utiltesting.MakeWorkload("two", "ns1").
+				*utiltestingapi.MakeWorkload("two", "ns1").
 					Queue("test").
 					Request(corev1.ResourceCPU, "100000").
 					Request("example.com/gpu", "3").Obj(),
@@ -2323,16 +2324,16 @@ func TestLocalQueueUsage(t *testing.T) {
 }
 
 func TestGetCacheLQ(t *testing.T) {
-	cq := utiltesting.MakeClusterQueue("cq").
+	cq := utiltestingapi.MakeClusterQueue("cq").
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("spot").
+			*utiltestingapi.MakeFlavorQuotas("spot").
 				Resource("cpu", "10", "10").
 				Resource("memory", "64Gi", "64Gi").Obj(),
 		).ResourceGroup(
-		*utiltesting.MakeFlavorQuotas("model-a").
+		*utiltestingapi.MakeFlavorQuotas("model-a").
 			Resource("example.com/gpu", "10", "10").Obj(),
 	).Obj()
-	lq := utiltesting.MakeLocalQueue("lq-a", "ns").ClusterQueue("cq").Obj()
+	lq := utiltestingapi.MakeLocalQueue("lq-a", "ns").ClusterQueue("cq").Obj()
 	cases := map[string]struct {
 		getLq          *kueue.LocalQueue
 		getCQReference kueue.ClusterQueueReference
@@ -2346,7 +2347,7 @@ func TestGetCacheLQ(t *testing.T) {
 				key: "ns/lq-a",
 			}},
 		"LQ doesnt exist": {
-			getLq:          utiltesting.MakeLocalQueue("non-existing-lq", "ns").ClusterQueue("cq").Obj(),
+			getLq:          utiltestingapi.MakeLocalQueue("non-existing-lq", "ns").ClusterQueue("cq").Obj(),
 			getCQReference: "cq",
 			wantErr:        errQNotFound,
 		},
@@ -2381,69 +2382,69 @@ func TestGetCacheLQ(t *testing.T) {
 
 func TestCacheQueueOperations(t *testing.T) {
 	cqs := []*kueue.ClusterQueue{
-		utiltesting.MakeClusterQueue("foo").
+		utiltestingapi.MakeClusterQueue("foo").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("spot").
+				*utiltestingapi.MakeFlavorQuotas("spot").
 					Resource("cpu", "10", "10").
 					Resource("memory", "64Gi", "64Gi").Obj(),
 			).ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("model-a").
+			*utiltestingapi.MakeFlavorQuotas("model-a").
 				Resource("example.com/gpu", "10", "10").Obj(),
 		).Obj(),
-		utiltesting.MakeClusterQueue("bar").
+		utiltestingapi.MakeClusterQueue("bar").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("ondemand").
+				*utiltestingapi.MakeFlavorQuotas("ondemand").
 					Resource("cpu", "5", "5").
 					Resource("memory", "32Gi", "32Gi").Obj(),
 			).ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("model-b").
+			*utiltestingapi.MakeFlavorQuotas("model-b").
 				Resource("example.com/gpu", "5", "5").Obj(),
 		).Obj(),
 	}
 	queues := []*kueue.LocalQueue{
-		utiltesting.MakeLocalQueue("alpha", "ns1").ClusterQueue("foo").Obj(),
-		utiltesting.MakeLocalQueue("beta", "ns2").ClusterQueue("foo").Obj(),
-		utiltesting.MakeLocalQueue("gamma", "ns1").ClusterQueue("bar").Obj(),
+		utiltestingapi.MakeLocalQueue("alpha", "ns1").ClusterQueue("foo").Obj(),
+		utiltestingapi.MakeLocalQueue("beta", "ns2").ClusterQueue("foo").Obj(),
+		utiltestingapi.MakeLocalQueue("gamma", "ns1").ClusterQueue("bar").Obj(),
 	}
 	workloads := []*kueue.Workload{
-		utiltesting.MakeWorkload("job1", "ns1").
+		utiltestingapi.MakeWorkload("job1", "ns1").
 			Queue("alpha").
 			Request("cpu", "2").
 			Request("memory", "8Gi").
 			ReserveQuota(
-				utiltesting.MakeAdmission("foo").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeAdmission("foo").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("cpu", "spot", "2").
 						Assignment("memory", "spot", "8Gi").Obj()).Obj(),
 			).
 			Condition(metav1.Condition{Type: kueue.WorkloadAdmitted, Status: metav1.ConditionTrue}).
 			Obj(),
-		utiltesting.MakeWorkload("job2", "ns2").
+		utiltestingapi.MakeWorkload("job2", "ns2").
 			Queue("beta").
 			Request("example.com/gpu", "2").
 			ReserveQuota(
-				utiltesting.MakeAdmission("foo").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeAdmission("foo").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("example.com/gpu", "model-a", "2").Obj()).Obj(),
 			).
 			Condition(metav1.Condition{Type: kueue.WorkloadAdmitted, Status: metav1.ConditionTrue}).
 			Obj(),
-		utiltesting.MakeWorkload("job3", "ns1").
+		utiltestingapi.MakeWorkload("job3", "ns1").
 			Queue("gamma").
 			Request("cpu", "5").
 			Request("memory", "16Gi").
 			ReserveQuota(
-				utiltesting.MakeAdmission("bar").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeAdmission("bar").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("cpu", "ondemand", "5").
 						Assignment("memory", "ondemand", "16Gi").Obj()).Obj(),
 			).Obj(),
-		utiltesting.MakeWorkload("job4", "ns2").
+		utiltestingapi.MakeWorkload("job4", "ns2").
 			Queue("beta").
 			Request("example.com/gpu", "5").
 			ReserveQuota(
-				utiltesting.MakeAdmission("foo").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeAdmission("foo").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("example.com/gpu", "model-a", "5").Obj()).Obj(),
 			).Obj(),
 	}
@@ -2844,17 +2845,17 @@ func TestCacheQueueOperations(t *testing.T) {
 }
 
 func TestClusterQueuesUsingFlavor(t *testing.T) {
-	x86Rf := utiltesting.MakeResourceFlavor("x86").Obj()
-	aarch64Rf := utiltesting.MakeResourceFlavor("aarch64").Obj()
-	fooCq := utiltesting.MakeClusterQueue("fooCq").
+	x86Rf := utiltestingapi.MakeResourceFlavor("x86").Obj()
+	aarch64Rf := utiltestingapi.MakeResourceFlavor("aarch64").Obj()
+	fooCq := utiltestingapi.MakeClusterQueue("fooCq").
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("x86").Resource("cpu", "5").Obj()).
+			*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "5").Obj()).
 		Obj()
-	barCq := utiltesting.MakeClusterQueue("barCq").Obj()
-	fizzCq := utiltesting.MakeClusterQueue("fizzCq").
+	barCq := utiltestingapi.MakeClusterQueue("barCq").Obj()
+	fizzCq := utiltestingapi.MakeClusterQueue("fizzCq").
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("x86").Resource("cpu", "5").Obj(),
-			*utiltesting.MakeFlavorQuotas("aarch64").Resource("cpu", "3").Obj(),
+			*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "5").Obj(),
+			*utiltestingapi.MakeFlavorQuotas("aarch64").Resource("cpu", "3").Obj(),
 		).
 		Obj()
 
@@ -2914,11 +2915,11 @@ func TestClusterQueuesUsingFlavor(t *testing.T) {
 
 func TestMatchingClusterQueues(t *testing.T) {
 	clusterQueues := []*kueue.ClusterQueue{
-		utiltesting.MakeClusterQueue("matching1").
+		utiltestingapi.MakeClusterQueue("matching1").
 			NamespaceSelector(&metav1.LabelSelector{}).Obj(),
-		utiltesting.MakeClusterQueue("not-matching").
+		utiltestingapi.MakeClusterQueue("not-matching").
 			NamespaceSelector(nil).Obj(),
-		utiltesting.MakeClusterQueue("matching2").
+		utiltestingapi.MakeClusterQueue("matching2").
 			NamespaceSelector(&metav1.LabelSelector{
 				MatchExpressions: []metav1.LabelSelectorRequirement{
 					{
@@ -2962,7 +2963,7 @@ func TestWaitForPodsReadyCancelled(t *testing.T) {
 		t.Fatalf("Failed adding clusterQueue: %v", err)
 	}
 
-	wl := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+	wl := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 		ClusterQueue: "one",
 	}).Obj()
 	if err := cache.AssumeWorkload(log, wl); err != nil {
@@ -3006,7 +3007,7 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 		{
 			name: "add Workload without PodsReady condition",
 			operation: func(log logr.Logger, cache *Cache) error {
-				wl := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				wl := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Obj()
 				cache.AddOrUpdateWorkload(log, wl)
@@ -3017,7 +3018,7 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 		{
 			name: "add Workload with PodsReady=False",
 			operation: func(log logr.Logger, cache *Cache) error {
-				wl := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				wl := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Condition(metav1.Condition{
 					Type:   kueue.WorkloadPodsReady,
@@ -3031,7 +3032,7 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 		{
 			name: "add Workload with PodsReady=True",
 			operation: func(log logr.Logger, cache *Cache) error {
-				wl := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				wl := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Condition(metav1.Condition{
 					Type:   kueue.WorkloadPodsReady,
@@ -3045,7 +3046,7 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 		{
 			name: "assume Workload without PodsReady condition",
 			operation: func(log logr.Logger, cache *Cache) error {
-				wl := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				wl := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Obj()
 				return cache.AssumeWorkload(log, wl)
@@ -3055,7 +3056,7 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 		{
 			name: "assume Workload with PodsReady=False",
 			operation: func(log logr.Logger, cache *Cache) error {
-				wl := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				wl := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Condition(metav1.Condition{
 					Type:   kueue.WorkloadPodsReady,
@@ -3068,7 +3069,7 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 		{
 			name: "assume Workload with PodsReady=True",
 			operation: func(log logr.Logger, cache *Cache) error {
-				wl := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				wl := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Condition(metav1.Condition{
 					Type:   kueue.WorkloadPodsReady,
@@ -3081,7 +3082,7 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 		{
 			name: "update workload to have PodsReady=True",
 			setup: func(log logr.Logger, cache *Cache) error {
-				wl := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				wl := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Obj()
 				cache.AddOrUpdateWorkload(log, wl)
@@ -3101,7 +3102,7 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 		{
 			name: "update workload to have PodsReady=False",
 			setup: func(log logr.Logger, cache *Cache) error {
-				wl := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				wl := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Condition(metav1.Condition{
 					Type:   kueue.WorkloadPodsReady,
@@ -3124,7 +3125,7 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 		{
 			name: "assume second workload without PodsReady",
 			setup: func(log logr.Logger, cache *Cache) error {
-				wl1 := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				wl1 := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Condition(metav1.Condition{
 					Type:   kueue.WorkloadPodsReady,
@@ -3134,7 +3135,7 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 				return nil
 			},
 			operation: func(log logr.Logger, cache *Cache) error {
-				wl2 := utiltesting.MakeWorkload("b", "").ReserveQuota(&kueue.Admission{
+				wl2 := utiltestingapi.MakeWorkload("b", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "two",
 				}).Obj()
 				return cache.AssumeWorkload(log, wl2)
@@ -3144,14 +3145,14 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 		{
 			name: "update second workload to have PodsReady=True",
 			setup: func(log logr.Logger, cache *Cache) error {
-				wl1 := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				wl1 := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Condition(metav1.Condition{
 					Type:   kueue.WorkloadPodsReady,
 					Status: metav1.ConditionTrue,
 				}).Obj()
 				cache.AddOrUpdateWorkload(log, wl1)
-				wl2 := utiltesting.MakeWorkload("b", "").ReserveQuota(&kueue.Admission{
+				wl2 := utiltestingapi.MakeWorkload("b", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "two",
 				}).Obj()
 				cache.AddOrUpdateWorkload(log, wl2)
@@ -3171,7 +3172,7 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 		{
 			name: "delete workload with PodsReady=False",
 			setup: func(log logr.Logger, cache *Cache) error {
-				wl := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				wl := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Condition(metav1.Condition{
 					Type:   kueue.WorkloadPodsReady,
@@ -3189,7 +3190,7 @@ func TestCachePodsReadyForAllAdmittedWorkloads(t *testing.T) {
 		{
 			name: "forget workload with PodsReady=False",
 			setup: func(log logr.Logger, cache *Cache) error {
-				wl := utiltesting.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
+				wl := utiltestingapi.MakeWorkload("a", "").ReserveQuota(&kueue.Admission{
 					ClusterQueue: "one",
 				}).Condition(metav1.Condition{
 					Type:   kueue.WorkloadPodsReady,
@@ -3359,22 +3360,22 @@ func messageOrEmpty(err error) string {
 
 func TestClusterQueuesUsingAdmissionChecks(t *testing.T) {
 	checks := []*kueue.AdmissionCheck{
-		utiltesting.MakeAdmissionCheck("ac1").Obj(),
-		utiltesting.MakeAdmissionCheck("ac2").Obj(),
-		utiltesting.MakeAdmissionCheck("ac3").Obj(),
+		utiltestingapi.MakeAdmissionCheck("ac1").Obj(),
+		utiltestingapi.MakeAdmissionCheck("ac2").Obj(),
+		utiltestingapi.MakeAdmissionCheck("ac3").Obj(),
 	}
 
-	fooCq := utiltesting.MakeClusterQueue("fooCq").
+	fooCq := utiltestingapi.MakeClusterQueue("fooCq").
 		AdmissionChecks("ac1").
 		Obj()
-	barCq := utiltesting.MakeClusterQueue("barCq").Obj()
-	fizzCq := utiltesting.MakeClusterQueue("fizzCq").
+	barCq := utiltestingapi.MakeClusterQueue("barCq").Obj()
+	fizzCq := utiltestingapi.MakeClusterQueue("fizzCq").
 		AdmissionChecks("ac1", "ac2").
 		Obj()
-	strategyCq := utiltesting.MakeClusterQueue("strategyCq").
+	strategyCq := utiltestingapi.MakeClusterQueue("strategyCq").
 		AdmissionCheckStrategy(
-			*utiltesting.MakeAdmissionCheckStrategyRule("ac1").Obj(),
-			*utiltesting.MakeAdmissionCheckStrategyRule("ac3").Obj()).
+			*utiltestingapi.MakeAdmissionCheckStrategyRule("ac1").Obj(),
+			*utiltestingapi.MakeAdmissionCheckStrategyRule("ac3").Obj()).
 		Obj()
 
 	cases := map[string]struct {
@@ -3435,11 +3436,11 @@ func TestClusterQueuesUsingAdmissionChecks(t *testing.T) {
 }
 
 func TestClusterQueueReadiness(t *testing.T) {
-	baseFlavor := utiltesting.MakeResourceFlavor("flavor1").Obj()
-	baseCheck := utiltesting.MakeAdmissionCheck("check1").Active(metav1.ConditionTrue).Obj()
-	baseQueue := utiltesting.MakeClusterQueue("queue1").
+	baseFlavor := utiltestingapi.MakeResourceFlavor("flavor1").Obj()
+	baseCheck := utiltestingapi.MakeAdmissionCheck("check1").Active(metav1.ConditionTrue).Obj()
+	baseQueue := utiltestingapi.MakeClusterQueue("queue1").
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas(baseFlavor.Name).
+			*utiltestingapi.MakeFlavorQuotas(baseFlavor.Name).
 				Resource(corev1.ResourceCPU, "10", "10").Obj()).
 		AdmissionChecks(kueue.AdmissionCheckReference(baseCheck.Name)).
 		Obj()
@@ -3481,7 +3482,7 @@ func TestClusterQueueReadiness(t *testing.T) {
 		"check inactive": {
 			clusterQueues:    []*kueue.ClusterQueue{baseQueue},
 			resourceFlavors:  []*kueue.ResourceFlavor{baseFlavor},
-			admissionChecks:  []*kueue.AdmissionCheck{utiltesting.MakeAdmissionCheck("check1").Obj()},
+			admissionChecks:  []*kueue.AdmissionCheck{utiltestingapi.MakeAdmissionCheck("check1").Obj()},
 			clusterQueueName: "queue1",
 			wantStatus:       metav1.ConditionFalse,
 			wantReason:       "AdmissionCheckInactive",
@@ -3516,7 +3517,7 @@ func TestClusterQueueReadiness(t *testing.T) {
 			wantActive:       true,
 		},
 		"stopped": {
-			clusterQueues:    []*kueue.ClusterQueue{utiltesting.MakeClusterQueue("queue1").StopPolicy(kueue.HoldAndDrain).Obj()},
+			clusterQueues:    []*kueue.ClusterQueue{utiltestingapi.MakeClusterQueue("queue1").StopPolicy(kueue.HoldAndDrain).Obj()},
 			clusterQueueName: "queue1",
 			wantStatus:       metav1.ConditionFalse,
 			wantReason:       "Stopped",
@@ -3571,16 +3572,16 @@ func TestClusterQueueReadiness(t *testing.T) {
 func TestCohortCycles(t *testing.T) {
 	t.Run("self cycle", func(t *testing.T) {
 		cache := New(utiltesting.NewFakeClient())
-		cohort := utiltesting.MakeCohort("cohort").Parent("cohort").Obj()
+		cohort := utiltestingapi.MakeCohort("cohort").Parent("cohort").Obj()
 		if err := cache.AddOrUpdateCohort(cohort); err == nil {
 			t.Fatal("Expected failure when cycle")
 		}
 	})
 	t.Run("simple cycle", func(t *testing.T) {
 		cache := New(utiltesting.NewFakeClient())
-		cohortA := utiltesting.MakeCohort("cohort-a").Parent("cohort-b").Obj()
-		cohortB := utiltesting.MakeCohort("cohort-b").Parent("cohort-c").Obj()
-		cohortC := utiltesting.MakeCohort("cohort-c").Parent("cohort-a").Obj()
+		cohortA := utiltestingapi.MakeCohort("cohort-a").Parent("cohort-b").Obj()
+		cohortB := utiltestingapi.MakeCohort("cohort-b").Parent("cohort-c").Obj()
+		cohortC := utiltestingapi.MakeCohort("cohort-c").Parent("cohort-a").Obj()
 		if err := cache.AddOrUpdateCohort(cohortA); err != nil {
 			t.Fatal("Expected success as no cycle yet")
 		}
@@ -3594,27 +3595,27 @@ func TestCohortCycles(t *testing.T) {
 	t.Run("clusterqueue add and update return error when cohort has cycle", func(t *testing.T) {
 		cache := New(utiltesting.NewFakeClient())
 		ctx, log := utiltesting.ContextWithLog(t)
-		cohortA := utiltesting.MakeCohort("cohort-a").Parent("cohort-b").Obj()
+		cohortA := utiltestingapi.MakeCohort("cohort-a").Parent("cohort-b").Obj()
 		if err := cache.AddOrUpdateCohort(cohortA); err != nil {
 			t.Fatal("Expected success as no cycle yet")
 		}
-		cohortB := utiltesting.MakeCohort("cohort-b").Parent("cohort-c").Obj()
+		cohortB := utiltestingapi.MakeCohort("cohort-b").Parent("cohort-c").Obj()
 		if err := cache.AddOrUpdateCohort(cohortB); err != nil {
 			t.Fatal("Expected success as no cycle yet")
 		}
-		cohortC := utiltesting.MakeCohort("cohort-c").Parent("cohort-a").Obj()
+		cohortC := utiltestingapi.MakeCohort("cohort-c").Parent("cohort-a").Obj()
 		if err := cache.AddOrUpdateCohort(cohortC); err == nil {
 			t.Fatal("Expected failure when cycle")
 		}
 
 		// Error when creating CQ with parent Cohort-A
-		cq := utiltesting.MakeClusterQueue("cq").Cohort("cohort-a").Obj()
+		cq := utiltestingapi.MakeClusterQueue("cq").Cohort("cohort-a").Obj()
 		if err := cache.AddClusterQueue(ctx, cq); err == nil {
 			t.Fatal("Expected failure when adding cq to cohort with cycle")
 		}
 
 		// Error when updating CQ with parent Cohort-B
-		cq = utiltesting.MakeClusterQueue("cq").Cohort("cohort-b").Obj()
+		cq = utiltestingapi.MakeClusterQueue("cq").Cohort("cohort-b").Obj()
 		if err := cache.UpdateClusterQueue(log, cq); err == nil {
 			t.Fatal("Expected failure when updating cq to cohort with cycle")
 		}
@@ -3623,7 +3624,7 @@ func TestCohortCycles(t *testing.T) {
 		cache.DeleteCohort("cohort-c")
 
 		// Update succeeds
-		cq = utiltesting.MakeClusterQueue("cq").Cohort("cohort-b").Obj()
+		cq = utiltestingapi.MakeClusterQueue("cq").Cohort("cohort-b").Obj()
 		if err := cache.UpdateClusterQueue(log, cq); err != nil {
 			t.Fatal("Expected success")
 		}
@@ -3632,23 +3633,23 @@ func TestCohortCycles(t *testing.T) {
 	t.Run("clusterqueue leaving cohort with cycle successfully updates new cohort", func(t *testing.T) {
 		cache := New(utiltesting.NewFakeClient())
 		ctx, log := utiltesting.ContextWithLog(t)
-		cycleCohort := utiltesting.MakeCohort("cycle").Parent("cycle").Obj()
+		cycleCohort := utiltestingapi.MakeCohort("cycle").Parent("cycle").Obj()
 		if err := cache.AddOrUpdateCohort(cycleCohort); err == nil {
 			t.Fatal("Expected failure")
 		}
 
-		cohort := utiltesting.MakeCohort("cohort").
+		cohort := utiltestingapi.MakeCohort("cohort").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10").Obj(),
 			).Obj()
 		if err := cache.AddOrUpdateCohort(cohort); err != nil {
 			t.Fatal("Expected success")
 		}
 
 		// Error when creating cq with parent that has cycle
-		cq := utiltesting.MakeClusterQueue("cq").
+		cq := utiltestingapi.MakeClusterQueue("cq").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Cohort("cycle").Obj()
 		if err := cache.AddClusterQueue(ctx, cq); err == nil {
 			t.Fatal("Expected failure")
@@ -3679,19 +3680,19 @@ func TestCohortCycles(t *testing.T) {
 	t.Run("clusterqueue joining cohort with cycle successfully updates old cohort", func(t *testing.T) {
 		cache := New(utiltesting.NewFakeClient())
 		ctx, log := utiltesting.ContextWithLog(t)
-		cycleCohort := utiltesting.MakeCohort("cycle").Parent("cycle").Obj()
+		cycleCohort := utiltestingapi.MakeCohort("cycle").Parent("cycle").Obj()
 		if err := cache.AddOrUpdateCohort(cycleCohort); err == nil {
 			t.Fatal("Expected failure")
 		}
-		cohort := utiltesting.MakeCohort("cohort").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10").Obj()).Obj()
+		cohort := utiltestingapi.MakeCohort("cohort").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10").Obj()).Obj()
 		if err := cache.AddOrUpdateCohort(cohort); err != nil {
 			t.Fatal("Expected success")
 		}
 
 		// Add CQ to cohort
-		cq := utiltesting.MakeClusterQueue("cq").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "5").Obj()).Cohort("cohort").Obj()
+		cq := utiltestingapi.MakeClusterQueue("cq").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "5").Obj()).Cohort("cohort").Obj()
 		if err := cache.AddClusterQueue(ctx, cq); err != nil {
 			t.Fatal("Expected success")
 		}
@@ -3735,8 +3736,8 @@ func TestCohortCycles(t *testing.T) {
 
 	t.Run("cohort switching cohorts updates both cohort trees", func(t *testing.T) {
 		cache := New(utiltesting.NewFakeClient())
-		root1 := utiltesting.MakeCohort("root1").Obj()
-		root2 := utiltesting.MakeCohort("root2").Obj()
+		root1 := utiltestingapi.MakeCohort("root1").Obj()
+		root2 := utiltestingapi.MakeCohort("root2").Obj()
 		if err := cache.AddOrUpdateCohort(root1); err != nil {
 			t.Fatal("Expected success")
 		}
@@ -3744,8 +3745,8 @@ func TestCohortCycles(t *testing.T) {
 			t.Fatal("Expected success")
 		}
 
-		cohort := utiltesting.MakeCohort("cohort").Parent("root1").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10").Obj()).Obj()
+		cohort := utiltestingapi.MakeCohort("cohort").Parent("root1").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10").Obj()).Obj()
 		if err := cache.AddOrUpdateCohort(cohort); err != nil {
 			t.Fatal("Expected success")
 		}
@@ -3800,18 +3801,18 @@ func TestCohortCycles(t *testing.T) {
 
 	t.Run("cohort leaving cohort with cycle successfully updates new cohort", func(t *testing.T) {
 		cache := New(utiltesting.NewFakeClient())
-		cycleRoot := utiltesting.MakeCohort("cycle-root").Parent("cycle-root").Obj()
+		cycleRoot := utiltestingapi.MakeCohort("cycle-root").Parent("cycle-root").Obj()
 		if err := cache.AddOrUpdateCohort(cycleRoot); err == nil {
 			t.Fatal("Expected failure")
 		}
-		root := utiltesting.MakeCohort("root").Obj()
+		root := utiltestingapi.MakeCohort("root").Obj()
 		if err := cache.AddOrUpdateCohort(root); err != nil {
 			t.Fatal("Expected success")
 		}
 
-		cohort := utiltesting.MakeCohort("cohort").Parent("cycle-root").
+		cohort := utiltestingapi.MakeCohort("cohort").Parent("cycle-root").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10").Obj(),
 			).Obj()
 		if err := cache.AddOrUpdateCohort(cohort); err == nil {
 			t.Fatal("Expected failure")
@@ -3835,18 +3836,18 @@ func TestCohortCycles(t *testing.T) {
 
 	t.Run("cohort joining cohort with cycle successfully updates old cohort", func(t *testing.T) {
 		cache := New(utiltesting.NewFakeClient())
-		cycleRoot := utiltesting.MakeCohort("cycle-root").Parent("cycle-root").Obj()
+		cycleRoot := utiltestingapi.MakeCohort("cycle-root").Parent("cycle-root").Obj()
 		if err := cache.AddOrUpdateCohort(cycleRoot); err == nil {
 			t.Fatal("Expected failure")
 		}
-		root := utiltesting.MakeCohort("root").Obj()
+		root := utiltestingapi.MakeCohort("root").Obj()
 		if err := cache.AddOrUpdateCohort(root); err != nil {
 			t.Fatal("Expected success")
 		}
 
-		cohort := utiltesting.MakeCohort("cohort").Parent("root").
+		cohort := utiltestingapi.MakeCohort("cohort").Parent("root").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10").Obj(),
 			).Obj()
 		if err := cache.AddOrUpdateCohort(cohort); err != nil {
 			t.Fatal("Expected success")
@@ -3894,14 +3895,14 @@ func TestSnapshotError(t *testing.T) {
 	features.SetFeatureGateDuringTest(t, features.TopologyAwareScheduling, true)
 	ctx, log := utiltesting.ContextWithLog(t)
 
-	topology := *utiltesting.MakeDefaultOneLevelTopology("default")
-	flavor := *utiltesting.MakeResourceFlavor("tas-default").
+	topology := *utiltestingapi.MakeDefaultOneLevelTopology("default")
+	flavor := *utiltestingapi.MakeResourceFlavor("tas-default").
 		TopologyName("default").
 		Obj()
-	localQueue := *utiltesting.MakeLocalQueue("lq", "default").ClusterQueue("cq").Obj()
-	clusterQueue := utiltesting.MakeClusterQueue("cq").
+	localQueue := *utiltestingapi.MakeLocalQueue("lq", "default").ClusterQueue("cq").Obj()
+	clusterQueue := utiltestingapi.MakeClusterQueue("cq").
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("tas-default").
+			*utiltestingapi.MakeFlavorQuotas("tas-default").
 				ResourceQuotaWrapper("cpu").NominalQuota("8").Append().
 				Obj(),
 		).ClusterQueue
@@ -3957,47 +3958,47 @@ func TestClusterQueueAncestors(t *testing.T) {
 		wantErr       error
 	}{
 		"without cohort": {
-			cq: utiltesting.MakeClusterQueue("cq").Obj(),
+			cq: utiltestingapi.MakeClusterQueue("cq").Obj(),
 		},
 		"cohort not found": {
-			cq: utiltesting.MakeClusterQueue("cq").Cohort("root").Obj(),
+			cq: utiltestingapi.MakeClusterQueue("cq").Cohort("root").Obj(),
 		},
 		"one level": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("root").Obj(),
+				utiltestingapi.MakeCohort("root").Obj(),
 			},
-			cq:            utiltesting.MakeClusterQueue("cq").Cohort("root").Obj(),
+			cq:            utiltestingapi.MakeClusterQueue("cq").Cohort("root").Obj(),
 			wantAncestors: []kueue.CohortReference{},
 		},
 		"two level": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("root").Obj(),
-				utiltesting.MakeCohort("left").Parent("root").Obj(),
-				utiltesting.MakeCohort("right").Parent("root").Obj(),
+				utiltestingapi.MakeCohort("root").Obj(),
+				utiltestingapi.MakeCohort("left").Parent("root").Obj(),
+				utiltestingapi.MakeCohort("right").Parent("root").Obj(),
 			},
-			cq:            utiltesting.MakeClusterQueue("cq").Cohort("left").Obj(),
+			cq:            utiltestingapi.MakeClusterQueue("cq").Cohort("left").Obj(),
 			wantAncestors: []kueue.CohortReference{"left"},
 		},
 		"three levels": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("root").Obj(),
-				utiltesting.MakeCohort("first-left").Parent("root").Obj(),
-				utiltesting.MakeCohort("first-right").Parent("root").Obj(),
-				utiltesting.MakeCohort("second-left").Parent("first-left").Obj(),
-				utiltesting.MakeCohort("second-right").Parent("first-left").Obj(),
+				utiltestingapi.MakeCohort("root").Obj(),
+				utiltestingapi.MakeCohort("first-left").Parent("root").Obj(),
+				utiltestingapi.MakeCohort("first-right").Parent("root").Obj(),
+				utiltestingapi.MakeCohort("second-left").Parent("first-left").Obj(),
+				utiltestingapi.MakeCohort("second-right").Parent("first-left").Obj(),
 			},
-			cq:            utiltesting.MakeClusterQueue("cq").Cohort("second-left").Obj(),
+			cq:            utiltestingapi.MakeClusterQueue("cq").Cohort("second-left").Obj(),
 			wantAncestors: []kueue.CohortReference{"second-left", "first-left"},
 		},
 		"with cycle": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("root").Parent("second-right").Obj(),
-				utiltesting.MakeCohort("first-left").Parent("root").Obj(),
-				utiltesting.MakeCohort("first-right").Parent("root").Obj(),
-				utiltesting.MakeCohort("second-left").Parent("first-left").Obj(),
-				utiltesting.MakeCohort("second-right").Parent("first-left").Obj(),
+				utiltestingapi.MakeCohort("root").Parent("second-right").Obj(),
+				utiltestingapi.MakeCohort("first-left").Parent("root").Obj(),
+				utiltestingapi.MakeCohort("first-right").Parent("root").Obj(),
+				utiltestingapi.MakeCohort("second-left").Parent("first-left").Obj(),
+				utiltestingapi.MakeCohort("second-right").Parent("first-left").Obj(),
 			},
-			cq:      utiltesting.MakeClusterQueue("cq").Cohort("second-left").Obj(),
+			cq:      utiltestingapi.MakeClusterQueue("cq").Cohort("second-left").Obj(),
 			wantErr: ErrCohortHasCycle,
 		},
 	}
diff --git a/pkg/cache/scheduler/clusterqueue_test.go b/pkg/cache/scheduler/clusterqueue_test.go
index 1c44cf35b..c32c8a96c 100644
--- a/pkg/cache/scheduler/clusterqueue_test.go
+++ b/pkg/cache/scheduler/clusterqueue_test.go
@@ -28,12 +28,13 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/metrics"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestClusterQueueUpdateWithFlavors(t *testing.T) {
-	rf := utiltesting.MakeResourceFlavor("x86").Obj()
-	cq := utiltesting.MakeClusterQueue("cq").
-		ResourceGroup(*utiltesting.MakeFlavorQuotas("x86").Resource("cpu", "5").Obj()).
+	rf := utiltestingapi.MakeResourceFlavor("x86").Obj()
+	cq := utiltestingapi.MakeClusterQueue("cq").
+		ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "5").Obj()).
 		Obj()
 
 	testcases := []struct {
@@ -92,11 +93,11 @@ func TestClusterQueueUpdateWithFlavors(t *testing.T) {
 
 func TestClusterQueueUpdate(t *testing.T) {
 	resourceFlavors := []*kueue.ResourceFlavor{
-		utiltesting.MakeResourceFlavor("on-demand").Obj(),
-		utiltesting.MakeResourceFlavor("spot").Obj(),
+		utiltestingapi.MakeResourceFlavor("on-demand").Obj(),
+		utiltestingapi.MakeResourceFlavor("spot").Obj(),
 	}
 	clusterQueue :=
-		*utiltesting.MakeClusterQueue("eng-alpha").
+		*utiltestingapi.MakeClusterQueue("eng-alpha").
 			QueueingStrategy(kueue.StrictFIFO).
 			Preemption(kueue.ClusterQueuePreemption{
 				WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
@@ -105,13 +106,13 @@ func TestClusterQueueUpdate(t *testing.T) {
 				WhenCanPreempt: kueue.MayStopSearch,
 			}).
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("on-demand").
+				*utiltestingapi.MakeFlavorQuotas("on-demand").
 					Resource(corev1.ResourceCPU, "50", "50").Obj(),
-				*utiltesting.MakeFlavorQuotas("spot").
+				*utiltestingapi.MakeFlavorQuotas("spot").
 					Resource(corev1.ResourceCPU, "100", "0").Obj(),
 			).Obj()
 	newClusterQueue :=
-		*utiltesting.MakeClusterQueue("eng-alpha").
+		*utiltestingapi.MakeClusterQueue("eng-alpha").
 			QueueingStrategy(kueue.StrictFIFO).
 			Preemption(kueue.ClusterQueuePreemption{
 				WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
@@ -120,9 +121,9 @@ func TestClusterQueueUpdate(t *testing.T) {
 				WhenCanPreempt: kueue.MayStopSearch,
 			}).
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("on-demand").
+				*utiltestingapi.MakeFlavorQuotas("on-demand").
 					Resource(corev1.ResourceCPU, "100", "50").Obj(),
-				*utiltesting.MakeFlavorQuotas("spot").
+				*utiltestingapi.MakeFlavorQuotas("spot").
 					Resource(corev1.ResourceCPU, "100", "0").Obj(),
 			).Obj()
 	cases := []struct {
@@ -178,15 +179,15 @@ func TestClusterQueueUpdate(t *testing.T) {
 }
 
 func TestClusterQueueUpdateWithAdmissionCheck(t *testing.T) {
-	cqWithAC := utiltesting.MakeClusterQueue("cq").
+	cqWithAC := utiltestingapi.MakeClusterQueue("cq").
 		AdmissionChecks("check1", "check2", "check3").
 		Obj()
 
-	cqWithACStrategy := utiltesting.MakeClusterQueue("cq2").
+	cqWithACStrategy := utiltestingapi.MakeClusterQueue("cq2").
 		AdmissionCheckStrategy(
-			*utiltesting.MakeAdmissionCheckStrategyRule("check1").Obj(),
-			*utiltesting.MakeAdmissionCheckStrategyRule("check2").Obj(),
-			*utiltesting.MakeAdmissionCheckStrategyRule("check3").Obj()).
+			*utiltestingapi.MakeAdmissionCheckStrategyRule("check1").Obj(),
+			*utiltestingapi.MakeAdmissionCheckStrategyRule("check2").Obj(),
+			*utiltestingapi.MakeAdmissionCheckStrategyRule("check3").Obj()).
 		Obj()
 
 	testcases := []struct {
@@ -496,9 +497,9 @@ func TestClusterQueueReadinessWithTAS(t *testing.T) {
 	}{
 		{
 			name: "TAS CQ goes active state",
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("tas-flavor").
+					*utiltestingapi.MakeFlavorQuotas("tas-flavor").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
@@ -507,15 +508,15 @@ func TestClusterQueueReadinessWithTAS(t *testing.T) {
 		},
 		{
 			name: "TAS do not support Cohorts",
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("tas-flavor").
+					*utiltestingapi.MakeFlavorQuotas("tas-flavor").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
-			updatedCq: utiltesting.MakeClusterQueue("cq").
+			updatedCq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("tas-flavor").
+					*utiltestingapi.MakeFlavorQuotas("tas-flavor").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Cohort("some-cohort").Obj(),
@@ -524,15 +525,15 @@ func TestClusterQueueReadinessWithTAS(t *testing.T) {
 		},
 		{
 			name: "TAS do not support Preemption",
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("tas-flavor").
+					*utiltestingapi.MakeFlavorQuotas("tas-flavor").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
-			updatedCq: utiltesting.MakeClusterQueue("cq").
+			updatedCq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("tas-flavor").
+					*utiltestingapi.MakeFlavorQuotas("tas-flavor").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).
@@ -548,15 +549,15 @@ func TestClusterQueueReadinessWithTAS(t *testing.T) {
 		},
 		{
 			name: "TAS do not support MultiKueue AdmissionCheck",
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("tas-flavor").
+					*utiltestingapi.MakeFlavorQuotas("tas-flavor").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
-			updatedCq: utiltesting.MakeClusterQueue("cq").
+			updatedCq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("tas-flavor").
+					*utiltestingapi.MakeFlavorQuotas("tas-flavor").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).AdmissionChecks("mk-check").Obj(),
@@ -566,9 +567,9 @@ func TestClusterQueueReadinessWithTAS(t *testing.T) {
 		{
 			name:         "Referenced TAS flavor without topology",
 			skipTopology: true,
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("tas-flavor").
+					*utiltestingapi.MakeFlavorQuotas("tas-flavor").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
@@ -589,19 +590,19 @@ func TestClusterQueueReadinessWithTAS(t *testing.T) {
 
 			cqCache := New(client)
 
-			topology := utiltesting.MakeTopology("example-topology").Levels("tas-level-0").Obj()
+			topology := utiltestingapi.MakeTopology("example-topology").Levels("tas-level-0").Obj()
 
-			rf := utiltesting.MakeResourceFlavor("tas-flavor").TopologyName(topology.Name).Obj()
+			rf := utiltestingapi.MakeResourceFlavor("tas-flavor").TopologyName(topology.Name).Obj()
 			cqCache.AddOrUpdateResourceFlavor(log, rf)
 
 			if !tc.skipTopology {
 				cqCache.AddOrUpdateTopology(log, topology)
 			}
 
-			mkAC := utiltesting.MakeAdmissionCheck("mk-check").ControllerName(kueue.MultiKueueControllerName).Active(metav1.ConditionTrue).Obj()
+			mkAC := utiltestingapi.MakeAdmissionCheck("mk-check").ControllerName(kueue.MultiKueueControllerName).Active(metav1.ConditionTrue).Obj()
 			cqCache.AddOrUpdateAdmissionCheck(log, mkAC)
 
-			acWithPR := utiltesting.MakeAdmissionCheck("pr-check").ControllerName(kueue.ProvisioningRequestControllerName).Active(metav1.ConditionTrue).Obj()
+			acWithPR := utiltestingapi.MakeAdmissionCheck("pr-check").ControllerName(kueue.ProvisioningRequestControllerName).Active(metav1.ConditionTrue).Obj()
 			cqCache.AddOrUpdateAdmissionCheck(log, acWithPR)
 
 			if err := cqCache.AddClusterQueue(ctx, tc.cq); err != nil {
diff --git a/pkg/cache/scheduler/fair_sharing_test.go b/pkg/cache/scheduler/fair_sharing_test.go
index 09c0e43d3..772a58da1 100644
--- a/pkg/cache/scheduler/fair_sharing_test.go
+++ b/pkg/cache/scheduler/fair_sharing_test.go
@@ -29,6 +29,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/resources"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
 
@@ -59,9 +60,9 @@ func TestDominantResourceShare(t *testing.T) {
 				{Flavor: "default", Resource: corev1.ResourceCPU}: 1_000,
 				{Flavor: "default", Resource: "example.com/gpu"}:  2,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("cpu").NominalQuota("2000").Append().
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
@@ -80,20 +81,20 @@ func TestDominantResourceShare(t *testing.T) {
 				{Flavor: "default", Resource: corev1.ResourceCPU}: 1_000,
 				{Flavor: "default", Resource: "example.com/gpu"}:  2,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("cpu").NominalQuota("2").Append().
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
-			lendingClusterQueue: utiltesting.MakeClusterQueue("lending-cq").
+			lendingClusterQueue: utiltestingapi.MakeClusterQueue("lending-cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("cpu").NominalQuota("8").Append().
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
@@ -124,20 +125,20 @@ func TestDominantResourceShare(t *testing.T) {
 				{Flavor: "default", Resource: corev1.ResourceCPU}: 3_000,
 				{Flavor: "default", Resource: "example.com/gpu"}:  7,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("cpu").NominalQuota("2").Append().
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
-			lendingClusterQueue: utiltesting.MakeClusterQueue("lending-cq").
+			lendingClusterQueue: utiltestingapi.MakeClusterQueue("lending-cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("cpu").NominalQuota("8").Append().
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
@@ -167,19 +168,19 @@ func TestDominantResourceShare(t *testing.T) {
 			usage: resources.FlavorResourceQuantities{
 				{Flavor: "default", Resource: "example.com/gpu"}: 501,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("500").Append().
 						Obj(),
 				).Obj(),
-			lendingClusterQueue: utiltesting.MakeClusterQueue("lending-cq").
+			lendingClusterQueue: utiltestingapi.MakeClusterQueue("lending-cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("300")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("1000").Append().
 						Obj(),
 				).Obj(),
@@ -208,19 +209,19 @@ func TestDominantResourceShare(t *testing.T) {
 			usage: resources.FlavorResourceQuantities{
 				{Flavor: "default", Resource: "example.com/gpu"}: 800,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("300")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("500").Append().
 						Obj(),
 				).Obj(),
-			lendingClusterQueue: utiltesting.MakeClusterQueue("lending-cq").
+			lendingClusterQueue: utiltestingapi.MakeClusterQueue("lending-cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("300")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("1000").Append().
 						Obj(),
 				).Obj(),
@@ -250,20 +251,20 @@ func TestDominantResourceShare(t *testing.T) {
 				{Flavor: "default", Resource: corev1.ResourceCPU}: 3_000,
 				{Flavor: "default", Resource: "example.com/gpu"}:  3,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("cpu").NominalQuota("2").Append().
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
-			lendingClusterQueue: utiltesting.MakeClusterQueue("lending-cq").
+			lendingClusterQueue: utiltestingapi.MakeClusterQueue("lending-cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("cpu").NominalQuota("8").Append().
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
@@ -294,20 +295,20 @@ func TestDominantResourceShare(t *testing.T) {
 				{Flavor: "default", Resource: corev1.ResourceCPU}: 1_000,
 				{Flavor: "default", Resource: "example.com/gpu"}:  2,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("cpu").NominalQuota("2").Append().
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
-			lendingClusterQueue: utiltesting.MakeClusterQueue("lending-cq").
+			lendingClusterQueue: utiltestingapi.MakeClusterQueue("lending-cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("cpu").NominalQuota("8").Append().
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
@@ -342,20 +343,20 @@ func TestDominantResourceShare(t *testing.T) {
 				{Flavor: "default", Resource: corev1.ResourceCPU}: 1_000,
 				{Flavor: "default", Resource: "example.com/gpu"}:  1,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("cpu").NominalQuota("2").Append().
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("2").LendingLimit("0").Append().
 						Obj(),
 				).Obj(),
-			lendingClusterQueue: utiltesting.MakeClusterQueue("lending-cq").
+			lendingClusterQueue: utiltestingapi.MakeClusterQueue("lending-cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("cpu").NominalQuota("8").Append().
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("64").LendingLimit("0").Append().
 						Obj(),
@@ -390,22 +391,22 @@ func TestDominantResourceShare(t *testing.T) {
 				{Flavor: "on-demand", Resource: corev1.ResourceCPU}: 15_000,
 				{Flavor: "spot", Resource: corev1.ResourceCPU}:      5_000,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("on-demand").
+					*utiltestingapi.MakeFlavorQuotas("on-demand").
 						ResourceQuotaWrapper("cpu").NominalQuota("20").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("spot").
+					*utiltestingapi.MakeFlavorQuotas("spot").
 						ResourceQuotaWrapper("cpu").NominalQuota("80").Append().
 						Obj(),
 				).Obj(),
-			lendingClusterQueue: utiltesting.MakeClusterQueue("lending-cq").
+			lendingClusterQueue: utiltestingapi.MakeClusterQueue("lending-cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("cpu").NominalQuota("100").Append().
 						Obj(),
 				).Obj(),
@@ -437,19 +438,19 @@ func TestDominantResourceShare(t *testing.T) {
 			usage: resources.FlavorResourceQuantities{
 				{Flavor: "default", Resource: "example.com/gpu"}: 7,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("2")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
-			lendingClusterQueue: utiltesting.MakeClusterQueue("lending-cq").
+			lendingClusterQueue: utiltestingapi.MakeClusterQueue("lending-cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
@@ -478,19 +479,19 @@ func TestDominantResourceShare(t *testing.T) {
 			usage: resources.FlavorResourceQuantities{
 				{Flavor: "default", Resource: "example.com/gpu"}: 7,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("0.5")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
-			lendingClusterQueue: utiltesting.MakeClusterQueue("lending-cq").
+			lendingClusterQueue: utiltestingapi.MakeClusterQueue("lending-cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
@@ -519,19 +520,19 @@ func TestDominantResourceShare(t *testing.T) {
 			usage: resources.FlavorResourceQuantities{
 				{Flavor: "default", Resource: "example.com/gpu"}: 7,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("0")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
-			lendingClusterQueue: utiltesting.MakeClusterQueue("lending-cq").
+			lendingClusterQueue: utiltestingapi.MakeClusterQueue("lending-cq").
 				Cohort("test-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("10").Append().
 						Obj(),
 				).Obj(),
@@ -560,18 +561,18 @@ func TestDominantResourceShare(t *testing.T) {
 			usage: resources.FlavorResourceQuantities{
 				{Flavor: "default", Resource: "example.com/gpu"}: 10,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("child-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("5").Append().
 						Obj(),
 				).Obj(),
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("child-cohort").FairWeight(resource.MustParse("2")).Parent("root").Obj(),
-				utiltesting.MakeCohort("root").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeCohort("child-cohort").FairWeight(resource.MustParse("2")).Parent("root").Obj(),
+				utiltestingapi.MakeCohort("root").ResourceGroup(
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("45").Append().
 						Obj(),
 				).Obj(),
@@ -601,18 +602,18 @@ func TestDominantResourceShare(t *testing.T) {
 			usage: resources.FlavorResourceQuantities{
 				{Flavor: "default", Resource: "example.com/gpu"}: 10,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("child-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("0").Append().
 						Obj(),
 				).Obj(),
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("child-cohort").FairWeight(resource.MustParse("2")).Parent("root").Obj(),
-				utiltesting.MakeCohort("root").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeCohort("child-cohort").FairWeight(resource.MustParse("2")).Parent("root").Obj(),
+				utiltestingapi.MakeCohort("root").ResourceGroup(
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("50").Append().
 						Obj(),
 				).Obj(),
@@ -645,21 +646,21 @@ func TestDominantResourceShare(t *testing.T) {
 			usage: resources.FlavorResourceQuantities{
 				{Flavor: "default", Resource: "example.com/gpu"}: 10,
 			},
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Cohort("child-cohort").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("0").Append().
 						Obj(),
 				).Obj(),
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("child-cohort").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeCohort("child-cohort").ResourceGroup(
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("0").BorrowingLimit("10").Append().
 						Obj(),
 				).Parent("root").Obj(),
-				utiltesting.MakeCohort("root").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeCohort("root").ResourceGroup(
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper("example.com/gpu").NominalQuota("50").Append().
 						Obj(),
 				).Obj(),
@@ -690,9 +691,9 @@ func TestDominantResourceShare(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			ctx, log := utiltesting.ContextWithLog(t)
 			cache := New(utiltesting.NewFakeClient())
-			cache.AddOrUpdateResourceFlavor(log, utiltesting.MakeResourceFlavor("default").Obj())
-			cache.AddOrUpdateResourceFlavor(log, utiltesting.MakeResourceFlavor("on-demand").Obj())
-			cache.AddOrUpdateResourceFlavor(log, utiltesting.MakeResourceFlavor("spot").Obj())
+			cache.AddOrUpdateResourceFlavor(log, utiltestingapi.MakeResourceFlavor("default").Obj())
+			cache.AddOrUpdateResourceFlavor(log, utiltestingapi.MakeResourceFlavor("on-demand").Obj())
+			cache.AddOrUpdateResourceFlavor(log, utiltestingapi.MakeResourceFlavor("spot").Obj())
 
 			_ = cache.AddClusterQueue(ctx, tc.clusterQueue)
 
@@ -711,13 +712,13 @@ func TestDominantResourceShare(t *testing.T) {
 			}
 			i := 0
 			for fr, v := range tc.usage {
-				admission := utiltesting.MakeAdmission("cq")
+				admission := utiltestingapi.MakeAdmission("cq")
 				quantity := resources.ResourceQuantity(fr.Resource, v)
-				admission.PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				admission.PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(fr.Resource, fr.Flavor, quantity.String()).
 					Obj())
 
-				wl := utiltesting.MakeWorkload(fmt.Sprintf("workload-%d", i), "default-namespace").ReserveQuota(admission.Obj()).Obj()
+				wl := utiltestingapi.MakeWorkload(fmt.Sprintf("workload-%d", i), "default-namespace").ReserveQuota(admission.Obj()).Obj()
 
 				cache.AddOrUpdateWorkload(log, wl)
 				snapshot.AddWorkload(workload.NewInfo(wl))
diff --git a/pkg/cache/scheduler/resource_node_test.go b/pkg/cache/scheduler/resource_node_test.go
index 59502772a..98f461220 100644
--- a/pkg/cache/scheduler/resource_node_test.go
+++ b/pkg/cache/scheduler/resource_node_test.go
@@ -23,24 +23,25 @@ import (
 	corev1 "k8s.io/api/core/v1"
 
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestCohortLendable(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
 	cache := New(utiltesting.NewFakeClient())
 
-	cq1 := utiltesting.MakeClusterQueue("cq1").
+	cq1 := utiltestingapi.MakeClusterQueue("cq1").
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("default").
+			*utiltestingapi.MakeFlavorQuotas("default").
 				ResourceQuotaWrapper("cpu").NominalQuota("8").LendingLimit("8").Append().
 				ResourceQuotaWrapper("example.com/gpu").NominalQuota("3").LendingLimit("3").Append().
 				Obj(),
 		).Cohort("test-cohort").
 		ClusterQueue
 
-	cq2 := utiltesting.MakeClusterQueue("cq2").
+	cq2 := utiltestingapi.MakeClusterQueue("cq2").
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("default").
+			*utiltestingapi.MakeFlavorQuotas("default").
 				ResourceQuotaWrapper("cpu").NominalQuota("2").LendingLimit("2").Append().
 				Obj(),
 		).Cohort("test-cohort").
diff --git a/pkg/cache/scheduler/resource_test.go b/pkg/cache/scheduler/resource_test.go
index d2e581ab6..739eba38a 100644
--- a/pkg/cache/scheduler/resource_test.go
+++ b/pkg/cache/scheduler/resource_test.go
@@ -24,6 +24,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/resources"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
 
@@ -37,14 +38,14 @@ func TestAvailable(t *testing.T) {
 	}{
 		"base cqs": {
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cq1").
+				*utiltestingapi.MakeClusterQueue("cq1").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "0").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("cq2").
+				*utiltestingapi.MakeClusterQueue("cq2").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "5").Obj(),
-						*utiltesting.MakeFlavorQuotas("blue").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("blue").Resource("cpu", "10").Obj(),
 					).Obj(),
 			},
 			usage: map[kueue.ClusterQueueReference]resources.FlavorResourceQuantities{
@@ -65,21 +66,21 @@ func TestAvailable(t *testing.T) {
 		},
 		"cqs with cohort": {
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cq1").
+				*utiltestingapi.MakeClusterQueue("cq1").
 					Cohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("cq2").
+				*utiltestingapi.MakeClusterQueue("cq2").
 					Cohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10", "", "9").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10", "", "9").Obj(),
 					).Obj(),
 			},
 			cohorts: []kueue.Cohort{
-				utiltesting.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Cohort,
 			},
 			usage: map[kueue.ClusterQueueReference]resources.FlavorResourceQuantities{
@@ -97,16 +98,16 @@ func TestAvailable(t *testing.T) {
 		},
 		"cq borrows from cohort": {
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cq1").
+				*utiltestingapi.MakeClusterQueue("cq1").
 					Cohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Obj(),
 			},
 			cohorts: []kueue.Cohort{
-				utiltesting.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Cohort,
 			},
 			usage:                    map[kueue.ClusterQueueReference]resources.FlavorResourceQuantities{"cq1": {{Flavor: "red", Resource: "cpu"}: 11_000}},
@@ -115,21 +116,21 @@ func TestAvailable(t *testing.T) {
 		},
 		"cq oversubscription spills into cohort": {
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cq1").
+				*utiltestingapi.MakeClusterQueue("cq1").
 					Cohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("cq2").
+				*utiltestingapi.MakeClusterQueue("cq2").
 					Cohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10", "0", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10", "0", "0").Obj(),
 					).Obj(),
 			},
 			cohorts: []kueue.Cohort{
-				utiltesting.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Cohort,
 			},
 			usage: map[kueue.ClusterQueueReference]resources.FlavorResourceQuantities{
@@ -156,26 +157,26 @@ func TestAvailable(t *testing.T) {
 			// cq2 can access 12, due to borrowing limit
 			// cq3 can access 40, as there are no restrictions.
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cq1").
+				*utiltestingapi.MakeClusterQueue("cq1").
 					Cohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("cq2").
+				*utiltestingapi.MakeClusterQueue("cq2").
 					Cohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10", "2").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10", "2").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("cq3").
+				*utiltestingapi.MakeClusterQueue("cq3").
 					Cohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10", "", "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10", "", "5").Obj(),
 					).Obj(),
 			},
 			cohorts: []kueue.Cohort{
-				utiltesting.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Cohort,
 			},
 			usage: map[kueue.ClusterQueueReference]resources.FlavorResourceQuantities{
@@ -209,28 +210,28 @@ func TestAvailable(t *testing.T) {
 			//           /           \
 			//        cq1            cq2
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cq1").
+				*utiltestingapi.MakeClusterQueue("cq1").
 					Cohort("left").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("cq2").
+				*utiltestingapi.MakeClusterQueue("cq2").
 					Cohort("right").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10", "", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10", "", "0").Obj(),
 					).Obj(),
 			},
 			cohorts: []kueue.Cohort{
-				utiltesting.MakeCohort("root").Cohort,
-				utiltesting.MakeCohort("left").
+				utiltestingapi.MakeCohort("root").Cohort,
+				utiltestingapi.MakeCohort("left").
 					Parent("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Cohort,
-				utiltesting.MakeCohort("right").
+				utiltestingapi.MakeCohort("right").
 					Parent("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Cohort,
 			},
 			usage: map[kueue.ClusterQueueReference]resources.FlavorResourceQuantities{
@@ -256,33 +257,33 @@ func TestAvailable(t *testing.T) {
 			//           /    5
 			//   left-cq1      left-cq2
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("left-cq1").
+				*utiltestingapi.MakeClusterQueue("left-cq1").
 					Cohort("left").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("left-cq2").
+				*utiltestingapi.MakeClusterQueue("left-cq2").
 					Cohort("left").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10", "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10", "5").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("right-cq").
+				*utiltestingapi.MakeClusterQueue("right-cq").
 					Cohort("right").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Obj(),
 			},
 			cohorts: []kueue.Cohort{
-				utiltesting.MakeCohort("root").Cohort,
-				utiltesting.MakeCohort("left").
+				utiltestingapi.MakeCohort("root").Cohort,
+				utiltestingapi.MakeCohort("left").
 					Parent("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10", "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10", "5").Obj(),
 					).Cohort,
-				utiltesting.MakeCohort("right").
+				utiltestingapi.MakeCohort("right").
 					Parent("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Cohort,
 			},
 			wantAvailable: map[kueue.ClusterQueueReference]resources.FlavorResourceQuantities{
@@ -306,38 +307,38 @@ func TestAvailable(t *testing.T) {
 			//           5    \
 			//   left-cq1      left-cq2
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("left-cq1").
+				*utiltestingapi.MakeClusterQueue("left-cq1").
 					Cohort("left").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10", "", "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10", "", "5").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("left-cq2").
+				*utiltestingapi.MakeClusterQueue("left-cq2").
 					Cohort("left").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("right-cq").
+				*utiltestingapi.MakeClusterQueue("right-cq").
 					Cohort("right").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "0").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("root-cq").
+				*utiltestingapi.MakeClusterQueue("root-cq").
 					Cohort("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "0").Obj(),
 					).Obj(),
 			},
 			cohorts: []kueue.Cohort{
-				utiltesting.MakeCohort("root").Cohort,
-				utiltesting.MakeCohort("left").
+				utiltestingapi.MakeCohort("root").Cohort,
+				utiltestingapi.MakeCohort("left").
 					Parent("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "0", "", "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "0", "", "5").Obj(),
 					).Cohort,
-				utiltesting.MakeCohort("right").
+				utiltestingapi.MakeCohort("right").
 					Parent("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "0").Obj(),
 					).Cohort,
 			},
 			wantAvailable: map[kueue.ClusterQueueReference]resources.FlavorResourceQuantities{
@@ -362,8 +363,8 @@ func TestAvailable(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			ctx, log := utiltesting.ContextWithLog(t)
 			cache := New(utiltesting.NewFakeClient())
-			cache.AddOrUpdateResourceFlavor(log, utiltesting.MakeResourceFlavor("red").Obj())
-			cache.AddOrUpdateResourceFlavor(log, utiltesting.MakeResourceFlavor("blue").Obj())
+			cache.AddOrUpdateResourceFlavor(log, utiltestingapi.MakeResourceFlavor("red").Obj())
+			cache.AddOrUpdateResourceFlavor(log, utiltestingapi.MakeResourceFlavor("blue").Obj())
 			for _, cq := range tc.clusterQueues {
 				_ = cache.AddClusterQueue(ctx, &cq)
 			}
diff --git a/pkg/cache/scheduler/snapshot_test.go b/pkg/cache/scheduler/snapshot_test.go
index 7d5fdccec..b2174d3eb 100644
--- a/pkg/cache/scheduler/snapshot_test.go
+++ b/pkg/cache/scheduler/snapshot_test.go
@@ -33,6 +33,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/resources"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
 
@@ -56,13 +57,13 @@ func TestSnapshot(t *testing.T) {
 		"empty": {},
 		"independent clusterQueues": {
 			cqs: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").Obj(),
-				utiltesting.MakeClusterQueue("b").Obj(),
+				utiltestingapi.MakeClusterQueue("a").Obj(),
+				utiltestingapi.MakeClusterQueue("b").Obj(),
 			},
 			wls: []*kueue.Workload{
-				utiltesting.MakeWorkload("alpha", "").
+				utiltestingapi.MakeWorkload("alpha", "").
 					ReserveQuota(&kueue.Admission{ClusterQueue: "a"}).Obj(),
-				utiltesting.MakeWorkload("beta", "").
+				utiltestingapi.MakeWorkload("beta", "").
 					ReserveQuota(&kueue.Admission{ClusterQueue: "b"}).Obj(),
 			},
 			wantSnapshot: Snapshot{
@@ -77,7 +78,7 @@ func TestSnapshot(t *testing.T) {
 							AllocatableResourceGeneration: 1,
 							Workloads: map[workload.Reference]*workload.Info{
 								"/alpha": workload.NewInfo(
-									utiltesting.MakeWorkload("alpha", "").
+									utiltestingapi.MakeWorkload("alpha", "").
 										ReserveQuota(&kueue.Admission{ClusterQueue: "a"}).Obj()),
 							},
 							Preemption: defaultPreemption,
@@ -91,7 +92,7 @@ func TestSnapshot(t *testing.T) {
 							AllocatableResourceGeneration: 1,
 							Workloads: map[workload.Reference]*workload.Info{
 								"/beta": workload.NewInfo(
-									utiltesting.MakeWorkload("beta", "").
+									utiltestingapi.MakeWorkload("beta", "").
 										ReserveQuota(&kueue.Admission{ClusterQueue: "b"}).Obj()),
 							},
 							Preemption: defaultPreemption,
@@ -103,8 +104,8 @@ func TestSnapshot(t *testing.T) {
 		},
 		"inactive clusterQueues": {
 			cqs: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("flavor-nonexistent-cq").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("nonexistent-flavor").
+				utiltestingapi.MakeClusterQueue("flavor-nonexistent-cq").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("nonexistent-flavor").
 						Resource(corev1.ResourceCPU, "100").Obj()).
 					Obj(),
 			},
@@ -114,15 +115,15 @@ func TestSnapshot(t *testing.T) {
 		},
 		"resourceFlavors": {
 			rfs: []*kueue.ResourceFlavor{
-				utiltesting.MakeResourceFlavor("demand").
+				utiltestingapi.MakeResourceFlavor("demand").
 					NodeLabel("a", "b").
 					NodeLabel("instance", "demand").
 					Obj(),
-				utiltesting.MakeResourceFlavor("spot").
+				utiltestingapi.MakeResourceFlavor("spot").
 					NodeLabel("c", "d").
 					NodeLabel("instance", "spot").
 					Obj(),
-				utiltesting.MakeResourceFlavor("default").Obj(),
+				utiltestingapi.MakeResourceFlavor("default").Obj(),
 			},
 			wantSnapshot: Snapshot{
 				Manager: hierarchy.NewManagerForTest(
@@ -130,83 +131,83 @@ func TestSnapshot(t *testing.T) {
 					map[kueue.ClusterQueueReference]*ClusterQueueSnapshot{},
 				),
 				ResourceFlavors: map[kueue.ResourceFlavorReference]*kueue.ResourceFlavor{
-					"demand": utiltesting.MakeResourceFlavor("demand").
+					"demand": utiltestingapi.MakeResourceFlavor("demand").
 						NodeLabel("a", "b").
 						NodeLabel("instance", "demand").
 						Obj(),
-					"spot": utiltesting.MakeResourceFlavor("spot").
+					"spot": utiltestingapi.MakeResourceFlavor("spot").
 						NodeLabel("c", "d").
 						NodeLabel("instance", "spot").
 						Obj(),
-					"default": utiltesting.MakeResourceFlavor("default").Obj(),
+					"default": utiltestingapi.MakeResourceFlavor("default").Obj(),
 				},
 			},
 		},
 		"cohort": {
 			cqs: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
+				utiltestingapi.MakeClusterQueue("a").
 					Cohort("borrowing").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("demand").Resource(corev1.ResourceCPU, "100").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "200").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("demand").Resource(corev1.ResourceCPU, "100").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "200").Obj(),
 					).
 					Obj(),
-				utiltesting.MakeClusterQueue("b").
+				utiltestingapi.MakeClusterQueue("b").
 					Cohort("borrowing").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "100").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "100").Obj(),
 					).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").Resource("example.com/gpu", "50").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("default").Resource("example.com/gpu", "50").Obj(),
 					).
 					Obj(),
-				utiltesting.MakeClusterQueue("c").
+				utiltestingapi.MakeClusterQueue("c").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "100").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "100").Obj(),
 					).
 					Obj(),
 			},
 			rfs: []*kueue.ResourceFlavor{
-				utiltesting.MakeResourceFlavor("demand").NodeLabel("instance", "demand").Obj(),
-				utiltesting.MakeResourceFlavor("spot").NodeLabel("instance", "spot").Obj(),
-				utiltesting.MakeResourceFlavor("default").Obj(),
+				utiltestingapi.MakeResourceFlavor("demand").NodeLabel("instance", "demand").Obj(),
+				utiltestingapi.MakeResourceFlavor("spot").NodeLabel("instance", "spot").Obj(),
+				utiltestingapi.MakeResourceFlavor("default").Obj(),
 			},
 			wls: []*kueue.Workload{
-				utiltesting.MakeWorkload("alpha", "").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				utiltestingapi.MakeWorkload("alpha", "").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "2").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("a").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "demand", "10000m").Count(5).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("a").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "demand", "10000m").Count(5).Obj()).Obj()).
 					Obj(),
-				utiltesting.MakeWorkload("beta", "").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				utiltestingapi.MakeWorkload("beta", "").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "1").
 						Request("example.com/gpu", "2").
 						Obj(),
 					).
-					ReserveQuota(utiltesting.MakeAdmission("b").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("b").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "spot", "5000m").
 							Assignment("example.com/gpu", "default", "10").
 							Count(5).
 							Obj()).
 						Obj()).
 					Obj(),
-				utiltesting.MakeWorkload("gamma", "").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				utiltestingapi.MakeWorkload("gamma", "").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "1").
 						Request("example.com/gpu", "1").
 						Obj(),
 					).
-					ReserveQuota(utiltesting.MakeAdmission("b").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("b").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "spot", "5000m").
 							Assignment("example.com/gpu", "default", "5").
 							Count(5).
 							Obj()).
 						Obj()).
 					Obj(),
-				utiltesting.MakeWorkload("sigma", "").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				utiltestingapi.MakeWorkload("sigma", "").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "1").
 						Obj(),
 					).
@@ -259,11 +260,11 @@ func TestSnapshot(t *testing.T) {
 								},
 								FlavorFungibility: defaultFlavorFungibility,
 								Workloads: map[workload.Reference]*workload.Info{
-									"/alpha": workload.NewInfo(utiltesting.MakeWorkload("alpha", "").
-										PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+									"/alpha": workload.NewInfo(utiltestingapi.MakeWorkload("alpha", "").
+										PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 											Request(corev1.ResourceCPU, "2").Obj()).
-										ReserveQuota(utiltesting.MakeAdmission("a").
-											PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+										ReserveQuota(utiltestingapi.MakeAdmission("a").
+											PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 												Assignment(corev1.ResourceCPU, "demand", "10000m").
 												Count(5).
 												Obj()).
@@ -305,27 +306,27 @@ func TestSnapshot(t *testing.T) {
 								},
 								FlavorFungibility: defaultFlavorFungibility,
 								Workloads: map[workload.Reference]*workload.Info{
-									"/beta": workload.NewInfo(utiltesting.MakeWorkload("beta", "").
-										PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+									"/beta": workload.NewInfo(utiltestingapi.MakeWorkload("beta", "").
+										PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 											Request(corev1.ResourceCPU, "1").
 											Request("example.com/gpu", "2").
 											Obj()).
-										ReserveQuota(utiltesting.MakeAdmission("b").
-											PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+										ReserveQuota(utiltestingapi.MakeAdmission("b").
+											PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 												Assignment(corev1.ResourceCPU, "spot", "5000m").
 												Assignment("example.com/gpu", "default", "10").
 												Count(5).
 												Obj()).
 											Obj()).
 										Obj()),
-									"/gamma": workload.NewInfo(utiltesting.MakeWorkload("gamma", "").
-										PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+									"/gamma": workload.NewInfo(utiltestingapi.MakeWorkload("gamma", "").
+										PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 											Request(corev1.ResourceCPU, "1").
 											Request("example.com/gpu", "1").
 											Obj(),
 										).
-										ReserveQuota(utiltesting.MakeAdmission("b").
-											PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+										ReserveQuota(utiltestingapi.MakeAdmission("b").
+											PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 												Assignment(corev1.ResourceCPU, "spot", "5000m").
 												Assignment("example.com/gpu", "default", "5").
 												Count(5).
@@ -365,16 +366,16 @@ func TestSnapshot(t *testing.T) {
 						},
 					),
 					ResourceFlavors: map[kueue.ResourceFlavorReference]*kueue.ResourceFlavor{
-						"demand":  utiltesting.MakeResourceFlavor("demand").NodeLabel("instance", "demand").Obj(),
-						"spot":    utiltesting.MakeResourceFlavor("spot").NodeLabel("instance", "spot").Obj(),
-						"default": utiltesting.MakeResourceFlavor("default").Obj(),
+						"demand":  utiltestingapi.MakeResourceFlavor("demand").NodeLabel("instance", "demand").Obj(),
+						"spot":    utiltestingapi.MakeResourceFlavor("spot").NodeLabel("instance", "spot").Obj(),
+						"default": utiltestingapi.MakeResourceFlavor("default").Obj(),
 					},
 				}
 			}(),
 		},
 		"clusterQueues with preemption": {
 			cqs: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("with-preemption").
+				utiltestingapi.MakeClusterQueue("with-preemption").
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -403,7 +404,7 @@ func TestSnapshot(t *testing.T) {
 		},
 		"clusterQueue with fair sharing weight": {
 			cqs: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("with-preemption").FairWeight(resource.MustParse("3")).Obj(),
+				utiltestingapi.MakeClusterQueue("with-preemption").FairWeight(resource.MustParse("3")).Obj(),
 			},
 			wantSnapshot: Snapshot{
 				Manager: hierarchy.NewManagerForTest(
@@ -425,52 +426,52 @@ func TestSnapshot(t *testing.T) {
 		},
 		"lendingLimit with 2 clusterQueues and 2 flavors(whenCanBorrow: MayStopSearch)": {
 			cqs: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
+				utiltestingapi.MakeClusterQueue("a").
 					Cohort("lending").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10", "", "5").Obj(),
-						*utiltesting.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "20", "", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10", "", "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "20", "", "10").Obj(),
 					).
 					FlavorFungibility(defaultFlavorFungibility).
 					Obj(),
-				utiltesting.MakeClusterQueue("b").
+				utiltestingapi.MakeClusterQueue("b").
 					Cohort("lending").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10", "", "5").Obj(),
-						*utiltesting.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "20", "", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10", "", "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "20", "", "10").Obj(),
 					).
 					Obj(),
 			},
 			rfs: []*kueue.ResourceFlavor{
-				utiltesting.MakeResourceFlavor("arm").NodeLabel("arch", "arm").Obj(),
-				utiltesting.MakeResourceFlavor("x86").NodeLabel("arch", "x86").Obj(),
+				utiltestingapi.MakeResourceFlavor("arm").NodeLabel("arch", "arm").Obj(),
+				utiltestingapi.MakeResourceFlavor("x86").NodeLabel("arch", "x86").Obj(),
 			},
 			wls: []*kueue.Workload{
-				utiltesting.MakeWorkload("alpha", "").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				utiltestingapi.MakeWorkload("alpha", "").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "2").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("a").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("a").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "arm", "10000m").
 							Count(5).
 							Obj()).
 						Obj()).
 					Obj(),
-				utiltesting.MakeWorkload("beta", "").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				utiltestingapi.MakeWorkload("beta", "").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("a").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("a").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "arm", "5000m").
 							Count(5).
 							Obj()).
 						Obj()).
 					Obj(),
-				utiltesting.MakeWorkload("gamma", "").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				utiltestingapi.MakeWorkload("gamma", "").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "2").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("a").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("a").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "x86", "10000m").
 							Count(5).
 							Obj()).
@@ -523,31 +524,31 @@ func TestSnapshot(t *testing.T) {
 								FlavorFungibility: defaultFlavorFungibility,
 								FairWeight:        defaultWeight,
 								Workloads: map[workload.Reference]*workload.Info{
-									"/alpha": workload.NewInfo(utiltesting.MakeWorkload("alpha", "").
-										PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+									"/alpha": workload.NewInfo(utiltestingapi.MakeWorkload("alpha", "").
+										PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 											Request(corev1.ResourceCPU, "2").Obj()).
-										ReserveQuota(utiltesting.MakeAdmission("a").
-											PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+										ReserveQuota(utiltestingapi.MakeAdmission("a").
+											PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 												Assignment(corev1.ResourceCPU, "arm", "10000m").
 												Count(5).
 												Obj()).
 											Obj()).
 										Obj()),
-									"/beta": workload.NewInfo(utiltesting.MakeWorkload("beta", "").
-										PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+									"/beta": workload.NewInfo(utiltestingapi.MakeWorkload("beta", "").
+										PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 											Request(corev1.ResourceCPU, "1").Obj()).
-										ReserveQuota(utiltesting.MakeAdmission("a").
-											PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+										ReserveQuota(utiltestingapi.MakeAdmission("a").
+											PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 												Assignment(corev1.ResourceCPU, "arm", "5000m").
 												Count(5).
 												Obj()).
 											Obj()).
 										Obj()),
-									"/gamma": workload.NewInfo(utiltesting.MakeWorkload("gamma", "").
-										PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+									"/gamma": workload.NewInfo(utiltestingapi.MakeWorkload("gamma", "").
+										PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 											Request(corev1.ResourceCPU, "2").Obj()).
-										ReserveQuota(utiltesting.MakeAdmission("a").
-											PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+										ReserveQuota(utiltestingapi.MakeAdmission("a").
+											PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 												Assignment(corev1.ResourceCPU, "x86", "10000m").
 												Count(5).
 												Obj()).
@@ -588,8 +589,8 @@ func TestSnapshot(t *testing.T) {
 						},
 					),
 					ResourceFlavors: map[kueue.ResourceFlavorReference]*kueue.ResourceFlavor{
-						"arm": utiltesting.MakeResourceFlavor("arm").NodeLabel("arch", "arm").Obj(),
-						"x86": utiltesting.MakeResourceFlavor("x86").NodeLabel("arch", "x86").Obj(),
+						"arm": utiltestingapi.MakeResourceFlavor("arm").NodeLabel("arch", "arm").Obj(),
+						"x86": utiltestingapi.MakeResourceFlavor("x86").NodeLabel("arch", "x86").Obj(),
 					},
 				}
 			}(),
@@ -597,52 +598,52 @@ func TestSnapshot(t *testing.T) {
 		"should not populate the snapshot with lendingLimit when feature disabled": {
 			disableLendingLimit: true,
 			cqs: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
+				utiltestingapi.MakeClusterQueue("a").
 					Cohort("lending").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10", "", "5").Obj(),
-						*utiltesting.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "20", "", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10", "", "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "20", "", "10").Obj(),
 					).
 					FlavorFungibility(defaultFlavorFungibility).
 					Obj(),
-				utiltesting.MakeClusterQueue("b").
+				utiltestingapi.MakeClusterQueue("b").
 					Cohort("lending").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10", "", "5").Obj(),
-						*utiltesting.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "20", "", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10", "", "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "20", "", "10").Obj(),
 					).
 					Obj(),
 			},
 			rfs: []*kueue.ResourceFlavor{
-				utiltesting.MakeResourceFlavor("arm").NodeLabel("arch", "arm").Obj(),
-				utiltesting.MakeResourceFlavor("x86").NodeLabel("arch", "x86").Obj(),
+				utiltestingapi.MakeResourceFlavor("arm").NodeLabel("arch", "arm").Obj(),
+				utiltestingapi.MakeResourceFlavor("x86").NodeLabel("arch", "x86").Obj(),
 			},
 			wls: []*kueue.Workload{
-				utiltesting.MakeWorkload("alpha", "").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				utiltestingapi.MakeWorkload("alpha", "").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "2").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("a").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("a").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "arm", "10000m").
 							Count(5).
 							Obj()).
 						Obj()).
 					Obj(),
-				utiltesting.MakeWorkload("beta", "").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				utiltestingapi.MakeWorkload("beta", "").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("a").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("a").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "arm", "5000m").
 							Count(5).
 							Obj()).
 						Obj()).
 					Obj(),
-				utiltesting.MakeWorkload("gamma", "").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				utiltestingapi.MakeWorkload("gamma", "").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "2").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("a").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("a").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "x86", "10000m").
 							Count(5).
 							Obj()).
@@ -696,31 +697,31 @@ func TestSnapshot(t *testing.T) {
 								FlavorFungibility: defaultFlavorFungibility,
 								FairWeight:        defaultWeight,
 								Workloads: map[workload.Reference]*workload.Info{
-									"/alpha": workload.NewInfo(utiltesting.MakeWorkload("alpha", "").
-										PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+									"/alpha": workload.NewInfo(utiltestingapi.MakeWorkload("alpha", "").
+										PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 											Request(corev1.ResourceCPU, "2").Obj()).
-										ReserveQuota(utiltesting.MakeAdmission("a").
-											PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+										ReserveQuota(utiltestingapi.MakeAdmission("a").
+											PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 												Assignment(corev1.ResourceCPU, "arm", "10000m").
 												Count(5).
 												Obj()).
 											Obj()).
 										Obj()),
-									"/beta": workload.NewInfo(utiltesting.MakeWorkload("beta", "").
-										PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+									"/beta": workload.NewInfo(utiltestingapi.MakeWorkload("beta", "").
+										PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 											Request(corev1.ResourceCPU, "1").Obj()).
-										ReserveQuota(utiltesting.MakeAdmission("a").
-											PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+										ReserveQuota(utiltestingapi.MakeAdmission("a").
+											PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 												Assignment(corev1.ResourceCPU, "arm", "5000m").
 												Count(5).
 												Obj()).
 											Obj()).
 										Obj()),
-									"/gamma": workload.NewInfo(utiltesting.MakeWorkload("gamma", "").
-										PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+									"/gamma": workload.NewInfo(utiltestingapi.MakeWorkload("gamma", "").
+										PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 											Request(corev1.ResourceCPU, "2").Obj()).
-										ReserveQuota(utiltesting.MakeAdmission("a").
-											PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+										ReserveQuota(utiltestingapi.MakeAdmission("a").
+											PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 												Assignment(corev1.ResourceCPU, "x86", "10000m").
 												Count(5).
 												Obj()).
@@ -760,35 +761,35 @@ func TestSnapshot(t *testing.T) {
 						},
 					),
 					ResourceFlavors: map[kueue.ResourceFlavorReference]*kueue.ResourceFlavor{
-						"arm": utiltesting.MakeResourceFlavor("arm").NodeLabel("arch", "arm").Obj(),
-						"x86": utiltesting.MakeResourceFlavor("x86").NodeLabel("arch", "x86").Obj(),
+						"arm": utiltestingapi.MakeResourceFlavor("arm").NodeLabel("arch", "arm").Obj(),
+						"x86": utiltestingapi.MakeResourceFlavor("x86").NodeLabel("arch", "x86").Obj(),
 					},
 				}
 			}(),
 		},
 		"cohort provides resources": {
 			rfs: []*kueue.ResourceFlavor{
-				utiltesting.MakeResourceFlavor("arm").Obj(),
-				utiltesting.MakeResourceFlavor("x86").Obj(),
-				utiltesting.MakeResourceFlavor("mips").Obj(),
+				utiltestingapi.MakeResourceFlavor("arm").Obj(),
+				utiltestingapi.MakeResourceFlavor("x86").Obj(),
+				utiltestingapi.MakeResourceFlavor("mips").Obj(),
 			},
 			cqs: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("cq").
+				utiltestingapi.MakeClusterQueue("cq").
 					Cohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "7", "", "3").Obj(),
-						*utiltesting.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "7", "", "3").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "5").Obj(),
 					).
 					Obj(),
 			},
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10").Obj(),
-						*utiltesting.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "20").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "20").Obj(),
 					).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("mips").Resource(corev1.ResourceCPU, "42").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("mips").Resource(corev1.ResourceCPU, "42").Obj(),
 					).Obj(),
 			},
 			wantSnapshot: Snapshot{
@@ -840,42 +841,42 @@ func TestSnapshot(t *testing.T) {
 					},
 				),
 				ResourceFlavors: map[kueue.ResourceFlavorReference]*kueue.ResourceFlavor{
-					"arm":  utiltesting.MakeResourceFlavor("arm").Obj(),
-					"x86":  utiltesting.MakeResourceFlavor("x86").Obj(),
-					"mips": utiltesting.MakeResourceFlavor("mips").Obj(),
+					"arm":  utiltestingapi.MakeResourceFlavor("arm").Obj(),
+					"x86":  utiltestingapi.MakeResourceFlavor("x86").Obj(),
+					"mips": utiltestingapi.MakeResourceFlavor("mips").Obj(),
 				},
 			},
 		},
 		"cohorts with cycles and their cqs excluded from snapshot": {
 			rfs: []*kueue.ResourceFlavor{
-				utiltesting.MakeResourceFlavor("arm").Obj(),
+				utiltestingapi.MakeResourceFlavor("arm").Obj(),
 			},
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("autocycle").Parent("autocycle").Obj(),
-				utiltesting.MakeCohort("cycle-a").Parent("cycle-b").Obj(),
-				utiltesting.MakeCohort("cycle-b").Parent("cycle-a").Obj(),
-				utiltesting.MakeCohort("nocycle").Obj(),
+				utiltestingapi.MakeCohort("autocycle").Parent("autocycle").Obj(),
+				utiltestingapi.MakeCohort("cycle-a").Parent("cycle-b").Obj(),
+				utiltestingapi.MakeCohort("cycle-b").Parent("cycle-a").Obj(),
+				utiltestingapi.MakeCohort("nocycle").Obj(),
 			},
 			cqs: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("cq-autocycle").
+				utiltestingapi.MakeClusterQueue("cq-autocycle").
 					Cohort("autocycle").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
-				utiltesting.MakeClusterQueue("cq-a").
+				utiltestingapi.MakeClusterQueue("cq-a").
 					Cohort("cycle-a").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
-				utiltesting.MakeClusterQueue("cq-b").
+				utiltestingapi.MakeClusterQueue("cq-b").
 					Cohort("cycle-b").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
-				utiltesting.MakeClusterQueue("cq-nocycle").
+				utiltestingapi.MakeClusterQueue("cq-nocycle").
 					Cohort("nocycle").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("arm").Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
 			},
 			wantSnapshot: Snapshot{
@@ -919,13 +920,13 @@ func TestSnapshot(t *testing.T) {
 				),
 				InactiveClusterQueueSets: sets.New[kueue.ClusterQueueReference]("cq-autocycle", "cq-a", "cq-b"),
 				ResourceFlavors: map[kueue.ResourceFlavorReference]*kueue.ResourceFlavor{
-					"arm": utiltesting.MakeResourceFlavor("arm").Obj(),
+					"arm": utiltestingapi.MakeResourceFlavor("arm").Obj(),
 				},
 			},
 		},
 		"cohort snapshot has fair sharing weight": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("cohort").FairWeight(resource.MustParse("0.5")).Obj(),
+				utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("0.5")).Obj(),
 			},
 			wantSnapshot: Snapshot{
 				Manager: hierarchy.NewManagerForTest(
@@ -987,65 +988,65 @@ func TestSnapshot(t *testing.T) {
 
 func TestSnapshotAddRemoveWorkload(t *testing.T) {
 	flavors := []*kueue.ResourceFlavor{
-		utiltesting.MakeResourceFlavor("default").Obj(),
-		utiltesting.MakeResourceFlavor("alpha").Obj(),
-		utiltesting.MakeResourceFlavor("beta").Obj(),
+		utiltestingapi.MakeResourceFlavor("default").Obj(),
+		utiltestingapi.MakeResourceFlavor("alpha").Obj(),
+		utiltestingapi.MakeResourceFlavor("beta").Obj(),
 	}
 	clusterQueues := []*kueue.ClusterQueue{
-		utiltesting.MakeClusterQueue("c1").
+		utiltestingapi.MakeClusterQueue("c1").
 			Cohort("cohort").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "6").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "6").Obj(),
 			).
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("alpha").Resource(corev1.ResourceMemory, "6Gi").Obj(),
-				*utiltesting.MakeFlavorQuotas("beta").Resource(corev1.ResourceMemory, "6Gi").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("alpha").Resource(corev1.ResourceMemory, "6Gi").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("beta").Resource(corev1.ResourceMemory, "6Gi").Obj(),
 			).
 			Obj(),
-		utiltesting.MakeClusterQueue("c2").
+		utiltestingapi.MakeClusterQueue("c2").
 			Cohort("cohort").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "6").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "6").Obj(),
 			).
 			Obj(),
 	}
 	workloads := []kueue.Workload{
-		*utiltesting.MakeWorkload("c1-cpu", "").
+		*utiltestingapi.MakeWorkload("c1-cpu", "").
 			Request(corev1.ResourceCPU, "1").
-			ReserveQuota(utiltesting.MakeAdmission("c1").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			ReserveQuota(utiltestingapi.MakeAdmission("c1").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceCPU, "default", "1000m").
 					Obj()).
 				Obj()).
 			Obj(),
-		*utiltesting.MakeWorkload("c1-memory-alpha", "").
+		*utiltestingapi.MakeWorkload("c1-memory-alpha", "").
 			Request(corev1.ResourceMemory, "1Gi").
-			ReserveQuota(utiltesting.MakeAdmission("c1").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			ReserveQuota(utiltestingapi.MakeAdmission("c1").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceMemory, "alpha", "1Gi").
 					Obj()).
 				Obj()).
 			Obj(),
-		*utiltesting.MakeWorkload("c1-memory-beta", "").
+		*utiltestingapi.MakeWorkload("c1-memory-beta", "").
 			Request(corev1.ResourceMemory, "1Gi").
-			ReserveQuota(utiltesting.MakeAdmission("c1").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			ReserveQuota(utiltestingapi.MakeAdmission("c1").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceMemory, "beta", "1Gi").
 					Obj()).
 				Obj()).
 			Obj(),
-		*utiltesting.MakeWorkload("c2-cpu-1", "").
+		*utiltestingapi.MakeWorkload("c2-cpu-1", "").
 			Request(corev1.ResourceCPU, "1").
-			ReserveQuota(utiltesting.MakeAdmission("c2").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			ReserveQuota(utiltestingapi.MakeAdmission("c2").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceCPU, "default", "1000m").
 					Obj()).
 				Obj()).
 			Obj(),
-		*utiltesting.MakeWorkload("c2-cpu-2", "").
+		*utiltestingapi.MakeWorkload("c2-cpu-2", "").
 			Request(corev1.ResourceCPU, "1").
-			ReserveQuota(utiltesting.MakeAdmission("c2").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			ReserveQuota(utiltestingapi.MakeAdmission("c2").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceCPU, "default", "1000m").
 					Obj()).
 				Obj()).
@@ -1303,23 +1304,23 @@ func TestSnapshotAddRemoveWorkload(t *testing.T) {
 
 func TestSnapshotAddRemoveWorkloadWithLendingLimit(t *testing.T) {
 	flavors := []*kueue.ResourceFlavor{
-		utiltesting.MakeResourceFlavor("default").Obj(),
+		utiltestingapi.MakeResourceFlavor("default").Obj(),
 	}
 	clusterQueues := []*kueue.ClusterQueue{
-		utiltesting.MakeClusterQueue("lend-a").
+		utiltestingapi.MakeClusterQueue("lend-a").
 			Cohort("lend").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "10", "", "4").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "10", "", "4").Obj(),
 			).
 			Preemption(kueue.ClusterQueuePreemption{
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 				ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("lend-b").
+		utiltestingapi.MakeClusterQueue("lend-b").
 			Cohort("lend").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "10", "", "6").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "10", "", "6").Obj(),
 			).
 			Preemption(kueue.ClusterQueuePreemption{
 				WithinClusterQueue:  kueue.PreemptionPolicyNever,
@@ -1328,34 +1329,34 @@ func TestSnapshotAddRemoveWorkloadWithLendingLimit(t *testing.T) {
 			Obj(),
 	}
 	workloads := []kueue.Workload{
-		*utiltesting.MakeWorkload("lend-a-1", "").
+		*utiltestingapi.MakeWorkload("lend-a-1", "").
 			Request(corev1.ResourceCPU, "1").
-			ReserveQuota(utiltesting.MakeAdmission("lend-a").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			ReserveQuota(utiltestingapi.MakeAdmission("lend-a").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceCPU, "default", "1").
 					Obj()).
 				Obj()).
 			Obj(),
-		*utiltesting.MakeWorkload("lend-a-2", "").
+		*utiltestingapi.MakeWorkload("lend-a-2", "").
 			Request(corev1.ResourceCPU, "9").
-			ReserveQuota(utiltesting.MakeAdmission("lend-a").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			ReserveQuota(utiltestingapi.MakeAdmission("lend-a").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceCPU, "default", "9").
 					Obj()).
 				Obj()).
 			Obj(),
-		*utiltesting.MakeWorkload("lend-a-3", "").
+		*utiltestingapi.MakeWorkload("lend-a-3", "").
 			Request(corev1.ResourceCPU, "6").
-			ReserveQuota(utiltesting.MakeAdmission("lend-a").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			ReserveQuota(utiltestingapi.MakeAdmission("lend-a").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceCPU, "default", "6").
 					Obj()).
 				Obj()).
 			Obj(),
-		*utiltesting.MakeWorkload("lend-b-1", "").
+		*utiltestingapi.MakeWorkload("lend-b-1", "").
 			Request(corev1.ResourceCPU, "4").
-			ReserveQuota(utiltesting.MakeAdmission("lend-b").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			ReserveQuota(utiltestingapi.MakeAdmission("lend-b").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceCPU, "default", "4").
 					Obj()).
 				Obj()).
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index 9e26a713f..bd62c1a51 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -37,6 +37,7 @@ import (
 	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache"
+	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 	runtimeconfig "sigs.k8s.io/controller-runtime/pkg/config"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
@@ -47,6 +48,41 @@ import (
 	_ "sigs.k8s.io/kueue/pkg/controller/jobs"
 )
 
+func defaultControlCacheOptions(namespace string) ctrlcache.Options {
+	return ctrlcache.Options{
+		ByObject: map[ctrlclient.Object]ctrlcache.ByObject{
+			objectKeySecret: {
+				Namespaces: map[string]ctrlcache.Config{
+					namespace: {},
+				},
+			},
+		},
+	}
+}
+
+func defaultControlOptions(namespace string) ctrl.Options {
+	return ctrl.Options{
+		Cache:                  defaultControlCacheOptions(namespace),
+		HealthProbeBindAddress: configapi.DefaultHealthProbeBindAddress,
+		Metrics: metricsserver.Options{
+			BindAddress: configapi.DefaultMetricsBindAddress,
+		},
+		LeaderElection:                true,
+		LeaderElectionID:              configapi.DefaultLeaderElectionID,
+		LeaderElectionResourceLock:    resourcelock.LeasesResourceLock,
+		LeaderElectionReleaseOnCancel: true,
+		LeaseDuration:                 ptr.To(configapi.DefaultLeaderElectionLeaseDuration),
+		RenewDeadline:                 ptr.To(configapi.DefaultLeaderElectionRenewDeadline),
+		RetryPeriod:                   ptr.To(configapi.DefaultLeaderElectionRetryPeriod),
+		WebhookServer: &webhook.DefaultServer{
+			Options: webhook.Options{
+				Port:    configapi.DefaultWebhookPort,
+				CertDir: configapi.DefaultWebhookCertDir,
+			},
+		},
+	}
+}
+
 func TestLoad(t *testing.T) {
 	testScheme := runtime.NewScheme()
 	err := configapi.AddToScheme(testScheme)
@@ -74,6 +110,14 @@ webhook:
 		t.Fatal(err)
 	}
 
+	emptyConfig := filepath.Join(tmpDir, "empty-config.yaml")
+	if err := os.WriteFile(emptyConfig, []byte(`
+apiVersion: config.kueue.x-k8s.io/v1beta1
+kind: Configuration
+`), os.FileMode(0600)); err != nil {
+		t.Fatal(err)
+	}
+
 	ctrlManagerConfigSpecOverWriteConfig := filepath.Join(tmpDir, "ctrl-manager-config-spec-overwrite.yaml")
 	if err := os.WriteFile(ctrlManagerConfigSpecOverWriteConfig, []byte(`
 apiVersion: config.kueue.x-k8s.io/v1beta1
@@ -330,26 +374,6 @@ objectRetentionPolicies:
 		t.Fatal(err)
 	}
 
-	defaultControlOptions := ctrl.Options{
-		HealthProbeBindAddress: configapi.DefaultHealthProbeBindAddress,
-		Metrics: metricsserver.Options{
-			BindAddress: configapi.DefaultMetricsBindAddress,
-		},
-		LeaderElection:                true,
-		LeaderElectionID:              configapi.DefaultLeaderElectionID,
-		LeaderElectionResourceLock:    resourcelock.LeasesResourceLock,
-		LeaderElectionReleaseOnCancel: true,
-		LeaseDuration:                 ptr.To(configapi.DefaultLeaderElectionLeaseDuration),
-		RenewDeadline:                 ptr.To(configapi.DefaultLeaderElectionRenewDeadline),
-		RetryPeriod:                   ptr.To(configapi.DefaultLeaderElectionRetryPeriod),
-		WebhookServer: &webhook.DefaultServer{
-			Options: webhook.Options{
-				Port:    configapi.DefaultWebhookPort,
-				CertDir: configapi.DefaultWebhookCertDir,
-			},
-		},
-	}
-
 	enableDefaultInternalCertManagement := &configapi.InternalCertManagement{
 		Enable:             ptr.To(true),
 		WebhookServiceName: ptr.To(configapi.DefaultWebhookServiceName),
@@ -418,6 +442,7 @@ objectRetentionPolicies:
 				WaitForPodsReady:             defaultWaitForPodsReady,
 			},
 			wantOptions: ctrl.Options{
+				Cache:                  defaultControlCacheOptions(configapi.DefaultNamespace),
 				HealthProbeBindAddress: configapi.DefaultHealthProbeBindAddress,
 				Metrics: metricsserver.Options{
 					BindAddress: configapi.DefaultMetricsBindAddress,
@@ -437,6 +462,24 @@ objectRetentionPolicies:
 				},
 			},
 		},
+		{
+			name:       "empty config",
+			configFile: emptyConfig,
+			wantConfiguration: configapi.Configuration{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: configapi.GroupVersion.String(),
+					Kind:       "Configuration",
+				},
+				Namespace:                    ptr.To(configapi.DefaultNamespace),
+				InternalCertManagement:       enableDefaultInternalCertManagement,
+				ClientConnection:             defaultClientConnection,
+				Integrations:                 defaultIntegrations,
+				MultiKueue:                   defaultMultiKueue,
+				ManagedJobsNamespaceSelector: defaultManagedJobsNamespaceSelector,
+				WaitForPodsReady:             defaultWaitForPodsReady,
+			},
+			wantOptions: defaultControlOptions(configapi.DefaultNamespace),
+		},
 		{
 			name:       "bad path",
 			configFile: ".",
@@ -473,7 +516,7 @@ objectRetentionPolicies:
 				},
 				WaitForPodsReady: defaultWaitForPodsReady,
 			},
-			wantOptions: defaultControlOptions,
+			wantOptions: defaultControlOptions("kueue-tenant-a"),
 		},
 		{
 			name:       "ControllerManagerConfigurationSpec overwrite config",
@@ -493,6 +536,7 @@ objectRetentionPolicies:
 				WaitForPodsReady:             defaultWaitForPodsReady,
 			},
 			wantOptions: ctrl.Options{
+				Cache:                  defaultControlCacheOptions(configapi.DefaultNamespace),
 				HealthProbeBindAddress: ":38081",
 				Metrics: metricsserver.Options{
 					BindAddress: ":38080",
@@ -533,7 +577,7 @@ objectRetentionPolicies:
 				ManagedJobsNamespaceSelector: defaultManagedJobsNamespaceSelector,
 				WaitForPodsReady:             defaultWaitForPodsReady,
 			},
-			wantOptions: defaultControlOptions,
+			wantOptions: defaultControlOptions(configapi.DefaultNamespace),
 		},
 		{
 			name:       "disable cert overwrite config",
@@ -554,7 +598,7 @@ objectRetentionPolicies:
 				ManagedJobsNamespaceSelector: defaultManagedJobsNamespaceSelector,
 				WaitForPodsReady:             defaultWaitForPodsReady,
 			},
-			wantOptions: defaultControlOptions,
+			wantOptions: defaultControlOptions(configapi.DefaultNamespace),
 		},
 		{
 			name:       "leaderElection disabled config",
@@ -574,6 +618,7 @@ objectRetentionPolicies:
 				WaitForPodsReady:             defaultWaitForPodsReady,
 			},
 			wantOptions: ctrl.Options{
+				Cache:                  defaultControlCacheOptions("kueue-system"),
 				HealthProbeBindAddress: configapi.DefaultHealthProbeBindAddress,
 				Metrics: metricsserver.Options{
 					BindAddress: configapi.DefaultMetricsBindAddress,
@@ -622,6 +667,7 @@ objectRetentionPolicies:
 				ManagedJobsNamespaceSelector: defaultManagedJobsNamespaceSelector,
 			},
 			wantOptions: ctrl.Options{
+				Cache:                  defaultControlCacheOptions(configapi.DefaultNamespace),
 				HealthProbeBindAddress: configapi.DefaultHealthProbeBindAddress,
 				Metrics: metricsserver.Options{
 					BindAddress: configapi.DefaultMetricsBindAddress,
@@ -661,7 +707,7 @@ objectRetentionPolicies:
 				ManagedJobsNamespaceSelector: defaultManagedJobsNamespaceSelector,
 				WaitForPodsReady:             defaultWaitForPodsReady,
 			},
-			wantOptions: defaultControlOptions,
+			wantOptions: defaultControlOptions(configapi.DefaultNamespace),
 		},
 		{
 			name:       "fullController config",
@@ -684,6 +730,7 @@ objectRetentionPolicies:
 				WaitForPodsReady:             defaultWaitForPodsReady,
 			},
 			wantOptions: ctrl.Options{
+				Cache:                  defaultControlCacheOptions(configapi.DefaultNamespace),
 				HealthProbeBindAddress: configapi.DefaultHealthProbeBindAddress,
 				ReadinessEndpointName:  "ready",
 				LivenessEndpointName:   "live",
@@ -737,6 +784,7 @@ objectRetentionPolicies:
 				WaitForPodsReady:             defaultWaitForPodsReady,
 			},
 			wantOptions: ctrl.Options{
+				Cache:                  defaultControlCacheOptions(configapi.DefaultNamespace),
 				HealthProbeBindAddress: configapi.DefaultHealthProbeBindAddress,
 				Metrics: metricsserver.Options{
 					BindAddress: configapi.DefaultMetricsBindAddress,
@@ -798,6 +846,7 @@ objectRetentionPolicies:
 				WaitForPodsReady:             defaultWaitForPodsReady,
 			},
 			wantOptions: ctrl.Options{
+				Cache:                  defaultControlCacheOptions(configapi.DefaultNamespace),
 				HealthProbeBindAddress: configapi.DefaultHealthProbeBindAddress,
 				Metrics: metricsserver.Options{
 					BindAddress: configapi.DefaultMetricsBindAddress,
@@ -839,7 +888,7 @@ objectRetentionPolicies:
 				ManagedJobsNamespaceSelector: defaultManagedJobsNamespaceSelector,
 				WaitForPodsReady:             defaultWaitForPodsReady,
 			},
-			wantOptions: defaultControlOptions,
+			wantOptions: defaultControlOptions(configapi.DefaultNamespace),
 		},
 		{
 			name:       "resourceTransform config",
@@ -885,7 +934,7 @@ objectRetentionPolicies:
 				},
 				WaitForPodsReady: defaultWaitForPodsReady,
 			},
-			wantOptions: defaultControlOptions,
+			wantOptions: defaultControlOptions(configapi.DefaultNamespace),
 		},
 		{
 			name:       "invalid config",
@@ -918,7 +967,7 @@ objectRetentionPolicies:
 				},
 				WaitForPodsReady: defaultWaitForPodsReady,
 			},
-			wantOptions: defaultControlOptions,
+			wantOptions: defaultControlOptions(configapi.DefaultNamespace),
 		},
 	}
 
diff --git a/pkg/controller/admissionchecks/multikueue/admissioncheck_test.go b/pkg/controller/admissionchecks/multikueue/admissioncheck_test.go
index 3935ea857..1d4c9a7b9 100644
--- a/pkg/controller/admissionchecks/multikueue/admissioncheck_test.go
+++ b/pkg/controller/admissionchecks/multikueue/admissioncheck_test.go
@@ -28,6 +28,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/admissioncheck"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestReconcile(t *testing.T) {
@@ -46,14 +47,14 @@ func TestReconcile(t *testing.T) {
 		"missing config": {
 			reconcileFor: "ac1",
 			checks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Generation(1).
 					Obj(),
 			},
 			wantChecks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Condition(metav1.Condition{
@@ -69,12 +70,12 @@ func TestReconcile(t *testing.T) {
 		"unmanaged": {
 			reconcileFor: "ac1",
 			checks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName("not-multikueue").
 					Obj(),
 			},
 			wantChecks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName("not-multikueue").
 					Obj(),
 			},
@@ -82,17 +83,17 @@ func TestReconcile(t *testing.T) {
 		"missing cluster": {
 			reconcileFor: "ac1",
 			checks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Generation(1).
 					Obj(),
 			},
 			configs: []kueue.MultiKueueConfig{
-				*utiltesting.MakeMultiKueueConfig("config1").Clusters("worker1").Obj(),
+				*utiltestingapi.MakeMultiKueueConfig("config1").Clusters("worker1").Obj(),
 			},
 			wantChecks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Condition(metav1.Condition{
@@ -108,22 +109,22 @@ func TestReconcile(t *testing.T) {
 		"inactive cluster": {
 			reconcileFor: "ac1",
 			checks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Generation(1).
 					Obj(),
 			},
 			configs: []kueue.MultiKueueConfig{
-				*utiltesting.MakeMultiKueueConfig("config1").Clusters("worker1").Obj(),
+				*utiltestingapi.MakeMultiKueueConfig("config1").Clusters("worker1").Obj(),
 			},
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					Active(metav1.ConditionFalse, "ByTest", "by test", 1).
 					Obj(),
 			},
 			wantChecks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Condition(metav1.Condition{
@@ -139,25 +140,25 @@ func TestReconcile(t *testing.T) {
 		"all clusters missing or inactive": {
 			reconcileFor: "ac1",
 			checks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Generation(1).
 					Obj(),
 			},
 			configs: []kueue.MultiKueueConfig{
-				*utiltesting.MakeMultiKueueConfig("config1").Clusters("worker1", "worker2", "worker3").Obj(),
+				*utiltestingapi.MakeMultiKueueConfig("config1").Clusters("worker1", "worker2", "worker3").Obj(),
 			},
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					Active(metav1.ConditionFalse, "ByTest", "by test", 1).
 					Obj(),
-				*utiltesting.MakeMultiKueueCluster("worker2").
+				*utiltestingapi.MakeMultiKueueCluster("worker2").
 					Active(metav1.ConditionFalse, "ByTest", "by test", 1).
 					Obj(),
 			},
 			wantChecks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Condition(metav1.Condition{
@@ -173,25 +174,25 @@ func TestReconcile(t *testing.T) {
 		"partially active": {
 			reconcileFor: "ac1",
 			checks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Generation(1).
 					Obj(),
 			},
 			configs: []kueue.MultiKueueConfig{
-				*utiltesting.MakeMultiKueueConfig("config1").Clusters("worker1", "worker2", "worker3").Obj(),
+				*utiltestingapi.MakeMultiKueueConfig("config1").Clusters("worker1", "worker2", "worker3").Obj(),
 			},
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					Active(metav1.ConditionFalse, "ByTest", "by test", 1).
 					Obj(),
-				*utiltesting.MakeMultiKueueCluster("worker2").
+				*utiltestingapi.MakeMultiKueueCluster("worker2").
 					Active(metav1.ConditionTrue, "ByTest", "by test", 1).
 					Obj(),
 			},
 			wantChecks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Condition(metav1.Condition{
@@ -207,22 +208,22 @@ func TestReconcile(t *testing.T) {
 		"active": {
 			reconcileFor: "ac1",
 			checks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Generation(1).
 					Obj(),
 			},
 			configs: []kueue.MultiKueueConfig{
-				*utiltesting.MakeMultiKueueConfig("config1").Clusters("worker1").Obj(),
+				*utiltestingapi.MakeMultiKueueConfig("config1").Clusters("worker1").Obj(),
 			},
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					Active(metav1.ConditionTrue, "ByTest", "by test", 1).
 					Obj(),
 			},
 			wantChecks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("ac1").
+				*utiltestingapi.MakeAdmissionCheck("ac1").
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Condition(metav1.Condition{
diff --git a/pkg/controller/admissionchecks/multikueue/fswatch_test.go b/pkg/controller/admissionchecks/multikueue/fswatch_test.go
index aa3dd704e..771dfa343 100644
--- a/pkg/controller/admissionchecks/multikueue/fswatch_test.go
+++ b/pkg/controller/admissionchecks/multikueue/fswatch_test.go
@@ -156,9 +156,7 @@ func TestFSWatch(t *testing.T) {
 			// start the recorder
 			gotEventsForClusters := set.New[string]()
 			wg := sync.WaitGroup{}
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
+			wg.Go(func() {
 				for {
 					select {
 					case ev := <-watcher.reconcile:
@@ -170,7 +168,7 @@ func TestFSWatch(t *testing.T) {
 						return
 					}
 				}
-			}()
+			})
 			_ = watcher.Start(ctx)
 
 			gotAddErrors := map[string]error{}
diff --git a/pkg/controller/admissionchecks/multikueue/indexer_test.go b/pkg/controller/admissionchecks/multikueue/indexer_test.go
index 42c25ad9a..a90f997b8 100644
--- a/pkg/controller/admissionchecks/multikueue/indexer_test.go
+++ b/pkg/controller/admissionchecks/multikueue/indexer_test.go
@@ -32,6 +32,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/util/slices"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 const (
@@ -68,21 +69,21 @@ func TestListMultiKueueClustersUsingKubeConfig(t *testing.T) {
 		},
 		"single cluster, single match": {
 			clusters: []*kueue.MultiKueueCluster{
-				utiltesting.MakeMultiKueueCluster("cluster1").KubeConfig(kueue.SecretLocationType, "secret1").Obj(),
+				utiltestingapi.MakeMultiKueueCluster("cluster1").KubeConfig(kueue.SecretLocationType, "secret1").Obj(),
 			},
 			filter:   client.MatchingFields{UsingKubeConfigs: TestNamespace + "/secret1"},
 			wantList: []string{"cluster1"},
 		},
 		"single cluster, no match": {
 			clusters: []*kueue.MultiKueueCluster{
-				utiltesting.MakeMultiKueueCluster("cluster2").KubeConfig(kueue.SecretLocationType, "secret2").Obj(),
+				utiltestingapi.MakeMultiKueueCluster("cluster2").KubeConfig(kueue.SecretLocationType, "secret2").Obj(),
 			},
 			filter: client.MatchingFields{UsingKubeConfigs: TestNamespace + "/secret1"},
 		},
 		"multiple clusters, single match": {
 			clusters: []*kueue.MultiKueueCluster{
-				utiltesting.MakeMultiKueueCluster("cluster1").KubeConfig(kueue.SecretLocationType, "secret1").Obj(),
-				utiltesting.MakeMultiKueueCluster("cluster2").KubeConfig(kueue.SecretLocationType, "secret2").Obj(),
+				utiltestingapi.MakeMultiKueueCluster("cluster1").KubeConfig(kueue.SecretLocationType, "secret1").Obj(),
+				utiltestingapi.MakeMultiKueueCluster("cluster2").KubeConfig(kueue.SecretLocationType, "secret2").Obj(),
 			},
 			filter:   client.MatchingFields{UsingKubeConfigs: TestNamespace + "/secret1"},
 			wantList: []string{"cluster1"},
@@ -126,21 +127,21 @@ func TestListMultiKueueConfigsUsingMultiKueueClusters(t *testing.T) {
 		},
 		"single config, single match": {
 			configs: []*kueue.MultiKueueConfig{
-				utiltesting.MakeMultiKueueConfig("config1").Clusters("cluster1", "cluster2").Obj(),
+				utiltestingapi.MakeMultiKueueConfig("config1").Clusters("cluster1", "cluster2").Obj(),
 			},
 			filter:   client.MatchingFields{UsingMultiKueueClusters: "cluster2"},
 			wantList: []string{"config1"},
 		},
 		"single config, no match": {
 			configs: []*kueue.MultiKueueConfig{
-				utiltesting.MakeMultiKueueConfig("config2").Clusters("cluster2").Obj(),
+				utiltestingapi.MakeMultiKueueConfig("config2").Clusters("cluster2").Obj(),
 			},
 			filter: client.MatchingFields{UsingMultiKueueClusters: "cluster1"},
 		},
 		"multiple configs, single match": {
 			configs: []*kueue.MultiKueueConfig{
-				utiltesting.MakeMultiKueueConfig("config1").Clusters("cluster1", "cluster2").Obj(),
-				utiltesting.MakeMultiKueueConfig("config2").Clusters("cluster2").Obj(),
+				utiltestingapi.MakeMultiKueueConfig("config1").Clusters("cluster1", "cluster2").Obj(),
+				utiltestingapi.MakeMultiKueueConfig("config2").Clusters("cluster2").Obj(),
 			},
 			filter:   client.MatchingFields{UsingMultiKueueClusters: "cluster1"},
 			wantList: []string{"config1"},
diff --git a/pkg/controller/admissionchecks/multikueue/multikueuecluster_test.go b/pkg/controller/admissionchecks/multikueue/multikueuecluster_test.go
index a72545268..2fd7884f6 100644
--- a/pkg/controller/admissionchecks/multikueue/multikueuecluster_test.go
+++ b/pkg/controller/admissionchecks/multikueue/multikueuecluster_test.go
@@ -38,6 +38,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/util/slices"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 
 	_ "sigs.k8s.io/kueue/pkg/controller/jobs"
@@ -116,7 +117,7 @@ func TestUpdateConfig(t *testing.T) {
 		"new valid client is added": {
 			reconcileFor: "worker1",
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Generation(1).
 					Obj(),
@@ -125,7 +126,7 @@ func TestUpdateConfig(t *testing.T) {
 				makeTestSecret("worker1", "worker1 kubeconfig"),
 			},
 			wantClusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Active(metav1.ConditionTrue, "Active", "Connected", 1).
 					Generation(1).
@@ -140,7 +141,7 @@ func TestUpdateConfig(t *testing.T) {
 		"update client with valid secret config": {
 			reconcileFor: "worker1",
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Generation(1).
 					Obj(),
@@ -152,7 +153,7 @@ func TestUpdateConfig(t *testing.T) {
 				"worker1": newTestClient(ctx, "worker1 old kubeconfig", cancelCalled),
 			},
 			wantClusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Active(metav1.ConditionTrue, "Active", "Connected", 1).
 					Generation(1).
@@ -168,7 +169,7 @@ func TestUpdateConfig(t *testing.T) {
 		"update client with valid path config": {
 			reconcileFor: "worker1",
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.PathLocationType, "testdata/worker1KubeConfig").
 					Generation(1).
 					Obj(),
@@ -177,7 +178,7 @@ func TestUpdateConfig(t *testing.T) {
 				"worker1": newTestClient(ctx, "worker1 old kubeconfig", cancelCalled),
 			},
 			wantClusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.PathLocationType, "testdata/worker1KubeConfig").
 					Active(metav1.ConditionTrue, "Active", "Connected", 1).
 					Generation(1).
@@ -193,7 +194,7 @@ func TestUpdateConfig(t *testing.T) {
 		"update client with invalid secret config": {
 			reconcileFor: "worker1",
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Generation(1).
 					Obj(),
@@ -208,7 +209,7 @@ func TestUpdateConfig(t *testing.T) {
 				"worker1": newTestClient(ctx, "invalid", nil),
 			},
 			wantClusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Active(metav1.ConditionFalse, "ClientConnectionFailed", "invalid kubeconfig", 1).
 					Generation(1).
@@ -219,7 +220,7 @@ func TestUpdateConfig(t *testing.T) {
 		"update client with invalid path config": {
 			reconcileFor: "worker1",
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.PathLocationType, "").
 					Generation(1).
 					Obj(),
@@ -228,7 +229,7 @@ func TestUpdateConfig(t *testing.T) {
 				"worker1": newTestClient(ctx, "worker1 old kubeconfig", cancelCalled),
 			},
 			wantClusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.PathLocationType, "").
 					Active(metav1.ConditionFalse, "BadConfig", "open : no such file or directory", 1).
 					Generation(1).
@@ -239,7 +240,7 @@ func TestUpdateConfig(t *testing.T) {
 		"missing cluster is removed": {
 			reconcileFor: "worker2",
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Generation(1).
 					Obj(),
@@ -249,7 +250,7 @@ func TestUpdateConfig(t *testing.T) {
 				"worker2": newTestClient(ctx, "worker2 kubeconfig", cancelCalled),
 			},
 			wantClusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Generation(1).
 					Obj(),
@@ -264,7 +265,7 @@ func TestUpdateConfig(t *testing.T) {
 		"update client config, nowatch": {
 			reconcileFor: "worker1",
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Generation(1).
 					Obj(),
@@ -279,7 +280,7 @@ func TestUpdateConfig(t *testing.T) {
 				"worker1": setReconnectState(newTestClient(ctx, "nowatch", nil), 1),
 			},
 			wantClusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Active(metav1.ConditionFalse, "ClientConnectionFailed", "client cannot watch", 1).
 					Generation(1).
@@ -291,7 +292,7 @@ func TestUpdateConfig(t *testing.T) {
 		"update client config, nowatch 3rd try": {
 			reconcileFor: "worker1",
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Active(metav1.ConditionFalse, "ClientConnectionFailed", "client cannot watch", 1).
 					Generation(1).
@@ -307,7 +308,7 @@ func TestUpdateConfig(t *testing.T) {
 				"worker1": setReconnectState(newTestClient(ctx, "nowatch", nil), 3),
 			},
 			wantClusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Active(metav1.ConditionFalse, "ClientConnectionFailed", "client cannot watch", 1).
 					Generation(1).
@@ -319,7 +320,7 @@ func TestUpdateConfig(t *testing.T) {
 		"failed attempts are set to 0 on successful connection": {
 			reconcileFor: "worker1",
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Active(metav1.ConditionFalse, "ClientConnectionFailed", "client cannot watch", 1).
 					Generation(1).
@@ -335,7 +336,7 @@ func TestUpdateConfig(t *testing.T) {
 				"worker1": newTestClient(ctx, "good config", nil),
 			},
 			wantClusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Active(metav1.ConditionTrue, "Active", "Connected", 1).
 					Generation(1).
@@ -346,7 +347,7 @@ func TestUpdateConfig(t *testing.T) {
 		"failed attempts are set to 0 on config change": {
 			reconcileFor: "worker1",
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Active(metav1.ConditionFalse, "ClientConnectionFailed", "client cannot watch", 1).
 					Generation(1).
@@ -362,7 +363,7 @@ func TestUpdateConfig(t *testing.T) {
 				"worker1": newTestClient(ctx, "invalid", nil),
 			},
 			wantClusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("worker1").
+				*utiltestingapi.MakeMultiKueueCluster("worker1").
 					KubeConfig(kueue.SecretLocationType, "worker1").
 					Active(metav1.ConditionFalse, "ClientConnectionFailed", "invalid kubeconfig", 1).
 					Generation(1).
@@ -432,7 +433,7 @@ func TestUpdateConfig(t *testing.T) {
 
 func TestRemoteClientGC(t *testing.T) {
 	baseJobBuilder := testingjob.MakeJob("job1", TestNamespace)
-	baseWlBuilder := utiltesting.MakeWorkload("wl1", TestNamespace).ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "test-uuid")
+	baseWlBuilder := utiltestingapi.MakeWorkload("wl1", TestNamespace).ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "test-uuid")
 
 	cases := map[string]struct {
 		managersWorkloads []kueue.Workload
diff --git a/pkg/controller/admissionchecks/multikueue/workload_test.go b/pkg/controller/admissionchecks/multikueue/workload_test.go
index 282610220..0613a8f82 100644
--- a/pkg/controller/admissionchecks/multikueue/workload_test.go
+++ b/pkg/controller/admissionchecks/multikueue/workload_test.go
@@ -48,6 +48,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/util/admissioncheck"
 	"sigs.k8s.io/kueue/pkg/util/slices"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/pkg/workloadslicing"
 
@@ -70,7 +71,7 @@ func TestWlReconcile(t *testing.T) {
 		cmpopts.SortSlices(func(a, b metav1.Condition) bool { return a.Type < b.Type }),
 	}
 
-	baseWorkloadBuilder := utiltesting.MakeWorkload("wl1", TestNamespace)
+	baseWorkloadBuilder := utiltestingapi.MakeWorkload("wl1", TestNamespace)
 	baseJobBuilder := testingjob.MakeJob("job1", TestNamespace).Suspend(false)
 	baseJobManagedByKueueBuilder := baseJobBuilder.Clone().ManagedBy(kueue.MultiKueueControllerName)
 
@@ -149,13 +150,13 @@ func TestWlReconcile(t *testing.T) {
 				baseWorkloadBuilder.Clone().
 					AdmissionCheck(kueue.AdmissionCheckState{Name: "ac1", State: kueue.CheckStatePending}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			worker1Jobs: []batchv1.Job{
@@ -171,7 +172,7 @@ func TestWlReconcile(t *testing.T) {
 				baseWorkloadBuilder.Clone().
 					AdmissionCheck(kueue.AdmissionCheckState{Name: "ac1", State: kueue.CheckStatePending}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 		},
@@ -328,7 +329,7 @@ func TestWlReconcile(t *testing.T) {
 				*baseWorkloadBuilder.Clone().
 					AdmissionCheck(kueue.AdmissionCheckState{Name: "ac1", State: kueue.CheckStatePending}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			useSecondWorker:      true,
@@ -339,7 +340,7 @@ func TestWlReconcile(t *testing.T) {
 				*baseWorkloadBuilder.Clone().
 					AdmissionCheck(kueue.AdmissionCheckState{Name: "ac1", State: kueue.CheckStatePending}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					NominatedClusterNames("worker1", "worker2").
 					Obj(),
 			},
@@ -357,7 +358,7 @@ func TestWlReconcile(t *testing.T) {
 				*baseWorkloadBuilder.Clone().
 					AdmissionCheck(kueue.AdmissionCheckState{Name: "ac1", State: kueue.CheckStatePending}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			worker1Workloads: []kueue.Workload{
@@ -372,7 +373,7 @@ func TestWlReconcile(t *testing.T) {
 				*baseWorkloadBuilder.Clone().
 					AdmissionCheck(kueue.AdmissionCheckState{Name: "ac1", State: kueue.CheckStatePending}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					NominatedClusterNames("worker1", "worker2").
 					Obj(),
 			},
@@ -394,7 +395,7 @@ func TestWlReconcile(t *testing.T) {
 				*baseWorkloadBuilder.Clone().
 					AdmissionCheck(kueue.AdmissionCheckState{Name: "ac1", State: kueue.CheckStatePending}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 
@@ -404,7 +405,7 @@ func TestWlReconcile(t *testing.T) {
 
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			useSecondWorker:      true,
@@ -418,7 +419,7 @@ func TestWlReconcile(t *testing.T) {
 				*baseWorkloadBuilder.Clone().
 					AdmissionCheck(kueue.AdmissionCheckState{Name: "ac1", State: kueue.CheckStatePending}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantManagersJobs: []batchv1.Job{
@@ -427,7 +428,7 @@ func TestWlReconcile(t *testing.T) {
 
 			wantWorker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantWorker2Workloads: []kueue.Workload{
@@ -443,7 +444,7 @@ func TestWlReconcile(t *testing.T) {
 				*baseWorkloadBuilder.Clone().
 					AdmissionCheck(kueue.AdmissionCheckState{Name: "ac1", State: kueue.CheckStatePending}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 
@@ -453,7 +454,7 @@ func TestWlReconcile(t *testing.T) {
 
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
 					Obj(),
 			},
@@ -471,7 +472,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					ClusterName("worker1").
 					Obj(),
 			},
@@ -482,7 +483,7 @@ func TestWlReconcile(t *testing.T) {
 			wantWorker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantWorker1Jobs: []batchv1.Job{
@@ -507,7 +508,7 @@ func TestWlReconcile(t *testing.T) {
 				*baseWorkloadBuilder.Clone().
 					AdmissionCheck(kueue.AdmissionCheckState{Name: "ac1", State: kueue.CheckStatePending}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 
@@ -517,7 +518,7 @@ func TestWlReconcile(t *testing.T) {
 
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
 					Obj(),
 			},
@@ -535,7 +536,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					ClusterName("worker1").
 					Obj(),
 			},
@@ -546,7 +547,7 @@ func TestWlReconcile(t *testing.T) {
 			wantWorker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantWorker1Jobs: []batchv1.Job{
@@ -572,7 +573,7 @@ func TestWlReconcile(t *testing.T) {
 				*baseWorkloadBuilder.Clone().
 					AdmissionCheck(kueue.AdmissionCheckState{Name: "ac1", State: kueue.CheckStatePending}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 
@@ -582,7 +583,7 @@ func TestWlReconcile(t *testing.T) {
 
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
 					Obj(),
 			},
@@ -600,7 +601,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					ClusterName("worker1").
 					Obj(),
 			},
@@ -611,7 +612,7 @@ func TestWlReconcile(t *testing.T) {
 			wantWorker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantWorker1Jobs: []batchv1.Job{
@@ -641,7 +642,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 
@@ -659,7 +660,7 @@ func TestWlReconcile(t *testing.T) {
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantManagersWorkloads: []kueue.Workload{
@@ -670,7 +671,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					ClusterName("worker1").
 					Obj(),
 			},
@@ -683,7 +684,7 @@ func TestWlReconcile(t *testing.T) {
 			wantWorker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantWorker1Jobs: []batchv1.Job{
@@ -712,7 +713,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 
@@ -730,7 +731,7 @@ func TestWlReconcile(t *testing.T) {
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantManagersWorkloads: []kueue.Workload{
@@ -741,7 +742,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					ClusterName("worker1").
 					Obj(),
 			},
@@ -752,7 +753,7 @@ func TestWlReconcile(t *testing.T) {
 			wantWorker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantWorker1Jobs: []batchv1.Job{
@@ -781,7 +782,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 
@@ -799,7 +800,7 @@ func TestWlReconcile(t *testing.T) {
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Condition(metav1.Condition{Type: kueue.WorkloadFinished, Status: metav1.ConditionTrue, Reason: "ByTest", Message: "by test"}).
 					Obj(),
 			},
@@ -811,7 +812,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Condition(metav1.Condition{Type: kueue.WorkloadFinished, Status: metav1.ConditionTrue, Reason: "ByTest", Message: `by test`}).
 					Obj(),
 			},
@@ -824,7 +825,7 @@ func TestWlReconcile(t *testing.T) {
 			wantWorker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Condition(metav1.Condition{Type: kueue.WorkloadFinished, Status: metav1.ConditionTrue, Reason: "ByTest", Message: "by test"}).
 					Obj(),
 			},
@@ -845,7 +846,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 
@@ -863,7 +864,7 @@ func TestWlReconcile(t *testing.T) {
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Condition(metav1.Condition{Type: kueue.WorkloadFinished, Status: metav1.ConditionTrue, Reason: "ByTest", Message: "by test"}).
 					Obj(),
 			},
@@ -875,7 +876,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Condition(metav1.Condition{Type: kueue.WorkloadFinished, Status: metav1.ConditionTrue, Reason: "ByTest", Message: `by test`}).
 					Obj(),
 			},
@@ -888,7 +889,7 @@ func TestWlReconcile(t *testing.T) {
 			wantWorker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Condition(metav1.Condition{Type: kueue.WorkloadFinished, Status: metav1.ConditionTrue, Reason: "ByTest", Message: "by test"}).
 					Obj(),
 			},
@@ -909,7 +910,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Condition(metav1.Condition{Type: kueue.WorkloadFinished, Status: metav1.ConditionTrue, Reason: "ByTest", Message: `by test`}).
 					Obj(),
 			},
@@ -930,7 +931,7 @@ func TestWlReconcile(t *testing.T) {
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Condition(metav1.Condition{Type: kueue.WorkloadFinished, Status: metav1.ConditionTrue, Reason: "ByTest", Message: "by test"}).
 					Obj(),
 			},
@@ -942,7 +943,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Condition(metav1.Condition{Type: kueue.WorkloadFinished, Status: metav1.ConditionTrue, Reason: "ByTest", Message: `by test`}).
 					Obj(),
 			},
@@ -964,7 +965,7 @@ func TestWlReconcile(t *testing.T) {
 						Message:            `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantManagersJobs: []batchv1.Job{*baseJobManagedByKueueBuilder.Clone().Obj()},
@@ -976,7 +977,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 		},
@@ -992,7 +993,7 @@ func TestWlReconcile(t *testing.T) {
 						Message:            `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantManagersJobs: []batchv1.Job{*baseJobManagedByKueueBuilder.Clone().Obj()},
@@ -1004,7 +1005,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `Reserving remote lost`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 		},
@@ -1037,7 +1038,7 @@ func TestWlReconcile(t *testing.T) {
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			worker1Jobs: []batchv1.Job{
@@ -1058,7 +1059,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker2"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			managersJobs: []batchv1.Job{
@@ -1067,7 +1068,7 @@ func TestWlReconcile(t *testing.T) {
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					QuotaReservedTime(now.Add(-time.Hour)). // one hour ago
 					Obj(),
 			},
@@ -1080,7 +1081,7 @@ func TestWlReconcile(t *testing.T) {
 			worker2Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					QuotaReservedTime(now.Add(-time.Minute)). // one minute ago
 					Obj(),
 			},
@@ -1097,7 +1098,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					ClusterName("worker1").
 					Obj(),
 			},
@@ -1107,7 +1108,7 @@ func TestWlReconcile(t *testing.T) {
 			wantWorker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantWorker1Jobs: []batchv1.Job{
@@ -1138,7 +1139,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadFinished,
 						Status: metav1.ConditionTrue,
@@ -1153,7 +1154,7 @@ func TestWlReconcile(t *testing.T) {
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					QuotaReservedTime(now.Add(-time.Hour)). // one hour ago
 					Obj(),
 			},
@@ -1173,7 +1174,7 @@ func TestWlReconcile(t *testing.T) {
 						Message: `The workload got reservation on "worker1"`,
 					}).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					ClusterName("worker1").
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadFinished,
@@ -1188,7 +1189,7 @@ func TestWlReconcile(t *testing.T) {
 			wantWorker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantWorker1Jobs: []batchv1.Job{
@@ -1219,7 +1220,7 @@ func TestWlReconcile(t *testing.T) {
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					QuotaReservedTime(now.Add(-time.Hour)). // one hour ago
 					Obj(),
 			},
@@ -1272,7 +1273,7 @@ func TestWlReconcile(t *testing.T) {
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					QuotaReservedTime(now.Add(-time.Hour)). // one hour ago
 					Obj(),
 			},
@@ -1302,7 +1303,7 @@ func TestWlReconcile(t *testing.T) {
 			wantWorker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantWorker1Jobs: []batchv1.Job{
@@ -1322,13 +1323,13 @@ func TestWlReconcile(t *testing.T) {
 				*baseWorkloadBuilder.Clone().
 					Annotation(workloadslicing.EnabledAnnotationKey, workloadslicing.EnabledAnnotationValue).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					PodSets(*utiltesting.MakePodSet("different-name", 1).Obj()).
+					PodSets(*utiltestingapi.MakePodSet("different-name", 1).Obj()).
 					AdmissionCheck(kueue.AdmissionCheckState{
 						Name:    "ac1",
 						State:   kueue.CheckStateReady,
 						Message: `The workload got reservation on "worker1"`,
 					}).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					ClusterName("worker1").
 					Obj(),
 			},
@@ -1338,7 +1339,7 @@ func TestWlReconcile(t *testing.T) {
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					QuotaReservedTime(now.Add(-time.Hour)). // one hour ago
 					Obj(),
 			},
@@ -1353,13 +1354,13 @@ func TestWlReconcile(t *testing.T) {
 				*baseWorkloadBuilder.Clone().
 					Annotation(workloadslicing.EnabledAnnotationKey, workloadslicing.EnabledAnnotationValue).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
-					PodSets(*utiltesting.MakePodSet("different-name", 1).Obj()).
+					PodSets(*utiltestingapi.MakePodSet("different-name", 1).Obj()).
 					AdmissionCheck(kueue.AdmissionCheckState{
 						Name:    "ac1",
 						State:   kueue.CheckStateRetry,
 						Message: "Reserving remote lost",
 					}).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					ClusterName("worker1").
 					Obj(),
 			},
@@ -1383,7 +1384,7 @@ func TestWlReconcile(t *testing.T) {
 						State:   kueue.CheckStateReady,
 						Message: `The workload got reservation on "worker1"`,
 					}).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					ClusterName("worker1").
 					Obj(),
 			},
@@ -1393,8 +1394,8 @@ func TestWlReconcile(t *testing.T) {
 			worker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					QuotaReservedTime(now.Add(-time.Hour)). // one hour ago
 					Obj(),
 			},
@@ -1414,7 +1415,7 @@ func TestWlReconcile(t *testing.T) {
 						State:   kueue.CheckStateReady,
 						Message: `The workload got reservation on "worker1"`,
 					}).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					ClusterName("worker1").
 					Obj(),
 			},
@@ -1424,7 +1425,7 @@ func TestWlReconcile(t *testing.T) {
 			wantWorker1Workloads: []kueue.Workload{
 				*baseWorkloadBuilder.Clone().
 					Label(kueue.MultiKueueOriginLabel, defaultOrigin).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantWorker1Jobs: []batchv1.Job{
@@ -1461,8 +1462,8 @@ func TestWlReconcile(t *testing.T) {
 			managerBuilder = managerBuilder.WithStatusSubresource(slices.Map(tc.managersWorkloads, func(w *kueue.Workload) client.Object { return w })...)
 			managerBuilder = managerBuilder.WithStatusSubresource(slices.Map(tc.managersJobs, func(w *batchv1.Job) client.Object { return w })...)
 			managerBuilder = managerBuilder.WithObjects(
-				utiltesting.MakeMultiKueueConfig("config1").Clusters(workerClusters...).Obj(),
-				utiltesting.MakeAdmissionCheck("ac1").ControllerName(kueue.MultiKueueControllerName).
+				utiltestingapi.MakeMultiKueueConfig("config1").Clusters(workerClusters...).Obj(),
+				utiltestingapi.MakeAdmissionCheck("ac1").ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "config1").
 					Obj(),
 			)
diff --git a/pkg/controller/admissionchecks/provisioning/admissioncheck_reconciler_test.go b/pkg/controller/admissionchecks/provisioning/admissioncheck_reconciler_test.go
index 9195f4285..9d316b1aa 100644
--- a/pkg/controller/admissionchecks/provisioning/admissioncheck_reconciler_test.go
+++ b/pkg/controller/admissionchecks/provisioning/admissioncheck_reconciler_test.go
@@ -27,6 +27,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestReconcileAdmissionCheck(t *testing.T) {
@@ -36,12 +37,12 @@ func TestReconcileAdmissionCheck(t *testing.T) {
 		wantCondition *metav1.Condition
 	}{
 		"unrelated check": {
-			check: utiltesting.MakeAdmissionCheck("check1").
+			check: utiltestingapi.MakeAdmissionCheck("check1").
 				ControllerName("other-controller").
 				Obj(),
 		},
 		"no parameters specified": {
-			check: utiltesting.MakeAdmissionCheck("check1").
+			check: utiltestingapi.MakeAdmissionCheck("check1").
 				ControllerName(kueue.ProvisioningRequestControllerName).
 				Generation(1).
 				Obj(),
@@ -54,7 +55,7 @@ func TestReconcileAdmissionCheck(t *testing.T) {
 			},
 		},
 		"bad ref group": {
-			check: utiltesting.MakeAdmissionCheck("check1").
+			check: utiltestingapi.MakeAdmissionCheck("check1").
 				Parameters("bad.group", ConfigKind, "config1").
 				ControllerName(kueue.ProvisioningRequestControllerName).
 				Generation(1).
@@ -68,7 +69,7 @@ func TestReconcileAdmissionCheck(t *testing.T) {
 			},
 		},
 		"bad ref kind": {
-			check: utiltesting.MakeAdmissionCheck("check1").
+			check: utiltestingapi.MakeAdmissionCheck("check1").
 				Parameters(kueue.GroupVersion.Group, "BadKind", "config1").
 				ControllerName(kueue.ProvisioningRequestControllerName).
 				Generation(1).
@@ -82,7 +83,7 @@ func TestReconcileAdmissionCheck(t *testing.T) {
 			},
 		},
 		"config missing": {
-			check: utiltesting.MakeAdmissionCheck("check1").
+			check: utiltestingapi.MakeAdmissionCheck("check1").
 				Parameters(kueue.GroupVersion.Group, ConfigKind, "config1").
 				ControllerName(kueue.ProvisioningRequestControllerName).
 				Generation(1).
@@ -96,12 +97,12 @@ func TestReconcileAdmissionCheck(t *testing.T) {
 			},
 		},
 		"config found": {
-			check: utiltesting.MakeAdmissionCheck("check1").
+			check: utiltestingapi.MakeAdmissionCheck("check1").
 				Parameters(kueue.GroupVersion.Group, ConfigKind, "config1").
 				ControllerName(kueue.ProvisioningRequestControllerName).
 				Generation(1).
 				Obj(),
-			configs: []kueue.ProvisioningRequestConfig{*utiltesting.MakeProvisioningRequestConfig("config1").Obj()},
+			configs: []kueue.ProvisioningRequestConfig{*utiltestingapi.MakeProvisioningRequestConfig("config1").Obj()},
 			wantCondition: &metav1.Condition{
 				Type:               kueue.AdmissionCheckActive,
 				Status:             metav1.ConditionTrue,
diff --git a/pkg/controller/admissionchecks/provisioning/controller_test.go b/pkg/controller/admissionchecks/provisioning/controller_test.go
index 98591d799..c97c3d7b2 100644
--- a/pkg/controller/admissionchecks/provisioning/controller_test.go
+++ b/pkg/controller/admissionchecks/provisioning/controller_test.go
@@ -43,6 +43,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
 
@@ -100,16 +101,16 @@ func TestReconcile(t *testing.T) {
 	now := time.Now()
 	fakeClock := testingclock.NewFakeClock(now)
 
-	baseWorkload := utiltesting.MakeWorkload("wl", TestNamespace).
+	baseWorkload := utiltestingapi.MakeWorkload("wl", TestNamespace).
 		PodSets(
-			*utiltesting.MakePodSet("ps1", 4).
+			*utiltestingapi.MakePodSet("ps1", 4).
 				Request(corev1.ResourceCPU, "1").
 				Obj(),
-			*utiltesting.MakePodSet("ps2", 4).
+			*utiltestingapi.MakePodSet("ps2", 4).
 				Request(corev1.ResourceMemory, "1M").
 				Obj(),
 		).
-		ReserveQuota(utiltesting.MakeAdmission("q1").PodSets(
+		ReserveQuota(utiltestingapi.MakeAdmission("q1").PodSets(
 			kueue.PodSetAssignment{
 				Name: "ps1",
 				Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -148,7 +149,7 @@ func TestReconcile(t *testing.T) {
 		State: kueue.CheckStateReady,
 	}, fakeClock)
 
-	baseFlavor1 := utiltesting.MakeResourceFlavor("flv1").NodeLabel("f1l1", "v1").
+	baseFlavor1 := utiltestingapi.MakeResourceFlavor("flv1").NodeLabel("f1l1", "v1").
 		Toleration(corev1.Toleration{
 			Key:      "f1t1k",
 			Value:    "f1t1v",
@@ -156,7 +157,7 @@ func TestReconcile(t *testing.T) {
 			Effect:   corev1.TaintEffectNoSchedule,
 		}).
 		Obj()
-	baseFlavor2 := utiltesting.MakeResourceFlavor("flv2").NodeLabel("f2l1", "v1").Obj()
+	baseFlavor2 := utiltestingapi.MakeResourceFlavor("flv2").NodeLabel("f2l1", "v1").Obj()
 
 	baseRequest := &autoscaling.ProvisioningRequest{
 		ObjectMeta: metav1.ObjectMeta{
@@ -223,7 +224,7 @@ func TestReconcile(t *testing.T) {
 		}).
 		NodeSelector("f2l1", "v1")
 
-	baseConfig := utiltesting.MakeProvisioningRequestConfig("config1").ProvisioningClass("class1").WithParameter("p1", "v1")
+	baseConfig := utiltestingapi.MakeProvisioningRequestConfig("config1").ProvisioningClass("class1").WithParameter("p1", "v1")
 
 	baseConfigWithRetryStrategy := baseConfig.Clone().RetryStrategy(&kueue.ProvisioningRequestRetryStrategy{
 		BackoffLimitCount:  ptr.To[int32](3),
@@ -240,7 +241,7 @@ func TestReconcile(t *testing.T) {
 		},
 	})
 
-	baseCheck := utiltesting.MakeAdmissionCheck("check1").
+	baseCheck := utiltestingapi.MakeAdmissionCheck("check1").
 		ControllerName(kueue.ProvisioningRequestControllerName).
 		Parameters(kueue.GroupVersion.Group, ConfigKind, "config1").
 		Obj()
@@ -316,16 +317,16 @@ func TestReconcile(t *testing.T) {
 		wantEvents           []utiltesting.EventRecord
 	}{
 		"unrelated workload": {
-			workload: utiltesting.MakeWorkload("wl", "ns").Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").Obj(),
 		},
 		"unrelated workload with reservation": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Obj(),
 		},
 		"unrelated admitted workload": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Obj(),
 		},
@@ -333,7 +334,7 @@ func TestReconcile(t *testing.T) {
 			workload: baseWorkload.DeepCopy(),
 			checks:   []kueue.AdmissionCheck{*baseCheck.DeepCopy()},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:    "check1",
 						State:   kueue.CheckStatePending,
@@ -374,7 +375,7 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"workload with provreq annotation": {
-			workload: utiltesting.MakeWorkload("wl", TestNamespace).
+			workload: utiltestingapi.MakeWorkload("wl", TestNamespace).
 				Annotations(map[string]string{
 					"provreq.kueue.x-k8s.io/ValidUntilSeconds": "0",
 					"invalid-provreq-prefix/Foo1":              "Bar1",
@@ -382,10 +383,10 @@ func TestReconcile(t *testing.T) {
 				AdmissionChecks(kueue.AdmissionCheckState{
 					Name:  "check1",
 					State: kueue.CheckStatePending}).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Obj(),
 			checks:  []kueue.AdmissionCheck{*baseCheck.DeepCopy()},
-			configs: []kueue.ProvisioningRequestConfig{*utiltesting.MakeProvisioningRequestConfig("config1").Obj()},
+			configs: []kueue.ProvisioningRequestConfig{*utiltestingapi.MakeProvisioningRequestConfig("config1").Obj()},
 			wantRequests: map[string]*autoscaling.ProvisioningRequest{
 				ProvisioningRequestName("wl", kueue.AdmissionCheckReference(baseCheck.Name), 1): {
 					ObjectMeta: metav1.ObjectMeta{
@@ -540,7 +541,7 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"request removed on workload finished": {
-			workload: (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+			workload: (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 				Condition(metav1.Condition{
 					Type:   kueue.WorkloadFinished,
 					Status: metav1.ConditionTrue,
@@ -564,7 +565,7 @@ func TestReconcile(t *testing.T) {
 			},
 			templates: []corev1.PodTemplate{*baseTemplate1.DeepCopy(), *baseTemplate2.DeepCopy()},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:    "check1",
 						State:   kueue.CheckStateRetry,
@@ -587,7 +588,7 @@ func TestReconcile(t *testing.T) {
 			},
 			templates: []corev1.PodTemplate{*baseTemplate1.DeepCopy(), *baseTemplate2.DeepCopy()},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:  "check1",
 						State: kueue.CheckStateRejected,
@@ -608,7 +609,7 @@ func TestReconcile(t *testing.T) {
 			},
 			templates: []corev1.PodTemplate{*baseTemplate1.DeepCopy(), *baseTemplate2.DeepCopy()},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:  "check1",
 						State: kueue.CheckStateReady,
@@ -641,7 +642,7 @@ func TestReconcile(t *testing.T) {
 			flavors:  []kueue.ResourceFlavor{*baseFlavor1.DeepCopy(), *baseFlavor2.DeepCopy()},
 			configs:  []kueue.ProvisioningRequestConfig{*baseConfig.Clone().WithManagedResource("example.org/gpu").Obj()},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:    "check1",
 						State:   kueue.CheckStateReady,
@@ -699,12 +700,12 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"when request is needed for one PodSet (resource limit)": {
-			workload: (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).Limit("example.com/gpu", "1").Obj(),
+			workload: (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).Limit("example.com/gpu", "1").Obj(),
 			checks:   []kueue.AdmissionCheck{*baseCheck.DeepCopy()},
 			flavors:  []kueue.ResourceFlavor{*baseFlavor1.DeepCopy(), *baseFlavor2.DeepCopy()},
 			configs:  []kueue.ProvisioningRequestConfig{*baseConfig.Clone().WithManagedResource("example.com/gpu").Obj()},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).Limit("example.com/gpu", "1").Obj(),
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).Limit("example.com/gpu", "1").Obj(),
 			},
 			wantRequests: map[string]*autoscaling.ProvisioningRequest{
 				"wl-check1-1": {
@@ -793,7 +794,7 @@ func TestReconcile(t *testing.T) {
 					}),
 			},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:    "check1",
 						State:   kueue.CheckStatePending,
@@ -806,7 +807,7 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"workload sets AdmissionCheck status to Rejected when it is not finished and receives the provisioning request's CapacityRevoked condition": {
-			workload: (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+			workload: (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 				Admitted(true).
 				Obj(),
 			checks:  []kueue.AdmissionCheck{*baseCheck.DeepCopy()},
@@ -834,7 +835,7 @@ func TestReconcile(t *testing.T) {
 					}),
 			},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:  "check1",
 						State: kueue.CheckStateRejected,
@@ -847,7 +848,7 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"workload sets AdmissionCheck status to Rejected when it is not admitted and receives the provisioning request's CapacityRevoked condition": {
-			workload: (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+			workload: (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 				Admitted(false).
 				Obj(),
 			checks:  []kueue.AdmissionCheck{*baseCheck.DeepCopy()},
@@ -875,7 +876,7 @@ func TestReconcile(t *testing.T) {
 					}),
 			},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:  "check1",
 						State: kueue.CheckStateRejected,
@@ -888,7 +889,7 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"workloads doesnt set AdmissionCheck status to Rejected when it is finished and receives the provisioning request's CapacityRevoked condition": {
-			workload: (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+			workload: (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadFinished,
 					Status:  metav1.ConditionTrue,
@@ -921,7 +922,7 @@ func TestReconcile(t *testing.T) {
 					}),
 			},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:  "check1",
 						State: kueue.CheckStatePending,
@@ -934,7 +935,7 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"workload does nothing when admitted and receives the provisioning request's BookingExpired condition": {
-			workload: (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+			workload: (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 				Admitted(true).
 				Obj(),
 			checks:  []kueue.AdmissionCheck{*baseCheck.DeepCopy()},
@@ -962,13 +963,13 @@ func TestReconcile(t *testing.T) {
 					}),
 			},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					Admitted(true).
 					Obj(),
 			},
 		},
 		"workload retries the admission check when is not admitted and receives the provisioning request's BookingExpired condition": {
-			workload: (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+			workload: (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 				Admitted(false).
 				Obj(),
 			checks:  []kueue.AdmissionCheck{*baseCheck.DeepCopy()},
@@ -996,7 +997,7 @@ func TestReconcile(t *testing.T) {
 					}),
 			},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:    "check1",
 						State:   kueue.CheckStateRetry,
@@ -1011,7 +1012,7 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"workload rejects the admission check when is not admitted and receives the provisioning request's BookingExpired condition": {
-			workload: (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+			workload: (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 				Admitted(false).
 				Obj(),
 			checks:  []kueue.AdmissionCheck{*baseCheck.DeepCopy()},
@@ -1039,7 +1040,7 @@ func TestReconcile(t *testing.T) {
 					}),
 			},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:  "check1",
 						State: kueue.CheckStateRejected,
@@ -1058,7 +1059,7 @@ func TestReconcile(t *testing.T) {
 				}
 				return client.Create(ctx, obj, opts...)
 			},
-			workload: utiltesting.MakeWorkload("wl", TestNamespace).
+			workload: utiltestingapi.MakeWorkload("wl", TestNamespace).
 				Annotations(map[string]string{
 					"provreq.kueue.x-k8s.io/ValidUntilSeconds": "0",
 					"invalid-provreq-prefix/Foo1":              "Bar1",
@@ -1066,13 +1067,13 @@ func TestReconcile(t *testing.T) {
 				AdmissionChecks(kueue.AdmissionCheckState{
 					Name:  "check1",
 					State: kueue.CheckStatePending}).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Obj(),
 			checks:             []kueue.AdmissionCheck{*baseCheck.DeepCopy()},
-			configs:            []kueue.ProvisioningRequestConfig{*utiltesting.MakeProvisioningRequestConfig("config1").Obj()},
+			configs:            []kueue.ProvisioningRequestConfig{*utiltestingapi.MakeProvisioningRequestConfig("config1").Obj()},
 			wantReconcileError: errInvalidPodTemplate,
 			wantWorkloads: map[string]*kueue.Workload{
-				"wl": utiltesting.MakeWorkload("wl", TestNamespace).
+				"wl": utiltestingapi.MakeWorkload("wl", TestNamespace).
 					Annotations(map[string]string{
 						"provreq.kueue.x-k8s.io/ValidUntilSeconds": "0",
 						"invalid-provreq-prefix/Foo1":              "Bar1",
@@ -1083,7 +1084,7 @@ func TestReconcile(t *testing.T) {
 						State:   kueue.CheckStatePending,
 						Message: "Error creating PodTemplate \"ppt-wl-check1-1-main\": invalid PodTemplate error",
 					}).
-					ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 					Obj(),
 			},
 			wantEvents: []utiltesting.EventRecord{
@@ -1169,7 +1170,7 @@ func TestReconcile(t *testing.T) {
 			},
 			templates: []corev1.PodTemplate{*baseTemplate1.DeepCopy(), *baseTemplate2.DeepCopy()},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:  "check1",
 						State: kueue.CheckStateReady,
@@ -1218,7 +1219,7 @@ func TestReconcile(t *testing.T) {
 			},
 			templates: []corev1.PodTemplate{*baseTemplate1.DeepCopy(), *baseTemplate2.DeepCopy()},
 			wantWorkloads: map[string]*kueue.Workload{
-				baseWorkload.GetName(): (&utiltesting.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
+				baseWorkload.GetName(): (&utiltestingapi.WorkloadWrapper{Workload: *baseWorkload.DeepCopy()}).
 					AdmissionChecks(kueue.AdmissionCheckState{
 						Name:  "check1",
 						State: kueue.CheckStateReady,
@@ -1250,31 +1251,31 @@ func TestReconcile(t *testing.T) {
 			// podSets 3 and 4 can be merged as they are identical,
 			// podSet 5 however have different priority class even though everything else match with podSets 3 and 4
 			// PodSetMergePolicy IdenticalPodTemplates prevents the ability to merge it
-			workload: utiltesting.MakeWorkload("wl", TestNamespace).
+			workload: utiltestingapi.MakeWorkload("wl", TestNamespace).
 				AdmissionChecks(kueue.AdmissionCheckState{
 					Name:  "check1",
 					State: kueue.CheckStatePending}).
 				PodSets(
-					*utiltesting.MakePodSet("ps1", 2).
+					*utiltestingapi.MakePodSet("ps1", 2).
 						Request(corev1.ResourceCPU, "1").
 						Obj(),
-					*utiltesting.MakePodSet("ps2", 2).
+					*utiltestingapi.MakePodSet("ps2", 2).
 						Request(corev1.ResourceCPU, "1").
 						Obj(),
-					*utiltesting.MakePodSet("ps3", 2).
+					*utiltestingapi.MakePodSet("ps3", 2).
 						Request(corev1.ResourceMemory, "1M").
 						PriorityClass("pc-100").
 						Obj(),
-					*utiltesting.MakePodSet("ps4", 2).
+					*utiltestingapi.MakePodSet("ps4", 2).
 						Request(corev1.ResourceMemory, "1M").
 						PriorityClass("pc-100").
 						Obj(),
-					*utiltesting.MakePodSet("ps5", 1).
+					*utiltestingapi.MakePodSet("ps5", 1).
 						Request(corev1.ResourceMemory, "1M").
 						PriorityClass("pc-200").
 						Obj(),
 				).
-				ReserveQuota(utiltesting.MakeAdmission("q1").PodSets(podSetMergePolicyAssignemnt...).Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").PodSets(podSetMergePolicyAssignemnt...).Obj()).
 				AdmissionChecks(kueue.AdmissionCheckState{
 					Name:  "check1",
 					State: kueue.CheckStatePending,
@@ -1283,7 +1284,7 @@ func TestReconcile(t *testing.T) {
 					State: kueue.CheckStatePending,
 				}).Obj(),
 			checks:  []kueue.AdmissionCheck{*baseCheck.DeepCopy()},
-			configs: []kueue.ProvisioningRequestConfig{*utiltesting.MakeProvisioningRequestConfig("config1").PodSetMergePolicy(kueue.IdenticalPodTemplates).Obj()},
+			configs: []kueue.ProvisioningRequestConfig{*utiltestingapi.MakeProvisioningRequestConfig("config1").PodSetMergePolicy(kueue.IdenticalPodTemplates).Obj()},
 			flavors: []kueue.ResourceFlavor{*baseFlavor1.DeepCopy(), *baseFlavor2.DeepCopy()},
 			wantRequests: map[string]*autoscaling.ProvisioningRequest{
 				ProvisioningRequestName("wl", kueue.AdmissionCheckReference(baseCheck.Name), 1): {
@@ -1384,30 +1385,30 @@ func TestReconcile(t *testing.T) {
 			// podSets 1 and 2 can be merged as they are similar, PriorityClass is not taken into account with this PodSetMergePolicy,
 			// podSets 3 and 4 can be merged as they are similar despite different PriorityClass and TopologyRequest,
 			// podSet 5 however have defined an extraAffinity and although everything else match with podSets can't be merged with others
-			workload: utiltesting.MakeWorkload("wl", TestNamespace).
+			workload: utiltestingapi.MakeWorkload("wl", TestNamespace).
 				AdmissionChecks(kueue.AdmissionCheckState{
 					Name:  "check1",
 					State: kueue.CheckStatePending}).
 				PodSets(
-					*utiltesting.MakePodSet("ps1", 2).
+					*utiltestingapi.MakePodSet("ps1", 2).
 						Request(corev1.ResourceCPU, "1").
 						PriorityClass("pc-100").
 						Obj(),
-					*utiltesting.MakePodSet("ps2", 2).
+					*utiltestingapi.MakePodSet("ps2", 2).
 						Request(corev1.ResourceCPU, "1").
 						PriorityClass("pc-200").
 						Obj(),
-					*utiltesting.MakePodSet("ps3", 2).
+					*utiltestingapi.MakePodSet("ps3", 2).
 						Request(corev1.ResourceMemory, "1M").
 						PriorityClass("pc-100").
 						RequiredTopologyRequest("default1").
 						Obj(),
-					*utiltesting.MakePodSet("ps4", 2).
+					*utiltestingapi.MakePodSet("ps4", 2).
 						Request(corev1.ResourceMemory, "1M").
 						PriorityClass("pc-200").
 						RequiredTopologyRequest("default2").
 						Obj(),
-					*utiltesting.MakePodSet("ps5", 1).
+					*utiltestingapi.MakePodSet("ps5", 1).
 						Request(corev1.ResourceMemory, "1M").
 						PriorityClass("pc-300").
 						RequiredDuringSchedulingIgnoredDuringExecution([]corev1.NodeSelectorTerm{
@@ -1423,7 +1424,7 @@ func TestReconcile(t *testing.T) {
 						}).
 						Obj(),
 				).
-				ReserveQuota(utiltesting.MakeAdmission("q1").PodSets(podSetMergePolicyAssignemnt...).Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").PodSets(podSetMergePolicyAssignemnt...).Obj()).
 				AdmissionChecks(kueue.AdmissionCheckState{
 					Name:  "check1",
 					State: kueue.CheckStatePending,
@@ -1432,7 +1433,7 @@ func TestReconcile(t *testing.T) {
 					State: kueue.CheckStatePending,
 				}).Obj(),
 			checks:  []kueue.AdmissionCheck{*baseCheck.DeepCopy()},
-			configs: []kueue.ProvisioningRequestConfig{*utiltesting.MakeProvisioningRequestConfig("config1").PodSetMergePolicy(kueue.IdenticalWorkloadSchedulingRequirements).Obj()},
+			configs: []kueue.ProvisioningRequestConfig{*utiltestingapi.MakeProvisioningRequestConfig("config1").PodSetMergePolicy(kueue.IdenticalWorkloadSchedulingRequirements).Obj()},
 			flavors: []kueue.ResourceFlavor{*baseFlavor1.DeepCopy(), *baseFlavor2.DeepCopy()},
 			wantRequests: map[string]*autoscaling.ProvisioningRequest{
 				ProvisioningRequestName("wl", kueue.AdmissionCheckReference(baseCheck.Name), 1): {
@@ -1545,21 +1546,21 @@ func TestReconcile(t *testing.T) {
 			// podSets 1 and 2 can be merged as they are similar, PriorityClass is not taken into account with this PodSetMergePolicy,
 			// podSets 3 and 4 can be merged as they are similar despite different PriorityClass and TopologyRequest,
 			// podSet 5 however have defined an extraAffinity and although everything else match with podSets can't be merged with others
-			workload: utiltesting.MakeWorkload("wl", TestNamespace).
+			workload: utiltestingapi.MakeWorkload("wl", TestNamespace).
 				AdmissionChecks(kueue.AdmissionCheckState{
 					Name:  "check1",
 					State: kueue.CheckStatePending}).
 				PodSets(
-					*utiltesting.MakePodSet("ps11", 2).
+					*utiltestingapi.MakePodSet("ps11", 2).
 						Request(corev1.ResourceCPU, "1").
 						PriorityClass("pc-100").
 						Obj(),
-					*utiltesting.MakePodSet("ps22", 2).
+					*utiltestingapi.MakePodSet("ps22", 2).
 						Request(corev1.ResourceCPU, "1").
 						PriorityClass("pc-200").
 						Obj(),
 				).
-				ReserveQuota(utiltesting.MakeAdmission("q1").PodSets(podSetMergePolicyAssignemnt...).Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").PodSets(podSetMergePolicyAssignemnt...).Obj()).
 				AdmissionChecks(kueue.AdmissionCheckState{
 					Name:  "check1",
 					State: kueue.CheckStatePending,
@@ -1568,7 +1569,7 @@ func TestReconcile(t *testing.T) {
 					State: kueue.CheckStatePending,
 				}).Obj(),
 			checks:             []kueue.AdmissionCheck{*baseCheck.DeepCopy()},
-			configs:            []kueue.ProvisioningRequestConfig{*utiltesting.MakeProvisioningRequestConfig("config1").PodSetMergePolicy(kueue.IdenticalWorkloadSchedulingRequirements).Obj()},
+			configs:            []kueue.ProvisioningRequestConfig{*utiltestingapi.MakeProvisioningRequestConfig("config1").PodSetMergePolicy(kueue.IdenticalWorkloadSchedulingRequirements).Obj()},
 			flavors:            []kueue.ResourceFlavor{*baseFlavor1.DeepCopy(), *baseFlavor2.DeepCopy()},
 			wantReconcileError: errInconsistentPodSetAssignments,
 		},
@@ -1673,13 +1674,13 @@ func TestReconcile(t *testing.T) {
 }
 
 func TestActiveOrLastPRForChecks(t *testing.T) {
-	baseWorkload := utiltesting.MakeWorkload("wl", TestNamespace).
+	baseWorkload := utiltestingapi.MakeWorkload("wl", TestNamespace).
 		PodSets(
-			*utiltesting.MakePodSet(kueue.DefaultPodSetName, 4).
+			*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 4).
 				Request(corev1.ResourceCPU, "1").
 				Obj(),
 		).
-		ReserveQuota(utiltesting.MakeAdmission("q1").PodSets(
+		ReserveQuota(utiltestingapi.MakeAdmission("q1").PodSets(
 			kueue.PodSetAssignment{
 				Name: kueue.DefaultPodSetName,
 				Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -1701,7 +1702,7 @@ func TestActiveOrLastPRForChecks(t *testing.T) {
 		}).
 		Obj()
 
-	baseConfig := utiltesting.MakeProvisioningRequestConfig("config1").ProvisioningClass("class1").WithParameter("p1", "v1")
+	baseConfig := utiltestingapi.MakeProvisioningRequestConfig("config1").ProvisioningClass("class1").WithParameter("p1", "v1")
 
 	baseRequest := autoscaling.ProvisioningRequest{
 		ObjectMeta: metav1.ObjectMeta{
@@ -1733,7 +1734,7 @@ func TestActiveOrLastPRForChecks(t *testing.T) {
 	pr2Created := baseRequest.DeepCopy()
 	pr2Created.Name = "wl-check-2"
 
-	baseCheck := utiltesting.MakeAdmissionCheck("check").
+	baseCheck := utiltestingapi.MakeAdmissionCheck("check").
 		ControllerName(kueue.ProvisioningRequestControllerName).
 		Parameters(kueue.GroupVersion.Group, ConfigKind, "config1").
 		Obj()
diff --git a/pkg/controller/admissionchecks/provisioning/indexer_test.go b/pkg/controller/admissionchecks/provisioning/indexer_test.go
index e385d37c2..ed5ccd59c 100644
--- a/pkg/controller/admissionchecks/provisioning/indexer_test.go
+++ b/pkg/controller/admissionchecks/provisioning/indexer_test.go
@@ -33,6 +33,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/slices"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 const (
@@ -274,7 +275,7 @@ func TestIndexAdmissionChecks(t *testing.T) {
 	}{
 		"different controller": {
 			checks: []*kueue.AdmissionCheck{
-				utiltesting.MakeAdmissionCheck("check1").
+				utiltestingapi.MakeAdmissionCheck("check1").
 					ControllerName("other").
 					Parameters(kueue.GroupVersion.Group, ConfigKind, "config1").
 					Obj(),
@@ -283,7 +284,7 @@ func TestIndexAdmissionChecks(t *testing.T) {
 		},
 		"bad ref group": {
 			checks: []*kueue.AdmissionCheck{
-				utiltesting.MakeAdmissionCheck("check1").
+				utiltestingapi.MakeAdmissionCheck("check1").
 					ControllerName(kueue.ProvisioningRequestControllerName).
 					Parameters("core", ConfigKind, "config1").
 					Obj(),
@@ -292,7 +293,7 @@ func TestIndexAdmissionChecks(t *testing.T) {
 		},
 		"bad ref kind": {
 			checks: []*kueue.AdmissionCheck{
-				utiltesting.MakeAdmissionCheck("check1").
+				utiltestingapi.MakeAdmissionCheck("check1").
 					ControllerName(kueue.ProvisioningRequestControllerName).
 					Parameters(kueue.GroupVersion.Group, "kind", "config1").
 					Obj(),
@@ -301,7 +302,7 @@ func TestIndexAdmissionChecks(t *testing.T) {
 		},
 		"empty name": {
 			checks: []*kueue.AdmissionCheck{
-				utiltesting.MakeAdmissionCheck("check1").
+				utiltestingapi.MakeAdmissionCheck("check1").
 					ControllerName(kueue.ProvisioningRequestControllerName).
 					Parameters(kueue.GroupVersion.Group, ConfigKind, "").
 					Obj(),
@@ -310,7 +311,7 @@ func TestIndexAdmissionChecks(t *testing.T) {
 		},
 		"match": {
 			checks: []*kueue.AdmissionCheck{
-				utiltesting.MakeAdmissionCheck("check1").
+				utiltestingapi.MakeAdmissionCheck("check1").
 					ControllerName(kueue.ProvisioningRequestControllerName).
 					Parameters(kueue.GroupVersion.Group, ConfigKind, "config1").
 					Obj(),
@@ -320,15 +321,15 @@ func TestIndexAdmissionChecks(t *testing.T) {
 		},
 		"multiple checks, partial match": {
 			checks: []*kueue.AdmissionCheck{
-				utiltesting.MakeAdmissionCheck("check1").
+				utiltestingapi.MakeAdmissionCheck("check1").
 					ControllerName(kueue.ProvisioningRequestControllerName).
 					Parameters(kueue.GroupVersion.Group, ConfigKind, "config1").
 					Obj(),
-				utiltesting.MakeAdmissionCheck("check2").
+				utiltestingapi.MakeAdmissionCheck("check2").
 					ControllerName(kueue.ProvisioningRequestControllerName).
 					Parameters(kueue.GroupVersion.Group, ConfigKind, "config1").
 					Obj(),
-				utiltesting.MakeAdmissionCheck("check3").
+				utiltestingapi.MakeAdmissionCheck("check3").
 					ControllerName(kueue.ProvisioningRequestControllerName).
 					Parameters(kueue.GroupVersion.Group, ConfigKind, "config2").
 					Obj(),
diff --git a/pkg/controller/core/clusterqueue_controller_test.go b/pkg/controller/core/clusterqueue_controller_test.go
index beb644012..7dbb35aa2 100644
--- a/pkg/controller/core/clusterqueue_controller_test.go
+++ b/pkg/controller/core/clusterqueue_controller_test.go
@@ -32,6 +32,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/metrics"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
 	testingmetrics "sigs.k8s.io/kueue/pkg/util/testing/metrics"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestUpdateCqStatusIfChanged(t *testing.T) {
@@ -39,8 +40,8 @@ func TestUpdateCqStatusIfChanged(t *testing.T) {
 	lqName := "test-lq"
 	defaultWls := &kueue.WorkloadList{
 		Items: []kueue.Workload{
-			*utiltesting.MakeWorkload("alpha", "").Queue(kueue.LocalQueueName(lqName)).Obj(),
-			*utiltesting.MakeWorkload("beta", "").Queue(kueue.LocalQueueName(lqName)).Obj(),
+			*utiltestingapi.MakeWorkload("alpha", "").Queue(kueue.LocalQueueName(lqName)).Obj(),
+			*utiltestingapi.MakeWorkload("beta", "").Queue(kueue.LocalQueueName(lqName)).Obj(),
 		},
 	}
 
@@ -163,7 +164,7 @@ func TestUpdateCqStatusIfChanged(t *testing.T) {
 					Message: "Can admit new workloads",
 				}},
 			},
-			newWl:              utiltesting.MakeWorkload("gamma", "").Queue(kueue.LocalQueueName(lqName)).Obj(),
+			newWl:              utiltestingapi.MakeWorkload("gamma", "").Queue(kueue.LocalQueueName(lqName)).Obj(),
 			newConditionStatus: metav1.ConditionTrue,
 			newReason:          "Ready",
 			newMessage:         "Can admit new workloads",
@@ -189,12 +190,12 @@ func TestUpdateCqStatusIfChanged(t *testing.T) {
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
-			cq := utiltesting.MakeClusterQueue(cqName).
+			cq := utiltestingapi.MakeClusterQueue(cqName).
 				QueueingStrategy(kueue.StrictFIFO).
 				Generation(1).
 				Obj()
 			cq.Status = tc.cqStatus
-			lq := utiltesting.MakeLocalQueue(lqName, "").
+			lq := utiltestingapi.MakeLocalQueue(lqName, "").
 				ClusterQueue(cqName).Obj()
 			ctx, log := utiltesting.ContextWithLog(t)
 
diff --git a/pkg/controller/core/cohort_controller_test.go b/pkg/controller/core/cohort_controller_test.go
index 6cad55964..c400ca0eb 100644
--- a/pkg/controller/core/cohort_controller_test.go
+++ b/pkg/controller/core/cohort_controller_test.go
@@ -33,6 +33,7 @@ import (
 	schdcache "sigs.k8s.io/kueue/pkg/cache/scheduler"
 	"sigs.k8s.io/kueue/pkg/resources"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestCohortReconcileCohortNotFoundDelete(t *testing.T) {
@@ -42,7 +43,7 @@ func TestCohortReconcileCohortNotFoundDelete(t *testing.T) {
 	qManager := qcache.NewManager(cl, cache)
 	reconciler := NewCohortReconciler(cl, cache, qManager)
 
-	cohort := utiltesting.MakeCohort("cohort").Obj()
+	cohort := utiltestingapi.MakeCohort("cohort").Obj()
 	_ = cache.AddOrUpdateCohort(cohort)
 	qManager.AddOrUpdateCohort(ctx, cohort)
 	snapshot, err := cache.Snapshot(ctx)
@@ -85,7 +86,7 @@ func TestCohortReconcileCohortNotFoundIdempotentDelete(t *testing.T) {
 		t.Fatal("unexpected Cohort in snapshot")
 	}
 
-	cohort := utiltesting.MakeCohort("cohort").Obj()
+	cohort := utiltestingapi.MakeCohort("cohort").Obj()
 	if _, err := reconciler.Reconcile(
 		ctx,
 		reconcile.Request{NamespacedName: client.ObjectKeyFromObject(cohort)},
@@ -103,8 +104,8 @@ func TestCohortReconcileCohortNotFoundIdempotentDelete(t *testing.T) {
 }
 
 func TestCohortReconcileCycleNoError(t *testing.T) {
-	cohortA := utiltesting.MakeCohort("cohort-a").Parent("cohort-b").Obj()
-	cohortB := utiltesting.MakeCohort("cohort-b").Parent("cohort-a").Obj()
+	cohortA := utiltestingapi.MakeCohort("cohort-a").Parent("cohort-b").Obj()
+	cohortB := utiltestingapi.MakeCohort("cohort-b").Parent("cohort-a").Obj()
 	cl := utiltesting.NewClientBuilder().
 		WithObjects(cohortA, cohortB).
 		WithStatusSubresource(&kueue.Cohort{}).
@@ -158,7 +159,7 @@ func TestCohortReconcileErrorOtherThanNotFoundNotDeleted(t *testing.T) {
 	cache := schdcache.New(cl)
 	qManager := qcache.NewManager(cl, cache)
 	reconciler := NewCohortReconciler(cl, cache, qManager)
-	cohort := utiltesting.MakeCohort("cohort").Obj()
+	cohort := utiltestingapi.MakeCohort("cohort").Obj()
 	_ = cache.AddOrUpdateCohort(cohort)
 	qManager.AddOrUpdateCohort(ctx, cohort)
 	snapshot, err := cache.Snapshot(ctx)
@@ -187,8 +188,8 @@ func TestCohortReconcileErrorOtherThanNotFoundNotDeleted(t *testing.T) {
 
 func TestCohortReconcileLifecycle(t *testing.T) {
 	ctx, _ := utiltesting.ContextWithLog(t)
-	cohort := utiltesting.MakeCohort("cohort").ResourceGroup(
-		*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+	cohort := utiltestingapi.MakeCohort("cohort").ResourceGroup(
+		*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 	).Obj()
 	cl := utiltesting.NewClientBuilder().WithObjects(cohort).WithStatusSubresource(&kueue.Cohort{}).Build()
 	cache := schdcache.New(cl)
@@ -226,8 +227,8 @@ func TestCohortReconcileLifecycle(t *testing.T) {
 		if err := cl.Get(ctx, client.ObjectKeyFromObject(cohort), cohort); err != nil {
 			t.Fatal("unexpected error")
 		}
-		cohort.Spec.ResourceGroups[0] = utiltesting.ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "5").Obj(),
+		cohort.Spec.ResourceGroups[0] = utiltestingapi.ResourceGroup(
+			*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "5").Obj(),
 		)
 		if err := cl.Update(ctx, cohort); err != nil {
 			t.Fatal("unexpected error updating cohort", err)
@@ -309,51 +310,51 @@ func TestCohortReconcilerFilters(t *testing.T) {
 		want bool
 	}{
 		"unchanged returns false": {
-			old: utiltesting.MakeCohort("cohort").ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "5").Obj(),
+			old: utiltestingapi.MakeCohort("cohort").ResourceGroup(
+				*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "5").Obj(),
 			).Obj(),
-			new: utiltesting.MakeCohort("cohort").ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "5").Obj(),
+			new: utiltestingapi.MakeCohort("cohort").ResourceGroup(
+				*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "5").Obj(),
 			).Obj(),
 			want: false,
 		},
 		"changed resource returns true": {
-			old: utiltesting.MakeCohort("cohort").ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "5").Obj(),
+			old: utiltestingapi.MakeCohort("cohort").ResourceGroup(
+				*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "5").Obj(),
 			).Obj(),
-			new: utiltesting.MakeCohort("cohort").ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
+			new: utiltestingapi.MakeCohort("cohort").ResourceGroup(
+				*utiltestingapi.MakeFlavorQuotas("red").Resource("cpu", "10").Obj(),
 			).Obj(),
 			want: true,
 		},
 		"adding parent returns true": {
-			old:  utiltesting.MakeCohort("cohort").Obj(),
-			new:  utiltesting.MakeCohort("cohort").Parent("parent").Obj(),
+			old:  utiltestingapi.MakeCohort("cohort").Obj(),
+			new:  utiltestingapi.MakeCohort("cohort").Parent("parent").Obj(),
 			want: true,
 		},
 		"changing parent returns true": {
-			old:  utiltesting.MakeCohort("cohort").Parent("old").Obj(),
-			new:  utiltesting.MakeCohort("cohort").Parent("new").Obj(),
+			old:  utiltestingapi.MakeCohort("cohort").Parent("old").Obj(),
+			new:  utiltestingapi.MakeCohort("cohort").Parent("new").Obj(),
 			want: true,
 		},
 		"deleting parent returns true": {
-			old:  utiltesting.MakeCohort("cohort").Parent("parent").Obj(),
-			new:  utiltesting.MakeCohort("cohort").Obj(),
+			old:  utiltestingapi.MakeCohort("cohort").Parent("parent").Obj(),
+			new:  utiltestingapi.MakeCohort("cohort").Obj(),
 			want: true,
 		},
 		"adding weight returns true": {
-			old:  utiltesting.MakeCohort("cohort").Obj(),
-			new:  utiltesting.MakeCohort("cohort").FairWeight(resource.MustParse("1")).Obj(),
+			old:  utiltestingapi.MakeCohort("cohort").Obj(),
+			new:  utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("1")).Obj(),
 			want: true,
 		},
 		"deleting weight returns true": {
-			old:  utiltesting.MakeCohort("cohort").FairWeight(resource.MustParse("1")).Obj(),
-			new:  utiltesting.MakeCohort("cohort").Obj(),
+			old:  utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("1")).Obj(),
+			new:  utiltestingapi.MakeCohort("cohort").Obj(),
 			want: true,
 		},
 		"updating weight returns true": {
-			old:  utiltesting.MakeCohort("cohort").FairWeight(resource.MustParse("1")).Obj(),
-			new:  utiltesting.MakeCohort("cohort").FairWeight(resource.MustParse("2")).Obj(),
+			old:  utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("1")).Obj(),
+			new:  utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("2")).Obj(),
 			want: true,
 		},
 	}
diff --git a/pkg/controller/core/localqueue_controller_test.go b/pkg/controller/core/localqueue_controller_test.go
index 27589a576..f323bc8ca 100644
--- a/pkg/controller/core/localqueue_controller_test.go
+++ b/pkg/controller/core/localqueue_controller_test.go
@@ -39,6 +39,7 @@ import (
 	schdcache "sigs.k8s.io/kueue/pkg/cache/scheduler"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -54,15 +55,15 @@ func TestLocalQueueReconcile(t *testing.T) {
 		wantRequeueAfter *time.Duration
 	}{
 		"local queue with Hold StopPolicy": {
-			clusterQueue: utiltesting.MakeClusterQueue("test-cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("test-cluster-queue").
 				Obj(),
-			localQueue: utiltesting.MakeLocalQueue("test-queue", "default").
+			localQueue: utiltestingapi.MakeLocalQueue("test-queue", "default").
 				ClusterQueue("test-cluster-queue").
 				PendingWorkloads(1).
 				StopPolicy(kueue.Hold).
 				Generation(1).
 				Obj(),
-			wantLocalQueue: utiltesting.MakeLocalQueue("test-queue", "default").
+			wantLocalQueue: utiltestingapi.MakeLocalQueue("test-queue", "default").
 				ClusterQueue("test-cluster-queue").
 				PendingWorkloads(0).
 				StopPolicy(kueue.Hold).
@@ -78,15 +79,15 @@ func TestLocalQueueReconcile(t *testing.T) {
 			wantError: nil,
 		},
 		"local queue with HoldAndDrain StopPolicy": {
-			clusterQueue: utiltesting.MakeClusterQueue("test-cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("test-cluster-queue").
 				Obj(),
-			localQueue: utiltesting.MakeLocalQueue("test-queue", "default").
+			localQueue: utiltestingapi.MakeLocalQueue("test-queue", "default").
 				ClusterQueue("test-cluster-queue").
 				PendingWorkloads(1).
 				StopPolicy(kueue.HoldAndDrain).
 				Generation(1).
 				Obj(),
-			wantLocalQueue: utiltesting.MakeLocalQueue("test-queue", "default").
+			wantLocalQueue: utiltestingapi.MakeLocalQueue("test-queue", "default").
 				ClusterQueue("test-cluster-queue").
 				PendingWorkloads(0).
 				StopPolicy(kueue.HoldAndDrain).
@@ -102,14 +103,14 @@ func TestLocalQueueReconcile(t *testing.T) {
 			wantError: nil,
 		},
 		"cluster queue is inactive": {
-			clusterQueue: utiltesting.MakeClusterQueue("test-cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("test-cluster-queue").
 				Obj(),
-			localQueue: utiltesting.MakeLocalQueue("test-queue", "default").
+			localQueue: utiltestingapi.MakeLocalQueue("test-queue", "default").
 				ClusterQueue("test-cluster-queue").
 				PendingWorkloads(1).
 				Generation(1).
 				Obj(),
-			wantLocalQueue: utiltesting.MakeLocalQueue("test-queue", "default").
+			wantLocalQueue: utiltestingapi.MakeLocalQueue("test-queue", "default").
 				ClusterQueue("test-cluster-queue").
 				PendingWorkloads(0).
 				Generation(1).
@@ -124,10 +125,10 @@ func TestLocalQueueReconcile(t *testing.T) {
 			wantError: nil,
 		},
 		"local queue decaying usage decays if there is no running workloads": {
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				Obj(),
-			localQueue: utiltesting.MakeLocalQueue("test-queue", "default").
+			localQueue: utiltestingapi.MakeLocalQueue("test-queue", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -142,7 +143,7 @@ func TestLocalQueueReconcile(t *testing.T) {
 						},
 					}).
 				Obj(),
-			wantLocalQueue: utiltesting.MakeLocalQueue("test-queue", "default").
+			wantLocalQueue: utiltestingapi.MakeLocalQueue("test-queue", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -163,10 +164,10 @@ func TestLocalQueueReconcile(t *testing.T) {
 			},
 		},
 		"local queue decaying usage sums the previous state and running workloads": {
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				Obj(),
-			localQueue: utiltesting.MakeLocalQueue("lq", "default").
+			localQueue: utiltestingapi.MakeLocalQueue("lq", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -181,7 +182,7 @@ func TestLocalQueueReconcile(t *testing.T) {
 						},
 					}).
 				Obj(),
-			wantLocalQueue: utiltesting.MakeLocalQueue("lq", "default").
+			wantLocalQueue: utiltestingapi.MakeLocalQueue("lq", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				ReservingWorkloads(1).
@@ -199,7 +200,7 @@ func TestLocalQueueReconcile(t *testing.T) {
 					}).
 				Obj(),
 			runningWls: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl", "default").
+				*utiltestingapi.MakeWorkload("wl", "default").
 					Queue("lq").
 					Request(corev1.ResourceCPU, "4").
 					SimpleReserveQuota("cq", "rf", clock.Now()).
@@ -212,10 +213,10 @@ func TestLocalQueueReconcile(t *testing.T) {
 			},
 		},
 		"local queue decaying usage sums the usage from different flavors and resources": {
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				Obj(),
-			localQueue: utiltesting.MakeLocalQueue("lq", "default").
+			localQueue: utiltestingapi.MakeLocalQueue("lq", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -232,7 +233,7 @@ func TestLocalQueueReconcile(t *testing.T) {
 						},
 					}).
 				Obj(),
-			wantLocalQueue: utiltesting.MakeLocalQueue("lq", "default").
+			wantLocalQueue: utiltestingapi.MakeLocalQueue("lq", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				ReservingWorkloads(3).
@@ -251,19 +252,19 @@ func TestLocalQueueReconcile(t *testing.T) {
 					}).
 				Obj(),
 			runningWls: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl-1", "default").
+				*utiltestingapi.MakeWorkload("wl-1", "default").
 					Queue("lq").
 					Request(corev1.ResourceCPU, "2").
 					SimpleReserveQuota("cq", "rf-1", clock.Now()).
 					Admitted(true).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-2", "default").
+				*utiltestingapi.MakeWorkload("wl-2", "default").
 					Queue("lq").
 					Request(corev1.ResourceCPU, "2").
 					SimpleReserveQuota("cq", "rf-2", clock.Now()).
 					Admitted(true).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-3", "default").
+				*utiltestingapi.MakeWorkload("wl-3", "default").
 					Queue("lq").
 					Request("GPU", "4").
 					SimpleReserveQuota("cq", "rf-3", clock.Now()).
@@ -276,10 +277,10 @@ func TestLocalQueueReconcile(t *testing.T) {
 			},
 		},
 		"local queue decaying usage sums the previous state and running workloads half time twice larger than sampling": {
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				Obj(),
-			localQueue: utiltesting.MakeLocalQueue("lq", "default").
+			localQueue: utiltestingapi.MakeLocalQueue("lq", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -294,7 +295,7 @@ func TestLocalQueueReconcile(t *testing.T) {
 						},
 					}).
 				Obj(),
-			wantLocalQueue: utiltesting.MakeLocalQueue("lq", "default").
+			wantLocalQueue: utiltestingapi.MakeLocalQueue("lq", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -312,7 +313,7 @@ func TestLocalQueueReconcile(t *testing.T) {
 					}).
 				Obj(),
 			runningWls: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl", "default").
+				*utiltestingapi.MakeWorkload("wl", "default").
 					Queue("lq").
 					Request(corev1.ResourceCPU, "4").
 					SimpleReserveQuota("cq", "rf", clock.Now()).
@@ -325,10 +326,10 @@ func TestLocalQueueReconcile(t *testing.T) {
 			},
 		},
 		"local queue decaying usage sums the previous state and running workloads with long half time": {
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				Obj(),
-			localQueue: utiltesting.MakeLocalQueue("lq", "default").
+			localQueue: utiltestingapi.MakeLocalQueue("lq", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -343,7 +344,7 @@ func TestLocalQueueReconcile(t *testing.T) {
 						},
 					}).
 				Obj(),
-			wantLocalQueue: utiltesting.MakeLocalQueue("lq", "default").
+			wantLocalQueue: utiltestingapi.MakeLocalQueue("lq", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -364,10 +365,10 @@ func TestLocalQueueReconcile(t *testing.T) {
 			},
 		},
 		"local queue decaying usage sums the previous state and running GPU workloads half time twice larger than sampling": {
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				Obj(),
-			localQueue: utiltesting.MakeLocalQueue("lq", "default").
+			localQueue: utiltestingapi.MakeLocalQueue("lq", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -382,7 +383,7 @@ func TestLocalQueueReconcile(t *testing.T) {
 						},
 					}).
 				Obj(),
-			wantLocalQueue: utiltesting.MakeLocalQueue("lq", "default").
+			wantLocalQueue: utiltestingapi.MakeLocalQueue("lq", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -400,7 +401,7 @@ func TestLocalQueueReconcile(t *testing.T) {
 					}).
 				Obj(),
 			runningWls: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl", "default").
+				*utiltestingapi.MakeWorkload("wl", "default").
 					Queue("lq").
 					Request("GPU", "4").
 					SimpleReserveQuota("cq", "rf", clock.Now()).
@@ -413,10 +414,10 @@ func TestLocalQueueReconcile(t *testing.T) {
 			},
 		},
 		"local queue decaying usage resets to 0 when half life is 0": {
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				Obj(),
-			localQueue: utiltesting.MakeLocalQueue("lq", "default").
+			localQueue: utiltestingapi.MakeLocalQueue("lq", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -431,7 +432,7 @@ func TestLocalQueueReconcile(t *testing.T) {
 						},
 					}).
 				Obj(),
-			wantLocalQueue: utiltesting.MakeLocalQueue("lq", "default").
+			wantLocalQueue: utiltestingapi.MakeLocalQueue("lq", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -445,7 +446,7 @@ func TestLocalQueueReconcile(t *testing.T) {
 					}).
 				Obj(),
 			runningWls: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl", "default").
+				*utiltestingapi.MakeWorkload("wl", "default").
 					Queue("lq").
 					Request("GPU", "4").
 					SimpleReserveQuota("cq", "rf", clock.Now()).
@@ -458,10 +459,10 @@ func TestLocalQueueReconcile(t *testing.T) {
 			},
 		},
 		"local queue decaying usage is not reconciled if not enough time has passed": {
-			clusterQueue: utiltesting.MakeClusterQueue("cq").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				Obj(),
-			localQueue: utiltesting.MakeLocalQueue("test-queue", "default").
+			localQueue: utiltestingapi.MakeLocalQueue("test-queue", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
@@ -476,7 +477,7 @@ func TestLocalQueueReconcile(t *testing.T) {
 						},
 					}).
 				Obj(),
-			wantLocalQueue: utiltesting.MakeLocalQueue("test-queue", "default").
+			wantLocalQueue: utiltestingapi.MakeLocalQueue("test-queue", "default").
 				ClusterQueue("cq").
 				Active(metav1.ConditionTrue).
 				FairSharing(&kueue.FairSharing{
diff --git a/pkg/controller/core/workload_controller_test.go b/pkg/controller/core/workload_controller_test.go
index 1fcfaa2c3..217ca9dc4 100644
--- a/pkg/controller/core/workload_controller_test.go
+++ b/pkg/controller/core/workload_controller_test.go
@@ -46,6 +46,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	utilqueue "sigs.k8s.io/kueue/pkg/util/queue"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -420,9 +421,9 @@ func TestReconcile(t *testing.T) {
 	}{
 		"reconcile DRA ResourceClaim should be rejected as inadmissible": {
 			enableDRAFeature: true,
-			workload: utiltesting.MakeWorkload("wlWithDRAResourceClaim", "ns").
+			workload: utiltestingapi.MakeWorkload("wlWithDRAResourceClaim", "ns").
 				Queue("lq").
-				PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					ResourceClaim("gpu", "rc1").
 					Obj()).
 				Obj(),
@@ -440,15 +441,15 @@ func TestReconcile(t *testing.T) {
 					},
 				},
 			}},
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("flavor1").
+					*utiltestingapi.MakeFlavorQuotas("flavor1").
 						Resource("gpus", "2").Obj(),
 				).Obj(),
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wlWithDRAResourceClaim", "ns").
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
+			wantWorkload: utiltestingapi.MakeWorkload("wlWithDRAResourceClaim", "ns").
 				Queue("lq").
-				PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					ResourceClaim("gpu", "rc1").
 					Obj()).
 				Condition(metav1.Condition{
@@ -470,9 +471,9 @@ func TestReconcile(t *testing.T) {
 			enableDRAFeature:     true,
 			wantDRAResourceTotal: ptr.To(int64(1)),
 			wantWorkloadsInQueue: ptr.To(1),
-			workload: utiltesting.MakeWorkload("wlWithDRAResourceClaimTemplate", "ns").
+			workload: utiltestingapi.MakeWorkload("wlWithDRAResourceClaimTemplate", "ns").
 				Queue("lq").
-				PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					ResourceClaimTemplate("gpu", "gpu-template").
 					Obj()).
 				Obj(),
@@ -493,15 +494,15 @@ func TestReconcile(t *testing.T) {
 					},
 				},
 			}},
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("flavor1").
+					*utiltestingapi.MakeFlavorQuotas("flavor1").
 						Resource("gpu", "2").Obj(),
 				).Obj(),
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wlWithDRAResourceClaimTemplate", "ns").
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
+			wantWorkload: utiltestingapi.MakeWorkload("wlWithDRAResourceClaimTemplate", "ns").
 				Queue("lq").
-				PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					ResourceClaimTemplate("gpu", "gpu-template").
 					Obj()).
 				Condition(metav1.Condition{
@@ -517,9 +518,9 @@ func TestReconcile(t *testing.T) {
 			enableDRAFeature:     true,
 			wantDRAResourceTotal: ptr.To(int64(6)),
 			wantWorkloadsInQueue: ptr.To(1),
-			workload: utiltesting.MakeWorkload("wlMultiPodDRA", "ns").
+			workload: utiltestingapi.MakeWorkload("wlMultiPodDRA", "ns").
 				Queue("lq").
-				PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					ResourceClaimTemplate("gpu", "gpu-template").
 					Obj()).
 				Obj(),
@@ -540,15 +541,15 @@ func TestReconcile(t *testing.T) {
 					},
 				},
 			}},
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("flavor1").
+					*utiltestingapi.MakeFlavorQuotas("flavor1").
 						Resource("gpu", "10").Obj(),
 				).Obj(),
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wlMultiPodDRA", "ns").
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
+			wantWorkload: utiltestingapi.MakeWorkload("wlMultiPodDRA", "ns").
 				Queue("lq").
-				PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					ResourceClaimTemplate("gpu", "gpu-template").
 					Obj()).
 				Condition(metav1.Condition{
@@ -562,9 +563,9 @@ func TestReconcile(t *testing.T) {
 		},
 		"reconcile DRA ResourceClaimTemplate with unmapped device class": {
 			enableDRAFeature: true,
-			workload: utiltesting.MakeWorkload("wlUnmappedDRA", "ns").
+			workload: utiltestingapi.MakeWorkload("wlUnmappedDRA", "ns").
 				Queue("lq").
-				PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					ResourceClaimTemplate("gpu", "gpu-template").
 					Obj()).
 				Obj(),
@@ -585,16 +586,16 @@ func TestReconcile(t *testing.T) {
 					},
 				},
 			}},
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("flavor1").
+					*utiltestingapi.MakeFlavorQuotas("flavor1").
 						Resource("gpu", "2").Obj(),
 				).Obj(),
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
 			wantWorkload: func() *kueue.Workload {
-				wl := utiltesting.MakeWorkload("wlUnmappedDRA", "ns").
+				wl := utiltestingapi.MakeWorkload("wlUnmappedDRA", "ns").
 					Queue("lq").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						ResourceClaimTemplate("gpu", "gpu-template").
 						Obj()).
 					Condition(metav1.Condition{
@@ -623,21 +624,21 @@ func TestReconcile(t *testing.T) {
 		},
 		"reconcile DRA ResourceClaimTemplate not found should return error": {
 			enableDRAFeature: true,
-			workload: utiltesting.MakeWorkload("wlMissingTemplate", "ns").
+			workload: utiltestingapi.MakeWorkload("wlMissingTemplate", "ns").
 				Queue("lq").
-				PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					ResourceClaimTemplate("gpu", "missing-template").
 					Obj()).
 				Obj(),
-			cq: utiltesting.MakeClusterQueue("cq").
+			cq: utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("flavor1").
+					*utiltestingapi.MakeFlavorQuotas("flavor1").
 						Resource("gpu", "2").Obj(),
 				).Obj(),
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wlMissingTemplate", "ns").
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
+			wantWorkload: utiltestingapi.MakeWorkload("wlMissingTemplate", "ns").
 				Queue("lq").
-				PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					ResourceClaimTemplate("gpu", "missing-template").
 					Obj()).
 				Condition(metav1.Condition{
@@ -657,24 +658,24 @@ func TestReconcile(t *testing.T) {
 			wantEvents: nil,
 		},
 		"assign Admission Checks from ClusterQueue.spec.AdmissionCheckStrategy": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("cq").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("cpu", "flavor1", "1").
 						Obj()).
 					Obj()).
 				Queue("queue").
 				Obj(),
-			cq: utiltesting.MakeClusterQueue("cq").
-				ResourceGroup(*utiltesting.MakeFlavorQuotas("flavor1").Obj(), *utiltesting.MakeFlavorQuotas("flavor2").Obj()).
+			cq: utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("flavor1").Obj(), *utiltestingapi.MakeFlavorQuotas("flavor2").Obj()).
 				AdmissionCheckStrategy(
-					*utiltesting.MakeAdmissionCheckStrategyRule("ac1", "flavor1").Obj(),
-					*utiltesting.MakeAdmissionCheckStrategyRule("ac2").Obj()).
+					*utiltestingapi.MakeAdmissionCheckStrategyRule("ac1", "flavor1").Obj(),
+					*utiltestingapi.MakeAdmissionCheckStrategyRule("ac2").Obj()).
 				Obj(),
-			lq: utiltesting.MakeLocalQueue("queue", "ns").ClusterQueue("cq").Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("cq").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			lq: utiltestingapi.MakeLocalQueue("queue", "ns").ClusterQueue("cq").Obj(),
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("cpu", "flavor1", "1").
 						Obj()).
 					Obj()).
@@ -691,22 +692,22 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"assign Admission Checks from ClusterQueue.spec.AdmissionChecks": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("cq").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("cpu", "flavor1", "1").
 						Obj()).
 					Obj()).
 				Queue("queue").
 				Obj(),
-			cq: utiltesting.MakeClusterQueue("cq").
-				ResourceGroup(*utiltesting.MakeFlavorQuotas("flavor1").Obj(), *utiltesting.MakeFlavorQuotas("flavor2").Obj()).
+			cq: utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("flavor1").Obj(), *utiltestingapi.MakeFlavorQuotas("flavor2").Obj()).
 				AdmissionChecks("ac1", "ac2").
 				Obj(),
-			lq: utiltesting.MakeLocalQueue("queue", "ns").ClusterQueue("cq").Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("cq").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			lq: utiltestingapi.MakeLocalQueue("queue", "ns").ClusterQueue("cq").Obj(),
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("cpu", "flavor1", "1").
 						Obj()).
 					Obj()).
@@ -723,15 +724,15 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"admit": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuotaAt(utiltesting.MakeAdmission("q1").Obj(), testStartTime).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuotaAt(utiltestingapi.MakeAdmission("q1").Obj(), testStartTime).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStateReady,
 				}).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStateReady,
@@ -754,16 +755,16 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"already admitted": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStateReady,
 				}).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
@@ -772,7 +773,7 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"remove finalizer for finished workload": {
-			workload: utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+			workload: utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 				Condition(metav1.Condition{
 					Type:   "Finished",
 					Status: "True",
@@ -782,7 +783,7 @@ func TestReconcile(t *testing.T) {
 			wantWorkload: nil,
 		},
 		"don't remove finalizer for owned finished workload": {
-			workload: utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+			workload: utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 				Condition(metav1.Condition{
 					Type:   "Finished",
 					Status: "True",
@@ -790,7 +791,7 @@ func TestReconcile(t *testing.T) {
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job", "test-uid").
 				DeletionTimestamp(testStartTime).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+			wantWorkload: utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 				Condition(metav1.Condition{
 					Type:   "Finished",
 					Status: "True",
@@ -800,17 +801,17 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"unadmitted workload with rejected checks gets deactivated": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStateRejected,
 				}).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStateRejected,
@@ -840,8 +841,8 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"admitted workload with rejected checks gets deactivated": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
 				AdmissionCheck(kueue.AdmissionCheckState{
@@ -849,8 +850,8 @@ func TestReconcile(t *testing.T) {
 					State: kueue.CheckStateRejected,
 				}).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
 				AdmissionCheck(kueue.AdmissionCheckState{
@@ -888,8 +889,8 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"workload with deactivation target condition should be deactivated and admission checks reset": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Active(false).
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
@@ -910,8 +911,8 @@ func TestReconcile(t *testing.T) {
 					Message: "Admission check(s): check-1, were rejected",
 				}).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Active(false).
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
@@ -950,8 +951,8 @@ func TestReconcile(t *testing.T) {
 					},
 				).
 				Obj(),
-			wantWorkloadUseMergePatch: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			wantWorkloadUseMergePatch: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Active(false).
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
@@ -993,8 +994,8 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"workload with retry checks should be evicted and checks should be pending": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
 				AdmissionChecks(kueue.AdmissionCheckState{
 					Name:  "check-1",
@@ -1004,8 +1005,8 @@ func TestReconcile(t *testing.T) {
 					State: kueue.CheckStateReady,
 				}).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
 				AdmissionChecks(kueue.AdmissionCheckState{
 					Name:    "check-1",
@@ -1048,8 +1049,8 @@ func TestReconcile(t *testing.T) {
 					requeuingBackoffMaxDuration: time.Duration(3600) * time.Second,
 				}),
 			},
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStateReady,
@@ -1079,8 +1080,8 @@ func TestReconcile(t *testing.T) {
 				).
 				Generation(1).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:    "check",
@@ -1130,8 +1131,8 @@ func TestReconcile(t *testing.T) {
 					requeuingBackoffJitter:     0,
 				}),
 			},
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStateReady,
@@ -1146,8 +1147,8 @@ func TestReconcile(t *testing.T) {
 				Admitted(true).
 				RequeueState(ptr.To[int32](1), ptr.To(metav1.NewTime(testStartTime.Add(1*time.Second).Truncate(time.Second)))).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
@@ -1172,8 +1173,8 @@ func TestReconcile(t *testing.T) {
 					requeuingBackoffMaxDuration: time.Duration(7200) * time.Second,
 				}),
 			},
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStateReady,
@@ -1189,8 +1190,8 @@ func TestReconcile(t *testing.T) {
 				Admitted(true).
 				RequeueState(ptr.To[int32](10), ptr.To(metav1.NewTime(testStartTime.Add(1*time.Second).Truncate(time.Second)))).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:    "check",
@@ -1235,8 +1236,8 @@ func TestReconcile(t *testing.T) {
 					requeuingBackoffMaxDuration: time.Duration(7200) * time.Second,
 				}),
 			},
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStateReady,
@@ -1258,8 +1259,8 @@ func TestReconcile(t *testing.T) {
 				}).
 				Admitted(true).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:    "check",
@@ -1301,7 +1302,7 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"should set the WorkloadRequeued condition to true on re-activated": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadRequeued,
@@ -1310,7 +1311,7 @@ func TestReconcile(t *testing.T) {
 					Message: "The workload is deactivated",
 				}).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadRequeued,
@@ -1321,7 +1322,7 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should keep the WorkloadRequeued condition until the WaitForPodsReady backoff expires": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadRequeued,
@@ -1331,7 +1332,7 @@ func TestReconcile(t *testing.T) {
 				}).
 				RequeueState(ptr.To[int32](1), ptr.To(metav1.NewTime(testStartTime.Add(60*time.Second).Truncate(time.Second)))).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadRequeued,
@@ -1344,7 +1345,7 @@ func TestReconcile(t *testing.T) {
 			wantResult: reconcile.Result{RequeueAfter: time.Minute},
 		},
 		"should set the WorkloadRequeued condition when the WaitForPodsReady backoff expires": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadRequeued,
@@ -1354,7 +1355,7 @@ func TestReconcile(t *testing.T) {
 				}).
 				RequeueState(ptr.To[int32](1), ptr.To(metav1.NewTime(testStartTime.Truncate(time.Second)))).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadRequeued,
@@ -1366,7 +1367,7 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should keep the WorkloadRequeued condition until the AdmissionCheck backoff expires": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadRequeued,
@@ -1376,7 +1377,7 @@ func TestReconcile(t *testing.T) {
 				}).
 				RequeueState(ptr.To[int32](1), ptr.To(metav1.NewTime(testStartTime.Add(60*time.Second).Truncate(time.Second)))).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadRequeued,
@@ -1389,7 +1390,7 @@ func TestReconcile(t *testing.T) {
 			wantResult: reconcile.Result{RequeueAfter: time.Minute},
 		},
 		"should set the WorkloadRequeued condition when the AdmissionCheck backoff expires": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadRequeued,
@@ -1399,7 +1400,7 @@ func TestReconcile(t *testing.T) {
 				}).
 				RequeueState(ptr.To[int32](1), ptr.To(metav1.NewTime(testStartTime.Truncate(time.Second)))).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadRequeued,
@@ -1411,7 +1412,7 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"shouldn't set the WorkloadRequeued condition when backoff expires and workload finished": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadRequeued,
@@ -1427,7 +1428,7 @@ func TestReconcile(t *testing.T) {
 				}).
 				RequeueState(ptr.To[int32](1), ptr.To(metav1.NewTime(testStartTime.Truncate(time.Second)))).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadRequeued,
@@ -1445,9 +1446,9 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set the WorkloadRequeued condition to true on ClusterQueue started": {
-			cq: utiltesting.MakeClusterQueue("cq").Obj(),
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			cq: utiltestingapi.MakeClusterQueue("cq").Obj(),
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Condition(metav1.Condition{
@@ -1457,7 +1458,7 @@ func TestReconcile(t *testing.T) {
 					Message: "The ClusterQueue is stopped",
 				}).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Condition(metav1.Condition{
@@ -1469,9 +1470,9 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set the WorkloadRequeued condition to true on LocalQueue started": {
-			cq: utiltesting.MakeClusterQueue("cq").Obj(),
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			cq: utiltestingapi.MakeClusterQueue("cq").Obj(),
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Condition(metav1.Condition{
@@ -1481,7 +1482,7 @@ func TestReconcile(t *testing.T) {
 					Message: "The LocalQueue is stopped",
 				}).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Condition(metav1.Condition{
@@ -1493,8 +1494,8 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set the Evicted condition with Deactivated reason when the .spec.active=False": {
-			workload: utiltesting.MakeWorkload("wl", "ns").Active(false).Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").Active(false).Obj(),
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadEvicted,
@@ -1511,14 +1512,14 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set the Evicted condition with Deactivated reason when the .spec.active=False and Admitted": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadEvicted,
@@ -1543,9 +1544,9 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"should set the Evicted condition with Deactivated reason when the .spec.active is False, Admitted, and the Workload has Evicted=False condition": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadEvicted,
@@ -1561,9 +1562,9 @@ func TestReconcile(t *testing.T) {
 					},
 				).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadEvicted,
@@ -1604,9 +1605,9 @@ func TestReconcile(t *testing.T) {
 					requeuingBackoffJitter:      0,
 				}),
 			},
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadPodsReady,
@@ -1621,9 +1622,9 @@ func TestReconcile(t *testing.T) {
 					Message: "exceeding the maximum number of re-queuing retries",
 				}).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadPodsReady,
@@ -1652,9 +1653,9 @@ func TestReconcile(t *testing.T) {
 					},
 				).
 				Obj(),
-			wantWorkloadUseMergePatch: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkloadUseMergePatch: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadPodsReady,
@@ -1695,9 +1696,9 @@ func TestReconcile(t *testing.T) {
 					requeuingBackoffJitter:      0,
 				}),
 			},
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadPodsReady,
@@ -1712,9 +1713,9 @@ func TestReconcile(t *testing.T) {
 					Message: "exceeding the maximum number of re-queuing retries",
 				}).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadPodsReady,
@@ -1743,9 +1744,9 @@ func TestReconcile(t *testing.T) {
 					},
 				).
 				Obj(),
-			wantWorkloadUseMergePatch: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkloadUseMergePatch: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadPodsReady,
@@ -1786,9 +1787,9 @@ func TestReconcile(t *testing.T) {
 					requeuingBackoffJitter:      0,
 				}),
 			},
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadPodsReady,
@@ -1804,9 +1805,9 @@ func TestReconcile(t *testing.T) {
 				}).
 				RequeueState(ptr.To[int32](100), nil).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadPodsReady,
@@ -1837,9 +1838,9 @@ func TestReconcile(t *testing.T) {
 					},
 				).
 				Obj(),
-			wantWorkloadUseMergePatch: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkloadUseMergePatch: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadPodsReady,
@@ -1880,9 +1881,9 @@ func TestReconcile(t *testing.T) {
 					requeuingBackoffJitter:      0,
 				}),
 			},
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadPodsReady,
@@ -1898,9 +1899,9 @@ func TestReconcile(t *testing.T) {
 				}).
 				RequeueState(ptr.To[int32](100), nil).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadPodsReady,
@@ -1931,9 +1932,9 @@ func TestReconcile(t *testing.T) {
 					},
 				).
 				Obj(),
-			wantWorkloadUseMergePatch: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkloadUseMergePatch: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadPodsReady,
@@ -1965,9 +1966,9 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"should keep the previous eviction reason when the Workload is already evicted by other reason even though the Workload is deactivated.": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadEvicted,
@@ -1976,9 +1977,9 @@ func TestReconcile(t *testing.T) {
 					Message: "Exceeded the PodsReady timeout ns",
 				}).
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(false).
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				Admitted(true).
 				Condition(metav1.Condition{
 					Type:    kueue.WorkloadEvicted,
@@ -1989,17 +1990,17 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set the Evicted condition with ClusterQueueStopped reason when the StopPolicy is HoldAndDrain": {
-			cq: utiltesting.MakeClusterQueue("cq").StopPolicy(kueue.HoldAndDrain).Obj(),
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			cq: utiltestingapi.MakeClusterQueue("cq").StopPolicy(kueue.HoldAndDrain).Obj(),
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
-				ReserveQuota(utiltesting.MakeAdmission("cq").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).
 				Admitted(true).
 				Queue("lq").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
-				ReserveQuota(utiltesting.MakeAdmission("cq").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).
 				Admitted(true).
 				Queue("lq").
 				Condition(metav1.Condition{
@@ -2025,17 +2026,17 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"should set the Evicted condition with LocalQueueStopped reason when the StopPolicy is HoldAndDrain": {
-			cq: utiltesting.MakeClusterQueue("cq").Obj(),
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").StopPolicy(kueue.HoldAndDrain).Obj(),
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			cq: utiltestingapi.MakeClusterQueue("cq").Obj(),
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").StopPolicy(kueue.HoldAndDrain).Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
-				ReserveQuota(utiltesting.MakeAdmission("cq").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).
 				Admitted(true).
 				Queue("lq").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
-				ReserveQuota(utiltesting.MakeAdmission("cq").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).
 				Admitted(true).
 				Queue("lq").
 				Condition(metav1.Condition{
@@ -2061,19 +2062,19 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		"should set the Inadmissible reason on QuotaReservation condition when the LocalQueue was deleted": {
-			cq: utiltesting.MakeClusterQueue("cq").AdmissionChecks("check").Obj(),
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			cq: utiltestingapi.MakeClusterQueue("cq").AdmissionChecks("check").Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
-				ReserveQuota(utiltesting.MakeAdmission("cq").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStatePending,
 				}).
 				Queue("lq").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
-				Admission(utiltesting.MakeAdmission("cq", kueue.DefaultPodSetName).Obj()).
+				Admission(utiltestingapi.MakeAdmission("cq", kueue.DefaultPodSetName).Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStatePending,
@@ -2086,7 +2087,7 @@ func TestReconcile(t *testing.T) {
 					Message: "LocalQueue lq is terminating or missing",
 				}).
 				Obj(),
-			wantWorkloadUseMergePatch: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkloadUseMergePatch: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
@@ -2102,20 +2103,20 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set the Inadmissible reason on QuotaReservation condition when the LocalQueue was Hold": {
-			cq: utiltesting.MakeClusterQueue("cq").AdmissionChecks("check").Obj(),
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").StopPolicy(kueue.Hold).Obj(),
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			cq: utiltestingapi.MakeClusterQueue("cq").AdmissionChecks("check").Obj(),
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").StopPolicy(kueue.Hold).Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
-				ReserveQuota(utiltesting.MakeAdmission("cq").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStatePending,
 				}).
 				Queue("lq").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
-				Admission(utiltesting.MakeAdmission("cq", kueue.DefaultPodSetName).Obj()).
+				Admission(utiltestingapi.MakeAdmission("cq", kueue.DefaultPodSetName).Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStatePending,
@@ -2128,7 +2129,7 @@ func TestReconcile(t *testing.T) {
 					Message: "LocalQueue lq is stopped",
 				}).
 				Obj(),
-			wantWorkloadUseMergePatch: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkloadUseMergePatch: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
@@ -2144,19 +2145,19 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set the Inadmissible reason on QuotaReservation condition when the ClusterQueue was deleted": {
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
-				ReserveQuota(utiltesting.MakeAdmission("cq").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStatePending,
 				}).
 				Queue("lq").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
-				Admission(utiltesting.MakeAdmission("cq", kueue.DefaultPodSetName).Obj()).
+				Admission(utiltestingapi.MakeAdmission("cq", kueue.DefaultPodSetName).Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStatePending,
@@ -2169,7 +2170,7 @@ func TestReconcile(t *testing.T) {
 					Message: "ClusterQueue cq is terminating or missing",
 				}).
 				Obj(),
-			wantWorkloadUseMergePatch: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkloadUseMergePatch: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
@@ -2185,20 +2186,20 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set the Inadmissible reason on QuotaReservation condition when the ClusterQueue was Hold": {
-			cq: utiltesting.MakeClusterQueue("cq").AdmissionChecks("check").StopPolicy(kueue.Hold).Obj(),
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			cq: utiltestingapi.MakeClusterQueue("cq").AdmissionChecks("check").StopPolicy(kueue.Hold).Obj(),
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
-				ReserveQuota(utiltesting.MakeAdmission("cq").Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStatePending,
 				}).
 				Queue("lq").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
-				Admission(utiltesting.MakeAdmission("cq", kueue.DefaultPodSetName).Obj()).
+				Admission(utiltestingapi.MakeAdmission("cq", kueue.DefaultPodSetName).Obj()).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
 					State: kueue.CheckStatePending,
@@ -2211,7 +2212,7 @@ func TestReconcile(t *testing.T) {
 					Message: "ClusterQueue cq is stopped",
 				}).
 				Obj(),
-			wantWorkloadUseMergePatch: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkloadUseMergePatch: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				AdmissionCheck(kueue.AdmissionCheckState{
 					Name:  "check",
@@ -2227,11 +2228,11 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set status QuotaReserved conditions to False with reason Inadmissible if quota not reserved LocalQueue is not created": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Condition(metav1.Condition{
@@ -2243,12 +2244,12 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set status QuotaReserved conditions to False with reason Inadmissible if quota not reserved LocalQueue StopPolicy=Hold": {
-			lq: utiltesting.MakeLocalQueue("lq", "ns").StopPolicy(kueue.Hold).Obj(),
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").StopPolicy(kueue.Hold).Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Condition(metav1.Condition{
@@ -2260,12 +2261,12 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set status QuotaReserved conditions to False with reason Inadmissible if quota not reserved LocalQueue StopPolicy=HoldAndDrain": {
-			lq: utiltesting.MakeLocalQueue("lq", "ns").StopPolicy(kueue.HoldAndDrain).Obj(),
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").StopPolicy(kueue.HoldAndDrain).Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Condition(metav1.Condition{
@@ -2277,12 +2278,12 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set status QuotaReserved conditions to False with reason Inadmissible if quota not reserved ClusterQueue is not created": {
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").StopPolicy(kueue.None).Obj(),
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").StopPolicy(kueue.None).Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Condition(metav1.Condition{
@@ -2294,13 +2295,13 @@ func TestReconcile(t *testing.T) {
 				Obj(),
 		},
 		"should set status QuotaReserved conditions to False with reason Inadmissible if quota not reserved ClusterQueue StopPolicy=Hold": {
-			lq: utiltesting.MakeLocalQueue("lq", "ns").ClusterQueue("cq").StopPolicy(kueue.None).Obj(),
-			cq: utiltesting.MakeClusterQueue("cq").StopPolicy(kueue.Hold).Obj(),
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			lq: utiltestingapi.MakeLocalQueue("lq", "ns").ClusterQueue("cq").StopPolicy(kueue.None).Obj(),
+			cq: utiltestingapi.MakeClusterQueue("cq").StopPolicy(kueue.Hold).Obj(),
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Active(true).
 				Queue("lq").
 				Condition(metav1.Condition{
@@ -2313,14 +2314,14 @@ func TestReconcile(t *testing.T) {
 		},
 
 		"admitted workload with max execution time": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				MaximumExecutionTimeSeconds(120).
 				AdmittedAt(true, testStartTime.Add(-time.Minute)).
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				MaximumExecutionTimeSeconds(120).
 				AdmittedAt(true, testStartTime.Add(-time.Minute)).
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
@@ -2329,14 +2330,14 @@ func TestReconcile(t *testing.T) {
 		},
 
 		"admitted workload with max execution time - expired": {
-			workload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				MaximumExecutionTimeSeconds(60).
 				AdmittedAt(true, testStartTime.Add(-2*time.Minute)).
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
 				Obj(),
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("q1").Obj()).
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("q1").Obj()).
 				MaximumExecutionTimeSeconds(60).
 				AdmittedAt(true, testStartTime.Add(-2*time.Minute)).
 				ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "ownername", "owneruid").
@@ -2358,7 +2359,7 @@ func TestReconcile(t *testing.T) {
 		},
 		"shouldn't delete the workload because, object retention not configured": {
 			enableObjectRetentionPolicies: true,
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Condition(metav1.Condition{
 					Type:   kueue.WorkloadFinished,
 					Status: metav1.ConditionTrue,
@@ -2367,7 +2368,7 @@ func TestReconcile(t *testing.T) {
 			reconcilerOpts: []Option{
 				WithWorkloadRetention(nil),
 			},
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Condition(metav1.Condition{
 					Type:   kueue.WorkloadFinished,
 					Status: metav1.ConditionTrue,
@@ -2377,7 +2378,7 @@ func TestReconcile(t *testing.T) {
 		},
 		"shouldn't try to delete the workload (no event emitted) because it is already being deleted by kubernetes, object retention configured": {
 			enableObjectRetentionPolicies: true,
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Condition(metav1.Condition{
 					Type:   kueue.WorkloadFinished,
 					Status: metav1.ConditionTrue,
@@ -2400,7 +2401,7 @@ func TestReconcile(t *testing.T) {
 		},
 		"shouldn't try to delete the workload because the retention period hasn't elapsed yet, object retention configured": {
 			enableObjectRetentionPolicies: true,
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Condition(metav1.Condition{
 					Type:               kueue.WorkloadFinished,
 					Status:             metav1.ConditionTrue,
@@ -2417,7 +2418,7 @@ func TestReconcile(t *testing.T) {
 			wantResult: reconcile.Result{
 				RequeueAfter: util.LongTimeout - util.Timeout,
 			},
-			wantWorkload: utiltesting.MakeWorkload("wl", "ns").
+			wantWorkload: utiltestingapi.MakeWorkload("wl", "ns").
 				Condition(metav1.Condition{
 					Type:               kueue.WorkloadFinished,
 					Status:             metav1.ConditionTrue,
@@ -2428,7 +2429,7 @@ func TestReconcile(t *testing.T) {
 		},
 		"should delete the workload because the retention period has elapsed, object retention configured": {
 			enableObjectRetentionPolicies: true,
-			workload: utiltesting.MakeWorkload("wl", "ns").
+			workload: utiltestingapi.MakeWorkload("wl", "ns").
 				Condition(metav1.Condition{
 					Type:               kueue.WorkloadFinished,
 					Status:             metav1.ConditionTrue,
diff --git a/pkg/controller/jobframework/base_webhook_test.go b/pkg/controller/jobframework/base_webhook_test.go
index c36f2255e..f617b43e4 100644
--- a/pkg/controller/jobframework/base_webhook_test.go
+++ b/pkg/controller/jobframework/base_webhook_test.go
@@ -37,6 +37,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	utiljob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 )
 
@@ -120,23 +121,23 @@ func TestBaseWebhookDefault(t *testing.T) {
 			cqCache := schdcache.New(cl)
 			queueManager := qcache.NewManager(cl, cqCache)
 			if tc.defaultLqExist {
-				if err := queueManager.AddLocalQueue(ctx, utiltesting.MakeLocalQueue("default", metav1.NamespaceDefault).
+				if err := queueManager.AddLocalQueue(ctx, utiltestingapi.MakeLocalQueue("default", metav1.NamespaceDefault).
 					ClusterQueue("cluster-queue").Obj()); err != nil {
 					t.Fatalf("failed to create default local queue: %s", err)
 				}
 			}
 			if tc.enableMultiKueue {
-				if err := queueManager.AddLocalQueue(ctx, utiltesting.MakeLocalQueue("multikueue", metav1.NamespaceDefault).
+				if err := queueManager.AddLocalQueue(ctx, utiltestingapi.MakeLocalQueue("multikueue", metav1.NamespaceDefault).
 					ClusterQueue("cluster-queue").Obj()); err != nil {
 					t.Fatalf("failed to create default local queue: %s", err)
 				}
-				cq := *utiltesting.MakeClusterQueue("cluster-queue").
+				cq := *utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("admission-check").
 					Obj()
 				if err := cqCache.AddClusterQueue(ctx, &cq); err != nil {
 					t.Fatalf("Inserting clusterQueue %s in cache: %v", cq.Name, err)
 				}
-				ac := utiltesting.MakeAdmissionCheck("admission-check").
+				ac := utiltestingapi.MakeAdmissionCheck("admission-check").
 					ControllerName(kueue.MultiKueueControllerName).
 					Active(metav1.ConditionTrue).
 					Obj()
diff --git a/pkg/controller/jobframework/reconciler_test.go b/pkg/controller/jobframework/reconciler_test.go
index 464419385..7d4e3ae32 100644
--- a/pkg/controller/jobframework/reconciler_test.go
+++ b/pkg/controller/jobframework/reconciler_test.go
@@ -45,6 +45,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/kubeversion"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingaw "sigs.k8s.io/kueue/pkg/util/testingjobs/appwrapper"
 	testingdeployment "sigs.k8s.io/kueue/pkg/util/testingjobs/deployment"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
@@ -67,9 +68,9 @@ func TestReconcileGenericJob(t *testing.T) {
 	baseReq := types.NamespacedName{Name: testJobName, Namespace: metav1.NamespaceDefault}
 	baseJob := testingjob.MakeJob(testJobName, metav1.NamespaceDefault).UID(testJobName).Queue(testLocalQueueName)
 	basePodSets := []kueue.PodSet{
-		*utiltesting.MakePodSet("main", 1).Obj(),
+		*utiltestingapi.MakePodSet("main", 1).Obj(),
 	}
-	baseWl := utiltesting.MakeWorkload("job-test-job", metav1.NamespaceDefault).
+	baseWl := utiltestingapi.MakeWorkload("job-test-job", metav1.NamespaceDefault).
 		ResourceVersion("1").
 		Finalizers(kueue.ResourceInUseFinalizerName).
 		Label(constants.JobUIDLabel, testJobName).
@@ -137,7 +138,7 @@ func TestReconcileGenericJob(t *testing.T) {
 			podSets: basePodSets,
 			objs: []client.Object{
 				baseWl.Clone().Name("job-test-job-1").
-					PodSets(*utiltesting.MakePodSet("old", 2).Obj()).
+					PodSets(*utiltestingapi.MakePodSet("old", 2).Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
@@ -186,6 +187,102 @@ func TestReconcileGenericJob(t *testing.T) {
 	}
 }
 
+func TestReconcileGenericJobWithCustomWorkloadActivation(t *testing.T) {
+	const (
+		testJobName = "test-job"
+		testNS      = metav1.NamespaceDefault
+	)
+
+	var (
+		testLocalQueueName = kueue.LocalQueueName("test-lq")
+		testGVK            = batchv1.SchemeGroupVersion.WithKind("Job")
+		req                = types.NamespacedName{Name: testJobName, Namespace: testNS}
+	)
+
+	baseJob := testingjob.MakeJob(testJobName, testNS).UID(testJobName).Queue(testLocalQueueName)
+	basePodSets := []kueue.PodSet{
+		*utiltestingapi.MakePodSet("main", 1).Obj(),
+	}
+	baseWl := utiltestingapi.MakeWorkload("job-test-job", testNS).
+		ResourceVersion("1").
+		Finalizers(kueue.ResourceInUseFinalizerName).
+		Label(constants.JobUIDLabel, testJobName).
+		ControllerReference(testGVK, testJobName, testJobName).
+		Queue(testLocalQueueName).
+		PodSets(basePodSets...).
+		Priority(0)
+
+	testCases := map[string]struct {
+		initialActive  *bool
+		jobActive      bool
+		expectedActive bool
+	}{
+		"marks workload inactive when job requests": {
+			initialActive:  nil,
+			jobActive:      false,
+			expectedActive: false,
+		},
+		"marks workload active when job requests": {
+			initialActive:  ptr.To(false),
+			jobActive:      true,
+			expectedActive: true,
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			ctx, _ := utiltesting.ContextWithLog(t)
+			mockctrl := gomock.NewController(t)
+
+			job := baseJob.DeepCopy()
+			wl := baseWl.Clone().Name("job-test-job-1").Obj()
+			if tc.initialActive == nil {
+				wl.Spec.Active = nil
+			} else {
+				wl.Spec.Active = ptr.To(*tc.initialActive)
+			}
+
+			cl := utiltesting.NewClientBuilder(batchv1.AddToScheme, kueue.AddToScheme).
+				WithObjects(job, wl).
+				WithIndex(&kueue.Workload{}, indexer.OwnerReferenceIndexKey(testGVK), indexer.WorkloadOwnerIndexFunc(testGVK)).
+				Build()
+
+			recorder := &utiltesting.EventRecorder{}
+			reconciler := NewReconciler(cl, recorder)
+
+			mgj := &struct {
+				*mocks.MockGenericJob
+				*mocks.MockJobWithCustomWorkloadActivation
+			}{
+				MockGenericJob:                      mocks.NewMockGenericJob(mockctrl),
+				MockJobWithCustomWorkloadActivation: mocks.NewMockJobWithCustomWorkloadActivation(mockctrl),
+			}
+			mgj.MockGenericJob.EXPECT().Object().Return(job).AnyTimes()
+			mgj.MockGenericJob.EXPECT().GVK().Return(testGVK).AnyTimes()
+			mgj.MockGenericJob.EXPECT().IsSuspended().Return(ptr.Deref(job.Spec.Suspend, false)).AnyTimes()
+			mgj.MockGenericJob.EXPECT().Finished(gomock.Any()).Return("", false, false).AnyTimes()
+			mgj.MockGenericJob.EXPECT().PodSets(gomock.Any()).Return(basePodSets, nil).AnyTimes()
+			mgj.MockJobWithCustomWorkloadActivation.EXPECT().IsWorkloadActive().Return(tc.jobActive).MaxTimes(1)
+
+			if _, err := reconciler.ReconcileGenericJob(ctx, controllerruntime.Request{NamespacedName: req}, mgj); err != nil {
+				t.Fatalf("Failed to Reconcile GenericJob: %v", err)
+			}
+
+			updated := &kueue.Workload{}
+			if err := cl.Get(ctx, client.ObjectKey{Name: wl.Name, Namespace: wl.Namespace}, updated); err != nil {
+				t.Fatalf("Failed to get workload: %v", err)
+			}
+
+			if updated.Spec.Active == nil {
+				t.Fatalf("Workload.Spec.Active is nil, want %t", tc.expectedActive)
+			}
+			if *updated.Spec.Active != tc.expectedActive {
+				t.Fatalf("Workload.Spec.Active = %t, want %t", *updated.Spec.Active, tc.expectedActive)
+			}
+		})
+	}
+}
+
 func TestFindAncestorJobManagedByKueue(t *testing.T) {
 	grandparentJobName := "test-job-grandparent"
 	parentJobName := "test-job-parent"
diff --git a/pkg/controller/jobframework/setup_test.go b/pkg/controller/jobframework/setup_test.go
index 8e39ad31f..8676ffd13 100644
--- a/pkg/controller/jobframework/setup_test.go
+++ b/pkg/controller/jobframework/setup_test.go
@@ -42,6 +42,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/slices"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestSetupControllers(t *testing.T) {
@@ -228,10 +229,10 @@ func TestSetupIndexes(t *testing.T) {
 	}{
 		"proper indexes are set": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("alpha-wl", testNamespace).
+				*utiltestingapi.MakeWorkload("alpha-wl", testNamespace).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "alpha", "job").
 					Obj(),
-				*utiltesting.MakeWorkload("beta-wl", testNamespace).
+				*utiltestingapi.MakeWorkload("beta-wl", testNamespace).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "beta", "job").
 					Obj(),
 			},
@@ -243,10 +244,10 @@ func TestSetupIndexes(t *testing.T) {
 		},
 		"kubeflow.org/mpijob is disabled in the configAPI": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("alpha-wl", testNamespace).
+				*utiltestingapi.MakeWorkload("alpha-wl", testNamespace).
 					ControllerReference(kfmpi.SchemeGroupVersionKind, "alpha", "mpijob").
 					Obj(),
-				*utiltesting.MakeWorkload("beta-wl", testNamespace).
+				*utiltestingapi.MakeWorkload("beta-wl", testNamespace).
 					ControllerReference(kfmpi.SchemeGroupVersionKind, "beta", "mpijob").
 					Obj(),
 			},
diff --git a/pkg/controller/jobs/appwrapper/appwrapper_controller_test.go b/pkg/controller/jobs/appwrapper/appwrapper_controller_test.go
index a310e0ddd..16a19043f 100644
--- a/pkg/controller/jobs/appwrapper/appwrapper_controller_test.go
+++ b/pkg/controller/jobs/appwrapper/appwrapper_controller_test.go
@@ -37,6 +37,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingappwrapper "sigs.k8s.io/kueue/pkg/util/testingjobs/appwrapper"
 	utiltestingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingpytorchjob "sigs.k8s.io/kueue/pkg/util/testingjobs/pytorchjob"
@@ -98,13 +99,13 @@ func TestPodSets(t *testing.T) {
 				Component(testingappwrapper.Component{Template: batchJob}).
 				Obj(),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet("aw-0", 1).
+				*utiltestingapi.MakePodSet("aw-0", 1).
 					PodSpec(pytorchJob.Spec.PyTorchReplicaSpecs[kftraining.PyTorchJobReplicaTypeMaster].Template.Spec).
 					Obj(),
-				*utiltesting.MakePodSet("aw-1", 4).
+				*utiltestingapi.MakePodSet("aw-1", 4).
 					PodSpec(pytorchJob.Spec.PyTorchReplicaSpecs[kftraining.PyTorchJobReplicaTypeWorker].Template.Spec).
 					Obj(),
-				*utiltesting.MakePodSet("aw-2", 2).
+				*utiltestingapi.MakePodSet("aw-2", 2).
 					PodSpec(batchJob.Spec.Template.Spec).
 					Obj(),
 			},
@@ -116,13 +117,13 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet("aw-0", 1).
+				*utiltestingapi.MakePodSet("aw-0", 1).
 					PodSpec(pytorchJobTAS.Spec.PyTorchReplicaSpecs[kftraining.PyTorchJobReplicaTypeMaster].Template.Spec).
 					Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/rack"}).
 					RequiredTopologyRequest("cloud.com/rack").
 					PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 					Obj(),
-				*utiltesting.MakePodSet("aw-1", 4).
+				*utiltestingapi.MakePodSet("aw-1", 4).
 					PodSpec(pytorchJobTAS.Spec.PyTorchReplicaSpecs[kftraining.PyTorchJobReplicaTypeWorker].Template.Spec).
 					Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 					PreferredTopologyRequest("cloud.com/block").
@@ -138,11 +139,11 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet("aw-0", 1).
+				*utiltestingapi.MakePodSet("aw-0", 1).
 					PodSpec(pytorchJobTAS.Spec.PyTorchReplicaSpecs[kftraining.PyTorchJobReplicaTypeMaster].Template.Spec).
 					Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/rack"}).
 					Obj(),
-				*utiltesting.MakePodSet("aw-1", 4).
+				*utiltestingapi.MakePodSet("aw-1", 4).
 					PodSpec(pytorchJobTAS.Spec.PyTorchReplicaSpecs[kftraining.PyTorchJobReplicaTypeWorker].Template.Spec).
 					Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 					Obj(),
@@ -208,9 +209,9 @@ func TestReconciler(t *testing.T) {
 				}).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("aw", "ns").
+				*utiltestingapi.MakeWorkload("aw", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("aw-0", 2).
+						*utiltestingapi.MakePodSet("aw-0", 2).
 							PodIndexLabel(ptr.To("batch.kubernetes.io/job-completion-index")).
 							Obj(),
 					).
@@ -242,10 +243,10 @@ func TestReconciler(t *testing.T) {
 				}).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("aw", "ns").
+				*utiltestingapi.MakeWorkload("aw", "ns").
 					Annotations(map[string]string{controllerconsts.ProvReqAnnotationPrefix + "test-annotation": "test-val"}).
 					PodSets(
-						*utiltesting.MakePodSet("aw-0", 2).
+						*utiltestingapi.MakePodSet("aw-0", 2).
 							PodIndexLabel(ptr.To("batch.kubernetes.io/job-completion-index")).
 							Obj(),
 					).
@@ -276,9 +277,9 @@ func TestReconciler(t *testing.T) {
 
 			"when workload is admitted, job gets node selectors": {
 				flavors: []kueue.ResourceFlavor{
-					*utiltesting.MakeResourceFlavor("default").Obj(),
-					*utiltesting.MakeResourceFlavor("on-demand").NodeLabel("provisioning", "on-demand").Obj(),
-					*utiltesting.MakeResourceFlavor("spot").NodeLabel("provisioning", "spot").Obj(),
+					*utiltestingapi.MakeResourceFlavor("default").Obj(),
+					*utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel("provisioning", "on-demand").Obj(),
+					*utiltestingapi.MakeResourceFlavor("spot").NodeLabel("provisioning", "spot").Obj(),
 				},
 				job: testingappwrapper.MakeAppWrapper("aw", "ns").
 					Component(utiltestingjob.MakeJob("job", "ns").Parallelism(1).Request(corev1.ResourceCPU, "1").SetTypeMeta().Obj()).
@@ -288,13 +289,13 @@ func TestReconciler(t *testing.T) {
 					Queue("foo").
 					Obj(),
 				workloads: []kueue.Workload{
-					*utiltesting.MakeWorkload("a", "ns").
+					*utiltestingapi.MakeWorkload("a", "ns").
 						PodSets(
-							*utiltesting.MakePodSet("aw-0", 1).Request(corev1.ResourceCPU, "1").Obj(),
-							*utiltesting.MakePodSet("aw-1", 1).Request(corev1.ResourceCPU, "1").Obj(),
-							*utiltesting.MakePodSet("aw-2", 1).Request(corev1.ResourceCPU, "1")Obj(),
+							*utiltestingapi.MakePodSet("aw-0", 1).Request(corev1.ResourceCPU, "1").Obj(),
+							*utiltestingapi.MakePodSet("aw-1", 1).Request(corev1.ResourceCPU, "1").Obj(),
+							*utiltestingapi.MakePodSet("aw-2", 1).Request(corev1.ResourceCPU, "1")Obj(),
 						).
-						ReserveQuota(utiltesting.MakeAdmission("cq").
+						ReserveQuota(utiltestingapi.MakeAdmission("cq").
 							PodSets(
 								kueue.PodSetAssignment{
 									Name: "aw-0",
@@ -334,13 +335,13 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 
 				wantWorkloads: []kueue.Workload{
-					*utiltesting.MakeWorkload("a", "ns").
+					*utiltestingapi.MakeWorkload("a", "ns").
 						PodSets(
-							*utiltesting.MakePodSet("aw-0", 1).Request(corev1.ResourceCPU, "1").Obj(),
-							*utiltesting.MakePodSet("aw-1", 1).Request(corev1.ResourceCPU, "1").Obj(),
-							*utiltesting.MakePodSet("aw-2", 1).Request(corev1.ResourceCPU, "1").Obj(),
+							*utiltestingapi.MakePodSet("aw-0", 1).Request(corev1.ResourceCPU, "1").Obj(),
+							*utiltestingapi.MakePodSet("aw-1", 1).Request(corev1.ResourceCPU, "1").Obj(),
+							*utiltestingapi.MakePodSet("aw-2", 1).Request(corev1.ResourceCPU, "1").Obj(),
 						).
-						ReserveQuota(utiltesting.MakeAdmission("cq").
+						ReserveQuota(utiltestingapi.MakeAdmission("cq").
 							PodSets(
 								kueue.PodSetAssignment{
 									Name: "aw-0",
diff --git a/pkg/controller/jobs/deployment/deployment_webhook_test.go b/pkg/controller/jobs/deployment/deployment_webhook_test.go
index 2b983e000..2896c5764 100644
--- a/pkg/controller/jobs/deployment/deployment_webhook_test.go
+++ b/pkg/controller/jobs/deployment/deployment_webhook_test.go
@@ -32,6 +32,7 @@ import (
 	podconstants "sigs.k8s.io/kueue/pkg/controller/jobs/pod/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingdeployment "sigs.k8s.io/kueue/pkg/util/testingjobs/deployment"
 )
 
@@ -154,7 +155,7 @@ func TestDefault(t *testing.T) {
 			cqCache := schdcache.New(client)
 			queueManager := qcache.NewManager(client, cqCache)
 			if tc.defaultLqExist {
-				if err := queueManager.AddLocalQueue(ctx, utiltesting.MakeLocalQueue("default", "default").
+				if err := queueManager.AddLocalQueue(ctx, utiltestingapi.MakeLocalQueue("default", "default").
 					ClusterQueue("cluster-queue").
 					Obj()); err != nil {
 					t.Fatalf("failed to create default local queue: %s", err)
diff --git a/pkg/controller/jobs/job/job_controller_test.go b/pkg/controller/jobs/job/job_controller_test.go
index a0a71cbf7..60cbb57ec 100644
--- a/pkg/controller/jobs/job/job_controller_test.go
+++ b/pkg/controller/jobs/job/job_controller_test.go
@@ -44,6 +44,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/podset"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	utiltestingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
@@ -340,7 +341,7 @@ func TestPodSets(t *testing.T) {
 		"no partial admission": {
 			job: (*Job)(jobTemplate.Clone().Parallelism(3).Obj()),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					PodSpec(*jobTemplate.Clone().Spec.Template.Spec.DeepCopy()).
 					Obj(),
 			},
@@ -354,7 +355,7 @@ func TestPodSets(t *testing.T) {
 					Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					PodSpec(*jobTemplate.Clone().Spec.Template.Spec.DeepCopy()).
 					SetMinimumCount(2).
 					Obj(),
@@ -369,7 +370,7 @@ func TestPodSets(t *testing.T) {
 					Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					PodSpec(jobTemplate.Clone().Spec.Template.Spec).
 					Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block"}).
 					RequiredTopologyRequest("cloud.com/block").
@@ -386,7 +387,7 @@ func TestPodSets(t *testing.T) {
 					Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					PodSpec(jobTemplate.Clone().Spec.Template.Spec).
 					Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 					PreferredTopologyRequest("cloud.com/block").
@@ -404,7 +405,7 @@ func TestPodSets(t *testing.T) {
 					Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					PodSpec(jobTemplate.Clone().Spec.Template.Spec).
 					Annotations(map[string]string{
 						kueue.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
@@ -426,7 +427,7 @@ func TestPodSets(t *testing.T) {
 					Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					PodSpec(jobTemplate.Clone().Spec.Template.Spec).
 					Annotations(map[string]string{
 						kueue.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
@@ -444,7 +445,7 @@ func TestPodSets(t *testing.T) {
 					Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					PodSpec(jobTemplate.Clone().Spec.Template.Spec).
 					Annotations(map[string]string{
 						kueue.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
@@ -462,7 +463,7 @@ func TestPodSets(t *testing.T) {
 					Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					PodSpec(jobTemplate.Clone().Spec.Template.Spec).
 					Annotations(map[string]string{
 						kueue.PodSetSliceSizeAnnotation: "1",
@@ -480,7 +481,7 @@ func TestPodSets(t *testing.T) {
 					Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					PodSpec(jobTemplate.Clone().Spec.Template.Spec).
 					Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 					Obj(),
@@ -495,7 +496,7 @@ func TestPodSets(t *testing.T) {
 					Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					PodSpec(jobTemplate.Clone().Spec.Template.Spec).
 					Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block"}).
 					Obj(),
@@ -568,15 +569,15 @@ func TestReconciler(t *testing.T) {
 		Request(corev1.ResourceCPU, "1").
 		Image("", nil)
 
-	baseWorkloadWrapper := utiltesting.MakeWorkload("wl", "ns").
+	baseWorkloadWrapper := utiltestingapi.MakeWorkload("wl", "ns").
 		Finalizers(kueue.ResourceInUseFinalizerName).
-		PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
-		ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Count(10).Obj()).Obj())
+		PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+		ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Count(10).Obj()).Obj())
 
-	baseWPCWrapper := utiltesting.MakeWorkloadPriorityClass("test-wpc").
+	baseWPCWrapper := utiltestingapi.MakeWorkloadPriorityClass("test-wpc").
 		PriorityValue(100)
 
-	highWPCWrapper := utiltesting.MakeWorkloadPriorityClass("test-wpc-high").
+	highWPCWrapper := utiltestingapi.MakeWorkloadPriorityClass("test-wpc-high").
 		PriorityValue(200)
 
 	basePCWrapper := utiltesting.MakePriorityClass("test-pc").
@@ -962,10 +963,10 @@ func TestReconciler(t *testing.T) {
 				Suspend(true).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					Annotations(map[string]string{controllerconsts.ProvReqAnnotationPrefix + "test-annotation": "test-val"}).
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("foo").
 					Priority(0).
 					Labels(map[string]string{controllerconsts.JobUIDLabel: "test-uid"}).
@@ -997,9 +998,9 @@ func TestReconciler(t *testing.T) {
 				jobframework.WithLabelKeysToCopy([]string{"toCopyKey", "redundantToCopyKey"}),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("foo").
 					Priority(0).
 					Labels(map[string]string{
@@ -2464,7 +2465,7 @@ func TestReconciler(t *testing.T) {
 			wantJob: *baseJobWrapper.DeepCopy(),
 			workloads: []kueue.Workload{
 				*baseWorkloadWrapper.Clone().
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -2486,16 +2487,16 @@ func TestReconciler(t *testing.T) {
 			job:     *baseJobWrapper.DeepCopy(),
 			wantJob: *baseJobWrapper.DeepCopy(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
+				*utiltestingapi.MakeWorkload("a", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()).
 					Priority(0).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
+				*utiltestingapi.MakeWorkload("a", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("foo").
 					Priority(0).
 					Obj(),
@@ -2524,23 +2525,23 @@ func TestReconciler(t *testing.T) {
 				PodLabel(controllerconsts.PodSetLabel, string(kueue.DefaultPodSetName)).
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
+				*utiltestingapi.MakeWorkload("a", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Count(8).Obj()).Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Count(8).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
+				*utiltestingapi.MakeWorkload("a", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).
 							SetMinimumCount(5).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Count(8).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Count(8).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -2566,15 +2567,15 @@ func TestReconciler(t *testing.T) {
 				SetAnnotation(JobMinParallelismAnnotation, "5").
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
+				*utiltestingapi.MakeWorkload("a", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).
 							SetMinimumCount(5).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Count(8).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Count(8).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -2607,9 +2608,9 @@ func TestReconciler(t *testing.T) {
 				UID("test-uid").
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					Priority(0).
 					Labels(map[string]string{
@@ -2645,9 +2646,9 @@ func TestReconciler(t *testing.T) {
 				UID("test-uid").
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					Priority(0).
 					Labels(map[string]string{
@@ -2656,9 +2657,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue-new").
 					Priority(0).
 					Labels(map[string]string{
@@ -2683,9 +2684,9 @@ func TestReconciler(t *testing.T) {
 				baseWPCWrapper.Obj(), highWPCWrapper.Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("foo").
 					Priority(baseWPCWrapper.Value).
 					PriorityClassSource(constants.WorkloadPriorityClassSource).
@@ -2696,9 +2697,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("foo").
 					Priority(highWPCWrapper.Value).
 					PriorityClassSource(constants.WorkloadPriorityClassSource).
@@ -2730,9 +2731,9 @@ func TestReconciler(t *testing.T) {
 				UID(strings.Repeat("long-uid", 8)).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					Priority(0).
 					Labels(map[string]string{}).
@@ -2808,17 +2809,17 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Count(10).Obj()).Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Count(10).Obj()).Obj()).
 					Admitted(true).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "parent", "parent-uid").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Count(10).Obj()).Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Count(10).Obj()).Obj()).
 					Admitted(true).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "parent", "parent-uid").
 					Obj(),
@@ -2845,16 +2846,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("parent-workload", "ns").
+				*utiltestingapi.MakeWorkload("parent-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "parent", "parent-uid").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("parent-workload", "ns").
+				*utiltestingapi.MakeWorkload("parent-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "parent", "parent-uid").
 					Obj(),
 			},
@@ -2887,19 +2888,19 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("parent-workload", "ns").
+				*utiltestingapi.MakeWorkload("parent-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Count(10).Obj()).Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Count(10).Obj()).Obj()).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "parent", "parent-uid").
 					Admitted(true).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("parent-workload", "ns").
+				*utiltestingapi.MakeWorkload("parent-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Count(10).Obj()).Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Count(10).Obj()).Obj()).
 					ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "parent", "parent-uid").
 					Admitted(true).
 					Obj(),
@@ -2921,22 +2922,22 @@ func TestReconciler(t *testing.T) {
 				Parallelism(5).
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("first-workload", "ns").
+				*utiltestingapi.MakeWorkload("first-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("cq").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).
 					Admitted(true).
 					Obj(),
-				*utiltesting.MakeWorkload("second-workload", "ns").
+				*utiltestingapi.MakeWorkload("second-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).SetMinimumCount(5).Request(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("first-workload", "ns").
+				*utiltestingapi.MakeWorkload("first-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("cq").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -3092,9 +3093,9 @@ func TestReconciler(t *testing.T) {
 		"when the workload is finished, its finalizer is removed": {
 			job: *baseJobWrapper.Clone().Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
+				*utiltestingapi.MakeWorkload("a", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadFinished,
 						Status: metav1.ConditionTrue,
@@ -3103,8 +3104,8 @@ func TestReconciler(t *testing.T) {
 			},
 			wantJob: *baseJobWrapper.Clone().Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("a", "ns").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadFinished,
 						Status: metav1.ConditionTrue,
@@ -3138,9 +3139,9 @@ func TestReconciler(t *testing.T) {
 				WorkloadPriorityClass("test-wpc").
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					PriorityClass("test-wpc").
 					Priority(100).
@@ -3183,9 +3184,9 @@ func TestReconciler(t *testing.T) {
 				PriorityClass("test-pc").
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
 					Queue("test-queue").
 					PriorityClass("test-pc").
 					Priority(200).
@@ -3230,9 +3231,9 @@ func TestReconciler(t *testing.T) {
 				PriorityClass("test-pc").
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
 					Queue("test-queue").
 					PriorityClass("test-wpc").
 					Priority(100).
@@ -3302,9 +3303,9 @@ func TestReconciler(t *testing.T) {
 				UID("test-uid").
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("prebuilt-workload", "ns").
+				*utiltestingapi.MakeWorkload("prebuilt-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
 					Queue("test-queue").
 					PriorityClass("test-wpc").
 					Priority(100).
@@ -3312,9 +3313,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("prebuilt-workload", "ns").
+				*utiltestingapi.MakeWorkload("prebuilt-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
 					Queue("test-queue").
 					PriorityClass("test-wpc").
 					Priority(100).
@@ -3347,9 +3348,9 @@ func TestReconciler(t *testing.T) {
 				UID("test-uid").
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("prebuilt-workload", "ns").
+				*utiltestingapi.MakeWorkload("prebuilt-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
 					Queue("test-queue").
 					PriorityClass("test-wpc").
 					Priority(100).
@@ -3358,9 +3359,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("prebuilt-workload", "ns").
+				*utiltestingapi.MakeWorkload("prebuilt-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
 					Queue("test-queue").
 					PriorityClass("test-wpc").
 					Priority(100).
@@ -3391,9 +3392,9 @@ func TestReconciler(t *testing.T) {
 				UID("test-uid").
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("prebuilt-workload", "ns").
+				*utiltestingapi.MakeWorkload("prebuilt-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
 					Queue("test-queue").
 					PriorityClass("test-wpc").
 					Priority(100).
@@ -3401,9 +3402,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("prebuilt-workload", "ns").
+				*utiltestingapi.MakeWorkload("prebuilt-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").PriorityClass("test-pc").Obj()).
 					Queue("test-queue").
 					PriorityClass("test-wpc").
 					Priority(100).
@@ -3444,11 +3445,11 @@ func TestReconciler(t *testing.T) {
 			}).NodeSelector("node-label", "value").
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadNameForJob(baseJobWrapper.Name, baseJobWrapper.GetUID()), "ns").
+				*utiltestingapi.MakeWorkload(GetWorkloadNameForJob(baseJobWrapper.Name, baseJobWrapper.GetUID()), "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					Queue("foo").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).
 							Toleration(corev1.Toleration{
 								Key:      "tolerationkey1",
 								Operator: corev1.TolerationOpExists,
@@ -3465,11 +3466,11 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadNameForJob(baseJobWrapper.Name, baseJobWrapper.GetUID()), "ns").
+				*utiltestingapi.MakeWorkload(GetWorkloadNameForJob(baseJobWrapper.Name, baseJobWrapper.GetUID()), "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					Queue("foo").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).
 							Toleration(corev1.Toleration{
 								Key:      "tolerationkey2",
 								Operator: corev1.TolerationOpExists,
@@ -3510,11 +3511,11 @@ func TestReconciler(t *testing.T) {
 				Suspend(false).
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadNameForJob(baseJobWrapper.Name, baseJobWrapper.GetUID()), "ns").
+				*utiltestingapi.MakeWorkload(GetWorkloadNameForJob(baseJobWrapper.Name, baseJobWrapper.GetUID()), "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					Queue("foo").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).
 							Toleration(corev1.Toleration{
 								Key:      "tolerationkey1",
 								Operator: corev1.TolerationOpExists,
@@ -3528,7 +3529,7 @@ func TestReconciler(t *testing.T) {
 						controllerconsts.JobUIDLabel: "",
 					}).
 					Priority(0).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(kueue.PodSetAssignment{
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(kueue.PodSetAssignment{
 						Name: kueue.DefaultPodSetName,
 						Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
 							corev1.ResourceCPU: "default",
@@ -3539,11 +3540,11 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadNameForJob(baseJobWrapper.Name, baseJobWrapper.GetUID()), "ns").
+				*utiltestingapi.MakeWorkload(GetWorkloadNameForJob(baseJobWrapper.Name, baseJobWrapper.GetUID()), "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					Queue("foo").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).
 							Toleration(corev1.Toleration{
 								Key:      "tolerationkey1",
 								Operator: corev1.TolerationOpExists,
@@ -3557,7 +3558,7 @@ func TestReconciler(t *testing.T) {
 						controllerconsts.JobUIDLabel: "",
 					}).
 					Priority(0).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(kueue.PodSetAssignment{
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(kueue.PodSetAssignment{
 						Name: kueue.DefaultPodSetName,
 						Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
 							corev1.ResourceCPU: "default",
@@ -3582,11 +3583,11 @@ func TestReconciler(t *testing.T) {
 				Effect:   corev1.TaintEffectNoSchedule,
 			}).Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadNameForJob(baseJobWrapper.Name, baseJobWrapper.GetUID()), "ns").
+				*utiltestingapi.MakeWorkload(GetWorkloadNameForJob(baseJobWrapper.Name, baseJobWrapper.GetUID()), "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					Queue("foo").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).
 							Toleration(corev1.Toleration{
 								Key:      "tolerationkey1",
 								Operator: corev1.TolerationOpExists,
@@ -3599,7 +3600,7 @@ func TestReconciler(t *testing.T) {
 						controllerconsts.JobUIDLabel: "",
 					}).
 					Priority(0).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(kueue.PodSetAssignment{
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(kueue.PodSetAssignment{
 						Name: kueue.DefaultPodSetName,
 						Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
 							corev1.ResourceCPU: "default",
@@ -3736,10 +3737,10 @@ func TestReconciler(t *testing.T) {
 				Label(controllerconsts.MaxExecTimeSecondsLabel, "10").
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					MaximumExecutionTimeSeconds(10).
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("foo").
 					Priority(0).
 					Labels(map[string]string{controllerconsts.JobUIDLabel: string(baseJobWrapper.GetUID())}).
@@ -3762,20 +3763,20 @@ func TestReconciler(t *testing.T) {
 				Label(controllerconsts.MaxExecTimeSecondsLabel, "10").
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					MaximumExecutionTimeSeconds(5).
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("foo").
 					Priority(0).
 					Labels(map[string]string{controllerconsts.JobUIDLabel: string(baseJobWrapper.GetUID())}).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").
+				*utiltestingapi.MakeWorkload("job", "ns").
 					MaximumExecutionTimeSeconds(10).
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("foo").
 					Priority(0).
 					Labels(map[string]string{controllerconsts.JobUIDLabel: string(baseJobWrapper.GetUID())}).
@@ -3834,14 +3835,14 @@ func TestReconciler(t *testing.T) {
 				Image("", nil).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "labelled-ns").
+				*utiltestingapi.MakeWorkload("job", "labelled-ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					Queue("test-queue").
 					Priority(0).
 					Labels(map[string]string{
 						controllerconsts.JobUIDLabel: "test-uid",
 					}).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 10).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
@@ -3875,7 +3876,7 @@ func TestReconciler(t *testing.T) {
 					Label("managed-by-kueue", "true").
 					Obj()
 
-				objs := append(tc.priorityClasses, &tc.job, utiltesting.MakeResourceFlavor("default").Obj(), testNamespace, labelledNamespace)
+				objs := append(tc.priorityClasses, &tc.job, utiltestingapi.MakeResourceFlavor("default").Obj(), testNamespace, labelledNamespace)
 				kcBuilder := clientBuilder.
 					WithObjects(objs...)
 
diff --git a/pkg/controller/jobs/job/job_webhook_test.go b/pkg/controller/jobs/job/job_webhook_test.go
index 2242eaf80..c47a780d1 100644
--- a/pkg/controller/jobs/job/job_webhook_test.go
+++ b/pkg/controller/jobs/job/job_webhook_test.go
@@ -40,6 +40,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingutil "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingmpijob "sigs.k8s.io/kueue/pkg/util/testingjobs/mpijob"
 	"sigs.k8s.io/kueue/pkg/workloadslicing"
@@ -54,12 +55,10 @@ const (
 )
 
 var (
-	annotationsPath               = field.NewPath("metadata", "annotations")
 	labelsPath                    = field.NewPath("metadata", "labels")
 	queueNameLabelPath            = labelsPath.Key(constants.QueueLabel)
 	prebuiltWlNameLabelPath       = labelsPath.Key(constants.PrebuiltWorkloadLabel)
 	maxExecTimeLabelPath          = labelsPath.Key(constants.MaxExecTimeSecondsLabel)
-	queueNameAnnotationsPath      = annotationsPath.Key(constants.QueueAnnotation)
 	workloadPriorityClassNamePath = labelsPath.Key(constants.WorkloadPriorityClassLabel)
 )
 
@@ -81,11 +80,6 @@ func TestValidateCreate(t *testing.T) {
 			job:                testingutil.MakeJob("job", "default").Queue("queue name").Obj(),
 			wantValidationErrs: field.ErrorList{field.Invalid(queueNameLabelPath, "queue name", invalidRFC1123Message)},
 		},
-		{
-			name:               "invalid queue-name annotation (deprecated)",
-			job:                testingutil.MakeJob("job", "default").QueueNameAnnotation("queue name").Obj(),
-			wantValidationErrs: field.ErrorList{field.Invalid(queueNameAnnotationsPath, "queue name", invalidRFC1123Message)},
-		},
 		{
 			name: "invalid partial admission annotation (format)",
 			job: testingutil.MakeJob("job", "default").
@@ -742,16 +736,16 @@ func TestDefault(t *testing.T) {
 				Suspend(false).
 				Obj(),
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("admission-check").
 					Obj(),
 			},
-			admissionCheck: utiltesting.MakeAdmissionCheck("admission-check").
+			admissionCheck: utiltestingapi.MakeAdmissionCheck("admission-check").
 				ControllerName(kueue.MultiKueueControllerName).
 				Active(metav1.ConditionTrue).
 				Obj(),
@@ -769,16 +763,16 @@ func TestDefault(t *testing.T) {
 				Suspend(false).
 				Obj(),
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("admission-check").
 					Obj(),
 			},
-			admissionCheck: utiltesting.MakeAdmissionCheck("admission-check").
+			admissionCheck: utiltestingapi.MakeAdmissionCheck("admission-check").
 				ControllerName(kueue.MultiKueueControllerName).
 				Active(metav1.ConditionTrue).
 				Obj(),
@@ -865,7 +859,7 @@ func TestDefault(t *testing.T) {
 			cqCache := schdcache.New(cl)
 			queueManager := qcache.NewManager(cl, cqCache)
 			if tc.defaultLqExist {
-				if err := queueManager.AddLocalQueue(ctx, utiltesting.MakeLocalQueue("default", "default").
+				if err := queueManager.AddLocalQueue(ctx, utiltestingapi.MakeLocalQueue("default", "default").
 					ClusterQueue("cluster-queue").Obj()); err != nil {
 					t.Fatalf("failed to create default local queue: %s", err)
 				}
diff --git a/pkg/controller/jobs/jobset/jobset_controller_test.go b/pkg/controller/jobs/jobset/jobset_controller_test.go
index fb1d1837b..25bc02140 100644
--- a/pkg/controller/jobs/jobset/jobset_controller_test.go
+++ b/pkg/controller/jobs/jobset/jobset_controller_test.go
@@ -37,6 +37,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjobset "sigs.k8s.io/kueue/pkg/util/testingjobs/jobset"
 )
 
@@ -219,10 +220,10 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(jobSet *JobSet) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[0].Name), 2).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[0].Name), 2).
 						PodSpec(*jobSet.Spec.ReplicatedJobs[0].Template.Spec.Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[1].Name), 6).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[1].Name), 6).
 						PodSpec(*jobSet.Spec.ReplicatedJobs[1].Template.Spec.Template.Spec.DeepCopy()).
 						Obj(),
 				}
@@ -246,7 +247,7 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(jobSet *JobSet) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[0].Name), 2).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[0].Name), 2).
 						PodSpec(*jobSet.Spec.ReplicatedJobs[0].Template.Spec.Template.Spec.DeepCopy()).
 						Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block"}).
 						RequiredTopologyRequest("cloud.com/block").
@@ -254,7 +255,7 @@ func TestPodSets(t *testing.T) {
 						SubGroupIndexLabel(ptr.To(jobset.JobIndexKey)).
 						SubGroupCount(ptr.To[int32](2)).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[1].Name), 6).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[1].Name), 6).
 						PodSpec(*jobSet.Spec.ReplicatedJobs[1].Template.Spec.Template.Spec.DeepCopy()).
 						PodIndexLabel(ptr.To(batchv1.JobCompletionIndexAnnotation)).
 						SubGroupIndexLabel(ptr.To(jobset.JobIndexKey)).
@@ -281,13 +282,13 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(jobSet *JobSet) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[0].Name), 2).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[0].Name), 2).
 						PodSpec(*jobSet.Spec.ReplicatedJobs[0].Template.Spec.Template.Spec.DeepCopy()).
 						PodIndexLabel(ptr.To(batchv1.JobCompletionIndexAnnotation)).
 						SubGroupIndexLabel(ptr.To(jobset.JobIndexKey)).
 						SubGroupCount(ptr.To[int32](2)).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[1].Name), 6).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[1].Name), 6).
 						PodSpec(*jobSet.Spec.ReplicatedJobs[1].Template.Spec.Template.Spec.DeepCopy()).
 						Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 						PreferredTopologyRequest("cloud.com/block").
@@ -325,14 +326,14 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(jobSet *JobSet) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[0].Name), 2).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[0].Name), 2).
 						PodSpec(*jobSet.Spec.ReplicatedJobs[0].Template.Spec.Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[1].Name), 2).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[1].Name), 2).
 						PodSpec(*jobSet.Spec.ReplicatedJobs[1].Template.Spec.Template.Spec.DeepCopy()).
 						Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block"}).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[2].Name), 6).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(jobSet.Spec.ReplicatedJobs[2].Name), 6).
 						PodSpec(*jobSet.Spec.ReplicatedJobs[2].Template.Spec.Template.Spec.DeepCopy()).
 						Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 						Obj(),
@@ -372,7 +373,7 @@ var (
 )
 
 func TestReconciler(t *testing.T) {
-	baseWPCWrapper := utiltesting.MakeWorkloadPriorityClass("test-wpc").
+	baseWPCWrapper := utiltestingapi.MakeWorkloadPriorityClass("test-wpc").
 		PriorityValue(100)
 	basePCWrapper := utiltesting.MakePriorityClass("test-pc").
 		PriorityValue(200)
@@ -429,15 +430,15 @@ func TestReconciler(t *testing.T) {
 				}).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("jobset", "ns").
+				*utiltestingapi.MakeWorkload("jobset", "ns").
 					Annotations(map[string]string{controllerconsts.ProvReqAnnotationPrefix + "test-annotation": "test-val"}).
 					PodSets(
-						*utiltesting.MakePodSet("replicated-job-1", 1).
+						*utiltestingapi.MakePodSet("replicated-job-1", 1).
 							PodIndexLabel(ptr.To("batch.kubernetes.io/job-completion-index")).
 							SubGroupIndexLabel(ptr.To(jobset.JobIndexKey)).
 							SubGroupCount(ptr.To[int32](1)).
 							Obj(),
-						*utiltesting.MakePodSet("replicated-job-2", 4).
+						*utiltestingapi.MakePodSet("replicated-job-2", 4).
 							PodIndexLabel(ptr.To("batch.kubernetes.io/job-completion-index")).
 							SubGroupIndexLabel(ptr.To(jobset.JobIndexKey)).
 							SubGroupCount(ptr.To[int32](2)).
@@ -471,12 +472,12 @@ func TestReconciler(t *testing.T) {
 				},
 			).WorkloadPriorityClass("test-wpc").Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("jobset", "ns").
+				*utiltestingapi.MakeWorkload("jobset", "ns").
 					PriorityClass("test-wpc").
 					Priority(100).
 					PriorityClassSource(constants.WorkloadPriorityClassSource).
 					PodSets(
-						*utiltesting.MakePodSet("replicated-job-1", 1).
+						*utiltestingapi.MakePodSet("replicated-job-1", 1).
 							PodIndexLabel(ptr.To("batch.kubernetes.io/job-completion-index")).
 							SubGroupIndexLabel(ptr.To(jobset.JobIndexKey)).
 							SubGroupCount(ptr.To[int32](1)).
@@ -510,12 +511,12 @@ func TestReconciler(t *testing.T) {
 				},
 			).PriorityClass("test-pc").Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("jobset", "ns").
+				*utiltestingapi.MakeWorkload("jobset", "ns").
 					PriorityClass("test-pc").
 					Priority(200).
 					PriorityClassSource(constants.PodPriorityClassSource).
 					PodSets(
-						*utiltesting.MakePodSet("replicated-job-1", 1).
+						*utiltestingapi.MakePodSet("replicated-job-1", 1).
 							PodIndexLabel(ptr.To("batch.kubernetes.io/job-completion-index")).
 							SubGroupIndexLabel(ptr.To(jobset.JobIndexKey)).
 							SubGroupCount(ptr.To[int32](1)).
@@ -549,12 +550,12 @@ func TestReconciler(t *testing.T) {
 				},
 			).PriorityClass("test-pc").WorkloadPriorityClass("test-wpc").Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("jobset", "ns").
+				*utiltestingapi.MakeWorkload("jobset", "ns").
 					PriorityClass("test-wpc").
 					Priority(100).
 					PriorityClassSource(constants.WorkloadPriorityClassSource).
 					PodSets(
-						*utiltesting.MakePodSet("replicated-job-1", 1).
+						*utiltestingapi.MakePodSet("replicated-job-1", 1).
 							PodIndexLabel(ptr.To("batch.kubernetes.io/job-completion-index")).
 							SubGroupIndexLabel(ptr.To(jobset.JobIndexKey)).
 							SubGroupCount(ptr.To[int32](1)).
diff --git a/pkg/controller/jobs/jobset/jobset_webhook_test.go b/pkg/controller/jobs/jobset/jobset_webhook_test.go
index 8c2158b2c..30c482110 100644
--- a/pkg/controller/jobs/jobset/jobset_webhook_test.go
+++ b/pkg/controller/jobs/jobset/jobset_webhook_test.go
@@ -33,6 +33,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingutil "sigs.k8s.io/kueue/pkg/util/testingjobs/jobset"
 )
 
@@ -378,16 +379,16 @@ func TestDefault(t *testing.T) {
 				},
 			},
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("admission-check").
 					Obj(),
 			},
-			admissionCheck: utiltesting.MakeAdmissionCheck("admission-check").
+			admissionCheck: utiltestingapi.MakeAdmissionCheck("admission-check").
 				ControllerName(kueue.MultiKueueControllerName).
 				Active(metav1.ConditionTrue).
 				Obj(),
@@ -405,16 +406,16 @@ func TestDefault(t *testing.T) {
 				},
 			},
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("admission-check").
 					Obj(),
 			},
-			admissionCheck: utiltesting.MakeAdmissionCheck("admission-check").
+			admissionCheck: utiltestingapi.MakeAdmissionCheck("admission-check").
 				ControllerName(kueue.MultiKueueControllerName).
 				Active(metav1.ConditionTrue).
 				Obj(),
@@ -462,12 +463,12 @@ func TestDefault(t *testing.T) {
 				},
 			},
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("non-existent-admission-check").
 					Obj(),
 			},
@@ -485,16 +486,16 @@ func TestDefault(t *testing.T) {
 				},
 			},
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("admission-check").
 					Obj(),
 			},
-			admissionCheck: utiltesting.MakeAdmissionCheck("admission-check").
+			admissionCheck: utiltestingapi.MakeAdmissionCheck("admission-check").
 				ControllerName(kueue.MultiKueueControllerName).
 				Active(metav1.ConditionTrue).
 				Obj(),
@@ -515,16 +516,16 @@ func TestDefault(t *testing.T) {
 				},
 			},
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("admission-check").
 					Obj(),
 			},
-			admissionCheck: utiltesting.MakeAdmissionCheck("admission-check").
+			admissionCheck: utiltestingapi.MakeAdmissionCheck("admission-check").
 				ControllerName(kueue.MultiKueueControllerName).
 				Active(metav1.ConditionTrue).
 				Obj(),
@@ -542,12 +543,12 @@ func TestDefault(t *testing.T) {
 				},
 			},
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					Obj(),
 			},
 			multiKueueEnabled: true,
@@ -589,7 +590,7 @@ func TestDefault(t *testing.T) {
 			queueManager := qcache.NewManager(cl, cqCache)
 
 			if tc.defaultLqExist {
-				if err := queueManager.AddLocalQueue(ctx, utiltesting.MakeLocalQueue("default", "default").
+				if err := queueManager.AddLocalQueue(ctx, utiltestingapi.MakeLocalQueue("default", "default").
 					ClusterQueue("cluster-queue").Obj()); err != nil {
 					t.Fatalf("failed to create default local queue: %s", err)
 				}
diff --git a/pkg/controller/jobs/kubeflow/jobs/jaxjob/jaxjob_controller_test.go b/pkg/controller/jobs/kubeflow/jobs/jaxjob/jaxjob_controller_test.go
index 535927eeb..f8c684a0e 100644
--- a/pkg/controller/jobs/kubeflow/jobs/jaxjob/jaxjob_controller_test.go
+++ b/pkg/controller/jobs/kubeflow/jobs/jaxjob/jaxjob_controller_test.go
@@ -29,6 +29,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingJAXjob "sigs.k8s.io/kueue/pkg/util/testingjobs/jaxjob"
 )
 
@@ -125,7 +126,7 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.JAXJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.JAXJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.JAXJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.JAXReplicaSpecs[kftraining.JAXJobReplicaTypeWorker].Template.Spec).
 						PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 						Obj(),
@@ -146,7 +147,7 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.JAXJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.JAXJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.JAXJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.JAXReplicaSpecs[kftraining.JAXJobReplicaTypeWorker].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 						PreferredTopologyRequest("cloud.com/block").
diff --git a/pkg/controller/jobs/kubeflow/jobs/paddlejob/paddlejob_controller_test.go b/pkg/controller/jobs/kubeflow/jobs/paddlejob/paddlejob_controller_test.go
index 194e4d627..4febc6242 100644
--- a/pkg/controller/jobs/kubeflow/jobs/paddlejob/paddlejob_controller_test.go
+++ b/pkg/controller/jobs/kubeflow/jobs/paddlejob/paddlejob_controller_test.go
@@ -37,6 +37,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingpaddlejob "sigs.k8s.io/kueue/pkg/util/testingjobs/paddlejob"
 )
 
@@ -253,10 +254,10 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.PaddleJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.PaddleJobReplicaTypeMaster)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.PaddleJobReplicaTypeMaster)), 1).
 						PodSpec(job.Spec.PaddleReplicaSpecs[kftraining.PaddleJobReplicaTypeMaster].Template.Spec).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.PaddleJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.PaddleJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.PaddleReplicaSpecs[kftraining.PaddleJobReplicaTypeWorker].Template.Spec).
 						Obj(),
 				}
@@ -284,13 +285,13 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.PaddleJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.PaddleJobReplicaTypeMaster)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.PaddleJobReplicaTypeMaster)), 1).
 						PodSpec(job.Spec.PaddleReplicaSpecs[kftraining.PaddleJobReplicaTypeMaster].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/rack"}).
 						RequiredTopologyRequest("cloud.com/rack").
 						PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.PaddleJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.PaddleJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.PaddleReplicaSpecs[kftraining.PaddleJobReplicaTypeWorker].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 						PreferredTopologyRequest("cloud.com/block").
@@ -321,11 +322,11 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.PaddleJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.PaddleJobReplicaTypeMaster)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.PaddleJobReplicaTypeMaster)), 1).
 						PodSpec(job.Spec.PaddleReplicaSpecs[kftraining.PaddleJobReplicaTypeMaster].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/rack"}).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.PaddleJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.PaddleJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.PaddleReplicaSpecs[kftraining.PaddleJobReplicaTypeWorker].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 						Obj(),
@@ -517,12 +518,12 @@ func TestReconciler(t *testing.T) {
 			job:     testingpaddlejob.MakePaddleJob("paddlejob", "ns").PaddleReplicaSpecsDefault().Parallelism(2).Obj(),
 			wantJob: testingpaddlejob.MakePaddleJob("paddlejob", "ns").PaddleReplicaSpecsDefault().Parallelism(2).Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("paddlejob", "ns").
+				*utiltestingapi.MakeWorkload("paddlejob", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("master", 1).
+						*utiltestingapi.MakePodSet("master", 1).
 							PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 							Obj(),
-						*utiltesting.MakePodSet("worker", 2).
+						*utiltestingapi.MakePodSet("worker", 2).
 							PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 							Obj(),
 					).
@@ -552,12 +553,12 @@ func TestReconciler(t *testing.T) {
 				Active(kftraining.PaddleJobReplicaTypeWorker, 10).
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
+				*utiltestingapi.MakeWorkload("a", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("master", 1).Request(corev1.ResourceCPU, "1").Obj(),
-						*utiltesting.MakePodSet("worker", 10).Request(corev1.ResourceCPU, "5").Obj(),
+						*utiltestingapi.MakePodSet("master", 1).Request(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakePodSet("worker", 10).Request(corev1.ResourceCPU, "5").Obj(),
 					).
-					ReserveQuota(utiltesting.MakeAdmission("cq").
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").
 						PodSets(
 							kueue.PodSetAssignment{
 								Name: "master",
@@ -595,12 +596,12 @@ func TestReconciler(t *testing.T) {
 				Active(kftraining.PaddleJobReplicaTypeWorker, 10).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
+				*utiltestingapi.MakeWorkload("a", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("master", 1).Request(corev1.ResourceCPU, "1").Obj(),
-						*utiltesting.MakePodSet("worker", 10).Request(corev1.ResourceCPU, "5").Obj(),
+						*utiltestingapi.MakePodSet("master", 1).Request(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakePodSet("worker", 10).Request(corev1.ResourceCPU, "5").Obj(),
 					).
-					ReserveQuota(utiltesting.MakeAdmission("cq").
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").
 						PodSets(
 							kueue.PodSetAssignment{
 								Name: "master",
@@ -635,7 +636,7 @@ func TestReconciler(t *testing.T) {
 			if err := SetupIndexes(ctx, indexer); err != nil {
 				t.Fatalf("Failed to setup indexes: %v", err)
 			}
-			kcBuilder = kcBuilder.WithObjects(utiltesting.MakeResourceFlavor("default").Obj())
+			kcBuilder = kcBuilder.WithObjects(utiltestingapi.MakeResourceFlavor("default").Obj())
 			kcBuilder = kcBuilder.WithObjects(tc.job, testNamespace)
 			for i := range tc.workloads {
 				kcBuilder = kcBuilder.WithStatusSubresource(&tc.workloads[i])
diff --git a/pkg/controller/jobs/kubeflow/jobs/pytorchjob/pytorchjob_controller_test.go b/pkg/controller/jobs/kubeflow/jobs/pytorchjob/pytorchjob_controller_test.go
index f09f3e8d5..559490812 100644
--- a/pkg/controller/jobs/kubeflow/jobs/pytorchjob/pytorchjob_controller_test.go
+++ b/pkg/controller/jobs/kubeflow/jobs/pytorchjob/pytorchjob_controller_test.go
@@ -28,6 +28,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingpytorchjob "sigs.k8s.io/kueue/pkg/util/testingjobs/pytorchjob"
 )
 
@@ -244,10 +245,10 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.PyTorchJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.PyTorchJobReplicaTypeMaster)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.PyTorchJobReplicaTypeMaster)), 1).
 						PodSpec(job.Spec.PyTorchReplicaSpecs[kftraining.PyTorchJobReplicaTypeMaster].Template.Spec).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.PyTorchJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.PyTorchJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.PyTorchReplicaSpecs[kftraining.PyTorchJobReplicaTypeWorker].Template.Spec).
 						Obj(),
 				}
@@ -275,13 +276,13 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.PyTorchJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.PyTorchJobReplicaTypeMaster)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.PyTorchJobReplicaTypeMaster)), 1).
 						PodSpec(job.Spec.PyTorchReplicaSpecs[kftraining.PyTorchJobReplicaTypeMaster].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/rack"}).
 						RequiredTopologyRequest("cloud.com/rack").
 						PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.PyTorchJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.PyTorchJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.PyTorchReplicaSpecs[kftraining.PyTorchJobReplicaTypeWorker].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 						PreferredTopologyRequest("cloud.com/block").
@@ -312,11 +313,11 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.PyTorchJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.PyTorchJobReplicaTypeMaster)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.PyTorchJobReplicaTypeMaster)), 1).
 						PodSpec(job.Spec.PyTorchReplicaSpecs[kftraining.PyTorchJobReplicaTypeMaster].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/rack"}).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.PyTorchJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.PyTorchJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.PyTorchReplicaSpecs[kftraining.PyTorchJobReplicaTypeWorker].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 						Obj(),
diff --git a/pkg/controller/jobs/kubeflow/jobs/tfjob/tfjob_controller_test.go b/pkg/controller/jobs/kubeflow/jobs/tfjob/tfjob_controller_test.go
index 633fa2c19..1129a4d7d 100644
--- a/pkg/controller/jobs/kubeflow/jobs/tfjob/tfjob_controller_test.go
+++ b/pkg/controller/jobs/kubeflow/jobs/tfjob/tfjob_controller_test.go
@@ -28,6 +28,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingtfjob "sigs.k8s.io/kueue/pkg/util/testingjobs/tfjob"
 )
 
@@ -251,13 +252,13 @@ func TestPodSets(t *testing.T) {
 			job: testingtfjob.MakeTFJob("tfjob", "ns").TFReplicaSpecsDefault().Obj(),
 			wantPodSets: func(job *kftraining.TFJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypeChief)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypeChief)), 1).
 						PodSpec(job.Spec.TFReplicaSpecs[kftraining.TFJobReplicaTypeChief].Template.Spec).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypePS)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypePS)), 1).
 						PodSpec(job.Spec.TFReplicaSpecs[kftraining.TFJobReplicaTypePS].Template.Spec).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.TFReplicaSpecs[kftraining.TFJobReplicaTypeWorker].Template.Spec).
 						Obj(),
 				}
@@ -289,19 +290,19 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.TFJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypeChief)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypeChief)), 1).
 						PodSpec(job.Spec.TFReplicaSpecs[kftraining.TFJobReplicaTypeChief].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/rack"}).
 						RequiredTopologyRequest("cloud.com/rack").
 						PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypePS)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypePS)), 1).
 						PodSpec(job.Spec.TFReplicaSpecs[kftraining.TFJobReplicaTypePS].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 						PreferredTopologyRequest("cloud.com/block").
 						PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.TFReplicaSpecs[kftraining.TFJobReplicaTypeWorker].Template.Spec).
 						PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 						Obj(),
@@ -334,15 +335,15 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.TFJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypeChief)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypeChief)), 1).
 						PodSpec(job.Spec.TFReplicaSpecs[kftraining.TFJobReplicaTypeChief].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/rack"}).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypePS)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypePS)), 1).
 						PodSpec(job.Spec.TFReplicaSpecs[kftraining.TFJobReplicaTypePS].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.TFJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.TFReplicaSpecs[kftraining.TFJobReplicaTypeWorker].Template.Spec).
 						Obj(),
 				}
diff --git a/pkg/controller/jobs/kubeflow/jobs/xgboostjob/xgboostjob_controller_test.go b/pkg/controller/jobs/kubeflow/jobs/xgboostjob/xgboostjob_controller_test.go
index 21aa83ed4..cec60528d 100644
--- a/pkg/controller/jobs/kubeflow/jobs/xgboostjob/xgboostjob_controller_test.go
+++ b/pkg/controller/jobs/kubeflow/jobs/xgboostjob/xgboostjob_controller_test.go
@@ -37,6 +37,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingxgboostjob "sigs.k8s.io/kueue/pkg/util/testingjobs/xgboostjob"
 )
 
@@ -251,10 +252,10 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.XGBoostJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.XGBoostJobReplicaTypeMaster)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.XGBoostJobReplicaTypeMaster)), 1).
 						PodSpec(job.Spec.XGBReplicaSpecs[kftraining.XGBoostJobReplicaTypeMaster].Template.Spec).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.XGBoostJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.XGBoostJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.XGBReplicaSpecs[kftraining.XGBoostJobReplicaTypeWorker].Template.Spec).
 						Obj(),
 				}
@@ -282,13 +283,13 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.XGBoostJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.XGBoostJobReplicaTypeMaster)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.XGBoostJobReplicaTypeMaster)), 1).
 						PodSpec(job.Spec.XGBReplicaSpecs[kftraining.XGBoostJobReplicaTypeMaster].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/rack"}).
 						RequiredTopologyRequest("cloud.com/rack").
 						PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.XGBoostJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.XGBoostJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.XGBReplicaSpecs[kftraining.XGBoostJobReplicaTypeWorker].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 						PreferredTopologyRequest("cloud.com/block").
@@ -319,11 +320,11 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			wantPodSets: func(job *kftraining.XGBoostJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.XGBoostJobReplicaTypeMaster)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.XGBoostJobReplicaTypeMaster)), 1).
 						PodSpec(job.Spec.XGBReplicaSpecs[kftraining.XGBoostJobReplicaTypeMaster].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/rack"}).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kftraining.XGBoostJobReplicaTypeWorker)), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kftraining.XGBoostJobReplicaTypeWorker)), 1).
 						PodSpec(job.Spec.XGBReplicaSpecs[kftraining.XGBoostJobReplicaTypeWorker].Template.Spec).
 						Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 						Obj(),
@@ -526,12 +527,12 @@ func TestReconciler(t *testing.T) {
 			job:     testingxgboostjob.MakeXGBoostJob("xgboostjob", "ns").XGBReplicaSpecsDefault().Parallelism(2).Obj(),
 			wantJob: testingxgboostjob.MakeXGBoostJob("xgboostjob", "ns").XGBReplicaSpecsDefault().Parallelism(2).Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("xgboostjob", "ns").
+				*utiltestingapi.MakeWorkload("xgboostjob", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("master", 1).
+						*utiltestingapi.MakePodSet("master", 1).
 							PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 							Obj(),
-						*utiltesting.MakePodSet("worker", 2).
+						*utiltestingapi.MakePodSet("worker", 2).
 							PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 							Obj(),
 					).
@@ -561,12 +562,12 @@ func TestReconciler(t *testing.T) {
 				Active(kftraining.XGBoostJobReplicaTypeWorker, 10).
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
+				*utiltestingapi.MakeWorkload("a", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("master", 1).Request(corev1.ResourceCPU, "1").Obj(),
-						*utiltesting.MakePodSet("worker", 10).Request(corev1.ResourceCPU, "5").Obj(),
+						*utiltestingapi.MakePodSet("master", 1).Request(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakePodSet("worker", 10).Request(corev1.ResourceCPU, "5").Obj(),
 					).
-					ReserveQuota(utiltesting.MakeAdmission("cq").
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").
 						PodSets(
 							kueue.PodSetAssignment{
 								Name: "master",
@@ -604,12 +605,12 @@ func TestReconciler(t *testing.T) {
 				Active(kftraining.XGBoostJobReplicaTypeWorker, 10).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
+				*utiltestingapi.MakeWorkload("a", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("master", 1).Request(corev1.ResourceCPU, "1").Obj(),
-						*utiltesting.MakePodSet("worker", 10).Request(corev1.ResourceCPU, "5").Obj(),
+						*utiltestingapi.MakePodSet("master", 1).Request(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakePodSet("worker", 10).Request(corev1.ResourceCPU, "5").Obj(),
 					).
-					ReserveQuota(utiltesting.MakeAdmission("cq").
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").
 						PodSets(
 							kueue.PodSetAssignment{
 								Name: "master",
@@ -644,7 +645,7 @@ func TestReconciler(t *testing.T) {
 			if err := SetupIndexes(ctx, indexer); err != nil {
 				t.Fatalf("Failed to setup indexes: %v", err)
 			}
-			kcBuilder = kcBuilder.WithObjects(utiltesting.MakeResourceFlavor("default").Obj())
+			kcBuilder = kcBuilder.WithObjects(utiltestingapi.MakeResourceFlavor("default").Obj())
 			kcBuilder = kcBuilder.WithObjects(tc.job, testNamespace)
 			for i := range tc.workloads {
 				kcBuilder = kcBuilder.WithStatusSubresource(&tc.workloads[i])
diff --git a/pkg/controller/jobs/leaderworkerset/leaderworkerset_reconciler_test.go b/pkg/controller/jobs/leaderworkerset/leaderworkerset_reconciler_test.go
index 7763f6233..32ab1772a 100644
--- a/pkg/controller/jobs/leaderworkerset/leaderworkerset_reconciler_test.go
+++ b/pkg/controller/jobs/leaderworkerset/leaderworkerset_reconciler_test.go
@@ -37,6 +37,7 @@ import (
 	podconstants "sigs.k8s.io/kueue/pkg/controller/jobs/pod/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testingjobs/leaderworkerset"
 )
 
@@ -69,7 +70,7 @@ func TestReconciler(t *testing.T) {
 			leaderWorkerSet:     leaderworkerset.MakeLeaderWorkerSet(testLWS, testNS).UID(testUID).Obj(),
 			wantLeaderWorkerSet: leaderworkerset.MakeLeaderWorkerSet(testLWS, testNS).UID(testUID).Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
+				*utiltestingapi.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
 					OwnerReference(gvk, testLWS, testUID).
 					Annotation(podconstants.IsGroupWorkloadAnnotationKey, podconstants.IsGroupWorkloadAnnotationValue).
 					Finalizers(kueue.ResourceInUseFinalizerName).
@@ -127,7 +128,7 @@ func TestReconciler(t *testing.T) {
 				}).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
+				*utiltestingapi.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
 					OwnerReference(gvk, testLWS, testUID).
 					Annotation(podconstants.IsGroupWorkloadAnnotationKey, podconstants.IsGroupWorkloadAnnotationValue).
 					Finalizers(kueue.ResourceInUseFinalizerName).
@@ -200,7 +201,7 @@ func TestReconciler(t *testing.T) {
 				}).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
+				*utiltestingapi.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
 					OwnerReference(gvk, testLWS, testUID).
 					Annotation(podconstants.IsGroupWorkloadAnnotationKey, podconstants.IsGroupWorkloadAnnotationValue).
 					Finalizers(kueue.ResourceInUseFinalizerName).
@@ -232,7 +233,7 @@ func TestReconciler(t *testing.T) {
 					).
 					Priority(0).
 					Obj(),
-				*utiltesting.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "1"), testNS).
+				*utiltestingapi.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "1"), testNS).
 					OwnerReference(gvk, testLWS, testUID).
 					Annotation(podconstants.IsGroupWorkloadAnnotationKey, podconstants.IsGroupWorkloadAnnotationValue).
 					Finalizers(kueue.ResourceInUseFinalizerName).
@@ -347,7 +348,7 @@ func TestReconciler(t *testing.T) {
 				}).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
+				*utiltestingapi.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
 					OwnerReference(gvk, testLWS, testUID).
 					Annotation(podconstants.IsGroupWorkloadAnnotationKey, podconstants.IsGroupWorkloadAnnotationValue).
 					Finalizers(kueue.ResourceInUseFinalizerName).
@@ -457,7 +458,7 @@ func TestReconciler(t *testing.T) {
 				}).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
+				*utiltestingapi.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
 					OwnerReference(gvk, testLWS, testUID).
 					Annotation(podconstants.IsGroupWorkloadAnnotationKey, podconstants.IsGroupWorkloadAnnotationValue).
 					Finalizers(kueue.ResourceInUseFinalizerName).
@@ -508,14 +509,14 @@ func TestReconciler(t *testing.T) {
 				UID(testUID).
 				Obj(),
 			workloadPriorityClasses: []kueue.WorkloadPriorityClass{
-				*utiltesting.MakeWorkloadPriorityClass("high-priority").PriorityValue(5000).Obj(),
+				*utiltestingapi.MakeWorkloadPriorityClass("high-priority").PriorityValue(5000).Obj(),
 			},
 			wantLeaderWorkerSet: leaderworkerset.MakeLeaderWorkerSet(testLWS, testNS).
 				WorkloadPriorityClass("high-priority").
 				UID(testUID).
 				Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
+				*utiltestingapi.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
 					OwnerReference(gvk, testLWS, testUID).
 					Annotation(podconstants.IsGroupWorkloadAnnotationKey, podconstants.IsGroupWorkloadAnnotationValue).
 					Finalizers(kueue.ResourceInUseFinalizerName).
@@ -555,7 +556,7 @@ func TestReconciler(t *testing.T) {
 			leaderWorkerSet:     leaderworkerset.MakeLeaderWorkerSet(testLWS, testNS).UID(testUID).Obj(),
 			wantLeaderWorkerSet: leaderworkerset.MakeLeaderWorkerSet(testLWS, testNS).UID(testUID).Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
+				*utiltestingapi.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
 					OwnerReference(gvk, testLWS, testUID).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "test-pod1", "test-pod1-uid").
 					Annotation(podconstants.IsGroupWorkloadAnnotationKey, podconstants.IsGroupWorkloadAnnotationValue).
@@ -574,7 +575,7 @@ func TestReconciler(t *testing.T) {
 						}).
 					Priority(0).
 					Obj(),
-				*utiltesting.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "1"), testNS).
+				*utiltestingapi.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "1"), testNS).
 					OwnerReference(gvk, testLWS, testUID).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "test-pod2", "test-pod2-uid").
 					Annotation(podconstants.IsGroupWorkloadAnnotationKey, podconstants.IsGroupWorkloadAnnotationValue).
@@ -595,7 +596,7 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
+				*utiltestingapi.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "0"), testNS).
 					OwnerReference(gvk, testLWS, testUID).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "test-pod1", "test-pod1-uid").
 					Annotation(podconstants.IsGroupWorkloadAnnotationKey, podconstants.IsGroupWorkloadAnnotationValue).
@@ -614,7 +615,7 @@ func TestReconciler(t *testing.T) {
 						}).
 					Priority(0).
 					Obj(),
-				*utiltesting.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "1"), testNS).
+				*utiltestingapi.MakeWorkload(GetWorkloadName(types.UID(testUID), testLWS, "1"), testNS).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "test-pod2", "test-pod2-uid").
 					Annotation(podconstants.IsGroupWorkloadAnnotationKey, podconstants.IsGroupWorkloadAnnotationValue).
 					Finalizers(kueue.ResourceInUseFinalizerName).
diff --git a/pkg/controller/jobs/leaderworkerset/leaderworkerset_webhook_test.go b/pkg/controller/jobs/leaderworkerset/leaderworkerset_webhook_test.go
index 730307b9e..65bc0c76f 100644
--- a/pkg/controller/jobs/leaderworkerset/leaderworkerset_webhook_test.go
+++ b/pkg/controller/jobs/leaderworkerset/leaderworkerset_webhook_test.go
@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 	leaderworkersetv1 "sigs.k8s.io/lws/api/leaderworkerset/v1"
 
-	kueuealpha "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	qcache "sigs.k8s.io/kueue/pkg/cache/queue"
 	schdcache "sigs.k8s.io/kueue/pkg/cache/scheduler"
 	"sigs.k8s.io/kueue/pkg/controller/constants"
@@ -36,6 +36,7 @@ import (
 	podconstants "sigs.k8s.io/kueue/pkg/controller/jobs/pod/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingleaderworkerset "sigs.k8s.io/kueue/pkg/util/testingjobs/leaderworkerset"
 )
 
@@ -121,7 +122,7 @@ func TestDefault(t *testing.T) {
 			cqCache := schdcache.New(cli)
 			queueManager := qcache.NewManager(cli, cqCache)
 			if tc.defaultLqExist {
-				if err := queueManager.AddLocalQueue(ctx, utiltesting.MakeLocalQueue("default", "default").
+				if err := queueManager.AddLocalQueue(ctx, utiltestingapi.MakeLocalQueue("default", "default").
 					ClusterQueue("cluster-queue").Obj()); err != nil {
 					t.Fatalf("failed to create default local queue: %s", err)
 				}
@@ -181,14 +182,14 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
@@ -202,16 +203,16 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation:  "cloud.com/block",
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetRequiredTopologyAnnotation:  "cloud.com/block",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation:  "cloud.com/block",
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetRequiredTopologyAnnotation:  "cloud.com/block",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
@@ -234,9 +235,9 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation:      "cloud.com/block",
-							kueuealpha.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
-							kueuealpha.PodSetSliceSizeAnnotation:             "2",
+							kueue.PodSetRequiredTopologyAnnotation:      "cloud.com/block",
+							kueue.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetSliceSizeAnnotation:             "2",
 						},
 					},
 				}).
@@ -244,9 +245,9 @@ func TestValidateCreate(t *testing.T) {
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation:      "cloud.com/block",
-							kueuealpha.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
-							kueuealpha.PodSetSliceSizeAnnotation:             "20",
+							kueue.PodSetRequiredTopologyAnnotation:      "cloud.com/block",
+							kueue.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetSliceSizeAnnotation:             "20",
 						},
 					},
 				}).
@@ -265,7 +266,7 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetSliceSizeAnnotation: "1",
+							kueue.PodSetSliceSizeAnnotation: "1",
 						},
 					},
 				}).
@@ -273,7 +274,7 @@ func TestValidateCreate(t *testing.T) {
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetSliceSizeAnnotation: "1",
+							kueue.PodSetSliceSizeAnnotation: "1",
 						},
 					},
 				}).
@@ -292,7 +293,7 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
@@ -300,7 +301,7 @@ func TestValidateCreate(t *testing.T) {
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
@@ -319,10 +320,10 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                       "groupname",
-							kueuealpha.PodSetRequiredTopologyAnnotation:      "cloud.com/block",
-							kueuealpha.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
-							kueuealpha.PodSetSliceSizeAnnotation:             "1",
+							kueue.PodSetGroupName:                       "groupname",
+							kueue.PodSetRequiredTopologyAnnotation:      "cloud.com/block",
+							kueue.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetSliceSizeAnnotation:             "1",
 						},
 					},
 				}).
@@ -330,10 +331,10 @@ func TestValidateCreate(t *testing.T) {
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                       "groupname",
-							kueuealpha.PodSetRequiredTopologyAnnotation:      "cloud.com/block",
-							kueuealpha.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
-							kueuealpha.PodSetSliceSizeAnnotation:             "1",
+							kueue.PodSetGroupName:                       "groupname",
+							kueue.PodSetRequiredTopologyAnnotation:      "cloud.com/block",
+							kueue.PodSetSliceRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetSliceSizeAnnotation:             "1",
 						},
 					},
 				}).
@@ -356,16 +357,16 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                  "groupname",
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                  "groupname",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                  "groupname",
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                  "groupname",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
@@ -379,16 +380,16 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                  "1234",
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                  "1234",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                  "1234",
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                  "1234",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
@@ -407,8 +408,8 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                  "groupname",
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                  "groupname",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
@@ -426,8 +427,8 @@ func TestValidateCreate(t *testing.T) {
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                  "groupname",
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                  "groupname",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
@@ -443,16 +444,16 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                  "groupname1",
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                  "groupname1",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                  "groupname2",
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                  "groupname2",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
@@ -469,16 +470,16 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                  "groupname",
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                  "groupname",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                  "groupname",
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/rack",
+							kueue.PodSetGroupName:                  "groupname",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/rack",
 						},
 					},
 				}).
@@ -495,16 +496,16 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                   "groupname",
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                   "groupname",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                   "groupname",
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/rack",
+							kueue.PodSetGroupName:                   "groupname",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/rack",
 						},
 					},
 				}).
@@ -521,16 +522,16 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                  "groupname",
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                  "groupname",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                   "groupname",
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                   "groupname",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
@@ -547,14 +548,14 @@ func TestValidateCreate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName: "groupname",
+							kueue.PodSetGroupName: "groupname",
 						},
 					},
 				}).
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName: "groupname",
+							kueue.PodSetGroupName: "groupname",
 						},
 					},
 				}).
@@ -573,8 +574,8 @@ func TestValidateCreate(t *testing.T) {
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetGroupName:                   "groupname",
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetGroupName:                   "groupname",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
@@ -991,14 +992,14 @@ func TestValidateUpdate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
@@ -1016,16 +1017,16 @@ func TestValidateUpdate(t *testing.T) {
 				LeaderTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation:  "cloud.com/block",
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetRequiredTopologyAnnotation:  "cloud.com/block",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
 				WorkerTemplate(corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation:  "cloud.com/block",
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetRequiredTopologyAnnotation:  "cloud.com/block",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block",
 						},
 					},
 				}).
diff --git a/pkg/controller/jobs/mpijob/mpijob_controller_test.go b/pkg/controller/jobs/mpijob/mpijob_controller_test.go
index 368a79818..77462b891 100644
--- a/pkg/controller/jobs/mpijob/mpijob_controller_test.go
+++ b/pkg/controller/jobs/mpijob/mpijob_controller_test.go
@@ -35,6 +35,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingmpijob "sigs.k8s.io/kueue/pkg/util/testingjobs/mpijob"
 )
 
@@ -203,10 +204,10 @@ func TestPodSets(t *testing.T) {
 		"no annotations": {
 			job: (*MPIJob)(jobTemplate.DeepCopy()),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeLauncher)), 1).
+				*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeLauncher)), 1).
 					PodSpec(jobTemplate.Clone().Spec.MPIReplicaSpecs[kfmpi.MPIReplicaTypeLauncher].Template.Spec).
 					Obj(),
-				*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeWorker)), 3).
+				*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeWorker)), 3).
 					PodSpec(jobTemplate.Clone().Spec.MPIReplicaSpecs[kfmpi.MPIReplicaTypeWorker].Template.Spec).
 					Obj(),
 			},
@@ -227,13 +228,13 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeLauncher)), 1).
+				*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeLauncher)), 1).
 					PodSpec(jobTemplate.Clone().Spec.MPIReplicaSpecs[kfmpi.MPIReplicaTypeLauncher].Template.Spec).
 					Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block"}).
 					RequiredTopologyRequest("cloud.com/block").
 					PodIndexLabel(ptr.To(kfmpi.ReplicaIndexLabel)).
 					Obj(),
-				*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeWorker)), 3).
+				*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeWorker)), 3).
 					PodSpec(jobTemplate.Clone().Spec.MPIReplicaSpecs[kfmpi.MPIReplicaTypeWorker].Template.Spec).
 					Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block"}).
 					RequiredTopologyRequest("cloud.com/block").
@@ -257,13 +258,13 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeLauncher)), 1).
+				*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeLauncher)), 1).
 					PodSpec(jobTemplate.Clone().Spec.MPIReplicaSpecs[kfmpi.MPIReplicaTypeLauncher].Template.Spec).
 					Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 					PreferredTopologyRequest("cloud.com/block").
 					PodIndexLabel(ptr.To(kfmpi.ReplicaIndexLabel)).
 					Obj(),
-				*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeWorker)), 3).
+				*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeWorker)), 3).
 					PodSpec(jobTemplate.Clone().Spec.MPIReplicaSpecs[kfmpi.MPIReplicaTypeWorker].Template.Spec).
 					Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 					PreferredTopologyRequest("cloud.com/block").
@@ -287,11 +288,11 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeLauncher)), 1).
+				*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeLauncher)), 1).
 					PodSpec(jobTemplate.Clone().Spec.MPIReplicaSpecs[kfmpi.MPIReplicaTypeLauncher].Template.Spec).
 					Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block"}).
 					Obj(),
-				*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeWorker)), 3).
+				*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeWorker)), 3).
 					PodSpec(jobTemplate.Clone().Spec.MPIReplicaSpecs[kfmpi.MPIReplicaTypeWorker].Template.Spec).
 					Annotations(map[string]string{kueue.PodSetRequiredTopologyAnnotation: "cloud.com/block"}).
 					Obj(),
@@ -313,11 +314,11 @@ func TestPodSets(t *testing.T) {
 				Obj(),
 			),
 			wantPodSets: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeLauncher)), 1).
+				*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeLauncher)), 1).
 					PodSpec(jobTemplate.Clone().Spec.MPIReplicaSpecs[kfmpi.MPIReplicaTypeLauncher].Template.Spec).
 					Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 					Obj(),
-				*utiltesting.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeWorker)), 3).
+				*utiltestingapi.MakePodSet(kueue.NewPodSetReference(string(kfmpi.MPIReplicaTypeWorker)), 3).
 					PodSpec(jobTemplate.Clone().Spec.MPIReplicaSpecs[kfmpi.MPIReplicaTypeWorker].Template.Spec).
 					Annotations(map[string]string{kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block"}).
 					Obj(),
@@ -355,7 +356,7 @@ var (
 )
 
 func TestReconciler(t *testing.T) {
-	baseWPCWrapper := utiltesting.MakeWorkloadPriorityClass("test-wpc").
+	baseWPCWrapper := utiltestingapi.MakeWorkloadPriorityClass("test-wpc").
 		PriorityValue(100)
 	basePCWrapper := utiltesting.MakePriorityClass("test-pc").
 		PriorityValue(200)
@@ -376,12 +377,12 @@ func TestReconciler(t *testing.T) {
 			job:     testingmpijob.MakeMPIJob("mpijob", "ns").GenericLauncherAndWorker().Parallelism(2).Obj(),
 			wantJob: testingmpijob.MakeMPIJob("mpijob", "ns").GenericLauncherAndWorker().Parallelism(2).Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("mpijob", "ns").
+				*utiltestingapi.MakeWorkload("mpijob", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("launcher", 1).
+						*utiltestingapi.MakePodSet("launcher", 1).
 							PodIndexLabel(ptr.To(kfmpi.ReplicaIndexLabel)).
 							Obj(),
-						*utiltesting.MakePodSet("worker", 2).
+						*utiltestingapi.MakePodSet("worker", 2).
 							PodIndexLabel(ptr.To(kfmpi.ReplicaIndexLabel)).
 							Obj(),
 					).
@@ -399,12 +400,12 @@ func TestReconciler(t *testing.T) {
 			},
 			wantJob: testingmpijob.MakeMPIJob("mpijob", "ns").GenericLauncherAndWorker().Parallelism(2).WorkloadPriorityClass("test-wpc").Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("mpijob", "ns").
+				*utiltestingapi.MakeWorkload("mpijob", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("launcher", 1).
+						*utiltestingapi.MakePodSet("launcher", 1).
 							PodIndexLabel(ptr.To(kfmpi.ReplicaIndexLabel)).
 							Obj(),
-						*utiltesting.MakePodSet("worker", 2).
+						*utiltestingapi.MakePodSet("worker", 2).
 							PodIndexLabel(ptr.To(kfmpi.ReplicaIndexLabel)).
 							Obj(),
 					).PriorityClass("test-wpc").Priority(100).
@@ -423,12 +424,12 @@ func TestReconciler(t *testing.T) {
 			},
 			wantJob: testingmpijob.MakeMPIJob("mpijob", "ns").GenericLauncherAndWorker().Parallelism(2).PriorityClass("test-pc").Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("mpijob", "ns").
+				*utiltestingapi.MakeWorkload("mpijob", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("launcher", 1).
+						*utiltestingapi.MakePodSet("launcher", 1).
 							PodIndexLabel(ptr.To(kfmpi.ReplicaIndexLabel)).
 							Obj(),
-						*utiltesting.MakePodSet("worker", 2).
+						*utiltestingapi.MakePodSet("worker", 2).
 							PodIndexLabel(ptr.To(kfmpi.ReplicaIndexLabel)).
 							Obj(),
 					).PriorityClass("test-pc").Priority(200).
@@ -449,12 +450,12 @@ func TestReconciler(t *testing.T) {
 			wantJob: testingmpijob.MakeMPIJob("mpijob", "ns").GenericLauncherAndWorker().Parallelism(2).
 				WorkloadPriorityClass("test-wpc").PriorityClass("test-pc").Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("mpijob", "ns").
+				*utiltestingapi.MakeWorkload("mpijob", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("launcher", 1).
+						*utiltestingapi.MakePodSet("launcher", 1).
 							PodIndexLabel(ptr.To(kfmpi.ReplicaIndexLabel)).
 							Obj(),
-						*utiltesting.MakePodSet("worker", 2).
+						*utiltestingapi.MakePodSet("worker", 2).
 							PodIndexLabel(ptr.To(kfmpi.ReplicaIndexLabel)).
 							Obj(),
 					).PriorityClass("test-wpc").Priority(100).
diff --git a/pkg/controller/jobs/mpijob/mpijob_webhook_test.go b/pkg/controller/jobs/mpijob/mpijob_webhook_test.go
index e8fac75dd..6bfa721a5 100644
--- a/pkg/controller/jobs/mpijob/mpijob_webhook_test.go
+++ b/pkg/controller/jobs/mpijob/mpijob_webhook_test.go
@@ -33,6 +33,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingutil "sigs.k8s.io/kueue/pkg/util/testingjobs/mpijob"
 )
 
@@ -345,16 +346,16 @@ func TestDefault(t *testing.T) {
 				},
 			},
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("admission-check").
 					Obj(),
 			},
-			admissionCheck: utiltesting.MakeAdmissionCheck("admission-check").
+			admissionCheck: utiltestingapi.MakeAdmissionCheck("admission-check").
 				ControllerName(kueue.MultiKueueControllerName).
 				Active(metav1.ConditionTrue).
 				Obj(),
@@ -372,16 +373,16 @@ func TestDefault(t *testing.T) {
 				},
 			},
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("admission-check").
 					Obj(),
 			},
-			admissionCheck: utiltesting.MakeAdmissionCheck("admission-check").
+			admissionCheck: utiltestingapi.MakeAdmissionCheck("admission-check").
 				ControllerName(kueue.MultiKueueControllerName).
 				Active(metav1.ConditionTrue).
 				Obj(),
@@ -429,12 +430,12 @@ func TestDefault(t *testing.T) {
 				},
 			},
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("non-existent-admission-check").
 					Obj(),
 			},
@@ -452,16 +453,16 @@ func TestDefault(t *testing.T) {
 				},
 			},
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("admission-check").
 					Obj(),
 			},
-			admissionCheck: utiltesting.MakeAdmissionCheck("admission-check").
+			admissionCheck: utiltestingapi.MakeAdmissionCheck("admission-check").
 				ControllerName(kueue.MultiKueueControllerName).
 				Active(metav1.ConditionTrue).
 				Obj(),
@@ -484,16 +485,16 @@ func TestDefault(t *testing.T) {
 				},
 			},
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					AdmissionChecks("admission-check").
 					Obj(),
 			},
-			admissionCheck: utiltesting.MakeAdmissionCheck("admission-check").
+			admissionCheck: utiltestingapi.MakeAdmissionCheck("admission-check").
 				ControllerName(kueue.MultiKueueControllerName).
 				Active(metav1.ConditionTrue).
 				Obj(),
@@ -511,12 +512,12 @@ func TestDefault(t *testing.T) {
 				},
 			},
 			queues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("local-queue", "default").
+				*utiltestingapi.MakeLocalQueue("local-queue", "default").
 					ClusterQueue("cluster-queue").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cluster-queue").
+				*utiltestingapi.MakeClusterQueue("cluster-queue").
 					Obj(),
 			},
 			multiKueueEnabled: true,
@@ -558,7 +559,7 @@ func TestDefault(t *testing.T) {
 			queueManager := qcache.NewManager(cl, cqCache)
 
 			if tc.defaultLqExist {
-				if err := queueManager.AddLocalQueue(ctx, utiltesting.MakeLocalQueue("default", "default").
+				if err := queueManager.AddLocalQueue(ctx, utiltestingapi.MakeLocalQueue("default", "default").
 					ClusterQueue("cluster-queue").Obj()); err != nil {
 					t.Fatalf("failed to create default local queue: %s", err)
 				}
diff --git a/pkg/controller/jobs/pod/pod_controller_test.go b/pkg/controller/jobs/pod/pod_controller_test.go
index ddbe93588..bf98dec0c 100644
--- a/pkg/controller/jobs/pod/pod_controller_test.go
+++ b/pkg/controller/jobs/pod/pod_controller_test.go
@@ -48,6 +48,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/podset"
 	utilpod "sigs.k8s.io/kueue/pkg/util/pod"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 	"sigs.k8s.io/kueue/pkg/workload"
 
@@ -142,7 +143,7 @@ func TestPodSets(t *testing.T) {
 			pod: FromObject(testingpod.MakePod("pod", "ns").Obj()),
 			wantPodSets: func(pod *Pod) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						PodSpec(*pod.pod.Spec.DeepCopy()).
 						Obj(),
 				}
@@ -156,7 +157,7 @@ func TestPodSets(t *testing.T) {
 			),
 			wantPodSets: func(pod *Pod) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						PodSpec(*pod.pod.Spec.DeepCopy()).
 						RequiredTopologyRequest("cloud.com/block").
 						PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
@@ -172,7 +173,7 @@ func TestPodSets(t *testing.T) {
 			),
 			wantPodSets: func(pod *Pod) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						PodSpec(*pod.pod.Spec.DeepCopy()).
 						PreferredTopologyRequest("cloud.com/block").
 						PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
@@ -188,7 +189,7 @@ func TestPodSets(t *testing.T) {
 			),
 			wantPodSets: func(pod *Pod) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						PodSpec(*pod.pod.Spec.DeepCopy()).
 						Obj(),
 				}
@@ -202,7 +203,7 @@ func TestPodSets(t *testing.T) {
 			),
 			wantPodSets: func(pod *Pod) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						PodSpec(*pod.pod.Spec.DeepCopy()).
 						Obj(),
 				}
@@ -284,7 +285,7 @@ func TestReconciler(t *testing.T) {
 	}{
 		"scheduling gate is removed and node selector is added if workload is admitted": {
 			initObjects: []client.Object{
-				utiltesting.MakeResourceFlavor("unit-test-flavor").NodeLabel(corev1.LabelArchStable, "arm64").Obj(),
+				utiltestingapi.MakeResourceFlavor("unit-test-flavor").NodeLabel(corev1.LabelArchStable, "arm64").Obj(),
 			},
 			pods: []corev1.Pod{*basePodWrapper.
 				Clone().
@@ -301,12 +302,12 @@ func TestReconciler(t *testing.T) {
 				Annotation(kueue.WorkloadAnnotation, "unit-test").
 				Obj()},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
 								Obj()).
 							Obj(),
@@ -315,12 +316,12 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
 								Obj()).
 							Obj(),
@@ -346,9 +347,9 @@ func TestReconciler(t *testing.T) {
 				Obj()},
 			wantPods: nil,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					Admitted(true).
 					Obj(),
@@ -386,9 +387,9 @@ func TestReconciler(t *testing.T) {
 				Queue("test-queue").
 				Obj()},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadNameForPod(basePodWrapper.GetName(), basePodWrapper.GetUID()), "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload(GetWorkloadNameForPod(basePodWrapper.GetName(), basePodWrapper.GetUID()), "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
@@ -442,8 +443,8 @@ func TestReconciler(t *testing.T) {
 				}).
 				Obj()},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("job", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					Condition(metav1.Condition{
@@ -456,8 +457,8 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("job", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("job", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					Condition(metav1.Condition{
@@ -494,17 +495,17 @@ func TestReconciler(t *testing.T) {
 				StatusMessage("Job finished successfully").
 				Obj()},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					Admitted(true).
 					Condition(metav1.Condition{
@@ -548,17 +549,17 @@ func TestReconciler(t *testing.T) {
 				StatusMessage("Job finished successfully").
 				Obj()},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					Admitted(true).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					Admitted(true).
 					Condition(metav1.Condition{
@@ -597,15 +598,15 @@ func TestReconciler(t *testing.T) {
 				}).
 				Obj()},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 			workloadCmpOpts: defaultWorkloadCmpOpts,
@@ -642,7 +643,7 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl", "ns").
+				*utiltestingapi.MakeWorkload("wl", "ns").
 					Annotations(map[string]string{controllerconsts.ProvReqAnnotationPrefix + "test-annotation": "test-val"}).
 					Obj(),
 			},
@@ -715,9 +716,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
@@ -771,9 +772,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 3).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 3).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
@@ -841,9 +842,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet("dc85db45", 2).
+						*utiltestingapi.MakePodSet("dc85db45", 2).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
@@ -892,9 +893,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet("dc85db45", 2).
+						*utiltestingapi.MakePodSet("dc85db45", 2).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							Obj(),
@@ -929,9 +930,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet("dc85db45", 2).
+						*utiltestingapi.MakePodSet("dc85db45", 2).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
@@ -995,9 +996,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							Obj(),
@@ -1009,9 +1010,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							Obj(),
@@ -1026,7 +1027,7 @@ func TestReconciler(t *testing.T) {
 		},
 		"scheduling gate is removed for all pods in the group if workload is admitted": {
 			initObjects: []client.Object{
-				utiltesting.MakeResourceFlavor("unit-test-flavor").NodeLabel(corev1.LabelArchStable, "arm64").Obj(),
+				utiltestingapi.MakeResourceFlavor("unit-test-flavor").NodeLabel(corev1.LabelArchStable, "arm64").Obj(),
 			},
 			pods: []corev1.Pod{
 				*basePodWrapper.
@@ -1071,13 +1072,13 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).Request(corev1.ResourceCPU, "1").Obj()).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "2").
 								Count(2).
 								Obj()).
@@ -1087,17 +1088,17 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "2").
 								Count(2).
 								Obj()).
@@ -1161,28 +1162,28 @@ func TestReconciler(t *testing.T) {
 			},
 
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 					Admitted(true).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 					Admitted(true).
@@ -1229,28 +1230,28 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
@@ -1288,15 +1289,15 @@ func TestReconciler(t *testing.T) {
 				GroupTotalCount("2").
 				Obj()},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -1307,15 +1308,15 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -1371,8 +1372,8 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
@@ -1386,8 +1387,8 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
@@ -1424,15 +1425,15 @@ func TestReconciler(t *testing.T) {
 			},
 
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    "Finished",
@@ -1449,15 +1450,15 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    "Finished",
@@ -1554,14 +1555,14 @@ func TestReconciler(t *testing.T) {
 			},
 			wantPods: []corev1.Pod{},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).Request(corev1.ResourceCPU, "1").Obj()).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 					Queue("test-queue").
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "2").
 								Count(2).
 								Obj()).
@@ -1628,16 +1629,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -1648,16 +1649,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -1717,14 +1718,14 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 3).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 3).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(3).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(3).Obj()).Obj()).
 					Admitted(true).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
@@ -1771,14 +1772,14 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 3).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 3).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(3).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(3).Obj()).Obj()).
 					ReclaimablePods(kueue.ReclaimablePod{
 						Name:  kueue.NewPodSetReference(podUID),
 						Count: 1,
@@ -1862,14 +1863,14 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
@@ -1877,14 +1878,14 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
@@ -1931,15 +1932,15 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadEvicted,
@@ -1958,14 +1959,14 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					Admitted(true).
 					Condition(metav1.Condition{
@@ -2010,15 +2011,15 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					AdmittedAt(true, testStartTime.Add(-time.Second)).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadEvicted,
@@ -2037,15 +2038,15 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					PastAdmittedTime(1).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadAdmitted,
@@ -2134,12 +2135,12 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet("incorrect-role-name", 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet("incorrect-role-name", 1).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "2").
 								Count(2).
 								Obj()).
@@ -2149,9 +2150,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).Request(corev1.ResourceCPU, "1").
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).Request(corev1.ResourceCPU, "1").
 							NodeName("test-node").
 							PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
 							Obj(),
@@ -2214,16 +2215,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -2234,16 +2235,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -2277,17 +2278,17 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("absent-pod-role", 1).
+						*utiltestingapi.MakePodSet("absent-pod-role", 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					Admitted(true).
 					Condition(metav1.Condition{
@@ -2299,17 +2300,17 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("absent-pod-role", 1).
+						*utiltestingapi.MakePodSet("absent-pod-role", 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					Admitted(true).
 					Condition(metav1.Condition{
@@ -2404,9 +2405,9 @@ func TestReconciler(t *testing.T) {
 			},
 			workloads: []kueue.Workload{},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							Request(corev1.ResourceCPU, "1").
 							PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
@@ -2538,13 +2539,13 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("a119f908", 1).
+						*utiltestingapi.MakePodSet("a119f908", 1).
 							Request(corev1.ResourceCPU, "1").
 							Request(corev1.ResourceMemory, "1Gi").
 							Obj(),
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -2552,7 +2553,7 @@ func TestReconciler(t *testing.T) {
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod3", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -2563,13 +2564,13 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("a119f908", 1).
+						*utiltestingapi.MakePodSet("a119f908", 1).
 							Request(corev1.ResourceCPU, "1").
 							Request(corev1.ResourceMemory, "1Gi").
 							Obj(),
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -2577,7 +2578,7 @@ func TestReconciler(t *testing.T) {
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod3", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -2665,13 +2666,13 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("4ebdd4a6", 1).
+						*utiltestingapi.MakePodSet("4ebdd4a6", 1).
 							Request(corev1.ResourceCPU, "1").
 							Request(corev1.ResourceMemory, "1Gi").
 							Obj(),
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -2679,7 +2680,7 @@ func TestReconciler(t *testing.T) {
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod3", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -2690,18 +2691,18 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("4ebdd4a6", 1).
+						*utiltestingapi.MakePodSet("4ebdd4a6", 1).
 							Request(corev1.ResourceCPU, "1").
 							Request(corev1.ResourceMemory, "1Gi").
 							Obj(),
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
@@ -2783,13 +2784,13 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("4ebdd4a6", 1).
+						*utiltestingapi.MakePodSet("4ebdd4a6", 1).
 							Request(corev1.ResourceCPU, "1").
 							Request(corev1.ResourceMemory, "1Gi").
 							Obj(),
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -2797,7 +2798,7 @@ func TestReconciler(t *testing.T) {
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod3", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -2808,18 +2809,18 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("4ebdd4a6", 1).
+						*utiltestingapi.MakePodSet("4ebdd4a6", 1).
 							Request(corev1.ResourceCPU, "1").
 							Request(corev1.ResourceMemory, "1Gi").
 							Obj(),
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
@@ -2869,9 +2870,9 @@ func TestReconciler(t *testing.T) {
 			},
 			workloads: []kueue.Workload{},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
@@ -2953,9 +2954,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -2966,9 +2967,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -3022,17 +3023,17 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("aaf269e6", 1).
+						*utiltestingapi.MakePodSet("aaf269e6", 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					Admitted(true).
 					Condition(metav1.Condition{
@@ -3044,17 +3045,17 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet("aaf269e6", 1).
+						*utiltestingapi.MakePodSet("aaf269e6", 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					Admitted(true).
 					Condition(metav1.Condition{
@@ -3143,26 +3144,26 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -3224,9 +3225,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -3234,14 +3235,14 @@ func TestReconciler(t *testing.T) {
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "pod2").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod3", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -3249,7 +3250,7 @@ func TestReconciler(t *testing.T) {
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "pod2").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod3", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -3312,9 +3313,9 @@ func TestReconciler(t *testing.T) {
 			},
 			workloads: []kueue.Workload{},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
@@ -3375,13 +3376,13 @@ func TestReconciler(t *testing.T) {
 		"finalize workload for non existent pod": {
 			reconcileKey: &types.NamespacedName{Namespace: "ns", Name: "deleted_pod"},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "deleted_pod", "").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "deleted_pod", "").
 					Obj(),
 			},
@@ -3443,16 +3444,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 3).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 3).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -3463,9 +3464,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 3).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 3).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -3473,7 +3474,7 @@ func TestReconciler(t *testing.T) {
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "replacement-for-pod1", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -3561,9 +3562,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 3).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 3).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -3588,9 +3589,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 3).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 3).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -3658,9 +3659,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 3).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 3).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -3682,9 +3683,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 3).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 3).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -3844,9 +3845,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 4).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 4).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -3855,7 +3856,7 @@ func TestReconciler(t *testing.T) {
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "finished-with-error", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "deleted", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "finished-with-error2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -3866,9 +3867,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 4).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 4).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -3879,7 +3880,7 @@ func TestReconciler(t *testing.T) {
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "finished-with-error2", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "replacement1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "replacement2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -3967,30 +3968,30 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "active-pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "finished-with-error", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "active-pod", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "finished-with-error", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -4080,16 +4081,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 4).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 4).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "finished-with-error", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "finished-with-error-no-finalizer", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -4100,9 +4101,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").
+				*utiltestingapi.MakeWorkload("test-group", "ns").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 4).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 4).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -4110,7 +4111,7 @@ func TestReconciler(t *testing.T) {
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "finished-with-error", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "finished-with-error-no-finalizer", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "replacement", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -4145,9 +4146,9 @@ func TestReconciler(t *testing.T) {
 				jobframework.WithLabelKeysToCopy([]string{"toCopyKey", "keyAbsentInThePod"}),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadNameForPod(basePodWrapper.GetName(), basePodWrapper.GetUID()), "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload(GetWorkloadNameForPod(basePodWrapper.GetName(), basePodWrapper.GetUID()), "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
@@ -4204,9 +4205,9 @@ func TestReconciler(t *testing.T) {
 				jobframework.WithLabelKeysToCopy([]string{"toCopyKey1", "toCopyKey2"}),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
@@ -4304,7 +4305,7 @@ func TestReconciler(t *testing.T) {
 				Obj()},
 			wantPods: nil,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadNameForPod(basePodWrapper.GetName(), basePodWrapper.GetUID()), "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload(GetWorkloadNameForPod(basePodWrapper.GetName(), basePodWrapper.GetUID()), "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					Active(false).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadQuotaReserved,
@@ -4321,7 +4322,7 @@ func TestReconciler(t *testing.T) {
 						Message: "Test message.",
 					}).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							Obj(),
@@ -4329,12 +4330,12 @@ func TestReconciler(t *testing.T) {
 					Queue("user-queue").
 					Priority(0).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(false).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(GetWorkloadNameForPod(basePodWrapper.GetName(), basePodWrapper.GetUID()), "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload(GetWorkloadNameForPod(basePodWrapper.GetName(), basePodWrapper.GetUID()), "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					Active(false).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadQuotaReserved,
@@ -4351,7 +4352,7 @@ func TestReconciler(t *testing.T) {
 						Message: "Test message.",
 					}).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							Obj(),
@@ -4359,7 +4360,7 @@ func TestReconciler(t *testing.T) {
 					Queue("user-queue").
 					Priority(0).
 					ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(false).
 					Obj(),
 			},
@@ -4395,7 +4396,7 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					Active(false).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadQuotaReserved,
@@ -4407,7 +4408,7 @@ func TestReconciler(t *testing.T) {
 						Message: "Not admitted, ETA: 2024-02-22T10:36:40Z.",
 					}).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							Obj(),
@@ -4416,13 +4417,13 @@ func TestReconciler(t *testing.T) {
 					Priority(0).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(false).
 					Obj(),
 			},
 			wantPods: nil,
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					Active(false).
 					Condition(metav1.Condition{
 						Type:   kueue.WorkloadQuotaReserved,
@@ -4434,7 +4435,7 @@ func TestReconciler(t *testing.T) {
 						Message: "Not admitted, ETA: 2024-02-22T10:36:40Z.",
 					}).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							SchedulingGates(corev1.PodSchedulingGate{Name: podconstants.SchedulingGateName}).
 							Obj(),
@@ -4443,7 +4444,7 @@ func TestReconciler(t *testing.T) {
 					Priority(0).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					Admitted(false).
 					Obj(),
 			},
@@ -4502,9 +4503,9 @@ func TestReconciler(t *testing.T) {
 			},
 			workloadCmpOpts: defaultWorkloadCmpOpts,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -4512,7 +4513,7 @@ func TestReconciler(t *testing.T) {
 					Priority(0).
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -4541,9 +4542,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -4552,7 +4553,7 @@ func TestReconciler(t *testing.T) {
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "replacement", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -4596,16 +4597,16 @@ func TestReconciler(t *testing.T) {
 			},
 			workloadCmpOpts: defaultWorkloadCmpOpts,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -4632,16 +4633,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -4671,16 +4672,16 @@ func TestReconciler(t *testing.T) {
 			},
 			workloadCmpOpts: defaultWorkloadCmpOpts,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -4707,16 +4708,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -4753,16 +4754,16 @@ func TestReconciler(t *testing.T) {
 			},
 			workloadCmpOpts: defaultWorkloadCmpOpts,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Obj(),
 			},
@@ -4790,16 +4791,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -4836,16 +4837,16 @@ func TestReconciler(t *testing.T) {
 			},
 			workloadCmpOpts: defaultWorkloadCmpOpts,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadEvicted,
@@ -4879,16 +4880,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadEvicted,
@@ -4933,16 +4934,16 @@ func TestReconciler(t *testing.T) {
 			},
 			workloadCmpOpts: defaultWorkloadCmpOpts,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    kueue.WorkloadEvicted,
@@ -4981,16 +4982,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    kueue.WorkloadEvicted,
@@ -5032,16 +5033,16 @@ func TestReconciler(t *testing.T) {
 			},
 			workloadCmpOpts: defaultWorkloadCmpOpts,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadEvicted,
@@ -5082,16 +5083,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadEvicted,
@@ -5135,16 +5136,16 @@ func TestReconciler(t *testing.T) {
 			},
 			workloadCmpOpts: defaultWorkloadCmpOpts,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -5177,16 +5178,16 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.NewPodSetReference(podUID)).Count(2).Obj()).Obj()).
 					Admitted(true).
 					Condition(metav1.Condition{
 						Type:    WorkloadWaitingForReplacementPods,
@@ -5221,9 +5222,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("prebuilt-workload", "ns").
+				*utiltestingapi.MakeWorkload("prebuilt-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet("dc85db45", 2).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet("dc85db45", 2).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					Obj(),
 			},
@@ -5262,9 +5263,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("prebuilt-workload", "ns").
+				*utiltestingapi.MakeWorkload("prebuilt-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet("dc85db45", 2).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet("dc85db45", 2).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
@@ -5316,9 +5317,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("prebuilt-workload", "ns").
+				*utiltestingapi.MakeWorkload("prebuilt-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet("dc85db45", 2).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet("dc85db45", 2).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					Obj(),
@@ -5358,9 +5359,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("prebuilt-workload", "ns").
+				*utiltestingapi.MakeWorkload("prebuilt-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet("dc85db45", 2).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet("dc85db45", 2).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
@@ -5412,9 +5413,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("prebuilt-workload", "ns").
+				*utiltestingapi.MakeWorkload("prebuilt-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
@@ -5455,9 +5456,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("prebuilt-workload", "ns").
+				*utiltestingapi.MakeWorkload("prebuilt-workload", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
 					Queue("test-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod1", "test-uid").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
@@ -5505,15 +5506,15 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					AdmittedAt(true, testStartTime.Add(-time.Second)).
 					Active(false).
 					Condition(metav1.Condition{
@@ -5526,15 +5527,15 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("test-group", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 1).
+						*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 1).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Queue("user-queue").
 					OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 					PastAdmittedTime(1).
 					Active(false).
 					Condition(metav1.Condition{
@@ -5699,9 +5700,9 @@ func TestReconciler_ErrorFinalizingPod(t *testing.T) {
 		StatusMessage("Job finished successfully").
 		Obj()
 
-	wl := *utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-		PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-		ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+	wl := *utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+		PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+		ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 		Admitted(true).
 		Obj()
 
@@ -5782,9 +5783,9 @@ func TestReconciler_ErrorFinalizingPod(t *testing.T) {
 	}
 
 	// Workload should be finished after the second reconcile
-	wantWl := *utiltesting.MakeWorkload("unit-test", "ns").
-		PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-		ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+	wantWl := *utiltestingapi.MakeWorkload("unit-test", "ns").
+		PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+		ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 		ControllerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 		Admitted(true).
 		Condition(
@@ -5917,9 +5918,9 @@ func TestReconciler_DeletePodAfterTransientErrorsOnUpdateOrDeleteOps(t *testing.
 			Obj(),
 	}
 
-	wl := *utiltesting.MakeWorkload("test-group", "ns").
+	wl := *utiltestingapi.MakeWorkload("test-group", "ns").
 		PodSets(
-			*utiltesting.MakePodSet(kueue.NewPodSetReference(podUID), 2).
+			*utiltestingapi.MakePodSet(kueue.NewPodSetReference(podUID), 2).
 				Request(corev1.ResourceCPU, "1").
 				Obj(),
 		).
@@ -5927,7 +5928,7 @@ func TestReconciler_DeletePodAfterTransientErrorsOnUpdateOrDeleteOps(t *testing.
 		OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod", "test-uid").
 		OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "pod2", "test-uid").
 		OwnerReference(corev1.SchemeGroupVersion.WithKind("Pod"), "excessPod", "test-uid").
-		ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
+		ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Obj()).Obj()).
 		Admitted(true).
 		Obj()
 
diff --git a/pkg/controller/jobs/pod/pod_webhook_test.go b/pkg/controller/jobs/pod/pod_webhook_test.go
index 058bf778e..2642f99e8 100644
--- a/pkg/controller/jobs/pod/pod_webhook_test.go
+++ b/pkg/controller/jobs/pod/pod_webhook_test.go
@@ -36,7 +36,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	configapi "sigs.k8s.io/kueue/apis/config/v1beta1"
-	kueuealpha "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	qcache "sigs.k8s.io/kueue/pkg/cache/queue"
 	schdcache "sigs.k8s.io/kueue/pkg/cache/scheduler"
 	"sigs.k8s.io/kueue/pkg/controller/constants"
@@ -44,6 +44,7 @@ import (
 	podconstants "sigs.k8s.io/kueue/pkg/controller/jobs/pod/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingmpijob "sigs.k8s.io/kueue/pkg/util/testingjobs/mpijob"
 	"sigs.k8s.io/kueue/pkg/util/testingjobs/paddlejob"
@@ -358,11 +359,11 @@ func TestDefault(t *testing.T) {
 			namespaceSelector:             defaultNamespaceSelector,
 			pod: testingpod.MakePod("test-pod", defaultNamespace.Name).
 				Queue("test-queue").
-				Annotation(kueuealpha.PodSetRequiredTopologyAnnotation, "block").
+				Annotation(kueue.PodSetRequiredTopologyAnnotation, "block").
 				Obj(),
 			want: testingpod.MakePod("test-pod", defaultNamespace.Name).
 				Queue("test-queue").
-				Annotation(kueuealpha.PodSetRequiredTopologyAnnotation, "block").
+				Annotation(kueue.PodSetRequiredTopologyAnnotation, "block").
 				ManagedByKueueLabel().
 				KueueFinalizer().
 				RoleHash("a9f06f3a").
@@ -378,15 +379,15 @@ func TestDefault(t *testing.T) {
 			pod: testingpod.MakePod("test-pod", defaultNamespace.Name).
 				Queue("test-queue").
 				Label("test-label", "test-value").
-				Annotation(kueuealpha.PodGroupPodIndexLabelAnnotation, "test-label").
-				Annotation(kueuealpha.PodSetRequiredTopologyAnnotation, "block").
+				Annotation(kueue.PodGroupPodIndexLabelAnnotation, "test-label").
+				Annotation(kueue.PodSetRequiredTopologyAnnotation, "block").
 				Obj(),
 			want: testingpod.MakePod("test-pod", defaultNamespace.Name).
 				Queue("test-queue").
-				Annotation(kueuealpha.PodGroupPodIndexLabelAnnotation, "test-label").
-				Annotation(kueuealpha.PodSetRequiredTopologyAnnotation, "block").
+				Annotation(kueue.PodGroupPodIndexLabelAnnotation, "test-label").
+				Annotation(kueue.PodSetRequiredTopologyAnnotation, "block").
 				Label("test-label", "test-value").
-				Label(kueuealpha.PodGroupPodIndexLabel, "test-value").
+				Label(kueue.PodGroupPodIndexLabel, "test-value").
 				ManagedByKueueLabel().
 				RoleHash("a9f06f3a").
 				KueueFinalizer().
@@ -535,7 +536,7 @@ func TestDefault(t *testing.T) {
 			ctx, _ := utiltesting.ContextWithLog(t)
 
 			if tc.defaultLqExist {
-				if err := queueManager.AddLocalQueue(ctx, utiltesting.MakeLocalQueue("default", defaultNamespace.Name).
+				if err := queueManager.AddLocalQueue(ctx, utiltestingapi.MakeLocalQueue("default", defaultNamespace.Name).
 					ClusterQueue("cluster-queue").Obj()); err != nil {
 					t.Fatalf("failed to create default local queue: %s", err)
 				}
@@ -732,14 +733,14 @@ func TestValidateCreate(t *testing.T) {
 		"valid topology request": {
 			pod: testingpod.MakePod("test-pod", "test-ns").
 				ManagedByKueueLabel().
-				Annotation(kueuealpha.PodSetRequiredTopologyAnnotation, "cloud.com/block").
+				Annotation(kueue.PodSetRequiredTopologyAnnotation, "cloud.com/block").
 				Obj(),
 		},
 		"invalid topology request": {
 			pod: testingpod.MakePod("test-pod", "test-ns").
 				ManagedByKueueLabel().
-				Annotation(kueuealpha.PodSetRequiredTopologyAnnotation, "cloud.com/block").
-				Annotation(kueuealpha.PodSetPreferredTopologyAnnotation, "cloud.com/block").
+				Annotation(kueue.PodSetRequiredTopologyAnnotation, "cloud.com/block").
+				Annotation(kueue.PodSetPreferredTopologyAnnotation, "cloud.com/block").
 				Obj(),
 			wantErr: field.ErrorList{
 				&field.Error{
diff --git a/pkg/controller/jobs/raycluster/raycluster_controller_test.go b/pkg/controller/jobs/raycluster/raycluster_controller_test.go
index b1c16eb19..db63d7380 100644
--- a/pkg/controller/jobs/raycluster/raycluster_controller_test.go
+++ b/pkg/controller/jobs/raycluster/raycluster_controller_test.go
@@ -40,6 +40,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/podset"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingrayutil "sigs.k8s.io/kueue/pkg/util/testingjobs/raycluster"
 )
 
@@ -90,13 +91,13 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayCluster) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet("group1", 1).
+					*utiltestingapi.MakePodSet("group1", 1).
 						PodSpec(*rayJob.Spec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet("group2", 3).
+					*utiltestingapi.MakePodSet("group2", 3).
 						PodSpec(*rayJob.Spec.WorkerGroupSpecs[1].Template.Spec.DeepCopy()).
 						Obj(),
 				}
@@ -140,17 +141,17 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayCluster) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.HeadGroupSpec.Template.Annotations).
 						RequiredTopologyRequest("cloud.com/block").
 						Obj(),
-					*utiltesting.MakePodSet("group1", 1).
+					*utiltestingapi.MakePodSet("group1", 1).
 						PodSpec(*rayJob.Spec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.WorkerGroupSpecs[0].Template.Annotations).
 						RequiredTopologyRequest("cloud.com/block").
 						Obj(),
-					*utiltesting.MakePodSet("group2", 3).
+					*utiltestingapi.MakePodSet("group2", 3).
 						PodSpec(*rayJob.Spec.WorkerGroupSpecs[1].Template.Spec.DeepCopy()).
 						Obj(),
 				}
@@ -194,15 +195,15 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayCluster) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.HeadGroupSpec.Template.Annotations).
 						PreferredTopologyRequest("cloud.com/block").
 						Obj(),
-					*utiltesting.MakePodSet("group1", 1).
+					*utiltestingapi.MakePodSet("group1", 1).
 						PodSpec(*rayJob.Spec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet("group2", 3).
+					*utiltestingapi.MakePodSet("group2", 3).
 						PodSpec(*rayJob.Spec.WorkerGroupSpecs[1].Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.WorkerGroupSpecs[1].Template.Annotations).
 						PreferredTopologyRequest("cloud.com/block").
@@ -260,19 +261,19 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayCluster) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.HeadGroupSpec.Template.Annotations).
 						Obj(),
-					*utiltesting.MakePodSet("group1", 1).
+					*utiltestingapi.MakePodSet("group1", 1).
 						PodSpec(*rayJob.Spec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.WorkerGroupSpecs[0].Template.Annotations).
 						Obj(),
-					*utiltesting.MakePodSet("group2", 3).
+					*utiltestingapi.MakePodSet("group2", 3).
 						PodSpec(*rayJob.Spec.WorkerGroupSpecs[1].Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.WorkerGroupSpecs[1].Template.Annotations).
 						Obj(),
-					*utiltesting.MakePodSet("group3", 3).
+					*utiltestingapi.MakePodSet("group3", 3).
 						PodSpec(*rayJob.Spec.WorkerGroupSpecs[2].Template.Spec.DeepCopy()).
 						Obj(),
 				}
@@ -320,7 +321,7 @@ func TestReconciler(t *testing.T) {
 	}{
 		"when workload is admitted, cluster is unsuspended": {
 			initObjects: []client.Object{
-				utiltesting.MakeResourceFlavor("unit-test-flavor").NodeLabel(corev1.LabelArchStable, "arm64").Obj(),
+				utiltestingapi.MakeResourceFlavor("unit-test-flavor").NodeLabel(corev1.LabelArchStable, "arm64").Obj(),
 			},
 			job: *baseJobWrapper.Clone().
 				Obj(),
@@ -333,10 +334,10 @@ func TestReconciler(t *testing.T) {
 				NodeAnnotation(rayv1.WorkerNode, kueue.WorkloadAnnotation, "test").
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test", "ns").
+				*utiltestingapi.MakeWorkload("test", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(headGroupPodSetName, 1).
+						*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 							PodSpec(corev1.PodSpec{
 								RestartPolicy: corev1.RestartPolicyNever,
 								Containers: []corev1.Container{
@@ -346,7 +347,7 @@ func TestReconciler(t *testing.T) {
 								},
 							}).
 							Obj(),
-						*utiltesting.MakePodSet("workers-group-0", 1).
+						*utiltestingapi.MakePodSet("workers-group-0", 1).
 							PodSpec(corev1.PodSpec{
 								RestartPolicy: corev1.RestartPolicyNever,
 								Containers: []corev1.Container{
@@ -360,12 +361,12 @@ func TestReconciler(t *testing.T) {
 					).
 					Request(corev1.ResourceCPU, "10").
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
+						utiltestingapi.MakeAdmission("cq").
 							PodSets(
-								utiltesting.MakePodSetAssignment("head").
+								utiltestingapi.MakePodSetAssignment("head").
 									Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
 									Obj(),
-								utiltesting.MakePodSetAssignment("workers-group-0").
+								utiltestingapi.MakePodSetAssignment("workers-group-0").
 									Obj(),
 							).
 							Obj(),
@@ -386,10 +387,10 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
+				*utiltestingapi.MakeWorkload("a", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(headGroupPodSetName, 1).
+						*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 							PodSpec(corev1.PodSpec{
 								RestartPolicy: corev1.RestartPolicyNever,
 								Containers: []corev1.Container{
@@ -400,7 +401,7 @@ func TestReconciler(t *testing.T) {
 							}).
 							Labels(map[string]string{controllerconsts.PodSetLabel: "head"}).
 							Obj(),
-						*utiltesting.MakePodSet("workers-group-0", 1).
+						*utiltestingapi.MakePodSet("workers-group-0", 1).
 							PodSpec(corev1.PodSpec{
 								RestartPolicy: corev1.RestartPolicyNever,
 								Containers: []corev1.Container{
@@ -413,12 +414,12 @@ func TestReconciler(t *testing.T) {
 							Obj(),
 					).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
+						utiltestingapi.MakeAdmission("cq").
 							PodSets(
-								utiltesting.MakePodSetAssignment("head").
+								utiltestingapi.MakePodSetAssignment("head").
 									Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
 									Obj(),
-								utiltesting.MakePodSetAssignment("workers-group-0").
+								utiltestingapi.MakePodSetAssignment("workers-group-0").
 									Obj(),
 							).
 							Obj(),
@@ -441,7 +442,7 @@ func TestReconciler(t *testing.T) {
 		},
 		"when workload is admitted but workload's conditions is Evicted, suspend it and restore node selector": {
 			initObjects: []client.Object{
-				utiltesting.MakeResourceFlavor("unit-test-flavor").NodeLabel(corev1.LabelArchStable, "arm64").Obj(),
+				utiltestingapi.MakeResourceFlavor("unit-test-flavor").NodeLabel(corev1.LabelArchStable, "arm64").Obj(),
 			},
 			job: *baseJobWrapper.Clone().
 				Suspend(false).
@@ -451,10 +452,10 @@ func TestReconciler(t *testing.T) {
 				Suspend(true).
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test", "ns").
+				*utiltestingapi.MakeWorkload("test", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(headGroupPodSetName, 1).
+						*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 							PodSpec(corev1.PodSpec{
 								RestartPolicy: corev1.RestartPolicyNever,
 								Containers: []corev1.Container{
@@ -464,7 +465,7 @@ func TestReconciler(t *testing.T) {
 								},
 							}).
 							Obj(),
-						*utiltesting.MakePodSet("workers-group-0", 1).
+						*utiltestingapi.MakePodSet("workers-group-0", 1).
 							PodSpec(corev1.PodSpec{
 								RestartPolicy: corev1.RestartPolicyNever,
 								Containers: []corev1.Container{
@@ -477,7 +478,7 @@ func TestReconciler(t *testing.T) {
 							Obj(),
 					).
 					Request(corev1.ResourceCPU, "10").
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment("head").Obj(), utiltesting.MakePodSetAssignment("workers-group-0").Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment("head").Obj(), utiltestingapi.MakePodSetAssignment("workers-group-0").Obj()).Obj()).
 					Generation(1).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadEvicted,
@@ -490,9 +491,9 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("a", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(headGroupPodSetName, 1).
+						*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 							PodSpec(corev1.PodSpec{
 								RestartPolicy: corev1.RestartPolicyNever,
 								Containers: []corev1.Container{
@@ -502,7 +503,7 @@ func TestReconciler(t *testing.T) {
 								},
 							}).
 							Obj(),
-						*utiltesting.MakePodSet("workers-group-0", 1).
+						*utiltestingapi.MakePodSet("workers-group-0", 1).
 							PodSpec(corev1.PodSpec{
 								RestartPolicy: corev1.RestartPolicyNever,
 								Containers: []corev1.Container{
@@ -513,7 +514,7 @@ func TestReconciler(t *testing.T) {
 							}).
 							Obj(),
 					).
-					ReserveQuota(utiltesting.MakeAdmission("cq").PodSets(utiltesting.MakePodSetAssignment("head").Obj(), utiltesting.MakePodSetAssignment("workers-group-0").Obj()).Obj()).
+					ReserveQuota(utiltestingapi.MakeAdmission("cq").PodSets(utiltestingapi.MakePodSetAssignment("head").Obj(), utiltestingapi.MakePodSetAssignment("workers-group-0").Obj()).Obj()).
 					Generation(1).
 					PastAdmittedTime(1).
 					Condition(metav1.Condition{
@@ -550,7 +551,7 @@ func TestReconciler(t *testing.T) {
 		},
 		"RayCluster with NumOfHosts > 1": {
 			initObjects: []client.Object{
-				utiltesting.MakeResourceFlavor("unit-test-flavor").NodeLabel(corev1.LabelArchStable, "arm64").Obj(),
+				utiltestingapi.MakeResourceFlavor("unit-test-flavor").NodeLabel(corev1.LabelArchStable, "arm64").Obj(),
 			},
 			job: *baseJobWrapper.Clone().
 				WithNumOfHosts("workers-group-0", 2).
@@ -565,10 +566,10 @@ func TestReconciler(t *testing.T) {
 				NodeAnnotation(rayv1.WorkerNode, kueue.WorkloadAnnotation, "test").
 				Obj(),
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("test", "ns").
+				*utiltestingapi.MakeWorkload("test", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(headGroupPodSetName, 1).
+						*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 							PodSpec(corev1.PodSpec{
 								RestartPolicy: corev1.RestartPolicyNever,
 								Containers: []corev1.Container{
@@ -578,7 +579,7 @@ func TestReconciler(t *testing.T) {
 								},
 							}).
 							Obj(),
-						*utiltesting.MakePodSet("workers-group-0", 2).
+						*utiltestingapi.MakePodSet("workers-group-0", 2).
 							PodSpec(corev1.PodSpec{
 								RestartPolicy: corev1.RestartPolicyNever,
 								Containers: []corev1.Container{
@@ -592,13 +593,13 @@ func TestReconciler(t *testing.T) {
 					).
 					Request(corev1.ResourceCPU, "10").
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
+						utiltestingapi.MakeAdmission("cq").
 							PodSets(
-								utiltesting.MakePodSetAssignment("head").
+								utiltestingapi.MakePodSetAssignment("head").
 									Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
 									Count(2).
 									Obj(),
-								utiltesting.MakePodSetAssignment("workers-group-0").
+								utiltestingapi.MakePodSetAssignment("workers-group-0").
 									Count(2).
 									Obj(),
 							).
@@ -620,10 +621,10 @@ func TestReconciler(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "ns").
+				*utiltestingapi.MakeWorkload("a", "ns").
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet(headGroupPodSetName, 1).
+						*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 							PodSpec(corev1.PodSpec{
 								RestartPolicy: corev1.RestartPolicyNever,
 								Containers: []corev1.Container{
@@ -633,7 +634,7 @@ func TestReconciler(t *testing.T) {
 								},
 							}).
 							Obj(),
-						*utiltesting.MakePodSet("workers-group-0", 2).
+						*utiltestingapi.MakePodSet("workers-group-0", 2).
 							PodSpec(corev1.PodSpec{
 								RestartPolicy: corev1.RestartPolicyNever,
 								Containers: []corev1.Container{
@@ -645,13 +646,13 @@ func TestReconciler(t *testing.T) {
 							Obj(),
 					).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
+						utiltestingapi.MakeAdmission("cq").
 							PodSets(
-								utiltesting.MakePodSetAssignment("head").
+								utiltestingapi.MakePodSetAssignment("head").
 									Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
 									Count(2).
 									Obj(),
-								utiltesting.MakePodSetAssignment("workers-group-0").
+								utiltestingapi.MakePodSetAssignment("workers-group-0").
 									Count(2).
 									Obj(),
 							).
diff --git a/pkg/controller/jobs/raycluster/raycluster_webhook_test.go b/pkg/controller/jobs/raycluster/raycluster_webhook_test.go
index 19ec7109f..0dbe53191 100644
--- a/pkg/controller/jobs/raycluster/raycluster_webhook_test.go
+++ b/pkg/controller/jobs/raycluster/raycluster_webhook_test.go
@@ -34,6 +34,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingrayutil "sigs.k8s.io/kueue/pkg/util/testingjobs/raycluster"
 )
 
@@ -106,7 +107,7 @@ func TestValidateDefault(t *testing.T) {
 			cqCache := schdcache.New(cli)
 			queueManager := qcache.NewManager(cli, cqCache)
 			if tc.defaultLqExist {
-				if err := queueManager.AddLocalQueue(ctx, utiltesting.MakeLocalQueue("default", "default").
+				if err := queueManager.AddLocalQueue(ctx, utiltestingapi.MakeLocalQueue("default", "default").
 					ClusterQueue("cluster-queue").Obj()); err != nil {
 					t.Fatalf("failed to create default local queue: %s", err)
 				}
diff --git a/pkg/controller/jobs/rayjob/rayjob_controller_test.go b/pkg/controller/jobs/rayjob/rayjob_controller_test.go
index 36ed162ca..69a76b7f7 100644
--- a/pkg/controller/jobs/rayjob/rayjob_controller_test.go
+++ b/pkg/controller/jobs/rayjob/rayjob_controller_test.go
@@ -31,6 +31,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/podset"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingrayutil "sigs.k8s.io/kueue/pkg/util/testingjobs/rayjob"
 )
 
@@ -67,13 +68,13 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet("group1", 1).
+					*utiltestingapi.MakePodSet("group1", 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet("group2", 3).
+					*utiltestingapi.MakePodSet("group2", 3).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].Template.Spec.DeepCopy()).
 						Obj(),
 				}
@@ -117,17 +118,17 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Annotations).
 						RequiredTopologyRequest("cloud.com/block").
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName), 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Annotations).
 						RequiredTopologyRequest("cloud.com/block").
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].GroupName), 3).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].GroupName), 3).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].Template.Spec.DeepCopy()).
 						Obj(),
 				}
@@ -171,15 +172,15 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Annotations).
 						PreferredTopologyRequest("cloud.com/block").
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName), 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].GroupName), 3).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].GroupName), 3).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].Template.Annotations).
 						PreferredTopologyRequest("cloud.com/block").
@@ -230,15 +231,15 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Annotations).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName), 1).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName), 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Annotations).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].GroupName), 3).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].GroupName), 3).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].Template.Annotations).
 						Obj(),
@@ -278,17 +279,17 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Annotations).
 						RequiredTopologyRequest("cloud.com/rack").
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName), 3).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName), 3).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Annotations).
 						PreferredTopologyRequest("cloud.com/block").
 						Obj(),
-					*utiltesting.MakePodSet("submitter", 1).
+					*utiltestingapi.MakePodSet("submitter", 1).
 						PodSpec(*getSubmitterTemplate(rayJob).Spec.DeepCopy()).
 						Obj(),
 				}
@@ -342,17 +343,17 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Annotations).
 						RequiredTopologyRequest("cloud.com/rack").
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName), 3).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName), 3).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Annotations).
 						PreferredTopologyRequest("cloud.com/block").
 						Obj(),
-					*utiltesting.MakePodSet("submitter", 1).
+					*utiltestingapi.MakePodSet("submitter", 1).
 						PodSpec(*rayJob.Spec.SubmitterPodTemplate.Spec.DeepCopy()).
 						Annotations(rayJob.Spec.SubmitterPodTemplate.Annotations).
 						RequiredTopologyRequest("cloud.com/block").
@@ -390,13 +391,13 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName), 4).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName), 4).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].GroupName), 12).
+					*utiltestingapi.MakePodSet(kueue.NewPodSetReference(rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].GroupName), 12).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].Template.Spec.DeepCopy()).
 						Obj(),
 				}
@@ -431,16 +432,16 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet("group1", 1).
+					*utiltestingapi.MakePodSet("group1", 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet("group2", 3).
+					*utiltestingapi.MakePodSet("group2", 3).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet("submitter", 1).
+					*utiltestingapi.MakePodSet("submitter", 1).
 						PodSpec(getSubmitterTemplate(rayJob).Spec).
 						Obj(),
 				}
@@ -491,16 +492,16 @@ func TestPodSets(t *testing.T) {
 				Obj()),
 			wantPodSets: func(rayJob *RayJob) []kueue.PodSet {
 				return []kueue.PodSet{
-					*utiltesting.MakePodSet(headGroupPodSetName, 1).
+					*utiltestingapi.MakePodSet(headGroupPodSetName, 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet("group1", 1).
+					*utiltestingapi.MakePodSet("group1", 1).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet("group2", 3).
+					*utiltestingapi.MakePodSet("group2", 3).
 						PodSpec(*rayJob.Spec.RayClusterSpec.WorkerGroupSpecs[1].Template.Spec.DeepCopy()).
 						Obj(),
-					*utiltesting.MakePodSet("submitter", 1).
+					*utiltestingapi.MakePodSet("submitter", 1).
 						PodSpec(corev1.PodSpec{
 							RestartPolicy: corev1.RestartPolicyNever,
 							Containers: []corev1.Container{
diff --git a/pkg/controller/jobs/rayjob/rayjob_webhook_test.go b/pkg/controller/jobs/rayjob/rayjob_webhook_test.go
index 2d3474240..c908c9759 100644
--- a/pkg/controller/jobs/rayjob/rayjob_webhook_test.go
+++ b/pkg/controller/jobs/rayjob/rayjob_webhook_test.go
@@ -34,6 +34,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingrayutil "sigs.k8s.io/kueue/pkg/util/testingjobs/rayjob"
 )
 
@@ -106,7 +107,7 @@ func TestDefault(t *testing.T) {
 			cqCache := schdcache.New(cli)
 			queueManager := qcache.NewManager(cli, cqCache)
 			if tc.defaultLqExist {
-				if err := queueManager.AddLocalQueue(ctx, utiltesting.MakeLocalQueue("default", "default").
+				if err := queueManager.AddLocalQueue(ctx, utiltestingapi.MakeLocalQueue("default", "default").
 					ClusterQueue("cluster-queue").Obj()); err != nil {
 					t.Fatalf("failed to create default local queue: %v", err)
 				}
diff --git a/pkg/controller/jobs/statefulset/statefulset_webhook_test.go b/pkg/controller/jobs/statefulset/statefulset_webhook_test.go
index 484966c4b..2389b0b0c 100644
--- a/pkg/controller/jobs/statefulset/statefulset_webhook_test.go
+++ b/pkg/controller/jobs/statefulset/statefulset_webhook_test.go
@@ -42,6 +42,7 @@ import (
 	podconstants "sigs.k8s.io/kueue/pkg/controller/jobs/pod/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingappwrapper "sigs.k8s.io/kueue/pkg/util/testingjobs/appwrapper"
 	testingleaderworkerset "sigs.k8s.io/kueue/pkg/util/testingjobs/leaderworkerset"
 	testingstatefulset "sigs.k8s.io/kueue/pkg/util/testingjobs/statefulset"
@@ -184,7 +185,7 @@ func TestDefault(t *testing.T) {
 			cqCache := schdcache.New(cli)
 			queueManager := qcache.NewManager(cli, cqCache)
 			if tc.defaultLqExist {
-				if err := queueManager.AddLocalQueue(ctx, utiltesting.MakeLocalQueue("default", "default").
+				if err := queueManager.AddLocalQueue(ctx, utiltestingapi.MakeLocalQueue("default", "default").
 					ClusterQueue("cluster-queue").Obj()); err != nil {
 					t.Fatalf("failed to create default local queue: %s", err)
 				}
diff --git a/pkg/controller/jobs/trainjob/trainjob_controller_test.go b/pkg/controller/jobs/trainjob/trainjob_controller_test.go
index b83e87576..68cdc7785 100644
--- a/pkg/controller/jobs/trainjob/trainjob_controller_test.go
+++ b/pkg/controller/jobs/trainjob/trainjob_controller_test.go
@@ -35,6 +35,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/podset"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjobset "sigs.k8s.io/kueue/pkg/util/testingjobs/jobset"
 	testingtrainjob "sigs.k8s.io/kueue/pkg/util/testingjobs/trainjob"
 )
@@ -332,9 +333,9 @@ func TestReconciler(t *testing.T) {
 			trainJob:     testTrainJob.Clone().Obj(),
 			wantTrainJob: testTrainJob.Clone().Obj(),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload(testTrainJob.Name, testTrainJob.Namespace).
+				*utiltestingapi.MakeWorkload(testTrainJob.Name, testTrainJob.Namespace).
 					PodSets(
-						*utiltesting.MakePodSet("node", 1).
+						*utiltestingapi.MakePodSet("node", 1).
 							PodIndexLabel(ptr.To("batch.kubernetes.io/job-completion-index")).
 							SubGroupIndexLabel(ptr.To(jobsetapi.JobIndexKey)).
 							SubGroupCount(ptr.To[int32](1)).
diff --git a/pkg/controller/jobs/trainjob/trainjob_webhook_test.go b/pkg/controller/jobs/trainjob/trainjob_webhook_test.go
index 8941cbf1a..4392b3647 100644
--- a/pkg/controller/jobs/trainjob/trainjob_webhook_test.go
+++ b/pkg/controller/jobs/trainjob/trainjob_webhook_test.go
@@ -31,6 +31,7 @@ import (
 	controllerconstants "sigs.k8s.io/kueue/pkg/controller/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingtrainjob "sigs.k8s.io/kueue/pkg/util/testingjobs/trainjob"
 )
 
@@ -80,8 +81,8 @@ func TestValidateCreate(t *testing.T) {
 func TestDefault(t *testing.T) {
 	testNamespace := utiltesting.MakeNamespaceWrapper("ns").Label(corev1.LabelMetadataName, "ns")
 	testTrainJob := testingtrainjob.MakeTrainJob("trainjob", testNamespace.Name).Suspend(false)
-	testClusterQueue := utiltesting.MakeClusterQueue("cluster-queue")
-	testLocalQueue := utiltesting.MakeLocalQueue("local-queue", testNamespace.Name).ClusterQueue(testClusterQueue.Name)
+	testClusterQueue := utiltestingapi.MakeClusterQueue("cluster-queue")
+	testLocalQueue := utiltestingapi.MakeLocalQueue("local-queue", testNamespace.Name).ClusterQueue(testClusterQueue.Name)
 	testCases := map[string]struct {
 		trainJob                     *kftrainerapi.TrainJob
 		defaultQueue                 *kueue.LocalQueue
@@ -171,7 +172,7 @@ func TestDefault(t *testing.T) {
 
 			cq := testClusterQueue.Clone()
 			if tc.withMultiKueueAdmissionCheck {
-				admissionCheck := utiltesting.MakeAdmissionCheck("admission-check").
+				admissionCheck := utiltestingapi.MakeAdmissionCheck("admission-check").
 					ControllerName(kueue.MultiKueueControllerName).
 					Active(metav1.ConditionTrue).
 					Obj()
@@ -188,7 +189,7 @@ func TestDefault(t *testing.T) {
 			}
 
 			if tc.withDefaultLocalQueue {
-				if err := queueManager.AddLocalQueue(ctx, utiltesting.MakeLocalQueue("default", testNamespace.Name).
+				if err := queueManager.AddLocalQueue(ctx, utiltestingapi.MakeLocalQueue("default", testNamespace.Name).
 					ClusterQueue(cq.Name).Obj()); err != nil {
 					t.Fatalf("failed to create default local queue: %s", err)
 				}
diff --git a/pkg/controller/tas/node_failure_controller_test.go b/pkg/controller/tas/node_failure_controller_test.go
index b820d3764..eeb38c808 100644
--- a/pkg/controller/tas/node_failure_controller_test.go
+++ b/pkg/controller/tas/node_failure_controller_test.go
@@ -38,6 +38,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/tas/indexer"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
 	testingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 )
@@ -51,15 +52,15 @@ func TestNodeFailureReconciler(t *testing.T) {
 	fakeClock := testingclock.NewFakeClock(testStartTime)
 	wlKey := types.NamespacedName{Name: wlName, Namespace: nsName}
 
-	baseWorkload := utiltesting.MakeWorkload(wlName, nsName).
+	baseWorkload := utiltestingapi.MakeWorkload(wlName, nsName).
 		Finalizers(kueue.ResourceInUseFinalizerName).
-		PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+		PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 		ReserveQuota(
-			utiltesting.MakeAdmission("cq").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			utiltestingapi.MakeAdmission("cq").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
-					TopologyAssignment(utiltesting.MakeTopologyAssignment([]string{corev1.LabelHostname}).
-						Domains(utiltesting.MakeTopologyDomainAssignment([]string{nodeName}, 1).Obj()).
+					TopologyAssignment(utiltestingapi.MakeTopologyAssignment([]string{corev1.LabelHostname}).
+						Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{nodeName}, 1).Obj()).
 						Obj()).
 					Obj()).
 				Obj(),
@@ -69,18 +70,18 @@ func TestNodeFailureReconciler(t *testing.T) {
 
 	workloadWithUnhealthyNode := baseWorkload.DeepCopy()
 	workloadWithUnhealthyNode.Status.UnhealthyNodes = []kueue.UnhealthyNode{{Name: nodeName}}
-	workloadWithTwoNodes := utiltesting.MakeWorkload(wlName, nsName).
+	workloadWithTwoNodes := utiltestingapi.MakeWorkload(wlName, nsName).
 		Finalizers(kueue.ResourceInUseFinalizerName).
-		PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
+		PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
 		ReserveQuota(
-			utiltesting.MakeAdmission("cq").
-				PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			utiltestingapi.MakeAdmission("cq").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
 					Count(2).
-					TopologyAssignment(utiltesting.MakeTopologyAssignment([]string{corev1.LabelHostname}).
+					TopologyAssignment(utiltestingapi.MakeTopologyAssignment([]string{corev1.LabelHostname}).
 						Domains(
-							utiltesting.MakeTopologyDomainAssignment([]string{nodeName}, 1).Obj(),
-							utiltesting.MakeTopologyDomainAssignment([]string{nodeName2}, 1).Obj(),
+							utiltestingapi.MakeTopologyDomainAssignment([]string{nodeName}, 1).Obj(),
+							utiltestingapi.MakeTopologyDomainAssignment([]string{nodeName2}, 1).Obj(),
 						).
 						Obj()).
 					Obj()).
diff --git a/pkg/controller/tas/topology_ungater_test.go b/pkg/controller/tas/topology_ungater_test.go
index bada480df..92e406097 100644
--- a/pkg/controller/tas/topology_ungater_test.go
+++ b/pkg/controller/tas/topology_ungater_test.go
@@ -41,6 +41,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/tas/indexer"
 	utilpod "sigs.k8s.io/kueue/pkg/util/pod"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 
 	_ "sigs.k8s.io/kueue/pkg/controller/jobs/job"
@@ -118,14 +119,14 @@ func TestReconcile(t *testing.T) {
 	}{
 		"ungate single pod": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -158,15 +159,15 @@ func TestReconcile(t *testing.T) {
 		},
 		"ungate multiple pods in a single domain": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
 								Count(3).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 3).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 3).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -208,17 +209,17 @@ func TestReconcile(t *testing.T) {
 		},
 		"ungate multiple pods across multiple domains": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
 								Count(2).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
 									Domains(
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
 									).
 									Obj()).
 								Obj()).
@@ -268,8 +269,8 @@ func TestReconcile(t *testing.T) {
 		},
 		"workload without admission - pod remains gated": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 			pods: []corev1.Pod{
@@ -289,11 +290,11 @@ func TestReconcile(t *testing.T) {
 		},
 		"workload admitted but without topology assignment - pod remains gated": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
 								Count(2).
 								Obj()).
@@ -319,15 +320,15 @@ func TestReconcile(t *testing.T) {
 		},
 		"workload with admission (reserved quota), but not admitted - pod remains gated": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
 								Count(2).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -352,14 +353,14 @@ func TestReconcile(t *testing.T) {
 		},
 		"workload admitted by TAS with single pod without the Workload annotation - Pod remains gated": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -382,14 +383,14 @@ func TestReconcile(t *testing.T) {
 		},
 		"workload admitted by TAS with single pod without the PodSet label - Pod remains gated": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -412,14 +413,14 @@ func TestReconcile(t *testing.T) {
 		},
 		"workload admitted by TAS with single pod without topology gate, remains gated by another gate": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -457,14 +458,14 @@ func TestReconcile(t *testing.T) {
 		},
 		"workload admitted by TAS with single pod with topology gate and another gate, ungated, but remains gated by another gate": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -501,14 +502,14 @@ func TestReconcile(t *testing.T) {
 		},
 		"expect single pod; one already running - don't ungate second pod": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -556,14 +557,14 @@ func TestReconcile(t *testing.T) {
 		},
 		"expect single pod; one ungated pod failed - ungate second pod": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -612,15 +613,15 @@ func TestReconcile(t *testing.T) {
 		},
 		"two pods, one already ungated, second to ungate": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "2").
 								Count(2).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -667,14 +668,14 @@ func TestReconcile(t *testing.T) {
 		},
 		"expect single pod; one ungated pod succeeded - ungate second pod": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -722,15 +723,15 @@ func TestReconcile(t *testing.T) {
 		"ungate single pod; while there are pending expectations": {
 			expectUIDs: []types.UID{"x"},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "2").
 								Count(2).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -777,21 +778,21 @@ func TestReconcile(t *testing.T) {
 		},
 		"ranks: ungate pods according to their ranks for batch/Job - some Pods already scheduled": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "1").
 						PodIndexLabel(ptr.To(batchv1.JobCompletionIndexAnnotation)).
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "5").
 								Count(5).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
 									Domains(
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 2).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 2).Obj(),
 									).
 									Obj()).
 								Obj()).
@@ -898,37 +899,37 @@ func TestReconcile(t *testing.T) {
 		},
 		"ranks: ungate pods according to their ranks for LeaderWorkerSet - for all Pods": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet("workers", 4).
+						*utiltestingapi.MakePodSet("workers", 4).
 							Request(corev1.ResourceCPU, "1").
 							PodIndexLabel(ptr.To(leaderworkersetv1.WorkerIndexLabelKey)).
 							PodSetGroup("lws-group").
 							Obj(),
-						*utiltesting.MakePodSet("leader", 1).
+						*utiltestingapi.MakePodSet("leader", 1).
 							Request(corev1.ResourceCPU, "1").
 							PodIndexLabel(ptr.To(leaderworkersetv1.WorkerIndexLabelKey)).
 							PodSetGroup("lws-group").
 							Obj(),
 					).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
+						utiltestingapi.MakeAdmission("cq").
 							PodSets(
-								utiltesting.MakePodSetAssignment("workers").
+								utiltestingapi.MakePodSetAssignment("workers").
 									Assignment(corev1.ResourceCPU, "unit-test-flavor", "4").
 									Count(4).
-									TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
+									TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
 										Domains(
-											utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj(),
-											utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
-											utiltesting.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 2).Obj(),
+											utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj(),
+											utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
+											utiltestingapi.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 2).Obj(),
 										).
 										Obj()).
 									Obj(),
-								utiltesting.MakePodSetAssignment("leader").
+								utiltestingapi.MakePodSetAssignment("leader").
 									Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
-									TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-										Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
+									TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+										Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
 										Obj()).
 									Obj(),
 							).
@@ -1033,21 +1034,21 @@ func TestReconcile(t *testing.T) {
 		},
 		"ranks: ungate pods according to their ranks for batch/Job - for all Pods": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "1").
 						PodIndexLabel(ptr.To(batchv1.JobCompletionIndexAnnotation)).
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "5").
 								Count(5).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
 									Domains(
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 2).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 2).Obj(),
 									).
 									Obj()).
 								Obj()).
@@ -1155,37 +1156,37 @@ func TestReconcile(t *testing.T) {
 			// but indexes of the second PodSet start from 0 instead of
 			// consecutive number after the first PodSet.
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
 					PodSets(
-						*utiltesting.MakePodSet("workers", 4).
+						*utiltestingapi.MakePodSet("workers", 4).
 							Request(corev1.ResourceCPU, "1").
 							PodIndexLabel(ptr.To(leaderworkersetv1.WorkerIndexLabelKey)).
 							PodSetGroup("lws-group").
 							Obj(),
-						*utiltesting.MakePodSet("leader", 1).
+						*utiltestingapi.MakePodSet("leader", 1).
 							Request(corev1.ResourceCPU, "1").
 							PodIndexLabel(ptr.To(leaderworkersetv1.WorkerIndexLabelKey)).
 							PodSetGroup("lws-group").
 							Obj(),
 					).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
+						utiltestingapi.MakeAdmission("cq").
 							PodSets(
-								utiltesting.MakePodSetAssignment("workers").
+								utiltestingapi.MakePodSetAssignment("workers").
 									Assignment(corev1.ResourceCPU, "unit-test-flavor", "4").
 									Count(4).
-									TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
+									TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
 										Domains(
-											utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj(),
-											utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
-											utiltesting.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 2).Obj(),
+											utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj(),
+											utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
+											utiltestingapi.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 2).Obj(),
 										).
 										Obj()).
 									Obj(),
-								utiltesting.MakePodSetAssignment("leader").
+								utiltestingapi.MakePodSetAssignment("leader").
 									Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
-									TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-										Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
+									TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+										Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
 										Obj()).
 									Obj(),
 							).
@@ -1294,18 +1295,18 @@ func TestReconcile(t *testing.T) {
 			// with unknown labels which we need to support gracefully - the
 			// order may not be optimal, but we cannot fail.
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 4).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 4).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "4").
 								Count(4).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
 									Domains(
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
 									).
 									Obj()).
 								Obj()).
@@ -1391,14 +1392,14 @@ func TestReconcile(t *testing.T) {
 			// The scenario corresponds to parallelism=1, completions=2, backoffLimitPerIndex=0.
 			// The pod with index 0 failed, the Pod with index 1 is created.
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "1").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
-									Domains(utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
+									Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -1452,23 +1453,23 @@ func TestReconcile(t *testing.T) {
 		},
 		"ranks: support rank-based ordering for JobSet - for all Pods": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 4).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 4).
 						Request(corev1.ResourceCPU, "1").
 						PodIndexLabel(ptr.To(batchv1.JobCompletionIndexAnnotation)).
 						SubGroupIndexLabel(ptr.To(jobset.JobIndexKey)).
 						SubGroupCount(ptr.To[int32](2)).
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "4").
 								Count(4).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
 									Domains(
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
 									).
 									Obj()).
 								Obj()).
@@ -1576,23 +1577,23 @@ func TestReconcile(t *testing.T) {
 		},
 		"ranks: support rank-based ordering for JobSet - some Pods already scheduled": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 4).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 4).
 						Request(corev1.ResourceCPU, "1").
 						PodIndexLabel(ptr.To(batchv1.JobCompletionIndexAnnotation)).
 						SubGroupIndexLabel(ptr.To(jobset.JobIndexKey)).
 						SubGroupCount(ptr.To[int32](2)).
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "4").
 								Count(4).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
 									Domains(
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
 									).
 									Obj()).
 								Obj()).
@@ -1702,16 +1703,16 @@ func TestReconcile(t *testing.T) {
 		},
 		"ranks: support rank-based ordering for JobSet - only subset of pods is observed so far": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 4).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 4).
 						Request(corev1.ResourceCPU, "1").
 						PodIndexLabel(ptr.To(batchv1.JobCompletionIndexAnnotation)).
 						SubGroupIndexLabel(ptr.To(jobset.JobIndexKey)).
 						SubGroupCount(ptr.To[int32](2)).
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "4").
 								Count(4).
 								TopologyAssignment(&kueue.TopologyAssignment{
@@ -1804,21 +1805,21 @@ func TestReconcile(t *testing.T) {
 		},
 		"ranks: support rank-based ordering for kubeflow - for all Pods": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 4).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 4).
 						Request(corev1.ResourceCPU, "1").
 						PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "4").
 								Count(4).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
 									Domains(
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
 									).
 									Obj()).
 								Obj()).
@@ -1916,21 +1917,21 @@ func TestReconcile(t *testing.T) {
 		},
 		"ranks: support rank-based ordering for kubeflow - some Pods already scheduled": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 4).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 4).
 						Request(corev1.ResourceCPU, "1").
 						PodIndexLabel(ptr.To(kftraining.ReplicaIndexLabel)).
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "4").
 								Count(4).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
 									Domains(
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
 									).
 									Obj()).
 								Obj()).
@@ -2030,21 +2031,21 @@ func TestReconcile(t *testing.T) {
 		},
 		"ranks: support rank-based ordering for pod groups - for all Pods": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 4).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 4).
 						Request(corev1.ResourceCPU, "1").
 						PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "4").
 								Count(4).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
 									Domains(
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
 									).
 									Obj()).
 								Obj()).
@@ -2136,21 +2137,21 @@ func TestReconcile(t *testing.T) {
 		},
 		"ranks: support rank-based ordering for pod groups - some Pods already scheduled": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 4).
+				*utiltestingapi.MakeWorkload("unit-test", "ns").Finalizers(kueue.ResourceInUseFinalizerName).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 4).
 						Request(corev1.ResourceCPU, "1").
 						PodIndexLabel(ptr.To(kueue.PodGroupPodIndexLabel)).
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("cq").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "unit-test-flavor", "4").
 								Count(4).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(defaultTestLevels).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(defaultTestLevels).
 									Domains(
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
-										utiltesting.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r1"}, 2).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b1", "r2"}, 1).Obj(),
+										utiltestingapi.MakeTopologyDomainAssignment([]string{"b2", "r1"}, 1).Obj(),
 									).
 									Obj()).
 								Obj()).
diff --git a/pkg/controller/workloaddispatcher/incrementaldispatcher_test.go b/pkg/controller/workloaddispatcher/incrementaldispatcher_test.go
index 703a75fb8..c987269d5 100644
--- a/pkg/controller/workloaddispatcher/incrementaldispatcher_test.go
+++ b/pkg/controller/workloaddispatcher/incrementaldispatcher_test.go
@@ -40,6 +40,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/util/admissioncheck"
 	utilmaps "sigs.k8s.io/kueue/pkg/util/maps"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestIncrementalDispatcherReconciler_Reconcile(t *testing.T) {
@@ -47,7 +48,7 @@ func TestIncrementalDispatcherReconciler_Reconcile(t *testing.T) {
 
 	now := time.Now()
 	fakeClock := testingclock.NewFakeClock(now)
-	baseWorkload := utiltesting.MakeWorkload(workloadName, metav1.NamespaceDefault)
+	baseWorkload := utiltestingapi.MakeWorkload(workloadName, metav1.NamespaceDefault)
 
 	tests := map[string]struct {
 		dispatcherName string
@@ -107,7 +108,7 @@ func TestIncrementalDispatcherReconciler_Reconcile(t *testing.T) {
 			},
 			remoteClusters: []string{"cluster1"},
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("cluster1").
+				*utiltestingapi.MakeMultiKueueCluster("cluster1").
 					KubeConfig(kueue.SecretLocationType, "cluster1").
 					Generation(1).
 					Obj(),
@@ -122,7 +123,7 @@ func TestIncrementalDispatcherReconciler_Reconcile(t *testing.T) {
 			},
 			remoteClusters: []string{"cluster1"},
 			clusters: []kueue.MultiKueueCluster{
-				*utiltesting.MakeMultiKueueCluster("cluster1").
+				*utiltestingapi.MakeMultiKueueCluster("cluster1").
 					KubeConfig(kueue.SecretLocationType, "cluster1").
 					Generation(1).
 					Obj(),
@@ -135,7 +136,7 @@ func TestIncrementalDispatcherReconciler_Reconcile(t *testing.T) {
 			objs := []client.Object{}
 			if tc.mkAcState != nil {
 				tc.workload.Status.AdmissionChecks = []kueue.AdmissionCheckState{*tc.mkAcState}
-				ac := utiltesting.MakeAdmissionCheck(string(tc.mkAcState.Name)).
+				ac := utiltestingapi.MakeAdmissionCheck(string(tc.mkAcState.Name)).
 					ControllerName(kueue.MultiKueueControllerName).
 					Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", string(tc.mkAcState.Name)).
 					Obj()
@@ -148,7 +149,7 @@ func TestIncrementalDispatcherReconciler_Reconcile(t *testing.T) {
 			}
 
 			if tc.mkAcState != nil {
-				mkConfig := utiltesting.MakeMultiKueueConfig(string(tc.mkAcState.Name)).Clusters("cluster1").Obj()
+				mkConfig := utiltestingapi.MakeMultiKueueConfig(string(tc.mkAcState.Name)).Clusters("cluster1").Obj()
 				objs = append(objs, mkConfig)
 			}
 			scheme := runtime.NewScheme()
@@ -185,7 +186,7 @@ func TestIncrementalDispatcherNominateWorkers(t *testing.T) {
 	const testName = "test-wl"
 	now := time.Now()
 	fakeClock := testingclock.NewFakeClock(now)
-	baseWl := utiltesting.MakeWorkload(testName, metav1.NamespaceDefault).
+	baseWl := utiltestingapi.MakeWorkload(testName, metav1.NamespaceDefault).
 		AdmissionCheck(kueue.AdmissionCheckState{
 			Name:  "ac1",
 			State: kueue.CheckStatePending,
diff --git a/pkg/dra/claims_test.go b/pkg/dra/claims_test.go
index ccade3e52..130e46b06 100644
--- a/pkg/dra/claims_test.go
+++ b/pkg/dra/claims_test.go
@@ -32,14 +32,14 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	configapi "sigs.k8s.io/kueue/apis/config/v1beta1"
-	kueuev1beta1 "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/dra"
 )
 
 func Test_GetResourceRequests(t *testing.T) {
 	scheme := runtime.NewScheme()
 	_ = clientgoscheme.AddToScheme(scheme)
-	_ = kueuev1beta1.AddToScheme(scheme)
+	_ = kueue.AddToScheme(scheme)
 	_ = resourcev1.AddToScheme(scheme)
 
 	tmpl := &resourcev1.ResourceClaimTemplate{
@@ -74,10 +74,10 @@ func Test_GetResourceRequests(t *testing.T) {
 		},
 	}
 
-	wl := &kueuev1beta1.Workload{
+	wl := &kueue.Workload{
 		ObjectMeta: metav1.ObjectMeta{Name: "wl", Namespace: "ns1"},
-		Spec: kueuev1beta1.WorkloadSpec{
-			PodSets: []kueuev1beta1.PodSet{{
+		Spec: kueue.WorkloadSpec{
+			PodSets: []kueue.PodSet{{
 				Name:  "main",
 				Count: 1,
 				Template: corev1.PodTemplateSpec{
@@ -95,10 +95,10 @@ func Test_GetResourceRequests(t *testing.T) {
 
 	tests := []struct {
 		name         string
-		modifyWL     func(w *kueuev1beta1.Workload)
+		modifyWL     func(w *kueue.Workload)
 		extraObjects []runtime.Object
 		lookup       func(corev1.ResourceName) (corev1.ResourceName, bool)
-		want         map[kueuev1beta1.PodSetReference]corev1.ResourceList
+		want         map[kueue.PodSetReference]corev1.ResourceList
 		wantErr      bool
 	}{
 		{
@@ -111,7 +111,7 @@ func Test_GetResourceRequests(t *testing.T) {
 				lr, ok := m[dc]
 				return lr, ok
 			},
-			want: map[kueuev1beta1.PodSetReference]corev1.ResourceList{
+			want: map[kueue.PodSetReference]corev1.ResourceList{
 				"main": {
 					"res-1": resource.MustParse("2"),
 				},
@@ -124,7 +124,7 @@ func Test_GetResourceRequests(t *testing.T) {
 		},
 		{
 			name: "Two containers each using different claim templates",
-			modifyWL: func(w *kueuev1beta1.Workload) {
+			modifyWL: func(w *kueue.Workload) {
 				w.Spec.PodSets[0].Template.Spec.Containers = []corev1.Container{
 					{
 						Name:  "c1",
@@ -157,11 +157,11 @@ func Test_GetResourceRequests(t *testing.T) {
 				lr, ok := m[dc]
 				return lr, ok
 			},
-			want: map[kueuev1beta1.PodSetReference]corev1.ResourceList{"main": {"res-1": resource.MustParse("2"), "res-2": resource.MustParse("1")}},
+			want: map[kueue.PodSetReference]corev1.ResourceList{"main": {"res-1": resource.MustParse("2"), "res-2": resource.MustParse("1")}},
 		},
 		{
 			name: "Two containers sharing one claim template",
-			modifyWL: func(w *kueuev1beta1.Workload) {
+			modifyWL: func(w *kueue.Workload) {
 				w.Spec.PodSets[0].Template.Spec.Containers = []corev1.Container{
 					{
 						Name:  "c1",
@@ -188,7 +188,7 @@ func Test_GetResourceRequests(t *testing.T) {
 				}
 				return "", false
 			},
-			want: map[kueuev1beta1.PodSetReference]corev1.ResourceList{"main": {"res-1": resource.MustParse("2")}},
+			want: map[kueue.PodSetReference]corev1.ResourceList{"main": {"res-1": resource.MustParse("2")}},
 		},
 		{
 			name: "Single template requesting two devices",
@@ -198,7 +198,7 @@ func Test_GetResourceRequests(t *testing.T) {
 					Spec:       resourcev1.ResourceClaimTemplateSpec{Spec: resourcev1.ResourceClaimSpec{Devices: resourcev1.DeviceClaim{Requests: []resourcev1.DeviceRequest{{Exactly: &resourcev1.ExactDeviceRequest{AllocationMode: resourcev1.DeviceAllocationModeExactCount, Count: 2, DeviceClassName: "test-deviceclass-1"}}}}}},
 				},
 			},
-			modifyWL: func(w *kueuev1beta1.Workload) {
+			modifyWL: func(w *kueue.Workload) {
 				w.Spec.PodSets[0].Template.Spec.Containers = []corev1.Container{
 					{
 						Name:  "c",
@@ -218,11 +218,11 @@ func Test_GetResourceRequests(t *testing.T) {
 				}
 				return "", false
 			},
-			want: map[kueuev1beta1.PodSetReference]corev1.ResourceList{"main": {"res-1": resource.MustParse("2")}},
+			want: map[kueue.PodSetReference]corev1.ResourceList{"main": {"res-1": resource.MustParse("2")}},
 		},
 		{
 			name: "Init and regular container sharing one template",
-			modifyWL: func(w *kueuev1beta1.Workload) {
+			modifyWL: func(w *kueue.Workload) {
 				w.Spec.PodSets[0].Template.Spec.InitContainers = []corev1.Container{
 					{
 						Name:  "init",
@@ -251,7 +251,7 @@ func Test_GetResourceRequests(t *testing.T) {
 				}
 				return "", false
 			},
-			want: map[kueuev1beta1.PodSetReference]corev1.ResourceList{"main": {"res-1": resource.MustParse("2")}},
+			want: map[kueue.PodSetReference]corev1.ResourceList{"main": {"res-1": resource.MustParse("2")}},
 		},
 	}
 
diff --git a/pkg/podset/podset_test.go b/pkg/podset/podset_test.go
index 6a0ea3490..b44bdecbf 100644
--- a/pkg/podset/podset_test.go
+++ b/pkg/podset/podset_test.go
@@ -29,6 +29,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestFromAssignment(t *testing.T) {
@@ -50,14 +51,14 @@ func TestFromAssignment(t *testing.T) {
 		Effect:   corev1.TaintEffectPreferNoSchedule,
 	}
 
-	flavor1 := utiltesting.MakeResourceFlavor("flavor1").
+	flavor1 := utiltestingapi.MakeResourceFlavor("flavor1").
 		NodeLabel("f1l1", "f1v1").
 		NodeLabel("f1l2", "f1v2").
 		Toleration(*toleration1.DeepCopy()).
 		Toleration(*toleration2.DeepCopy()).
 		Obj()
 
-	flavor2 := utiltesting.MakeResourceFlavor("flavor2").
+	flavor2 := utiltestingapi.MakeResourceFlavor("flavor2").
 		NodeLabel("f2l1", "f2v1").
 		NodeLabel("f2l2", "f2v2").
 		Toleration(*toleration3.DeepCopy()).
@@ -257,7 +258,7 @@ func TestFromAssignment(t *testing.T) {
 }
 
 func TestMergeRestore(t *testing.T) {
-	basePodSet := utiltesting.MakePodSet("", 1).
+	basePodSet := utiltestingapi.MakePodSet("", 1).
 		NodeSelector(map[string]string{"ns0": "ns0v"}).
 		Labels(map[string]string{"l0": "l0v"}).
 		Annotations(map[string]string{"a0": "a0v"}).
@@ -301,7 +302,7 @@ func TestMergeRestore(t *testing.T) {
 					},
 				},
 			},
-			wantPodSet: utiltesting.MakePodSet("", 1).
+			wantPodSet: utiltestingapi.MakePodSet("", 1).
 				NodeSelector(map[string]string{"ns0": "ns0v", "ns1": "ns1v"}).
 				Labels(map[string]string{"l0": "l0v", "l1": "l1v"}).
 				Annotations(map[string]string{"a0": "a0v", "a1": "a1v"}).
@@ -341,7 +342,7 @@ func TestMergeRestore(t *testing.T) {
 					},
 				},
 			},
-			wantPodSet: utiltesting.MakePodSet("", 1).
+			wantPodSet: utiltestingapi.MakePodSet("", 1).
 				NodeSelector(map[string]string{"ns0": "ns0v", "ns1": "ns1v"}).
 				Labels(map[string]string{"l0": "l0v", "l1": "l1v"}).
 				Annotations(map[string]string{"a0": "a0v", "a1": "a1v"}).
@@ -382,19 +383,19 @@ func TestMergeRestore(t *testing.T) {
 			wantError: true,
 		},
 		"podset with scheduling gate; empty info": {
-			podSet: utiltesting.MakePodSet("", 1).
+			podSet: utiltestingapi.MakePodSet("", 1).
 				SchedulingGates(corev1.PodSchedulingGate{
 					Name: "example.com/gate",
 				}).
 				Obj(),
-			wantPodSet: utiltesting.MakePodSet("", 1).
+			wantPodSet: utiltestingapi.MakePodSet("", 1).
 				SchedulingGates(corev1.PodSchedulingGate{
 					Name: "example.com/gate",
 				}).
 				Obj(),
 		},
 		"podset with scheduling gate; info re-adds the same": {
-			podSet: utiltesting.MakePodSet("", 1).
+			podSet: utiltestingapi.MakePodSet("", 1).
 				SchedulingGates(corev1.PodSchedulingGate{
 					Name: "example.com/gate",
 				}).
@@ -406,14 +407,14 @@ func TestMergeRestore(t *testing.T) {
 					},
 				},
 			},
-			wantPodSet: utiltesting.MakePodSet("", 1).
+			wantPodSet: utiltestingapi.MakePodSet("", 1).
 				SchedulingGates(corev1.PodSchedulingGate{
 					Name: "example.com/gate",
 				}).
 				Obj(),
 		},
 		"podset with scheduling gate; info adds another": {
-			podSet: utiltesting.MakePodSet("", 1).
+			podSet: utiltestingapi.MakePodSet("", 1).
 				SchedulingGates(corev1.PodSchedulingGate{
 					Name: "example.com/gate",
 				}).
@@ -425,7 +426,7 @@ func TestMergeRestore(t *testing.T) {
 					},
 				},
 			},
-			wantPodSet: utiltesting.MakePodSet("", 1).
+			wantPodSet: utiltestingapi.MakePodSet("", 1).
 				SchedulingGates(corev1.PodSchedulingGate{
 					Name: "example.com/gate",
 				}, corev1.PodSchedulingGate{
@@ -435,21 +436,21 @@ func TestMergeRestore(t *testing.T) {
 			wantRestoreChanges: true,
 		},
 		"podset with tas label; empty info": {
-			podSet: utiltesting.MakePodSet("", 1).
+			podSet: utiltestingapi.MakePodSet("", 1).
 				Labels(map[string]string{kueue.TASLabel: "true"}).
 				Obj(),
-			wantPodSet: utiltesting.MakePodSet("", 1).
+			wantPodSet: utiltestingapi.MakePodSet("", 1).
 				Labels(map[string]string{kueue.TASLabel: "true"}).
 				Obj(),
 		},
 		"podset with tas label; info re-adds the same": {
-			podSet: utiltesting.MakePodSet("", 1).
+			podSet: utiltestingapi.MakePodSet("", 1).
 				Labels(map[string]string{kueue.TASLabel: "true"}).
 				Obj(),
 			info: PodSetInfo{
 				Labels: map[string]string{kueue.TASLabel: "true"},
 			},
-			wantPodSet: utiltesting.MakePodSet("", 1).
+			wantPodSet: utiltestingapi.MakePodSet("", 1).
 				Labels(map[string]string{kueue.TASLabel: "true"}).
 				Obj(),
 		},
diff --git a/pkg/scheduler/flavorassigner/flavorassigner_test.go b/pkg/scheduler/flavorassigner/flavorassigner_test.go
index 926a78c2e..3b6eff74a 100644
--- a/pkg/scheduler/flavorassigner/flavorassigner_test.go
+++ b/pkg/scheduler/flavorassigner/flavorassigner_test.go
@@ -33,6 +33,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/resources"
 	preemptioncommon "sigs.k8s.io/kueue/pkg/scheduler/preemption/common"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
 
@@ -67,18 +68,18 @@ func (f *testOracle) SimulatePreemption(log logr.Logger, cq *schdcache.ClusterQu
 
 func TestAssignFlavors(t *testing.T) {
 	resourceFlavors := map[kueue.ResourceFlavorReference]*kueue.ResourceFlavor{
-		"default": utiltesting.MakeResourceFlavor("default").Obj(),
-		"one":     utiltesting.MakeResourceFlavor("one").NodeLabel("type", "one").Obj(),
-		"two":     utiltesting.MakeResourceFlavor("two").NodeLabel("type", "two").Obj(),
-		"b_one":   utiltesting.MakeResourceFlavor("b_one").NodeLabel("b_type", "one").Obj(),
-		"b_two":   utiltesting.MakeResourceFlavor("b_two").NodeLabel("b_type", "two").Obj(),
-		"tainted": utiltesting.MakeResourceFlavor("tainted").
+		"default": utiltestingapi.MakeResourceFlavor("default").Obj(),
+		"one":     utiltestingapi.MakeResourceFlavor("one").NodeLabel("type", "one").Obj(),
+		"two":     utiltestingapi.MakeResourceFlavor("two").NodeLabel("type", "two").Obj(),
+		"b_one":   utiltestingapi.MakeResourceFlavor("b_one").NodeLabel("b_type", "one").Obj(),
+		"b_two":   utiltestingapi.MakeResourceFlavor("b_two").NodeLabel("b_type", "two").Obj(),
+		"tainted": utiltestingapi.MakeResourceFlavor("tainted").
 			Taint(corev1.Taint{
 				Key:    "instance",
 				Value:  "spot",
 				Effect: corev1.TaintEffectNoSchedule,
 			}).Obj(),
-		"taint_and_toleration": utiltesting.MakeResourceFlavor("taint_and_toleration").
+		"taint_and_toleration": utiltestingapi.MakeResourceFlavor("taint_and_toleration").
 			Taint(corev1.Taint{
 				Key:    "instance",
 				Value:  "spot",
@@ -111,14 +112,14 @@ func TestAssignFlavors(t *testing.T) {
 	}{
 		"single flavor, fits": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1Mi").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "2Mi").
 						Obj(),
@@ -147,7 +148,7 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"single flavor, fits tainted flavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "1").
 					Toleration(corev1.Toleration{
 						Key:      "instance",
@@ -157,9 +158,9 @@ func TestAssignFlavors(t *testing.T) {
 					}).
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("tainted").
+					*utiltestingapi.MakeFlavorQuotas("tainted").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
 				).Obj(),
@@ -183,11 +184,11 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"single flavor, fits tainted flavor with toleration": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj(),
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("taint_and_toleration").
+					*utiltestingapi.MakeFlavorQuotas("taint_and_toleration").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
 				).Obj(),
@@ -211,13 +212,13 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"single flavor, used resources, doesn't fit": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "2").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
 				).Obj(),
@@ -244,25 +245,25 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple resource groups, fits": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "3").
 					Request(corev1.ResourceMemory, "10Mi").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "2").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
 				).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("b_one").
+					*utiltestingapi.MakeFlavorQuotas("b_one").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("b_two").
+					*utiltestingapi.MakeFlavorQuotas("b_two").
 						Resource(corev1.ResourceMemory, "5Gi").
 						Obj(),
 				).
@@ -289,21 +290,21 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple flavors, leader worker set, leader and workers request the same resources fits": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet("worker", 4).
+				*utiltestingapi.MakePodSet("worker", 4).
 					Request(corev1.ResourceCPU, "2").
 					PodSetGroup("group1").
 					Obj(),
-				*utiltesting.MakePodSet("leader", 1).
+				*utiltestingapi.MakePodSet("leader", 1).
 					Request(corev1.ResourceCPU, "1").
 					PodSetGroup("group1").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "9").
 						Obj(),
 				).
@@ -338,27 +339,27 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple flavors, leader worker set, workers request GPU, leader does not request GPU, fits": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet("worker", 4).
+				*utiltestingapi.MakePodSet("worker", 4).
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1").
 					Request("example.com/gpu", "1").
 					PodSetGroup("group1").
 					Obj(),
-				*utiltesting.MakePodSet("leader", 1).
+				*utiltestingapi.MakePodSet("leader", 1).
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1").
 					PodSetGroup("group1").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "10").
 						Resource(corev1.ResourceMemory, "10").
 						Obj(),
 				).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "5").
 						Resource(corev1.ResourceMemory, "5").
 						Resource("example.com/gpu", "4").
@@ -403,23 +404,23 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple flavors, leader worker set, workers request GPU, leader does not request GPU, does not fit, without group it would fit": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet("worker", 4).
+				*utiltestingapi.MakePodSet("worker", 4).
 					Request(corev1.ResourceCPU, "1").
 					Request("example.com/gpu", "1").
 					PodSetGroup("group1").
 					Obj(),
-				*utiltesting.MakePodSet("leader", 1).
+				*utiltestingapi.MakePodSet("leader", 1).
 					Request(corev1.ResourceCPU, "1").
 					PodSetGroup("group1").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "4").
 						Resource("example.com/gpu", "4").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "5").
 						Resource("example.com/gpu", "0").
 						Obj(),
@@ -435,8 +436,8 @@ func TestAssignFlavors(t *testing.T) {
 							"example.com/gpu":  resource.MustParse("4"),
 						},
 						Status: *NewStatus(
-							"insufficient quota for cpu in flavor one, request > maximum capacity (5 > 4)",
-							"insufficient quota for example.com/gpu in flavor two, request > maximum capacity (4 > 0)",
+							"insufficient quota for cpu in flavor one, previously considered podsets requests (0) + current podset request (5) > maximum capacity (4)",
+							"insufficient quota for example.com/gpu in flavor two, previously considered podsets requests (0) + current podset request (4) > maximum capacity (0)",
 						),
 						Count: 4,
 					},
@@ -446,8 +447,8 @@ func TestAssignFlavors(t *testing.T) {
 							corev1.ResourceCPU: resource.MustParse("1"),
 						},
 						Status: *NewStatus(
-							"insufficient quota for cpu in flavor one, request > maximum capacity (5 > 4)",
-							"insufficient quota for example.com/gpu in flavor two, request > maximum capacity (4 > 0)",
+							"insufficient quota for cpu in flavor one, previously considered podsets requests (0) + current podset request (5) > maximum capacity (4)",
+							"insufficient quota for example.com/gpu in flavor two, previously considered podsets requests (0) + current podset request (4) > maximum capacity (0)",
 						),
 						Count: 1,
 					}},
@@ -456,18 +457,18 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple resource groups, one could fit with preemption, other doesn't fit": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "3").
 					Request(corev1.ResourceMemory, "10Mi").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "3").
 						Obj(),
 				).ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("b_one").
+				*utiltestingapi.MakeFlavorQuotas("b_one").
 					Resource(corev1.ResourceMemory, "1Mi").
 					Obj(),
 			).Obj(),
@@ -484,7 +485,7 @@ func TestAssignFlavors(t *testing.T) {
 						corev1.ResourceMemory: resource.MustParse("10Mi"),
 					},
 					Status: *NewStatus(
-						"insufficient quota for memory in flavor b_one, request > maximum capacity (10Mi > 1Mi)",
+						"insufficient quota for memory in flavor b_one, previously considered podsets requests (0) + current podset request (10Mi) > maximum capacity (1Mi)",
 					),
 					Count: 1,
 				}},
@@ -493,27 +494,27 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple resource groups with multiple resources, fits": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "3").
 					Request(corev1.ResourceMemory, "10Mi").
 					Request("example.com/gpu", "3").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "2").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Resource(corev1.ResourceMemory, "15Mi").
 						Obj(),
 				).ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("b_one").
+				*utiltestingapi.MakeFlavorQuotas("b_one").
 					Resource("example.com/gpu", "4").
 					Obj(),
-				*utiltesting.MakeFlavorQuotas("b_two").
+				*utiltestingapi.MakeFlavorQuotas("b_two").
 					Resource("example.com/gpu", "2").
 					Obj(),
 			).Obj(),
@@ -543,24 +544,24 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple resource groups with multiple resources, fits with different modes": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "3").
 					Request(corev1.ResourceMemory, "10Mi").
 					Request("example.com/gpu", "3").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "2").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Resource(corev1.ResourceMemory, "15Mi").
 						Obj(),
 				).ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("b_one").
+				*utiltestingapi.MakeFlavorQuotas("b_one").
 					Resource("example.com/gpu", "4").
 					Obj(),
 			).Cohort("test-cohort").
@@ -568,9 +569,9 @@ func TestAssignFlavors(t *testing.T) {
 			clusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "two", Resource: corev1.ResourceMemory}: 10 * utiltesting.Mi,
 			},
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("b_one").
+					*utiltestingapi.MakeFlavorQuotas("b_one").
 						Resource("example.com/gpu", "0").
 						Obj(),
 				).
@@ -597,7 +598,7 @@ func TestAssignFlavors(t *testing.T) {
 						"example.com/gpu":     resource.MustParse("3"),
 					},
 					Status: *NewStatus(
-						"insufficient quota for cpu in flavor one, request > maximum capacity (3 > 2)",
+						"insufficient quota for cpu in flavor one, previously considered podsets requests (0) + current podset request (3) > maximum capacity (2)",
 						"insufficient unused quota for memory in flavor two, 5Mi more needed",
 						"insufficient unused quota for example.com/gpu in flavor b_one, 1 more needed",
 					),
@@ -613,18 +614,18 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple resources in a group, doesn't fit": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "3").
 					Request(corev1.ResourceMemory, "10Mi").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "2").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Resource(corev1.ResourceMemory, "5Mi").
 						Obj(),
@@ -637,8 +638,8 @@ func TestAssignFlavors(t *testing.T) {
 						corev1.ResourceMemory: resource.MustParse("10Mi"),
 					},
 					Status: *NewStatus(
-						"insufficient quota for cpu in flavor one, request > maximum capacity (3 > 2)",
-						"insufficient quota for memory in flavor two, request > maximum capacity (10Mi > 5Mi)",
+						"insufficient quota for cpu in flavor one, previously considered podsets requests (0) + current podset request (3) > maximum capacity (2)",
+						"insufficient quota for memory in flavor two, previously considered podsets requests (0) + current podset request (10Mi) > maximum capacity (5Mi)",
 					),
 					Count: 1,
 				}},
@@ -647,16 +648,16 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple flavors, fits while skipping tainted flavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "3").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("tainted").
+					*utiltestingapi.MakeFlavorQuotas("tainted").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
 				).Obj(),
@@ -679,7 +680,7 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple flavors, fits a node selector": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					// ignored:foo should get ignored
 					NodeSelector(map[string]string{"type": "two", "ignored1": "foo"}).
 					RequiredDuringSchedulingIgnoredDuringExecution([]corev1.NodeSelectorTerm{
@@ -701,12 +702,12 @@ func TestAssignFlavors(t *testing.T) {
 					).
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
 				).Obj(),
@@ -729,7 +730,7 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple flavors, fits with node affinity": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					NodeSelector(map[string]string{"ignored1": "foo"}).
 					RequiredDuringSchedulingIgnoredDuringExecution([]corev1.NodeSelectorTerm{
 						{
@@ -750,13 +751,13 @@ func TestAssignFlavors(t *testing.T) {
 					).
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "4").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
@@ -784,7 +785,7 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple flavors, node affinity fits any flavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					RequiredDuringSchedulingIgnoredDuringExecution([]corev1.NodeSelectorTerm{
 						{
 							MatchExpressions: []corev1.NodeSelectorRequirement{
@@ -816,12 +817,12 @@ func TestAssignFlavors(t *testing.T) {
 					).
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
 				).Obj(),
@@ -845,7 +846,7 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple flavors, doesn't fit node affinity": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					RequiredDuringSchedulingIgnoredDuringExecution([]corev1.NodeSelectorTerm{
 						{
 							MatchExpressions: []corev1.NodeSelectorRequirement{
@@ -864,12 +865,12 @@ func TestAssignFlavors(t *testing.T) {
 					).
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
 				).Obj(),
@@ -891,19 +892,19 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple specs, fit different flavors": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet("driver", 1).
+				*utiltestingapi.MakePodSet("driver", 1).
 					Request(corev1.ResourceCPU, "5").
 					Obj(),
-				*utiltesting.MakePodSet("worker", 1).
+				*utiltestingapi.MakePodSet("worker", 1).
 					Request(corev1.ResourceCPU, "3").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
 				).Obj(),
@@ -940,26 +941,26 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"multiple specs, fits borrowing": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet("driver", 1).
+				*utiltestingapi.MakePodSet("driver", 1).
 					Request(corev1.ResourceCPU, "4").
 					Request(corev1.ResourceMemory, "1Gi").
 					Obj(),
-				*utiltesting.MakePodSet("worker", 1).
+				*utiltestingapi.MakePodSet("worker", 1).
 					Request(corev1.ResourceCPU, "6").
 					Request(corev1.ResourceMemory, "4Gi").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("2").BorrowingLimit("98").Append().
 						Resource(corev1.ResourceMemory, "2Gi").
 						Obj(),
 				).Cohort("test-cohort").
 				Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "198").
 						Resource(corev1.ResourceMemory, "198Gi").
 						Obj(),
@@ -1003,19 +1004,19 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"not enough space to borrow": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "2").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "1").
 						Obj(),
 				).Cohort("test-cohort").Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("10").LendingLimit("0").Append().
 						Obj(),
 				).
@@ -1030,7 +1031,7 @@ func TestAssignFlavors(t *testing.T) {
 					Requests: corev1.ResourceList{
 						corev1.ResourceCPU: resource.MustParse("2"),
 					},
-					Status: *NewStatus("insufficient quota for cpu in flavor one, request > maximum capacity (2 > 1)"),
+					Status: *NewStatus("insufficient quota for cpu in flavor one, previously considered podsets requests (0) + current podset request (2) > maximum capacity (1)"),
 					Count:  1,
 				}},
 				Usage: workload.Usage{Quota: resources.FlavorResourceQuantities{}},
@@ -1038,13 +1039,13 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"past max, but can preempt in ClusterQueue": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "2").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("2").BorrowingLimit("8").Append().
 						Obj(),
 				).Cohort("test-cohort").
@@ -1052,9 +1053,9 @@ func TestAssignFlavors(t *testing.T) {
 			clusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "one", Resource: corev1.ResourceCPU}: 9_000,
 			},
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "98").
 						Obj(),
 				).
@@ -1087,13 +1088,13 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"past min, but can preempt in ClusterQueue": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "2").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "2").
 						Obj(),
 				).Obj(),
@@ -1120,22 +1121,22 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"past min, but can preempt in cohort and ClusterQueue": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "2").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "3").
 						Obj(),
 				).Cohort("test-cohort").Obj(),
 			clusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "one", Resource: corev1.ResourceCPU}: 2_000,
 			},
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "7").
 						Obj(),
 				).
@@ -1168,18 +1169,18 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"can only preempt flavors that match affinity": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Containers(
 						utiltesting.SingleContainerForRequest(map[corev1.ResourceName]string{corev1.ResourceCPU: "2"})...,
 					).NodeSelector(map[string]string{"type": "two"}).
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
 				).Obj(),
@@ -1210,10 +1211,10 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"each podset requires preemption on a different flavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet("launcher", 1).
+				*utiltestingapi.MakePodSet("launcher", 1).
 					Request(corev1.ResourceCPU, "2").
 					Obj(),
-				*utiltesting.MakePodSet("workers", 10).
+				*utiltestingapi.MakePodSet("workers", 10).
 					Request(corev1.ResourceCPU, "1").
 					Toleration(corev1.Toleration{
 						Key:      "instance",
@@ -1223,12 +1224,12 @@ func TestAssignFlavors(t *testing.T) {
 					}).
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("tainted").
+					*utiltestingapi.MakeFlavorQuotas("tainted").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
 				).Obj(),
@@ -1262,7 +1263,7 @@ func TestAssignFlavors(t *testing.T) {
 							corev1.ResourceCPU: resource.MustParse("10"),
 						},
 						Status: *NewStatus(
-							"insufficient quota for cpu in flavor one, request > maximum capacity (12 > 4)",
+							"insufficient quota for cpu in flavor one, previously considered podsets requests (2) + current podset request (10) > maximum capacity (4)",
 							"insufficient unused quota for cpu in flavor tainted, 3 more needed",
 						),
 						Count: 10,
@@ -1276,13 +1277,13 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"resource not listed in clusterQueue": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request("example.com/gpu", "2").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "4").
 						Obj(),
 				).Obj(),
@@ -1300,13 +1301,13 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"num pods fit": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					Request(corev1.ResourceCPU, "1").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourcePods, "3").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
@@ -1335,13 +1336,13 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"num pods don't fit": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					Request(corev1.ResourceCPU, "1").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourcePods, "2").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
@@ -1354,7 +1355,7 @@ func TestAssignFlavors(t *testing.T) {
 						corev1.ResourceCPU:  resource.MustParse("3"),
 						corev1.ResourcePods: resource.MustParse("3"),
 					},
-					Status: *NewStatus("insufficient quota for pods in flavor default, request > maximum capacity (3 > 2)"),
+					Status: *NewStatus("insufficient quota for pods in flavor default, previously considered podsets requests (0) + current podset request (3) > maximum capacity (2)"),
 					Count:  3,
 				}},
 				Usage: workload.Usage{Quota: resources.FlavorResourceQuantities{}},
@@ -1362,7 +1363,7 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"with reclaimable pods": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 					Request(corev1.ResourceCPU, "1").
 					Obj(),
 			},
@@ -1372,9 +1373,9 @@ func TestAssignFlavors(t *testing.T) {
 					Count: 2,
 				},
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourcePods, "3").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
@@ -1402,18 +1403,18 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"preempt before try next flavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "9").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.MayStopSearch, WhenCanPreempt: kueue.MayStopSearch}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourcePods, "10").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourcePods, "10").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
@@ -1444,18 +1445,18 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"preempt before try next flavor; using deprecated WhenCanBorrow=Borrow,WhenCanPreempt=Preempt": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "9").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.Borrow, WhenCanPreempt: kueue.Preempt}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourcePods, "10").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourcePods, "10").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
@@ -1486,17 +1487,17 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"preempt try next flavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "9").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourcePods, "10").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourcePods, "10").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
@@ -1526,18 +1527,18 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"borrow try next flavor, found the first flavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "9").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.TryNextFlavor, WhenCanPreempt: kueue.TryNextFlavor}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourcePods, "10").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("10").BorrowingLimit("1").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourcePods, "10").
 						Resource(corev1.ResourceCPU, "1").
 						Obj(),
@@ -1546,9 +1547,9 @@ func TestAssignFlavors(t *testing.T) {
 			clusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "one", Resource: corev1.ResourceCPU}: 2_000,
 			},
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "1").
 						Obj(),
 				).
@@ -1577,18 +1578,18 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"borrow try next flavor, found the second flavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "9").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.TryNextFlavor, WhenCanPreempt: kueue.TryNextFlavor}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourcePods, "10").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("10").BorrowingLimit("1").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourcePods, "10").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
@@ -1598,9 +1599,9 @@ func TestAssignFlavors(t *testing.T) {
 				{Flavor: "one", Resource: corev1.ResourceCPU}: 2_000,
 			},
 
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "1").
 						Obj(),
 				).
@@ -1628,17 +1629,17 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"borrow before try next flavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "9").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourcePods, "10").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("10").BorrowingLimit("1").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourcePods, "10").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
@@ -1647,9 +1648,9 @@ func TestAssignFlavors(t *testing.T) {
 			clusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "one", Resource: corev1.ResourceCPU}: 2_000,
 			},
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "1").
 						Obj(),
 				).
@@ -1678,11 +1679,11 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"when borrowing while preemption is needed for flavor one; WhenCanBorrow=MayStopSearch": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "12").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					BorrowWithinCohort: &kueue.BorrowWithinCohort{
@@ -1694,16 +1695,16 @@ func TestAssignFlavors(t *testing.T) {
 					WhenCanPreempt: kueue.MayStopSearch,
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").BorrowingLimit("12").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).Cohort("test-cohort").Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).
@@ -1736,11 +1737,11 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"when borrowing while preemption is needed for flavor one; WhenCanBorrow=Borrow,WhenCanPreempt=Preempt": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "12").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					BorrowWithinCohort: &kueue.BorrowWithinCohort{
@@ -1752,16 +1753,16 @@ func TestAssignFlavors(t *testing.T) {
 					WhenCanPreempt: kueue.Preempt,
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").BorrowingLimit("12").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).Cohort("test-cohort").Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).
@@ -1794,11 +1795,11 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"when borrowing while preemption is needed for flavor one, no borrowingLimit; WhenCanBorrow=MayStopSearch": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "12").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					BorrowWithinCohort: &kueue.BorrowWithinCohort{
@@ -1810,16 +1811,16 @@ func TestAssignFlavors(t *testing.T) {
 					WhenCanPreempt: kueue.MayStopSearch,
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "0").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).Cohort("test-cohort").Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).
@@ -1852,11 +1853,11 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"when borrowing while preemption is needed for flavor one, no borrowingLimit; WhenCanBorrow=Borrow,WhenCanPreempt=Preempt": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "12").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					BorrowWithinCohort: &kueue.BorrowWithinCohort{
@@ -1868,16 +1869,16 @@ func TestAssignFlavors(t *testing.T) {
 					WhenCanPreempt: kueue.Preempt,
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "0").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).Cohort("test-cohort").Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).
@@ -1910,11 +1911,11 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"when borrowing while preemption is needed for flavor one; WhenCanBorrow=TryNextFlavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "12").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					BorrowWithinCohort: &kueue.BorrowWithinCohort{
@@ -1926,17 +1927,17 @@ func TestAssignFlavors(t *testing.T) {
 					WhenCanPreempt: kueue.MayStopSearch,
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").BorrowingLimit("12").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).Cohort("test-cohort").
 				Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).
@@ -1961,11 +1962,11 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"when borrowing while preemption is needed for flavor one; WhenCanBorrow=TryNextFlavor,WhenCanPreempt=Preempt": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "12").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					BorrowWithinCohort: &kueue.BorrowWithinCohort{
@@ -1977,17 +1978,17 @@ func TestAssignFlavors(t *testing.T) {
 					WhenCanPreempt: kueue.Preempt,
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").BorrowingLimit("12").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).Cohort("test-cohort").
 				Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).
@@ -2012,11 +2013,11 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"when borrowing while preemption is needed, but borrowingLimit exceeds the quota available in the cohort": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "12").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					BorrowWithinCohort: &kueue.BorrowWithinCohort{
@@ -2024,13 +2025,13 @@ func TestAssignFlavors(t *testing.T) {
 					},
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").BorrowingLimit("12").Append().
 						Obj(),
 				).Cohort("test-cohort").Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "11").
 						Obj(),
 				).
@@ -2045,7 +2046,7 @@ func TestAssignFlavors(t *testing.T) {
 				PodSets: []PodSetAssignment{
 					{
 						Name:   kueue.DefaultPodSetName,
-						Status: *NewStatus("insufficient quota for cpu in flavor one, request > maximum capacity (12 > 11)"),
+						Status: *NewStatus("insufficient quota for cpu in flavor one, previously considered podsets requests (0) + current podset request (12) > maximum capacity (11)"),
 						Requests: corev1.ResourceList{
 							corev1.ResourceCPU: resource.MustParse("12"),
 						},
@@ -2056,21 +2057,21 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"lend try next flavor, found the second flavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "9").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				FlavorFungibility(kueue.FlavorFungibility{
 					WhenCanBorrow:  kueue.TryNextFlavor,
 					WhenCanPreempt: kueue.TryNextFlavor},
 				).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourcePods, "10").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("10").LendingLimit("1").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourcePods, "10").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("10").LendingLimit("0").Append().
 						Obj(),
@@ -2079,9 +2080,9 @@ func TestAssignFlavors(t *testing.T) {
 			clusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "one", Resource: corev1.ResourceCPU}: 2_000,
 			},
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "1").
 						Obj(),
 				).
@@ -2109,18 +2110,18 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"lend try next flavor, found the first flavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "9").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.TryNextFlavor, WhenCanPreempt: kueue.TryNextFlavor}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourcePods, "10").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("10").LendingLimit("1").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourcePods, "10").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("1").LendingLimit("0").Append().
 						Obj(),
@@ -2129,9 +2130,9 @@ func TestAssignFlavors(t *testing.T) {
 			clusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "one", Resource: corev1.ResourceCPU}: 2_000,
 			},
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "1").
 						Obj(),
 				).
@@ -2160,11 +2161,11 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"cannot preempt in cohort (oracle returns None) for the first flavor, tries the second flavor (which fits)": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "2").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.MayStopSearch, WhenCanPreempt: kueue.MayStopSearch}).
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
@@ -2173,20 +2174,20 @@ func TestAssignFlavors(t *testing.T) {
 					},
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").BorrowingLimit("2").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").BorrowingLimit("2").Append().
 						Obj(),
 				).Cohort("test-cohort").
 				Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("2").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("2").Append().
 						Obj(),
 				).
@@ -2218,11 +2219,11 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"cannot preempt in cohort (oracle returns None) for the first flavor, tries the second flavor (which fits); using deprecated WhenCanBorrow=Borrow,WhenCanPreempt=Preempt": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "2").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.Borrow, WhenCanPreempt: kueue.Preempt}).
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
@@ -2231,20 +2232,20 @@ func TestAssignFlavors(t *testing.T) {
 					},
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").BorrowingLimit("2").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").BorrowingLimit("2").Append().
 						Obj(),
 				).Cohort("test-cohort").
 				Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("2").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("2").Append().
 						Obj(),
 				).
@@ -2276,13 +2277,13 @@ func TestAssignFlavors(t *testing.T) {
 		},
 		"quota exhausted, but can preempt in cohort and ClusterQueue": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "9").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourcePods, "10").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("10").LendingLimit("0").Append().
 						Obj(),
@@ -2290,9 +2291,9 @@ func TestAssignFlavors(t *testing.T) {
 			clusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "one", Resource: corev1.ResourceCPU}: 2_000,
 			},
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourcePods, "0").
 						Resource(corev1.ResourceCPU, "0").
 						Obj(),
@@ -2327,24 +2328,24 @@ func TestAssignFlavors(t *testing.T) {
 		"when borrowing while preemption is needed for flavor one, fair sharing enabled, reclaimWithinCohort=Any": {
 			enableFairSharing: true,
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "12").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Preemption(kueue.ClusterQueuePreemption{ReclaimWithinCohort: kueue.PreemptionPolicyAny}).
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.MayStopSearch, WhenCanPreempt: kueue.MayStopSearch}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "0").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).Cohort("test-cohort").Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).
@@ -2378,24 +2379,24 @@ func TestAssignFlavors(t *testing.T) {
 		"when borrowing while preemption is needed for flavor one, fair sharing enabled, reclaimWithinCohort=Any; using deprecated WhenCanBorrow=Borrow,WhenCanPreempt=Preempt": {
 			enableFairSharing: true,
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "12").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Preemption(kueue.ClusterQueuePreemption{ReclaimWithinCohort: kueue.PreemptionPolicyAny}).
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.Borrow, WhenCanPreempt: kueue.Preempt}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "0").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).Cohort("test-cohort").Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).
@@ -2429,24 +2430,24 @@ func TestAssignFlavors(t *testing.T) {
 		"when borrowing while preemption is needed for flavor one, fair sharing enabled, reclaimWithinCohort=Never": {
 			enableFairSharing: true,
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "12").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Preemption(kueue.ClusterQueuePreemption{ReclaimWithinCohort: kueue.PreemptionPolicyNever}).
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.MayStopSearch, WhenCanPreempt: kueue.MayStopSearch}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "0").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).Cohort("test-cohort").Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).
@@ -2478,24 +2479,24 @@ func TestAssignFlavors(t *testing.T) {
 		"when borrowing while preemption is needed for flavor one, fair sharing enabled, reclaimWithinCohort=Never; using deprecated WhenCanBorrow=Borrow,WhenCanPreempt=Preempt": {
 			enableFairSharing: true,
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "12").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Preemption(kueue.ClusterQueuePreemption{ReclaimWithinCohort: kueue.PreemptionPolicyNever}).
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.Borrow, WhenCanPreempt: kueue.Preempt}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "0").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).Cohort("test-cohort").Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("test-secondary-clusterqueue").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("test-secondary-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "12").
 						Obj(),
 				).
@@ -2527,18 +2528,18 @@ func TestAssignFlavors(t *testing.T) {
 		"workload slice preemption fits in the original workload resource flavor": {
 			elasticJobsViaWorkloadSlicesEnabled: true,
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "3").
 					Request(corev1.ResourceMemory, "10Mi").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "2").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Resource(corev1.ResourceMemory, "2Gi").
 						Obj(),
@@ -2582,18 +2583,18 @@ func TestAssignFlavors(t *testing.T) {
 		"workload slice preemption does not fit in the original workload resource flavor": {
 			elasticJobsViaWorkloadSlicesEnabled: true,
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "3").
 					Request(corev1.ResourceMemory, "10Mi").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "500m"). // <-- does not fit after scale-up.
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Resource(corev1.ResourceMemory, "2Gi").
 						Obj(),
@@ -2624,7 +2625,7 @@ func TestAssignFlavors(t *testing.T) {
 					},
 					Count: 1,
 					Status: *NewStatus(
-						"insufficient quota for cpu in flavor one, request > maximum capacity (1 > 500m)",
+						"insufficient quota for cpu in flavor one, previously considered podsets requests (0) + current podset request (1) > maximum capacity (500m)",
 						"could not assign two flavor since the original workload is assigned: one",
 					),
 				}},
@@ -2634,31 +2635,31 @@ func TestAssignFlavors(t *testing.T) {
 		"preferPreemption; preempt without borrowing is preferred over fit with borrowing; preempt within cohort": {
 			enableImplicitPreferenceDefault: true,
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet("main", 1).
+				*utiltestingapi.MakePodSet("main", 1).
 					Request(corev1.ResourceCPU, "10").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("cq-test").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("cq-test").
 				Cohort("cohort").
 				FlavorFungibility(kueue.FlavorFungibility{
 					WhenCanPreempt: kueue.TryNextFlavor,
 					WhenCanBorrow:  kueue.TryNextFlavor,
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "5").
 						Obj(),
 				).Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("cq-secondary").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("cq-secondary").
 				Cohort("cohort").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "5").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "5").
 						Obj(),
 				).
@@ -2688,31 +2689,31 @@ func TestAssignFlavors(t *testing.T) {
 		"preferPreemption; preempt without borrowing is preferred over fit with borrowing; preempt in own CQ": {
 			enableImplicitPreferenceDefault: true,
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet("main", 1).
+				*utiltestingapi.MakePodSet("main", 1).
 					Request(corev1.ResourceCPU, "10").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("cq-test").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("cq-test").
 				Cohort("cohort").
 				FlavorFungibility(kueue.FlavorFungibility{
 					WhenCanPreempt: kueue.TryNextFlavor,
 					WhenCanBorrow:  kueue.TryNextFlavor,
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "5").
 						Obj(),
 				).Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("cq-secondary").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("cq-secondary").
 				Cohort("cohort").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "5").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "5").
 						Obj(),
 				).
@@ -2742,31 +2743,31 @@ func TestAssignFlavors(t *testing.T) {
 		"preferPreemption; fit without borrowing is preferred over fit with borrowing": {
 			enableImplicitPreferenceDefault: true,
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet("main", 1).
+				*utiltestingapi.MakePodSet("main", 1).
 					Request(corev1.ResourceCPU, "10").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("cq-test").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("cq-test").
 				Cohort("cohort").
 				FlavorFungibility(kueue.FlavorFungibility{
 					WhenCanPreempt: kueue.TryNextFlavor,
 					WhenCanBorrow:  kueue.TryNextFlavor,
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "5").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
 				).Obj(),
-			secondaryClusterQueue: utiltesting.MakeClusterQueue("cq-secondary").
+			secondaryClusterQueue: utiltestingapi.MakeClusterQueue("cq-secondary").
 				Cohort("cohort").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").
+					*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "5").
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("two").
+					*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "5").
 						Obj(),
 				).
@@ -2821,7 +2822,7 @@ func TestAssignFlavors(t *testing.T) {
 				cache.AddOrUpdateResourceFlavor(log, rf)
 			}
 
-			if err := cache.AddOrUpdateCohort(utiltesting.MakeCohort(tc.clusterQueue.Spec.Cohort).Obj()); err != nil {
+			if err := cache.AddOrUpdateCohort(utiltestingapi.MakeCohort(tc.clusterQueue.Spec.Cohort).Obj()); err != nil {
 				t.Fatalf("Failed to create a cohort")
 			}
 
@@ -2872,7 +2873,7 @@ func TestAssignFlavors(t *testing.T) {
 func TestReclaimBeforePriorityPreemption(t *testing.T) {
 	type rfMap = map[corev1.ResourceName]kueue.ResourceFlavorReference
 	cases := map[string]struct {
-		workloadRequests       *utiltesting.PodSetWrapper
+		workloadRequests       *utiltestingapi.PodSetWrapper
 		testClusterQueueUsage  resources.FlavorResourceQuantities
 		otherClusterQueueUsage resources.FlavorResourceQuantities
 		flavorFungibility      *kueue.FlavorFungibility
@@ -2881,7 +2882,7 @@ func TestReclaimBeforePriorityPreemption(t *testing.T) {
 		simulationResult       map[resources.FlavorResource]simulationResultForFlavor
 	}{
 		"Select first flavor which fits": {
-			workloadRequests: utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("gpu", "10"),
+			workloadRequests: utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("gpu", "10"),
 			testClusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "uno", Resource: "gpu"}: 1,
 			},
@@ -2892,7 +2893,7 @@ func TestReclaimBeforePriorityPreemption(t *testing.T) {
 			wantAssigment: rfMap{"gpu": "tre"},
 		},
 		"Select first flavor where gpu reclamation is possible": {
-			workloadRequests: utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("gpu", "10"),
+			workloadRequests: utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("gpu", "10"),
 			testClusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "uno", Resource: "gpu"}: 1,
 			},
@@ -2908,7 +2909,7 @@ func TestReclaimBeforePriorityPreemption(t *testing.T) {
 			wantAssigment: rfMap{"gpu": "due"},
 		},
 		"Select first flavor when flavor fungibility is disabled": {
-			workloadRequests: utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("gpu", "10"),
+			workloadRequests: utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("gpu", "10"),
 			testClusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "uno", Resource: "gpu"}: 1,
 			},
@@ -2923,7 +2924,7 @@ func TestReclaimBeforePriorityPreemption(t *testing.T) {
 			wantAssigment: rfMap{"gpu": "uno"},
 		},
 		"Select first flavor when flavor fungibility is disabled; using deprecated WhenCanPreempt=Preempt": {
-			workloadRequests: utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("gpu", "10"),
+			workloadRequests: utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("gpu", "10"),
 			testClusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "uno", Resource: "gpu"}: 1,
 			},
@@ -2938,7 +2939,7 @@ func TestReclaimBeforePriorityPreemption(t *testing.T) {
 			wantAssigment: rfMap{"gpu": "uno"},
 		},
 		"Select first flavor where priority based preemption is possible": {
-			workloadRequests: utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("gpu", "10"),
+			workloadRequests: utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("gpu", "10"),
 			testClusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "uno", Resource: "gpu"}: 1,
 				{Flavor: "due", Resource: "gpu"}: 1,
@@ -2948,7 +2949,7 @@ func TestReclaimBeforePriorityPreemption(t *testing.T) {
 			wantAssigment: rfMap{"gpu": "uno"},
 		},
 		"Select second flavor where gpu reclamation is possible, as compute Fits": {
-			workloadRequests: utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("gpu", "10").Request("compute", "10"),
+			workloadRequests: utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("gpu", "10").Request("compute", "10"),
 			testClusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "uno", Resource: "gpu"}:     1,
 				{Flavor: "uno", Resource: "compute"}: 1,
@@ -2971,11 +2972,11 @@ func TestReclaimBeforePriorityPreemption(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			ctx, _ := utiltesting.ContextWithLog(t)
 			resourceFlavors := map[kueue.ResourceFlavorReference]*kueue.ResourceFlavor{
-				"uno": utiltesting.MakeResourceFlavor("uno").Obj(),
-				"due": utiltesting.MakeResourceFlavor("due").Obj(),
-				"tre": utiltesting.MakeResourceFlavor("tre").Obj(),
+				"uno": utiltestingapi.MakeResourceFlavor("uno").Obj(),
+				"due": utiltestingapi.MakeResourceFlavor("due").Obj(),
+				"tre": utiltestingapi.MakeResourceFlavor("tre").Obj(),
 			}
-			testCq := *utiltesting.MakeClusterQueue("test-clusterqueue").
+			testCq := *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Cohort("cohort").
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -2985,16 +2986,16 @@ func TestReclaimBeforePriorityPreemption(t *testing.T) {
 					WhenCanPreempt: kueue.TryNextFlavor,
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("uno").Resource("compute", "10").Resource("gpu", "10").Obj(),
-					*utiltesting.MakeFlavorQuotas("due").Resource("compute", "10").Resource("gpu", "10").Obj(),
-					*utiltesting.MakeFlavorQuotas("tre").Resource("compute", "10").Resource("gpu", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("uno").Resource("compute", "10").Resource("gpu", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("due").Resource("compute", "10").Resource("gpu", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("tre").Resource("compute", "10").Resource("gpu", "10").Obj(),
 				).Obj()
-			otherCq := *utiltesting.MakeClusterQueue("other-clusterqueue").
+			otherCq := *utiltestingapi.MakeClusterQueue("other-clusterqueue").
 				Cohort("cohort").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("uno").Resource("compute", "0").Resource("gpu", "0").Obj(),
-					*utiltesting.MakeFlavorQuotas("due").Resource("compute", "0").Resource("gpu", "0").Obj(),
-					*utiltesting.MakeFlavorQuotas("tre").Resource("compute", "0").Resource("gpu", "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("uno").Resource("compute", "0").Resource("gpu", "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("due").Resource("compute", "0").Resource("gpu", "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("tre").Resource("compute", "0").Resource("gpu", "0").Obj(),
 				).Obj()
 
 			wlInfo := workload.NewInfo(&kueue.Workload{
@@ -3060,16 +3061,16 @@ func TestDeletedFlavors(t *testing.T) {
 	}{
 		"multiple flavors, skip missing ResourceFlavor": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "3").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("deleted-flavor").
+					*utiltestingapi.MakeFlavorQuotas("deleted-flavor").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("4").Append().
 						Obj(),
-					*utiltesting.MakeFlavorQuotas("flavor").
+					*utiltestingapi.MakeFlavorQuotas("flavor").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("4").Append().
 						Obj(),
 				).Obj(),
@@ -3092,13 +3093,13 @@ func TestDeletedFlavors(t *testing.T) {
 		},
 		"flavor not found": {
 			wlPods: []kueue.PodSet{
-				*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+				*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "1").
 					Obj(),
 			},
-			clusterQueue: *utiltesting.MakeClusterQueue("test-clusterqueue").
+			clusterQueue: *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("deleted-flavor").
+					*utiltestingapi.MakeFlavorQuotas("deleted-flavor").
 						ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("4").Append().
 						Obj(),
 				).Obj(),
@@ -3137,8 +3138,8 @@ func TestDeletedFlavors(t *testing.T) {
 			}
 
 			flavorMap := map[kueue.ResourceFlavorReference]*kueue.ResourceFlavor{
-				"flavor":         utiltesting.MakeResourceFlavor("flavor").Obj(),
-				"deleted-flavor": utiltesting.MakeResourceFlavor("deleted-flavor").Obj(),
+				"flavor":         utiltestingapi.MakeResourceFlavor("flavor").Obj(),
+				"deleted-flavor": utiltestingapi.MakeResourceFlavor("deleted-flavor").Obj(),
 			}
 
 			// we have to add the deleted flavor to the cache before snapshot,
@@ -3229,7 +3230,7 @@ func TestLastAssignmentOutdated(t *testing.T) {
 func TestHierarchical(t *testing.T) {
 	type rfMap = map[corev1.ResourceName]kueue.ResourceFlavorReference
 	cases := map[string]struct {
-		workloadRequests       *utiltesting.PodSetWrapper
+		workloadRequests       *utiltestingapi.PodSetWrapper
 		testClusterQueueUsage  resources.FlavorResourceQuantities
 		otherClusterQueueUsage resources.FlavorResourceQuantities
 		flavorFungibility      *kueue.FlavorFungibility
@@ -3237,7 +3238,7 @@ func TestHierarchical(t *testing.T) {
 		wantAssigment          rfMap
 	}{
 		"Select the top flavor": {
-			workloadRequests: utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "4"),
+			workloadRequests: utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "4"),
 			testClusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "one", Resource: corev1.ResourceCPU}: 4_000,
 			},
@@ -3248,7 +3249,7 @@ func TestHierarchical(t *testing.T) {
 			wantAssigment: rfMap{corev1.ResourceCPU: "three"},
 		},
 		"Select the first flavor which fits": {
-			workloadRequests: utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "4"),
+			workloadRequests: utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "4"),
 			testClusterQueueUsage: resources.FlavorResourceQuantities{
 				{Flavor: "one", Resource: corev1.ResourceCPU}: 4_000,
 			},
@@ -3260,45 +3261,45 @@ func TestHierarchical(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			ctx, _ := utiltesting.ContextWithLog(t)
 			resourceFlavors := map[kueue.ResourceFlavorReference]*kueue.ResourceFlavor{
-				"one":   utiltesting.MakeResourceFlavor("one").Obj(),
-				"two":   utiltesting.MakeResourceFlavor("two").Obj(),
-				"three": utiltesting.MakeResourceFlavor("three").Obj(),
+				"one":   utiltestingapi.MakeResourceFlavor("one").Obj(),
+				"two":   utiltestingapi.MakeResourceFlavor("two").Obj(),
+				"three": utiltestingapi.MakeResourceFlavor("three").Obj(),
 			}
 			cohorts := []*kueue.Cohort{
-				utiltesting.MakeCohort("three").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("three").
+				utiltestingapi.MakeCohort("three").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("three").
 						Resource(corev1.ResourceCPU, "4").
 						Obj()).Obj(),
-				utiltesting.MakeCohort("two").
+				utiltestingapi.MakeCohort("two").
 					Parent("three").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("two").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("two").
 						Resource(corev1.ResourceCPU, "4").
 						Obj()).Obj(),
-				utiltesting.MakeCohort("one").
+				utiltestingapi.MakeCohort("one").
 					Parent("two").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("one").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("one").
 						Resource(corev1.ResourceCPU, "4").
 						Obj()).Obj(),
 			}
-			testCq := *utiltesting.MakeClusterQueue("test-clusterqueue").
+			testCq := *utiltestingapi.MakeClusterQueue("test-clusterqueue").
 				Cohort("one").
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 				}).
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "0").Obj(),
-					*utiltesting.MakeFlavorQuotas("two").Resource(corev1.ResourceCPU, "0").Obj(),
-					*utiltesting.MakeFlavorQuotas("three").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("two").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("three").Resource(corev1.ResourceCPU, "0").Obj(),
 				).
 				FlavorFungibility(kueue.FlavorFungibility{
 					WhenCanPreempt: kueue.TryNextFlavor,
 				}).Obj()
-			otherCq := *utiltesting.MakeClusterQueue("other-clusterqueue").
+			otherCq := *utiltestingapi.MakeClusterQueue("other-clusterqueue").
 				Cohort("two").ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "0").Obj(),
-				*utiltesting.MakeFlavorQuotas("two").Resource(corev1.ResourceCPU, "0").Obj(),
-				*utiltesting.MakeFlavorQuotas("three").Resource(corev1.ResourceCPU, "0").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "0").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("two").Resource(corev1.ResourceCPU, "0").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("three").Resource(corev1.ResourceCPU, "0").Obj(),
 			).Obj()
 
 			wlInfo := workload.NewInfo(&kueue.Workload{
@@ -3380,7 +3381,7 @@ func TestWorkloadsTopologyRequests_ErrorBranches(t *testing.T) {
 			workload: *workload.NewInfo(&kueue.Workload{
 				Spec: kueue.WorkloadSpec{
 					PodSets: []kueue.PodSet{
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 							Request(corev1.ResourceCPU, "1").
 							RequiredTopologyRequest(corev1.LabelHostname).
 							Obj(),
@@ -3406,7 +3407,7 @@ func TestWorkloadsTopologyRequests_ErrorBranches(t *testing.T) {
 			workload: *workload.NewInfo(&kueue.Workload{
 				Spec: kueue.WorkloadSpec{
 					PodSets: []kueue.PodSet{
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 							Request(corev1.ResourceCPU, "1").
 							RequiredTopologyRequest(corev1.LabelHostname).
 							Obj(),
@@ -3462,8 +3463,8 @@ func TestAssignment_TotalRequestsFor(t *testing.T) {
 				},
 			},
 			args: args{
-				wl: workload.NewInfo(utiltesting.MakeWorkload("test", "default").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Obj()). // Has 2 pods.
+				wl: workload.NewInfo(utiltestingapi.MakeWorkload("test", "default").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Obj()). // Has 2 pods.
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1Mi").
 					Obj()),
@@ -3491,8 +3492,8 @@ func TestAssignment_TotalRequestsFor(t *testing.T) {
 				},
 			},
 			args: args{
-				wl: workload.NewInfo(utiltesting.MakeWorkload("test", "default").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Obj()). // Has 2 pods.
+				wl: workload.NewInfo(utiltestingapi.MakeWorkload("test", "default").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Obj()). // Has 2 pods.
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1Mi").
 					Obj()),
@@ -3518,15 +3519,15 @@ func TestAssignment_TotalRequestsFor(t *testing.T) {
 						Count: 71, // Assigned 1 pod.
 					},
 				},
-				replaceWorkloadSlice: workload.NewInfo(utiltesting.MakeWorkload("test", "default").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Obj()).
+				replaceWorkloadSlice: workload.NewInfo(utiltestingapi.MakeWorkload("test", "default").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Obj()).
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1Mi").
 					Obj()),
 			},
 			args: args{
-				wl: workload.NewInfo(utiltesting.MakeWorkload("test", "default").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Obj()).
+				wl: workload.NewInfo(utiltestingapi.MakeWorkload("test", "default").
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Obj()).
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1Mi").
 					Obj()),
diff --git a/pkg/scheduler/flavorassigner/podset_reducer_test.go b/pkg/scheduler/flavorassigner/podset_reducer_test.go
index 19475ca1b..378692bd9 100644
--- a/pkg/scheduler/flavorassigner/podset_reducer_test.go
+++ b/pkg/scheduler/flavorassigner/podset_reducer_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestSearch(t *testing.T) {
@@ -38,8 +38,8 @@ func TestSearch(t *testing.T) {
 		},
 		"partial not available": {
 			podSets: []kueue.PodSet{
-				*utiltesting.MakePodSet("ps1", 1).Obj(),
-				*utiltesting.MakePodSet("ps2", 2).SetMinimumCount(2).Obj(),
+				*utiltestingapi.MakePodSet("ps1", 1).Obj(),
+				*utiltestingapi.MakePodSet("ps2", 2).SetMinimumCount(2).Obj(),
 			},
 			countLimit: 2,
 			wantFound:  false,
@@ -47,10 +47,10 @@ func TestSearch(t *testing.T) {
 		},
 		"partial available": {
 			podSets: []kueue.PodSet{
-				*utiltesting.MakePodSet("ps1", 5).SetMinimumCount(3).Obj(),
-				*utiltesting.MakePodSet("ps2", 5).SetMinimumCount(4).Obj(),
-				*utiltesting.MakePodSet("ps3", 5).SetMinimumCount(1).Obj(),
-				*utiltesting.MakePodSet("ps4", 5).SetMinimumCount(2).Obj(),
+				*utiltestingapi.MakePodSet("ps1", 5).SetMinimumCount(3).Obj(),
+				*utiltestingapi.MakePodSet("ps2", 5).SetMinimumCount(4).Obj(),
+				*utiltestingapi.MakePodSet("ps3", 5).SetMinimumCount(1).Obj(),
+				*utiltestingapi.MakePodSet("ps4", 5).SetMinimumCount(2).Obj(),
 			},
 			countLimit: 15,
 			wantFound:  true,
@@ -58,10 +58,10 @@ func TestSearch(t *testing.T) {
 		},
 		"one partial available": {
 			podSets: []kueue.PodSet{
-				*utiltesting.MakePodSet("ps1", 5).SetMinimumCount(3).Obj(),
-				*utiltesting.MakePodSet("ps2", 5).Obj(),
-				*utiltesting.MakePodSet("ps3", 5).Obj(),
-				*utiltesting.MakePodSet("ps4", 5).Obj(),
+				*utiltestingapi.MakePodSet("ps1", 5).SetMinimumCount(3).Obj(),
+				*utiltestingapi.MakePodSet("ps2", 5).Obj(),
+				*utiltestingapi.MakePodSet("ps3", 5).Obj(),
+				*utiltestingapi.MakePodSet("ps4", 5).Obj(),
 			},
 			countLimit: 19,
 			wantFound:  true,
@@ -69,10 +69,10 @@ func TestSearch(t *testing.T) {
 		},
 		"to min": {
 			podSets: []kueue.PodSet{
-				*utiltesting.MakePodSet("ps1", 5).SetMinimumCount(3).Obj(),
-				*utiltesting.MakePodSet("ps2", 5).SetMinimumCount(4).Obj(),
-				*utiltesting.MakePodSet("ps3", 5).SetMinimumCount(1).Obj(),
-				*utiltesting.MakePodSet("ps4", 5).SetMinimumCount(2).Obj(),
+				*utiltestingapi.MakePodSet("ps1", 5).SetMinimumCount(3).Obj(),
+				*utiltestingapi.MakePodSet("ps2", 5).SetMinimumCount(4).Obj(),
+				*utiltestingapi.MakePodSet("ps3", 5).SetMinimumCount(1).Obj(),
+				*utiltestingapi.MakePodSet("ps4", 5).SetMinimumCount(2).Obj(),
 			},
 			countLimit: 10,
 			wantFound:  true,
@@ -80,10 +80,10 @@ func TestSearch(t *testing.T) {
 		},
 		"to max": {
 			podSets: []kueue.PodSet{
-				*utiltesting.MakePodSet("ps1", 5).SetMinimumCount(3).Obj(),
-				*utiltesting.MakePodSet("ps2", 5).SetMinimumCount(4).Obj(),
-				*utiltesting.MakePodSet("ps3", 5).SetMinimumCount(1).Obj(),
-				*utiltesting.MakePodSet("ps4", 5).SetMinimumCount(2).Obj(),
+				*utiltestingapi.MakePodSet("ps1", 5).SetMinimumCount(3).Obj(),
+				*utiltestingapi.MakePodSet("ps2", 5).SetMinimumCount(4).Obj(),
+				*utiltestingapi.MakePodSet("ps3", 5).SetMinimumCount(1).Obj(),
+				*utiltestingapi.MakePodSet("ps4", 5).SetMinimumCount(2).Obj(),
 			},
 			countLimit: 20,
 			wantFound:  true,
@@ -91,14 +91,14 @@ func TestSearch(t *testing.T) {
 		},
 		"no overflow": {
 			podSets: []kueue.PodSet{
-				*utiltesting.MakePodSet("ps1", 150_000).SetMinimumCount(1).Obj(),
-				*utiltesting.MakePodSet("ps2", 150_000).SetMinimumCount(1).Obj(),
-				*utiltesting.MakePodSet("ps3", 150_000).SetMinimumCount(1).Obj(),
-				*utiltesting.MakePodSet("ps4", 150_000).SetMinimumCount(1).Obj(),
-				*utiltesting.MakePodSet("ps5", 150_000).SetMinimumCount(1).Obj(),
-				*utiltesting.MakePodSet("ps6", 150_000).SetMinimumCount(1).Obj(),
-				*utiltesting.MakePodSet("ps7", 150_000).SetMinimumCount(1).Obj(),
-				*utiltesting.MakePodSet("ps8", 150_000).SetMinimumCount(1).Obj(),
+				*utiltestingapi.MakePodSet("ps1", 150_000).SetMinimumCount(1).Obj(),
+				*utiltestingapi.MakePodSet("ps2", 150_000).SetMinimumCount(1).Obj(),
+				*utiltestingapi.MakePodSet("ps3", 150_000).SetMinimumCount(1).Obj(),
+				*utiltestingapi.MakePodSet("ps4", 150_000).SetMinimumCount(1).Obj(),
+				*utiltestingapi.MakePodSet("ps5", 150_000).SetMinimumCount(1).Obj(),
+				*utiltestingapi.MakePodSet("ps6", 150_000).SetMinimumCount(1).Obj(),
+				*utiltestingapi.MakePodSet("ps7", 150_000).SetMinimumCount(1).Obj(),
+				*utiltestingapi.MakePodSet("ps8", 150_000).SetMinimumCount(1).Obj(),
 			},
 			countLimit: 150_000,
 			wantFound:  true,
@@ -106,14 +106,14 @@ func TestSearch(t *testing.T) {
 		},
 		"max pods on 1.27": {
 			podSets: []kueue.PodSet{
-				*utiltesting.MakePodSet("ps1", 150_000).SetMinimumCount(1).Obj(),
-				*utiltesting.MakePodSet("ps2", 1).Obj(),
-				*utiltesting.MakePodSet("ps3", 1).Obj(),
-				*utiltesting.MakePodSet("ps4", 1).Obj(),
-				*utiltesting.MakePodSet("ps5", 1).Obj(),
-				*utiltesting.MakePodSet("ps6", 1).Obj(),
-				*utiltesting.MakePodSet("ps7", 1).Obj(),
-				*utiltesting.MakePodSet("ps8", 1).Obj(),
+				*utiltestingapi.MakePodSet("ps1", 150_000).SetMinimumCount(1).Obj(),
+				*utiltestingapi.MakePodSet("ps2", 1).Obj(),
+				*utiltestingapi.MakePodSet("ps3", 1).Obj(),
+				*utiltestingapi.MakePodSet("ps4", 1).Obj(),
+				*utiltestingapi.MakePodSet("ps5", 1).Obj(),
+				*utiltestingapi.MakePodSet("ps6", 1).Obj(),
+				*utiltestingapi.MakePodSet("ps7", 1).Obj(),
+				*utiltestingapi.MakePodSet("ps8", 1).Obj(),
 			},
 			countLimit: 150_000,
 			wantFound:  true,
@@ -121,7 +121,7 @@ func TestSearch(t *testing.T) {
 		},
 		"podset with replica count 0": {
 			podSets: []kueue.PodSet{
-				*utiltesting.MakePodSet("ps1", 0).SetMinimumCount(0).Obj(),
+				*utiltestingapi.MakePodSet("ps1", 0).SetMinimumCount(0).Obj(),
 			},
 			countLimit: 0,
 			wantFound:  false,
diff --git a/pkg/scheduler/preemption/preemption_test.go b/pkg/scheduler/preemption/preemption_test.go
index c4be38194..dfe925d08 100644
--- a/pkg/scheduler/preemption/preemption_test.go
+++ b/pkg/scheduler/preemption/preemption_test.go
@@ -48,6 +48,7 @@ import (
 	preemptioncommon "sigs.k8s.io/kueue/pkg/scheduler/preemption/common"
 	utilslices "sigs.k8s.io/kueue/pkg/util/slices"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
 
@@ -65,21 +66,21 @@ var snapCmpOpts = cmp.Options{
 func TestPreemption(t *testing.T) {
 	now := time.Now()
 	flavors := []*kueue.ResourceFlavor{
-		utiltesting.MakeResourceFlavor("default").Obj(),
-		utiltesting.MakeResourceFlavor("alpha").Obj(),
-		utiltesting.MakeResourceFlavor("beta").Obj(),
+		utiltestingapi.MakeResourceFlavor("default").Obj(),
+		utiltestingapi.MakeResourceFlavor("alpha").Obj(),
+		utiltestingapi.MakeResourceFlavor("beta").Obj(),
 	}
 	defaultClusterQueues := []*kueue.ClusterQueue{
-		utiltesting.MakeClusterQueue("standalone").
+		utiltestingapi.MakeClusterQueue("standalone").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("default").
+				*utiltestingapi.MakeFlavorQuotas("default").
 					Resource(corev1.ResourceCPU, "6").
 					Obj(),
 			).ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("alpha").
+			*utiltestingapi.MakeFlavorQuotas("alpha").
 				Resource(corev1.ResourceMemory, "3Gi").
 				Obj(),
-			*utiltesting.MakeFlavorQuotas("beta").
+			*utiltestingapi.MakeFlavorQuotas("beta").
 				Resource(corev1.ResourceMemory, "3Gi").
 				Obj(),
 		).
@@ -87,9 +88,9 @@ func TestPreemption(t *testing.T) {
 				WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("c1").
+		utiltestingapi.MakeClusterQueue("c1").
 			Cohort("cohort").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "6", "6").
 				Resource(corev1.ResourceMemory, "3Gi", "3Gi").
 				Obj(),
@@ -99,9 +100,9 @@ func TestPreemption(t *testing.T) {
 				ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("c2").
+		utiltestingapi.MakeClusterQueue("c2").
 			Cohort("cohort").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "6", "6").
 				Resource(corev1.ResourceMemory, "3Gi", "3Gi").
 				Obj(),
@@ -111,9 +112,9 @@ func TestPreemption(t *testing.T) {
 				ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("d1").
+		utiltestingapi.MakeClusterQueue("d1").
 			Cohort("cohort-no-limits").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "6").
 				Resource(corev1.ResourceMemory, "3Gi").
 				Obj(),
@@ -123,9 +124,9 @@ func TestPreemption(t *testing.T) {
 				ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("d2").
+		utiltestingapi.MakeClusterQueue("d2").
 			Cohort("cohort-no-limits").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "6").
 				Resource(corev1.ResourceMemory, "3Gi").
 				Obj(),
@@ -135,9 +136,9 @@ func TestPreemption(t *testing.T) {
 				ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("l1").
+		utiltestingapi.MakeClusterQueue("l1").
 			Cohort("legion").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "6", "12").
 				Resource(corev1.ResourceMemory, "3Gi", "6Gi").
 				Obj(),
@@ -147,8 +148,8 @@ func TestPreemption(t *testing.T) {
 				ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("preventStarvation").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+		utiltestingapi.MakeClusterQueue("preventStarvation").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "6").
 				Obj(),
 			).
@@ -156,10 +157,10 @@ func TestPreemption(t *testing.T) {
 				WithinClusterQueue: kueue.PreemptionPolicyLowerOrNewerEqualPriority,
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("a_standard").
+		utiltestingapi.MakeClusterQueue("a_standard").
 			Cohort("with_shared_cq").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("default").
+				*utiltestingapi.MakeFlavorQuotas("default").
 					Resource(corev1.ResourceCPU, "1", "12").
 					Obj(),
 			).
@@ -172,10 +173,10 @@ func TestPreemption(t *testing.T) {
 				},
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("b_standard").
+		utiltestingapi.MakeClusterQueue("b_standard").
 			Cohort("with_shared_cq").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("default").
+				*utiltestingapi.MakeFlavorQuotas("default").
 					Resource(corev1.ResourceCPU, "1", "12").
 					Obj(),
 			).
@@ -188,9 +189,9 @@ func TestPreemption(t *testing.T) {
 				},
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("a_best_effort").
+		utiltestingapi.MakeClusterQueue("a_best_effort").
 			Cohort("with_shared_cq").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "1", "12").
 				Obj(),
 			).
@@ -203,9 +204,9 @@ func TestPreemption(t *testing.T) {
 				},
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("b_best_effort").
+		utiltestingapi.MakeClusterQueue("b_best_effort").
 			Cohort("with_shared_cq").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "0", "13").
 				Obj(),
 			).
@@ -218,16 +219,16 @@ func TestPreemption(t *testing.T) {
 				},
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("shared").
+		utiltestingapi.MakeClusterQueue("shared").
 			Cohort("with_shared_cq").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "10").
 				Obj(),
 			).
 			Obj(),
-		utiltesting.MakeClusterQueue("lend1").
+		utiltestingapi.MakeClusterQueue("lend1").
 			Cohort("cohort-lend").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "6", "", "4").
 				Obj(),
 			).
@@ -236,9 +237,9 @@ func TestPreemption(t *testing.T) {
 				ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("lend2").
+		utiltestingapi.MakeClusterQueue("lend2").
 			Cohort("cohort-lend").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "6", "", "2").
 				Obj(),
 			).
@@ -247,9 +248,9 @@ func TestPreemption(t *testing.T) {
 				ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("a").
+		utiltestingapi.MakeClusterQueue("a").
 			Cohort("cohort-three").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "2").
 				Resource(corev1.ResourceMemory, "2").
 				Obj(),
@@ -259,17 +260,17 @@ func TestPreemption(t *testing.T) {
 				ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("b").
+		utiltestingapi.MakeClusterQueue("b").
 			Cohort("cohort-three").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "2").
 				Resource(corev1.ResourceMemory, "2").
 				Obj(),
 			).
 			Obj(),
-		utiltesting.MakeClusterQueue("c").
+		utiltestingapi.MakeClusterQueue("c").
 			Cohort("cohort-three").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "2").
 				Resource(corev1.ResourceMemory, "2").
 				Obj(),
@@ -289,35 +290,35 @@ func TestPreemption(t *testing.T) {
 		"preempt lowest priority": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("low", "").
+				*utiltestingapi.MakeWorkload("low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("mid", "").
+				*utiltestingapi.MakeWorkload("mid", "").
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("high", "").
+				*utiltestingapi.MakeWorkload("high", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2000m").
 								Obj()).
 							Obj(),
@@ -325,7 +326,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "2").
 				Obj(),
@@ -341,35 +342,35 @@ func TestPreemption(t *testing.T) {
 		"preempt multiple": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("low", "").
+				*utiltestingapi.MakeWorkload("low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("mid", "").
+				*utiltestingapi.MakeWorkload("mid", "").
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("high", "").
+				*utiltestingapi.MakeWorkload("high", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2000m").
 								Obj()).
 							Obj(),
@@ -377,7 +378,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "3").
 				Obj(),
@@ -394,23 +395,23 @@ func TestPreemption(t *testing.T) {
 		"no preemption for low priority": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("low", "").
+				*utiltestingapi.MakeWorkload("low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("mid", "").
+				*utiltestingapi.MakeWorkload("mid", "").
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
@@ -418,7 +419,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(-1).
 				Request(corev1.ResourceCPU, "1").
 				Obj(),
@@ -433,23 +434,23 @@ func TestPreemption(t *testing.T) {
 		"not enough low priority workloads": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("low", "").
+				*utiltestingapi.MakeWorkload("low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("mid", "").
+				*utiltestingapi.MakeWorkload("mid", "").
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
@@ -457,7 +458,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Request(corev1.ResourceCPU, "4").
 				Obj(),
 			targetCQ: "standalone",
@@ -471,35 +472,35 @@ func TestPreemption(t *testing.T) {
 		"some free quota, preempt low priority": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("low", "").
+				*utiltestingapi.MakeWorkload("low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("mid", "").
+				*utiltestingapi.MakeWorkload("mid", "").
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("high", "").
+				*utiltestingapi.MakeWorkload("high", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
@@ -507,7 +508,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "2").
 				Obj(),
@@ -523,35 +524,35 @@ func TestPreemption(t *testing.T) {
 		"minimal set excludes low priority": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("low", "").
+				*utiltestingapi.MakeWorkload("low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("mid", "").
+				*utiltestingapi.MakeWorkload("mid", "").
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("high", "").
+				*utiltestingapi.MakeWorkload("high", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
@@ -559,7 +560,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "2").
 				Obj(),
@@ -575,35 +576,35 @@ func TestPreemption(t *testing.T) {
 		"only preempt workloads using the chosen flavor": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("low", "").
+				*utiltestingapi.MakeWorkload("low", "").
 					Priority(-1).
 					Request(corev1.ResourceMemory, "2Gi").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceMemory, "alpha", "2Gi").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("mid", "").
+				*utiltestingapi.MakeWorkload("mid", "").
 					Request(corev1.ResourceMemory, "1Gi").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceMemory, "beta", "1Gi").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("high", "").
+				*utiltestingapi.MakeWorkload("high", "").
 					Priority(1).
 					Request(corev1.ResourceMemory, "1Gi").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceMemory, "beta", "1Gi").
 								Obj()).
 							Obj(),
@@ -611,7 +612,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "1").
 				Request(corev1.ResourceMemory, "2Gi").
@@ -632,35 +633,35 @@ func TestPreemption(t *testing.T) {
 		"reclaim quota from borrower": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("c1-low", "").
+				*utiltestingapi.MakeWorkload("c1-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-mid", "").
+				*utiltestingapi.MakeWorkload("c2-mid", "").
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-high", "").
+				*utiltestingapi.MakeWorkload("c2-high", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "6").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "6000m").
 								Obj()).
 							Obj(),
@@ -668,7 +669,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "3").
 				Obj(),
@@ -684,23 +685,23 @@ func TestPreemption(t *testing.T) {
 		"reclaim quota if workload requests 0 resources for a resource at nominal quota": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("c1-low", "").
+				*utiltestingapi.MakeWorkload("c1-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "3").
 					Request(corev1.ResourceMemory, "3Gi").
 					SimpleReserveQuota("c1", "default", now).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-mid", "").
+				*utiltestingapi.MakeWorkload("c2-mid", "").
 					Request(corev1.ResourceCPU, "3").
 					SimpleReserveQuota("c2", "default", now).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-high", "").
+				*utiltestingapi.MakeWorkload("c2-high", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "6").
 					SimpleReserveQuota("c2", "default", now).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "3").
 				Request(corev1.ResourceMemory, "0").
@@ -721,24 +722,24 @@ func TestPreemption(t *testing.T) {
 		"no workloads borrowing": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("c1-high", "").
+				*utiltestingapi.MakeWorkload("c1-high", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-low-1", "").
+				*utiltestingapi.MakeWorkload("c2-low-1", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
@@ -746,7 +747,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "4").
 				Obj(),
@@ -761,36 +762,36 @@ func TestPreemption(t *testing.T) {
 		"not enough workloads borrowing": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("c1-high", "").
+				*utiltestingapi.MakeWorkload("c1-high", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-low-1", "").
+				*utiltestingapi.MakeWorkload("c2-low-1", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-low-2", "").
+				*utiltestingapi.MakeWorkload("c2-low-2", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
@@ -798,7 +799,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "4").
 				Obj(),
@@ -813,36 +814,36 @@ func TestPreemption(t *testing.T) {
 		"preempting locally and borrowing other resources in cohort, without cohort candidates": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("c1-low", "").
+				*utiltestingapi.MakeWorkload("c1-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-low-1", "").
+				*utiltestingapi.MakeWorkload("c2-low-1", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-high-2", "").
+				*utiltestingapi.MakeWorkload("c2-high-2", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
@@ -850,7 +851,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "4").
 				Request(corev1.ResourceMemory, "5Gi").
@@ -871,36 +872,36 @@ func TestPreemption(t *testing.T) {
 		"preempting locally and borrowing same resource in cohort": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("c1-med", "").
+				*utiltestingapi.MakeWorkload("c1-med", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c1-low", "").
+				*utiltestingapi.MakeWorkload("c1-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-low-1", "").
+				*utiltestingapi.MakeWorkload("c2-low-1", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
@@ -908,7 +909,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "4").
 				Obj(),
@@ -924,36 +925,36 @@ func TestPreemption(t *testing.T) {
 		"preempting locally and borrowing same resource in cohort; no borrowing limit in the cohort": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("d1-med", "").
+				*utiltestingapi.MakeWorkload("d1-med", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("d1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("d1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("d1-low", "").
+				*utiltestingapi.MakeWorkload("d1-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("d1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("d1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("d2-low-1", "").
+				*utiltestingapi.MakeWorkload("d2-low-1", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("d2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("d2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4").
 								Obj()).
 							Obj(),
@@ -961,7 +962,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "4").
 				Obj(),
@@ -977,48 +978,48 @@ func TestPreemption(t *testing.T) {
 		"preempting locally and borrowing other resources in cohort, with cohort candidates": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("c1-med", "").
+				*utiltestingapi.MakeWorkload("c1-med", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-low-1", "").
+				*utiltestingapi.MakeWorkload("c2-low-1", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "5").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "5000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-low-2", "").
+				*utiltestingapi.MakeWorkload("c2-low-2", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-low-3", "").
+				*utiltestingapi.MakeWorkload("c2-low-3", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1000m").
 								Obj()).
 							Obj(),
@@ -1026,7 +1027,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "2").
 				Request(corev1.ResourceMemory, "5Gi").
@@ -1047,24 +1048,24 @@ func TestPreemption(t *testing.T) {
 		"preempting locally and not borrowing same resource in 1-queue cohort": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("l1-med", "").
+				*utiltestingapi.MakeWorkload("l1-med", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("l1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("l1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("l1-low", "").
+				*utiltestingapi.MakeWorkload("l1-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("l1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("l1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2000m").
 								Obj()).
 							Obj(),
@@ -1072,7 +1073,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "4").
 				Obj(),
@@ -1088,33 +1089,33 @@ func TestPreemption(t *testing.T) {
 		"do not reclaim borrowed quota from same priority for withinCohort=ReclaimFromLowerPriority": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("c1", "").
+				*utiltestingapi.MakeWorkload("c1", "").
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-1", "").
+				*utiltestingapi.MakeWorkload("c2-1", "").
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-2", "").
+				*utiltestingapi.MakeWorkload("c2-2", "").
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
@@ -1122,7 +1123,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Request(corev1.ResourceCPU, "4").
 				Obj(),
 			targetCQ: "c1",
@@ -1136,34 +1137,34 @@ func TestPreemption(t *testing.T) {
 		"reclaim borrowed quota from same priority for withinCohort=ReclaimFromAny": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("c1-1", "").
+				*utiltestingapi.MakeWorkload("c1-1", "").
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c1-2", "").
+				*utiltestingapi.MakeWorkload("c1-2", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2", "").
+				*utiltestingapi.MakeWorkload("c2", "").
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2000m").
 								Obj()).
 							Obj(),
@@ -1171,7 +1172,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Request(corev1.ResourceCPU, "4").
 				Obj(),
 			targetCQ: "c2",
@@ -1186,46 +1187,46 @@ func TestPreemption(t *testing.T) {
 		"preempt from all ClusterQueues in cohort": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("c1-low", "").
+				*utiltestingapi.MakeWorkload("c1-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c1-mid", "").
+				*utiltestingapi.MakeWorkload("c1-mid", "").
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-low", "").
+				*utiltestingapi.MakeWorkload("c2-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c2-mid", "").
+				*utiltestingapi.MakeWorkload("c2-mid", "").
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
@@ -1233,7 +1234,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Request(corev1.ResourceCPU, "4").
 				Obj(),
 			targetCQ: "c1",
@@ -1248,12 +1249,12 @@ func TestPreemption(t *testing.T) {
 		"can't preempt workloads in ClusterQueue for withinClusterQueue=Never": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("c2-low", "").
+				*utiltestingapi.MakeWorkload("c2-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("c2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("c2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
@@ -1261,7 +1262,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "4").
 				Obj(),
@@ -1276,24 +1277,24 @@ func TestPreemption(t *testing.T) {
 		"each podset preempts a different flavor": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("low-alpha", "").
+				*utiltestingapi.MakeWorkload("low-alpha", "").
 					Priority(-1).
 					Request(corev1.ResourceMemory, "2Gi").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceMemory, "alpha", "2Gi").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("low-beta", "").
+				*utiltestingapi.MakeWorkload("low-beta", "").
 					Priority(-1).
 					Request(corev1.ResourceMemory, "2Gi").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("standalone").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("standalone").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceMemory, "beta", "2Gi").
 								Obj()).
 							Obj(),
@@ -1301,11 +1302,11 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				PodSets(
-					*utiltesting.MakePodSet("launcher", 1).
+					*utiltestingapi.MakePodSet("launcher", 1).
 						Request(corev1.ResourceMemory, "2Gi").Obj(),
-					*utiltesting.MakePodSet("workers", 2).
+					*utiltestingapi.MakePodSet("workers", 2).
 						Request(corev1.ResourceMemory, "1Gi").Obj(),
 				).
 				Obj(),
@@ -1339,38 +1340,38 @@ func TestPreemption(t *testing.T) {
 		"preempt newer workloads with the same priority": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl1", "").
+				*utiltestingapi.MakeWorkload("wl1", "").
 					Priority(2).
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("preventStarvation").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("preventStarvation").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("wl2", "").
+				*utiltestingapi.MakeWorkload("wl2", "").
 					Priority(1).
 					Creation(now).
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("preventStarvation").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("preventStarvation").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2").
 								Obj()).
 							Obj(),
 						now.Add(time.Second),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("wl3", "").
+				*utiltestingapi.MakeWorkload("wl3", "").
 					Priority(1).
 					Creation(now).
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("preventStarvation").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("preventStarvation").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2").
 								Obj()).
 							Obj(),
@@ -1378,11 +1379,11 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Creation(now.Add(-15 * time.Second)).
 				PodSets(
-					*utiltesting.MakePodSet("launcher", 1).
+					*utiltestingapi.MakePodSet("launcher", 1).
 						Request(corev1.ResourceCPU, "2").Obj(),
 				).
 				Obj(),
@@ -1405,24 +1406,24 @@ func TestPreemption(t *testing.T) {
 		"use BorrowWithinCohort; allow preempting a lower-priority workload from another ClusterQueue while borrowing": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a_best_effort_low", "").
+				*utiltestingapi.MakeWorkload("a_best_effort_low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "10").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a_best_effort").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a_best_effort").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "10").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b_best_effort_low", "").
+				*utiltestingapi.MakeWorkload("b_best_effort_low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b_best_effort").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b_best_effort").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
@@ -1430,7 +1431,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Request(corev1.ResourceCPU, "10").
 				Obj(),
 			targetCQ: "a_standard",
@@ -1445,12 +1446,12 @@ func TestPreemption(t *testing.T) {
 		"use BorrowWithinCohort; don't allow preempting a lower-priority workload with priority above MaxPriorityThreshold, if borrowing is required even after the preemption": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("b_standard", "").
+				*utiltestingapi.MakeWorkload("b_standard", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "10").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b_standard").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b_standard").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "10000m").
 								Obj()).
 							Obj(),
@@ -1458,7 +1459,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(2).
 				Request(corev1.ResourceCPU, "10").
 				Obj(),
@@ -1474,12 +1475,12 @@ func TestPreemption(t *testing.T) {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
 				// this admitted workload consumes all resources so it needs to be preempted to run a new workload
-				*utiltesting.MakeWorkload("b_standard", "").
+				*utiltestingapi.MakeWorkload("b_standard", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "13").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b_standard").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b_standard").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "13000m").
 								Obj()).
 							Obj(),
@@ -1487,7 +1488,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				// this is a small workload which can be admitted without borrowing, if the b_standard workload is preempted
 				Priority(2).
 				Request(corev1.ResourceCPU, "1").
@@ -1504,12 +1505,12 @@ func TestPreemption(t *testing.T) {
 		"use BorrowWithinCohort; don't allow for preemption of lower-priority workload from the same ClusterQueue": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a_standard", "").
+				*utiltestingapi.MakeWorkload("a_standard", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "13").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a_standard").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a_standard").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "13000m").
 								Obj()).
 							Obj(),
@@ -1517,7 +1518,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(2).
 				Request(corev1.ResourceCPU, "1").
 				Obj(),
@@ -1532,48 +1533,48 @@ func TestPreemption(t *testing.T) {
 		"use BorrowWithinCohort; only preempt from CQ if no workloads below threshold and already above nominal": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a_standard_1", "").
+				*utiltestingapi.MakeWorkload("a_standard_1", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "10").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a_standard").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a_standard").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "10").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("a_standard_2", "").
+				*utiltestingapi.MakeWorkload("a_standard_2", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a_standard").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a_standard").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b_standard_1", "").
+				*utiltestingapi.MakeWorkload("b_standard_1", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b_standard").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b_standard").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b_standard_2", "").
+				*utiltestingapi.MakeWorkload("b_standard_2", "").
 					Priority(2).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b_standard").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b_standard").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
@@ -1581,7 +1582,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(3).
 				Request(corev1.ResourceCPU, "1").
 				Obj(),
@@ -1597,48 +1598,48 @@ func TestPreemption(t *testing.T) {
 		"use BorrowWithinCohort; preempt from CQ and from other CQs with workloads below threshold": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("b_standard_high", "").
+				*utiltestingapi.MakeWorkload("b_standard_high", "").
 					Priority(2).
 					Request(corev1.ResourceCPU, "10").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b_standard").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b_standard").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "10").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b_standard_mid", "").
+				*utiltestingapi.MakeWorkload("b_standard_mid", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b_standard").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b_standard").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("a_best_effort_low", "").
+				*utiltestingapi.MakeWorkload("a_best_effort_low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a_best_effort").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a_best_effort").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("a_best_effort_lower", "").
+				*utiltestingapi.MakeWorkload("a_best_effort_lower", "").
 					Priority(-2).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a_best_effort").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a_best_effort").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
@@ -1646,7 +1647,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(2).
 				Request(corev1.ResourceCPU, "2").
 				Obj(),
@@ -1662,35 +1663,35 @@ func TestPreemption(t *testing.T) {
 		"reclaim quota from lender": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("lend1-low", "").
+				*utiltestingapi.MakeWorkload("lend1-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("lend1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("lend1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("lend2-mid", "").
+				*utiltestingapi.MakeWorkload("lend2-mid", "").
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("lend2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("lend2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("lend2-high", "").
+				*utiltestingapi.MakeWorkload("lend2-high", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("lend2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("lend2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
@@ -1698,7 +1699,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "3").
 				Obj(),
@@ -1714,46 +1715,46 @@ func TestPreemption(t *testing.T) {
 		"preempt from all ClusterQueues in cohort-lend": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("lend1-low", "").
+				*utiltestingapi.MakeWorkload("lend1-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("lend1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("lend1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("lend1-mid", "").
+				*utiltestingapi.MakeWorkload("lend1-mid", "").
 					Request(corev1.ResourceCPU, "2").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("lend1").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("lend1").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("lend2-low", "").
+				*utiltestingapi.MakeWorkload("lend2-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "3").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("lend2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("lend2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "3000m").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("lend2-mid", "").
+				*utiltestingapi.MakeWorkload("lend2-mid", "").
 					Request(corev1.ResourceCPU, "4").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("lend2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("lend2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "4000m").
 								Obj()).
 							Obj(),
@@ -1761,7 +1762,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Request(corev1.ResourceCPU, "4").
 				Obj(),
 			targetCQ: "lend1",
@@ -1776,12 +1777,12 @@ func TestPreemption(t *testing.T) {
 		"cannot preempt from other ClusterQueues if exceeds requestable quota including lending limit": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("lend2-low", "").
+				*utiltestingapi.MakeWorkload("lend2-low", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "10").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("lend2").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("lend2").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "10").
 								Obj()).
 							Obj(),
@@ -1789,7 +1790,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Request(corev1.ResourceCPU, "9").
 				Obj(),
 			targetCQ: "lend1",
@@ -1804,72 +1805,72 @@ func TestPreemption(t *testing.T) {
 		"preemptions from cq when target queue is exhausted for the single requested resource": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "").
+				*utiltestingapi.MakeWorkload("a1", "").
 					Priority(-2).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "").
+				*utiltestingapi.MakeWorkload("a2", "").
 					Priority(-2).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("a3", "").
+				*utiltestingapi.MakeWorkload("a3", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "").
+				*utiltestingapi.MakeWorkload("b1", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b2", "").
+				*utiltestingapi.MakeWorkload("b2", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b3", "").
+				*utiltestingapi.MakeWorkload("b3", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
@@ -1877,7 +1878,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Request(corev1.ResourceCPU, "2").
 				Priority(0).
 				Obj(),
@@ -1893,13 +1894,13 @@ func TestPreemption(t *testing.T) {
 		"preemptions from cq when target queue is exhausted for two requested resources": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "").
+				*utiltestingapi.MakeWorkload("a1", "").
 					Priority(-2).
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Assignment(corev1.ResourceMemory, "default", "1").
 								Obj()).
@@ -1907,13 +1908,13 @@ func TestPreemption(t *testing.T) {
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "").
+				*utiltestingapi.MakeWorkload("a2", "").
 					Priority(-2).
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Assignment(corev1.ResourceMemory, "default", "1").
 								Obj()).
@@ -1921,13 +1922,13 @@ func TestPreemption(t *testing.T) {
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("a3", "").
+				*utiltestingapi.MakeWorkload("a3", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Assignment(corev1.ResourceMemory, "default", "1").
 								Obj()).
@@ -1935,13 +1936,13 @@ func TestPreemption(t *testing.T) {
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "").
+				*utiltestingapi.MakeWorkload("b1", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Assignment(corev1.ResourceMemory, "default", "1").
 								Obj()).
@@ -1949,13 +1950,13 @@ func TestPreemption(t *testing.T) {
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b2", "").
+				*utiltestingapi.MakeWorkload("b2", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Assignment(corev1.ResourceMemory, "default", "1").
 								Obj()).
@@ -1963,13 +1964,13 @@ func TestPreemption(t *testing.T) {
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b3", "").
+				*utiltestingapi.MakeWorkload("b3", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Assignment(corev1.ResourceMemory, "default", "1").
 								Obj()).
@@ -1978,7 +1979,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Request(corev1.ResourceCPU, "2").
 				Request(corev1.ResourceMemory, "2").
 				Priority(0).
@@ -1999,72 +2000,72 @@ func TestPreemption(t *testing.T) {
 		"preemptions from cq when target queue is exhausted for one requested resource, but not the other": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "").
+				*utiltestingapi.MakeWorkload("a1", "").
 					Priority(-2).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "").
+				*utiltestingapi.MakeWorkload("a2", "").
 					Priority(-2).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("a3", "").
+				*utiltestingapi.MakeWorkload("a3", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "").
+				*utiltestingapi.MakeWorkload("b1", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b2", "").
+				*utiltestingapi.MakeWorkload("b2", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b3", "").
+				*utiltestingapi.MakeWorkload("b3", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
@@ -2072,7 +2073,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Request(corev1.ResourceCPU, "2").
 				Request(corev1.ResourceMemory, "2").
 				Priority(0).
@@ -2093,72 +2094,72 @@ func TestPreemption(t *testing.T) {
 		"allow preemption from other cluster queues if target cq is not exhausted for the requested resource": {
 			clusterQueues: defaultClusterQueues,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "").
+				*utiltestingapi.MakeWorkload("a1", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("a").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("a").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "").
+				*utiltestingapi.MakeWorkload("b1", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b2", "").
+				*utiltestingapi.MakeWorkload("b2", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b3", "").
+				*utiltestingapi.MakeWorkload("b3", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b4", "").
+				*utiltestingapi.MakeWorkload("b4", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
 						now,
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b5", "").
+				*utiltestingapi.MakeWorkload("b5", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("b").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("b").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Obj()).
 							Obj(),
@@ -2166,7 +2167,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("in", "").
+			incoming: utiltestingapi.MakeWorkload("in", "").
 				Request(corev1.ResourceCPU, "2").
 				Obj(),
 			targetCQ: "a",
@@ -2180,33 +2181,33 @@ func TestPreemption(t *testing.T) {
 		},
 		"long range preemption": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("cq-left").
+				utiltestingapi.MakeClusterQueue("cq-left").
 					Cohort("cohort-left").
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "10").
 						Obj(),
 					).Obj(),
-				utiltesting.MakeClusterQueue("cq-right").
+				utiltestingapi.MakeClusterQueue("cq-right").
 					Cohort("cohort-right").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "0").
 						Obj(),
 					).
 					Obj(),
 			},
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("cohort-left").Parent("root").Obj(),
-				utiltesting.MakeCohort("cohort-right").Parent("root").Obj(),
+				utiltestingapi.MakeCohort("cohort-left").Parent("root").Obj(),
+				utiltestingapi.MakeCohort("cohort-right").Parent("root").Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("to-be-preempted", "").
+				*utiltestingapi.MakeWorkload("to-be-preempted", "").
 					Request(corev1.ResourceCPU, "5").
 					ReserveQuotaAt(
-						utiltesting.MakeAdmission("cq-right").
-							PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakeAdmission("cq-right").
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "5").
 								Obj()).
 							Obj(),
@@ -2214,7 +2215,7 @@ func TestPreemption(t *testing.T) {
 					).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Request(corev1.ResourceCPU, "8").
 				Obj(),
 			targetCQ: "cq-left",
@@ -2301,12 +2302,12 @@ func TestPreemption(t *testing.T) {
 func TestFairPreemptions(t *testing.T) {
 	now := time.Now()
 	flavors := []*kueue.ResourceFlavor{
-		utiltesting.MakeResourceFlavor("default").Obj(),
+		utiltestingapi.MakeResourceFlavor("default").Obj(),
 	}
 	baseCQs := []*kueue.ClusterQueue{
-		utiltesting.MakeClusterQueue("a").
+		utiltestingapi.MakeClusterQueue("a").
 			Cohort("all").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "3").Obj()).
 			Preemption(kueue.ClusterQueuePreemption{
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -2317,9 +2318,9 @@ func TestFairPreemptions(t *testing.T) {
 				},
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("b").
+		utiltestingapi.MakeClusterQueue("b").
 			Cohort("all").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "3").Obj()).
 			Preemption(kueue.ClusterQueuePreemption{
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -2330,9 +2331,9 @@ func TestFairPreemptions(t *testing.T) {
 				},
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("c").
+		utiltestingapi.MakeClusterQueue("c").
 			Cohort("all").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "3").Obj()).
 			Preemption(kueue.ClusterQueuePreemption{
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -2343,13 +2344,13 @@ func TestFairPreemptions(t *testing.T) {
 				},
 			}).
 			Obj(),
-		utiltesting.MakeClusterQueue("preemptible").
+		utiltestingapi.MakeClusterQueue("preemptible").
 			Cohort("all").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "0").Obj()).
 			Obj(),
 	}
-	unitWl := *utiltesting.MakeWorkload("unit", "").Request(corev1.ResourceCPU, "1")
+	unitWl := *utiltestingapi.MakeWorkload("unit", "").Request(corev1.ResourceCPU, "1")
 	cases := map[string]struct {
 		clusterQueues []*kueue.ClusterQueue
 		cohorts       []*kueue.Cohort
@@ -2379,12 +2380,12 @@ func TestFairPreemptions(t *testing.T) {
 		"can reclaim from queue using less, if taking the latest workload from user using the most isn't enough": {
 			clusterQueues: baseCQs,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("a", "default", now).Obj(),
-				*utiltesting.MakeWorkload("a2", "").Request(corev1.ResourceCPU, "1").SimpleReserveQuota("a", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("a1", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("a", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("a2", "").Request(corev1.ResourceCPU, "1").SimpleReserveQuota("a", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming:      utiltesting.MakeWorkload("c_incoming", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("a", "default", now).Obj(),
+			incoming:      utiltestingapi.MakeWorkload("c_incoming", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("a", "default", now).Obj(),
 			targetCQ:      "c",
 			wantPreempted: sets.New(targetKeyReason("/a1", kueue.InCohortFairSharingReason)), // attempts to preempt b1, but it's not enough.
 		},
@@ -2408,14 +2409,14 @@ func TestFairPreemptions(t *testing.T) {
 		"preempt one from each CQ borrowing": {
 			clusterQueues: baseCQs,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "").Request(corev1.ResourceCPU, "0.5").SimpleReserveQuota("a", "default", now).Obj(),
-				*utiltesting.MakeWorkload("a2", "").Request(corev1.ResourceCPU, "0.5").SimpleReserveQuota("a", "default", now).Obj(),
-				*utiltesting.MakeWorkload("a3", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("a", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "0.5").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "0.5").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b3", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
-			},
-			incoming: utiltesting.MakeWorkload("c_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
+				*utiltestingapi.MakeWorkload("a1", "").Request(corev1.ResourceCPU, "0.5").SimpleReserveQuota("a", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("a2", "").Request(corev1.ResourceCPU, "0.5").SimpleReserveQuota("a", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("a3", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("a", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "0.5").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "0.5").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b3", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
+			},
+			incoming: utiltestingapi.MakeWorkload("c_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
 			targetCQ: "c",
 			wantPreempted: sets.New(
 				targetKeyReason("/a1", kueue.InCohortFairSharingReason),
@@ -2450,7 +2451,7 @@ func TestFairPreemptions(t *testing.T) {
 				*unitWl.Clone().Name("b4").SimpleReserveQuota("b", "default", now).Obj(),
 				*unitWl.Clone().Name("b5").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
+			incoming: utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
 			targetCQ: "a",
 		},
 		"can preempt lower priority workloads from same CQ": {
@@ -2466,7 +2467,7 @@ func TestFairPreemptions(t *testing.T) {
 				*unitWl.Clone().Name("b4").SimpleReserveQuota("b", "default", now).Obj(),
 				*unitWl.Clone().Name("b5").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
+			incoming: utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
 			targetCQ: "a",
 			wantPreempted: sets.New(
 				targetKeyReason("/a1_low", kueue.InClusterQueueReason),
@@ -2486,7 +2487,7 @@ func TestFairPreemptions(t *testing.T) {
 				*unitWl.Clone().Name("b5").SimpleReserveQuota("b", "default", now).Obj(),
 				*unitWl.Clone().Name("b6").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
+			incoming: utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
 			targetCQ: "a",
 			wantPreempted: sets.New(
 				targetKeyReason("/a_low", kueue.InClusterQueueReason),
@@ -2496,40 +2497,40 @@ func TestFairPreemptions(t *testing.T) {
 		"preempt huge workload if there is no other option, as long as the target CQ gets a lower share": {
 			clusterQueues: baseCQs,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "9").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "9").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming:      utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
+			incoming:      utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
 			targetCQ:      "a",
 			wantPreempted: sets.New(targetKeyReason("/b1", kueue.InCohortFairSharingReason)),
 		},
 		"can't preempt huge workload if the incoming is also huge": {
 			clusterQueues: baseCQs,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("a", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "7").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("a1", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("a", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "7").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "5").Obj(),
+			incoming: utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "5").Obj(),
 			targetCQ: "a",
 		},
 		"can't preempt 2 smaller workloads if the incoming is huge": {
 			clusterQueues: baseCQs,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b3", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b3", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "6").Obj(),
+			incoming: utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "6").Obj(),
 			targetCQ: "a",
 		},
 		"preempt from target and others even if over nominal": {
 			clusterQueues: baseCQs,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1_low", "").Priority(-1).Request(corev1.ResourceCPU, "2").SimpleReserveQuota("a", "default", now).Obj(),
-				*utiltesting.MakeWorkload("a2_low", "").Priority(-1).Request(corev1.ResourceCPU, "1").SimpleReserveQuota("a", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("a1_low", "").Priority(-1).Request(corev1.ResourceCPU, "2").SimpleReserveQuota("a", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("a2_low", "").Priority(-1).Request(corev1.ResourceCPU, "1").SimpleReserveQuota("a", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "4").Obj(),
+			incoming: utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "4").Obj(),
 			targetCQ: "a",
 			wantPreempted: sets.New(
 				targetKeyReason("/a1_low", kueue.InClusterQueueReason),
@@ -2539,12 +2540,12 @@ func TestFairPreemptions(t *testing.T) {
 		"prefer to preempt workloads that don't make the target CQ have the biggest share": {
 			clusterQueues: baseCQs,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "1").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b3", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("c1", "").Request(corev1.ResourceCPU, "1").SimpleReserveQuota("c", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "1").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b3", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("c1", "").Request(corev1.ResourceCPU, "1").SimpleReserveQuota("c", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "3.5").Obj(),
+			incoming: utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "3.5").Obj(),
 			targetCQ: "a",
 			// It would have been possible to preempt "/b1" under rule S2-b, but S2-a was possible first.
 			wantPreempted: sets.New(targetKeyReason("/b2", kueue.InCohortFairSharingReason)),
@@ -2552,12 +2553,12 @@ func TestFairPreemptions(t *testing.T) {
 		"preempt from different cluster queues if the end result has a smaller max share": {
 			clusterQueues: baseCQs,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "2.5").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("c1", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("c", "default", now).Obj(),
-				*utiltesting.MakeWorkload("c2", "").Request(corev1.ResourceCPU, "2.5").SimpleReserveQuota("c", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "2.5").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("c1", "").Request(corev1.ResourceCPU, "2").SimpleReserveQuota("c", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("c2", "").Request(corev1.ResourceCPU, "2.5").SimpleReserveQuota("c", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "3.5").Obj(),
+			incoming: utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "3.5").Obj(),
 			targetCQ: "a",
 			wantPreempted: sets.New(
 				targetKeyReason("/b1", kueue.InCohortFairSharingReason),
@@ -2567,21 +2568,21 @@ func TestFairPreemptions(t *testing.T) {
 		"scenario above does not flap": {
 			clusterQueues: baseCQs,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "").Request(corev1.ResourceCPU, "3.5").SimpleReserveQuota("a", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "2.5").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("c2", "").Request(corev1.ResourceCPU, "2.5").SimpleReserveQuota("c", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("a1", "").Request(corev1.ResourceCPU, "3.5").SimpleReserveQuota("a", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "2.5").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("c2", "").Request(corev1.ResourceCPU, "2.5").SimpleReserveQuota("c", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("b_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
+			incoming: utiltestingapi.MakeWorkload("b_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
 			targetCQ: "b",
 		},
 		"cannot preempt if it would make the candidate CQ go under nominal after preempting one element": {
 			clusterQueues: baseCQs,
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("c1", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("c", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b1", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b2", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("c1", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("c", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "4").Obj(),
+			incoming: utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "4").Obj(),
 			targetCQ: "a",
 		},
 		// preemption.borrowWithinCohort does not affect how
@@ -2602,7 +2603,7 @@ func TestFairPreemptions(t *testing.T) {
 				*unitWl.Clone().Name("preemptible2").Priority(-3).SimpleReserveQuota("preemptible", "default", now).Obj(),
 				*unitWl.Clone().Name("preemptible3").Priority(-3).SimpleReserveQuota("preemptible", "default", now).Obj(),
 			},
-			incoming:      utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
+			incoming:      utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
 			targetCQ:      "a",
 			wantPreempted: nil,
 		},
@@ -2610,11 +2611,11 @@ func TestFairPreemptions(t *testing.T) {
 			clusterQueues: baseCQs,
 			strategies:    []config.PreemptionStrategy{config.LessThanInitialShare},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("a", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b_low", "").Priority(0).Request(corev1.ResourceCPU, "5").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b_high", "").Priority(1).Request(corev1.ResourceCPU, "1").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("a1", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("a", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b_low", "").Priority(0).Request(corev1.ResourceCPU, "5").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b_high", "").Priority(1).Request(corev1.ResourceCPU, "1").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming:      utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "1").Obj(),
+			incoming:      utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "1").Obj(),
 			targetCQ:      "a",
 			wantPreempted: sets.New(targetKeyReason("/b_low", kueue.InCohortFairSharingReason)),
 		},
@@ -2622,19 +2623,19 @@ func TestFairPreemptions(t *testing.T) {
 			clusterQueues: baseCQs,
 			strategies:    []config.PreemptionStrategy{config.LessThanOrEqualToFinalShare},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("a", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b_low", "").Priority(0).Request(corev1.ResourceCPU, "5").SimpleReserveQuota("b", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b_high", "").Priority(1).Request(corev1.ResourceCPU, "1").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("a1", "").Request(corev1.ResourceCPU, "3").SimpleReserveQuota("a", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b_low", "").Priority(0).Request(corev1.ResourceCPU, "5").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b_high", "").Priority(1).Request(corev1.ResourceCPU, "1").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming:      utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "1").Obj(),
+			incoming:      utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "1").Obj(),
 			targetCQ:      "a",
 			wantPreempted: sets.New(targetKeyReason("/b_high", kueue.InCohortFairSharingReason)),
 		},
 		"CQ with higher weight can preempt more": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
+				utiltestingapi.MakeClusterQueue("a").
 					Cohort("all").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "3").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -2642,18 +2643,18 @@ func TestFairPreemptions(t *testing.T) {
 					}).
 					FairWeight(resource.MustParse("2")).
 					Obj(),
-				utiltesting.MakeClusterQueue("b").
+				utiltestingapi.MakeClusterQueue("b").
 					Cohort("all").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "3").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("c").
+				utiltestingapi.MakeClusterQueue("c").
 					Cohort("all").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "3").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -2672,7 +2673,7 @@ func TestFairPreemptions(t *testing.T) {
 				*unitWl.Clone().Name("b5").SimpleReserveQuota("b", "default", now).Obj(),
 				*unitWl.Clone().Name("b6").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
+			incoming: utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "2").Obj(),
 			targetCQ: "a",
 			wantPreempted: sets.New(
 				targetKeyReason("/b1", kueue.InCohortFairSharingReason),
@@ -2681,18 +2682,18 @@ func TestFairPreemptions(t *testing.T) {
 		},
 		"can preempt anything borrowing from CQ with 0 weight": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
+				utiltestingapi.MakeClusterQueue("a").
 					Cohort("all").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "3").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("b").
+				utiltestingapi.MakeClusterQueue("b").
 					Cohort("all").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "3").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -2700,9 +2701,9 @@ func TestFairPreemptions(t *testing.T) {
 					}).
 					FairWeight(resource.MustParse("0")).
 					Obj(),
-				utiltesting.MakeClusterQueue("c").
+				utiltestingapi.MakeClusterQueue("c").
 					Cohort("all").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "3").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -2721,7 +2722,7 @@ func TestFairPreemptions(t *testing.T) {
 				*unitWl.Clone().Name("b5").SimpleReserveQuota("b", "default", now).Obj(),
 				*unitWl.Clone().Name("b6").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "3").Obj(),
+			incoming: utiltestingapi.MakeWorkload("a_incoming", "").Request(corev1.ResourceCPU, "3").Obj(),
 			targetCQ: "a",
 			wantPreempted: sets.New(
 				targetKeyReason("/b1", kueue.InCohortFairSharingReason),
@@ -2731,18 +2732,18 @@ func TestFairPreemptions(t *testing.T) {
 		},
 		"can't preempt nominal from CQ with 0 weight": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
+				utiltestingapi.MakeClusterQueue("a").
 					Cohort("all").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "3").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("b").
+				utiltestingapi.MakeClusterQueue("b").
 					Cohort("all").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "3").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -2764,17 +2765,17 @@ func TestFairPreemptions(t *testing.T) {
 		},
 		"can't preempt nominal from Cohort with 0 weight": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("left-cq").
+				utiltestingapi.MakeClusterQueue("left-cq").
 					Cohort("root").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "0").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("right-cq").
+				utiltestingapi.MakeClusterQueue("right-cq").
 					Cohort("right-cohort").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "0").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
@@ -2783,9 +2784,9 @@ func TestFairPreemptions(t *testing.T) {
 					Obj(),
 			},
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("right-cohort").
+				utiltestingapi.MakeCohort("right-cohort").
 					FairWeight(resource.MustParse("0")).
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "1").Obj()).
 					Parent("root").Obj(),
 			},
@@ -2798,8 +2799,8 @@ func TestFairPreemptions(t *testing.T) {
 		},
 		"can preempt within cluster queue when no cohort": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeClusterQueue("a").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "1").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
@@ -2834,53 +2835,53 @@ func TestFairPreemptions(t *testing.T) {
 		// preemptions deterministic
 		"hierarchical preemption": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
+				utiltestingapi.MakeClusterQueue("a").
 					Cohort("LEFT").
 					FairWeight(resource.MustParse("2")).
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "1").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("b").
+				utiltestingapi.MakeClusterQueue("b").
 					Cohort("LEFT").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
-				utiltesting.MakeClusterQueue("c").
+				utiltestingapi.MakeClusterQueue("c").
 					Cohort("ROOT").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
-				utiltesting.MakeClusterQueue("d").
+				utiltestingapi.MakeClusterQueue("d").
 					Cohort("RIGHT").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
-				utiltesting.MakeClusterQueue("e").
+				utiltestingapi.MakeClusterQueue("e").
 					Cohort("RIGHT").
 					// for determinism, we slightly prefer preemptions from e
 					// compared to d.
 					FairWeight(resource.MustParse("0.99")).
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("ROOT").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeCohort("ROOT").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "5").Obj()).
 					Obj(),
-				utiltesting.MakeCohort("LEFT").
+				utiltestingapi.MakeCohort("LEFT").
 					FairWeight(resource.MustParse("2")).
 					Parent("ROOT").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "5").Obj()).
 					Obj(),
-				utiltesting.MakeCohort("RIGHT").
+				utiltestingapi.MakeCohort("RIGHT").
 					Parent("ROOT").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "5").Obj()).
 					Obj(),
 			},
@@ -2906,7 +2907,7 @@ func TestFairPreemptions(t *testing.T) {
 				*unitWl.Clone().Name("e4").Priority(4).SimpleReserveQuota("e", "default", now).Obj(),
 				*unitWl.Clone().Name("e5").Priority(5).SimpleReserveQuota("e", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("unit", "").Request(corev1.ResourceCPU, "5").Obj(),
+			incoming: utiltestingapi.MakeWorkload("unit", "").Request(corev1.ResourceCPU, "5").Obj(),
 			targetCQ: "a",
 			wantPreempted: sets.New(
 				targetKeyReason("/b1", kueue.InCohortFairSharingReason),
@@ -2928,26 +2929,26 @@ func TestFairPreemptions(t *testing.T) {
 		// being high, and RIGHT/b having a low weight.
 		"borrowing cq in non-borrowing cohort is protected": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
+				utiltestingapi.MakeClusterQueue("a").
 					Cohort("ROOT").
 					FairWeight(resource.MustParse("10")).
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "5").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("b").
+				utiltestingapi.MakeClusterQueue("b").
 					Cohort("RIGHT").
 					FairWeight(resource.MustParse("0.1")).
 					Obj(),
 			},
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("ROOT").Obj(),
-				utiltesting.MakeCohort("RIGHT").Parent("ROOT").
+				utiltestingapi.MakeCohort("ROOT").Obj(),
+				utiltestingapi.MakeCohort("RIGHT").Parent("ROOT").
 					FairWeight(resource.MustParse("0.1")).
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj()).
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 			admitted: []kueue.Workload{
@@ -2956,7 +2957,7 @@ func TestFairPreemptions(t *testing.T) {
 				*unitWl.Clone().Name("a3").Priority(-1).SimpleReserveQuota("a", "default", now).Obj(),
 				*unitWl.Clone().Name("b1").Priority(-1).SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("unit", "").Request(corev1.ResourceCPU, "5").Obj(),
+			incoming: utiltestingapi.MakeWorkload("unit", "").Request(corev1.ResourceCPU, "5").Obj(),
 			targetCQ: "a",
 			wantPreempted: sets.New(
 				targetKeyReason("/a1", kueue.InClusterQueueReason),
@@ -2976,35 +2977,35 @@ func TestFairPreemptions(t *testing.T) {
 		//
 		"forced to preempt within clusterqueue because borrowing workload too important": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
+				utiltestingapi.MakeClusterQueue("a").
 					Cohort("ROOT").
 					FairWeight(resource.MustParse("10")).
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "5").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("b").
+				utiltestingapi.MakeClusterQueue("b").
 					Cohort("RIGHT").
 					FairWeight(resource.MustParse("0.1")).
 					Obj(),
 			},
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("ROOT").Obj(),
-				utiltesting.MakeCohort("RIGHT").Parent("ROOT").
+				utiltestingapi.MakeCohort("ROOT").Obj(),
+				utiltestingapi.MakeCohort("RIGHT").Parent("ROOT").
 					FairWeight(resource.MustParse("0.1")).
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "3").Obj()).
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "3").Obj()).
 					Obj(),
 			},
 			admitted: []kueue.Workload{
 				*unitWl.Clone().Name("a1").Priority(-1).SimpleReserveQuota("a", "default", now).Obj(),
 				*unitWl.Clone().Name("a2").Priority(-1).SimpleReserveQuota("a", "default", now).Obj(),
 				*unitWl.Clone().Name("a3").Priority(-1).SimpleReserveQuota("a", "default", now).Obj(),
-				*utiltesting.MakeWorkload("b1", "").Priority(100).Request(corev1.ResourceCPU, "4").SimpleReserveQuota("b", "default", now).Obj(),
+				*utiltestingapi.MakeWorkload("b1", "").Priority(100).Request(corev1.ResourceCPU, "4").SimpleReserveQuota("b", "default", now).Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("unit", "").Request(corev1.ResourceCPU, "4").Obj(),
+			incoming: utiltestingapi.MakeWorkload("unit", "").Request(corev1.ResourceCPU, "4").Obj(),
 			targetCQ: "a",
 			wantPreempted: sets.New(
 				targetKeyReason("/a1", kueue.InClusterQueueReason),
@@ -3029,23 +3030,23 @@ func TestFairPreemptions(t *testing.T) {
 		// preemption is possible.
 		"deep preemption": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
+				utiltestingapi.MakeClusterQueue("a").
 					Cohort("AAA").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "0").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("b").
+				utiltestingapi.MakeClusterQueue("b").
 					Cohort("BBB").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "0").Obj()).
 					Obj(),
 			},
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("ROOT").Obj(),
-				utiltesting.MakeCohort("A").Parent("ROOT").
+				utiltestingapi.MakeCohort("ROOT").Obj(),
+				utiltestingapi.MakeCohort("A").Parent("ROOT").
 					// we are comparing
 					// almostLCAs=(A,B). In order
 					// for the preemption to
@@ -3053,25 +3054,25 @@ func TestFairPreemptions(t *testing.T) {
 					// is more important than B.
 					FairWeight(resource.MustParse("1.01")).
 					Obj(),
-				utiltesting.MakeCohort("AA").Parent("A").
+				utiltestingapi.MakeCohort("AA").Parent("A").
 					Obj(),
-				utiltesting.MakeCohort("AAA").Parent("AA").
+				utiltestingapi.MakeCohort("AAA").Parent("AA").
 					Obj(),
-				utiltesting.MakeCohort("B").Parent("ROOT").
+				utiltestingapi.MakeCohort("B").Parent("ROOT").
 					FairWeight(resource.MustParse("0.99")).
 					Obj(),
-				utiltesting.MakeCohort("BB").Parent("B").
+				utiltestingapi.MakeCohort("BB").Parent("B").
 					Obj(),
-				utiltesting.MakeCohort("BBB").Parent("BB").
+				utiltestingapi.MakeCohort("BBB").Parent("BB").
 					Obj(),
-				utiltesting.MakeCohort("C").Parent("ROOT").
+				utiltestingapi.MakeCohort("C").Parent("ROOT").
 					Obj(),
-				utiltesting.MakeCohort("CC").Parent("C").
+				utiltestingapi.MakeCohort("CC").Parent("C").
 					Obj(),
-				utiltesting.MakeCohort("CCC").Parent("CC").
+				utiltestingapi.MakeCohort("CCC").Parent("CC").
 					Obj(),
-				utiltesting.MakeCohort("CCCC").Parent("CCC").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj()).
+				utiltestingapi.MakeCohort("CCCC").Parent("CCC").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 			admitted: []kueue.Workload{
@@ -3085,18 +3086,18 @@ func TestFairPreemptions(t *testing.T) {
 		},
 		"cq with zero weight can reclaim nominal quota": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
+				utiltestingapi.MakeClusterQueue("a").
 					Cohort("ROOT").
 					FairWeight(resource.MustParse("0.0")).
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "1").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("b").
+				utiltestingapi.MakeClusterQueue("b").
 					Cohort("ROOT").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "0").Obj()).
 					FairWeight(resource.MustParse("1.0")).
 					Obj(),
@@ -3112,27 +3113,27 @@ func TestFairPreemptions(t *testing.T) {
 		},
 		"cohort with zero weight can reclaim nominal quota": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("a").
+				utiltestingapi.MakeClusterQueue("a").
 					Cohort("A").
 					FairWeight(resource.MustParse("0.0")).
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "0").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("b").
+				utiltestingapi.MakeClusterQueue("b").
 					Cohort("ROOT").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "0").Obj()).
 					FairWeight(resource.MustParse("1.0")).
 					Obj(),
 			},
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("A").
+				utiltestingapi.MakeCohort("A").
 					Parent("ROOT").
 					FairWeight(resource.MustParse("0.0")).
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "1").Obj()).Obj(),
 			},
 			admitted: []kueue.Workload{
@@ -3217,23 +3218,23 @@ func TestCandidatesOrdering(t *testing.T) {
 
 	preemptorCq := "preemptor"
 
-	wlLowUsageLq := workload.NewInfo(utiltesting.MakeWorkload("low_lq_usage", "").
+	wlLowUsageLq := workload.NewInfo(utiltestingapi.MakeWorkload("low_lq_usage", "").
 		Queue("low_usage_lq").
-		ReserveQuotaAt(utiltesting.MakeAdmission(preemptorCq).Obj(), now).
+		ReserveQuotaAt(utiltestingapi.MakeAdmission(preemptorCq).Obj(), now).
 		Priority(1).
 		Obj())
 	wlLowUsageLq.LocalQueueFSUsage = ptr.To(0.1)
 
-	wlMidUsageLq := workload.NewInfo(utiltesting.MakeWorkload("mid_lq_usage", "").
+	wlMidUsageLq := workload.NewInfo(utiltestingapi.MakeWorkload("mid_lq_usage", "").
 		Queue("mid_usage_lq").
-		ReserveQuotaAt(utiltesting.MakeAdmission(preemptorCq).Obj(), now).
+		ReserveQuotaAt(utiltestingapi.MakeAdmission(preemptorCq).Obj(), now).
 		Priority(10).
 		Obj())
 	wlMidUsageLq.LocalQueueFSUsage = ptr.To(0.5)
 
-	wlHighUsageLqDifCQ := workload.NewInfo(utiltesting.MakeWorkload("high_lq_usage_different_cq", "").
+	wlHighUsageLqDifCQ := workload.NewInfo(utiltestingapi.MakeWorkload("high_lq_usage_different_cq", "").
 		Queue("high_usage_lq_different_cq").
-		ReserveQuotaAt(utiltesting.MakeAdmission("different_cq").Obj(), now).
+		ReserveQuotaAt(utiltestingapi.MakeAdmission("different_cq").Obj(), now).
 		Priority(1).
 		Obj())
 	wlHighUsageLqDifCQ.LocalQueueFSUsage = ptr.To(1.0)
@@ -3245,12 +3246,12 @@ func TestCandidatesOrdering(t *testing.T) {
 	}{
 		"workloads sorted by priority": {
 			candidates: []workload.Info{
-				*workload.NewInfo(utiltesting.MakeWorkload("high", "").
-					ReserveQuotaAt(utiltesting.MakeAdmission(preemptorCq).Obj(), now).
+				*workload.NewInfo(utiltestingapi.MakeWorkload("high", "").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission(preemptorCq).Obj(), now).
 					Priority(10).
 					Obj()),
-				*workload.NewInfo(utiltesting.MakeWorkload("low", "").
-					ReserveQuotaAt(utiltesting.MakeAdmission(preemptorCq).Obj(), now).
+				*workload.NewInfo(utiltestingapi.MakeWorkload("low", "").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission(preemptorCq).Obj(), now).
 					Priority(-10).
 					Obj()),
 			},
@@ -3258,11 +3259,11 @@ func TestCandidatesOrdering(t *testing.T) {
 		},
 		"evicted workload first": {
 			candidates: []workload.Info{
-				*workload.NewInfo(utiltesting.MakeWorkload("other", "").
-					ReserveQuotaAt(utiltesting.MakeAdmission(preemptorCq).Obj(), now).
+				*workload.NewInfo(utiltestingapi.MakeWorkload("other", "").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission(preemptorCq).Obj(), now).
 					Priority(10).
 					Obj()),
-				*workload.NewInfo(utiltesting.MakeWorkload("evicted", "").
+				*workload.NewInfo(utiltestingapi.MakeWorkload("evicted", "").
 					SetOrReplaceCondition(metav1.Condition{
 						Type:               kueue.WorkloadEvicted,
 						Status:             metav1.ConditionTrue,
@@ -3274,12 +3275,12 @@ func TestCandidatesOrdering(t *testing.T) {
 		},
 		"workload from different CQ first": {
 			candidates: []workload.Info{
-				*workload.NewInfo(utiltesting.MakeWorkload("preemptorCq", "").
-					ReserveQuotaAt(utiltesting.MakeAdmission(preemptorCq).Obj(), now).
+				*workload.NewInfo(utiltestingapi.MakeWorkload("preemptorCq", "").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission(preemptorCq).Obj(), now).
 					Priority(10).
 					Obj()),
-				*workload.NewInfo(utiltesting.MakeWorkload("other", "").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other").Obj(), now).
+				*workload.NewInfo(utiltestingapi.MakeWorkload("other", "").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other").Obj(), now).
 					Priority(10).
 					Obj()),
 			},
@@ -3287,14 +3288,14 @@ func TestCandidatesOrdering(t *testing.T) {
 		},
 		"old workloads last": {
 			candidates: []workload.Info{
-				*workload.NewInfo(utiltesting.MakeWorkload("older", "").
-					ReserveQuotaAt(utiltesting.MakeAdmission(preemptorCq).Obj(), now.Add(-time.Second)).
+				*workload.NewInfo(utiltestingapi.MakeWorkload("older", "").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission(preemptorCq).Obj(), now.Add(-time.Second)).
 					Obj()),
-				*workload.NewInfo(utiltesting.MakeWorkload("younger", "").
-					ReserveQuotaAt(utiltesting.MakeAdmission(preemptorCq).Obj(), now.Add(time.Second)).
+				*workload.NewInfo(utiltestingapi.MakeWorkload("younger", "").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission(preemptorCq).Obj(), now.Add(time.Second)).
 					Obj()),
-				*workload.NewInfo(utiltesting.MakeWorkload("current", "").
-					ReserveQuotaAt(utiltesting.MakeAdmission(preemptorCq).Obj(), now).
+				*workload.NewInfo(utiltestingapi.MakeWorkload("current", "").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission(preemptorCq).Obj(), now).
 					Obj()),
 			},
 			wantCandidates: []workload.Reference{"younger", "current", "older"},
@@ -3376,7 +3377,7 @@ func TestPreemptionMessage(t *testing.T) {
 func TestHierarchicalPreemptions(t *testing.T) {
 	now := time.Now()
 	flavors := []*kueue.ResourceFlavor{
-		utiltesting.MakeResourceFlavor("default").Obj(),
+		utiltestingapi.MakeResourceFlavor("default").Obj(),
 	}
 	cases := map[string]struct {
 		clusterQueues []*kueue.ClusterQueue
@@ -3395,39 +3396,39 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		// q
 		"preempt with hierarchical advantage": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("r").Obj(),
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "2").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_borrowing").
+				utiltestingapi.MakeClusterQueue("q_borrowing").
 					Cohort("r").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted2", "").
+				*utiltestingapi.MakeWorkload("admitted2", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(0).
 				Request(corev1.ResourceCPU, "2").
 				Obj(),
@@ -3448,54 +3449,54 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		// q
 		"avoid queues within nominal quota": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("r").Obj(),
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "2").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q_nominal").
-					Cohort("r").ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeClusterQueue("q_nominal").
+					Cohort("r").ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 					Resource(corev1.ResourceCPU, "2").
 					Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_borrowing").
+				utiltestingapi.MakeClusterQueue("q_borrowing").
 					Cohort("r").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted1", "").
+				*utiltestingapi.MakeWorkload("admitted1", "").
 					Priority(-10).
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuota(utiltesting.MakeAdmission("q_nominal").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_nominal").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted2", "").
+				*utiltestingapi.MakeWorkload("admitted2", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(0).
 				Request(corev1.ResourceCPU, "2").
 				Obj(),
@@ -3516,46 +3517,46 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		// q(0)
 		"preempt multiple with hierarchical advantage": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("r").Obj(),
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "2").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_borrowing").
+				utiltestingapi.MakeClusterQueue("q_borrowing").
 					Cohort("r").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted1", "").
+				*utiltestingapi.MakeWorkload("admitted1", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted2", "").
+				*utiltestingapi.MakeWorkload("admitted2", "").
 					Priority(2).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(0).
 				Request(corev1.ResourceCPU, "2").
 				Obj(),
@@ -3578,17 +3579,17 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		// q(0) q_same_cohort(0)
 		"preempt in cohort and own CQ": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("r").Obj(),
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "3").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
@@ -3597,38 +3598,38 @@ func TestHierarchicalPreemptions(t *testing.T) {
 							MaxPriorityThreshold: ptr.To[int32](0),
 						},
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_same_cohort").
+				utiltestingapi.MakeClusterQueue("q_same_cohort").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted_not_preemptible", "").
+				*utiltestingapi.MakeWorkload("admitted_not_preemptible", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_same_cohort").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_same_cohort").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_preemptible", "").
+				*utiltestingapi.MakeWorkload("admitted_preemptible", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_same_cohort").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_same_cohort").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_own_queue", "").
+				*utiltestingapi.MakeWorkload("admitted_own_queue", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(1).
 				Request(corev1.ResourceCPU, "2").
 				Obj(),
@@ -3651,46 +3652,46 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		// q(0)
 		"prefer to preempt hierarchical candidate": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("r").Obj(),
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "2").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_borrowing").
+				utiltestingapi.MakeClusterQueue("q_borrowing").
 					Cohort("r").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted_borrowing", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_same_queue", "").
+				*utiltestingapi.MakeWorkload("admitted_same_queue", "").
 					Priority(-2).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(0).
 				Request(corev1.ResourceCPU, "1").
 				Obj(),
@@ -3712,17 +3713,17 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		// q(0) q_same_cohort(0)
 		"forced to preempt priority candidate": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("r").Obj(),
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "2").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
@@ -3731,40 +3732,40 @@ func TestHierarchicalPreemptions(t *testing.T) {
 							MaxPriorityThreshold: ptr.To[int32](0),
 						},
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_nominal").
+				utiltestingapi.MakeClusterQueue("q_nominal").
 					Cohort("r").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "2").
 						Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_same_cohort").
+				utiltestingapi.MakeClusterQueue("q_same_cohort").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted_nominal", "").
+				*utiltestingapi.MakeWorkload("admitted_nominal", "").
 					Priority(-10).
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuota(utiltesting.MakeAdmission("q_nominal").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_nominal").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_same_cohort", "").
+				*utiltestingapi.MakeWorkload("admitted_same_cohort", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuota(utiltesting.MakeAdmission("q_same_cohort").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_same_cohort").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(0).
 				Request(corev1.ResourceCPU, "2").
 				Obj(),
@@ -3787,53 +3788,53 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		//
 		"incoming workload fits in CQ nominal quota": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("r").Obj(),
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "2").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "4").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "4").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_borrowing").
+				utiltestingapi.MakeClusterQueue("q_borrowing").
 					Cohort("r").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_same_cohort").
+				utiltestingapi.MakeClusterQueue("q_same_cohort").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted_borrowing", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing", "").
 					Priority(10).
 					Request(corev1.ResourceCPU, "3").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "3").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_same_cohort", "").
+				*utiltestingapi.MakeWorkload("admitted_same_cohort", "").
 					Priority(10).
 					Request(corev1.ResourceCPU, "3").
-					ReserveQuota(utiltesting.MakeAdmission("q_same_cohort").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_same_cohort").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "3").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(0).
 				Request(corev1.ResourceCPU, "4").
 				Obj(),
@@ -3857,19 +3858,19 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		//
 		"preempt hierarchical and priority candidates": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeCohort("r").ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 					Resource(corev1.ResourceCPU, "1").
 					Obj()).Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "4").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
@@ -3878,45 +3879,45 @@ func TestHierarchicalPreemptions(t *testing.T) {
 							MaxPriorityThreshold: ptr.To[int32](0),
 						},
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_borrowing").
+				utiltestingapi.MakeClusterQueue("q_borrowing").
 					Cohort("r").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_same_cohort").
+				utiltestingapi.MakeClusterQueue("q_same_cohort").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted_borrowing", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_same_cohort_preemptible", "").
+				*utiltestingapi.MakeWorkload("admitted_same_cohort_preemptible", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_same_cohort").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_same_cohort").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_borrowing_not_preemptible", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_not_preemptible", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(0).
 				Request(corev1.ResourceCPU, "3").
 				Obj(),
@@ -3940,19 +3941,19 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		//
 		"preempt hierarchical candidates and inside CQ": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeCohort("r").ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 					Resource(corev1.ResourceCPU, "1").
 					Obj()).Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "4").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
@@ -3961,45 +3962,45 @@ func TestHierarchicalPreemptions(t *testing.T) {
 							MaxPriorityThreshold: ptr.To[int32](0),
 						},
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_borrowing").
+				utiltestingapi.MakeClusterQueue("q_borrowing").
 					Cohort("r").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_same_cohort").
+				utiltestingapi.MakeClusterQueue("q_same_cohort").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted_borrowing", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_same_queue_preemptible", "").
+				*utiltestingapi.MakeWorkload("admitted_same_queue_preemptible", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_borrowing_not_preemptible", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_not_preemptible", "").
 					Priority(1).
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(0).
 				Request(corev1.ResourceCPU, "3").
 				Obj(),
@@ -4022,30 +4023,30 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		// q(0)
 		"reclaim nominal quota from lowest priority workload, excluding non-borrowing": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("r").Obj(),
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "3").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_borrowing").
+				utiltestingapi.MakeClusterQueue("q_borrowing").
 					Cohort("r").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_nominal").
-					Cohort("r").ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeClusterQueue("q_nominal").
+					Cohort("r").ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 					Resource(corev1.ResourceCPU, "2").
 					Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
@@ -4054,36 +4055,36 @@ func TestHierarchicalPreemptions(t *testing.T) {
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted_borrowing_prio_8", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_prio_8", "").
 					Priority(8).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_borrowing_prio_9", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_prio_9", "").
 					Priority(9).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_borrowing_prio_10", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_prio_10", "").
 					Priority(9).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_nominal", "").
+				*utiltestingapi.MakeWorkload("admitted_nominal", "").
 					Priority(-2).
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuota(utiltesting.MakeAdmission("q_nominal").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_nominal").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(0).
 				Request(corev1.ResourceCPU, "1").
 				Obj(),
@@ -4105,65 +4106,65 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		//    q(0)  q_same_cohort(0)   q_other(0)
 		"infeasible preemption all available workloads in pruned subtrees": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("r").Obj(),
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "2").
 						Obj()).Obj(),
-				utiltesting.MakeCohort("c_other").
+				utiltestingapi.MakeCohort("c_other").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "2").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q_other").
-					Cohort("c_other").ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeClusterQueue("q_other").
+					Cohort("c_other").ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 					Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_same_cohort").
+				utiltestingapi.MakeClusterQueue("q_same_cohort").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted_other_1", "").
+				*utiltestingapi.MakeWorkload("admitted_other_1", "").
 					Priority(-10).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_other").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_other").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_other_2", "").
+				*utiltestingapi.MakeWorkload("admitted_other_2", "").
 					Priority(-10).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_other").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_other").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_same_cohort", "").
+				*utiltestingapi.MakeWorkload("admitted_same_cohort", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuota(utiltesting.MakeAdmission("q_same_cohort").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_same_cohort").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(0).
 				Request(corev1.ResourceCPU, "2").
 				Obj(),
@@ -4184,34 +4185,34 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		// q(0)   q_same_cohort(0)
 		"hiearchical preemption with multiple resources": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeCohort("r").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "3").
 						Obj()).Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "4").
 						Resource(corev1.ResourceMemory, "4Gi").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_borrowing").
+				utiltestingapi.MakeClusterQueue("q_borrowing").
 					Cohort("r").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_same_cohort").
-					Cohort("c").ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+				utiltestingapi.MakeClusterQueue("q_same_cohort").
+					Cohort("c").ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 					Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -4219,26 +4220,26 @@ func TestHierarchicalPreemptions(t *testing.T) {
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted_borrowing", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "3").
 					Request(corev1.ResourceMemory, "1Gi").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "3").
 							Assignment(corev1.ResourceMemory, "default", "1Gi").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_same_cohort", "").
+				*utiltestingapi.MakeWorkload("admitted_same_cohort", "").
 					Priority(-2).
 					Request(corev1.ResourceCPU, "1").
 					Request(corev1.ResourceMemory, "3Gi").
-					ReserveQuota(utiltesting.MakeAdmission("q_same_cohort").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_same_cohort").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").
 							Assignment(corev1.ResourceMemory, "default", "3Gi").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(-2).
 				Request(corev1.ResourceCPU, "2").
 				Request(corev1.ResourceMemory, "1Gi").
@@ -4265,17 +4266,17 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		//
 		"prefer to preempt evicted workloads": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("r").Obj(),
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "2").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
@@ -4284,34 +4285,34 @@ func TestHierarchicalPreemptions(t *testing.T) {
 							MaxPriorityThreshold: ptr.To[int32](0),
 						},
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_borrowing").
+				utiltestingapi.MakeClusterQueue("q_borrowing").
 					Cohort("r").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_same_cohort").
+				utiltestingapi.MakeClusterQueue("q_same_cohort").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted_borrowing", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing", "").
 					Priority(-10).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("evicted_same_cohort", "").
+				*utiltestingapi.MakeWorkload("evicted_same_cohort", "").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuota(utiltesting.MakeAdmission("q_same_cohort").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_same_cohort").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj()).
 					SetOrReplaceCondition(metav1.Condition{
 						Type:               kueue.WorkloadEvicted,
@@ -4320,7 +4321,7 @@ func TestHierarchicalPreemptions(t *testing.T) {
 					}).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(0).
 				Request(corev1.ResourceCPU, "1").
 				Obj(),
@@ -4342,40 +4343,40 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		//
 		"respect lending limits": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").Obj(),
-				utiltesting.MakeCohort("c").
+				utiltestingapi.MakeCohort("r").Obj(),
+				utiltestingapi.MakeCohort("c").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "2").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q").
+				utiltestingapi.MakeClusterQueue("q").
 					Cohort("c").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").
+					*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "3", "", "2").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
-				utiltesting.MakeClusterQueue("q_borrowing").
+				utiltestingapi.MakeClusterQueue("q_borrowing").
 					Cohort("r").ResourceGroup(
-					*utiltesting.MakeFlavorQuotas("default").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("default").Obj()).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted_borrowing", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing", "").
 					Priority(0).
 					Request(corev1.ResourceCPU, "4").
-					ReserveQuota(utiltesting.MakeAdmission("q_borrowing").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q_borrowing").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "4").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(-2).
 				Request(corev1.ResourceCPU, "5").
 				Obj(),
@@ -4403,73 +4404,73 @@ func TestHierarchicalPreemptions(t *testing.T) {
 		//	0: q1, q3, q4, q5
 		"reclaim in complex hierarchy": {
 			cohorts: []*kueue.Cohort{
-				utiltesting.MakeCohort("r").Obj(),
-				utiltesting.MakeCohort("c11").
+				utiltestingapi.MakeCohort("r").Obj(),
+				utiltestingapi.MakeCohort("c11").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "4").
 						Obj()).Obj(),
-				utiltesting.MakeCohort("c12").
+				utiltestingapi.MakeCohort("c12").
 					Parent("r").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "4").
 						Obj()).Obj(),
-				utiltesting.MakeCohort("c21").
+				utiltestingapi.MakeCohort("c21").
 					Parent("c11").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "4").
 						Obj()).Obj(),
-				utiltesting.MakeCohort("c22").
+				utiltestingapi.MakeCohort("c22").
 					Parent("c11").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "4").
 						Obj()).Obj(),
-				utiltesting.MakeCohort("c23").
+				utiltestingapi.MakeCohort("c23").
 					Parent("c11").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "4").
 						Obj()).Obj(),
-				utiltesting.MakeCohort("c31").
+				utiltestingapi.MakeCohort("c31").
 					Parent("c21").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "4").
 						Obj()).Obj(),
-				utiltesting.MakeCohort("c32").
+				utiltestingapi.MakeCohort("c32").
 					Parent("c21").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "4").
 						Obj()).Obj(),
 			},
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue("q1").
+				utiltestingapi.MakeClusterQueue("q1").
 					Cohort("c12").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("q2").
+				utiltestingapi.MakeClusterQueue("q2").
 					Cohort("c23").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("q3").
+				utiltestingapi.MakeClusterQueue("q3").
 					Cohort("c22").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("q4").
+				utiltestingapi.MakeClusterQueue("q4").
 					Cohort("c32").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				utiltesting.MakeClusterQueue("q5").
+				utiltestingapi.MakeClusterQueue("q5").
 					Cohort("c31").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -4478,64 +4479,64 @@ func TestHierarchicalPreemptions(t *testing.T) {
 					Obj(),
 			},
 			admitted: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted_borrowing_1", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_1", "").
 					Priority(-6).
 					Request(corev1.ResourceCPU, "4").
-					ReserveQuota(utiltesting.MakeAdmission("q1").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "4").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_borrowing_2", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_2", "").
 					Priority(-5).
 					Request(corev1.ResourceCPU, "4").
-					ReserveQuota(utiltesting.MakeAdmission("q1").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q1").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "4").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_borrowing_3", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_3", "").
 					Priority(-9).
 					Request(corev1.ResourceCPU, "4").
-					ReserveQuota(utiltesting.MakeAdmission("q2").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q2").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "4").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_borrowing_4", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_4", "").
 					Priority(-10).
 					Request(corev1.ResourceCPU, "4").
-					ReserveQuota(utiltesting.MakeAdmission("q2").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q2").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "4").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_borrowing_5", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_5", "").
 					Priority(-4).
 					Request(corev1.ResourceCPU, "4").
-					ReserveQuota(utiltesting.MakeAdmission("q3").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q3").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "4").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_borrowing_6", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_6", "").
 					Priority(-3).
 					Request(corev1.ResourceCPU, "3").
-					ReserveQuota(utiltesting.MakeAdmission("q3").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q3").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "3").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_borrowing_7", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_7", "").
 					Priority(4).
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuota(utiltesting.MakeAdmission("q4").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q4").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").Obj()).Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_borrowing_8", "").
+				*utiltestingapi.MakeWorkload("admitted_borrowing_8", "").
 					Priority(2).
 					Request(corev1.ResourceCPU, "3").
-					ReserveQuota(utiltesting.MakeAdmission("q4").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuota(utiltestingapi.MakeAdmission("q4").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "3").Obj()).Obj()).
 					Obj(),
 			},
-			incoming: utiltesting.MakeWorkload("incoming", "").
+			incoming: utiltestingapi.MakeWorkload("incoming", "").
 				Priority(-2).
 				Request(corev1.ResourceCPU, "7").
 				Obj(),
diff --git a/pkg/scheduler/scheduler_afs_test.go b/pkg/scheduler/scheduler_afs_test.go
index f0b19e027..eb4fe32b3 100644
--- a/pkg/scheduler/scheduler_afs_test.go
+++ b/pkg/scheduler/scheduler_afs_test.go
@@ -18,6 +18,7 @@ package scheduler
 
 import (
 	"context"
+	"fmt"
 	"sync"
 	"testing"
 	"time"
@@ -38,6 +39,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/routine"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestScheduleForAFS(t *testing.T) {
@@ -48,18 +50,18 @@ func TestScheduleForAFS(t *testing.T) {
 	now := time.Now().Truncate(time.Second)
 	fakeClock := testingclock.NewFakeClock(now)
 	resourceFlavors := []*kueue.ResourceFlavor{
-		utiltesting.MakeResourceFlavor("default").Obj(),
+		utiltestingapi.MakeResourceFlavor("default").Obj(),
 	}
 	clusterQueues := []kueue.ClusterQueue{
-		*utiltesting.MakeClusterQueue("cq1").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+		*utiltestingapi.MakeClusterQueue("cq1").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "8").
 				Resource(corev1.ResourceMemory, "8Gi").Obj()).
 			AdmissionMode(kueue.UsageBasedAdmissionFairSharing).
 			Obj(),
 	}
 	queues := []kueue.LocalQueue{
-		*utiltesting.MakeLocalQueue("lq-a", "default").
+		*utiltestingapi.MakeLocalQueue("lq-a", "default").
 			FairSharing(&kueue.FairSharing{Weight: ptr.To(resource.MustParse("1"))}).
 			ClusterQueue("cq1").
 			FairSharingStatus(&kueue.FairSharingStatus{
@@ -69,7 +71,7 @@ func TestScheduleForAFS(t *testing.T) {
 				},
 			}).
 			Obj(),
-		*utiltesting.MakeLocalQueue("lq-b", "default").
+		*utiltestingapi.MakeLocalQueue("lq-b", "default").
 			FairSharing(&kueue.FairSharing{Weight: ptr.To(resource.MustParse("1"))}).
 			ClusterQueue("cq1").
 			FairSharingStatus(&kueue.FairSharingStatus{
@@ -79,7 +81,7 @@ func TestScheduleForAFS(t *testing.T) {
 				},
 			}).
 			Obj(),
-		*utiltesting.MakeLocalQueue("lq-c", "default").
+		*utiltestingapi.MakeLocalQueue("lq-c", "default").
 			FairSharing(&kueue.FairSharing{Weight: ptr.To(resource.MustParse("1"))}).
 			ClusterQueue("cq1").
 			FairSharingStatus(&kueue.FairSharingStatus{
@@ -104,25 +106,25 @@ func TestScheduleForAFS(t *testing.T) {
 				"lq-b": {corev1.ResourceCPU: resource.MustParse("2")},
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl-a1", "default").
+				*utiltestingapi.MakeWorkload("wl-a1", "default").
 					Queue("lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "8").
 						Obj()).
 					Creation(now).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-b1", "default").
+				*utiltestingapi.MakeWorkload("wl-b1", "default").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "8").
 						Obj()).
 					Creation(now.Add(1 * time.Second)).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl-a1", "default").
+				*utiltestingapi.MakeWorkload("wl-a1", "default").
 					Queue("lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "8").
 						Obj()).
 					Creation(now).
@@ -140,9 +142,9 @@ func TestScheduleForAFS(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-b1", "default").
+				*utiltestingapi.MakeWorkload("wl-b1", "default").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "8").
 						Obj()).
 					Creation(now.Add(1 * time.Second)).
@@ -161,9 +163,9 @@ func TestScheduleForAFS(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq1").
+						utiltestingapi.MakeAdmission("cq1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "default", "8").
 									Count(1).
 									Obj(),
@@ -180,25 +182,25 @@ func TestScheduleForAFS(t *testing.T) {
 				"lq-b": {corev1.ResourceCPU: resource.MustParse("2")},
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl-a1", "default").
+				*utiltestingapi.MakeWorkload("wl-a1", "default").
 					Queue("lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "8").
 						Obj()).
 					Creation(now).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-b1", "default").
+				*utiltestingapi.MakeWorkload("wl-b1", "default").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "8").
 						Obj()).
 					Creation(now.Add(1 * time.Second)).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl-a1", "default").
+				*utiltestingapi.MakeWorkload("wl-a1", "default").
 					Queue("lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "8").
 						Obj()).
 					Creation(now).
@@ -217,9 +219,9 @@ func TestScheduleForAFS(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq1").
+						utiltestingapi.MakeAdmission("cq1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "default", "8").
 									Count(1).
 									Obj(),
@@ -227,9 +229,9 @@ func TestScheduleForAFS(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-b1", "default").
+				*utiltestingapi.MakeWorkload("wl-b1", "default").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "8").
 						Obj()).
 					Creation(now.Add(1 * time.Second)).
@@ -256,39 +258,39 @@ func TestScheduleForAFS(t *testing.T) {
 				"lq-b": {corev1.ResourceCPU: resource.MustParse("4")},
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl-a1", "default").
+				*utiltestingapi.MakeWorkload("wl-a1", "default").
 					Queue("lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Creation(now).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-a2", "default").
+				*utiltestingapi.MakeWorkload("wl-a2", "default").
 					Queue("lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Creation(now.Add(1 * time.Second)).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-b1", "default").
+				*utiltestingapi.MakeWorkload("wl-b1", "default").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Creation(now.Add(2 * time.Second)).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-b2", "default").
+				*utiltestingapi.MakeWorkload("wl-b2", "default").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Creation(now.Add(3 * time.Second)).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl-a1", "default").
+				*utiltestingapi.MakeWorkload("wl-a1", "default").
 					Queue("lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Creation(now).
@@ -307,9 +309,9 @@ func TestScheduleForAFS(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq1").
+						utiltestingapi.MakeAdmission("cq1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "default", "4").
 									Count(1).
 									Obj(),
@@ -317,9 +319,9 @@ func TestScheduleForAFS(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-a2", "default").
+				*utiltestingapi.MakeWorkload("wl-a2", "default").
 					Queue("lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Creation(now.Add(1 * time.Second)).
@@ -337,9 +339,9 @@ func TestScheduleForAFS(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-b1", "default").
+				*utiltestingapi.MakeWorkload("wl-b1", "default").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Creation(now.Add(2 * time.Second)).
@@ -358,9 +360,9 @@ func TestScheduleForAFS(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq1").
+						utiltestingapi.MakeAdmission("cq1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "default", "4").
 									Count(1).
 									Obj(),
@@ -368,9 +370,9 @@ func TestScheduleForAFS(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-b2", "default").
+				*utiltestingapi.MakeWorkload("wl-b2", "default").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Creation(now.Add(3 * time.Second)).
@@ -398,29 +400,29 @@ func TestScheduleForAFS(t *testing.T) {
 				"lq-c": {corev1.ResourceCPU: resource.MustParse("2")},
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl-a1", "default").
+				*utiltestingapi.MakeWorkload("wl-a1", "default").
 					Queue("lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-b1", "default").
+				*utiltestingapi.MakeWorkload("wl-b1", "default").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "3").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-c1", "default").
+				*utiltestingapi.MakeWorkload("wl-c1", "default").
 					Queue("lq-c").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl-a1", "default").
+				*utiltestingapi.MakeWorkload("wl-a1", "default").
 					Queue("lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Condition(metav1.Condition{
@@ -438,9 +440,9 @@ func TestScheduleForAFS(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq1").
+						utiltestingapi.MakeAdmission("cq1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "default", "4").
 									Count(1).
 									Obj(),
@@ -448,9 +450,9 @@ func TestScheduleForAFS(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-b1", "default").
+				*utiltestingapi.MakeWorkload("wl-b1", "default").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "3").
 						Obj()).
 					Condition(metav1.Condition{
@@ -468,9 +470,9 @@ func TestScheduleForAFS(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq1").
+						utiltestingapi.MakeAdmission("cq1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "default", "3").
 									Count(1).
 									Obj(),
@@ -478,9 +480,9 @@ func TestScheduleForAFS(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("wl-c1", "default").
+				*utiltestingapi.MakeWorkload("wl-c1", "default").
 					Queue("lq-c").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -498,9 +500,9 @@ func TestScheduleForAFS(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq1").
+						utiltestingapi.MakeAdmission("cq1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "default", "1").
 									Count(1).
 									Obj(),
@@ -513,87 +515,90 @@ func TestScheduleForAFS(t *testing.T) {
 	}
 
 	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			if tc.enableFairSharing {
-				features.SetFeatureGateDuringTest(t, features.AdmissionFairSharing, true)
-			}
+		for _, enabled := range []bool{false, true} {
+			t.Run(fmt.Sprintf("%s WorkloadRequestUseMergePatch enabled: %t", name, enabled), func(t *testing.T) {
+				features.SetFeatureGateDuringTest(t, features.WorkloadRequestUseMergePatch, enabled)
+				if tc.enableFairSharing {
+					features.SetFeatureGateDuringTest(t, features.AdmissionFairSharing, true)
+				}
 
-			for i, q := range queues {
-				if resList, found := tc.initialUsage[q.Name]; found {
-					queues[i].Status.FairSharing.AdmissionFairSharingStatus.ConsumedResources = resList
+				for i, q := range queues {
+					if resList, found := tc.initialUsage[q.Name]; found {
+						queues[i].Status.FairSharing.AdmissionFairSharingStatus.ConsumedResources = resList
+					}
 				}
-			}
 
-			clientBuilder := utiltesting.NewClientBuilder().
-				WithLists(
-					&kueue.WorkloadList{Items: tc.workloads},
-					&kueue.ClusterQueueList{Items: clusterQueues},
-					&kueue.LocalQueueList{Items: queues}).
-				WithObjects(
-					utiltesting.MakeNamespace("default"),
-				).
-				WithStatusSubresource(&kueue.Workload{}).
-				WithInterceptorFuncs(interceptor.Funcs{SubResourcePatch: utiltesting.TreatSSAAsStrategicMerge})
-			cl := clientBuilder.Build()
+				clientBuilder := utiltesting.NewClientBuilder().
+					WithLists(
+						&kueue.WorkloadList{Items: tc.workloads},
+						&kueue.ClusterQueueList{Items: clusterQueues},
+						&kueue.LocalQueueList{Items: queues}).
+					WithObjects(
+						utiltesting.MakeNamespace("default"),
+					).
+					WithStatusSubresource(&kueue.Workload{}).
+					WithInterceptorFuncs(interceptor.Funcs{SubResourcePatch: utiltesting.TreatSSAAsStrategicMerge})
+				cl := clientBuilder.Build()
 
-			fairSharing := &config.FairSharing{
-				Enable: tc.enableFairSharing,
-			}
-			cqCache := schdcache.New(cl, schdcache.WithFairSharing(fairSharing.Enable), schdcache.WithAdmissionFairSharing(afsConfig))
-			qManager := qcache.NewManager(cl, cqCache, qcache.WithAdmissionFairSharing(afsConfig))
+				fairSharing := &config.FairSharing{
+					Enable: tc.enableFairSharing,
+				}
+				cqCache := schdcache.New(cl, schdcache.WithFairSharing(fairSharing.Enable), schdcache.WithAdmissionFairSharing(afsConfig))
+				qManager := qcache.NewManager(cl, cqCache, qcache.WithAdmissionFairSharing(afsConfig))
 
-			ctx, log := utiltesting.ContextWithLog(t)
-			for _, q := range queues {
-				if err := qManager.AddLocalQueue(ctx, &q); err != nil {
-					t.Fatalf("Inserting queue %s/%s in manager: %v", q.Namespace, q.Name, err)
+				ctx, log := utiltesting.ContextWithLog(t)
+				for _, q := range queues {
+					if err := qManager.AddLocalQueue(ctx, &q); err != nil {
+						t.Fatalf("Inserting queue %s/%s in manager: %v", q.Namespace, q.Name, err)
+					}
 				}
-			}
-			for _, rf := range resourceFlavors {
-				cqCache.AddOrUpdateResourceFlavor(log, rf)
-			}
-			for _, cq := range clusterQueues {
-				if err := cqCache.AddClusterQueue(ctx, &cq); err != nil {
-					t.Fatalf("Inserting clusterQueue %s in cache: %v", cq.Name, err)
+				for _, rf := range resourceFlavors {
+					cqCache.AddOrUpdateResourceFlavor(log, rf)
 				}
-				if err := qManager.AddClusterQueue(ctx, &cq); err != nil {
-					t.Fatalf("Inserting clusterQueue %s in manager: %v", cq.Name, err)
+				for _, cq := range clusterQueues {
+					if err := cqCache.AddClusterQueue(ctx, &cq); err != nil {
+						t.Fatalf("Inserting clusterQueue %s in cache: %v", cq.Name, err)
+					}
+					if err := qManager.AddClusterQueue(ctx, &cq); err != nil {
+						t.Fatalf("Inserting clusterQueue %s in manager: %v", cq.Name, err)
+					}
 				}
-			}
-			recorder := &utiltesting.EventRecorder{}
-			scheduler := New(qManager, cqCache, cl, recorder,
-				WithFairSharing(fairSharing),
-				WithAdmissionFairSharing(afsConfig),
-				WithClock(t, fakeClock))
-			wg := sync.WaitGroup{}
-			scheduler.setAdmissionRoutineWrapper(routine.NewWrapper(
-				func() { wg.Add(1) },
-				func() { wg.Done() },
-			))
+				recorder := &utiltesting.EventRecorder{}
+				scheduler := New(qManager, cqCache, cl, recorder,
+					WithFairSharing(fairSharing),
+					WithAdmissionFairSharing(afsConfig),
+					WithClock(t, fakeClock))
+				wg := sync.WaitGroup{}
+				scheduler.setAdmissionRoutineWrapper(routine.NewWrapper(
+					func() { wg.Add(1) },
+					func() { wg.Done() },
+				))
 
-			ctx, cancel := context.WithTimeout(ctx, queueingTimeout)
-			go qManager.CleanUpOnContext(ctx)
-			defer cancel()
+				ctx, cancel := context.WithTimeout(ctx, queueingTimeout)
+				go qManager.CleanUpOnContext(ctx)
+				defer cancel()
 
-			for range len(tc.workloads) {
-				scheduler.schedule(ctx)
-				wg.Wait()
-			}
+				for range len(tc.workloads) {
+					scheduler.schedule(ctx)
+					wg.Wait()
+				}
 
-			gotWorkloads := &kueue.WorkloadList{}
-			err := cl.List(ctx, gotWorkloads)
-			if err != nil {
-				t.Fatalf("Unexpected list workloads error: %v", err)
-			}
+				gotWorkloads := &kueue.WorkloadList{}
+				err := cl.List(ctx, gotWorkloads)
+				if err != nil {
+					t.Fatalf("Unexpected list workloads error: %v", err)
+				}
 
-			defaultWorkloadCmpOpts := cmp.Options{
-				cmpopts.EquateEmpty(),
-				cmpopts.IgnoreFields(kueue.AdmissionCheckState{}, "LastTransitionTime"),
-				cmpopts.IgnoreFields(kueue.Workload{}, "ObjectMeta.ResourceVersion"),
-			}
+				defaultWorkloadCmpOpts := cmp.Options{
+					cmpopts.EquateEmpty(),
+					cmpopts.IgnoreFields(kueue.AdmissionCheckState{}, "LastTransitionTime"),
+					cmpopts.IgnoreFields(kueue.Workload{}, "ObjectMeta.ResourceVersion"),
+				}
 
-			if diff := cmp.Diff(tc.wantWorkloads, gotWorkloads.Items, defaultWorkloadCmpOpts); diff != "" {
-				t.Errorf("Unexpected workloads (-want,+got):\n%s", diff)
-			}
-		})
+				if diff := cmp.Diff(tc.wantWorkloads, gotWorkloads.Items, defaultWorkloadCmpOpts); diff != "" {
+					t.Errorf("Unexpected workloads (-want,+got):\n%s", diff)
+				}
+			})
+		}
 	}
 }
diff --git a/pkg/scheduler/scheduler_tas_test.go b/pkg/scheduler/scheduler_tas_test.go
index 93c477575..acfa0f657 100644
--- a/pkg/scheduler/scheduler_tas_test.go
+++ b/pkg/scheduler/scheduler_tas_test.go
@@ -18,6 +18,7 @@ package scheduler
 
 import (
 	"context"
+	"fmt"
 	"sync"
 	"testing"
 	"time"
@@ -41,6 +42,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/util/slices"
 	utiltas "sigs.k8s.io/kueue/pkg/util/tas"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
 	testingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 	"sigs.k8s.io/kueue/pkg/workload"
@@ -144,59 +146,59 @@ func TestScheduleForTAS(t *testing.T) {
 			Obj(),
 	}
 
-	defaultSingleLevelTopology := *utiltesting.MakeDefaultOneLevelTopology("tas-single-level")
-	defaultTwoLevelTopology := *utiltesting.MakeTopology("tas-two-level").
+	defaultSingleLevelTopology := *utiltestingapi.MakeDefaultOneLevelTopology("tas-single-level")
+	defaultTwoLevelTopology := *utiltestingapi.MakeTopology("tas-two-level").
 		Levels(tasRackLabel, corev1.LabelHostname).
 		Obj()
-	defaultThreeLevelTopology := *utiltesting.MakeTopology("tas-three-level").
+	defaultThreeLevelTopology := *utiltestingapi.MakeTopology("tas-three-level").
 		Levels(tasBlockLabel, tasRackLabel, corev1.LabelHostname).
 		Obj()
-	defaultFlavor := *utiltesting.MakeResourceFlavor("default").Obj()
-	defaultTASFlavor := *utiltesting.MakeResourceFlavor("tas-default").
+	defaultFlavor := *utiltestingapi.MakeResourceFlavor("default").Obj()
+	defaultTASFlavor := *utiltestingapi.MakeResourceFlavor("tas-default").
 		NodeLabel("tas-node", "true").
 		TopologyName("tas-single-level").
 		Obj()
-	defaultTASTwoLevelFlavor := *utiltesting.MakeResourceFlavor("tas-default").
+	defaultTASTwoLevelFlavor := *utiltestingapi.MakeResourceFlavor("tas-default").
 		NodeLabel("tas-node", "true").
 		TopologyName("tas-two-level").
 		Obj()
-	defaultTASThreeLevelFlavor := *utiltesting.MakeResourceFlavor("tas-default").
+	defaultTASThreeLevelFlavor := *utiltestingapi.MakeResourceFlavor("tas-default").
 		NodeLabel("tas-node", "true").
 		TopologyName("tas-three-level").
 		Obj()
-	defaultClusterQueue := *utiltesting.MakeClusterQueue("tas-main").
-		ResourceGroup(*utiltesting.MakeFlavorQuotas("tas-default").
+	defaultClusterQueue := *utiltestingapi.MakeClusterQueue("tas-main").
+		ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-default").
 			Resource(corev1.ResourceCPU, "50").
 			Resource(corev1.ResourceMemory, "50Gi").Obj()).
 		Obj()
-	defaultProvCheck := *utiltesting.MakeAdmissionCheck("prov-check").
+	defaultProvCheck := *utiltestingapi.MakeAdmissionCheck("prov-check").
 		ControllerName(kueue.ProvisioningRequestControllerName).
 		Condition(metav1.Condition{
 			Type:   kueue.AdmissionCheckActive,
 			Status: metav1.ConditionTrue,
 		}).
 		Obj()
-	defaultCustomCheck := *utiltesting.MakeAdmissionCheck("custom-check").
+	defaultCustomCheck := *utiltestingapi.MakeAdmissionCheck("custom-check").
 		ControllerName("custom-admission-check-controller").
 		Condition(metav1.Condition{
 			Type:   kueue.AdmissionCheckActive,
 			Status: metav1.ConditionTrue,
 		}).
 		Obj()
-	clusterQueueWithProvReq := *utiltesting.MakeClusterQueue("tas-main").
-		ResourceGroup(*utiltesting.MakeFlavorQuotas("tas-default").
+	clusterQueueWithProvReq := *utiltestingapi.MakeClusterQueue("tas-main").
+		ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-default").
 			Resource(corev1.ResourceCPU, "50").
 			Resource(corev1.ResourceMemory, "50Gi").Obj()).
 		AdmissionChecks(kueue.AdmissionCheckReference(defaultProvCheck.Name)).
 		Obj()
-	clusterQueueWithCustomCheck := *utiltesting.MakeClusterQueue("tas-main").
-		ResourceGroup(*utiltesting.MakeFlavorQuotas("tas-default").
+	clusterQueueWithCustomCheck := *utiltestingapi.MakeClusterQueue("tas-main").
+		ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-default").
 			Resource(corev1.ResourceCPU, "50").
 			Resource(corev1.ResourceMemory, "50Gi").Obj()).
 		AdmissionChecks(kueue.AdmissionCheckReference(defaultCustomCheck.Name)).
 		Obj()
 	queues := []kueue.LocalQueue{
-		*utiltesting.MakeLocalQueue("tas-main", "default").ClusterQueue("tas-main").Obj(),
+		*utiltestingapi.MakeLocalQueue("tas-main", "default").ClusterQueue("tas-main").Obj(),
 	}
 	eventIgnoreMessage := cmpopts.IgnoreFields(utiltesting.EventRecord{}, "Message")
 	cases := map[string]struct {
@@ -238,32 +240,32 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASTwoLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
 					PodSets(
-						*utiltesting.MakePodSet("launcher", 1).
+						*utiltestingapi.MakePodSet("launcher", 1).
 							PreferredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("worker", 0).
+						*utiltestingapi.MakePodSet("worker", 0).
 							PreferredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "1").
 							Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
 					PodSets(
-						utiltesting.MakePodSetAssignment("launcher").
+						utiltestingapi.MakePodSetAssignment("launcher").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 								Obj()).
 							Obj(),
-						utiltesting.MakePodSetAssignment("worker").
+						utiltestingapi.MakePodSetAssignment("worker").
 							Assignment(corev1.ResourceCPU, "tas-default", "0").
 							Count(0).
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).Obj()).
 							Obj(),
 					).
 					Obj(),
@@ -281,16 +283,16 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{clusterQueueWithProvReq},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
+						utiltestingapi.MakeAdmission("tas-main").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "tas-default", "1000m").
 									DelayedTopologyRequest(kueue.DelayedTopologyRequestStatePending).
 									Obj(),
@@ -304,13 +306,13 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
 					PodSets(
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
 							DelayedTopologyRequest(kueue.DelayedTopologyRequestStateReady).
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 								Obj()).
 							Obj(),
 					).
@@ -336,20 +338,20 @@ func TestScheduleForTAS(t *testing.T) {
 			admissionChecks: []kueue.AdmissionCheck{defaultProvCheck},
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{
-				*utiltesting.MakeResourceFlavor("tas-reservation").
+				*utiltestingapi.MakeResourceFlavor("tas-reservation").
 					NodeLabel("tas-group", "reservation").
 					TopologyName("tas-single-level").
 					Obj(),
-				*utiltesting.MakeResourceFlavor("tas-provisioning").
+				*utiltestingapi.MakeResourceFlavor("tas-provisioning").
 					NodeLabel("tas-group", "provisioning").
 					TopologyName("tas-single-level").
 					Obj()},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-reservation").
+						*utiltestingapi.MakeFlavorQuotas("tas-reservation").
 							Resource(corev1.ResourceCPU, "1").Obj(),
-						*utiltesting.MakeFlavorQuotas("tas-provisioning").
+						*utiltestingapi.MakeFlavorQuotas("tas-provisioning").
 							Resource(corev1.ResourceCPU, "1").Obj()).
 					AdmissionCheckStrategy(kueue.AdmissionCheckStrategyRule{
 						Name: "prov-check",
@@ -360,20 +362,20 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-reservation", "1000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -391,19 +393,19 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x0").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -412,11 +414,11 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -429,21 +431,21 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x0").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						PreferredTopologyRequest(tasRackLabel).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "1000m").
 								Count(2).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -452,12 +454,12 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
 						Count(2).
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 2).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 2).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -471,19 +473,19 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x0").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(tasRackLabel).
 						Request(corev1.ResourceCPU, "3").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "3000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -492,11 +494,11 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "3000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -514,19 +516,19 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x0").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(tasRackLabel).
 						Request(corev1.ResourceCPU, "3").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "3000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -535,11 +537,11 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "3000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -557,20 +559,20 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x0").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						RequiredTopologyRequest(tasRackLabel).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x2"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x2"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -579,12 +581,12 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x2"}, 1).Obj()).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x3"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x2"}, 1).Obj()).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x3"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -597,19 +599,19 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x0").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(tasRackLabel).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -618,11 +620,11 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -636,20 +638,20 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x0").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						RequiredTopologyRequest(tasRackLabel).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -658,12 +660,12 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -681,31 +683,31 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x0").
 					Queue("tas-main").
 					PodSets(
-						*utiltesting.MakePodSet("one", 1).
+						*utiltestingapi.MakePodSet("one", 1).
 							PreferredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("two", 1).
+						*utiltestingapi.MakePodSet("two", 1).
 							PreferredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "1").
 							Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
+						utiltestingapi.MakeAdmission("tas-main").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-									TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-										Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+									TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+										Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
 										Obj()).
 									Obj(),
-								utiltesting.MakePodSetAssignment("two").
+								utiltestingapi.MakePodSetAssignment("two").
 									Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-									TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-										Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+									TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+										Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 										Obj()).
 									Obj(),
 							).
@@ -715,18 +717,18 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
 					PodSets(
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x2"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x2"}, 1).Obj()).
 								Obj()).
 							Obj(),
-						utiltesting.MakePodSetAssignment("two").
+						utiltestingapi.MakePodSetAssignment("two").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 								Obj()).
 							Obj(),
 					).
@@ -740,22 +742,22 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x2").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						PreferredTopologyRequest(tasBlockLabel).
 						SliceSizeTopologyRequest(2).
 						SliceRequiredTopologyRequest(tasRackLabel).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").Count(2).
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").Count(2).
 								Assignment(corev1.ResourceCPU, "tas-default", "2000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x2"}, 1).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x3"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x2"}, 1).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x3"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -764,12 +766,12 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").Count(2).
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").Count(2).
 						Assignment(corev1.ResourceCPU, "tas-default", "2000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x3"}, 1).Obj()).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x4"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x3"}, 1).Obj()).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x4"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -782,22 +784,22 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x2").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 8).
+					PodSets(*utiltestingapi.MakePodSet("one", 8).
 						PreferredTopologyRequest(tasBlockLabel).
 						SliceSizeTopologyRequest(8).
 						SliceRequiredTopologyRequest(tasRackLabel).
 						Request(corev1.ResourceCPU, "250").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").Count(8).
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").Count(8).
 								Assignment(corev1.ResourceCPU, "tas-default", "2000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x2"}, 4).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x3"}, 4).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x2"}, 4).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x3"}, 4).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -806,12 +808,12 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").Count(8).
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").Count(8).
 						Assignment(corev1.ResourceCPU, "tas-default", "2000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x3"}, 4).Obj()).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x4"}, 4).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x3"}, 4).Obj()).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x4"}, 4).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -824,23 +826,23 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x3").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 12).
+					PodSets(*utiltestingapi.MakePodSet("one", 12).
 						RequiredTopologyRequest(tasBlockLabel).
 						SliceSizeTopologyRequest(4).
 						SliceRequiredTopologyRequest(tasRackLabel).
 						Request(corev1.ResourceCPU, "250m").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").Count(12).
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").Count(12).
 								Assignment(corev1.ResourceCPU, "tas-default", "3000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x2"}, 4).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x3"}, 4).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x4"}, 4).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x2"}, 4).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x3"}, 4).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x4"}, 4).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -849,13 +851,13 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").Count(12).
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").Count(12).
 						Assignment(corev1.ResourceCPU, "tas-default", "3000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 4).Obj()).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x2"}, 4).Obj()).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x4"}, 4).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 4).Obj()).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x2"}, 4).Obj()).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x4"}, 4).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -868,22 +870,22 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x1").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 8).
+					PodSets(*utiltestingapi.MakePodSet("one", 8).
 						RequiredTopologyRequest(tasBlockLabel).
 						SliceSizeTopologyRequest(2).
 						SliceRequiredTopologyRequest(tasRackLabel).
 						Request(corev1.ResourceCPU, "200m").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").Count(8).
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").Count(8).
 								Assignment(corev1.ResourceCPU, "tas-default", "1600m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 3).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x2"}, 5).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 3).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x2"}, 5).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -892,12 +894,12 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").Count(8).
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").Count(8).
 						Assignment(corev1.ResourceCPU, "tas-default", "1600m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x2"}, 5).Obj()).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x3"}, 3).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x2"}, 5).Obj()).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x3"}, 3).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -910,21 +912,21 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x1").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 4).
+					PodSets(*utiltestingapi.MakePodSet("one", 4).
 						RequiredTopologyRequest(tasRackLabel).
 						SliceSizeTopologyRequest(2).
 						SliceRequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "250").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").Count(4).
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").Count(4).
 								Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 4).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 4).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -933,11 +935,11 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").Count(4).
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").Count(4).
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x5"}, 4).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x5"}, 4).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -950,24 +952,24 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x7").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 8).
+					PodSets(*utiltestingapi.MakePodSet("one", 8).
 						PreferredTopologyRequest(tasBlockLabel).
 						SliceSizeTopologyRequest(4).
 						SliceRequiredTopologyRequest(tasBlockLabel).
 						Request(corev1.ResourceCPU, "500m").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").Count(8).
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").Count(8).
 								Assignment(corev1.ResourceCPU, "tas-default", "4000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 2).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x3"}, 2).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x5"}, 2).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x7"}, 2).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 2).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x3"}, 2).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x5"}, 2).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x7"}, 2).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -976,14 +978,14 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").Count(8).
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").Count(8).
 						Assignment(corev1.ResourceCPU, "tas-default", "4000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 2).Obj()).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x3"}, 2).Obj()).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x5"}, 2).Obj()).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x6"}, 2).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 2).Obj()).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x3"}, 2).Obj()).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x5"}, 2).Obj()).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x6"}, 2).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -1010,16 +1012,16 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{clusterQueueWithProvReq},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 26).
+					PodSets(*utiltestingapi.MakePodSet("one", 26).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
+						utiltestingapi.MakeAdmission("tas-main").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "tas-default", "26").
 									DelayedTopologyRequest(kueue.DelayedTopologyRequestStatePending).
 									Count(26).
@@ -1034,14 +1036,14 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
 					PodSets(
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-default", "26").
 							Count(26).
 							DelayedTopologyRequest(kueue.DelayedTopologyRequestStateReady).
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 26).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 26).Obj()).
 								Obj()).
 							Obj(),
 					).
@@ -1076,31 +1078,31 @@ func TestScheduleForTAS(t *testing.T) {
 			admissionChecks: []kueue.AdmissionCheck{defaultProvCheck},
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor,
-				*utiltesting.MakeResourceFlavor("tas-second").
+				*utiltestingapi.MakeResourceFlavor("tas-second").
 					NodeLabel("tas-node-second", "true").
 					TopologyName("tas-single-level").
 					Obj()},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "50").Obj(),
-						*utiltesting.MakeFlavorQuotas("tas-second").
+						*utiltestingapi.MakeFlavorQuotas("tas-second").
 							Resource(corev1.ResourceCPU, "50").Obj()).
 					AdmissionChecks(kueue.AdmissionCheckReference(defaultProvCheck.Name)).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
+						utiltestingapi.MakeAdmission("tas-main").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "tas-second", "1000m").
 									DelayedTopologyRequest(kueue.DelayedTopologyRequestStatePending).
 									Obj(),
@@ -1114,13 +1116,13 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
 					PodSets(
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-second", "1000m").
 							DelayedTopologyRequest(kueue.DelayedTopologyRequestStateReady).
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
 								Obj()).
 							Obj(),
 					).
@@ -1155,16 +1157,16 @@ func TestScheduleForTAS(t *testing.T) {
 			admissionChecks: []kueue.AdmissionCheck{defaultProvCheck},
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor,
-				*utiltesting.MakeResourceFlavor("tas-second").
+				*utiltestingapi.MakeResourceFlavor("tas-second").
 					NodeLabel("tas-node-second", "true").
 					TopologyName("tas-single-level").
 					Obj()},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "50").Obj(),
-						*utiltesting.MakeFlavorQuotas("tas-second").
+						*utiltestingapi.MakeFlavorQuotas("tas-second").
 							Resource(corev1.ResourceCPU, "50").Obj()).
 					AdmissionCheckStrategy(kueue.AdmissionCheckStrategyRule{
 						Name: kueue.AdmissionCheckReference(defaultProvCheck.Name),
@@ -1175,27 +1177,27 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
 					PodSets(
-						*utiltesting.MakePodSet("one", 1).
+						*utiltestingapi.MakePodSet("one", 1).
 							RequiredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("two", 1).
+						*utiltestingapi.MakePodSet("two", 1).
 							RequiredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "1").
 							Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
+						utiltestingapi.MakeAdmission("tas-main").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "tas-default", "1").
-									TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-										Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+									TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+										Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 										Obj()).
 									Obj(),
-								utiltesting.MakePodSetAssignment("two").
+								utiltestingapi.MakePodSetAssignment("two").
 									Assignment(corev1.ResourceCPU, "tas-second", "1").
 									DelayedTopologyRequest(kueue.DelayedTopologyRequestStatePending).
 									Obj(),
@@ -1208,19 +1210,19 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
 					PodSets(
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-default", "1").
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 								Obj()).
 							Obj(),
-						utiltesting.MakePodSetAssignment("two").
+						utiltestingapi.MakePodSetAssignment("two").
 							Assignment(corev1.ResourceCPU, "tas-second", "1").
 							DelayedTopologyRequest(kueue.DelayedTopologyRequestStateReady).
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
 								Obj()).
 							Obj(),
 					).Obj(),
@@ -1237,9 +1239,9 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{clusterQueueWithProvReq},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					AdmissionCheck(kueue.AdmissionCheckState{
@@ -1249,9 +1251,9 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
 					PodSets(
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
 							DelayedTopologyRequest(kueue.DelayedTopologyRequestStatePending).
 							Obj(),
@@ -1287,30 +1289,30 @@ func TestScheduleForTAS(t *testing.T) {
 			admissionChecks: []kueue.AdmissionCheck{defaultProvCheck},
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor,
-				*utiltesting.MakeResourceFlavor("tas-second").
+				*utiltestingapi.MakeResourceFlavor("tas-second").
 					NodeLabel("tas-node-second", "true").
 					TopologyName("tas-single-level").
 					Obj()},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "50").Obj(),
-						*utiltesting.MakeFlavorQuotas("tas-second").
+						*utiltestingapi.MakeFlavorQuotas("tas-second").
 							Resource(corev1.ResourceCPU, "50").Obj()).
 					AdmissionChecks(kueue.AdmissionCheckReference(defaultProvCheck.Name)).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
+						utiltestingapi.MakeAdmission("tas-main").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "tas-second", "1000m").
 									DelayedTopologyRequest(kueue.DelayedTopologyRequestStatePending).
 									Obj(),
@@ -1324,13 +1326,13 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
 					PodSets(
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-second", "1000m").
 							DelayedTopologyRequest(kueue.DelayedTopologyRequestStateReady).
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
 								Obj()).
 							Obj(),
 					).
@@ -1348,9 +1350,9 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{clusterQueueWithProvReq},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -1361,9 +1363,9 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
 					PodSets(
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
 							DelayedTopologyRequest(kueue.DelayedTopologyRequestStatePending).
 							Obj(),
@@ -1382,9 +1384,9 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{clusterQueueWithCustomCheck},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -1395,11 +1397,11 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -1414,26 +1416,26 @@ func TestScheduleForTAS(t *testing.T) {
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor, defaultFlavor},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "50").Obj()).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -1449,29 +1451,29 @@ func TestScheduleForTAS(t *testing.T) {
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor, defaultFlavor},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "50").Obj(),
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "50").Obj()).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -1487,25 +1489,25 @@ func TestScheduleForTAS(t *testing.T) {
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor, defaultFlavor},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "50").Obj(),
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "50").Obj()).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "default", "1000m").
 						Obj()).
 					Obj(),
@@ -1521,37 +1523,37 @@ func TestScheduleForTAS(t *testing.T) {
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor, defaultFlavor},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "50").Obj(),
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "50").Obj()).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
 					PodSets(
-						*utiltesting.MakePodSet("launcher", 1).
+						*utiltestingapi.MakePodSet("launcher", 1).
 							Request(corev1.ResourceCPU, "500m").
 							Obj(),
-						*utiltesting.MakePodSet("worker", 1).
+						*utiltestingapi.MakePodSet("worker", 1).
 							RequiredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "500m").
 							Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
 					PodSets(
-						utiltesting.MakePodSetAssignment("launcher").
+						utiltestingapi.MakePodSetAssignment("launcher").
 							Assignment(corev1.ResourceCPU, "default", "500m").
 							Obj(),
-						utiltesting.MakePodSetAssignment("worker").
+						utiltestingapi.MakePodSetAssignment("worker").
 							Assignment(corev1.ResourceCPU, "tas-default", "500m").
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 								Obj()).
 							Obj(),
 					).
@@ -1569,20 +1571,20 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -1599,9 +1601,9 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest("cloud.com/non-existing").
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -1629,40 +1631,40 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			topologies: []kueue.Topology{defaultSingleLevelTopology,
-				*utiltesting.MakeTopology("tas-custom-topology").
+				*utiltestingapi.MakeTopology("tas-custom-topology").
 					Levels("cloud.com/custom-level").
 					Obj(),
 			},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor,
-				*utiltesting.MakeResourceFlavor("tas-custom-flavor").
+				*utiltestingapi.MakeResourceFlavor("tas-custom-flavor").
 					NodeLabel("tas-node", "true").
 					TopologyName("tas-custom-topology").
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "50").Obj(),
-						*utiltesting.MakeFlavorQuotas("tas-custom-flavor").
+						*utiltestingapi.MakeFlavorQuotas("tas-custom-flavor").
 							Resource(corev1.ResourceCPU, "50").Obj()).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest("cloud.com/custom-level").
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-custom-flavor", "1").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment([]string{"cloud.com/custom-level"}).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment([]string{"cloud.com/custom-level"}).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -1679,9 +1681,9 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -1702,27 +1704,27 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("bar-admitted", "default").
+				*utiltestingapi.MakeWorkload("bar-admitted", "default").
 					Queue("tas-main").
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -1749,9 +1751,9 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -1780,38 +1782,38 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "500m").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("bar-admitted", "default").
+				*utiltestingapi.MakeWorkload("bar-admitted", "default").
 					Queue("tas-main").
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "400m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "400m").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "500m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -1828,29 +1830,29 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "500m").
 						Request(corev1.ResourceMemory, "500Mi").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("bar-admitted", "default").
+				*utiltestingapi.MakeWorkload("bar-admitted", "default").
 					Queue("tas-main").
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "500m").
 								Assignment(corev1.ResourceMemory, "tas-default", "500Mi").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "500m").
 						Request(corev1.ResourceMemory, "500Mi").
@@ -1858,12 +1860,12 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "500m").
 						Assignment(corev1.ResourceMemory, "tas-default", "500Mi").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -1900,21 +1902,21 @@ func TestScheduleForTAS(t *testing.T) {
 			topologies:      []kueue.Topology{defaultTwoLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASTwoLevelFlavor},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "50").Obj()).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
 					PodSets(
-						*utiltesting.MakePodSet("launcher", 1).
+						*utiltestingapi.MakePodSet("launcher", 1).
 							PreferredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("worker", 1).
+						*utiltestingapi.MakePodSet("worker", 1).
 							PreferredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "7").
 							Obj()).
@@ -1955,41 +1957,41 @@ func TestScheduleForTAS(t *testing.T) {
 			topologies:      []kueue.Topology{defaultTwoLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASTwoLevelFlavor},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "16").Obj()).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
 					PodSets(
-						*utiltesting.MakePodSet("launcher", 1).
+						*utiltestingapi.MakePodSet("launcher", 1).
 							RequiredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("worker", 15).
+						*utiltestingapi.MakePodSet("worker", 15).
 							PreferredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "1").
 							Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
 					PodSets(
-						utiltesting.MakePodSetAssignment("launcher").
+						utiltestingapi.MakePodSetAssignment("launcher").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-							TopologyAssignment(utiltesting.MakeTopologyAssignment([]string{corev1.LabelHostname}).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment([]string{corev1.LabelHostname}).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 								Obj()).
 							Obj(),
-						utiltesting.MakePodSetAssignment("worker").
+						utiltestingapi.MakePodSetAssignment("worker").
 							Assignment(corev1.ResourceCPU, "tas-default", "15000m").
 							Count(15).
-							TopologyAssignment(utiltesting.MakeTopologyAssignment([]string{corev1.LabelHostname}).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 7).Obj()).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 8).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment([]string{corev1.LabelHostname}).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 7).Obj()).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 8).Obj()).
 								Obj()).
 							Obj(),
 					).
@@ -2027,41 +2029,41 @@ func TestScheduleForTAS(t *testing.T) {
 			topologies:      []kueue.Topology{defaultTwoLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASTwoLevelFlavor},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "16").Obj()).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
 					PodSets(
-						*utiltesting.MakePodSet("launcher", 1).
+						*utiltestingapi.MakePodSet("launcher", 1).
 							RequiredTopologyRequest(tasRackLabel).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("worker", 15).
+						*utiltestingapi.MakePodSet("worker", 15).
 							RequiredTopologyRequest(tasRackLabel).
 							Request(corev1.ResourceCPU, "1").
 							Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
 					PodSets(
-						utiltesting.MakePodSetAssignment("launcher").
+						utiltestingapi.MakePodSetAssignment("launcher").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-							TopologyAssignment(utiltesting.MakeTopologyAssignment([]string{corev1.LabelHostname}).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment([]string{corev1.LabelHostname}).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 								Obj()).
 							Obj(),
-						utiltesting.MakePodSetAssignment("worker").
+						utiltestingapi.MakePodSetAssignment("worker").
 							Assignment(corev1.ResourceCPU, "tas-default", "15000m").
 							Count(15).
-							TopologyAssignment(utiltesting.MakeTopologyAssignment([]string{corev1.LabelHostname}).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 7).Obj()).
-								Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 8).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment([]string{corev1.LabelHostname}).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 7).Obj()).
+								Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 8).Obj()).
 								Obj()).
 							Obj(),
 					).
@@ -2091,47 +2093,47 @@ func TestScheduleForTAS(t *testing.T) {
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "50").Obj()).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
 					PodSets(
-						*utiltesting.MakePodSet("one", 1).
+						*utiltestingapi.MakePodSet("one", 1).
 							PreferredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("bar-admitted", "default").
+				*utiltestingapi.MakeWorkload("bar-admitted", "default").
 					Queue("tas-main").
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -2161,7 +2163,7 @@ func TestScheduleForTAS(t *testing.T) {
 			},
 			topologies: []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{
-				*utiltesting.MakeResourceFlavor("tas-default").
+				*utiltestingapi.MakeResourceFlavor("tas-default").
 					NodeLabel("tas-node", "true").
 					Toleration(corev1.Toleration{
 						Key:      "example.com/gpu",
@@ -2171,17 +2173,17 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("tas-default").
+						*utiltestingapi.MakeFlavorQuotas("tas-default").
 							Resource(corev1.ResourceCPU, "50").Obj()).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
 					PodSets(
-						*utiltesting.MakePodSet("one", 1).
+						*utiltestingapi.MakePodSet("one", 1).
 							PreferredTopologyRequest(corev1.LabelHostname).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
@@ -2189,11 +2191,11 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -2210,9 +2212,9 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 5).
+					PodSets(*utiltestingapi.MakePodSet("one", 5).
 						SetMinimumCount(1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
@@ -2220,11 +2222,11 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -2258,28 +2260,28 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "300m").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("bar-admitted", "default").
+				*utiltestingapi.MakeWorkload("bar-admitted", "default").
 					Queue("tas-main").
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "150m").
 								Count(2).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 2).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 2).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "150m").
 						Obj()).
@@ -2300,21 +2302,21 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "0").
 						Request(corev1.ResourceMemory, "10Mi").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "0").
 						Assignment(corev1.ResourceMemory, "tas-default", "10Mi").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -2332,22 +2334,22 @@ func TestScheduleForTAS(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASThreeLevelFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueue},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					UnhealthyNodes("x0").
 					Queue("tas-main").
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						PreferredTopologyRequest(tasBlockLabel).
 						SliceSizeTopologyRequest(2).
 						SliceRequiredTopologyRequest(tasRackLabel).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").Count(2).
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").Count(2).
 								Assignment(corev1.ResourceCPU, "tas-default", "2000m").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
@@ -2356,12 +2358,12 @@ func TestScheduleForTAS(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/foo": *utiltesting.MakeAdmission("tas-main").
-					PodSets(utiltesting.MakePodSetAssignment("one").Count(2).
+				"default/foo": *utiltestingapi.MakeAdmission("tas-main").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").Count(2).
 						Assignment(corev1.ResourceCPU, "tas-default", "2000m").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -2373,122 +2375,129 @@ func TestScheduleForTAS(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			for fg, enable := range tc.featureGates {
-				features.SetFeatureGateDuringTest(t, fg, enable)
-			}
-			ctx, log := utiltesting.ContextWithLog(t)
+		for _, enabled := range []bool{false, true} {
+			t.Run(fmt.Sprintf("%s WorkloadRequestUseMergePatch enabled: %t", name, enabled), func(t *testing.T) {
+				features.SetFeatureGateDuringTest(t, features.WorkloadRequestUseMergePatch, enabled)
+				for fg, enable := range tc.featureGates {
+					features.SetFeatureGateDuringTest(t, fg, enable)
+				}
+				ctx, log := utiltesting.ContextWithLog(t)
+				testWls := make([]kueue.Workload, 0, len(tc.workloads))
+				for _, wl := range tc.workloads {
+					testWls = append(testWls, *wl.DeepCopy())
+				}
 
-			clientBuilder := utiltesting.NewClientBuilder().
-				WithLists(
-					&kueue.AdmissionCheckList{Items: tc.admissionChecks},
-					&kueue.WorkloadList{Items: tc.workloads},
-					&kueue.TopologyList{Items: tc.topologies},
-					&corev1.PodList{Items: tc.pods},
-					&corev1.NodeList{Items: tc.nodes},
-					&kueue.LocalQueueList{Items: queues}).
-				WithObjects(utiltesting.MakeNamespace("default")).
-				WithInterceptorFuncs(interceptor.Funcs{SubResourcePatch: utiltesting.TreatSSAAsStrategicMerge}).
-				WithStatusSubresource(&kueue.Workload{}, &kueue.ClusterQueue{}, &kueue.LocalQueue{})
+				clientBuilder := utiltesting.NewClientBuilder().
+					WithLists(
+						&kueue.AdmissionCheckList{Items: tc.admissionChecks},
+						&kueue.WorkloadList{Items: testWls},
+						&kueue.TopologyList{Items: tc.topologies},
+						&corev1.PodList{Items: tc.pods},
+						&corev1.NodeList{Items: tc.nodes},
+						&kueue.LocalQueueList{Items: queues}).
+					WithObjects(utiltesting.MakeNamespace("default")).
+					WithInterceptorFuncs(interceptor.Funcs{SubResourcePatch: utiltesting.TreatSSAAsStrategicMerge}).
+					WithStatusSubresource(&kueue.Workload{}, &kueue.ClusterQueue{}, &kueue.LocalQueue{})
 
-			for _, ac := range tc.admissionChecks {
-				clientBuilder = clientBuilder.WithStatusSubresource(ac.DeepCopy())
-			}
-			_ = tasindexer.SetupIndexes(ctx, utiltesting.AsIndexer(clientBuilder))
-			cl := clientBuilder.Build()
-			recorder := &utiltesting.EventRecorder{}
-			cqCache := schdcache.New(cl)
-			now := time.Now()
-			fakeClock := testingclock.NewFakeClock(now)
-			qManager := qcache.NewManager(cl, cqCache, qcache.WithClock(fakeClock))
-			topologyByName := slices.ToMap(tc.topologies, func(i int) (kueue.TopologyReference, kueue.Topology) {
-				return kueue.TopologyReference(tc.topologies[i].Name), tc.topologies[i]
-			})
-			for _, ac := range tc.admissionChecks {
-				cqCache.AddOrUpdateAdmissionCheck(log, &ac)
-			}
-			for _, flavor := range tc.resourceFlavors {
-				cqCache.AddOrUpdateResourceFlavor(log, &flavor)
-				if flavor.Spec.TopologyName != nil {
-					t := topologyByName[*flavor.Spec.TopologyName]
-					cqCache.AddOrUpdateTopology(log, &t)
+				for _, ac := range tc.admissionChecks {
+					clientBuilder = clientBuilder.WithStatusSubresource(ac.DeepCopy())
 				}
-			}
-			for _, cq := range tc.clusterQueues {
-				if err := cqCache.AddClusterQueue(ctx, &cq); err != nil {
-					t.Fatalf("Inserting clusterQueue %s in cache: %v", cq.Name, err)
+				_ = tasindexer.SetupIndexes(ctx, utiltesting.AsIndexer(clientBuilder))
+				cl := clientBuilder.Build()
+				recorder := &utiltesting.EventRecorder{}
+				cqCache := schdcache.New(cl)
+				now := time.Now()
+				fakeClock := testingclock.NewFakeClock(now)
+				qManager := qcache.NewManager(cl, cqCache, qcache.WithClock(fakeClock))
+				topologyByName := slices.ToMap(tc.topologies, func(i int) (kueue.TopologyReference, kueue.Topology) {
+					return kueue.TopologyReference(tc.topologies[i].Name), tc.topologies[i]
+				})
+				for _, ac := range tc.admissionChecks {
+					cqCache.AddOrUpdateAdmissionCheck(log, &ac)
 				}
-				if err := qManager.AddClusterQueue(ctx, &cq); err != nil {
-					t.Fatalf("Inserting clusterQueue %s in manager: %v", cq.Name, err)
+				for _, flavor := range tc.resourceFlavors {
+					cqCache.AddOrUpdateResourceFlavor(log, &flavor)
+					if flavor.Spec.TopologyName != nil {
+						t := topologyByName[*flavor.Spec.TopologyName]
+						cqCache.AddOrUpdateTopology(log, &t)
+					}
 				}
-				if err := cl.Create(ctx, &cq); err != nil {
-					t.Fatalf("couldn't create the cluster queue: %v", err)
+				for _, cq := range tc.clusterQueues {
+					if err := cqCache.AddClusterQueue(ctx, &cq); err != nil {
+						t.Fatalf("Inserting clusterQueue %s in cache: %v", cq.Name, err)
+					}
+					if err := qManager.AddClusterQueue(ctx, &cq); err != nil {
+						t.Fatalf("Inserting clusterQueue %s in manager: %v", cq.Name, err)
+					}
+					if err := cl.Create(ctx, &cq); err != nil {
+						t.Fatalf("couldn't create the cluster queue: %v", err)
+					}
 				}
-			}
-			for _, q := range queues {
-				if err := qManager.AddLocalQueue(ctx, &q); err != nil {
-					t.Fatalf("Inserting queue %s/%s in manager: %v", q.Namespace, q.Name, err)
+				for _, q := range queues {
+					if err := qManager.AddLocalQueue(ctx, &q); err != nil {
+						t.Fatalf("Inserting queue %s/%s in manager: %v", q.Namespace, q.Name, err)
+					}
 				}
-			}
-			initiallyAdmittedWorkloads := sets.New[workload.Reference]()
-			for _, w := range tc.workloads {
-				if workload.IsAdmitted(&w) && !workload.HasUnhealthyNodes(&w) {
-					initiallyAdmittedWorkloads.Insert(workload.Key(&w))
+				initiallyAdmittedWorkloads := sets.New[workload.Reference]()
+				for _, w := range testWls {
+					if workload.IsAdmitted(&w) && !workload.HasUnhealthyNodes(&w) {
+						initiallyAdmittedWorkloads.Insert(workload.Key(&w))
+					}
 				}
-			}
-			for _, w := range tc.workloads {
-				if qManager.QueueSecondPassIfNeeded(ctx, &w, 0) {
-					fakeClock.Step(time.Second)
+				for _, w := range testWls {
+					if qManager.QueueSecondPassIfNeeded(ctx, &w, 0) {
+						fakeClock.Step(time.Second)
+					}
 				}
-			}
-			scheduler := New(qManager, cqCache, cl, recorder)
-			wg := sync.WaitGroup{}
-			scheduler.setAdmissionRoutineWrapper(routine.NewWrapper(
-				func() { wg.Add(1) },
-				func() { wg.Done() },
-			))
+				scheduler := New(qManager, cqCache, cl, recorder)
+				wg := sync.WaitGroup{}
+				scheduler.setAdmissionRoutineWrapper(routine.NewWrapper(
+					func() { wg.Add(1) },
+					func() { wg.Done() },
+				))
 
-			ctx, cancel := context.WithTimeout(ctx, queueingTimeout)
-			go qManager.CleanUpOnContext(ctx)
-			defer cancel()
+				ctx, cancel := context.WithTimeout(ctx, queueingTimeout)
+				go qManager.CleanUpOnContext(ctx)
+				defer cancel()
 
-			scheduler.schedule(ctx)
-			wg.Wait()
-			snapshot, err := cqCache.Snapshot(ctx)
-			if err != nil {
-				t.Fatalf("unexpected error while building snapshot: %v", err)
-			}
-			gotAssignments := make(map[workload.Reference]kueue.Admission)
-			for cqName, c := range snapshot.ClusterQueues() {
-				for name, w := range c.Workloads {
-					if initiallyAdmittedWorkloads.Has(workload.Key(w.Obj)) {
-						continue
-					}
-					switch {
-					case !workload.HasQuotaReservation(w.Obj):
-						t.Fatalf("Workload %s is not admitted by a clusterQueue, but it is found as member of clusterQueue %s in the cache", name, cqName)
-					case w.Obj.Status.Admission.ClusterQueue != cqName:
-						t.Fatalf("Workload %s is admitted by clusterQueue %s, but it is found as member of clusterQueue %s in the cache", name, w.Obj.Status.Admission.ClusterQueue, cqName)
-					default:
-						gotAssignments[name] = *w.Obj.Status.Admission
+				scheduler.schedule(ctx)
+				wg.Wait()
+				snapshot, err := cqCache.Snapshot(ctx)
+				if err != nil {
+					t.Fatalf("unexpected error while building snapshot: %v", err)
+				}
+				gotAssignments := make(map[workload.Reference]kueue.Admission)
+				for cqName, c := range snapshot.ClusterQueues() {
+					for name, w := range c.Workloads {
+						if initiallyAdmittedWorkloads.Has(workload.Key(w.Obj)) {
+							continue
+						}
+						switch {
+						case !workload.HasQuotaReservation(w.Obj):
+							t.Fatalf("Workload %s is not admitted by a clusterQueue, but it is found as member of clusterQueue %s in the cache", name, cqName)
+						case w.Obj.Status.Admission.ClusterQueue != cqName:
+							t.Fatalf("Workload %s is admitted by clusterQueue %s, but it is found as member of clusterQueue %s in the cache", name, w.Obj.Status.Admission.ClusterQueue, cqName)
+						default:
+							gotAssignments[name] = *w.Obj.Status.Admission
+						}
 					}
 				}
-			}
-			if diff := cmp.Diff(tc.wantNewAssignments, gotAssignments, cmpopts.EquateEmpty()); diff != "" {
-				t.Errorf("Unexpected assigned clusterQueues in cache (-want,+got):\n%s", diff)
-			}
-			qDump := qManager.Dump()
-			if diff := cmp.Diff(tc.wantLeft, qDump, cmpDump...); diff != "" {
-				t.Errorf("Unexpected elements left in the queue (-want,+got):\n%s", diff)
-			}
-			qDumpInadmissible := qManager.DumpInadmissible()
-			if diff := cmp.Diff(tc.wantInadmissibleLeft, qDumpInadmissible, cmpDump...); diff != "" {
-				t.Errorf("Unexpected elements left in inadmissible workloads (-want,+got):\n%s", diff)
-			}
-			if diff := cmp.Diff(tc.wantEvents, recorder.RecordedEvents, tc.eventCmpOpts...); diff != "" {
-				t.Errorf("unexpected events (-want/+got):\n%s", diff)
-			}
-		})
+				if diff := cmp.Diff(tc.wantNewAssignments, gotAssignments, cmpopts.EquateEmpty()); diff != "" {
+					t.Errorf("Unexpected assigned clusterQueues in cache (-want,+got):\n%s", diff)
+				}
+				qDump := qManager.Dump()
+				if diff := cmp.Diff(tc.wantLeft, qDump, cmpDump...); diff != "" {
+					t.Errorf("Unexpected elements left in the queue (-want,+got):\n%s", diff)
+				}
+				qDumpInadmissible := qManager.DumpInadmissible()
+				if diff := cmp.Diff(tc.wantInadmissibleLeft, qDumpInadmissible, cmpDump...); diff != "" {
+					t.Errorf("Unexpected elements left in inadmissible workloads (-want,+got):\n%s", diff)
+				}
+				if diff := cmp.Diff(tc.wantEvents, recorder.RecordedEvents, tc.eventCmpOpts...); diff != "" {
+					t.Errorf("unexpected events (-want/+got):\n%s", diff)
+				}
+			})
+		}
 	}
 }
 
@@ -2527,19 +2536,19 @@ func TestScheduleForTASPreemption(t *testing.T) {
 			Ready().
 			Obj(),
 	}
-	defaultSingleLevelTopology := *utiltesting.MakeDefaultOneLevelTopology("tas-single-level")
-	defaultTASFlavor := *utiltesting.MakeResourceFlavor("tas-default").
+	defaultSingleLevelTopology := *utiltestingapi.MakeDefaultOneLevelTopology("tas-single-level")
+	defaultTASFlavor := *utiltestingapi.MakeResourceFlavor("tas-default").
 		NodeLabel("tas-node", "true").
 		TopologyName("tas-single-level").
 		Obj()
-	defaultClusterQueueWithPreemption := *utiltesting.MakeClusterQueue("tas-main").
+	defaultClusterQueueWithPreemption := *utiltestingapi.MakeClusterQueue("tas-main").
 		Preemption(kueue.ClusterQueuePreemption{WithinClusterQueue: kueue.PreemptionPolicyLowerPriority}).
-		ResourceGroup(*utiltesting.MakeFlavorQuotas("tas-default").
+		ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-default").
 			Resource(corev1.ResourceCPU, "50").
 			Resource(corev1.ResourceMemory, "50Gi").Obj()).
 		Obj()
 	queues := []kueue.LocalQueue{
-		*utiltesting.MakeLocalQueue("tas-main", "default").ClusterQueue("tas-main").Obj(),
+		*utiltestingapi.MakeLocalQueue("tas-main", "default").ClusterQueue("tas-main").Obj(),
 	}
 	cases := map[string]struct {
 		nodes           []corev1.Node
@@ -2569,37 +2578,37 @@ func TestScheduleForTASPreemption(t *testing.T) {
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("tas-main").
+				*utiltestingapi.MakeClusterQueue("tas-main").
 					Preemption(kueue.ClusterQueuePreemption{WithinClusterQueue: kueue.PreemptionPolicyLowerPriority}).
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("tas-default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-default").
 						Resource(corev1.ResourceCPU, "10").
 						Resource(corev1.ResourceMemory, "10Gi").Obj()).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
 					Priority(3).
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("low-priority-admitted", "default").
+				*utiltestingapi.MakeWorkload("low-priority-admitted", "default").
 					Queue("tas-main").
 					Priority(1).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "5").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"z1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"z1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "5").
 						Obj()).
@@ -2626,29 +2635,29 @@ func TestScheduleForTASPreemption(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueWithPreemption},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
 					Priority(3).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "2").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("low-priority-admitted", "default").
+				*utiltestingapi.MakeWorkload("low-priority-admitted", "default").
 					Queue("tas-main").
 					Priority(1).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "5").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "5").
 						Obj()).
@@ -2679,29 +2688,29 @@ func TestScheduleForTASPreemption(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueWithPreemption},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("high-priority-waiting", "default").
+				*utiltestingapi.MakeWorkload("high-priority-waiting", "default").
 					Queue("tas-main").
 					Priority(3).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "2").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("low-priority-admitted", "default").
+				*utiltestingapi.MakeWorkload("low-priority-admitted", "default").
 					Queue("tas-main").
 					Priority(1).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "5").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "5").
 						Obj()).
@@ -2728,48 +2737,48 @@ func TestScheduleForTASPreemption(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueWithPreemption},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
 					Priority(3).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "2").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("mid-priority-admitted", "default").
+				*utiltestingapi.MakeWorkload("mid-priority-admitted", "default").
 					Queue("tas-main").
 					Priority(2).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "2").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "2").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("low-priority-admitted", "default").
+				*utiltestingapi.MakeWorkload("low-priority-admitted", "default").
 					Queue("tas-main").
 					Priority(1).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "2").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "2").
 						Obj()).
@@ -2798,48 +2807,48 @@ func TestScheduleForTASPreemption(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueWithPreemption},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "default").
+				*utiltestingapi.MakeWorkload("foo", "default").
 					Queue("tas-main").
 					Priority(3).
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("mid-priority-admitted", "default").
+				*utiltestingapi.MakeWorkload("mid-priority-admitted", "default").
 					Queue("tas-main").
 					Priority(2).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "4").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("low-priority-admitted", "default").
+				*utiltestingapi.MakeWorkload("low-priority-admitted", "default").
 					Queue("tas-main").
 					Priority(1).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "4").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
@@ -2869,37 +2878,37 @@ func TestScheduleForTASPreemption(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueWithPreemption},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("low-priority-which-would-fit", "default").
+				*utiltestingapi.MakeWorkload("low-priority-which-would-fit", "default").
 					Queue("tas-main").
 					Priority(1).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("mid-priority-waiting", "default").
+				*utiltestingapi.MakeWorkload("mid-priority-waiting", "default").
 					Queue("tas-main").
 					Priority(2).
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("mid-priority-admitted", "default").
+				*utiltestingapi.MakeWorkload("mid-priority-admitted", "default").
 					Queue("tas-main").
 					Priority(2).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-main").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-main").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "4").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
@@ -2919,116 +2928,122 @@ func TestScheduleForTASPreemption(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			ctx, log := utiltesting.ContextWithLog(t)
-
-			clientBuilder := utiltesting.NewClientBuilder().
-				WithLists(
-					&kueue.WorkloadList{Items: tc.workloads},
-					&kueue.TopologyList{Items: tc.topologies},
-					&corev1.PodList{Items: tc.pods},
-					&corev1.NodeList{Items: tc.nodes},
-					&kueue.LocalQueueList{Items: queues}).
-				WithObjects(
-					utiltesting.MakeNamespace("default"),
-				)
-			_ = tasindexer.SetupIndexes(ctx, utiltesting.AsIndexer(clientBuilder))
-			cl := clientBuilder.Build()
-			recorder := &utiltesting.EventRecorder{}
-			cqCache := schdcache.New(cl)
-			qManager := qcache.NewManager(cl, cqCache)
-			topologyByName := slices.ToMap(tc.topologies, func(i int) (kueue.TopologyReference, kueue.Topology) {
-				return kueue.TopologyReference(tc.topologies[i].Name), tc.topologies[i]
-			})
-			for _, flavor := range tc.resourceFlavors {
-				cqCache.AddOrUpdateResourceFlavor(log, &flavor)
-				if flavor.Spec.TopologyName != nil {
-					t := topologyByName[*flavor.Spec.TopologyName]
-					cqCache.AddOrUpdateTopology(log, &t)
-				}
-			}
-			for _, cq := range tc.clusterQueues {
-				if err := cqCache.AddClusterQueue(ctx, &cq); err != nil {
-					t.Fatalf("Inserting clusterQueue %s in cache: %v", cq.Name, err)
+		for _, enabled := range []bool{false, true} {
+			t.Run(fmt.Sprintf("%s WorkloadRequestUseMergePatch enabled: %t", name, enabled), func(t *testing.T) {
+				features.SetFeatureGateDuringTest(t, features.WorkloadRequestUseMergePatch, enabled)
+				ctx, log := utiltesting.ContextWithLog(t)
+				testWls := make([]kueue.Workload, 0, len(tc.workloads))
+				for _, wl := range tc.workloads {
+					testWls = append(testWls, *wl.DeepCopy())
 				}
-				if err := qManager.AddClusterQueue(ctx, &cq); err != nil {
-					t.Fatalf("Inserting clusterQueue %s in manager: %v", cq.Name, err)
+				clientBuilder := utiltesting.NewClientBuilder().
+					WithLists(
+						&kueue.WorkloadList{Items: testWls},
+						&kueue.TopologyList{Items: tc.topologies},
+						&corev1.PodList{Items: tc.pods},
+						&corev1.NodeList{Items: tc.nodes},
+						&kueue.LocalQueueList{Items: queues}).
+					WithObjects(
+						utiltesting.MakeNamespace("default"),
+					)
+				_ = tasindexer.SetupIndexes(ctx, utiltesting.AsIndexer(clientBuilder))
+				cl := clientBuilder.Build()
+				recorder := &utiltesting.EventRecorder{}
+				cqCache := schdcache.New(cl)
+				qManager := qcache.NewManager(cl, cqCache)
+				topologyByName := slices.ToMap(tc.topologies, func(i int) (kueue.TopologyReference, kueue.Topology) {
+					return kueue.TopologyReference(tc.topologies[i].Name), tc.topologies[i]
+				})
+				for _, flavor := range tc.resourceFlavors {
+					cqCache.AddOrUpdateResourceFlavor(log, &flavor)
+					if flavor.Spec.TopologyName != nil {
+						t := topologyByName[*flavor.Spec.TopologyName]
+						cqCache.AddOrUpdateTopology(log, &t)
+					}
 				}
-				if err := cl.Create(ctx, &cq); err != nil {
-					t.Fatalf("couldn't create the cluster queue: %v", err)
+				for _, cq := range tc.clusterQueues {
+					if err := cqCache.AddClusterQueue(ctx, &cq); err != nil {
+						t.Fatalf("Inserting clusterQueue %s in cache: %v", cq.Name, err)
+					}
+					if err := qManager.AddClusterQueue(ctx, &cq); err != nil {
+						t.Fatalf("Inserting clusterQueue %s in manager: %v", cq.Name, err)
+					}
+					if err := cl.Create(ctx, &cq); err != nil {
+						t.Fatalf("couldn't create the cluster queue: %v", err)
+					}
 				}
-			}
-			for _, q := range queues {
-				if err := qManager.AddLocalQueue(ctx, &q); err != nil {
-					t.Fatalf("Inserting queue %s/%s in manager: %v", q.Namespace, q.Name, err)
+				for _, q := range queues {
+					if err := qManager.AddLocalQueue(ctx, &q); err != nil {
+						t.Fatalf("Inserting queue %s/%s in manager: %v", q.Namespace, q.Name, err)
+					}
 				}
-			}
-			initiallyAdmittedWorkloads := sets.New[workload.Reference]()
-			for _, w := range tc.workloads {
-				if workload.IsAdmitted(&w) {
-					initiallyAdmittedWorkloads.Insert(workload.Key(&w))
+				initiallyAdmittedWorkloads := sets.New[workload.Reference]()
+				for _, w := range testWls {
+					if workload.IsAdmitted(&w) {
+						initiallyAdmittedWorkloads.Insert(workload.Key(&w))
+					}
 				}
-			}
-			scheduler := New(qManager, cqCache, cl, recorder)
-			wg := sync.WaitGroup{}
-			scheduler.setAdmissionRoutineWrapper(routine.NewWrapper(
-				func() { wg.Add(1) },
-				func() { wg.Done() },
-			))
+				scheduler := New(qManager, cqCache, cl, recorder)
+				wg := sync.WaitGroup{}
+				scheduler.setAdmissionRoutineWrapper(routine.NewWrapper(
+					func() { wg.Add(1) },
+					func() { wg.Done() },
+				))
 
-			var mu sync.Mutex
-			gotPreempted := sets.New[workload.Reference]()
-			scheduler.preemptor.OverrideApply(func(_ context.Context, w *kueue.Workload, _, _ string) error {
-				mu.Lock()
-				gotPreempted.Insert(workload.Key(w))
-				mu.Unlock()
-				return nil
-			})
+				var mu sync.Mutex
+				gotPreempted := sets.New[workload.Reference]()
+				scheduler.preemptor.OverrideApply(func(_ context.Context, w *kueue.Workload, _, _ string) error {
+					mu.Lock()
+					gotPreempted.Insert(workload.Key(w))
+					mu.Unlock()
+					return nil
+				})
 
-			ctx, cancel := context.WithTimeout(ctx, queueingTimeout)
-			go qManager.CleanUpOnContext(ctx)
-			defer cancel()
+				ctx, cancel := context.WithTimeout(ctx, queueingTimeout)
+				go qManager.CleanUpOnContext(ctx)
+				defer cancel()
 
-			scheduler.schedule(ctx)
-			wg.Wait()
-			snapshot, err := cqCache.Snapshot(ctx)
-			if err != nil {
-				t.Fatalf("unexpected error while building snapshot: %v", err)
-			}
-			if diff := cmp.Diff(tc.wantPreempted, gotPreempted); diff != "" {
-				t.Errorf("Unexpected preemptions (-want,+got):\n%s", diff)
-			}
-			gotAssignments := make(map[workload.Reference]kueue.Admission)
-			for cqName, c := range snapshot.ClusterQueues() {
-				for name, w := range c.Workloads {
-					if initiallyAdmittedWorkloads.Has(workload.Key(w.Obj)) {
-						continue
-					}
-					switch {
-					case !workload.HasQuotaReservation(w.Obj):
-						t.Fatalf("Workload %s is not admitted by a clusterQueue, but it is found as member of clusterQueue %s in the cache", name, cqName)
-					case w.Obj.Status.Admission.ClusterQueue != cqName:
-						t.Fatalf("Workload %s is admitted by clusterQueue %s, but it is found as member of clusterQueue %s in the cache", name, w.Obj.Status.Admission.ClusterQueue, cqName)
-					default:
-						gotAssignments[name] = *w.Obj.Status.Admission
+				scheduler.schedule(ctx)
+				wg.Wait()
+				snapshot, err := cqCache.Snapshot(ctx)
+				if err != nil {
+					t.Fatalf("unexpected error while building snapshot: %v", err)
+				}
+				if diff := cmp.Diff(tc.wantPreempted, gotPreempted); diff != "" {
+					t.Errorf("Unexpected preemptions (-want,+got):\n%s", diff)
+				}
+				gotAssignments := make(map[workload.Reference]kueue.Admission)
+				for cqName, c := range snapshot.ClusterQueues() {
+					for name, w := range c.Workloads {
+						if initiallyAdmittedWorkloads.Has(workload.Key(w.Obj)) {
+							continue
+						}
+						switch {
+						case !workload.HasQuotaReservation(w.Obj):
+							t.Fatalf("Workload %s is not admitted by a clusterQueue, but it is found as member of clusterQueue %s in the cache", name, cqName)
+						case w.Obj.Status.Admission.ClusterQueue != cqName:
+							t.Fatalf("Workload %s is admitted by clusterQueue %s, but it is found as member of clusterQueue %s in the cache", name, w.Obj.Status.Admission.ClusterQueue, cqName)
+						default:
+							gotAssignments[name] = *w.Obj.Status.Admission
+						}
 					}
 				}
-			}
-			if diff := cmp.Diff(tc.wantNewAssignments, gotAssignments, cmpopts.EquateEmpty()); diff != "" {
-				t.Errorf("Unexpected assigned clusterQueues in cache (-want,+got):\n%s", diff)
-			}
-			qDump := qManager.Dump()
-			if diff := cmp.Diff(tc.wantLeft, qDump, cmpDump...); diff != "" {
-				t.Errorf("Unexpected elements left in the queue (-want,+got):\n%s", diff)
-			}
-			qDumpInadmissible := qManager.DumpInadmissible()
-			if diff := cmp.Diff(tc.wantInadmissibleLeft, qDumpInadmissible, cmpDump...); diff != "" {
-				t.Errorf("Unexpected elements left in inadmissible workloads (-want,+got):\n%s", diff)
-			}
-			if diff := cmp.Diff(tc.wantEvents, recorder.RecordedEvents, tc.eventCmpOpts...); diff != "" {
-				t.Errorf("unexpected events (-want/+got):\n%s", diff)
-			}
-		})
+				if diff := cmp.Diff(tc.wantNewAssignments, gotAssignments, cmpopts.EquateEmpty()); diff != "" {
+					t.Errorf("Unexpected assigned clusterQueues in cache (-want,+got):\n%s", diff)
+				}
+				qDump := qManager.Dump()
+				if diff := cmp.Diff(tc.wantLeft, qDump, cmpDump...); diff != "" {
+					t.Errorf("Unexpected elements left in the queue (-want,+got):\n%s", diff)
+				}
+				qDumpInadmissible := qManager.DumpInadmissible()
+				if diff := cmp.Diff(tc.wantInadmissibleLeft, qDumpInadmissible, cmpDump...); diff != "" {
+					t.Errorf("Unexpected elements left in inadmissible workloads (-want,+got):\n%s", diff)
+				}
+				if diff := cmp.Diff(tc.wantEvents, recorder.RecordedEvents, tc.eventCmpOpts...); diff != "" {
+					t.Errorf("unexpected events (-want/+got):\n%s", diff)
+				}
+			})
+		}
 	}
 }
 
@@ -3054,43 +3069,43 @@ func TestScheduleForTASCohorts(t *testing.T) {
 		Ready().
 		Obj()
 	defaultTwoNodes := []corev1.Node{defaultNodeX1, defaultNodeY1}
-	defaultSingleLevelTopology := *utiltesting.MakeDefaultOneLevelTopology("tas-single-level")
-	defaultTASFlavor := *utiltesting.MakeResourceFlavor("tas-default").
+	defaultSingleLevelTopology := *utiltestingapi.MakeDefaultOneLevelTopology("tas-single-level")
+	defaultTASFlavor := *utiltestingapi.MakeResourceFlavor("tas-default").
 		NodeLabel("tas-node", "true").
 		TopologyName("tas-single-level").
 		Obj()
-	defaultClusterQueueA := *utiltesting.MakeClusterQueue("tas-cq-a").
+	defaultClusterQueueA := *utiltestingapi.MakeClusterQueue("tas-cq-a").
 		Cohort("tas-cohort-main").
 		Preemption(kueue.ClusterQueuePreemption{
 			WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 			ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 		}).
-		ResourceGroup(*utiltesting.MakeFlavorQuotas("tas-default").
+		ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-default").
 			Resource(corev1.ResourceCPU, "4").
 			Resource(corev1.ResourceMemory, "4Gi").Obj()).
 		Obj()
-	defaultClusterQueueB := *utiltesting.MakeClusterQueue("tas-cq-b").
+	defaultClusterQueueB := *utiltestingapi.MakeClusterQueue("tas-cq-b").
 		Cohort("tas-cohort-main").
 		Preemption(kueue.ClusterQueuePreemption{
 			ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 		}).
-		ResourceGroup(*utiltesting.MakeFlavorQuotas("tas-default").
+		ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-default").
 			Resource(corev1.ResourceCPU, "4").
 			Resource(corev1.ResourceMemory, "4Gi").Obj()).
 		Obj()
-	defaultClusterQueueC := *utiltesting.MakeClusterQueue("tas-cq-c").
+	defaultClusterQueueC := *utiltestingapi.MakeClusterQueue("tas-cq-c").
 		Cohort("tas-cohort-main").
 		Preemption(kueue.ClusterQueuePreemption{
 			ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 		}).
-		ResourceGroup(*utiltesting.MakeFlavorQuotas("tas-default").
+		ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-default").
 			Resource(corev1.ResourceCPU, "4").
 			Resource(corev1.ResourceMemory, "4Gi").Obj()).
 		Obj()
 	queues := []kueue.LocalQueue{
-		*utiltesting.MakeLocalQueue("tas-lq-a", "default").ClusterQueue("tas-cq-a").Obj(),
-		*utiltesting.MakeLocalQueue("tas-lq-b", "default").ClusterQueue("tas-cq-b").Obj(),
-		*utiltesting.MakeLocalQueue("tas-lq-c", "default").ClusterQueue("tas-cq-c").Obj(),
+		*utiltestingapi.MakeLocalQueue("tas-lq-a", "default").ClusterQueue("tas-cq-a").Obj(),
+		*utiltestingapi.MakeLocalQueue("tas-lq-b", "default").ClusterQueue("tas-cq-b").Obj(),
+		*utiltestingapi.MakeLocalQueue("tas-lq-c", "default").ClusterQueue("tas-cq-c").Obj(),
 	}
 	eventIgnoreMessage := cmpopts.IgnoreFields(utiltesting.EventRecord{}, "Message")
 	cases := map[string]struct {
@@ -3120,22 +3135,22 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueA, defaultClusterQueueB},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Queue("tas-lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 6).
+					PodSets(*utiltestingapi.MakePodSet("one", 6).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/a1": *utiltesting.MakeAdmission("tas-cq-a").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/a1": *utiltestingapi.MakeAdmission("tas-cq-a").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "6").
 						Count(6).
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 5).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 5).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -3154,28 +3169,28 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueA, defaultClusterQueueB},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "default").
+				*utiltestingapi.MakeWorkload("a1-admitted", "default").
 					Queue("tas-lq-a").
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-cq-a").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-cq-a").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "5").
 								Count(5).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 5).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 5).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 5).
+					PodSets(*utiltestingapi.MakePodSet("one", 5).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "default").
+				*utiltestingapi.MakeWorkload("b1", "default").
 					Queue("tas-lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 4).
+					PodSets(*utiltestingapi.MakePodSet("one", 4).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -3200,69 +3215,69 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueA, defaultClusterQueueB},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "default").
+				*utiltestingapi.MakeWorkload("a1-admitted", "default").
 					Queue("tas-lq-a").
 					Priority(1).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-cq-a").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-cq-a").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "5").
 								Count(5).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 5).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 5).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 5).
+					PodSets(*utiltestingapi.MakePodSet("one", 5).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("a2-admitted", "default").
+				*utiltestingapi.MakeWorkload("a2-admitted", "default").
 					Queue("tas-lq-a").
 					Priority(2).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-cq-a").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-cq-a").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "2").
 								Count(2).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 2).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 2).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("a3-admitted", "default").
+				*utiltestingapi.MakeWorkload("a3-admitted", "default").
 					Queue("tas-lq-a").
 					Priority(2).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-cq-a").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-cq-a").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "1").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "default").
+				*utiltestingapi.MakeWorkload("b1", "default").
 					Queue("tas-lq-b").
 					Priority(3).
-					PodSets(*utiltesting.MakePodSet("one", 3).
+					PodSets(*utiltestingapi.MakePodSet("one", 3).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -3288,50 +3303,50 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueA, defaultClusterQueueB},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "default").
+				*utiltestingapi.MakeWorkload("a1-admitted", "default").
 					Queue("tas-lq-a").
 					Priority(3).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-cq-a").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-cq-a").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "5").
 								Count(5).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 5).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 5).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 4).
+					PodSets(*utiltestingapi.MakePodSet("one", 4).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("a2-admitted", "default").
+				*utiltestingapi.MakeWorkload("a2-admitted", "default").
 					Queue("tas-lq-a").
 					Priority(2).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-cq-a").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-cq-a").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "3").
 								Count(3).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 3).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 3).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 3).
+					PodSets(*utiltestingapi.MakePodSet("one", 3).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "default").
+				*utiltestingapi.MakeWorkload("b1", "default").
 					Queue("tas-lq-b").
 					Priority(3).
-					PodSets(*utiltesting.MakePodSet("one", 4).
+					PodSets(*utiltestingapi.MakePodSet("one", 4).
 						SetMinimumCount(3).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
@@ -3358,77 +3373,77 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueA, defaultClusterQueueB, defaultClusterQueueC},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "default").
+				*utiltestingapi.MakeWorkload("a1-admitted", "default").
 					Queue("tas-lq-a").
 					Priority(2).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-cq-a").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-cq-a").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "5").
 								Count(5).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 3).Obj()).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 2).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 3).Obj()).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 2).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 5).
+					PodSets(*utiltestingapi.MakePodSet("one", 5).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("a2-admitted", "default").
+				*utiltestingapi.MakeWorkload("a2-admitted", "default").
 					Queue("tas-lq-a").
 					Priority(1).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-cq-a").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-cq-a").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "1").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("a3-admitted", "default").
+				*utiltestingapi.MakeWorkload("a3-admitted", "default").
 					Queue("tas-lq-a").
 					Priority(1).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-cq-a").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-cq-a").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "1").
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "default").
+				*utiltestingapi.MakeWorkload("b1", "default").
 					Queue("tas-lq-b").
 					Priority(3).
-					PodSets(*utiltesting.MakePodSet("one", 3).
+					PodSets(*utiltestingapi.MakePodSet("one", 3).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "default").
+				*utiltestingapi.MakeWorkload("c1", "default").
 					Queue("tas-lq-c").
 					Priority(1).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -3453,37 +3468,37 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueA, defaultClusterQueueB},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Priority(2).
 					Queue("tas-lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "5").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "default").
+				*utiltestingapi.MakeWorkload("b1", "default").
 					Priority(1).
 					Queue("tas-lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceMemory, "5").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/a1": *utiltesting.MakeAdmission("tas-cq-a").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/a1": *utiltestingapi.MakeAdmission("tas-cq-a").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "5").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
-				"default/b1": *utiltesting.MakeAdmission("tas-cq-b").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/b1": *utiltestingapi.MakeAdmission("tas-cq-b").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceMemory, "tas-default", "5").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -3502,38 +3517,38 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueA, defaultClusterQueueB},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Priority(2).
 					Queue("tas-lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "default").
+				*utiltestingapi.MakeWorkload("b1", "default").
 					Priority(1).
 					Queue("tas-lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/a1": *utiltesting.MakeAdmission("tas-cq-a").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/a1": *utiltestingapi.MakeAdmission("tas-cq-a").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
-				"default/b1": *utiltesting.MakeAdmission("tas-cq-b").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/b1": *utiltestingapi.MakeAdmission("tas-cq-b").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "2").
 						Count(2).
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 2).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 2).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -3552,29 +3567,29 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueA, defaultClusterQueueB},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Priority(2).
 					Queue("tas-lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "default").
+				*utiltestingapi.MakeWorkload("b1", "default").
 					Priority(1).
 					Queue("tas-lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 3).
+					PodSets(*utiltestingapi.MakePodSet("one", 3).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/a1": *utiltesting.MakeAdmission("tas-cq-a").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/a1": *utiltestingapi.MakeAdmission("tas-cq-a").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "1").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -3595,18 +3610,18 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueA, defaultClusterQueueB},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Priority(2).
 					Queue("tas-lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 5).
+					PodSets(*utiltestingapi.MakePodSet("one", 5).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "default").
+				*utiltestingapi.MakeWorkload("b1", "default").
 					Priority(1).
 					Queue("tas-lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 5).
+					PodSets(*utiltestingapi.MakePodSet("one", 5).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -3616,12 +3631,12 @@ func TestScheduleForTASCohorts(t *testing.T) {
 				"tas-cq-b": {"default/b1"},
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/a1": *utiltesting.MakeAdmission("tas-cq-a").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/a1": *utiltestingapi.MakeAdmission("tas-cq-a").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "5").
 						Count(5).
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 5).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 5).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -3641,29 +3656,29 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
 			clusterQueues:   []kueue.ClusterQueue{defaultClusterQueueA, defaultClusterQueueB},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Priority(2).
 					Queue("tas-lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "2").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "default").
+				*utiltestingapi.MakeWorkload("b1", "default").
 					Priority(1).
 					Queue("tas-lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "2").
 						Obj()).
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/a1": *utiltesting.MakeAdmission("tas-cq-a").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/a1": *utiltestingapi.MakeAdmission("tas-cq-a").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "2").
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -3682,49 +3697,49 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			nodes:           []corev1.Node{defaultNodeY1},
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
-			clusterQueues: []kueue.ClusterQueue{*utiltesting.MakeClusterQueue("tas-cq-a").
+			clusterQueues: []kueue.ClusterQueue{*utiltestingapi.MakeClusterQueue("tas-cq-a").
 				Cohort("tas-cohort-main").
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				}).
-				ResourceGroup(*utiltesting.MakeFlavorQuotas("tas-default").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-default").
 					Resource(corev1.ResourceCPU, "8", "0").
 					Resource(corev1.ResourceMemory, "4Gi", "0").Obj()).
 				Obj(), defaultClusterQueueB},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "default").
+				*utiltestingapi.MakeWorkload("a1-admitted", "default").
 					Queue("tas-lq-a").
 					Priority(1).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-cq-a").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-cq-a").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "2").
 								Count(2).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 2).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 2).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "default").
+				*utiltestingapi.MakeWorkload("a2", "default").
 					Queue("tas-lq-a").
 					Priority(2).
-					PodSets(*utiltesting.MakePodSet("one", 4).
+					PodSets(*utiltestingapi.MakePodSet("one", 4).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "default").
+				*utiltestingapi.MakeWorkload("b1", "default").
 					Queue("tas-lq-b").
 					Priority(1).
-					PodSets(*utiltesting.MakePodSet("one", 3).
+					PodSets(*utiltestingapi.MakePodSet("one", 3).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -3746,49 +3761,49 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			nodes:           []corev1.Node{defaultNodeY1},
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
-			clusterQueues: []kueue.ClusterQueue{*utiltesting.MakeClusterQueue("tas-cq-a").
+			clusterQueues: []kueue.ClusterQueue{*utiltestingapi.MakeClusterQueue("tas-cq-a").
 				Cohort("tas-cohort-main").
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 				}).
-				ResourceGroup(*utiltesting.MakeFlavorQuotas("tas-default").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-default").
 					Resource(corev1.ResourceCPU, "8", "0").
 					Resource(corev1.ResourceMemory, "4Gi", "0").Obj()).
 				Obj(), defaultClusterQueueB},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "default").
+				*utiltestingapi.MakeWorkload("a1-admitted", "default").
 					Queue("tas-lq-a").
 					Priority(2).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-cq-a").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-cq-a").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "2").
 								Count(2).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 2).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 2).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "default").
+				*utiltestingapi.MakeWorkload("a2", "default").
 					Queue("tas-lq-a").
 					Priority(2).
-					PodSets(*utiltesting.MakePodSet("one", 4).
+					PodSets(*utiltestingapi.MakePodSet("one", 4).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "default").
+				*utiltestingapi.MakeWorkload("b1", "default").
 					Queue("tas-lq-b").
 					Priority(1).
-					PodSets(*utiltesting.MakePodSet("one", 3).
+					PodSets(*utiltestingapi.MakePodSet("one", 3).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -3810,49 +3825,49 @@ func TestScheduleForTASCohorts(t *testing.T) {
 			nodes:           []corev1.Node{defaultNodeY1},
 			topologies:      []kueue.Topology{defaultSingleLevelTopology},
 			resourceFlavors: []kueue.ResourceFlavor{defaultTASFlavor},
-			clusterQueues: []kueue.ClusterQueue{*utiltesting.MakeClusterQueue("tas-cq-a").
+			clusterQueues: []kueue.ClusterQueue{*utiltestingapi.MakeClusterQueue("tas-cq-a").
 				Cohort("tas-cohort-main").
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				}).
-				ResourceGroup(*utiltesting.MakeFlavorQuotas("tas-default").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-default").
 					Resource(corev1.ResourceCPU, "8", "0").
 					Resource(corev1.ResourceMemory, "4Gi", "0").Obj()).
 				Obj(), defaultClusterQueueB},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "default").
+				*utiltestingapi.MakeWorkload("a1-admitted", "default").
 					Queue("tas-lq-a").
 					Priority(2).
 					ReserveQuota(
-						utiltesting.MakeAdmission("tas-cq-a").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("tas-cq-a").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "2").
 								Count(2).
-								TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-									Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 2).Obj()).
+								TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+									Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 2).Obj()).
 									Obj()).
 								Obj()).
 							Obj(),
 					).
 					Admitted(true).
-					PodSets(*utiltesting.MakePodSet("one", 2).
+					PodSets(*utiltestingapi.MakePodSet("one", 2).
 						RequiredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "default").
+				*utiltestingapi.MakeWorkload("a2", "default").
 					Queue("tas-lq-a").
 					Priority(2).
-					PodSets(*utiltesting.MakePodSet("one", 4).
+					PodSets(*utiltestingapi.MakePodSet("one", 4).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "default").
+				*utiltestingapi.MakeWorkload("b1", "default").
 					Queue("tas-lq-b").
 					Priority(1).
-					PodSets(*utiltesting.MakePodSet("one", 3).
+					PodSets(*utiltestingapi.MakePodSet("one", 3).
 						PreferredTopologyRequest(corev1.LabelHostname).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
@@ -3870,12 +3885,12 @@ func TestScheduleForTASCohorts(t *testing.T) {
 					Obj(),
 			},
 			wantNewAssignments: map[workload.Reference]kueue.Admission{
-				"default/b1": *utiltesting.MakeAdmission("tas-cq-b").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"default/b1": *utiltestingapi.MakeAdmission("tas-cq-b").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "tas-default", "3").
 						Count(3).
-						TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-							Domain(utiltesting.MakeTopologyDomainAssignment([]string{"y1"}, 3).Obj()).
+						TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+							Domain(utiltestingapi.MakeTopologyDomainAssignment([]string{"y1"}, 3).Obj()).
 							Obj()).
 						Obj()).
 					Obj(),
@@ -3883,116 +3898,124 @@ func TestScheduleForTASCohorts(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			features.SetFeatureGateDuringTest(t, features.TopologyAwareScheduling, true)
-			ctx, log := utiltesting.ContextWithLog(t)
+		for _, enabled := range []bool{false, true} {
+			t.Run(fmt.Sprintf("%s WorkloadRequestUseMergePatch enabled: %t", name, enabled), func(t *testing.T) {
+				features.SetFeatureGateDuringTest(t, features.WorkloadRequestUseMergePatch, enabled)
+				features.SetFeatureGateDuringTest(t, features.TopologyAwareScheduling, true)
+				ctx, log := utiltesting.ContextWithLog(t)
 
-			clientBuilder := utiltesting.NewClientBuilder().
-				WithLists(
-					&kueue.WorkloadList{Items: tc.workloads},
-					&kueue.TopologyList{Items: tc.topologies},
-					&corev1.PodList{Items: tc.pods},
-					&corev1.NodeList{Items: tc.nodes},
-					&kueue.LocalQueueList{Items: queues}).
-				WithObjects(
-					utiltesting.MakeNamespace("default"),
-				)
-			_ = tasindexer.SetupIndexes(ctx, utiltesting.AsIndexer(clientBuilder))
-			cl := clientBuilder.Build()
-			recorder := &utiltesting.EventRecorder{}
-			cqCache := schdcache.New(cl)
-			qManager := qcache.NewManager(cl, cqCache)
-			topologyByName := slices.ToMap(tc.topologies, func(i int) (kueue.TopologyReference, kueue.Topology) {
-				return kueue.TopologyReference(tc.topologies[i].Name), tc.topologies[i]
-			})
-			for _, flavor := range tc.resourceFlavors {
-				cqCache.AddOrUpdateResourceFlavor(log, &flavor)
-				if flavor.Spec.TopologyName != nil {
-					t := topologyByName[*flavor.Spec.TopologyName]
-					cqCache.AddOrUpdateTopology(log, &t)
-				}
-			}
-			for _, cq := range tc.clusterQueues {
-				if err := cqCache.AddClusterQueue(ctx, &cq); err != nil {
-					t.Fatalf("Inserting clusterQueue %s in cache: %v", cq.Name, err)
+				testWls := make([]kueue.Workload, 0, len(tc.workloads))
+				for _, wl := range tc.workloads {
+					testWls = append(testWls, *wl.DeepCopy())
 				}
-				if err := qManager.AddClusterQueue(ctx, &cq); err != nil {
-					t.Fatalf("Inserting clusterQueue %s in manager: %v", cq.Name, err)
+				clientBuilder := utiltesting.NewClientBuilder().
+					WithLists(
+						&kueue.WorkloadList{Items: testWls},
+						&kueue.TopologyList{Items: tc.topologies},
+						&corev1.PodList{Items: tc.pods},
+						&corev1.NodeList{Items: tc.nodes},
+						&kueue.LocalQueueList{Items: queues}).
+					WithObjects(
+						utiltesting.MakeNamespace("default"),
+					).
+					WithStatusSubresource(&kueue.Workload{})
+				_ = tasindexer.SetupIndexes(ctx, utiltesting.AsIndexer(clientBuilder))
+				cl := clientBuilder.Build()
+				recorder := &utiltesting.EventRecorder{}
+				cqCache := schdcache.New(cl)
+				qManager := qcache.NewManager(cl, cqCache)
+				topologyByName := slices.ToMap(tc.topologies, func(i int) (kueue.TopologyReference, kueue.Topology) {
+					return kueue.TopologyReference(tc.topologies[i].Name), tc.topologies[i]
+				})
+				for _, flavor := range tc.resourceFlavors {
+					cqCache.AddOrUpdateResourceFlavor(log, &flavor)
+					if flavor.Spec.TopologyName != nil {
+						t := topologyByName[*flavor.Spec.TopologyName]
+						cqCache.AddOrUpdateTopology(log, &t)
+					}
 				}
-				if err := cl.Create(ctx, &cq); err != nil {
-					t.Fatalf("couldn't create the cluster queue: %v", err)
+				for _, cq := range tc.clusterQueues {
+					if err := cqCache.AddClusterQueue(ctx, &cq); err != nil {
+						t.Fatalf("Inserting clusterQueue %s in cache: %v", cq.Name, err)
+					}
+					if err := qManager.AddClusterQueue(ctx, &cq); err != nil {
+						t.Fatalf("Inserting clusterQueue %s in manager: %v", cq.Name, err)
+					}
+					if err := cl.Create(ctx, &cq); err != nil {
+						t.Fatalf("couldn't create the cluster queue: %v", err)
+					}
 				}
-			}
-			for _, q := range queues {
-				if err := qManager.AddLocalQueue(ctx, &q); err != nil {
-					t.Fatalf("Inserting queue %s/%s in manager: %v", q.Namespace, q.Name, err)
+				for _, q := range queues {
+					if err := qManager.AddLocalQueue(ctx, &q); err != nil {
+						t.Fatalf("Inserting queue %s/%s in manager: %v", q.Namespace, q.Name, err)
+					}
 				}
-			}
-			initiallyAdmittedWorkloads := sets.New[workload.Reference]()
-			for _, w := range tc.workloads {
-				if workload.IsAdmitted(&w) {
-					initiallyAdmittedWorkloads.Insert(workload.Key(&w))
+				initiallyAdmittedWorkloads := sets.New[workload.Reference]()
+				for _, w := range testWls {
+					if workload.IsAdmitted(&w) {
+						initiallyAdmittedWorkloads.Insert(workload.Key(&w))
+					}
 				}
-			}
-			scheduler := New(qManager, cqCache, cl, recorder)
-			wg := sync.WaitGroup{}
-			scheduler.setAdmissionRoutineWrapper(routine.NewWrapper(
-				func() { wg.Add(1) },
-				func() { wg.Done() },
-			))
+				scheduler := New(qManager, cqCache, cl, recorder)
+				wg := sync.WaitGroup{}
+				scheduler.setAdmissionRoutineWrapper(routine.NewWrapper(
+					func() { wg.Add(1) },
+					func() { wg.Done() },
+				))
 
-			var mu sync.Mutex
-			gotPreempted := sets.New[workload.Reference]()
-			scheduler.preemptor.OverrideApply(func(_ context.Context, w *kueue.Workload, _, _ string) error {
-				mu.Lock()
-				gotPreempted.Insert(workload.Key(w))
-				mu.Unlock()
-				return nil
-			})
+				var mu sync.Mutex
+				gotPreempted := sets.New[workload.Reference]()
+				scheduler.preemptor.OverrideApply(func(_ context.Context, w *kueue.Workload, _, _ string) error {
+					mu.Lock()
+					gotPreempted.Insert(workload.Key(w))
+					mu.Unlock()
+					return nil
+				})
 
-			ctx, cancel := context.WithTimeout(ctx, queueingTimeout)
-			go qManager.CleanUpOnContext(ctx)
-			defer cancel()
+				ctx, cancel := context.WithTimeout(ctx, queueingTimeout)
+				go qManager.CleanUpOnContext(ctx)
+				defer cancel()
 
-			scheduler.schedule(ctx)
-			wg.Wait()
-			snapshot, err := cqCache.Snapshot(ctx)
-			if err != nil {
-				t.Fatalf("unexpected error while building snapshot: %v", err)
-			}
-			if diff := cmp.Diff(tc.wantPreempted, gotPreempted); diff != "" {
-				t.Errorf("Unexpected preemptions (-want,+got):\n%s", diff)
-			}
-			gotAssignments := make(map[workload.Reference]kueue.Admission)
-			for cqName, c := range snapshot.ClusterQueues() {
-				for name, w := range c.Workloads {
-					if initiallyAdmittedWorkloads.Has(workload.Key(w.Obj)) {
-						continue
-					}
-					switch {
-					case !workload.HasQuotaReservation(w.Obj):
-						t.Fatalf("Workload %s is not admitted by a clusterQueue, but it is found as member of clusterQueue %s in the cache", name, cqName)
-					case w.Obj.Status.Admission.ClusterQueue != cqName:
-						t.Fatalf("Workload %s is admitted by clusterQueue %s, but it is found as member of clusterQueue %s in the cache", name, w.Obj.Status.Admission.ClusterQueue, cqName)
-					default:
-						gotAssignments[name] = *w.Obj.Status.Admission
+				scheduler.schedule(ctx)
+				wg.Wait()
+				snapshot, err := cqCache.Snapshot(ctx)
+				if err != nil {
+					t.Fatalf("unexpected error while building snapshot: %v", err)
+				}
+				if diff := cmp.Diff(tc.wantPreempted, gotPreempted); diff != "" {
+					t.Errorf("Unexpected preemptions (-want,+got):\n%s", diff)
+				}
+				gotAssignments := make(map[workload.Reference]kueue.Admission)
+				for cqName, c := range snapshot.ClusterQueues() {
+					for name, w := range c.Workloads {
+						if initiallyAdmittedWorkloads.Has(workload.Key(w.Obj)) {
+							continue
+						}
+						switch {
+						case !workload.HasQuotaReservation(w.Obj):
+							t.Fatalf("Workload %s is not admitted by a clusterQueue, but it is found as member of clusterQueue %s in the cache", name, cqName)
+						case w.Obj.Status.Admission.ClusterQueue != cqName:
+							t.Fatalf("Workload %s is admitted by clusterQueue %s, but it is found as member of clusterQueue %s in the cache", name, w.Obj.Status.Admission.ClusterQueue, cqName)
+						default:
+							gotAssignments[name] = *w.Obj.Status.Admission
+						}
 					}
 				}
-			}
-			if diff := cmp.Diff(tc.wantNewAssignments, gotAssignments, cmpopts.EquateEmpty()); diff != "" {
-				t.Errorf("Unexpected assigned clusterQueues in cache (-want,+got):\n%s", diff)
-			}
-			qDump := qManager.Dump()
-			if diff := cmp.Diff(tc.wantLeft, qDump, cmpDump...); diff != "" {
-				t.Errorf("Unexpected elements left in the queue (-want,+got):\n%s", diff)
-			}
-			qDumpInadmissible := qManager.DumpInadmissible()
-			if diff := cmp.Diff(tc.wantInadmissibleLeft, qDumpInadmissible, cmpDump...); diff != "" {
-				t.Errorf("Unexpected elements left in inadmissible workloads (-want,+got):\n%s", diff)
-			}
-			if diff := cmp.Diff(tc.wantEvents, recorder.RecordedEvents, append(tc.eventCmpOpts, cmpopts.SortSlices(utiltesting.SortEvents))...); diff != "" {
-				t.Errorf("unexpected events (-want/+got):\n%s", diff)
-			}
-		})
+				if diff := cmp.Diff(tc.wantNewAssignments, gotAssignments, cmpopts.EquateEmpty()); diff != "" {
+					t.Errorf("Unexpected assigned clusterQueues in cache (-want,+got):\n%s", diff)
+				}
+				qDump := qManager.Dump()
+				if diff := cmp.Diff(tc.wantLeft, qDump, cmpDump...); diff != "" {
+					t.Errorf("Unexpected elements left in the queue (-want,+got):\n%s", diff)
+				}
+				qDumpInadmissible := qManager.DumpInadmissible()
+				if diff := cmp.Diff(tc.wantInadmissibleLeft, qDumpInadmissible, cmpDump...); diff != "" {
+					t.Errorf("Unexpected elements left in inadmissible workloads (-want,+got):\n%s", diff)
+				}
+				if diff := cmp.Diff(tc.wantEvents, recorder.RecordedEvents, append(tc.eventCmpOpts, cmpopts.SortSlices(utiltesting.SortEvents))...); diff != "" {
+					t.Errorf("unexpected events (-want/+got):\n%s", diff)
+				}
+			})
+		}
 	}
 }
diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go
index 599a29a68..cf70be31a 100644
--- a/pkg/scheduler/scheduler_test.go
+++ b/pkg/scheduler/scheduler_test.go
@@ -52,6 +52,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/util/limitrange"
 	"sigs.k8s.io/kueue/pkg/util/routine"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/pkg/workloadslicing"
 )
@@ -70,13 +71,13 @@ func TestSchedule(t *testing.T) {
 	ignoreEventMessageCmpOpts := cmp.Options{cmpopts.IgnoreFields(utiltesting.EventRecord{}, "Message")}
 
 	resourceFlavors := []*kueue.ResourceFlavor{
-		utiltesting.MakeResourceFlavor("default").Obj(),
-		utiltesting.MakeResourceFlavor("on-demand").Obj(),
-		utiltesting.MakeResourceFlavor("spot").Obj(),
-		utiltesting.MakeResourceFlavor("model-a").Obj(),
+		utiltestingapi.MakeResourceFlavor("default").Obj(),
+		utiltestingapi.MakeResourceFlavor("on-demand").Obj(),
+		utiltestingapi.MakeResourceFlavor("spot").Obj(),
+		utiltestingapi.MakeResourceFlavor("model-a").Obj(),
 	}
 	clusterQueues := []kueue.ClusterQueue{
-		*utiltesting.MakeClusterQueue("sales").
+		*utiltestingapi.MakeClusterQueue("sales").
 			NamespaceSelector(&metav1.LabelSelector{
 				MatchExpressions: []metav1.LabelSelectorRequirement{{
 					Key:      "dep",
@@ -85,10 +86,10 @@ func TestSchedule(t *testing.T) {
 				}},
 			}).
 			QueueingStrategy(kueue.StrictFIFO).
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "50", "0").Obj()).
 			Obj(),
-		*utiltesting.MakeClusterQueue("eng-alpha").
+		*utiltestingapi.MakeClusterQueue("eng-alpha").
 			Cohort("eng").
 			NamespaceSelector(&metav1.LabelSelector{
 				MatchExpressions: []metav1.LabelSelectorRequirement{{
@@ -99,13 +100,13 @@ func TestSchedule(t *testing.T) {
 			}).
 			QueueingStrategy(kueue.StrictFIFO).
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("on-demand").
+				*utiltestingapi.MakeFlavorQuotas("on-demand").
 					Resource(corev1.ResourceCPU, "50", "50").Obj(),
-				*utiltesting.MakeFlavorQuotas("spot").
+				*utiltestingapi.MakeFlavorQuotas("spot").
 					Resource(corev1.ResourceCPU, "100", "0").Obj(),
 			).
 			Obj(),
-		*utiltesting.MakeClusterQueue("eng-beta").
+		*utiltestingapi.MakeClusterQueue("eng-beta").
 			Cohort("eng").
 			NamespaceSelector(&metav1.LabelSelector{
 				MatchExpressions: []metav1.LabelSelectorRequirement{{
@@ -120,22 +121,22 @@ func TestSchedule(t *testing.T) {
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 			}).
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("on-demand").
+				*utiltestingapi.MakeFlavorQuotas("on-demand").
 					Resource(corev1.ResourceCPU, "50", "10").Obj(),
-				*utiltesting.MakeFlavorQuotas("spot").
+				*utiltestingapi.MakeFlavorQuotas("spot").
 					Resource(corev1.ResourceCPU, "0", "100").Obj(),
 			).
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("model-a").
+				*utiltestingapi.MakeFlavorQuotas("model-a").
 					Resource("example.com/gpu", "20", "0").Obj(),
 			).
 			Obj(),
-		*utiltesting.MakeClusterQueue("flavor-nonexistent-cq").
+		*utiltestingapi.MakeClusterQueue("flavor-nonexistent-cq").
 			QueueingStrategy(kueue.StrictFIFO).
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("nonexistent-flavor").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("nonexistent-flavor").
 				Resource(corev1.ResourceCPU, "50").Obj()).
 			Obj(),
-		*utiltesting.MakeClusterQueue("lend-a").
+		*utiltestingapi.MakeClusterQueue("lend-a").
 			Cohort("lend").
 			NamespaceSelector(&metav1.LabelSelector{
 				MatchExpressions: []metav1.LabelSelectorRequirement{{
@@ -144,10 +145,10 @@ func TestSchedule(t *testing.T) {
 					Values:   []string{"lend"},
 				}},
 			}).
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "3", "", "2").Obj()).
 			Obj(),
-		*utiltesting.MakeClusterQueue("lend-b").
+		*utiltestingapi.MakeClusterQueue("lend-b").
 			Cohort("lend").
 			NamespaceSelector(&metav1.LabelSelector{
 				MatchExpressions: []metav1.LabelSelectorRequirement{{
@@ -156,19 +157,19 @@ func TestSchedule(t *testing.T) {
 					Values:   []string{"lend"},
 				}},
 			}).
-			ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 				Resource(corev1.ResourceCPU, "2", "", "2").Obj()).
 			Obj(),
 	}
 	queues := []kueue.LocalQueue{
-		*utiltesting.MakeLocalQueue("main", "sales").ClusterQueue("sales").Obj(),
-		*utiltesting.MakeLocalQueue("blocked", "sales").ClusterQueue("eng-alpha").Obj(),
-		*utiltesting.MakeLocalQueue("main", "eng-alpha").ClusterQueue("eng-alpha").Obj(),
-		*utiltesting.MakeLocalQueue("main", "eng-beta").ClusterQueue("eng-beta").Obj(),
-		*utiltesting.MakeLocalQueue("flavor-nonexistent-queue", "sales").ClusterQueue("flavor-nonexistent-cq").Obj(),
-		*utiltesting.MakeLocalQueue("cq-nonexistent-queue", "sales").ClusterQueue("nonexistent-cq").Obj(),
-		*utiltesting.MakeLocalQueue("lend-a-queue", "lend").ClusterQueue("lend-a").Obj(),
-		*utiltesting.MakeLocalQueue("lend-b-queue", "lend").ClusterQueue("lend-b").Obj(),
+		*utiltestingapi.MakeLocalQueue("main", "sales").ClusterQueue("sales").Obj(),
+		*utiltestingapi.MakeLocalQueue("blocked", "sales").ClusterQueue("eng-alpha").Obj(),
+		*utiltestingapi.MakeLocalQueue("main", "eng-alpha").ClusterQueue("eng-alpha").Obj(),
+		*utiltestingapi.MakeLocalQueue("main", "eng-beta").ClusterQueue("eng-beta").Obj(),
+		*utiltestingapi.MakeLocalQueue("flavor-nonexistent-queue", "sales").ClusterQueue("flavor-nonexistent-cq").Obj(),
+		*utiltestingapi.MakeLocalQueue("cq-nonexistent-queue", "sales").ClusterQueue("nonexistent-cq").Obj(),
+		*utiltestingapi.MakeLocalQueue("lend-a-queue", "lend").ClusterQueue("lend-a").Obj(),
+		*utiltestingapi.MakeLocalQueue("lend-b-queue", "lend").ClusterQueue("lend-b").Obj(),
 	}
 	cases := map[string]struct {
 		// Features
@@ -207,7 +208,7 @@ func TestSchedule(t *testing.T) {
 	}{
 		"use second flavor when the first has no preemption candidates; WhenCanPreempt: MayStopSearch": {
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 					}).
@@ -215,43 +216,43 @@ func TestSchedule(t *testing.T) {
 						WhenCanPreempt: kueue.MayStopSearch,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "50", "50").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").
+						*utiltestingapi.MakeFlavorQuotas("spot").
 							Resource(corev1.ResourceCPU, "100", "0").Obj(),
 					).Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted", "eng-alpha").
+				*utiltestingapi.MakeWorkload("admitted", "eng-alpha").
 					Queue("other").
 					Request(corev1.ResourceCPU, "50").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "50").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("other").
 					Request(corev1.ResourceCPU, "20").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted", "eng-alpha").
+				*utiltestingapi.MakeWorkload("admitted", "eng-alpha").
 					Queue("other").
 					Request(corev1.ResourceCPU, "50").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "50").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("other").
 					Request(corev1.ResourceCPU, "20").
 					SetOrReplaceCondition(metav1.Condition{
@@ -268,9 +269,9 @@ func TestSchedule(t *testing.T) {
 						Message:            "The workload is admitted",
 						LastTransitionTime: metav1.NewTime(now),
 					}).
-					Admission(utiltesting.MakeAdmission("other-alpha").
+					Admission(utiltestingapi.MakeAdmission("other-alpha").
 						PodSets(
-							utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+							utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "spot", "20").
 								Obj()).
 						Obj()).
@@ -281,7 +282,7 @@ func TestSchedule(t *testing.T) {
 				"eng-alpha/admitted": {
 					ClusterQueue: "other-alpha",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("main").
+						utiltestingapi.MakePodSetAssignment("main").
 							Assignment(corev1.ResourceCPU, "on-demand", "50").
 							Obj(),
 					},
@@ -289,16 +290,16 @@ func TestSchedule(t *testing.T) {
 				"eng-alpha/new": {
 					ClusterQueue: "other-alpha",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("main").Assignment(corev1.ResourceCPU, "spot", "20").Obj(),
+						utiltestingapi.MakePodSetAssignment("main").Assignment(corev1.ResourceCPU, "spot", "20").Obj(),
 					},
 				},
 			},
 		},
 		"workload fits in single clusterQueue, with check state ready": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "sales").
+				*utiltestingapi.MakeWorkload("foo", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					AdmissionCheck(kueue.AdmissionCheckState{
@@ -312,7 +313,7 @@ func TestSchedule(t *testing.T) {
 				"sales/foo": {
 					ClusterQueue: "sales",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "default", "10000m").
 							Count(10).
 							Obj(),
@@ -320,9 +321,9 @@ func TestSchedule(t *testing.T) {
 				},
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "sales").
+				*utiltestingapi.MakeWorkload("foo", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					AdmissionCheck(kueue.AdmissionCheckState{
@@ -330,8 +331,8 @@ func TestSchedule(t *testing.T) {
 						State: kueue.CheckStateReady,
 					}).
 					Admission(
-						utiltesting.MakeAdmission("sales").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("sales").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "default", "10000m").
 								Count(10).
 								Obj()).
@@ -364,18 +365,18 @@ func TestSchedule(t *testing.T) {
 		},
 		"skip workload with missing or deleted ClusterQueue (NoFit)": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("missing-cq-workload", "sales").
+				*utiltestingapi.MakeWorkload("missing-cq-workload", "sales").
 					Queue("non-existent-queue").
-					PodSets(*utiltesting.MakePodSet("set", 1).
+					PodSets(*utiltestingapi.MakePodSet("set", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Generation(1).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("missing-cq-workload", "sales").
+				*utiltestingapi.MakeWorkload("missing-cq-workload", "sales").
 					Queue("non-existent-queue").
-					PodSets(*utiltesting.MakePodSet("set", 1).
+					PodSets(*utiltestingapi.MakePodSet("set", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Generation(1).
@@ -388,9 +389,9 @@ func TestSchedule(t *testing.T) {
 		},
 		"workload fits in single clusterQueue, with check state pending": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "sales").
+				*utiltestingapi.MakeWorkload("foo", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					AdmissionCheck(kueue.AdmissionCheckState{
@@ -400,9 +401,9 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "sales").
+				*utiltestingapi.MakeWorkload("foo", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					AdmissionCheck(kueue.AdmissionCheckState{
@@ -410,8 +411,8 @@ func TestSchedule(t *testing.T) {
 						State: kueue.CheckStatePending,
 					}).
 					Admission(
-						utiltesting.MakeAdmission("sales").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("sales").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "default", "10000m").
 								Count(10).
 								Obj()).
@@ -430,7 +431,7 @@ func TestSchedule(t *testing.T) {
 				"sales/foo": {
 					ClusterQueue: "sales",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "default", "10000m").
 							Count(10).
 							Obj(),
@@ -444,17 +445,17 @@ func TestSchedule(t *testing.T) {
 		},
 		"error during admission": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "sales").
+				*utiltestingapi.MakeWorkload("foo", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "sales").
+				*utiltestingapi.MakeWorkload("foo", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
@@ -466,22 +467,22 @@ func TestSchedule(t *testing.T) {
 		},
 		"single clusterQueue full": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 11).
+					PodSets(*utiltestingapi.MakePodSet("one", 11).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("assigned", "sales").
-					PodSets(*utiltesting.MakePodSet("one", 40).
+				*utiltestingapi.MakeWorkload("assigned", "sales").
+					PodSets(*utiltestingapi.MakePodSet("one", 40).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("sales").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "default", "40000m").Count(40).Obj()).Obj(), now).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("sales").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "default", "40000m").Count(40).Obj()).Obj(), now).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("assigned", "sales").
-					PodSets(*utiltesting.MakePodSet("one", 40).
+				*utiltestingapi.MakeWorkload("assigned", "sales").
+					PodSets(*utiltestingapi.MakePodSet("one", 40).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -492,17 +493,17 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("sales").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("sales").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "default", "40").
 								Count(40).
 								Obj()).
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 11).
+					PodSets(*utiltestingapi.MakePodSet("one", 11).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -524,7 +525,7 @@ func TestSchedule(t *testing.T) {
 				"sales/assigned": {
 					ClusterQueue: "sales",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "default", "40000m").
 							Count(40).
 							Obj(),
@@ -537,17 +538,17 @@ func TestSchedule(t *testing.T) {
 		},
 		"failed to match clusterQueue selector": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("blocked").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("blocked").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -571,23 +572,23 @@ func TestSchedule(t *testing.T) {
 		},
 		"admit in different cohorts": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 51 /* Will borrow */).
+					PodSets(*utiltestingapi.MakePodSet("one", 51 /* Will borrow */).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 51 /* Will borrow */).
+					PodSets(*utiltestingapi.MakePodSet("one", 51 /* Will borrow */).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -605,17 +606,17 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-alpha").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("eng-alpha").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "on-demand", "51").
 								Count(51).
 								Obj()).
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -633,8 +634,8 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("sales").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("sales").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "default", "1").
 								Count(1).
 								Obj()).
@@ -646,7 +647,7 @@ func TestSchedule(t *testing.T) {
 				"sales/new": {
 					ClusterQueue: "sales",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "default", "1000m").
 							Obj(),
 					},
@@ -654,7 +655,7 @@ func TestSchedule(t *testing.T) {
 				"eng-alpha/new": {
 					ClusterQueue: "eng-alpha",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "51000m").
 							Count(51).
 							Obj(),
@@ -664,23 +665,23 @@ func TestSchedule(t *testing.T) {
 		},
 		"admit in same cohort with no borrowing": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 40).
+					PodSets(*utiltestingapi.MakePodSet("one", 40).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 40).
+					PodSets(*utiltestingapi.MakePodSet("one", 40).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 40).
+					PodSets(*utiltestingapi.MakePodSet("one", 40).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -698,17 +699,17 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-alpha").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("eng-alpha").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "on-demand", "40").
 								Count(40).
 								Obj()).
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 40).
+					PodSets(*utiltestingapi.MakePodSet("one", 40).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -726,8 +727,8 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-beta").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("eng-beta").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "on-demand", "40").
 								Count(40).
 								Obj()).
@@ -739,7 +740,7 @@ func TestSchedule(t *testing.T) {
 				"eng-alpha/new": {
 					ClusterQueue: "eng-alpha",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "40000m").
 							Count(40).
 							Obj(),
@@ -748,7 +749,7 @@ func TestSchedule(t *testing.T) {
 				"eng-beta/new": {
 					ClusterQueue: "eng-beta",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "40000m").
 							Count(40).
 							Obj(),
@@ -758,28 +759,28 @@ func TestSchedule(t *testing.T) {
 		},
 		"assign multiple resources and flavors": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
 					PodSets(
-						*utiltesting.MakePodSet("one", 10).
+						*utiltestingapi.MakePodSet("one", 10).
 							Request(corev1.ResourceCPU, "6").
 							Request("example.com/gpu", "1").
 							Obj(),
-						*utiltesting.MakePodSet("two", 40).
+						*utiltestingapi.MakePodSet("two", 40).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
 					PodSets(
-						*utiltesting.MakePodSet("one", 10).
+						*utiltestingapi.MakePodSet("one", 10).
 							Request(corev1.ResourceCPU, "6").
 							Request("example.com/gpu", "1").
 							Obj(),
-						*utiltesting.MakePodSet("two", 40).
+						*utiltestingapi.MakePodSet("two", 40).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
@@ -798,14 +799,14 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-beta").
+						utiltestingapi.MakeAdmission("eng-beta").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "on-demand", "60000m").
 									Assignment("example.com/gpu", "model-a", "10").
 									Count(10).
 									Obj(),
-								utiltesting.MakePodSetAssignment("two").
+								utiltestingapi.MakePodSetAssignment("two").
 									Assignment(corev1.ResourceCPU, "spot", "40000m").
 									Count(40).
 									Obj(),
@@ -818,12 +819,12 @@ func TestSchedule(t *testing.T) {
 				"eng-beta/new": {
 					ClusterQueue: "eng-beta",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "60000m").
 							Assignment("example.com/gpu", "model-a", "10").
 							Count(10).
 							Obj(),
-						utiltesting.MakePodSetAssignment("two").
+						utiltestingapi.MakePodSetAssignment("two").
 							Assignment(corev1.ResourceCPU, "spot", "40000m").
 							Count(40).
 							Obj(),
@@ -833,23 +834,23 @@ func TestSchedule(t *testing.T) {
 		},
 		"cannot borrow if cohort was assigned and would result in overadmission": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 45).
+					PodSets(*utiltestingapi.MakePodSet("one", 45).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 56).
+					PodSets(*utiltestingapi.MakePodSet("one", 56).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 45).
+					PodSets(*utiltestingapi.MakePodSet("one", 45).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -867,9 +868,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-alpha").
+						utiltestingapi.MakeAdmission("eng-alpha").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "on-demand", "45").
 									Count(45).
 									Obj(),
@@ -877,9 +878,9 @@ func TestSchedule(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 56).
+					PodSets(*utiltestingapi.MakePodSet("one", 56).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -901,7 +902,7 @@ func TestSchedule(t *testing.T) {
 				"eng-alpha/new": {
 					ClusterQueue: "eng-alpha",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "45000m").
 							Count(45).
 							Obj(),
@@ -914,23 +915,23 @@ func TestSchedule(t *testing.T) {
 		},
 		"can borrow if cohort was assigned and will not result in overadmission": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 45).
+					PodSets(*utiltestingapi.MakePodSet("one", 45).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 55).
+					PodSets(*utiltestingapi.MakePodSet("one", 55).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 45).
+					PodSets(*utiltestingapi.MakePodSet("one", 45).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -948,17 +949,17 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-alpha").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("eng-alpha").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "on-demand", "45").
 								Count(45).
 								Obj()).
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 55).
+					PodSets(*utiltestingapi.MakePodSet("one", 55).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -976,8 +977,8 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-beta").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("eng-beta").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "on-demand", "55").
 								Count(55).
 								Obj()).
@@ -989,7 +990,7 @@ func TestSchedule(t *testing.T) {
 				"eng-alpha/new": {
 					ClusterQueue: "eng-alpha",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "45000m").
 							Count(45).
 							Obj(),
@@ -998,7 +999,7 @@ func TestSchedule(t *testing.T) {
 				"eng-beta/new": {
 					ClusterQueue: "eng-beta",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "55000m").
 							Count(55).
 							Obj(),
@@ -1008,33 +1009,33 @@ func TestSchedule(t *testing.T) {
 		},
 		"can borrow if needs reclaim from cohort in different flavor": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("can-reclaim", "eng-alpha").
+				*utiltestingapi.MakeWorkload("can-reclaim", "eng-alpha").
 					Queue("main").
 					Request(corev1.ResourceCPU, "100").
 					Obj(),
-				*utiltesting.MakeWorkload("needs-to-borrow", "eng-beta").
+				*utiltestingapi.MakeWorkload("needs-to-borrow", "eng-beta").
 					Queue("main").
 					Request(corev1.ResourceCPU, "1").
 					Obj(),
-				*utiltesting.MakeWorkload("user-on-demand", "eng-beta").
+				*utiltestingapi.MakeWorkload("user-on-demand", "eng-beta").
 					Request(corev1.ResourceCPU, "50").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "50000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("user-spot", "eng-beta").
+				*utiltestingapi.MakeWorkload("user-spot", "eng-beta").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "spot", "1000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("can-reclaim", "eng-alpha").
+				*utiltestingapi.MakeWorkload("can-reclaim", "eng-alpha").
 					Queue("main").
 					Request(corev1.ResourceCPU, "100").
 					Condition(metav1.Condition{
@@ -1051,7 +1052,7 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("needs-to-borrow", "eng-beta").
+				*utiltestingapi.MakeWorkload("needs-to-borrow", "eng-beta").
 					Queue("main").
 					Request(corev1.ResourceCPU, "1").
 					Condition(metav1.Condition{
@@ -1069,26 +1070,26 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-beta").
-							PodSets(utiltesting.MakePodSetAssignment("main").
+						utiltestingapi.MakeAdmission("eng-beta").
+							PodSets(utiltestingapi.MakePodSetAssignment("main").
 								Assignment(corev1.ResourceCPU, "on-demand", "1").
 								Count(1).
 								Obj()).
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("user-on-demand", "eng-beta").
+				*utiltestingapi.MakeWorkload("user-on-demand", "eng-beta").
 					Request(corev1.ResourceCPU, "50").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "50000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("user-spot", "eng-beta").
+				*utiltestingapi.MakeWorkload("user-spot", "eng-beta").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "spot", "1000m").
 							Obj()).
 						Obj(), now).
@@ -1098,18 +1099,18 @@ func TestSchedule(t *testing.T) {
 				"eng-alpha": {"eng-alpha/can-reclaim"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-beta/user-spot": *utiltesting.MakeAdmission("eng-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/user-spot": *utiltestingapi.MakeAdmission("eng-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "spot", "1000m").
 						Obj()).
 					Obj(),
-				"eng-beta/user-on-demand": *utiltesting.MakeAdmission("eng-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/user-on-demand": *utiltestingapi.MakeAdmission("eng-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "50000m").
 						Obj()).
 					Obj(),
-				"eng-beta/needs-to-borrow": *utiltesting.MakeAdmission("eng-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/needs-to-borrow": *utiltestingapi.MakeAdmission("eng-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "1000m").
 						Obj()).
 					Obj(),
@@ -1117,29 +1118,29 @@ func TestSchedule(t *testing.T) {
 		},
 		"workload exceeds lending limit when borrow in cohort": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "lend").
+				*utiltestingapi.MakeWorkload("a", "lend").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("lend-b").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("lend-b").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b", "lend").
+				*utiltestingapi.MakeWorkload("b", "lend").
 					Queue("lend-b-queue").
 					Request(corev1.ResourceCPU, "3").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "lend").
+				*utiltestingapi.MakeWorkload("a", "lend").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("lend-b").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("lend-b").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b", "lend").
+				*utiltestingapi.MakeWorkload("b", "lend").
 					Queue("lend-b-queue").
 					Request(corev1.ResourceCPU, "3").
 					Condition(metav1.Condition{
@@ -1158,8 +1159,8 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"lend/a": *utiltesting.MakeAdmission("lend-b").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"lend/a": *utiltestingapi.MakeAdmission("lend-b").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "2000m").
 						Obj()).
 					Obj(),
@@ -1171,29 +1172,29 @@ func TestSchedule(t *testing.T) {
 		"lendingLimit should not affect assignments when feature disabled": {
 			disableLendingLimit: true,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "lend").
+				*utiltestingapi.MakeWorkload("a", "lend").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("lend-b").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("lend-b").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b", "lend").
+				*utiltestingapi.MakeWorkload("b", "lend").
 					Queue("lend-b-queue").
 					Request(corev1.ResourceCPU, "3").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "lend").
+				*utiltestingapi.MakeWorkload("a", "lend").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("lend-b").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("lend-b").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b", "lend").
+				*utiltestingapi.MakeWorkload("b", "lend").
 					Queue("lend-b-queue").
 					Request(corev1.ResourceCPU, "3").
 					Condition(metav1.Condition{
@@ -1211,8 +1212,8 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("lend-b").
-							PodSets(utiltesting.MakePodSetAssignment("main").
+						utiltestingapi.MakeAdmission("lend-b").
+							PodSets(utiltestingapi.MakePodSetAssignment("main").
 								Assignment(corev1.ResourceCPU, "default", "3").
 								Count(1).
 								Obj()).
@@ -1221,13 +1222,13 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"lend/a": *utiltesting.MakeAdmission("lend-b").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"lend/a": *utiltestingapi.MakeAdmission("lend-b").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "2000m").
 						Obj()).
 					Obj(),
-				"lend/b": *utiltesting.MakeAdmission("lend-b").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"lend/b": *utiltestingapi.MakeAdmission("lend-b").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "3000m").
 						Obj()).
 					Obj(),
@@ -1235,81 +1236,81 @@ func TestSchedule(t *testing.T) {
 		},
 		"preempt workloads in ClusterQueue and cohort": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-beta").
 					Queue("main").
 					Request(corev1.ResourceCPU, "20").
 					Obj(),
-				*utiltesting.MakeWorkload("use-all-spot", "eng-alpha").
+				*utiltestingapi.MakeWorkload("use-all-spot", "eng-alpha").
 					Request(corev1.ResourceCPU, "100").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "spot", "100000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("low-1", "eng-beta").
+				*utiltestingapi.MakeWorkload("low-1", "eng-beta").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "30").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "30000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("low-2", "eng-beta").
+				*utiltestingapi.MakeWorkload("low-2", "eng-beta").
 					Priority(-2).
 					Request(corev1.ResourceCPU, "10").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "10000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("borrower", "eng-alpha").
+				*utiltestingapi.MakeWorkload("borrower", "eng-alpha").
 					Request(corev1.ResourceCPU, "60").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "60000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("borrower", "eng-alpha").
+				*utiltestingapi.MakeWorkload("borrower", "eng-alpha").
 					Request(corev1.ResourceCPU, "60").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "60000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("use-all-spot", "eng-alpha").
+				*utiltestingapi.MakeWorkload("use-all-spot", "eng-alpha").
 					Request(corev1.ResourceCPU, "100").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "spot", "100000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("low-1", "eng-beta").
+				*utiltestingapi.MakeWorkload("low-1", "eng-beta").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "30").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "30000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("low-2", "eng-beta").
+				*utiltestingapi.MakeWorkload("low-2", "eng-beta").
 					Priority(-2).
 					Request(corev1.ResourceCPU, "10").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "10000m").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-beta").
 					Queue("main").
 					Request(corev1.ResourceCPU, "20").
 					Condition(metav1.Condition{
@@ -1333,24 +1334,24 @@ func TestSchedule(t *testing.T) {
 			},
 			wantPreempted: sets.New[workload.Reference]("eng-alpha/borrower", "eng-beta/low-2"),
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/use-all-spot": *utiltesting.MakeAdmission("eng-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/use-all-spot": *utiltestingapi.MakeAdmission("eng-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "spot", "100").
 						Obj()).
 					Obj(),
-				"eng-beta/low-1": *utiltesting.MakeAdmission("eng-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/low-1": *utiltestingapi.MakeAdmission("eng-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "30").
 						Obj()).
 					Obj(),
 				// Removal from cache for the preempted workloads is deferred until we receive Workload updates
-				"eng-beta/low-2": *utiltesting.MakeAdmission("eng-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/low-2": *utiltestingapi.MakeAdmission("eng-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "10").
 						Obj()).
 					Obj(),
-				"eng-alpha/borrower": *utiltesting.MakeAdmission("eng-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/borrower": *utiltestingapi.MakeAdmission("eng-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "60").
 						Obj()).
 					Obj(),
@@ -1358,51 +1359,51 @@ func TestSchedule(t *testing.T) {
 		},
 		"multiple CQs need preemption": {
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Cohort("other").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "50", "50").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-beta").
+				*utiltestingapi.MakeClusterQueue("other-beta").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "50", "10").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-beta").
 					Priority(-1).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
 					Obj(),
-				*utiltesting.MakeWorkload("pending", "eng-alpha").
+				*utiltestingapi.MakeWorkload("pending", "eng-alpha").
 					Priority(1).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
 					Obj(),
-				*utiltesting.MakeWorkload("use-all", "eng-alpha").
+				*utiltestingapi.MakeWorkload("use-all", "eng-alpha").
 					Request(corev1.ResourceCPU, "100").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "100").
 							Obj()).
 						Obj(), now).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("pending", "eng-alpha").
+				*utiltestingapi.MakeWorkload("pending", "eng-alpha").
 					Priority(1).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
@@ -1420,15 +1421,15 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("use-all", "eng-alpha").
+				*utiltestingapi.MakeWorkload("use-all", "eng-alpha").
 					Request(corev1.ResourceCPU, "100").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "100").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-beta").
 					Priority(-1).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
@@ -1457,8 +1458,8 @@ func TestSchedule(t *testing.T) {
 			wantPreempted: sets.New[workload.Reference]("eng-alpha/use-all"),
 			wantAssignments: map[workload.Reference]kueue.Admission{
 				// Removal from cache for the preempted workloads is deferred until we receive Workload updates
-				"eng-alpha/use-all": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/use-all": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "100").
 						Obj()).
 					Obj(),
@@ -1466,13 +1467,13 @@ func TestSchedule(t *testing.T) {
 		},
 		"cannot borrow resource not listed in clusterQueue": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
 					Request("example.com/gpu", "1").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
 					Request("example.com/gpu", "1").
 					Condition(metav1.Condition{
@@ -1496,23 +1497,23 @@ func TestSchedule(t *testing.T) {
 		},
 		"not enough resources to borrow, fallback to next flavor; WhenCanPreempt: TryNextFlavor": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 60).
+					PodSets(*utiltestingapi.MakePodSet("one", 60).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("existing", "eng-beta").
-					PodSets(*utiltesting.MakePodSet("one", 45).
+				*utiltestingapi.MakeWorkload("existing", "eng-beta").
+					PodSets(*utiltestingapi.MakePodSet("one", 45).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "45000m").Count(45).Obj()).Obj(), now).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "45000m").Count(45).Obj()).Obj(), now).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 60).
+					PodSets(*utiltestingapi.MakePodSet("one", 60).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -1530,9 +1531,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-alpha").
+						utiltestingapi.MakeAdmission("eng-alpha").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "spot", "60").
 									Count(60).
 									Obj(),
@@ -1540,18 +1541,18 @@ func TestSchedule(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("existing", "eng-beta").
-					PodSets(*utiltesting.MakePodSet("one", 45).
+				*utiltestingapi.MakeWorkload("existing", "eng-beta").
+					PodSets(*utiltestingapi.MakePodSet("one", 45).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "45000m").Count(45).Obj()).Obj(), now).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "45000m").Count(45).Obj()).Obj(), now).
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
 				"eng-alpha/new": {
 					ClusterQueue: "eng-alpha",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "spot", "60000m").
 							Count(60).
 							Obj(),
@@ -1560,7 +1561,7 @@ func TestSchedule(t *testing.T) {
 				"eng-beta/existing": {
 					ClusterQueue: "eng-beta",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "45000m").
 							Count(45).
 							Obj(),
@@ -1570,13 +1571,13 @@ func TestSchedule(t *testing.T) {
 		},
 		"workload should not fit in nonexistent clusterQueue": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "sales").
+				*utiltestingapi.MakeWorkload("foo", "sales").
 					Queue("cq-nonexistent-queue").
 					Request(corev1.ResourceCPU, "1").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "sales").
+				*utiltestingapi.MakeWorkload("foo", "sales").
 					Queue("cq-nonexistent-queue").
 					Request(corev1.ResourceCPU, "1").
 					Obj(),
@@ -1584,13 +1585,13 @@ func TestSchedule(t *testing.T) {
 		},
 		"workload should not fit in clusterQueue with nonexistent flavor": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "sales").
+				*utiltestingapi.MakeWorkload("foo", "sales").
 					Queue("flavor-nonexistent-queue").
 					Request(corev1.ResourceCPU, "1").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo", "sales").
+				*utiltestingapi.MakeWorkload("foo", "sales").
 					Queue("flavor-nonexistent-queue").
 					Request(corev1.ResourceCPU, "1").
 					Obj(),
@@ -1601,43 +1602,43 @@ func TestSchedule(t *testing.T) {
 		},
 		"no overadmission while borrowing": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
 					Creation(now.Add(-2 * time.Second)).
-					PodSets(*utiltesting.MakePodSet("one", 50).
+					PodSets(*utiltestingapi.MakePodSet("one", 50).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("new-alpha", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new-alpha", "eng-alpha").
 					Queue("main").
 					Creation(now.Add(-time.Second)).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("new-gamma", "eng-gamma").
+				*utiltestingapi.MakeWorkload("new-gamma", "eng-gamma").
 					Queue("main").
 					Creation(now).
-					PodSets(*utiltesting.MakePodSet("one", 50).
+					PodSets(*utiltestingapi.MakePodSet("one", 50).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("existing", "eng-gamma").
+				*utiltestingapi.MakeWorkload("existing", "eng-gamma").
 					PodSets(
-						*utiltesting.MakePodSet("borrow-on-demand", 51).
+						*utiltestingapi.MakePodSet("borrow-on-demand", 51).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("use-all-spot", 100).
+						*utiltestingapi.MakePodSet("use-all-spot", 100).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-gamma").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-gamma").
 						PodSets(
-							utiltesting.MakePodSetAssignment("borrow-on-demand").
+							utiltestingapi.MakePodSetAssignment("borrow-on-demand").
 								Assignment(corev1.ResourceCPU, "on-demand", "51").
 								Count(51).
 								Obj(),
-							utiltesting.MakePodSetAssignment("use-all-spot").
+							utiltestingapi.MakePodSetAssignment("use-all-spot").
 								Assignment(corev1.ResourceCPU, "spot", "100").
 								Count(100).
 								Obj(),
@@ -1646,10 +1647,10 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new-alpha", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new-alpha", "eng-alpha").
 					Queue("main").
 					Creation(now.Add(-time.Second)).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -1667,18 +1668,18 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-alpha").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("eng-alpha").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "on-demand", "1").
 								Count(1).
 								Obj()).
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
 					Creation(now.Add(-2 * time.Second)).
-					PodSets(*utiltesting.MakePodSet("one", 50).
+					PodSets(*utiltestingapi.MakePodSet("one", 50).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -1696,40 +1697,40 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-beta").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("eng-beta").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "on-demand", "50").
 								Count(50).
 								Obj()).
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("existing", "eng-gamma").
+				*utiltestingapi.MakeWorkload("existing", "eng-gamma").
 					PodSets(
-						*utiltesting.MakePodSet("borrow-on-demand", 51).
+						*utiltestingapi.MakePodSet("borrow-on-demand", 51).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("use-all-spot", 100).
+						*utiltestingapi.MakePodSet("use-all-spot", 100).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
 					).
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-gamma").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-gamma").
 						PodSets(
-							utiltesting.MakePodSetAssignment("borrow-on-demand").
+							utiltestingapi.MakePodSetAssignment("borrow-on-demand").
 								Assignment(corev1.ResourceCPU, "on-demand", "51").
 								Count(51).
 								Obj(),
-							utiltesting.MakePodSetAssignment("use-all-spot").
+							utiltestingapi.MakePodSetAssignment("use-all-spot").
 								Assignment(corev1.ResourceCPU, "spot", "100").
 								Count(100).
 								Obj(),
 						).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("new-gamma", "eng-gamma").
+				*utiltestingapi.MakeWorkload("new-gamma", "eng-gamma").
 					Queue("main").
 					Creation(now).
-					PodSets(*utiltesting.MakePodSet("one", 50).
+					PodSets(*utiltestingapi.MakePodSet("one", 50).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -1748,37 +1749,37 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("eng-gamma").
+				*utiltestingapi.MakeClusterQueue("eng-gamma").
 					Cohort("eng").
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "50", "10").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").
+						*utiltestingapi.MakeFlavorQuotas("spot").
 							Resource(corev1.ResourceCPU, "0", "100").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("main", "eng-gamma").ClusterQueue("eng-gamma").Obj(),
+				*utiltestingapi.MakeLocalQueue("main", "eng-gamma").ClusterQueue("eng-gamma").Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-gamma/existing": *utiltesting.MakeAdmission("eng-gamma").
+				"eng-gamma/existing": *utiltestingapi.MakeAdmission("eng-gamma").
 					PodSets(
-						utiltesting.MakePodSetAssignment("borrow-on-demand").
+						utiltestingapi.MakePodSetAssignment("borrow-on-demand").
 							Assignment(corev1.ResourceCPU, "on-demand", "51").
 							Count(51).
 							Obj(),
-						utiltesting.MakePodSetAssignment("use-all-spot").
+						utiltestingapi.MakePodSetAssignment("use-all-spot").
 							Assignment(corev1.ResourceCPU, "spot", "100").
 							Count(100).
 							Obj(),
 					).Obj(),
-				"eng-beta/new":        *utiltesting.MakeAdmission("eng-beta").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "50").Count(50).Obj()).Obj(),
-				"eng-alpha/new-alpha": *utiltesting.MakeAdmission("eng-alpha").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()).Obj(),
+				"eng-beta/new":        *utiltestingapi.MakeAdmission("eng-beta").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "50").Count(50).Obj()).Obj(),
+				"eng-alpha/new-alpha": *utiltestingapi.MakeAdmission("eng-alpha").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()).Obj(),
 			},
 			wantInadmissibleLeft: map[kueue.ClusterQueueReference][]workload.Reference{
 				"eng-gamma": {"eng-gamma/new-gamma"},
@@ -1791,18 +1792,18 @@ func TestSchedule(t *testing.T) {
 		},
 		"partial admission single variable pod set": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 50).
+					PodSets(*utiltestingapi.MakePodSet("one", 50).
 						SetMinimumCount(20).
 						Request(corev1.ResourceCPU, "2").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 50).
+					PodSets(*utiltestingapi.MakePodSet("one", 50).
 						SetMinimumCount(20).
 						Request(corev1.ResourceCPU, "2").
 						Obj()).
@@ -1821,9 +1822,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("sales").
+						utiltestingapi.MakeAdmission("sales").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "default", "50").
 									Count(25).
 									Obj(),
@@ -1836,7 +1837,7 @@ func TestSchedule(t *testing.T) {
 				"sales/new": {
 					ClusterQueue: "sales",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "default", "50000m").
 							Count(25).
 							Obj(),
@@ -1846,27 +1847,27 @@ func TestSchedule(t *testing.T) {
 		},
 		"partial admission single variable pod set, preempt first": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
 					Priority(4).
-					PodSets(*utiltesting.MakePodSet("one", 20).
+					PodSets(*utiltestingapi.MakePodSet("one", 20).
 						SetMinimumCount(10).
 						Request("example.com/gpu", "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("old", "eng-beta").
+				*utiltestingapi.MakeWorkload("old", "eng-beta").
 					Priority(-4).
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						Request("example.com/gpu", "1").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").PodSets(utiltesting.MakePodSetAssignment("one").Assignment("example.com/gpu", "model-a", "10").Count(10).Obj()).Obj(), now).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment("example.com/gpu", "model-a", "10").Count(10).Obj()).Obj(), now).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
 					Priority(4).
-					PodSets(*utiltesting.MakePodSet("one", 20).
+					PodSets(*utiltestingapi.MakePodSet("one", 20).
 						SetMinimumCount(10).
 						Request("example.com/gpu", "1").
 						Obj()).
@@ -1884,19 +1885,19 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("old", "eng-beta").
+				*utiltestingapi.MakeWorkload("old", "eng-beta").
 					Priority(-4).
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						Request("example.com/gpu", "1").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").PodSets(utiltesting.MakePodSetAssignment("one").Assignment("example.com/gpu", "model-a", "10").Count(10).Obj()).Obj(), now).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment("example.com/gpu", "model-a", "10").Count(10).Obj()).Obj(), now).
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
 				"eng-beta/old": {
 					ClusterQueue: "eng-beta",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment("example.com/gpu", "model-a", "10").
 							Count(10).
 							Obj(),
@@ -1910,27 +1911,27 @@ func TestSchedule(t *testing.T) {
 		},
 		"partial admission single variable pod set, preempt with partial admission": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
 					Priority(4).
-					PodSets(*utiltesting.MakePodSet("one", 30).
+					PodSets(*utiltestingapi.MakePodSet("one", 30).
 						SetMinimumCount(10).
 						Request("example.com/gpu", "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("old", "eng-beta").
+				*utiltestingapi.MakeWorkload("old", "eng-beta").
 					Priority(-4).
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						Request("example.com/gpu", "1").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").PodSets(utiltesting.MakePodSetAssignment("one").Assignment("example.com/gpu", "model-a", "10").Count(10).Obj()).Obj(), now).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment("example.com/gpu", "model-a", "10").Count(10).Obj()).Obj(), now).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "eng-beta").
+				*utiltestingapi.MakeWorkload("new", "eng-beta").
 					Queue("main").
 					Priority(4).
-					PodSets(*utiltesting.MakePodSet("one", 30).
+					PodSets(*utiltestingapi.MakePodSet("one", 30).
 						SetMinimumCount(10).
 						Request("example.com/gpu", "1").
 						Obj()).
@@ -1948,19 +1949,19 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("old", "eng-beta").
+				*utiltestingapi.MakeWorkload("old", "eng-beta").
 					Priority(-4).
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						Request("example.com/gpu", "1").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").PodSets(utiltesting.MakePodSetAssignment("one").Assignment("example.com/gpu", "model-a", "10").Count(10).Obj()).Obj(), now).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment("example.com/gpu", "model-a", "10").Count(10).Obj()).Obj(), now).
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
 				"eng-beta/old": {
 					ClusterQueue: "eng-beta",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment("example.com/gpu", "model-a", "10").
 							Count(10).
 							Obj(),
@@ -1974,17 +1975,17 @@ func TestSchedule(t *testing.T) {
 		},
 		"partial admission multiple variable pod sets": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
 					PodSets(
-						*utiltesting.MakePodSet("one", 20).
+						*utiltestingapi.MakePodSet("one", 20).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("two", 30).
+						*utiltestingapi.MakePodSet("two", 30).
 							SetMinimumCount(10).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("three", 15).
+						*utiltestingapi.MakePodSet("three", 15).
 							SetMinimumCount(5).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
@@ -1992,17 +1993,17 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
 					PodSets(
-						*utiltesting.MakePodSet("one", 20).
+						*utiltestingapi.MakePodSet("one", 20).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("two", 30).
+						*utiltestingapi.MakePodSet("two", 30).
 							SetMinimumCount(10).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("three", 15).
+						*utiltestingapi.MakePodSet("three", 15).
 							SetMinimumCount(5).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
@@ -2022,17 +2023,17 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("sales").
+						utiltestingapi.MakeAdmission("sales").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "default", "20").
 									Count(20).
 									Obj(),
-								utiltesting.MakePodSetAssignment("two").
+								utiltestingapi.MakePodSetAssignment("two").
 									Assignment(corev1.ResourceCPU, "default", "20").
 									Count(20).
 									Obj(),
-								utiltesting.MakePodSetAssignment("three").
+								utiltestingapi.MakePodSetAssignment("three").
 									Assignment(corev1.ResourceCPU, "default", "10").
 									Count(10).
 									Obj(),
@@ -2045,15 +2046,15 @@ func TestSchedule(t *testing.T) {
 				"sales/new": {
 					ClusterQueue: "sales",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "default", "20000m").
 							Count(20).
 							Obj(),
-						utiltesting.MakePodSetAssignment("two").
+						utiltestingapi.MakePodSetAssignment("two").
 							Assignment(corev1.ResourceCPU, "default", "20000m").
 							Count(20).
 							Obj(),
-						utiltesting.MakePodSetAssignment("three").
+						utiltestingapi.MakePodSetAssignment("three").
 							Assignment(corev1.ResourceCPU, "default", "10000m").
 							Count(10).
 							Obj(),
@@ -2063,17 +2064,17 @@ func TestSchedule(t *testing.T) {
 		},
 		"partial admission disabled, multiple variable pod sets": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
 					PodSets(
-						*utiltesting.MakePodSet("one", 20).
+						*utiltestingapi.MakePodSet("one", 20).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("two", 30).
+						*utiltestingapi.MakePodSet("two", 30).
 							SetMinimumCount(10).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("three", 15).
+						*utiltestingapi.MakePodSet("three", 15).
 							SetMinimumCount(5).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
@@ -2081,17 +2082,17 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
 					PodSets(
-						*utiltesting.MakePodSet("one", 20).
+						*utiltestingapi.MakePodSet("one", 20).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("two", 30).
+						*utiltestingapi.MakePodSet("two", 30).
 							SetMinimumCount(10).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
-						*utiltesting.MakePodSet("three", 15).
+						*utiltestingapi.MakePodSet("three", 15).
 							SetMinimumCount(5).
 							Request(corev1.ResourceCPU, "1").
 							Obj(),
@@ -2100,7 +2101,7 @@ func TestSchedule(t *testing.T) {
 						Type:               kueue.WorkloadQuotaReserved,
 						Status:             metav1.ConditionFalse,
 						Reason:             "Pending",
-						Message:            "couldn't assign flavors to pod set three: insufficient quota for cpu in flavor default, request > maximum capacity (65 > 50)",
+						Message:            "couldn't assign flavors to pod set three: insufficient quota for cpu in flavor default, previously considered podsets requests (50) + current podset request (15) > maximum capacity (50)",
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					ResourceRequests(
@@ -2136,28 +2137,28 @@ func TestSchedule(t *testing.T) {
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 				}
-				rg := *utiltesting.MakeFlavorQuotas("default").Resource("r1", "10", "10").Resource("r2", "10", "10").Obj()
-				cq1 := *utiltesting.MakeClusterQueue("cq1").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
-				cq2 := *utiltesting.MakeClusterQueue("cq2").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
-				cq3 := *utiltesting.MakeClusterQueue("cq3").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
+				rg := *utiltestingapi.MakeFlavorQuotas("default").Resource("r1", "10", "10").Resource("r2", "10", "10").Obj()
+				cq1 := *utiltestingapi.MakeClusterQueue("cq1").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
+				cq2 := *utiltestingapi.MakeClusterQueue("cq2").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
+				cq3 := *utiltestingapi.MakeClusterQueue("cq3").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
 				return []kueue.ClusterQueue{cq1, cq2, cq3}
 			}(),
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq1", "sales").ClusterQueue("cq1").Obj(),
-				*utiltesting.MakeLocalQueue("lq2", "sales").ClusterQueue("cq2").Obj(),
-				*utiltesting.MakeLocalQueue("lq3", "sales").ClusterQueue("cq3").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq1", "sales").ClusterQueue("cq1").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq2", "sales").ClusterQueue("cq2").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq3", "sales").ClusterQueue("cq3").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl1", "sales").Queue("lq1").Priority(-1).PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
+				*utiltestingapi.MakeWorkload("wl1", "sales").Queue("lq1").Priority(-1).PodSets(
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
 				).Obj(),
-				*utiltesting.MakeWorkload("wl2", "sales").Queue("lq2").Priority(-2).PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("r2", "16").Obj(),
+				*utiltestingapi.MakeWorkload("wl2", "sales").Queue("lq2").Priority(-2).PodSets(
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("r2", "16").Obj(),
 				).Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl1", "sales").Queue("lq1").Priority(-1).PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
+				*utiltestingapi.MakeWorkload("wl1", "sales").Queue("lq1").Priority(-1).PodSets(
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
 				).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadQuotaReserved,
@@ -2174,9 +2175,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq1").
+						utiltestingapi.MakeAdmission("cq1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment("r1", "default", "16").
 									Count(1).
 									Obj(),
@@ -2184,8 +2185,8 @@ func TestSchedule(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("wl2", "sales").Queue("lq2").Priority(-2).PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("r2", "16").Obj(),
+				*utiltestingapi.MakeWorkload("wl2", "sales").Queue("lq2").Priority(-2).PodSets(
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("r2", "16").Obj(),
 				).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadQuotaReserved,
@@ -2202,9 +2203,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq2").
+						utiltestingapi.MakeAdmission("cq2").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment("r2", "default", "16").
 									Count(1).
 									Obj(),
@@ -2214,13 +2215,13 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"sales/wl1": *utiltesting.MakeAdmission("cq1").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"sales/wl1": *utiltestingapi.MakeAdmission("cq1").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("r1", "default", "16").
 						Obj()).
 					Obj(),
-				"sales/wl2": *utiltesting.MakeAdmission("cq2").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"sales/wl2": *utiltestingapi.MakeAdmission("cq2").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("r2", "default", "16").
 						Obj()).
 					Obj(),
@@ -2232,28 +2233,28 @@ func TestSchedule(t *testing.T) {
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 				}
-				rg := *utiltesting.MakeFlavorQuotas("default").Resource("r1", "10", "10").Resource("r2", "10", "10").Obj()
-				cq1 := *utiltesting.MakeClusterQueue("cq1").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
-				cq2 := *utiltesting.MakeClusterQueue("cq2").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
-				cq3 := *utiltesting.MakeClusterQueue("cq3").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
+				rg := *utiltestingapi.MakeFlavorQuotas("default").Resource("r1", "10", "10").Resource("r2", "10", "10").Obj()
+				cq1 := *utiltestingapi.MakeClusterQueue("cq1").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
+				cq2 := *utiltestingapi.MakeClusterQueue("cq2").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
+				cq3 := *utiltestingapi.MakeClusterQueue("cq3").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
 				return []kueue.ClusterQueue{cq1, cq2, cq3}
 			}(),
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq1", "sales").ClusterQueue("cq1").Obj(),
-				*utiltesting.MakeLocalQueue("lq2", "sales").ClusterQueue("cq2").Obj(),
-				*utiltesting.MakeLocalQueue("lq3", "sales").ClusterQueue("cq3").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq1", "sales").ClusterQueue("cq1").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq2", "sales").ClusterQueue("cq2").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq3", "sales").ClusterQueue("cq3").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl1", "sales").Queue("lq1").Priority(-1).PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
+				*utiltestingapi.MakeWorkload("wl1", "sales").Queue("lq1").Priority(-1).PodSets(
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
 				).Obj(),
-				*utiltesting.MakeWorkload("wl2", "sales").Queue("lq2").Priority(-2).PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "14").Obj(),
+				*utiltestingapi.MakeWorkload("wl2", "sales").Queue("lq2").Priority(-2).PodSets(
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "14").Obj(),
 				).Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl1", "sales").Queue("lq1").Priority(-1).PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
+				*utiltestingapi.MakeWorkload("wl1", "sales").Queue("lq1").Priority(-1).PodSets(
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
 				).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadQuotaReserved,
@@ -2270,9 +2271,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq1").
+						utiltestingapi.MakeAdmission("cq1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment("r1", "default", "16").
 									Count(1).
 									Obj(),
@@ -2280,8 +2281,8 @@ func TestSchedule(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("wl2", "sales").Queue("lq2").Priority(-2).PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "14").Obj(),
+				*utiltestingapi.MakeWorkload("wl2", "sales").Queue("lq2").Priority(-2).PodSets(
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "14").Obj(),
 				).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadQuotaReserved,
@@ -2298,9 +2299,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq2").
+						utiltestingapi.MakeAdmission("cq2").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment("r1", "default", "14").
 									Count(1).
 									Obj(),
@@ -2310,13 +2311,13 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"sales/wl1": *utiltesting.MakeAdmission("cq1").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"sales/wl1": *utiltestingapi.MakeAdmission("cq1").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("r1", "default", "16").
 						Obj()).
 					Obj(),
-				"sales/wl2": *utiltesting.MakeAdmission("cq2").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"sales/wl2": *utiltestingapi.MakeAdmission("cq2").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("r1", "default", "14").
 						Obj()).
 					Obj(),
@@ -2328,28 +2329,28 @@ func TestSchedule(t *testing.T) {
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 				}
-				rg := *utiltesting.MakeFlavorQuotas("default").Resource("r1", "10", "10").Resource("r2", "10", "10").Obj()
-				cq1 := *utiltesting.MakeClusterQueue("cq1").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
-				cq2 := *utiltesting.MakeClusterQueue("cq2").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
-				cq3 := *utiltesting.MakeClusterQueue("cq3").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
+				rg := *utiltestingapi.MakeFlavorQuotas("default").Resource("r1", "10", "10").Resource("r2", "10", "10").Obj()
+				cq1 := *utiltestingapi.MakeClusterQueue("cq1").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
+				cq2 := *utiltestingapi.MakeClusterQueue("cq2").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
+				cq3 := *utiltestingapi.MakeClusterQueue("cq3").Cohort("co").Preemption(preemption).ResourceGroup(rg).Obj()
 				return []kueue.ClusterQueue{cq1, cq2, cq3}
 			}(),
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq1", "sales").ClusterQueue("cq1").Obj(),
-				*utiltesting.MakeLocalQueue("lq2", "sales").ClusterQueue("cq2").Obj(),
-				*utiltesting.MakeLocalQueue("lq3", "sales").ClusterQueue("cq3").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq1", "sales").ClusterQueue("cq1").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq2", "sales").ClusterQueue("cq2").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq3", "sales").ClusterQueue("cq3").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl1", "sales").Queue("lq1").Priority(-1).PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
+				*utiltestingapi.MakeWorkload("wl1", "sales").Queue("lq1").Priority(-1).PodSets(
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
 				).Obj(),
-				*utiltesting.MakeWorkload("wl2", "sales").Queue("lq2").Priority(-2).PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
+				*utiltestingapi.MakeWorkload("wl2", "sales").Queue("lq2").Priority(-2).PodSets(
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
 				).Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("wl1", "sales").Queue("lq1").Priority(-1).PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
+				*utiltestingapi.MakeWorkload("wl1", "sales").Queue("lq1").Priority(-1).PodSets(
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
 				).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadQuotaReserved,
@@ -2366,9 +2367,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq1").
+						utiltestingapi.MakeAdmission("cq1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment("r1", "default", "16").
 									Count(1).
 									Obj(),
@@ -2376,8 +2377,8 @@ func TestSchedule(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("wl2", "sales").Queue("lq2").Priority(-2).PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
+				*utiltestingapi.MakeWorkload("wl2", "sales").Queue("lq2").Priority(-2).PodSets(
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request("r1", "16").Obj(),
 				).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadQuotaReserved,
@@ -2395,8 +2396,8 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"sales/wl1": *utiltesting.MakeAdmission("cq1").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"sales/wl1": *utiltestingapi.MakeAdmission("cq1").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("r1", "default", "16").
 						Obj()).
 					Obj(),
@@ -2407,12 +2408,12 @@ func TestSchedule(t *testing.T) {
 		},
 		"preemption while borrowing, workload waiting for preemption should not block a borrowing workload in another CQ": {
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cq_shared").
+				*utiltestingapi.MakeClusterQueue("cq_shared").
 					Cohort("preemption-while-borrowing").
-					ResourceGroup(*utiltesting.MakeFlavorQuotas("default").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").
 						Resource(corev1.ResourceCPU, "4", "0").Obj()).
 					Obj(),
-				*utiltesting.MakeClusterQueue("cq_a").
+				*utiltestingapi.MakeClusterQueue("cq_a").
 					Cohort("preemption-while-borrowing").
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
@@ -2421,11 +2422,11 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "0", "3").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("cq_b").
+				*utiltestingapi.MakeClusterQueue("cq_b").
 					Cohort("preemption-while-borrowing").
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
@@ -2434,40 +2435,40 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq_a", "eng-alpha").ClusterQueue("cq_a").Obj(),
-				*utiltesting.MakeLocalQueue("lq_b", "eng-beta").ClusterQueue("cq_b").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq_a", "eng-alpha").ClusterQueue("cq_a").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq_b", "eng-beta").ClusterQueue("cq_b").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a", "eng-alpha").
 					Queue("lq_a").
 					Creation(now.Add(time.Second)).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						Request(corev1.ResourceCPU, "3").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b", "eng-beta").
+				*utiltestingapi.MakeWorkload("b", "eng-beta").
 					Queue("lq_b").
 					Creation(now.Add(2 * time.Second)).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_a", "eng-alpha").
+				*utiltestingapi.MakeWorkload("admitted_a", "eng-alpha").
 					Queue("lq_a").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 							Request(corev1.ResourceCPU, "2").
 							Obj(),
 					).
-					ReserveQuotaAt(utiltesting.MakeAdmission("cq_a").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("cq_a").
 						PodSets(
-							utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+							utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2").
 								Obj(),
 						).
@@ -2475,10 +2476,10 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a", "eng-alpha").
 					Queue("lq_a").
 					Creation(now.Add(time.Second)).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						Request(corev1.ResourceCPU, "3").
 						Obj()).
 					Condition(metav1.Condition{
@@ -2495,25 +2496,25 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("admitted_a", "eng-alpha").
+				*utiltestingapi.MakeWorkload("admitted_a", "eng-alpha").
 					Queue("lq_a").
 					PodSets(
-						*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 							Request(corev1.ResourceCPU, "2").
 							Obj(),
 					).
-					ReserveQuotaAt(utiltesting.MakeAdmission("cq_a").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("cq_a").
 						PodSets(
-							utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+							utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "default", "2").
 								Obj(),
 						).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b", "eng-beta").
+				*utiltestingapi.MakeWorkload("b", "eng-beta").
 					Queue("lq_b").
 					Creation(now.Add(2 * time.Second)).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -2531,9 +2532,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq_b").
+						utiltestingapi.MakeAdmission("cq_b").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment(corev1.ResourceCPU, "default", "1").
 									Count(1).
 									Obj(),
@@ -2546,7 +2547,7 @@ func TestSchedule(t *testing.T) {
 				"eng-alpha/admitted_a": {
 					ClusterQueue: "cq_a",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").
 							Obj(),
 					},
@@ -2554,7 +2555,7 @@ func TestSchedule(t *testing.T) {
 				"eng-beta/b": {
 					ClusterQueue: "cq_b",
 					PodSetAssignments: []kueue.PodSetAssignment{
-						utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+						utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").
 							Obj(),
 					},
@@ -2567,57 +2568,57 @@ func TestSchedule(t *testing.T) {
 		"with fair sharing: schedule workload with lowest share first": {
 			enableFairSharing: true,
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("eng-shared").
+				*utiltestingapi.MakeClusterQueue("eng-shared").
 					Cohort("eng").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "10", "0").Obj(),
 					).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("all_nominal", "eng-alpha").
+				*utiltestingapi.MakeWorkload("all_nominal", "eng-alpha").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 50).
+					PodSets(*utiltestingapi.MakePodSet("one", 50).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-alpha").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "50").Count(50).Obj()).Obj(), now).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-alpha").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "50").Count(50).Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("borrowing", "eng-beta").
+				*utiltestingapi.MakeWorkload("borrowing", "eng-beta").
 					Queue("main").
 					// Use half of shared quota.
-					PodSets(*utiltesting.MakePodSet("one", 55).
+					PodSets(*utiltestingapi.MakePodSet("one", 55).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "55").Count(55).Obj()).Obj(), now).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "55").Count(55).Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("older_new", "eng-beta").
+				*utiltestingapi.MakeWorkload("older_new", "eng-beta").
 					Queue("main").
 					Creation(now.Add(-time.Minute)).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
 					Creation(now).
-					PodSets(*utiltesting.MakePodSet("one", 5).
+					PodSets(*utiltestingapi.MakePodSet("one", 5).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("all_nominal", "eng-alpha").
+				*utiltestingapi.MakeWorkload("all_nominal", "eng-alpha").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 50).
+					PodSets(*utiltestingapi.MakePodSet("one", 50).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-alpha").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "50").Count(50).Obj()).Obj(), now).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-alpha").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "50").Count(50).Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("main").
 					Creation(now).
-					PodSets(*utiltesting.MakePodSet("one", 5).
+					PodSets(*utiltestingapi.MakePodSet("one", 5).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -2635,9 +2636,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-alpha").
+						utiltestingapi.MakeAdmission("eng-alpha").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "on-demand", "5").
 									Count(5).
 									Obj(),
@@ -2645,18 +2646,18 @@ func TestSchedule(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("borrowing", "eng-beta").
+				*utiltestingapi.MakeWorkload("borrowing", "eng-beta").
 					Queue("main").
 					// Use half of shared quota.
-					PodSets(*utiltesting.MakePodSet("one", 55).
+					PodSets(*utiltestingapi.MakePodSet("one", 55).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-beta").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "55").Count(55).Obj()).Obj(), now).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-beta").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "55").Count(55).Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("older_new", "eng-beta").
+				*utiltestingapi.MakeWorkload("older_new", "eng-beta").
 					Queue("main").
 					Creation(now.Add(-time.Minute)).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -2675,9 +2676,9 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/all_nominal": *utiltesting.MakeAdmission("eng-alpha").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "50").Count(50).Obj()).Obj(),
-				"eng-beta/borrowing":    *utiltesting.MakeAdmission("eng-beta").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "55").Count(55).Obj()).Obj(),
-				"eng-alpha/new":         *utiltesting.MakeAdmission("eng-alpha").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "5").Count(5).Obj()).Obj(),
+				"eng-alpha/all_nominal": *utiltestingapi.MakeAdmission("eng-alpha").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "50").Count(50).Obj()).Obj(),
+				"eng-beta/borrowing":    *utiltestingapi.MakeAdmission("eng-beta").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "55").Count(55).Obj()).Obj(),
+				"eng-alpha/new":         *utiltestingapi.MakeAdmission("eng-alpha").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "on-demand", "5").Count(5).Obj()).Obj(),
 			},
 			wantLeft: map[kueue.ClusterQueueReference][]workload.Reference{
 				"eng-beta": {"eng-beta/older_new"},
@@ -2716,120 +2717,120 @@ func TestSchedule(t *testing.T) {
 		"hierarchical fair sharing schedule workload which wins tournament": {
 			enableFairSharing: true,
 			cohorts: []kueue.Cohort{
-				*utiltesting.MakeCohort("A").
+				*utiltestingapi.MakeCohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "200").Obj(),
 					).Obj(),
-				*utiltesting.MakeCohort("B").Parent("A").Obj(),
-				*utiltesting.MakeCohort("C").Parent("A").Obj(),
+				*utiltestingapi.MakeCohort("B").Parent("A").Obj(),
+				*utiltestingapi.MakeCohort("C").Parent("A").Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("d").
+				*utiltestingapi.MakeClusterQueue("d").
 					Cohort("B").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("e").
+				*utiltestingapi.MakeClusterQueue("e").
 					Cohort("B").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("f").
+				*utiltestingapi.MakeClusterQueue("f").
 					Cohort("C").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("g").
+				*utiltestingapi.MakeClusterQueue("g").
 					Cohort("C").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq-d", "eng-alpha").ClusterQueue("d").Obj(),
-				*utiltesting.MakeLocalQueue("lq-e", "eng-alpha").ClusterQueue("e").Obj(),
-				*utiltesting.MakeLocalQueue("lq-f", "eng-alpha").ClusterQueue("f").Obj(),
-				*utiltesting.MakeLocalQueue("lq-g", "eng-alpha").ClusterQueue("g").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-d", "eng-alpha").ClusterQueue("d").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-e", "eng-alpha").ClusterQueue("e").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-f", "eng-alpha").ClusterQueue("f").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-g", "eng-alpha").ClusterQueue("g").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("d0", "eng-alpha").
+				*utiltestingapi.MakeWorkload("d0", "eng-alpha").
 					Queue("lq-d").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("d", "one").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("d", "one").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "10").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("e0", "eng-alpha").
+				*utiltestingapi.MakeWorkload("e0", "eng-alpha").
 					Queue("lq-e").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "20").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("e", "one").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("e", "one").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "20").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("g0", "eng-alpha").
+				*utiltestingapi.MakeWorkload("g0", "eng-alpha").
 					Queue("lq-g").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "100").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("g", "one").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("g", "one").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "100").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("d1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("d1", "eng-alpha").
 					Queue("lq-d").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "70").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("e1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("e1", "eng-alpha").
 					Queue("lq-e").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "61").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("f1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("f1", "eng-alpha").
 					Queue("lq-f").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("g1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("g1", "eng-alpha").
 					Queue("lq-g").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("d0", "eng-alpha").
+				*utiltestingapi.MakeWorkload("d0", "eng-alpha").
 					Queue("lq-d").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("d", "one").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("d", "one").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "10").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("d1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("d1", "eng-alpha").
 					Queue("lq-d").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "70").
 						Obj()).
 					Condition(metav1.Condition{
@@ -2847,9 +2848,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("d").
+						utiltestingapi.MakeAdmission("d").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "on-demand", "70").
 									Count(1).
 									Obj(),
@@ -2857,20 +2858,20 @@ func TestSchedule(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("e0", "eng-alpha").
+				*utiltestingapi.MakeWorkload("e0", "eng-alpha").
 					Queue("lq-e").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "20").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("e", "one").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("e", "one").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "20").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("e1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("e1", "eng-alpha").
 					Queue("lq-e").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "61").
 						Obj()).
 					Condition(metav1.Condition{
@@ -2887,9 +2888,9 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("f1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("f1", "eng-alpha").
 					Queue("lq-f").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -2906,20 +2907,20 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("g0", "eng-alpha").
+				*utiltestingapi.MakeWorkload("g0", "eng-alpha").
 					Queue("lq-g").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "100").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("g", "one").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("g", "one").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "100").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("g1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("g1", "eng-alpha").
 					Queue("lq-g").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Condition(metav1.Condition{
@@ -2938,23 +2939,23 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/d0": *utiltesting.MakeAdmission("d", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/d0": *utiltestingapi.MakeAdmission("d", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "10").
 						Obj()).
 					Obj(),
-				"eng-alpha/e0": *utiltesting.MakeAdmission("e", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/e0": *utiltestingapi.MakeAdmission("e", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
-				"eng-alpha/g0": *utiltesting.MakeAdmission("g", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/g0": *utiltestingapi.MakeAdmission("g", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "100").
 						Obj()).
 					Obj(),
-				"eng-alpha/d1": *utiltesting.MakeAdmission("d", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/d1": *utiltestingapi.MakeAdmission("d", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "70").
 						Obj()).
 					Obj(),
@@ -2973,70 +2974,70 @@ func TestSchedule(t *testing.T) {
 		"fair sharing schedule workload with lowest drf after admission": {
 			enableFairSharing: true,
 			cohorts: []kueue.Cohort{
-				*utiltesting.MakeCohort("A").
+				*utiltestingapi.MakeCohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "100").Obj(),
 					).Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("b").
+				*utiltestingapi.MakeClusterQueue("b").
 					Cohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("c").
+				*utiltestingapi.MakeClusterQueue("c").
 					Cohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq-b", "eng-alpha").ClusterQueue("b").Obj(),
-				*utiltesting.MakeLocalQueue("lq-c", "eng-alpha").ClusterQueue("c").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-b", "eng-alpha").ClusterQueue("b").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-c", "eng-alpha").ClusterQueue("c").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("b0", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b0", "eng-alpha").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("b", "one").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("b", "one").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "10").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b1", "eng-alpha").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "50").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("c1", "eng-alpha").
 					Queue("lq-c").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "75").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("b0", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b0", "eng-alpha").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("b", "one").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("b", "one").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "10").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b1", "eng-alpha").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "50").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3054,9 +3055,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("b").
+						utiltestingapi.MakeAdmission("b").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "on-demand", "50").
 									Count(1).
 									Obj(),
@@ -3064,9 +3065,9 @@ func TestSchedule(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("c1", "eng-alpha").
 					Queue("lq-c").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "75").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3085,13 +3086,13 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/b0": *utiltesting.MakeAdmission("b", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/b0": *utiltestingapi.MakeAdmission("b", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "10").
 						Obj()).
 					Obj(),
-				"eng-alpha/b1": *utiltesting.MakeAdmission("b", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/b1": *utiltestingapi.MakeAdmission("b", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "50").
 						Obj()).
 					Obj(),
@@ -3108,14 +3109,14 @@ func TestSchedule(t *testing.T) {
 		"fair sharing two queues with weight 0 schedules workload which borrows less": {
 			enableFairSharing: true,
 			cohorts: []kueue.Cohort{
-				*utiltesting.MakeCohort("A").
+				*utiltestingapi.MakeCohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "8").Obj(),
 					).Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("b").
+				*utiltestingapi.MakeClusterQueue("b").
 					FairWeight(resource.MustParse("0")).
 					Cohort("A").
 					Preemption(kueue.ClusterQueuePreemption{
@@ -3123,10 +3124,10 @@ func TestSchedule(t *testing.T) {
 						WithinClusterQueue:  kueue.PreemptionPolicyNever,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("c").
+				*utiltestingapi.MakeClusterQueue("c").
 					FairWeight(resource.MustParse("0")).
 					Cohort("A").
 					Preemption(kueue.ClusterQueuePreemption{
@@ -3134,59 +3135,59 @@ func TestSchedule(t *testing.T) {
 						WithinClusterQueue:  kueue.PreemptionPolicyNever,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq-b", "eng-alpha").ClusterQueue("b").Obj(),
-				*utiltesting.MakeLocalQueue("lq-c", "eng-alpha").ClusterQueue("c").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-b", "eng-alpha").ClusterQueue("b").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-c", "eng-alpha").ClusterQueue("c").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("b0", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b0", "eng-alpha").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("b", "one").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("b", "one").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "4").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b1", "eng-alpha").
 					Queue("lq-b").
 					// high priority for tiebreak
 					Priority(9001).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("c1", "eng-alpha").
 					Priority(0).
 					Queue("lq-c").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("b0", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b0", "eng-alpha").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("b", "one").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("b", "one").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "4").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b1", "eng-alpha").
 					Queue("lq-b").
 					// high priority for tiebreak
 					Priority(9001).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3203,10 +3204,10 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("c1", "eng-alpha").
 					Priority(0).
 					Queue("lq-c").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3224,9 +3225,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("c").
+						utiltestingapi.MakeAdmission("c").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "on-demand", "4").
 									Count(1).
 									Obj(),
@@ -3236,13 +3237,13 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/b0": *utiltesting.MakeAdmission("b", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/b0": *utiltestingapi.MakeAdmission("b", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "4").
 						Obj()).
 					Obj(),
-				"eng-alpha/c1": *utiltesting.MakeAdmission("c", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/c1": *utiltestingapi.MakeAdmission("c", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "4").
 						Obj()).
 					Obj(),
@@ -3260,14 +3261,14 @@ func TestSchedule(t *testing.T) {
 		"fair sharing two queues with high weight schedules workload which borrows less": {
 			enableFairSharing: true,
 			cohorts: []kueue.Cohort{
-				*utiltesting.MakeCohort("A").
+				*utiltestingapi.MakeCohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "8").Obj(),
 					).Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("b").
+				*utiltestingapi.MakeClusterQueue("b").
 					FairWeight(resource.MustParse("123456789")).
 					Cohort("A").
 					Preemption(kueue.ClusterQueuePreemption{
@@ -3275,10 +3276,10 @@ func TestSchedule(t *testing.T) {
 						WithinClusterQueue:  kueue.PreemptionPolicyNever,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("c").
+				*utiltestingapi.MakeClusterQueue("c").
 					FairWeight(resource.MustParse("123456789")).
 					Cohort("A").
 					Preemption(kueue.ClusterQueuePreemption{
@@ -3286,57 +3287,57 @@ func TestSchedule(t *testing.T) {
 						WithinClusterQueue:  kueue.PreemptionPolicyNever,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq-b", "eng-alpha").ClusterQueue("b").Obj(),
-				*utiltesting.MakeLocalQueue("lq-c", "eng-alpha").ClusterQueue("c").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-b", "eng-alpha").ClusterQueue("b").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-c", "eng-alpha").ClusterQueue("c").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("b0", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b0", "eng-alpha").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("b", "one").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("b", "one").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "4").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b1", "eng-alpha").
 					Queue("lq-b").
 					Priority(9001).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("c1", "eng-alpha").
 					Priority(0).
 					Queue("lq-c").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("b0", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b0", "eng-alpha").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("b", "one").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("b", "one").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "on-demand", "4").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b1", "eng-alpha").
 					Queue("lq-b").
 					Priority(9001).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3353,10 +3354,10 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("c1", "eng-alpha").
 					Priority(0).
 					Queue("lq-c").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3374,9 +3375,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("c").
+						utiltestingapi.MakeAdmission("c").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "on-demand", "4").
 									Count(1).
 									Obj(),
@@ -3386,13 +3387,13 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/b0": *utiltesting.MakeAdmission("b", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/b0": *utiltestingapi.MakeAdmission("b", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "4").
 						Obj()).
 					Obj(),
-				"eng-alpha/c1": *utiltesting.MakeAdmission("c", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/c1": *utiltestingapi.MakeAdmission("c", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "4").
 						Obj()).
 					Obj(),
@@ -3416,64 +3417,64 @@ func TestSchedule(t *testing.T) {
 		"fair sharing schedule singleton cqs and cq without cohort": {
 			enableFairSharing: true,
 			cohorts: []kueue.Cohort{
-				*utiltesting.MakeCohort("A").
+				*utiltestingapi.MakeCohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "10").Obj(),
 					).Obj(),
-				*utiltesting.MakeCohort("B").Obj(),
+				*utiltestingapi.MakeCohort("B").Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("a").
+				*utiltestingapi.MakeClusterQueue("a").
 					Cohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("b").
+				*utiltestingapi.MakeClusterQueue("b").
 					Cohort("B").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "10").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("c").
+				*utiltestingapi.MakeClusterQueue("c").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "10").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq-a", "eng-alpha").ClusterQueue("a").Obj(),
-				*utiltesting.MakeLocalQueue("lq-b", "eng-alpha").ClusterQueue("b").Obj(),
-				*utiltesting.MakeLocalQueue("lq-c", "eng-alpha").ClusterQueue("c").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-a", "eng-alpha").ClusterQueue("a").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-b", "eng-alpha").ClusterQueue("b").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-c", "eng-alpha").ClusterQueue("c").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Queue("lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b1", "eng-alpha").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("c1", "eng-alpha").
 					Queue("lq-c").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Queue("lq-a").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3491,9 +3492,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("a").
+						utiltestingapi.MakeAdmission("a").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "on-demand", "10").
 									Count(1).
 									Obj(),
@@ -3501,9 +3502,9 @@ func TestSchedule(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b1", "eng-alpha").
 					Queue("lq-b").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3521,9 +3522,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("b").
+						utiltestingapi.MakeAdmission("b").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "on-demand", "10").
 									Count(1).
 									Obj(),
@@ -3531,9 +3532,9 @@ func TestSchedule(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("c1", "eng-alpha").
 					Queue("lq-c").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3551,9 +3552,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("c").
+						utiltestingapi.MakeAdmission("c").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "on-demand", "10").
 									Count(1).
 									Obj(),
@@ -3563,18 +3564,18 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1": *utiltesting.MakeAdmission("a", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/a1": *utiltestingapi.MakeAdmission("a", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "10").
 						Obj()).
 					Obj(),
-				"eng-alpha/b1": *utiltesting.MakeAdmission("b", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/b1": *utiltestingapi.MakeAdmission("b", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "10").
 						Obj()).
 					Obj(),
-				"eng-alpha/c1": *utiltesting.MakeAdmission("c", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/c1": *utiltestingapi.MakeAdmission("c", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "10").
 						Obj()).
 					Obj(),
@@ -3584,52 +3585,52 @@ func TestSchedule(t *testing.T) {
 		"fair sharing schedule highest priority first": {
 			enableFairSharing: true,
 			cohorts: []kueue.Cohort{
-				*utiltesting.MakeCohort("A").
+				*utiltestingapi.MakeCohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "10").Obj(),
 					).Obj(),
-				*utiltesting.MakeCohort("B").Obj(),
+				*utiltestingapi.MakeCohort("B").Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("b").
+				*utiltestingapi.MakeClusterQueue("b").
 					Cohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("c").
+				*utiltestingapi.MakeClusterQueue("c").
 					Cohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq-b", "eng-alpha").ClusterQueue("b").Obj(),
-				*utiltesting.MakeLocalQueue("lq-c", "eng-alpha").ClusterQueue("c").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-b", "eng-alpha").ClusterQueue("b").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-c", "eng-alpha").ClusterQueue("c").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("b1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b1", "eng-alpha").
 					Queue("lq-b").
 					Priority(99).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("c1", "eng-alpha").
 					Queue("lq-c").
 					Priority(101).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("b1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b1", "eng-alpha").
 					Queue("lq-b").
 					Priority(99).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3646,10 +3647,10 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("c1", "eng-alpha").
 					Queue("lq-c").
 					Priority(101).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3667,9 +3668,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("c").
+						utiltestingapi.MakeAdmission("c").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "on-demand", "10").
 									Count(1).
 									Obj(),
@@ -3679,8 +3680,8 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/c1": *utiltesting.MakeAdmission("c", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/c1": *utiltestingapi.MakeAdmission("c", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "10").
 						Obj()).
 					Obj(),
@@ -3692,55 +3693,55 @@ func TestSchedule(t *testing.T) {
 		"fair sharing schedule earliest timestamp first": {
 			enableFairSharing: true,
 			cohorts: []kueue.Cohort{
-				*utiltesting.MakeCohort("A").
+				*utiltestingapi.MakeCohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "10").Obj(),
 					).Obj(),
-				*utiltesting.MakeCohort("B").Obj(),
+				*utiltestingapi.MakeCohort("B").Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("b").
+				*utiltestingapi.MakeClusterQueue("b").
 					Cohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("c").
+				*utiltestingapi.MakeClusterQueue("c").
 					Cohort("A").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq-b", "eng-alpha").ClusterQueue("b").Obj(),
-				*utiltesting.MakeLocalQueue("lq-c", "eng-alpha").ClusterQueue("c").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-b", "eng-alpha").ClusterQueue("b").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-c", "eng-alpha").ClusterQueue("c").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("b1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b1", "eng-alpha").
 					Creation(now.Add(time.Second)).
 					Queue("lq-b").
 					Priority(101).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("c1", "eng-alpha").
 					Creation(now).
 					Queue("lq-c").
 					Priority(101).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("b1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("b1", "eng-alpha").
 					Creation(now.Add(time.Second)).
 					Queue("lq-b").
 					Priority(101).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3757,11 +3758,11 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("c1", "eng-alpha").
 					Creation(now).
 					Queue("lq-c").
 					Priority(101).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "10").
 						Obj()).
 					Condition(metav1.Condition{
@@ -3779,9 +3780,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("c").
+						utiltestingapi.MakeAdmission("c").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "on-demand", "10").
 									Count(1).
 									Obj(),
@@ -3791,8 +3792,8 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/c1": *utiltesting.MakeAdmission("c", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/c1": *utiltestingapi.MakeAdmission("c", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "on-demand", "10").
 						Obj()).
 					Obj(),
@@ -3803,136 +3804,136 @@ func TestSchedule(t *testing.T) {
 		},
 		"minimal preemptions when target queue is exhausted": {
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "2").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-beta").
+				*utiltestingapi.MakeClusterQueue("other-beta").
 					Cohort("other").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "2").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-gamma").
+				*utiltestingapi.MakeClusterQueue("other-gamma").
 					Cohort("other").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "2").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-gamma").ClusterQueue("other-gamma").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-gamma").ClusterQueue("other-gamma").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(-2).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a2", "eng-alpha").
 					Priority(-2).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("a3", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a3", "eng-alpha").
 					Priority(-1).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b2", "eng-beta").
+				*utiltestingapi.MakeWorkload("b2", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b3", "eng-beta").
+				*utiltestingapi.MakeWorkload("b3", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("incoming", "eng-alpha").
+				*utiltestingapi.MakeWorkload("incoming", "eng-alpha").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(-2).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a2", "eng-alpha").
 					Priority(-2).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("a3", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a3", "eng-alpha").
 					Priority(-1).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("incoming", "eng-alpha").
+				*utiltestingapi.MakeWorkload("incoming", "eng-alpha").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
@@ -3950,32 +3951,32 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b2", "eng-beta").
+				*utiltestingapi.MakeWorkload("b2", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b3", "eng-beta").
+				*utiltestingapi.MakeWorkload("b3", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
@@ -3986,33 +3987,33 @@ func TestSchedule(t *testing.T) {
 				"other-alpha": {"eng-alpha/incoming"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "1").
 						Obj()).
 					Obj(),
-				"eng-alpha/a2": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a2": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "1").
 						Obj()).
 					Obj(),
-				"eng-alpha/a3": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a3": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "1").
 						Obj()).
 					Obj(),
-				"eng-beta/b1": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b1": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "1").
 						Obj()).
 					Obj(),
-				"eng-beta/b2": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b2": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "1").
 						Obj()).
 					Obj(),
-				"eng-beta/b3": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b3": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "1").
 						Obj()).
 					Obj(),
@@ -4020,68 +4021,68 @@ func TestSchedule(t *testing.T) {
 		},
 		"A workload is only eligible to do preemptions if it fits fully within nominal quota": {
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "2").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-beta").
+				*utiltestingapi.MakeClusterQueue("other-beta").
 					Cohort("other").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "2").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(-1).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(-1).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("incoming", "eng-alpha").
+				*utiltestingapi.MakeWorkload("incoming", "eng-alpha").
 					Priority(1).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(-1).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("incoming", "eng-alpha").
+				*utiltestingapi.MakeWorkload("incoming", "eng-alpha").
 					Priority(1).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
@@ -4099,12 +4100,12 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(-1).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "1").
 							Obj()).
 						Obj(), now).
@@ -4114,13 +4115,13 @@ func TestSchedule(t *testing.T) {
 				"other-alpha": {"eng-alpha/incoming"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "1").
 						Obj()).
 					Obj(),
-				"eng-beta/b1": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b1": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "1").
 						Obj()).
 					Obj(),
@@ -4129,63 +4130,63 @@ func TestSchedule(t *testing.T) {
 		"with fair sharing: preempt workload from CQ with the highest share": {
 			enableFairSharing: true,
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("eng-gamma").
+				*utiltestingapi.MakeClusterQueue("eng-gamma").
 					Cohort("eng").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "50", "0").Obj(),
 					).
 					Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("all_spot", "eng-alpha").
+				*utiltestingapi.MakeWorkload("all_spot", "eng-alpha").
 					Request(corev1.ResourceCPU, "100").
 					SimpleReserveQuota("eng-alpha", "spot", now).Obj(),
-				*utiltesting.MakeWorkload("alpha1", "eng-alpha").UID("alpha1").
+				*utiltestingapi.MakeWorkload("alpha1", "eng-alpha").UID("alpha1").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-alpha", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("alpha2", "eng-alpha").UID("alpha2").
+				*utiltestingapi.MakeWorkload("alpha2", "eng-alpha").UID("alpha2").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-alpha", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("alpha3", "eng-alpha").UID("alpha3").
+				*utiltestingapi.MakeWorkload("alpha3", "eng-alpha").UID("alpha3").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-alpha", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("alpha4", "eng-alpha").UID("alpha4").
+				*utiltestingapi.MakeWorkload("alpha4", "eng-alpha").UID("alpha4").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-alpha", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("gamma1", "eng-gamma").UID("gamma1").
+				*utiltestingapi.MakeWorkload("gamma1", "eng-gamma").UID("gamma1").
 					Request(corev1.ResourceCPU, "10").
 					SimpleReserveQuota("eng-gamma", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("gamma2", "eng-gamma").UID("gamma2").
+				*utiltestingapi.MakeWorkload("gamma2", "eng-gamma").UID("gamma2").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-gamma", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("gamma3", "eng-gamma").UID("gamma3").
+				*utiltestingapi.MakeWorkload("gamma3", "eng-gamma").UID("gamma3").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-gamma", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("gamma4", "eng-gamma").UID("gamma4").
+				*utiltestingapi.MakeWorkload("gamma4", "eng-gamma").UID("gamma4").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-gamma", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-beta").
 					Queue("main").
 					Request(corev1.ResourceCPU, "30").Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("all_spot", "eng-alpha").
+				*utiltestingapi.MakeWorkload("all_spot", "eng-alpha").
 					Request(corev1.ResourceCPU, "100").
 					SimpleReserveQuota("eng-alpha", "spot", now).Obj(),
-				*utiltesting.MakeWorkload("alpha1", "eng-alpha").UID("alpha1").
+				*utiltestingapi.MakeWorkload("alpha1", "eng-alpha").UID("alpha1").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-alpha", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("alpha2", "eng-alpha").UID("alpha2").
+				*utiltestingapi.MakeWorkload("alpha2", "eng-alpha").UID("alpha2").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-alpha", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("alpha3", "eng-alpha").UID("alpha3").
+				*utiltestingapi.MakeWorkload("alpha3", "eng-alpha").UID("alpha3").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-alpha", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("alpha4", "eng-alpha").UID("alpha4").
+				*utiltestingapi.MakeWorkload("alpha4", "eng-alpha").UID("alpha4").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-alpha", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-beta").
 					Queue("main").
 					Request(corev1.ResourceCPU, "30").
 					Condition(metav1.Condition{
@@ -4202,16 +4203,16 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("gamma1", "eng-gamma").UID("gamma1").
+				*utiltestingapi.MakeWorkload("gamma1", "eng-gamma").UID("gamma1").
 					Request(corev1.ResourceCPU, "10").
 					SimpleReserveQuota("eng-gamma", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("gamma2", "eng-gamma").UID("gamma2").
+				*utiltestingapi.MakeWorkload("gamma2", "eng-gamma").UID("gamma2").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-gamma", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("gamma3", "eng-gamma").UID("gamma3").
+				*utiltestingapi.MakeWorkload("gamma3", "eng-gamma").UID("gamma3").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-gamma", "on-demand", now).Obj(),
-				*utiltesting.MakeWorkload("gamma4", "eng-gamma").UID("gamma4").
+				*utiltestingapi.MakeWorkload("gamma4", "eng-gamma").UID("gamma4").
 					Request(corev1.ResourceCPU, "20").
 					SimpleReserveQuota("eng-gamma", "on-demand", now).Obj(),
 			},
@@ -4221,48 +4222,48 @@ func TestSchedule(t *testing.T) {
 				"eng-beta": {"eng-beta/preemptor"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/all_spot": *utiltesting.MakeAdmission("eng-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/all_spot": *utiltestingapi.MakeAdmission("eng-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "spot", "100").
 						Obj()).
 					Obj(),
-				"eng-alpha/alpha1": *utiltesting.MakeAdmission("eng-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/alpha1": *utiltestingapi.MakeAdmission("eng-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
-				"eng-alpha/alpha2": *utiltesting.MakeAdmission("eng-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/alpha2": *utiltestingapi.MakeAdmission("eng-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
-				"eng-alpha/alpha3": *utiltesting.MakeAdmission("eng-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/alpha3": *utiltestingapi.MakeAdmission("eng-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
-				"eng-alpha/alpha4": *utiltesting.MakeAdmission("eng-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/alpha4": *utiltestingapi.MakeAdmission("eng-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
-				"eng-gamma/gamma1": *utiltesting.MakeAdmission("eng-gamma").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-gamma/gamma1": *utiltestingapi.MakeAdmission("eng-gamma").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "10").
 						Obj()).
 					Obj(),
-				"eng-gamma/gamma2": *utiltesting.MakeAdmission("eng-gamma").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-gamma/gamma2": *utiltestingapi.MakeAdmission("eng-gamma").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
-				"eng-gamma/gamma3": *utiltesting.MakeAdmission("eng-gamma").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-gamma/gamma3": *utiltestingapi.MakeAdmission("eng-gamma").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
-				"eng-gamma/gamma4": *utiltesting.MakeAdmission("eng-gamma").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-gamma/gamma4": *utiltestingapi.MakeAdmission("eng-gamma").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
@@ -4273,75 +4274,75 @@ func TestSchedule(t *testing.T) {
 			// multiple workloads are able to issue preemptions on workloads within
 			// their own CQs in a single scheduling cycle.
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "2").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-beta").
+				*utiltestingapi.MakeClusterQueue("other-beta").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "2").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-beta").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
@@ -4359,17 +4360,17 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-beta").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
@@ -4394,13 +4395,13 @@ func TestSchedule(t *testing.T) {
 				"other-beta":  {"eng-beta/preemptor"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "2").
 						Obj()).
 					Obj(),
-				"eng-beta/b1": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b1": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "2").
 						Obj()).
 					Obj(),
@@ -4415,55 +4416,55 @@ func TestSchedule(t *testing.T) {
 			// and another Preempt, the Fit workload doesn't block
 			// the preempting workload in the same cycle.
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "1").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-beta").
+				*utiltestingapi.MakeClusterQueue("other-beta").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "2").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("fit", "eng-alpha").
+				*utiltestingapi.MakeWorkload("fit", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-beta").
 					Priority(99).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("fit", "eng-alpha").
+				*utiltestingapi.MakeWorkload("fit", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "1").
@@ -4482,9 +4483,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("other-alpha").
+						utiltestingapi.MakeAdmission("other-alpha").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment(corev1.ResourceCPU, "default", "1").
 									Count(1).
 									Obj(),
@@ -4492,17 +4493,17 @@ func TestSchedule(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-beta").
 					Priority(99).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
@@ -4526,13 +4527,13 @@ func TestSchedule(t *testing.T) {
 				"other-beta": {"eng-beta/preemptor"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/fit": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/fit": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "1").
 						Obj()).
 					Obj(),
-				"eng-beta/b1": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b1": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "2").
 						Obj()).
 					Obj(),
@@ -4552,7 +4553,7 @@ func TestSchedule(t *testing.T) {
 			// Preempting workloads: request 6
 			// Cohort has capacity 5
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
@@ -4561,11 +4562,11 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "2").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-beta").
+				*utiltestingapi.MakeClusterQueue("other-beta").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
@@ -4574,66 +4575,66 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "2").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("resource-bank").
+				*utiltestingapi.MakeClusterQueue("resource-bank").
 					Cohort("other").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "1").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
 					Obj(),
-				*utiltesting.MakeWorkload("pretending-preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("pretending-preemptor", "eng-beta").
 					Priority(99).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
@@ -4651,17 +4652,17 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "2").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "2").
 							Obj()).
 						Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("pretending-preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("pretending-preemptor", "eng-beta").
 					Priority(99).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
@@ -4686,13 +4687,13 @@ func TestSchedule(t *testing.T) {
 				"other-beta":  {"eng-beta/pretending-preemptor"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "2").
 						Obj()).
 					Obj(),
-				"eng-beta/b1": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b1": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "2").
 						Obj()).
 					Obj(),
@@ -4707,105 +4708,105 @@ func TestSchedule(t *testing.T) {
 			// fair sharing enabled.
 			enableFairSharing: true,
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "2").
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-beta").
+				*utiltestingapi.MakeClusterQueue("other-beta").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "2").
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-gamma").
+				*utiltestingapi.MakeClusterQueue("other-gamma").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "2").
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("resource-bank").
+				*utiltestingapi.MakeClusterQueue("resource-bank").
 					Cohort("other").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "3").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-gamma").ClusterQueue("other-gamma").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-gamma").ClusterQueue("other-gamma").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "3").
 							Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "3").Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-gamma").
+				*utiltestingapi.MakeWorkload("c1", "eng-gamma").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-gamma").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-gamma").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "3").Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-beta").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-gamma").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-gamma").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "3").
 							Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
@@ -4823,15 +4824,15 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "3").Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-beta").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
@@ -4849,15 +4850,15 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-gamma").
+				*utiltestingapi.MakeWorkload("c1", "eng-gamma").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-gamma").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-gamma").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "3").Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-gamma").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-gamma").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
@@ -4883,14 +4884,14 @@ func TestSchedule(t *testing.T) {
 				"other-gamma": {"eng-gamma/preemptor"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "3").Obj()).Obj(),
-				"eng-beta/b1": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b1": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "3").Obj()).Obj(),
-				"eng-gamma/c1": *utiltesting.MakeAdmission("other-gamma").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-gamma/c1": *utiltestingapi.MakeAdmission("other-gamma").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "3").Obj()).Obj(),
 			},
 			wantSkippedPreemptions: map[string]int{
@@ -4910,86 +4911,89 @@ func TestSchedule(t *testing.T) {
 			// in the same cycle
 			enableFairSharing: true,
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
-						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
+						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
+						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "0").
 							Resource("alpha-resource", "1").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-beta").
+				*utiltestingapi.MakeClusterQueue("other-beta").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
-						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
+						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
+						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "0").
 							Resource("beta-resource", "1").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-gamma").
+				*utiltestingapi.MakeClusterQueue("other-gamma").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
-						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
+						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
+						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "0").
 							Resource("gamma-resource", "1").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("resource-bank").
+				*utiltestingapi.MakeClusterQueue("resource-bank").
 					Cohort("other").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "9").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-gamma").ClusterQueue("other-gamma").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-gamma").ClusterQueue("other-gamma").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(0).
 					Queue("other").
 					Request("alpha-resource", "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment("alpha-resource", "default", "1").
 							Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request("beta-resource", "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment("beta-resource", "default", "1").Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-gamma").
+				*utiltestingapi.MakeWorkload("c1", "eng-gamma").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "9").
 					Request("gamma-resource", "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-gamma").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-gamma").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "9").Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
 					Request("alpha-resource", "1").
 					Obj(),
-				*utiltesting.MakeWorkload("pretending-preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("pretending-preemptor", "eng-beta").
 					Priority(99).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
@@ -4997,16 +5001,16 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(0).
 					Queue("other").
 					Request("alpha-resource", "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment("alpha-resource", "default", "1").
 							Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
@@ -5026,15 +5030,15 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(0).
 					Queue("other").
 					Request("beta-resource", "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-beta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-beta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment("beta-resource", "default", "1").Obj()).Obj(), now).
 					Obj(),
-				*utiltesting.MakeWorkload("pretending-preemptor", "eng-beta").
+				*utiltestingapi.MakeWorkload("pretending-preemptor", "eng-beta").
 					Priority(99).
 					Queue("other").
 					Request(corev1.ResourceCPU, "3").
@@ -5054,13 +5058,13 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("c1", "eng-gamma").
+				*utiltestingapi.MakeWorkload("c1", "eng-gamma").
 					Priority(0).
 					Queue("other").
 					Request(corev1.ResourceCPU, "9").
 					Request("gamma-resource", "1").
-					ReserveQuotaAt(utiltesting.MakeAdmission("other-gamma").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("other-gamma").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "9").Obj()).Obj(), now).
 					Obj(),
 			},
@@ -5070,14 +5074,14 @@ func TestSchedule(t *testing.T) {
 				"other-beta":  {"eng-beta/pretending-preemptor"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("alpha-resource", "default", "1").Obj()).Obj(),
-				"eng-beta/b1": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b1": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("beta-resource", "default", "1").Obj()).Obj(),
-				"eng-gamma/c1": *utiltesting.MakeAdmission("other-gamma").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-gamma/c1": *utiltestingapi.MakeAdmission("other-gamma").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "9").Obj()).Obj(),
 			},
 			wantSkippedPreemptions: map[string]int{
@@ -5088,24 +5092,24 @@ func TestSchedule(t *testing.T) {
 		},
 		"not enough resources": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "100").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "100").
 						Obj()).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadQuotaReserved,
 						Status:             metav1.ConditionFalse,
 						Reason:             "Pending",
-						Message:            "couldn't assign flavors to pod set one: insufficient quota for cpu in flavor default, request > maximum capacity (100 > 50)",
+						Message:            "couldn't assign flavors to pod set one: insufficient quota for cpu in flavor default, previously considered podsets requests (0) + current podset request (100) > maximum capacity (50)",
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					ResourceRequests(kueue.PodSetRequest{
@@ -5122,17 +5126,17 @@ func TestSchedule(t *testing.T) {
 		},
 		"container does not satisfy limitRange constraints": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "500m").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "500m").
 						Obj()).
 					Condition(metav1.Condition{
@@ -5174,18 +5178,18 @@ func TestSchedule(t *testing.T) {
 		},
 		"container resource requests exceed limits": {
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "200m").
 						Limit(corev1.ResourceCPU, "100m").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "200m").
 						Limit(corev1.ResourceCPU, "100m").
 						Obj()).
@@ -5222,24 +5226,24 @@ func TestSchedule(t *testing.T) {
 		"not enough resources with fair sharing enabled": {
 			enableFairSharing: true,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "100").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "sales").
+				*utiltestingapi.MakeWorkload("new", "sales").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "100").
 						Obj()).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadQuotaReserved,
 						Status:             metav1.ConditionFalse,
 						Reason:             "Pending",
-						Message:            "couldn't assign flavors to pod set one: insufficient quota for cpu in flavor default, request > maximum capacity (100 > 50)",
+						Message:            "couldn't assign flavors to pod set one: insufficient quota for cpu in flavor default, previously considered podsets requests (0) + current podset request (100) > maximum capacity (50)",
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					ResourceRequests(kueue.PodSetRequest{
@@ -5260,60 +5264,60 @@ func TestSchedule(t *testing.T) {
 			// is borrowing from CQ.
 			// Flavor 2 is a better assignment, so we preempt in it.
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "10").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "10").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-beta").
+				*utiltestingapi.MakeClusterQueue("other-beta").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-alpha", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-beta", "spot", now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request("gpu", "6").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-alpha", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request("gpu", "6").
@@ -5331,7 +5335,7 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
@@ -5343,13 +5347,13 @@ func TestSchedule(t *testing.T) {
 				"other-alpha": {"eng-alpha/preemptor"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "5").
 						Obj()).
 					Obj(),
-				"eng-beta/b1": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b1": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "spot", "5").
 						Obj()).
 					Obj(),
@@ -5363,56 +5367,56 @@ func TestSchedule(t *testing.T) {
 			// priority-based preemption.
 			enableFairSharing: true,
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "7").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "7").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "7").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "7").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-beta").
+				*utiltestingapi.MakeClusterQueue("other-beta").
 					Cohort("other").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "3").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "3").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "3").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "3").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-alpha", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-beta", "spot", now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request("gpu", "8").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-alpha", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request("gpu", "8").
@@ -5430,7 +5434,7 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
@@ -5442,13 +5446,13 @@ func TestSchedule(t *testing.T) {
 				"other-alpha": {"eng-alpha/preemptor"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "5").
 						Obj()).
 					Obj(),
-				"eng-beta/b1": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b1": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "spot", "5").
 						Obj()).
 					Obj(),
@@ -5459,68 +5463,68 @@ func TestSchedule(t *testing.T) {
 			// Flavor 2, spot, requires preemption of workload in Cohort and CQ
 			// Since Flavor 2 doesn't improve the assignment, we prefer Flavor 1.
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "10").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "10").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-beta").
+				*utiltestingapi.MakeClusterQueue("other-beta").
 					Cohort("other").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-alpha", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a2", "eng-alpha").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-alpha", "spot", now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-beta", "spot", now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request("gpu", "6").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-alpha", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a2", "eng-alpha").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-alpha", "spot", now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request("gpu", "6").
@@ -5538,7 +5542,7 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
@@ -5550,18 +5554,18 @@ func TestSchedule(t *testing.T) {
 				"other-alpha": {"eng-alpha/preemptor"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "5").
 						Obj()).
 					Obj(),
-				"eng-alpha/a2": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a2": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "spot", "5").
 						Obj()).
 					Obj(),
-				"eng-beta/b1": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b1": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "spot", "5").
 						Obj()).
 					Obj(),
@@ -5573,69 +5577,69 @@ func TestSchedule(t *testing.T) {
 			// since the borrowing workload in Cohort is too high priority.
 			// Therefore, we choose Flavor 1.
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("other-alpha").
+				*utiltestingapi.MakeClusterQueue("other-alpha").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "10").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "10").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("other-beta").
+				*utiltestingapi.MakeClusterQueue("other-beta").
 					Cohort("other").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
-				*utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(),
+				*utiltestingapi.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "6").
 					SimpleReserveQuota("other-alpha", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a2", "eng-alpha").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-alpha", "spot", now).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					// b1 is too high priority for preemptor.
 					Priority(9001).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-beta", "spot", now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request("gpu", "5").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1", "eng-alpha").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "6").
 					SimpleReserveQuota("other-alpha", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a2", "eng-alpha").
 					Priority(50).
 					Queue("other").
 					Request("gpu", "5").
 					SimpleReserveQuota("other-alpha", "spot", now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "eng-alpha").
+				*utiltestingapi.MakeWorkload("preemptor", "eng-alpha").
 					Priority(100).
 					Queue("other").
 					Request("gpu", "5").
@@ -5653,7 +5657,7 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1", "eng-beta").
 					// b1 is too high priority for preemptor.
 					Priority(9001).
 					Queue("other").
@@ -5666,18 +5670,18 @@ func TestSchedule(t *testing.T) {
 				"other-alpha": {"eng-alpha/preemptor"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "6").
 						Obj()).
 					Obj(),
-				"eng-alpha/a2": *utiltesting.MakeAdmission("other-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a2": *utiltestingapi.MakeAdmission("other-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "spot", "5").
 						Obj()).
 					Obj(),
-				"eng-beta/b1": *utiltesting.MakeAdmission("other-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b1": *utiltestingapi.MakeAdmission("other-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "spot", "5").
 						Obj()).
 					Obj(),
@@ -5716,56 +5720,56 @@ func TestSchedule(t *testing.T) {
 			// inadmissible/left different, and we will
 			// delete that logic shortly.
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("CQ1").
+				*utiltestingapi.MakeClusterQueue("CQ1").
 					Cohort("other").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "10").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("CQ2").
+				*utiltestingapi.MakeClusterQueue("CQ2").
 					Cohort("other").
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "10").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "10").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("CQ3").
+				*utiltestingapi.MakeClusterQueue("CQ3").
 					Cohort("other").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq", "eng-alpha").ClusterQueue("CQ1").Obj(),
-				*utiltesting.MakeLocalQueue("lq", "eng-beta").ClusterQueue("CQ2").Obj(),
-				*utiltesting.MakeLocalQueue("lq", "eng-gamma").ClusterQueue("CQ3").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq", "eng-alpha").ClusterQueue("CQ1").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq", "eng-beta").ClusterQueue("CQ2").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq", "eng-gamma").ClusterQueue("CQ3").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("Admitted-Workload-1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("Admitted-Workload-1", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "5").
 					SimpleReserveQuota("CQ1", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("WL1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("WL1", "eng-alpha").
 					Creation(now).
 					Queue("lq").
 					Request("gpu", "10").
 					Obj(),
-				*utiltesting.MakeWorkload("WL2", "eng-beta").
+				*utiltestingapi.MakeWorkload("WL2", "eng-beta").
 					Creation(now.Add(time.Second)).
 					Queue("lq").
 					Request("gpu", "10").
 					Obj(),
-				*utiltesting.MakeWorkload("Admitted-Workload-2", "eng-gamma").
+				*utiltestingapi.MakeWorkload("Admitted-Workload-2", "eng-gamma").
 					Queue("lq").
 					Priority(0).
 					Request("gpu", "5").
 					SimpleReserveQuota("CQ3", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("Admitted-Workload-3", "eng-gamma").
+				*utiltestingapi.MakeWorkload("Admitted-Workload-3", "eng-gamma").
 					Queue("lq").
 					Priority(1).
 					Request("gpu", "5").
@@ -5773,12 +5777,12 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("Admitted-Workload-1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("Admitted-Workload-1", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "5").
 					SimpleReserveQuota("CQ1", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("WL1", "eng-alpha").
+				*utiltestingapi.MakeWorkload("WL1", "eng-alpha").
 					Creation(now).
 					Queue("lq").
 					Request("gpu", "10").
@@ -5796,7 +5800,7 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("WL2", "eng-beta").
+				*utiltestingapi.MakeWorkload("WL2", "eng-beta").
 					Creation(now.Add(time.Second)).
 					Queue("lq").
 					Request("gpu", "10").
@@ -5814,13 +5818,13 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("Admitted-Workload-2", "eng-gamma").
+				*utiltestingapi.MakeWorkload("Admitted-Workload-2", "eng-gamma").
 					Queue("lq").
 					Priority(0).
 					Request("gpu", "5").
 					SimpleReserveQuota("CQ3", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("Admitted-Workload-3", "eng-gamma").
+				*utiltestingapi.MakeWorkload("Admitted-Workload-3", "eng-gamma").
 					Queue("lq").
 					Priority(1).
 					Request("gpu", "5").
@@ -5835,18 +5839,18 @@ func TestSchedule(t *testing.T) {
 				"CQ1": {"eng-alpha/WL1"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/Admitted-Workload-1": *utiltesting.MakeAdmission("CQ1").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/Admitted-Workload-1": *utiltestingapi.MakeAdmission("CQ1").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "5").
 						Obj()).
 					Obj(),
-				"eng-gamma/Admitted-Workload-2": *utiltesting.MakeAdmission("CQ3").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-gamma/Admitted-Workload-2": *utiltestingapi.MakeAdmission("CQ3").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "5").
 						Obj()).
 					Obj(),
-				"eng-gamma/Admitted-Workload-3": *utiltesting.MakeAdmission("CQ3").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-gamma/Admitted-Workload-3": *utiltestingapi.MakeAdmission("CQ3").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "5").
 						Obj()).
 					Obj(),
@@ -5857,49 +5861,49 @@ func TestSchedule(t *testing.T) {
 		// Since ClusterQueueA knows it can reclaim capacity, it lets ClusterQueueB borrow.
 		"capacity not blocked when lending clusterqueue can reclaim (ReclaimWithinCohort=Any)": {
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("ClusterQueueA").
+				*utiltestingapi.MakeClusterQueue("ClusterQueueA").
 					Cohort("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
 					).
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
 					Obj(),
-				*utiltesting.MakeClusterQueue("ClusterQueueB").
+				*utiltestingapi.MakeClusterQueue("ClusterQueueB").
 					Cohort("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq", "eng-alpha").ClusterQueue("ClusterQueueA").Obj(),
-				*utiltesting.MakeLocalQueue("lq", "eng-beta").ClusterQueue("ClusterQueueB").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq", "eng-alpha").ClusterQueue("ClusterQueueA").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq", "eng-beta").ClusterQueue("ClusterQueueB").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1-admitted", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "1").
 					SimpleReserveQuota("ClusterQueueA", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2-pending", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a2-pending", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "2").
 					Obj(),
-				*utiltesting.MakeWorkload("b1-pending", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1-pending", "eng-beta").
 					Creation(now).
 					Queue("lq").
 					Request("gpu", "1").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1-admitted", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "1").
 					SimpleReserveQuota("ClusterQueueA", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2-pending", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a2-pending", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "2").
 					Condition(metav1.Condition{
@@ -5916,7 +5920,7 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1-pending", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1-pending", "eng-beta").
 					Creation(now).
 					Queue("lq").
 					Request("gpu", "1").
@@ -5935,9 +5939,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("ClusterQueueB").
+						utiltestingapi.MakeAdmission("ClusterQueueB").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment("gpu", "on-demand", "1").
 									Count(1).
 									Obj(),
@@ -5951,13 +5955,13 @@ func TestSchedule(t *testing.T) {
 				"ClusterQueueA": {"eng-alpha/a2-pending"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1-admitted": *utiltesting.MakeAdmission("ClusterQueueA").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1-admitted": *utiltestingapi.MakeAdmission("ClusterQueueA").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "1").
 						Obj()).
 					Obj(),
-				"eng-beta/b1-pending": *utiltesting.MakeAdmission("ClusterQueueB").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-beta/b1-pending": *utiltestingapi.MakeAdmission("ClusterQueueB").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "1").
 						Obj()).
 					Obj(),
@@ -5968,49 +5972,49 @@ func TestSchedule(t *testing.T) {
 		// Since ClusterQueueA is not sure that it can reclaim this capacity, it doesn't let ClusterQueueB borrow.
 		"capacity blocked when lending clusterqueue not guaranteed to reclaim (ReclaimWithinCohort=LowerPriority)": {
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("ClusterQueueA").
+				*utiltestingapi.MakeClusterQueue("ClusterQueueA").
 					Cohort("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
 					).
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 					}).
 					Obj(),
-				*utiltesting.MakeClusterQueue("ClusterQueueB").
+				*utiltestingapi.MakeClusterQueue("ClusterQueueB").
 					Cohort("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq", "eng-alpha").ClusterQueue("ClusterQueueA").Obj(),
-				*utiltesting.MakeLocalQueue("lq", "eng-beta").ClusterQueue("ClusterQueueB").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq", "eng-alpha").ClusterQueue("ClusterQueueA").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq", "eng-beta").ClusterQueue("ClusterQueueB").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1-admitted", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "1").
 					SimpleReserveQuota("ClusterQueueA", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2-pending", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a2-pending", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "2").
 					Obj(),
-				*utiltesting.MakeWorkload("b1-pending", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1-pending", "eng-beta").
 					Creation(now).
 					Queue("lq").
 					Request("gpu", "1").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1-admitted", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "1").
 					SimpleReserveQuota("ClusterQueueA", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2-pending", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a2-pending", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "2").
 					Condition(metav1.Condition{
@@ -6027,7 +6031,7 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1-pending", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1-pending", "eng-beta").
 					Creation(now).
 					Queue("lq").
 					Request("gpu", "1").
@@ -6053,8 +6057,8 @@ func TestSchedule(t *testing.T) {
 				"ClusterQueueA": {"eng-alpha/a2-pending"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1-admitted": *utiltesting.MakeAdmission("ClusterQueueA").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1-admitted": *utiltestingapi.MakeAdmission("ClusterQueueA").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "1").
 						Obj()).
 					Obj(),
@@ -6065,49 +6069,49 @@ func TestSchedule(t *testing.T) {
 		// Since ClusterQueueA is not sure that it can reclaim this capacity, it doesn't let ClusterQueueB borrow.
 		"capacity blocked when lending clusterqueue not guaranteed to reclaim (ReclaimWithinCohort=Never)": {
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("ClusterQueueA").
+				*utiltestingapi.MakeClusterQueue("ClusterQueueA").
 					Cohort("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
 					).
 					Preemption(kueue.ClusterQueuePreemption{
 						ReclaimWithinCohort: kueue.PreemptionPolicyNever,
 					}).
 					Obj(),
-				*utiltesting.MakeClusterQueue("ClusterQueueB").
+				*utiltestingapi.MakeClusterQueue("ClusterQueueB").
 					Cohort("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq", "eng-alpha").ClusterQueue("ClusterQueueA").Obj(),
-				*utiltesting.MakeLocalQueue("lq", "eng-beta").ClusterQueue("ClusterQueueB").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq", "eng-alpha").ClusterQueue("ClusterQueueA").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq", "eng-beta").ClusterQueue("ClusterQueueB").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1-admitted", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "1").
 					SimpleReserveQuota("ClusterQueueA", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2-pending", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a2-pending", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "2").
 					Obj(),
-				*utiltesting.MakeWorkload("b1-pending", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1-pending", "eng-beta").
 					Creation(now).
 					Queue("lq").
 					Request("gpu", "1").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1-admitted", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a1-admitted", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "1").
 					SimpleReserveQuota("ClusterQueueA", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2-pending", "eng-alpha").
+				*utiltestingapi.MakeWorkload("a2-pending", "eng-alpha").
 					Queue("lq").
 					Request("gpu", "2").
 					Condition(metav1.Condition{
@@ -6124,7 +6128,7 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("b1-pending", "eng-beta").
+				*utiltestingapi.MakeWorkload("b1-pending", "eng-beta").
 					Creation(now).
 					Queue("lq").
 					Request("gpu", "1").
@@ -6150,8 +6154,8 @@ func TestSchedule(t *testing.T) {
 				"ClusterQueueA": {"eng-alpha/a2-pending"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/a1-admitted": *utiltesting.MakeAdmission("ClusterQueueA").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/a1-admitted": *utiltestingapi.MakeAdmission("ClusterQueueA").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "1").
 						Obj()).
 					Obj(),
@@ -6169,52 +6173,52 @@ func TestSchedule(t *testing.T) {
 		//
 		"in a hierarchical cohort, workload borrowing less is scheduled first": {
 			cohorts: []kueue.Cohort{
-				*utiltesting.MakeCohort("root").Obj(),
-				*utiltesting.MakeCohort("guaranteed").
+				*utiltestingapi.MakeCohort("root").Obj(),
+				*utiltestingapi.MakeCohort("guaranteed").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "4").Obj(),
 					).Parent("root").Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("guaranteed").
+				*utiltestingapi.MakeClusterQueue("guaranteed").
 					Cohort("guaranteed").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("best-effort").
+				*utiltestingapi.MakeClusterQueue("best-effort").
 					Cohort("root").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("default").
+						*utiltestingapi.MakeFlavorQuotas("default").
 							Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq-guaranteed", "eng-alpha").ClusterQueue("guaranteed").Obj(),
-				*utiltesting.MakeLocalQueue("lq-best-effort", "eng-alpha").ClusterQueue("best-effort").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-guaranteed", "eng-alpha").ClusterQueue("guaranteed").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq-best-effort", "eng-alpha").ClusterQueue("best-effort").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("guaranteed", "eng-alpha").
+				*utiltestingapi.MakeWorkload("guaranteed", "eng-alpha").
 					Queue("lq-guaranteed").
 					Priority(0).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Obj(),
-				*utiltesting.MakeWorkload("best-effort", "eng-alpha").
+				*utiltestingapi.MakeWorkload("best-effort", "eng-alpha").
 					Queue("lq-best-effort").
 					Priority(3).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("best-effort", "eng-alpha").
+				*utiltestingapi.MakeWorkload("best-effort", "eng-alpha").
 					Queue("lq-best-effort").
 					Priority(3).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Condition(metav1.Condition{
@@ -6231,10 +6235,10 @@ func TestSchedule(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("guaranteed", "eng-alpha").
+				*utiltestingapi.MakeWorkload("guaranteed", "eng-alpha").
 					Queue("lq-guaranteed").
 					Priority(0).
-					PodSets(*utiltesting.MakePodSet("one", 1).
+					PodSets(*utiltestingapi.MakePodSet("one", 1).
 						Request(corev1.ResourceCPU, "4").
 						Obj()).
 					Condition(metav1.Condition{
@@ -6252,9 +6256,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("guaranteed").
+						utiltestingapi.MakeAdmission("guaranteed").
 							PodSets(
-								utiltesting.MakePodSetAssignment("one").
+								utiltestingapi.MakePodSetAssignment("one").
 									Assignment(corev1.ResourceCPU, "default", "4").
 									Count(1).
 									Obj(),
@@ -6264,8 +6268,8 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/guaranteed": *utiltesting.MakeAdmission("guaranteed", "one").
-					PodSets(utiltesting.MakePodSetAssignment("one").
+				"eng-alpha/guaranteed": *utiltestingapi.MakeAdmission("guaranteed", "one").
+					PodSets(utiltestingapi.MakePodSetAssignment("one").
 						Assignment(corev1.ResourceCPU, "default", "4").
 						Obj()).
 					Obj(),
@@ -6280,7 +6284,7 @@ func TestSchedule(t *testing.T) {
 		// this and assigns the other flavor `spot` to the workload `new`.
 		"don't assign flavor if there are no candidates for preemption": {
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("cq1").
+				*utiltestingapi.MakeClusterQueue("cq1").
 					Cohort("cohort").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -6294,51 +6298,51 @@ func TestSchedule(t *testing.T) {
 						WhenCanBorrow:  kueue.MayStopSearch,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").BorrowingLimit("1").Append().
 							Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").
+						*utiltestingapi.MakeFlavorQuotas("spot").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").BorrowingLimit("1").Append().
 							Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("cq2").
+				*utiltestingapi.MakeClusterQueue("cq2").
 					Cohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("1").Append().
 							Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").
+						*utiltestingapi.MakeFlavorQuotas("spot").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("1").Append().
 							Obj(),
 					).Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("lq1", "eng-alpha").ClusterQueue("cq1").Obj(),
-				*utiltesting.MakeLocalQueue("lq2", "eng-alpha").ClusterQueue("cq2").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq1", "eng-alpha").ClusterQueue("cq1").Obj(),
+				*utiltestingapi.MakeLocalQueue("lq2", "eng-alpha").ClusterQueue("cq2").Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted", "eng-alpha").
+				*utiltestingapi.MakeWorkload("admitted", "eng-alpha").
 					Queue("lq2").
 					Request(corev1.ResourceCPU, "1").
 					SimpleReserveQuota("cq2", "on-demand", now.Add(-time.Second)).
 					AdmittedAt(true, now).
 					Priority(0).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("lq1").
 					Request(corev1.ResourceCPU, "1").
 					Priority(100).
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("admitted", "eng-alpha").
+				*utiltestingapi.MakeWorkload("admitted", "eng-alpha").
 					Queue("lq2").
 					Request(corev1.ResourceCPU, "1").
 					SimpleReserveQuota("cq2", "on-demand", now.Add(-time.Second)).
 					AdmittedAt(true, now).
 					Priority(0).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "eng-alpha").
+				*utiltestingapi.MakeWorkload("new", "eng-alpha").
 					Queue("lq1").
 					Request(corev1.ResourceCPU, "1").
 					Priority(100).
@@ -6357,9 +6361,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("cq1").
+						utiltestingapi.MakeAdmission("cq1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment(corev1.ResourceCPU, "spot", "1").
 									Count(1).
 									Obj(),
@@ -6369,13 +6373,13 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"eng-alpha/new": *utiltesting.MakeAdmission("cq1").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/new": *utiltestingapi.MakeAdmission("cq1").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "spot", "1").
 						Obj()).
 					Obj(),
-				"eng-alpha/admitted": *utiltesting.MakeAdmission("cq2").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"eng-alpha/admitted": *utiltestingapi.MakeAdmission("cq2").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "1").
 						Obj()).
 					Obj(),
@@ -6386,14 +6390,14 @@ func TestSchedule(t *testing.T) {
 			enableElasticJobsViaWorkloadSlice: true,
 			// workloads that will be returned by the fake.client.
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo-1", "sales").
+				*utiltestingapi.MakeWorkload("foo-1", "sales").
 					ResourceVersion("1").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Generation(1).
-					ReserveQuotaAt(utiltesting.MakeAdmission("sales").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "default", "10000m").Count(10).Obj()).Obj(), now).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("sales").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "default", "10000m").Count(10).Obj()).Obj(), now).
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadQuotaReserved,
 						Status:             metav1.ConditionTrue,
@@ -6411,11 +6415,11 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("foo-2", "sales").
+				*utiltestingapi.MakeWorkload("foo-2", "sales").
 					ResourceVersion("1").
 					Annotation(workloadslicing.WorkloadSliceReplacementFor, "sales/foo-1").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 15).
+					PodSets(*utiltestingapi.MakePodSet("one", 15).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Generation(1).
@@ -6423,21 +6427,21 @@ func TestSchedule(t *testing.T) {
 			},
 			// wantAssignments is a map of workload name to the status assignments expected to be in the cache after the scheduling cycle.
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"sales/foo-1": *utiltesting.MakeAdmission("sales").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "default", "10").Count(10).Obj()).Obj(),
-				"sales/foo-2": *utiltesting.MakeAdmission("sales").PodSets(utiltesting.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "default", "15").Count(15).Obj()).Obj(),
+				"sales/foo-1": *utiltestingapi.MakeAdmission("sales").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "default", "10").Count(10).Obj()).Obj(),
+				"sales/foo-2": *utiltestingapi.MakeAdmission("sales").PodSets(utiltestingapi.MakePodSetAssignment("one").Assignment(corev1.ResourceCPU, "default", "15").Count(15).Obj()).Obj(),
 			},
 			// wantWorkloads an authoritative list of workloads expected in K8s API after the scheduling cycle.
 			// This may not be the same as previous "want*" values due to the stabbed apply status invocations in the test.
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("foo-1", "sales").
+				*utiltestingapi.MakeWorkload("foo-1", "sales").
 					ResourceVersion("2").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 10).
+					PodSets(*utiltestingapi.MakePodSet("one", 10).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Admission(
-						utiltesting.MakeAdmission("sales").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("sales").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "default", "10000m").
 								Count(10).
 								Obj()).
@@ -6468,16 +6472,16 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("foo-2", "sales").
+				*utiltestingapi.MakeWorkload("foo-2", "sales").
 					Annotation(workloadslicing.WorkloadSliceReplacementFor, "sales/foo-1").
 					ResourceVersion("2").
 					Queue("main").
-					PodSets(*utiltesting.MakePodSet("one", 15).
+					PodSets(*utiltestingapi.MakePodSet("one", 15).
 						Request(corev1.ResourceCPU, "1").
 						Obj()).
 					Admission(
-						utiltesting.MakeAdmission("sales").
-							PodSets(utiltesting.MakePodSetAssignment("one").
+						utiltestingapi.MakeAdmission("sales").
+							PodSets(utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "default", "15000m").
 								Count(15).
 								Obj()).
@@ -6512,22 +6516,22 @@ func TestSchedule(t *testing.T) {
 		"prefer flavor with most local capacity": {
 			enableFairSharing: true,
 			cohorts: []kueue.Cohort{
-				*utiltesting.MakeCohort("root-cohort").
+				*utiltestingapi.MakeCohort("root-cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeCohort("child-cohort").
+				*utiltestingapi.MakeCohort("child-cohort").
 					Parent("root-cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "5").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "7").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "7").Obj(),
 					).
 					Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("queue1").
+				*utiltestingapi.MakeClusterQueue("queue1").
 					Cohort("child-cohort").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -6538,46 +6542,46 @@ func TestSchedule(t *testing.T) {
 						WhenCanBorrow:  kueue.TryNextFlavor,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "3").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "3").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "3").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "3").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("queue1", "default").ClusterQueue("queue1").Obj(),
+				*utiltestingapi.MakeLocalQueue("queue1", "default").ClusterQueue("queue1").Obj(),
 			},
 			workloads: []kueue.Workload{
 				// exhaust quota in on-demand in ParentCohort
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Queue("queue1").
 					Request("gpu", "8").
 					SimpleReserveQuota("queue1", "on-demand", now).
 					Obj(),
 				// exhaust quota in spot in ClusterQueue
-				*utiltesting.MakeWorkload("a2", "default").
+				*utiltestingapi.MakeWorkload("a2", "default").
 					Queue("queue1").
 					Request("gpu", "3").
 					SimpleReserveQuota("queue1", "spot", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a3", "default").
+				*utiltestingapi.MakeWorkload("a3", "default").
 					Queue("queue1").
 					Request("gpu", "1").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
 				// exhaust quota in on-demand in ParentCohort
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Queue("queue1").
 					Request("gpu", "8").
 					SimpleReserveQuota("queue1", "on-demand", now).
 					Obj(),
 				// exhaust quota in spot in ClusterQueue
-				*utiltesting.MakeWorkload("a2", "default").
+				*utiltestingapi.MakeWorkload("a2", "default").
 					Queue("queue1").
 					Request("gpu", "3").
 					SimpleReserveQuota("queue1", "spot", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a3", "default").
+				*utiltestingapi.MakeWorkload("a3", "default").
 					Queue("queue1").
 					Request("gpu", "1").
 					Condition(metav1.Condition{
@@ -6595,9 +6599,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("queue1").
+						utiltestingapi.MakeAdmission("queue1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment("gpu", "spot", "1").
 									Count(1).
 									Obj(),
@@ -6607,18 +6611,18 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"default/a1": *utiltesting.MakeAdmission("queue1").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/a1": *utiltestingapi.MakeAdmission("queue1").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "8").
 						Obj()).
 					Obj(),
-				"default/a2": *utiltesting.MakeAdmission("queue1").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/a2": *utiltestingapi.MakeAdmission("queue1").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "spot", "3").
 						Obj()).
 					Obj(),
-				"default/a3": *utiltesting.MakeAdmission("queue1").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/a3": *utiltestingapi.MakeAdmission("queue1").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "spot", "1").
 						Obj()).
 					Obj(),
@@ -6627,22 +6631,22 @@ func TestSchedule(t *testing.T) {
 		"prefer flavor with most local capacity (FS=false)": {
 			enableFairSharing: false,
 			cohorts: []kueue.Cohort{
-				*utiltesting.MakeCohort("root-cohort").
+				*utiltestingapi.MakeCohort("root-cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeCohort("child-cohort").
+				*utiltestingapi.MakeCohort("child-cohort").
 					Parent("root-cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "5").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "7").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "7").Obj(),
 					).
 					Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("queue1").
+				*utiltestingapi.MakeClusterQueue("queue1").
 					Cohort("child-cohort").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -6653,46 +6657,46 @@ func TestSchedule(t *testing.T) {
 						WhenCanBorrow:  kueue.TryNextFlavor,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "3").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "3").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "3").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "3").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("queue1", "default").ClusterQueue("queue1").Obj(),
+				*utiltestingapi.MakeLocalQueue("queue1", "default").ClusterQueue("queue1").Obj(),
 			},
 			workloads: []kueue.Workload{
 				// exhaust quota in on-demand in ParentCohort
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Queue("queue1").
 					Request("gpu", "8").
 					SimpleReserveQuota("queue1", "on-demand", now).
 					Obj(),
 				// exhaust quota in spot in ClusterQueue
-				*utiltesting.MakeWorkload("a2", "default").
+				*utiltestingapi.MakeWorkload("a2", "default").
 					Queue("queue1").
 					Request("gpu", "3").
 					SimpleReserveQuota("queue1", "spot", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a3", "default").
+				*utiltestingapi.MakeWorkload("a3", "default").
 					Queue("queue1").
 					Request("gpu", "1").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
 				// exhaust quota in on-demand in ParentCohort
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Queue("queue1").
 					Request("gpu", "8").
 					SimpleReserveQuota("queue1", "on-demand", now).
 					Obj(),
 				// exhaust quota in spot in ClusterQueue
-				*utiltesting.MakeWorkload("a2", "default").
+				*utiltestingapi.MakeWorkload("a2", "default").
 					Queue("queue1").
 					Request("gpu", "3").
 					SimpleReserveQuota("queue1", "spot", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a3", "default").
+				*utiltestingapi.MakeWorkload("a3", "default").
 					Queue("queue1").
 					Request("gpu", "1").
 					Condition(metav1.Condition{
@@ -6710,9 +6714,9 @@ func TestSchedule(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("queue1").
+						utiltestingapi.MakeAdmission("queue1").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment("gpu", "spot", "1").
 									Count(1).
 									Obj(),
@@ -6722,18 +6726,18 @@ func TestSchedule(t *testing.T) {
 					Obj(),
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"default/a1": *utiltesting.MakeAdmission("queue1").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/a1": *utiltestingapi.MakeAdmission("queue1").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "8").
 						Obj()).
 					Obj(),
-				"default/a2": *utiltesting.MakeAdmission("queue1").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/a2": *utiltestingapi.MakeAdmission("queue1").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "spot", "3").
 						Obj()).
 					Obj(),
-				"default/a3": *utiltesting.MakeAdmission("queue1").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/a3": *utiltestingapi.MakeAdmission("queue1").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "spot", "1").
 						Obj()).
 					Obj(),
@@ -6743,22 +6747,22 @@ func TestSchedule(t *testing.T) {
 			enableFairSharing:                          true,
 			flavorFungibilityImplicitPreferenceDefault: true,
 			cohorts: []kueue.Cohort{
-				*utiltesting.MakeCohort("root-cohort").
+				*utiltestingapi.MakeCohort("root-cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "2").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "2").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeCohort("child-cohort").
+				*utiltestingapi.MakeCohort("child-cohort").
 					Parent("root-cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("queue1").
+				*utiltestingapi.MakeClusterQueue("queue1").
 					Cohort("child-cohort").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -6769,23 +6773,23 @@ func TestSchedule(t *testing.T) {
 						WhenCanBorrow:  kueue.TryNextFlavor,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("queue1", "default").ClusterQueue("queue1").Obj(),
+				*utiltestingapi.MakeLocalQueue("queue1", "default").ClusterQueue("queue1").Obj(),
 			},
 			workloads: []kueue.Workload{
 				// exhaust quota in on-demand in ParentCohort
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Priority(-1).
 					Queue("queue1").
 					Request("gpu", "2").
 					SimpleReserveQuota("queue1", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "default").
+				*utiltestingapi.MakeWorkload("a2", "default").
 					Priority(99).
 					Queue("queue1").
 					Request("gpu", "1").
@@ -6793,13 +6797,13 @@ func TestSchedule(t *testing.T) {
 			},
 			wantWorkloads: []kueue.Workload{
 				// exhaust quota in on-demand in ParentCohort
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Priority(-1).
 					Queue("queue1").
 					Request("gpu", "2").
 					SimpleReserveQuota("queue1", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a2", "default").
+				*utiltestingapi.MakeWorkload("a2", "default").
 					Priority(99).
 					Queue("queue1").
 					Request("gpu", "1").
@@ -6823,8 +6827,8 @@ func TestSchedule(t *testing.T) {
 				"queue1": {"default/a2"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"default/a1": *utiltesting.MakeAdmission("queue1").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/a1": *utiltestingapi.MakeAdmission("queue1").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "2").
 						Obj()).
 					Obj(),
@@ -6834,22 +6838,22 @@ func TestSchedule(t *testing.T) {
 			enableFairSharing:                          true,
 			flavorFungibilityImplicitPreferenceDefault: true,
 			cohorts: []kueue.Cohort{
-				*utiltesting.MakeCohort("root-cohort").
+				*utiltestingapi.MakeCohort("root-cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "2").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "2").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeCohort("child-cohort").
+				*utiltestingapi.MakeCohort("child-cohort").
 					Parent("root-cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "2").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
 			},
 			additionalClusterQueues: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("queue1").
+				*utiltestingapi.MakeClusterQueue("queue1").
 					Cohort("child-cohort").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -6860,11 +6864,11 @@ func TestSchedule(t *testing.T) {
 						WhenCanBorrow:  kueue.TryNextFlavor,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeClusterQueue("queue2").
+				*utiltestingapi.MakeClusterQueue("queue2").
 					Cohort("child-cohort").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -6875,31 +6879,31 @@ func TestSchedule(t *testing.T) {
 						WhenCanBorrow:  kueue.TryNextFlavor,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("on-demand").Resource("gpu", "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("spot").Resource("gpu", "0").Obj(),
 					).
 					Obj(),
 			},
 			additionalLocalQueues: []kueue.LocalQueue{
-				*utiltesting.MakeLocalQueue("queue1", "default").ClusterQueue("queue1").Obj(),
-				*utiltesting.MakeLocalQueue("queue2", "default").ClusterQueue("queue2").Obj(),
+				*utiltestingapi.MakeLocalQueue("queue1", "default").ClusterQueue("queue1").Obj(),
+				*utiltestingapi.MakeLocalQueue("queue2", "default").ClusterQueue("queue2").Obj(),
 			},
 			workloads: []kueue.Workload{
 				// exhaust quota in on-demand in ParentCohort
-				*utiltesting.MakeWorkload("a2", "default").
+				*utiltestingapi.MakeWorkload("a2", "default").
 					Priority(-1).
 					Queue("queue2").
 					Request("gpu", "2").
 					SimpleReserveQuota("queue2", "on-demand", now).
 					Obj(),
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Priority(99).
 					Queue("queue1").
 					Request("gpu", "1").
 					Obj(),
 			},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("a1", "default").
+				*utiltestingapi.MakeWorkload("a1", "default").
 					Priority(99).
 					Queue("queue1").
 					Request("gpu", "1").
@@ -6918,7 +6922,7 @@ func TestSchedule(t *testing.T) {
 					}).
 					Obj(),
 				// exhaust quota in on-demand in ParentCohort
-				*utiltesting.MakeWorkload("a2", "default").
+				*utiltestingapi.MakeWorkload("a2", "default").
 					Priority(-1).
 					Queue("queue2").
 					Request("gpu", "2").
@@ -6930,8 +6934,8 @@ func TestSchedule(t *testing.T) {
 				"queue1": {"default/a1"},
 			},
 			wantAssignments: map[workload.Reference]kueue.Admission{
-				"default/a2": *utiltesting.MakeAdmission("queue2").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/a2": *utiltestingapi.MakeAdmission("queue2").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("gpu", "on-demand", "2").
 						Obj()).
 					Obj(),
@@ -6939,170 +6943,173 @@ func TestSchedule(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			metrics.AdmissionCyclePreemptionSkips.Reset()
-			if tc.disableLendingLimit {
-				features.SetFeatureGateDuringTest(t, features.LendingLimit, false)
-			}
-			if tc.disablePartialAdmission {
-				features.SetFeatureGateDuringTest(t, features.PartialAdmission, false)
-			}
-			features.SetFeatureGateDuringTest(t, features.ElasticJobsViaWorkloadSlices, tc.enableElasticJobsViaWorkloadSlice)
-			features.SetFeatureGateDuringTest(t, features.FlavorFungibilityImplicitPreferenceDefault, tc.flavorFungibilityImplicitPreferenceDefault)
+		for _, enabled := range []bool{false, true} {
+			t.Run(fmt.Sprintf("%s WorkloadRequestUseMergePatch enabled: %t", name, enabled), func(t *testing.T) {
+				features.SetFeatureGateDuringTest(t, features.WorkloadRequestUseMergePatch, enabled)
+				metrics.AdmissionCyclePreemptionSkips.Reset()
+				if tc.disableLendingLimit {
+					features.SetFeatureGateDuringTest(t, features.LendingLimit, false)
+				}
+				if tc.disablePartialAdmission {
+					features.SetFeatureGateDuringTest(t, features.PartialAdmission, false)
+				}
+				features.SetFeatureGateDuringTest(t, features.ElasticJobsViaWorkloadSlices, tc.enableElasticJobsViaWorkloadSlice)
+				features.SetFeatureGateDuringTest(t, features.FlavorFungibilityImplicitPreferenceDefault, tc.flavorFungibilityImplicitPreferenceDefault)
 
-			ctx, log := utiltesting.ContextWithLog(t)
+				ctx, log := utiltesting.ContextWithLog(t)
 
-			allQueues := append(queues, tc.additionalLocalQueues...)
-			allClusterQueues := append(clusterQueues, tc.additionalClusterQueues...)
+				allQueues := append(queues, tc.additionalLocalQueues...)
+				allClusterQueues := append(clusterQueues, tc.additionalClusterQueues...)
 
-			clientBuilder := utiltesting.NewClientBuilder().
-				WithLists(&kueue.WorkloadList{Items: tc.workloads}, &kueue.LocalQueueList{Items: allQueues}).
-				WithObjects(append(
-					[]client.Object{
-						utiltesting.MakeNamespaceWrapper("default").Obj(),
-						utiltesting.MakeNamespaceWrapper("eng-alpha").Label("dep", "eng").Obj(),
-						utiltesting.MakeNamespaceWrapper("eng-beta").Label("dep", "eng").Obj(),
-						utiltesting.MakeNamespaceWrapper("eng-gamma").Label("dep", "eng").Obj(),
-						utiltesting.MakeNamespaceWrapper("sales").Label("dep", "sales").Obj(),
-						utiltesting.MakeNamespaceWrapper("lend").Label("dep", "lend").Obj(),
-					}, tc.objects...,
-				)...).
-				WithStatusSubresource(&kueue.Workload{}).
-				WithInterceptorFuncs(interceptor.Funcs{
-					SubResourcePatch: func(ctx context.Context, client client.Client, subResourceName string, obj client.Object, patch client.Patch, opts ...client.SubResourcePatchOption) error {
-						if _, ok := obj.(*kueue.Workload); ok && subResourceName == "status" && tc.admissionError != nil {
-							return tc.admissionError
-						}
-						return utiltesting.TreatSSAAsStrategicMerge(ctx, client, subResourceName, obj, patch, opts...)
-					},
-				})
+				clientBuilder := utiltesting.NewClientBuilder().
+					WithLists(&kueue.WorkloadList{Items: tc.workloads}, &kueue.LocalQueueList{Items: allQueues}).
+					WithObjects(append(
+						[]client.Object{
+							utiltesting.MakeNamespaceWrapper("default").Obj(),
+							utiltesting.MakeNamespaceWrapper("eng-alpha").Label("dep", "eng").Obj(),
+							utiltesting.MakeNamespaceWrapper("eng-beta").Label("dep", "eng").Obj(),
+							utiltesting.MakeNamespaceWrapper("eng-gamma").Label("dep", "eng").Obj(),
+							utiltesting.MakeNamespaceWrapper("sales").Label("dep", "sales").Obj(),
+							utiltesting.MakeNamespaceWrapper("lend").Label("dep", "lend").Obj(),
+						}, tc.objects...,
+					)...).
+					WithStatusSubresource(&kueue.Workload{}).
+					WithInterceptorFuncs(interceptor.Funcs{
+						SubResourcePatch: func(ctx context.Context, client client.Client, subResourceName string, obj client.Object, patch client.Patch, opts ...client.SubResourcePatchOption) error {
+							if _, ok := obj.(*kueue.Workload); ok && subResourceName == "status" && tc.admissionError != nil {
+								return tc.admissionError
+							}
+							return utiltesting.TreatSSAAsStrategicMerge(ctx, client, subResourceName, obj, patch, opts...)
+						},
+					})
 
-			cl := clientBuilder.Build()
-			recorder := &utiltesting.EventRecorder{}
-			cqCache := schdcache.New(cl)
-			qManager := qcache.NewManager(cl, cqCache)
-			// Workloads are loaded into queues or clusterQueues as we add them.
-			for _, q := range allQueues {
-				if err := qManager.AddLocalQueue(ctx, &q); err != nil {
-					t.Fatalf("Inserting queue %s/%s in manager: %v", q.Namespace, q.Name, err)
-				}
-			}
-			for i := range resourceFlavors {
-				cqCache.AddOrUpdateResourceFlavor(log, resourceFlavors[i])
-			}
-			for _, cq := range allClusterQueues {
-				if err := cqCache.AddClusterQueue(ctx, &cq); err != nil {
-					t.Fatalf("Inserting clusterQueue %s in cache: %v", cq.Name, err)
+				cl := clientBuilder.Build()
+				recorder := &utiltesting.EventRecorder{}
+				cqCache := schdcache.New(cl)
+				qManager := qcache.NewManager(cl, cqCache)
+				// Workloads are loaded into queues or clusterQueues as we add them.
+				for _, q := range allQueues {
+					if err := qManager.AddLocalQueue(ctx, &q); err != nil {
+						t.Fatalf("Inserting queue %s/%s in manager: %v", q.Namespace, q.Name, err)
+					}
 				}
-				if err := qManager.AddClusterQueue(ctx, &cq); err != nil {
-					t.Fatalf("Inserting clusterQueue %s in manager: %v", cq.Name, err)
+				for i := range resourceFlavors {
+					cqCache.AddOrUpdateResourceFlavor(log, resourceFlavors[i])
 				}
-				if err := cl.Create(ctx, &cq); err != nil {
-					t.Errorf("couldn't create the cluster queue: %v", err)
+				for _, cq := range allClusterQueues {
+					if err := cqCache.AddClusterQueue(ctx, &cq); err != nil {
+						t.Fatalf("Inserting clusterQueue %s in cache: %v", cq.Name, err)
+					}
+					if err := qManager.AddClusterQueue(ctx, &cq); err != nil {
+						t.Fatalf("Inserting clusterQueue %s in manager: %v", cq.Name, err)
+					}
+					if err := cl.Create(ctx, &cq); err != nil {
+						t.Errorf("couldn't create the cluster queue: %v", err)
+					}
 				}
-			}
 
-			for _, cohort := range tc.cohorts {
-				if err := cqCache.AddOrUpdateCohort(&cohort); err != nil {
-					t.Fatalf("Inserting Cohort %s in cache: %v", cohort.Name, err)
+				for _, cohort := range tc.cohorts {
+					if err := cqCache.AddOrUpdateCohort(&cohort); err != nil {
+						t.Fatalf("Inserting Cohort %s in cache: %v", cohort.Name, err)
+					}
 				}
-			}
 
-			scheduler := New(qManager, cqCache, cl, recorder, WithFairSharing(&config.FairSharing{Enable: tc.enableFairSharing}), WithClock(t, fakeClock))
-			wg := sync.WaitGroup{}
-			scheduler.setAdmissionRoutineWrapper(routine.NewWrapper(
-				func() { wg.Add(1) },
-				func() { wg.Done() },
-			))
+				scheduler := New(qManager, cqCache, cl, recorder, WithFairSharing(&config.FairSharing{Enable: tc.enableFairSharing}), WithClock(t, fakeClock))
+				wg := sync.WaitGroup{}
+				scheduler.setAdmissionRoutineWrapper(routine.NewWrapper(
+					func() { wg.Add(1) },
+					func() { wg.Done() },
+				))
 
-			var mu sync.Mutex
-			gotPreempted := sets.New[workload.Reference]()
-			scheduler.preemptor.OverrideApply(func(_ context.Context, w *kueue.Workload, _, _ string) error {
-				mu.Lock()
-				gotPreempted.Insert(workload.Key(w))
-				mu.Unlock()
-				return nil
-			})
+				var mu sync.Mutex
+				gotPreempted := sets.New[workload.Reference]()
+				scheduler.preemptor.OverrideApply(func(_ context.Context, w *kueue.Workload, _, _ string) error {
+					mu.Lock()
+					gotPreempted.Insert(workload.Key(w))
+					mu.Unlock()
+					return nil
+				})
 
-			ctx, cancel := context.WithTimeout(ctx, queueingTimeout)
-			go qManager.CleanUpOnContext(ctx)
-			defer cancel()
+				ctx, cancel := context.WithTimeout(ctx, queueingTimeout)
+				go qManager.CleanUpOnContext(ctx)
+				defer cancel()
 
-			scheduler.schedule(ctx)
-			wg.Wait()
+				scheduler.schedule(ctx)
+				wg.Wait()
 
-			if diff := cmp.Diff(tc.wantPreempted, gotPreempted); diff != "" {
-				t.Errorf("Unexpected preemptions (-want,+got):\n%s", diff)
-			}
+				if diff := cmp.Diff(tc.wantPreempted, gotPreempted); diff != "" {
+					t.Errorf("Unexpected preemptions (-want,+got):\n%s", diff)
+				}
 
-			// Verify assignments in cache.
-			gotAssignments := make(map[workload.Reference]kueue.Admission)
-			snapshot, err := cqCache.Snapshot(ctx)
-			if err != nil {
-				t.Fatalf("unexpected error while building snapshot: %v", err)
-			}
-			for cqName, c := range snapshot.ClusterQueues() {
-				for name, w := range c.Workloads {
-					switch {
-					case !workload.HasQuotaReservation(w.Obj):
-						t.Errorf("Workload %s is not admitted by a clusterQueue, but it is found as member of clusterQueue %s in the cache", name, cqName)
-					case w.Obj.Status.Admission.ClusterQueue != cqName:
-						t.Errorf("Workload %s is admitted by clusterQueue %s, but it is found as member of clusterQueue %s in the cache", name, w.Obj.Status.Admission.ClusterQueue, cqName)
-					default:
-						gotAssignments[name] = *w.Obj.Status.Admission
+				// Verify assignments in cache.
+				gotAssignments := make(map[workload.Reference]kueue.Admission)
+				snapshot, err := cqCache.Snapshot(ctx)
+				if err != nil {
+					t.Fatalf("unexpected error while building snapshot: %v", err)
+				}
+				for cqName, c := range snapshot.ClusterQueues() {
+					for name, w := range c.Workloads {
+						switch {
+						case !workload.HasQuotaReservation(w.Obj):
+							t.Errorf("Workload %s is not admitted by a clusterQueue, but it is found as member of clusterQueue %s in the cache", name, cqName)
+						case w.Obj.Status.Admission.ClusterQueue != cqName:
+							t.Errorf("Workload %s is admitted by clusterQueue %s, but it is found as member of clusterQueue %s in the cache", name, w.Obj.Status.Admission.ClusterQueue, cqName)
+						default:
+							gotAssignments[name] = *w.Obj.Status.Admission
+						}
 					}
 				}
-			}
-
-			gotWorkloads := &kueue.WorkloadList{}
-			err = cl.List(ctx, gotWorkloads)
-			if err != nil {
-				t.Fatalf("Unexpected list workloads error: %v", err)
-			}
 
-			defaultWorkloadCmpOpts := cmp.Options{
-				cmpopts.EquateEmpty(),
-				cmpopts.IgnoreFields(kueue.AdmissionCheckState{}, "LastTransitionTime"),
-				cmpopts.IgnoreFields(kueue.Workload{}, "ObjectMeta.ResourceVersion", "ObjectMeta.CreationTimestamp"),
-			}
+				gotWorkloads := &kueue.WorkloadList{}
+				err = cl.List(ctx, gotWorkloads)
+				if err != nil {
+					t.Fatalf("Unexpected list workloads error: %v", err)
+				}
 
-			if diff := cmp.Diff(tc.wantWorkloads, gotWorkloads.Items, defaultWorkloadCmpOpts); diff != "" {
-				t.Errorf("Unexpected workloads (-want,+got):\n%s", diff)
-			}
+				defaultWorkloadCmpOpts := cmp.Options{
+					cmpopts.EquateEmpty(),
+					cmpopts.IgnoreFields(kueue.AdmissionCheckState{}, "LastTransitionTime"),
+					cmpopts.IgnoreFields(kueue.Workload{}, "ObjectMeta.ResourceVersion", "ObjectMeta.CreationTimestamp"),
+				}
 
-			if len(gotAssignments) == 0 {
-				gotAssignments = nil
-			}
-			if diff := cmp.Diff(tc.wantAssignments, gotAssignments); diff != "" {
-				t.Errorf("Unexpected assigned clusterQueues in cache (-want,+got):\n%s", diff)
-			}
+				if diff := cmp.Diff(tc.wantWorkloads, gotWorkloads.Items, defaultWorkloadCmpOpts); diff != "" {
+					t.Errorf("Unexpected workloads (-want,+got):\n%s", diff)
+				}
 
-			qDump := qManager.Dump()
-			if diff := cmp.Diff(tc.wantLeft, qDump, cmpDump...); diff != "" {
-				t.Errorf("Unexpected elements left in the queue (-want,+got):\n%s", diff)
-			}
-			qDumpInadmissible := qManager.DumpInadmissible()
-			if diff := cmp.Diff(tc.wantInadmissibleLeft, qDumpInadmissible, cmpDump...); diff != "" {
-				t.Errorf("Unexpected elements left in inadmissible workloads (-want,+got):\n%s", diff)
-			}
+				if len(gotAssignments) == 0 {
+					gotAssignments = nil
+				}
+				if diff := cmp.Diff(tc.wantAssignments, gotAssignments); diff != "" {
+					t.Errorf("Unexpected assigned clusterQueues in cache (-want,+got):\n%s", diff)
+				}
 
-			if len(tc.wantEvents) > 0 {
-				if diff := cmp.Diff(tc.wantEvents, recorder.RecordedEvents, tc.eventCmpOpts...); diff != "" {
-					t.Errorf("unexpected events (-want/+got):\n%s", diff)
+				qDump := qManager.Dump()
+				if diff := cmp.Diff(tc.wantLeft, qDump, cmpDump...); diff != "" {
+					t.Errorf("Unexpected elements left in the queue (-want,+got):\n%s", diff)
+				}
+				qDumpInadmissible := qManager.DumpInadmissible()
+				if diff := cmp.Diff(tc.wantInadmissibleLeft, qDumpInadmissible, cmpDump...); diff != "" {
+					t.Errorf("Unexpected elements left in inadmissible workloads (-want,+got):\n%s", diff)
 				}
-			}
 
-			for cqName, want := range tc.wantSkippedPreemptions {
-				val, err := testutil.GetGaugeMetricValue(metrics.AdmissionCyclePreemptionSkips.WithLabelValues(cqName))
-				if err != nil {
-					t.Fatalf("Couldn't get value for metric admission_cycle_preemption_skips for %q: %v", cqName, err)
+				if len(tc.wantEvents) > 0 {
+					if diff := cmp.Diff(tc.wantEvents, recorder.RecordedEvents, tc.eventCmpOpts...); diff != "" {
+						t.Errorf("unexpected events (-want/+got):\n%s", diff)
+					}
 				}
-				got := int(val)
-				if want != got {
-					t.Errorf("Counted %d skips for %q, want %d", got, cqName, want)
+
+				for cqName, want := range tc.wantSkippedPreemptions {
+					val, err := testutil.GetGaugeMetricValue(metrics.AdmissionCyclePreemptionSkips.WithLabelValues(cqName))
+					if err != nil {
+						t.Fatalf("Couldn't get value for metric admission_cycle_preemption_skips for %q: %v", cqName, err)
+					}
+					got := int(val)
+					if want != got {
+						t.Errorf("Counted %d skips for %q, want %d", got, cqName, want)
+					}
 				}
-			}
-		})
+			})
+		}
 	}
 }
 
@@ -7389,11 +7396,11 @@ func TestLastSchedulingContext(t *testing.T) {
 	fakeClock := testingclock.NewFakeClock(now)
 
 	resourceFlavors := []*kueue.ResourceFlavor{
-		utiltesting.MakeResourceFlavor("on-demand").Obj(),
-		utiltesting.MakeResourceFlavor("spot").Obj(),
+		utiltestingapi.MakeResourceFlavor("on-demand").Obj(),
+		utiltestingapi.MakeResourceFlavor("spot").Obj(),
 	}
 	clusterQueueCohort := []kueue.ClusterQueue{
-		*utiltesting.MakeClusterQueue("eng-cohort-alpha").
+		*utiltestingapi.MakeClusterQueue("eng-cohort-alpha").
 			Cohort("cohort").
 			QueueingStrategy(kueue.StrictFIFO).
 			Preemption(kueue.ClusterQueuePreemption{
@@ -7405,12 +7412,12 @@ func TestLastSchedulingContext(t *testing.T) {
 				WhenCanBorrow:  kueue.MayStopSearch,
 			}).
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("on-demand").
+				*utiltestingapi.MakeFlavorQuotas("on-demand").
 					Resource(corev1.ResourceCPU, "50", "50").Obj(),
-				*utiltesting.MakeFlavorQuotas("spot").
+				*utiltestingapi.MakeFlavorQuotas("spot").
 					Resource(corev1.ResourceCPU, "100", "0").Obj(),
 			).Obj(),
-		*utiltesting.MakeClusterQueue("eng-cohort-beta").
+		*utiltestingapi.MakeClusterQueue("eng-cohort-beta").
 			Cohort("cohort").
 			QueueingStrategy(kueue.StrictFIFO).
 			Preemption(kueue.ClusterQueuePreemption{
@@ -7422,12 +7429,12 @@ func TestLastSchedulingContext(t *testing.T) {
 				WhenCanBorrow:  kueue.MayStopSearch,
 			}).
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("on-demand").
+				*utiltestingapi.MakeFlavorQuotas("on-demand").
 					Resource(corev1.ResourceCPU, "50", "50").Obj(),
-				*utiltesting.MakeFlavorQuotas("spot").
+				*utiltestingapi.MakeFlavorQuotas("spot").
 					Resource(corev1.ResourceCPU, "100", "0").Obj(),
 			).Obj(),
-		*utiltesting.MakeClusterQueue("eng-cohort-theta").
+		*utiltestingapi.MakeClusterQueue("eng-cohort-theta").
 			Cohort("cohort").
 			QueueingStrategy(kueue.StrictFIFO).
 			Preemption(kueue.ClusterQueuePreemption{
@@ -7439,18 +7446,18 @@ func TestLastSchedulingContext(t *testing.T) {
 				WhenCanBorrow:  kueue.TryNextFlavor,
 			}).
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("on-demand").
+				*utiltestingapi.MakeFlavorQuotas("on-demand").
 					Resource(corev1.ResourceCPU, "50", "50").Obj(),
-				*utiltesting.MakeFlavorQuotas("spot").
+				*utiltestingapi.MakeFlavorQuotas("spot").
 					Resource(corev1.ResourceCPU, "100", "0").Obj(),
 			).Obj(),
 	}
 
 	queues := []kueue.LocalQueue{
-		*utiltesting.MakeLocalQueue("main", "default").ClusterQueue("eng-alpha").Obj(),
-		*utiltesting.MakeLocalQueue("main-alpha", "default").ClusterQueue("eng-cohort-alpha").Obj(),
-		*utiltesting.MakeLocalQueue("main-beta", "default").ClusterQueue("eng-cohort-beta").Obj(),
-		*utiltesting.MakeLocalQueue("main-theta", "default").ClusterQueue("eng-cohort-theta").Obj(),
+		*utiltestingapi.MakeLocalQueue("main", "default").ClusterQueue("eng-alpha").Obj(),
+		*utiltestingapi.MakeLocalQueue("main-alpha", "default").ClusterQueue("eng-cohort-alpha").Obj(),
+		*utiltestingapi.MakeLocalQueue("main-beta", "default").ClusterQueue("eng-cohort-beta").Obj(),
+		*utiltestingapi.MakeLocalQueue("main-theta", "default").ClusterQueue("eng-cohort-theta").Obj(),
 	}
 	cases := []struct {
 		name                           string
@@ -7467,7 +7474,7 @@ func TestLastSchedulingContext(t *testing.T) {
 			// removal of workloads. The second flavor cannot be used because
 			// it is noFit.
 			cqs: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("eng-alpha").
+				*utiltestingapi.MakeClusterQueue("eng-alpha").
 					QueueingStrategy(kueue.BestEffortFIFO).
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
@@ -7476,24 +7483,24 @@ func TestLastSchedulingContext(t *testing.T) {
 						WhenCanPreempt: kueue.MayStopSearch,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							Resource(corev1.ResourceCPU, "50", "50").Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").
+						*utiltestingapi.MakeFlavorQuotas("spot").
 							Resource(corev1.ResourceCPU, "10", "0").Obj(),
 					).Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("low-1", "default").
+				*utiltestingapi.MakeWorkload("low-1", "default").
 					Queue("main").
 					Request(corev1.ResourceCPU, "50").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "50").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "default").
+				*utiltestingapi.MakeWorkload("preemptor", "default").
 					Queue("main").
 					Request(corev1.ResourceCPU, "20").
 					Obj(),
@@ -7504,24 +7511,24 @@ func TestLastSchedulingContext(t *testing.T) {
 			}},
 			wantPreempted: sets.Set[workload.Reference]{},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("low-1", "default").
+				*utiltestingapi.MakeWorkload("low-1", "default").
 					Queue("main").
 					Request(corev1.ResourceCPU, "50").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "50").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("preemptor", "default").
+				*utiltestingapi.MakeWorkload("preemptor", "default").
 					Queue("main").
 					Request(corev1.ResourceCPU, "20").
 					Condition(metav1.Condition{
 						Type:               kueue.WorkloadQuotaReserved,
 						Status:             metav1.ConditionFalse,
 						Reason:             "Pending",
-						Message:            "couldn't assign flavors to pod set main: insufficient quota for cpu in flavor spot, request > maximum capacity (20 > 10), insufficient unused quota for cpu in flavor on-demand, 20 more needed",
+						Message:            "couldn't assign flavors to pod set main: insufficient quota for cpu in flavor spot, previously considered podsets requests (0) + current podset request (20) > maximum capacity (10), insufficient unused quota for cpu in flavor on-demand, 20 more needed",
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					ResourceRequests(kueue.PodSetRequest{
@@ -7533,8 +7540,8 @@ func TestLastSchedulingContext(t *testing.T) {
 					Obj(),
 			},
 			wantAdmissionsOnSecondSchedule: map[workload.Reference]kueue.Admission{
-				"default/preemptor": *utiltesting.MakeAdmission("eng-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/preemptor": *utiltestingapi.MakeAdmission("eng-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
@@ -7544,27 +7551,27 @@ func TestLastSchedulingContext(t *testing.T) {
 			name: "borrow before next flavor",
 			cqs:  clusterQueueCohort,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("placeholder", "default").
+				*utiltestingapi.MakeWorkload("placeholder", "default").
 					Request(corev1.ResourceCPU, "50").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "50").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("borrower", "default").
+				*utiltestingapi.MakeWorkload("borrower", "default").
 					Queue("main-alpha").
 					Request(corev1.ResourceCPU, "20").
 					Obj(),
-				*utiltesting.MakeWorkload("workload1", "default").
+				*utiltestingapi.MakeWorkload("workload1", "default").
 					Queue("main-beta").
 					Request(corev1.ResourceCPU, "20").
 					Obj(),
 			},
 			wantPreempted: sets.Set[workload.Reference]{},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("borrower", "default").
+				*utiltestingapi.MakeWorkload("borrower", "default").
 					Queue("main-alpha").
 					Request(corev1.ResourceCPU, "20").
 					Condition(metav1.Condition{
@@ -7582,9 +7589,9 @@ func TestLastSchedulingContext(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-cohort-alpha").
+						utiltestingapi.MakeAdmission("eng-cohort-alpha").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment(corev1.ResourceCPU, "on-demand", "20").
 									Count(1).
 									Obj(),
@@ -7592,16 +7599,16 @@ func TestLastSchedulingContext(t *testing.T) {
 							Obj(),
 					).
 					Obj(),
-				*utiltesting.MakeWorkload("placeholder", "default").
+				*utiltestingapi.MakeWorkload("placeholder", "default").
 					Request(corev1.ResourceCPU, "50").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "50").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("workload1", "default").
+				*utiltestingapi.MakeWorkload("workload1", "default").
 					Queue("main-beta").
 					Request(corev1.ResourceCPU, "20").
 					Condition(metav1.Condition{
@@ -7619,9 +7626,9 @@ func TestLastSchedulingContext(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-cohort-beta").
+						utiltestingapi.MakeAdmission("eng-cohort-beta").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment(corev1.ResourceCPU, "on-demand", "20").
 									Count(1).
 									Obj(),
@@ -7631,18 +7638,18 @@ func TestLastSchedulingContext(t *testing.T) {
 					Obj(),
 			},
 			wantAdmissionsOnSecondSchedule: map[workload.Reference]kueue.Admission{
-				"default/placeholder": *utiltesting.MakeAdmission("eng-cohort-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/placeholder": *utiltestingapi.MakeAdmission("eng-cohort-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "50").
 						Obj()).
 					Obj(),
-				"default/workload1": *utiltesting.MakeAdmission("eng-cohort-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/workload1": *utiltestingapi.MakeAdmission("eng-cohort-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
-				"default/borrower": *utiltesting.MakeAdmission("eng-cohort-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/borrower": *utiltestingapi.MakeAdmission("eng-cohort-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
@@ -7652,50 +7659,50 @@ func TestLastSchedulingContext(t *testing.T) {
 			name: "borrow after all flavors",
 			cqs:  clusterQueueCohort,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("placeholder", "default").
+				*utiltestingapi.MakeWorkload("placeholder", "default").
 					Request(corev1.ResourceCPU, "50").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "50").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("placeholder1", "default").
+				*utiltestingapi.MakeWorkload("placeholder1", "default").
 					Request(corev1.ResourceCPU, "50").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-theta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-theta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "50").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("workload", "default").
+				*utiltestingapi.MakeWorkload("workload", "default").
 					Queue("main-theta").
 					Request(corev1.ResourceCPU, "20").
 					Obj(),
 			},
 			wantPreempted: sets.Set[workload.Reference]{},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("placeholder", "default").
+				*utiltestingapi.MakeWorkload("placeholder", "default").
 					Request(corev1.ResourceCPU, "50").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "50").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("placeholder1", "default").
+				*utiltestingapi.MakeWorkload("placeholder1", "default").
 					Request(corev1.ResourceCPU, "50").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-theta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-theta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "50").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("workload", "default").
+				*utiltestingapi.MakeWorkload("workload", "default").
 					Queue("main-theta").
 					Request(corev1.ResourceCPU, "20").
 					Condition(metav1.Condition{
@@ -7713,9 +7720,9 @@ func TestLastSchedulingContext(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-cohort-theta").
+						utiltestingapi.MakeAdmission("eng-cohort-theta").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment(corev1.ResourceCPU, "spot", "20").
 									Count(1).
 									Obj(),
@@ -7725,18 +7732,18 @@ func TestLastSchedulingContext(t *testing.T) {
 					Obj(),
 			},
 			wantAdmissionsOnSecondSchedule: map[workload.Reference]kueue.Admission{
-				"default/placeholder": *utiltesting.MakeAdmission("eng-cohort-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/placeholder": *utiltestingapi.MakeAdmission("eng-cohort-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "50").
 						Obj()).
 					Obj(),
-				"default/placeholder1": *utiltesting.MakeAdmission("eng-cohort-theta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/placeholder1": *utiltestingapi.MakeAdmission("eng-cohort-theta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "50").
 						Obj()).
 					Obj(),
-				"default/workload": *utiltesting.MakeAdmission("eng-cohort-theta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/workload": *utiltestingapi.MakeAdmission("eng-cohort-theta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "spot", "20").
 						Obj()).
 					Obj(),
@@ -7746,68 +7753,68 @@ func TestLastSchedulingContext(t *testing.T) {
 			name: "when the next flavor is full, but can borrow on first",
 			cqs:  clusterQueueCohort,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("placeholder", "default").
+				*utiltestingapi.MakeWorkload("placeholder", "default").
 					Request(corev1.ResourceCPU, "40").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "40").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("placeholder1", "default").
+				*utiltestingapi.MakeWorkload("placeholder1", "default").
 					Request(corev1.ResourceCPU, "40").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-theta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-theta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "40").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("placeholder2", "default").
+				*utiltestingapi.MakeWorkload("placeholder2", "default").
 					Request(corev1.ResourceCPU, "100").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-theta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-theta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "spot", "100").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("workload", "default").
+				*utiltestingapi.MakeWorkload("workload", "default").
 					Queue("main-theta").
 					Request(corev1.ResourceCPU, "20").
 					Obj(),
 			},
 			wantPreempted: sets.Set[workload.Reference]{},
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("placeholder", "default").
+				*utiltestingapi.MakeWorkload("placeholder", "default").
 					Request(corev1.ResourceCPU, "40").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "40").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("placeholder1", "default").
+				*utiltestingapi.MakeWorkload("placeholder1", "default").
 					Request(corev1.ResourceCPU, "40").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-theta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-theta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "40").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("placeholder2", "default").
+				*utiltestingapi.MakeWorkload("placeholder2", "default").
 					Request(corev1.ResourceCPU, "100").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-theta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-theta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "spot", "100").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("workload", "default").
+				*utiltestingapi.MakeWorkload("workload", "default").
 					Queue("main-theta").
 					Request(corev1.ResourceCPU, "20").
 					Condition(metav1.Condition{
@@ -7825,9 +7832,9 @@ func TestLastSchedulingContext(t *testing.T) {
 						LastTransitionTime: metav1.NewTime(now),
 					}).
 					Admission(
-						utiltesting.MakeAdmission("eng-cohort-theta").
+						utiltestingapi.MakeAdmission("eng-cohort-theta").
 							PodSets(
-								utiltesting.MakePodSetAssignment("main").
+								utiltestingapi.MakePodSetAssignment("main").
 									Assignment(corev1.ResourceCPU, "on-demand", "20").
 									Count(1).
 									Obj(),
@@ -7837,23 +7844,23 @@ func TestLastSchedulingContext(t *testing.T) {
 					Obj(),
 			},
 			wantAdmissionsOnSecondSchedule: map[workload.Reference]kueue.Admission{
-				"default/placeholder": *utiltesting.MakeAdmission("eng-cohort-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/placeholder": *utiltestingapi.MakeAdmission("eng-cohort-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "40").
 						Obj()).
 					Obj(),
-				"default/placeholder1": *utiltesting.MakeAdmission("eng-cohort-theta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/placeholder1": *utiltestingapi.MakeAdmission("eng-cohort-theta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "40").
 						Obj()).
 					Obj(),
-				"default/placeholder2": *utiltesting.MakeAdmission("eng-cohort-theta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/placeholder2": *utiltestingapi.MakeAdmission("eng-cohort-theta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "spot", "100").
 						Obj()).
 					Obj(),
-				"default/workload": *utiltesting.MakeAdmission("eng-cohort-theta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/workload": *utiltestingapi.MakeAdmission("eng-cohort-theta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
@@ -7863,26 +7870,26 @@ func TestLastSchedulingContext(t *testing.T) {
 			name: "when the next flavor is full, but can preempt on first",
 			cqs:  clusterQueueCohort,
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("placeholder-alpha", "default").
+				*utiltestingapi.MakeWorkload("placeholder-alpha", "default").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "150").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "150").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("placeholder-theta-spot", "default").
+				*utiltestingapi.MakeWorkload("placeholder-theta-spot", "default").
 					Request(corev1.ResourceCPU, "100").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-theta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-theta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "spot", "100").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "default").
+				*utiltestingapi.MakeWorkload("new", "default").
 					Queue("main-theta").
 					Request(corev1.ResourceCPU, "20").
 					Obj(),
@@ -7893,7 +7900,7 @@ func TestLastSchedulingContext(t *testing.T) {
 			}},
 			wantPreempted: sets.New[workload.Reference]("default/placeholder-alpha"),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("new", "default").
+				*utiltestingapi.MakeWorkload("new", "default").
 					Queue("main-theta").
 					Request(corev1.ResourceCPU, "20").
 					Condition(metav1.Condition{
@@ -7910,20 +7917,20 @@ func TestLastSchedulingContext(t *testing.T) {
 						},
 					}).
 					Obj(),
-				*utiltesting.MakeWorkload("placeholder-alpha", "default").
+				*utiltestingapi.MakeWorkload("placeholder-alpha", "default").
 					Priority(-1).
 					Request(corev1.ResourceCPU, "150").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-alpha").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-alpha").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "on-demand", "150").
 							Obj()).
 						Obj(), now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("placeholder-theta-spot", "default").
+				*utiltestingapi.MakeWorkload("placeholder-theta-spot", "default").
 					Request(corev1.ResourceCPU, "100").
-					ReserveQuotaAt(utiltesting.MakeAdmission("eng-cohort-theta").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("eng-cohort-theta").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "spot", "100").
 							Obj()).
 						Obj(), now).
@@ -7931,13 +7938,13 @@ func TestLastSchedulingContext(t *testing.T) {
 					Obj(),
 			},
 			wantAdmissionsOnSecondSchedule: map[workload.Reference]kueue.Admission{
-				"default/placeholder-theta-spot": *utiltesting.MakeAdmission("eng-cohort-theta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/placeholder-theta-spot": *utiltestingapi.MakeAdmission("eng-cohort-theta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "spot", "100").
 						Obj()).
 					Obj(),
-				"default/new": *utiltesting.MakeAdmission("eng-cohort-theta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/new": *utiltestingapi.MakeAdmission("eng-cohort-theta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "20").
 						Obj()).
 					Obj(),
@@ -7946,7 +7953,7 @@ func TestLastSchedulingContext(t *testing.T) {
 		{
 			name: "TryNextFlavor, but second flavor is full and can preempt on first",
 			cqs: []kueue.ClusterQueue{
-				*utiltesting.MakeClusterQueue("eng-cohort-alpha").
+				*utiltestingapi.MakeClusterQueue("eng-cohort-alpha").
 					Cohort("cohort").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -7957,14 +7964,14 @@ func TestLastSchedulingContext(t *testing.T) {
 						WhenCanBorrow:  kueue.TryNextFlavor,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").BorrowingLimit("60").Append().
 							Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").
+						*utiltestingapi.MakeFlavorQuotas("spot").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("30").BorrowingLimit("30").Append().
 							Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("eng-cohort-beta").
+				*utiltestingapi.MakeClusterQueue("eng-cohort-beta").
 					Cohort("cohort").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -7975,43 +7982,43 @@ func TestLastSchedulingContext(t *testing.T) {
 						WhenCanBorrow:  kueue.TryNextFlavor,
 					}).
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("30").BorrowingLimit("30").Append().
 							Obj(),
-						*utiltesting.MakeFlavorQuotas("spot").
+						*utiltestingapi.MakeFlavorQuotas("spot").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("30").BorrowingLimit("30").Append().
 							Obj(),
 					).Obj(),
-				*utiltesting.MakeClusterQueue("eng-cohort-shared").
+				*utiltestingapi.MakeClusterQueue("eng-cohort-shared").
 					Cohort("cohort").
 					ResourceGroup(
-						*utiltesting.MakeFlavorQuotas("on-demand").
+						*utiltestingapi.MakeFlavorQuotas("on-demand").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("30").Append().
 							Obj(),
 					).Obj(),
 			},
 			workloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("alpha1", "default").
+				*utiltestingapi.MakeWorkload("alpha1", "default").
 					Request(corev1.ResourceCPU, "22").
 					SimpleReserveQuota("eng-cohort-alpha", "on-demand", now.Add(-time.Second)).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("alpha2", "default").
+				*utiltestingapi.MakeWorkload("alpha2", "default").
 					Request(corev1.ResourceCPU, "22").
 					SimpleReserveQuota("eng-cohort-alpha", "on-demand", now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("alpha3", "default").
+				*utiltestingapi.MakeWorkload("alpha3", "default").
 					Request(corev1.ResourceCPU, "22").
 					SimpleReserveQuota("eng-cohort-alpha", "spot", now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("beta1", "default").
+				*utiltestingapi.MakeWorkload("beta1", "default").
 					Request(corev1.ResourceCPU, "22").
 					SimpleReserveQuota("eng-cohort-beta", "spot", now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "default").
+				*utiltestingapi.MakeWorkload("new", "default").
 					Queue("main-beta").
 					Request(corev1.ResourceCPU, "22").
 					Obj(),
@@ -8022,27 +8029,27 @@ func TestLastSchedulingContext(t *testing.T) {
 			}},
 			wantPreempted: sets.New[workload.Reference]("default/alpha2"),
 			wantWorkloads: []kueue.Workload{
-				*utiltesting.MakeWorkload("alpha1", "default").
+				*utiltestingapi.MakeWorkload("alpha1", "default").
 					Request(corev1.ResourceCPU, "22").
 					SimpleReserveQuota("eng-cohort-alpha", "on-demand", now.Add(-time.Second)).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("alpha2", "default").
+				*utiltestingapi.MakeWorkload("alpha2", "default").
 					Request(corev1.ResourceCPU, "22").
 					SimpleReserveQuota("eng-cohort-alpha", "on-demand", now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("alpha3", "default").
+				*utiltestingapi.MakeWorkload("alpha3", "default").
 					Request(corev1.ResourceCPU, "22").
 					SimpleReserveQuota("eng-cohort-alpha", "spot", now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("beta1", "default").
+				*utiltestingapi.MakeWorkload("beta1", "default").
 					Request(corev1.ResourceCPU, "22").
 					SimpleReserveQuota("eng-cohort-beta", "spot", now).
 					AdmittedAt(true, now).
 					Obj(),
-				*utiltesting.MakeWorkload("new", "default").
+				*utiltestingapi.MakeWorkload("new", "default").
 					Queue("main-beta").
 					Request(corev1.ResourceCPU, "22").
 					Condition(metav1.Condition{
@@ -8061,23 +8068,23 @@ func TestLastSchedulingContext(t *testing.T) {
 					Obj(),
 			},
 			wantAdmissionsOnSecondSchedule: map[workload.Reference]kueue.Admission{
-				"default/alpha1": *utiltesting.MakeAdmission("eng-cohort-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/alpha1": *utiltestingapi.MakeAdmission("eng-cohort-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "22").
 						Obj()).
 					Obj(),
-				"default/alpha3": *utiltesting.MakeAdmission("eng-cohort-alpha").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/alpha3": *utiltestingapi.MakeAdmission("eng-cohort-alpha").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "spot", "22").
 						Obj()).
 					Obj(),
-				"default/beta1": *utiltesting.MakeAdmission("eng-cohort-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/beta1": *utiltestingapi.MakeAdmission("eng-cohort-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "spot", "22").
 						Obj()).
 					Obj(),
-				"default/new": *utiltesting.MakeAdmission("eng-cohort-beta").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				"default/new": *utiltestingapi.MakeAdmission("eng-cohort-beta").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "22").
 						Obj()).
 					Obj(),
@@ -8194,6 +8201,12 @@ func TestLastSchedulingContext(t *testing.T) {
 				scheduler.schedule(ctx)
 				wg.Wait()
 
+				if features.Enabled(features.WorkloadRequestUseMergePatch) {
+					// Schedule again to ensure all workloads are admitted, as with MergePatch we enforce stricter patching.
+					scheduler.schedule(ctx)
+					wg.Wait()
+				}
+
 				if diff := cmp.Diff(tc.wantPreempted, gotPreempted); diff != "" {
 					t.Errorf("Unexpected preemptions (-want,+got):\n%s", diff)
 				}
@@ -8224,9 +8237,9 @@ func TestLastSchedulingContext(t *testing.T) {
 }
 
 func TestRequeueAndUpdate(t *testing.T) {
-	cq := utiltesting.MakeClusterQueue("cq").Obj()
-	q1 := utiltesting.MakeLocalQueue("q1", "ns1").ClusterQueue(cq.Name).Obj()
-	w1 := utiltesting.MakeWorkload("w1", "ns1").Queue(kueue.LocalQueueName(q1.Name)).Obj()
+	cq := utiltestingapi.MakeClusterQueue("cq").Obj()
+	q1 := utiltestingapi.MakeLocalQueue("q1", "ns1").ClusterQueue(cq.Name).Obj()
+	w1 := utiltestingapi.MakeWorkload("w1", "ns1").Queue(kueue.LocalQueueName(q1.Name)).Obj()
 
 	cases := []struct {
 		name              string
@@ -8371,23 +8384,23 @@ func TestRequeueAndUpdate(t *testing.T) {
 
 func TestResourcesToReserve(t *testing.T) {
 	resourceFlavors := []*kueue.ResourceFlavor{
-		utiltesting.MakeResourceFlavor("on-demand").Obj(),
-		utiltesting.MakeResourceFlavor("spot").Obj(),
-		utiltesting.MakeResourceFlavor("model-a").Obj(),
-		utiltesting.MakeResourceFlavor("model-b").Obj(),
+		utiltestingapi.MakeResourceFlavor("on-demand").Obj(),
+		utiltestingapi.MakeResourceFlavor("spot").Obj(),
+		utiltestingapi.MakeResourceFlavor("model-a").Obj(),
+		utiltestingapi.MakeResourceFlavor("model-b").Obj(),
 	}
-	cq := utiltesting.MakeClusterQueue("cq").
+	cq := utiltestingapi.MakeClusterQueue("cq").
 		Cohort("eng").
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("on-demand").
+			*utiltestingapi.MakeFlavorQuotas("on-demand").
 				Resource(corev1.ResourceMemory, "100").Obj(),
-			*utiltesting.MakeFlavorQuotas("spot").
+			*utiltestingapi.MakeFlavorQuotas("spot").
 				Resource(corev1.ResourceMemory, "0", "100").Obj(),
 		).
 		ResourceGroup(
-			*utiltesting.MakeFlavorQuotas("model-a").
+			*utiltestingapi.MakeFlavorQuotas("model-a").
 				Resource("gpu", "10", "0").Obj(),
-			*utiltesting.MakeFlavorQuotas("model-b").
+			*utiltestingapi.MakeFlavorQuotas("model-b").
 				Resource("gpu", "10", "5").Obj(),
 		).
 		QueueingStrategy(kueue.StrictFIFO).
@@ -8548,12 +8561,12 @@ func TestResourcesToReserve(t *testing.T) {
 			i := 0
 			for fr, v := range tc.cqUsage {
 				quantity := resources.ResourceQuantity(fr.Resource, v)
-				admission := utiltesting.MakeAdmission("cq").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+				admission := utiltestingapi.MakeAdmission("cq").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(fr.Resource, fr.Flavor, quantity.String()).
 						Obj()).
 					Obj()
-				wl := utiltesting.MakeWorkload(fmt.Sprintf("workload-%d", i), "default-namespace").ReserveQuota(admission).Obj()
+				wl := utiltestingapi.MakeWorkload(fmt.Sprintf("workload-%d", i), "default-namespace").ReserveQuota(admission).Obj()
 				cqCache.AddOrUpdateWorkload(log, wl)
 				i++
 			}
diff --git a/pkg/util/admissioncheck/admissioncheck_test.go b/pkg/util/admissioncheck/admissioncheck_test.go
index d6c872409..0dad35606 100644
--- a/pkg/util/admissioncheck/admissioncheck_test.go
+++ b/pkg/util/admissioncheck/admissioncheck_test.go
@@ -33,10 +33,11 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestConfigHelper(t *testing.T) {
-	testConfig := utiltesting.MakeProvisioningRequestConfig("config").
+	testConfig := utiltestingapi.MakeProvisioningRequestConfig("config").
 		ProvisioningClass("className").
 		WithParameter("p1", "v1").
 		WithManagedResource("cpu")
@@ -53,40 +54,40 @@ func TestConfigHelper(t *testing.T) {
 			wantError:            cmpopts.AnyError,
 		},
 		"no parameter reference": {
-			admissioncheck:       utiltesting.MakeAdmissionCheck("ac").Obj(),
+			admissioncheck:       utiltestingapi.MakeAdmissionCheck("ac").Obj(),
 			targetAdmissionCheck: "ac",
 			wantError:            ErrNilParametersRef,
 		},
 		"bad parameter reference, no name": {
-			admissioncheck: utiltesting.MakeAdmissionCheck("ac").
+			admissioncheck: utiltestingapi.MakeAdmissionCheck("ac").
 				Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", "").
 				Obj(),
 			targetAdmissionCheck: "ac",
 			wantError:            ErrBadParametersRef,
 		},
 		"bad parameter reference, bad group": {
-			admissioncheck: utiltesting.MakeAdmissionCheck("ac").
+			admissioncheck: utiltestingapi.MakeAdmissionCheck("ac").
 				Parameters("not-"+kueue.GroupVersion.Group, "ProvisioningRequestConfig", "config").
 				Obj(),
 			targetAdmissionCheck: "ac",
 			wantError:            ErrBadParametersRef,
 		},
 		"bad parameter reference, bad kind": {
-			admissioncheck: utiltesting.MakeAdmissionCheck("ac").
+			admissioncheck: utiltestingapi.MakeAdmissionCheck("ac").
 				Parameters(kueue.GroupVersion.Group, "NptProvisioningRequestConfig", "config").
 				Obj(),
 			targetAdmissionCheck: "ac",
 			wantError:            ErrBadParametersRef,
 		},
 		"config not found": {
-			admissioncheck: utiltesting.MakeAdmissionCheck("ac").
+			admissioncheck: utiltestingapi.MakeAdmissionCheck("ac").
 				Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", "config").
 				Obj(),
 			targetAdmissionCheck: "ac",
 			wantError:            cmpopts.AnyError,
 		},
 		"config found": {
-			admissioncheck: utiltesting.MakeAdmissionCheck("ac").
+			admissioncheck: utiltestingapi.MakeAdmissionCheck("ac").
 				Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", "config").
 				Obj(),
 			config:               testConfig.DeepCopy(),
@@ -131,19 +132,19 @@ func TestIndexerFunc(t *testing.T) {
 	}{
 		"nil ac": {},
 		"wrong controller": {
-			admissioncheck: utiltesting.MakeAdmissionCheck("ac").
+			admissioncheck: utiltestingapi.MakeAdmissionCheck("ac").
 				ControllerName("other-controller").
 				Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", "config-name").
 				Obj(),
 		},
 		"wrong ref": {
-			admissioncheck: utiltesting.MakeAdmissionCheck("ac").
+			admissioncheck: utiltestingapi.MakeAdmissionCheck("ac").
 				ControllerName("test-controller").
 				Parameters(kueue.GroupVersion.Group, "NotProvisioningRequestConfig", "config-name").
 				Obj(),
 		},
 		"good": {
-			admissioncheck: utiltesting.MakeAdmissionCheck("ac").
+			admissioncheck: utiltestingapi.MakeAdmissionCheck("ac").
 				ControllerName("test-controller").
 				Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", "config-name").
 				Obj(),
@@ -184,9 +185,9 @@ func TestFilterCheckStates(t *testing.T) {
 		},
 		"two matches": {
 			admissionchecks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("check1").ControllerName("test-controller").Obj(),
-				*utiltesting.MakeAdmissionCheck("check2").ControllerName("other-controller").Obj(),
-				*utiltesting.MakeAdmissionCheck("check3").ControllerName("test-controller").Obj(),
+				*utiltestingapi.MakeAdmissionCheck("check1").ControllerName("test-controller").Obj(),
+				*utiltestingapi.MakeAdmissionCheck("check2").ControllerName("other-controller").Obj(),
+				*utiltestingapi.MakeAdmissionCheck("check3").ControllerName("test-controller").Obj(),
 			},
 			states: []kueue.AdmissionCheckState{
 				{Name: "check1"},
@@ -228,8 +229,8 @@ func TestGetMultiKueueAdmissionCheck(t *testing.T) {
 		},
 		"no relevant checks": {
 			admissionChecks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("check1").ControllerName("other-controller").Obj(),
-				*utiltesting.MakeAdmissionCheck("check2").ControllerName("other-controller").Obj(),
+				*utiltestingapi.MakeAdmissionCheck("check1").ControllerName("other-controller").Obj(),
+				*utiltestingapi.MakeAdmissionCheck("check2").ControllerName("other-controller").Obj(),
 			},
 			workloadACS: []kueue.AdmissionCheckState{
 				{Name: "check1"},
@@ -240,8 +241,8 @@ func TestGetMultiKueueAdmissionCheck(t *testing.T) {
 		},
 		"one relevant check": {
 			admissionChecks: []kueue.AdmissionCheck{
-				*utiltesting.MakeAdmissionCheck("check1").ControllerName(kueue.MultiKueueControllerName).Obj(),
-				*utiltesting.MakeAdmissionCheck("check2").ControllerName("other-controller").Obj(),
+				*utiltestingapi.MakeAdmissionCheck("check1").ControllerName(kueue.MultiKueueControllerName).Obj(),
+				*utiltestingapi.MakeAdmissionCheck("check2").ControllerName("other-controller").Obj(),
 			},
 			workloadACS: []kueue.AdmissionCheckState{
 				{Name: "check1"},
@@ -327,7 +328,7 @@ func TestGetRemoteClusters(t *testing.T) {
 					return c.Get(ctx, key, obj, opts...)
 				},
 			})
-			ac := utiltesting.MakeAdmissionCheck(acTest).
+			ac := utiltestingapi.MakeAdmissionCheck(acTest).
 				ControllerName(kueue.MultiKueueControllerName).
 				Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", acTest).
 				Obj()
diff --git a/pkg/util/equality/podset_test.go b/pkg/util/equality/podset_test.go
index fc00c0676..bfc75c118 100644
--- a/pkg/util/equality/podset_test.go
+++ b/pkg/util/equality/podset_test.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	utiltestting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestComparePodSetSlices(t *testing.T) {
@@ -34,27 +34,27 @@ func TestComparePodSetSlices(t *testing.T) {
 		wantEquivalent    bool
 	}{
 		"different name": {
-			a:              []kueue.PodSet{*utiltestting.MakePodSet("ps", 10).SetMinimumCount(5).Obj()},
-			b:              []kueue.PodSet{*utiltestting.MakePodSet("ps2", 10).SetMinimumCount(5).Obj()},
+			a:              []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 10).SetMinimumCount(5).Obj()},
+			b:              []kueue.PodSet{*utiltestingapi.MakePodSet("ps2", 10).SetMinimumCount(5).Obj()},
 			wantEquivalent: true,
 		},
 		"different min count": {
-			a:              []kueue.PodSet{*utiltestting.MakePodSet("ps", 10).SetMinimumCount(5).Obj()},
-			b:              []kueue.PodSet{*utiltestting.MakePodSet("ps", 10).SetMinimumCount(2).Obj()},
+			a:              []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 10).SetMinimumCount(5).Obj()},
+			b:              []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 10).SetMinimumCount(2).Obj()},
 			wantEquivalent: false,
 		},
 		"different node selector": {
-			a:              []kueue.PodSet{*utiltestting.MakePodSet("ps", 10).SetMinimumCount(5).Obj()},
-			b:              []kueue.PodSet{*utiltestting.MakePodSet("ps", 10).SetMinimumCount(5).NodeSelector(map[string]string{"key": "val"}).Obj()},
+			a:              []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 10).SetMinimumCount(5).Obj()},
+			b:              []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 10).SetMinimumCount(5).NodeSelector(map[string]string{"key": "val"}).Obj()},
 			wantEquivalent: true,
 		},
 		"different requests": {
-			a:              []kueue.PodSet{*utiltestting.MakePodSet("ps", 10).SetMinimumCount(5).Request("res", "1").Obj()},
-			b:              []kueue.PodSet{*utiltestting.MakePodSet("ps", 10).SetMinimumCount(5).Request("res", "2").Obj()},
+			a:              []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 10).SetMinimumCount(5).Request("res", "1").Obj()},
+			b:              []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 10).SetMinimumCount(5).Request("res", "2").Obj()},
 			wantEquivalent: false,
 		},
 		"different requests in init containers": {
-			a: []kueue.PodSet{*utiltestting.MakePodSet("ps", 10).SetMinimumCount(5).InitContainers(corev1.Container{
+			a: []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 10).SetMinimumCount(5).InitContainers(corev1.Container{
 				Image: "img1",
 				Resources: corev1.ResourceRequirements{
 					Requests: corev1.ResourceList{
@@ -62,7 +62,7 @@ func TestComparePodSetSlices(t *testing.T) {
 					},
 				},
 			}).Obj()},
-			b: []kueue.PodSet{*utiltestting.MakePodSet("ps", 10).SetMinimumCount(5).InitContainers(corev1.Container{
+			b: []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 10).SetMinimumCount(5).InitContainers(corev1.Container{
 				Image: "img1",
 				Resources: corev1.ResourceRequirements{
 					Requests: corev1.ResourceList{
@@ -73,13 +73,13 @@ func TestComparePodSetSlices(t *testing.T) {
 			wantEquivalent: false,
 		},
 		"different requests in toleration": {
-			a: []kueue.PodSet{*utiltestting.MakePodSet("ps", 10).SetMinimumCount(5).Toleration(corev1.Toleration{
+			a: []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 10).SetMinimumCount(5).Toleration(corev1.Toleration{
 				Key:      "instance",
 				Operator: corev1.TolerationOpEqual,
 				Value:    "spot",
 				Effect:   corev1.TaintEffectNoSchedule,
 			}).Obj()},
-			b: []kueue.PodSet{*utiltestting.MakePodSet("ps", 10).SetMinimumCount(5).Toleration(corev1.Toleration{
+			b: []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 10).SetMinimumCount(5).Toleration(corev1.Toleration{
 				Key:      "instance",
 				Operator: corev1.TolerationOpEqual,
 				Value:    "demand",
@@ -88,8 +88,8 @@ func TestComparePodSetSlices(t *testing.T) {
 			wantEquivalent: false,
 		},
 		"different count": {
-			a:              []kueue.PodSet{*utiltestting.MakePodSet("ps", 10).SetMinimumCount(5).Obj()},
-			b:              []kueue.PodSet{*utiltestting.MakePodSet("ps", 20).SetMinimumCount(5).Obj()},
+			a:              []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 10).SetMinimumCount(5).Obj()},
+			b:              []kueue.PodSet{*utiltestingapi.MakePodSet("ps", 20).SetMinimumCount(5).Obj()},
 			wantEquivalent: false,
 		},
 		"different slice len": {
@@ -99,7 +99,7 @@ func TestComparePodSetSlices(t *testing.T) {
 		},
 		"different requests in toleration, ignore tolerations": {
 			a: []kueue.PodSet{
-				*utiltestting.MakePodSet("ps", 10).
+				*utiltestingapi.MakePodSet("ps", 10).
 					SetMinimumCount(5).
 					Toleration(corev1.Toleration{
 						Key:      "instance",
@@ -109,7 +109,7 @@ func TestComparePodSetSlices(t *testing.T) {
 					}).Obj(),
 			},
 			b: []kueue.PodSet{
-				*utiltestting.MakePodSet("ps", 10).
+				*utiltestingapi.MakePodSet("ps", 10).
 					SetMinimumCount(5).
 					Toleration(corev1.Toleration{
 						Key:      "instance",
@@ -123,13 +123,13 @@ func TestComparePodSetSlices(t *testing.T) {
 		},
 		"different requests in node selector": {
 			a: []kueue.PodSet{
-				*utiltestting.MakePodSet("ps", 10).
+				*utiltestingapi.MakePodSet("ps", 10).
 					SetMinimumCount(5).
 					NodeSelector(map[string]string{"key": "val"}).
 					Obj(),
 			},
 			b: []kueue.PodSet{
-				*utiltestting.MakePodSet("ps", 10).
+				*utiltestingapi.MakePodSet("ps", 10).
 					SetMinimumCount(5).
 					NodeSelector(map[string]string{"key": "val2"}).
 					Obj(),
diff --git a/pkg/util/priority/priority_test.go b/pkg/util/priority/priority_test.go
index f3202cc8f..0e6d901c1 100644
--- a/pkg/util/priority/priority_test.go
+++ b/pkg/util/priority/priority_test.go
@@ -29,6 +29,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/constants"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestPriority(t *testing.T) {
@@ -37,7 +38,7 @@ func TestPriority(t *testing.T) {
 		want     int32
 	}{
 		"priority is specified": {
-			workload: utiltesting.MakeWorkload("name", "ns").Priority(100).Obj(),
+			workload: utiltestingapi.MakeWorkload("name", "ns").Priority(100).Obj(),
 			want:     100,
 		},
 		"priority is empty": {
diff --git a/pkg/util/testing/condition_matchers.go b/pkg/util/testing/condition_matchers.go
index 6a3e8dad1..74bddf520 100644
--- a/pkg/util/testing/condition_matchers.go
+++ b/pkg/util/testing/condition_matchers.go
@@ -70,7 +70,7 @@ type conditionMatcher struct {
 func (matcher *conditionMatcher) Match(actual any) (bool, error) {
 	conditions, ok := actual.([]metav1.Condition)
 	if !ok {
-		return false, fmt.Errorf("Condition matcher expects a []metav1.Condition. Got:\n%s", format.Object(actual, 1))
+		return false, fmt.Errorf("condition matcher expects a []metav1.Condition. Got:\n%s", format.Object(actual, 1))
 	}
 
 	found := apimeta.FindStatusCondition(conditions, matcher.conditionType)
diff --git a/pkg/util/testing/condition_matchers_test.go b/pkg/util/testing/condition_matchers_test.go
index 6bf5632bb..e88721476 100644
--- a/pkg/util/testing/condition_matchers_test.go
+++ b/pkg/util/testing/condition_matchers_test.go
@@ -38,7 +38,7 @@ func TestHaveConditionStatusAndReason(t *testing.T) {
 			conditionType: "TestCondition",
 			conditions:    "invalid type",
 			want:          false,
-			wantErr:       "Condition matcher expects a []metav1.Condition. Got:\n    <string>: invalid type",
+			wantErr:       "condition matcher expects a []metav1.Condition. Got:\n    <string>: invalid type",
 		},
 		"success": {
 			conditionType: "TestCondition",
diff --git a/pkg/util/testing/defaults.go b/pkg/util/testing/defaults.go
index af6e5b0fb..1efe90951 100644
--- a/pkg/util/testing/defaults.go
+++ b/pkg/util/testing/defaults.go
@@ -20,8 +20,6 @@ import (
 	"os"
 
 	corev1 "k8s.io/api/core/v1"
-
-	kueuealpha "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 )
 
 const (
@@ -29,27 +27,6 @@ const (
 	DefaultBlockTopologyLevel = "cloud.provider.com/topology-block"
 )
 
-// MakeDefaultOneLevelTopology creates a default topology with hostname level.
-func MakeDefaultOneLevelTopology(name string) *kueuealpha.Topology {
-	return MakeTopology(name).
-		Levels(corev1.LabelHostname).
-		Obj()
-}
-
-// MakeDefaultTwoLevelTopology creates a default topology with block and rack levels.
-func MakeDefaultTwoLevelTopology(name string) *kueuealpha.Topology {
-	return MakeTopology(name).
-		Levels(DefaultBlockTopologyLevel, DefaultRackTopologyLevel).
-		Obj()
-}
-
-// MakeDefaultThreeLevelTopology creates a default topology with block, rack and hostname levels.
-func MakeDefaultThreeLevelTopology(name string) *kueuealpha.Topology {
-	return MakeTopology(name).
-		Levels(DefaultBlockTopologyLevel, DefaultRackTopologyLevel, corev1.LabelHostname).
-		Obj()
-}
-
 // MakeNamespace creates a default namespace with name.
 func MakeNamespace(name string) *corev1.Namespace {
 	return MakeNamespaceWrapper(name).Obj()
diff --git a/pkg/util/testing/v1beta1/wrappers.go b/pkg/util/testing/v1beta1/wrappers.go
new file mode 100644
index 000000000..777ea0e72
--- /dev/null
+++ b/pkg/util/testing/v1beta1/wrappers.go
@@ -0,0 +1,1546 @@
+/*
+Copyright The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta1
+
+import (
+	"fmt"
+	"maps"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/ptr"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+)
+
+// MakeDefaultOneLevelTopology creates a default topology with hostname level.
+func MakeDefaultOneLevelTopology(name string) *kueue.Topology {
+	return MakeTopology(name).
+		Levels(corev1.LabelHostname).
+		Obj()
+}
+
+// MakeDefaultTwoLevelTopology creates a default topology with block and rack levels.
+func MakeDefaultTwoLevelTopology(name string) *kueue.Topology {
+	return MakeTopology(name).
+		Levels(utiltesting.DefaultBlockTopologyLevel, utiltesting.DefaultRackTopologyLevel).
+		Obj()
+}
+
+// MakeDefaultThreeLevelTopology creates a default topology with block, rack and hostname levels.
+func MakeDefaultThreeLevelTopology(name string) *kueue.Topology {
+	return MakeTopology(name).
+		Levels(utiltesting.DefaultBlockTopologyLevel, utiltesting.DefaultRackTopologyLevel, corev1.LabelHostname).
+		Obj()
+}
+
+type WorkloadWrapper struct{ kueue.Workload }
+
+// MakeWorkload creates a wrapper for a Workload with a single pod
+// with a single container.
+func MakeWorkload(name, ns string) *WorkloadWrapper {
+	return &WorkloadWrapper{kueue.Workload{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: ns},
+		Spec: kueue.WorkloadSpec{
+			PodSets: []kueue.PodSet{
+				*MakePodSet(kueue.DefaultPodSetName, 1).Obj(),
+			},
+		},
+	}}
+}
+
+// MakeWorkloadWithGeneratedName creates a wrapper for a Workload with a single pod
+// with a single container.
+func MakeWorkloadWithGeneratedName(namePrefix, ns string) *WorkloadWrapper {
+	wl := MakeWorkload("", ns)
+	wl.GenerateName = namePrefix
+	return wl
+}
+
+func (w *WorkloadWrapper) Obj() *kueue.Workload {
+	return &w.Workload
+}
+
+func (w *WorkloadWrapper) Clone() *WorkloadWrapper {
+	return &WorkloadWrapper{Workload: *w.DeepCopy()}
+}
+
+func (w *WorkloadWrapper) UID(uid types.UID) *WorkloadWrapper {
+	w.Workload.UID = uid
+	return w
+}
+
+// Generation sets the generation of the Workload.
+func (w *WorkloadWrapper) Generation(num int64) *WorkloadWrapper {
+	w.ObjectMeta.Generation = num
+	return w
+}
+
+func (w *WorkloadWrapper) Name(name string) *WorkloadWrapper {
+	w.Workload.Name = name
+	return w
+}
+
+func (w *WorkloadWrapper) Finalizers(fin ...string) *WorkloadWrapper {
+	w.ObjectMeta.Finalizers = fin
+	return w
+}
+
+func (w *WorkloadWrapper) Request(r corev1.ResourceName, q string) *WorkloadWrapper {
+	w.Spec.PodSets[0].Template.Spec.Containers[0].Resources.Requests[r] = resource.MustParse(q)
+	return w
+}
+
+func (w *WorkloadWrapper) Limit(r corev1.ResourceName, q string) *WorkloadWrapper {
+	res := &w.Spec.PodSets[0].Template.Spec.Containers[0].Resources
+	if res.Limits == nil {
+		res.Limits = corev1.ResourceList{
+			r: resource.MustParse(q),
+		}
+	} else {
+		res.Limits[r] = resource.MustParse(q)
+	}
+	return w
+}
+
+func (w *WorkloadWrapper) RequestAndLimit(r corev1.ResourceName, q string) *WorkloadWrapper {
+	return w.Request(r, q).Limit(r, q)
+}
+
+func (w *WorkloadWrapper) Queue(q kueue.LocalQueueName) *WorkloadWrapper {
+	w.Spec.QueueName = q
+	return w
+}
+
+func (w *WorkloadWrapper) Active(a bool) *WorkloadWrapper {
+	w.Spec.Active = ptr.To(a)
+	return w
+}
+
+// SimpleReserveQuota reserves the quota for all the requested resources in one flavor.
+// It assumes one podset with one container.
+func (w *WorkloadWrapper) SimpleReserveQuota(cq, flavor string, now time.Time) *WorkloadWrapper {
+	admission := MakeAdmission(cq, w.Spec.PodSets[0].Name)
+	resReq := make(corev1.ResourceList)
+	flavors := make(map[corev1.ResourceName]kueue.ResourceFlavorReference)
+	for res, val := range w.Spec.PodSets[0].Template.Spec.Containers[0].Resources.Requests {
+		val.Mul(int64(w.Spec.PodSets[0].Count))
+		resReq[res] = val
+		flavors[res] = kueue.ResourceFlavorReference(flavor)
+	}
+	admission.PodSetAssignments[0].Count = ptr.To(w.Spec.PodSets[0].Count)
+	admission.PodSetAssignments[0].Flavors = flavors
+	admission.PodSetAssignments[0].ResourceUsage = resReq
+
+	return w.ReserveQuotaAt(admission.Obj(), now)
+}
+
+// ReserveQuota sets workload admission and adds a "QuotaReserved" status condition
+func (w *WorkloadWrapper) ReserveQuota(a *kueue.Admission) *WorkloadWrapper {
+	return w.ReserveQuotaAt(a, time.Now())
+}
+
+// ReserveQuotaAt sets workload admission and adds a "QuotaReserved" status condition
+func (w *WorkloadWrapper) ReserveQuotaAt(a *kueue.Admission, now time.Time) *WorkloadWrapper {
+	w.Status.Admission = a
+	w.Status.Conditions = []metav1.Condition{{
+		Type:               kueue.WorkloadQuotaReserved,
+		Status:             metav1.ConditionTrue,
+		LastTransitionTime: metav1.NewTime(now),
+		Reason:             "AdmittedByTest",
+		Message:            fmt.Sprintf("Admitted by ClusterQueue %s", w.Status.Admission.ClusterQueue),
+	}}
+	return w
+}
+
+// QuotaReservedTime - sets the LastTransitionTime of the QuotaReserved condition if found.
+func (w *WorkloadWrapper) QuotaReservedTime(t time.Time) *WorkloadWrapper {
+	cond := apimeta.FindStatusCondition(w.Status.Conditions, kueue.WorkloadQuotaReserved)
+	cond.LastTransitionTime = metav1.NewTime(t)
+	return w
+}
+
+func (w *WorkloadWrapper) Admitted(a bool) *WorkloadWrapper {
+	return w.AdmittedAt(a, time.Now())
+}
+
+func (w *WorkloadWrapper) AdmittedAt(a bool, t time.Time) *WorkloadWrapper {
+	cond := metav1.Condition{
+		Type:               kueue.WorkloadAdmitted,
+		Status:             metav1.ConditionTrue,
+		LastTransitionTime: metav1.NewTime(t),
+		Reason:             "ByTest",
+		Message:            fmt.Sprintf("Admitted by ClusterQueue %s", w.Status.Admission.ClusterQueue),
+	}
+	if !a {
+		cond.Status = metav1.ConditionFalse
+	}
+	apimeta.SetStatusCondition(&w.Status.Conditions, cond)
+	return w
+}
+
+func (w *WorkloadWrapper) Finished() *WorkloadWrapper {
+	return w.FinishedAt(time.Now())
+}
+
+func (w *WorkloadWrapper) FinishedAt(t time.Time) *WorkloadWrapper {
+	cond := metav1.Condition{
+		Type:               kueue.WorkloadFinished,
+		Status:             metav1.ConditionTrue,
+		LastTransitionTime: metav1.NewTime(t),
+		Reason:             "ByTest",
+		Message:            "Finished by test",
+	}
+	apimeta.SetStatusCondition(&w.Status.Conditions, cond)
+	return w
+}
+
+func (w *WorkloadWrapper) Evicted() *WorkloadWrapper {
+	cond := metav1.Condition{
+		Type:               kueue.WorkloadEvicted,
+		Status:             metav1.ConditionTrue,
+		LastTransitionTime: metav1.Now(),
+		Reason:             "ByTest",
+		Message:            "Evicted by test",
+	}
+	apimeta.SetStatusCondition(&w.Status.Conditions, cond)
+	return w
+}
+
+func (w *WorkloadWrapper) Creation(t time.Time) *WorkloadWrapper {
+	w.CreationTimestamp = metav1.NewTime(t)
+	return w
+}
+
+func (w *WorkloadWrapper) PriorityClass(priorityClassName string) *WorkloadWrapper {
+	w.Spec.PriorityClassName = priorityClassName
+	return w
+}
+
+func (w *WorkloadWrapper) RuntimeClass(name string) *WorkloadWrapper {
+	for i := range w.Spec.PodSets {
+		w.Spec.PodSets[i].Template.Spec.RuntimeClassName = &name
+	}
+	return w
+}
+
+func (w *WorkloadWrapper) Priority(priority int32) *WorkloadWrapper {
+	w.Spec.Priority = &priority
+	return w
+}
+
+func (w *WorkloadWrapper) PriorityClassSource(source string) *WorkloadWrapper {
+	w.Spec.PriorityClassSource = source
+	return w
+}
+
+func (w *WorkloadWrapper) PodSets(podSets ...kueue.PodSet) *WorkloadWrapper {
+	w.Spec.PodSets = podSets
+	return w
+}
+
+func (w *WorkloadWrapper) Toleration(t corev1.Toleration) *WorkloadWrapper {
+	w.Spec.PodSets[0].Template.Spec.Tolerations = append(w.Spec.PodSets[0].Template.Spec.Tolerations, t)
+	return w
+}
+
+func (w *WorkloadWrapper) NodeSelector(kv map[string]string) *WorkloadWrapper {
+	w.Spec.PodSets[0].Template.Spec.NodeSelector = kv
+	return w
+}
+
+func (w *WorkloadWrapper) Condition(condition metav1.Condition) *WorkloadWrapper {
+	apimeta.SetStatusCondition(&w.Status.Conditions, condition)
+	return w
+}
+
+func (w *WorkloadWrapper) AdmissionCheck(ac kueue.AdmissionCheckState) *WorkloadWrapper {
+	w.Status.AdmissionChecks = append(w.Status.AdmissionChecks, ac)
+	return w
+}
+
+func (w *WorkloadWrapper) ResourceRequests(rr ...kueue.PodSetRequest) *WorkloadWrapper {
+	w.Status.ResourceRequests = rr
+	return w
+}
+
+func (w *WorkloadWrapper) SetOrReplaceCondition(condition metav1.Condition) *WorkloadWrapper {
+	existingCondition := apimeta.FindStatusCondition(w.Status.Conditions, condition.Type)
+	if existingCondition != nil {
+		apimeta.RemoveStatusCondition(&w.Status.Conditions, condition.Type)
+	}
+	apimeta.SetStatusCondition(&w.Status.Conditions, condition)
+	return w
+}
+
+func (w *WorkloadWrapper) ReclaimablePods(rps ...kueue.ReclaimablePod) *WorkloadWrapper {
+	w.Status.ReclaimablePods = rps
+	return w
+}
+
+func (w *WorkloadWrapper) Labels(l map[string]string) *WorkloadWrapper {
+	w.ObjectMeta.Labels = l
+	return w
+}
+
+func (w *WorkloadWrapper) Label(k, v string) *WorkloadWrapper {
+	if w.ObjectMeta.Labels == nil {
+		w.ObjectMeta.Labels = make(map[string]string)
+	}
+	w.ObjectMeta.Labels[k] = v
+	return w
+}
+
+func (w *WorkloadWrapper) Annotation(k, v string) *WorkloadWrapper {
+	if w.ObjectMeta.Annotations == nil {
+		w.ObjectMeta.Annotations = make(map[string]string)
+	}
+	w.ObjectMeta.Annotations[k] = v
+	return w
+}
+
+func (w *WorkloadWrapper) AdmissionChecks(checks ...kueue.AdmissionCheckState) *WorkloadWrapper {
+	w.Status.AdmissionChecks = checks
+	return w
+}
+
+func (w *WorkloadWrapper) Admission(admission *kueue.Admission) *WorkloadWrapper {
+	w.Status.Admission = admission
+	return w
+}
+
+func (w *WorkloadWrapper) Conditions(conditions ...metav1.Condition) *WorkloadWrapper {
+	w.Status.Conditions = conditions
+	return w
+}
+
+func (w *WorkloadWrapper) ControllerReference(gvk schema.GroupVersionKind, name, uid string) *WorkloadWrapper {
+	AppendOwnerReference(&w.Workload, gvk, name, uid, ptr.To(true), ptr.To(true))
+	return w
+}
+
+func (w *WorkloadWrapper) OwnerReference(gvk schema.GroupVersionKind, name, uid string) *WorkloadWrapper {
+	AppendOwnerReference(&w.Workload, gvk, name, uid, nil, nil)
+	return w
+}
+
+func (w *WorkloadWrapper) Annotations(annotations map[string]string) *WorkloadWrapper {
+	w.ObjectMeta.Annotations = annotations
+	return w
+}
+
+func (w *WorkloadWrapper) UnhealthyNodes(nodeNames ...string) *WorkloadWrapper {
+	for _, nodeName := range nodeNames {
+		w.Status.UnhealthyNodes = append(w.Status.UnhealthyNodes, kueue.UnhealthyNode{Name: nodeName})
+	}
+	return w
+}
+
+// DeletionTimestamp sets a deletion timestamp for the workload.
+func (w *WorkloadWrapper) DeletionTimestamp(t time.Time) *WorkloadWrapper {
+	w.Workload.DeletionTimestamp = ptr.To(metav1.NewTime(t).Rfc3339Copy())
+	return w
+}
+
+func (w *WorkloadWrapper) RequeueState(count *int32, requeueAt *metav1.Time) *WorkloadWrapper {
+	if count == nil && requeueAt == nil {
+		w.Status.RequeueState = nil
+		return w
+	}
+	if w.Status.RequeueState == nil {
+		w.Status.RequeueState = &kueue.RequeueState{}
+	}
+	if count != nil {
+		w.Status.RequeueState.Count = count
+	}
+	if requeueAt != nil {
+		w.Status.RequeueState.RequeueAt = requeueAt
+	}
+	return w
+}
+
+func (w *WorkloadWrapper) ResourceVersion(v string) *WorkloadWrapper {
+	w.SetResourceVersion(v)
+	return w
+}
+
+func (w *WorkloadWrapper) MaximumExecutionTimeSeconds(v int32) *WorkloadWrapper {
+	w.Spec.MaximumExecutionTimeSeconds = &v
+	return w
+}
+
+func (w *WorkloadWrapper) PastAdmittedTime(v int32) *WorkloadWrapper {
+	w.Status.AccumulatedPastExexcutionTimeSeconds = &v
+	return w
+}
+
+func (w *WorkloadWrapper) SchedulingStatsEviction(evictionState kueue.WorkloadSchedulingStatsEviction) *WorkloadWrapper {
+	if w.Status.SchedulingStats == nil {
+		w.Status.SchedulingStats = &kueue.SchedulingStats{}
+	}
+	w.Status.SchedulingStats.Evictions = append(w.Status.SchedulingStats.Evictions, evictionState)
+	return w
+}
+
+func (w *WorkloadWrapper) ClusterName(clusterName string) *WorkloadWrapper {
+	w.Status.ClusterName = &clusterName
+	return w
+}
+
+func (w *WorkloadWrapper) NominatedClusterNames(nominatedClusterNames ...string) *WorkloadWrapper {
+	w.Status.NominatedClusterNames = nominatedClusterNames
+	return w
+}
+
+func AppendOwnerReference(obj client.Object, gvk schema.GroupVersionKind, name, uid string, controller, blockDeletion *bool) {
+	obj.SetOwnerReferences(append(obj.GetOwnerReferences(), metav1.OwnerReference{
+		APIVersion:         gvk.GroupVersion().String(),
+		Kind:               gvk.Kind,
+		Name:               name,
+		UID:                types.UID(uid),
+		Controller:         controller,
+		BlockOwnerDeletion: blockDeletion,
+	}))
+}
+
+type PodSetWrapper struct{ kueue.PodSet }
+
+func MakePodSet(name kueue.PodSetReference, count int) *PodSetWrapper {
+	return &PodSetWrapper{
+		kueue.PodSet{
+			Name:  name,
+			Count: int32(count),
+			Template: corev1.PodTemplateSpec{
+				Spec: corev1.PodSpec{
+					RestartPolicy: corev1.RestartPolicyNever,
+					Containers: []corev1.Container{
+						{
+							Name: "c",
+							Resources: corev1.ResourceRequirements{
+								Requests: make(corev1.ResourceList),
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func (p *PodSetWrapper) PodSpec(ps corev1.PodSpec) *PodSetWrapper {
+	p.Template.Spec = ps
+	return p
+}
+
+func (p *PodSetWrapper) PriorityClass(pc string) *PodSetWrapper {
+	p.Template.Spec.PriorityClassName = pc
+	return p
+}
+
+func (p *PodSetWrapper) RuntimeClass(name string) *PodSetWrapper {
+	p.Template.Spec.RuntimeClassName = &name
+	return p
+}
+
+func (p *PodSetWrapper) RestartPolicy(policy corev1.RestartPolicy) *PodSetWrapper {
+	p.Template.Spec.RestartPolicy = policy
+	return p
+}
+
+func (p *PodSetWrapper) RequiredTopologyRequest(level string) *PodSetWrapper {
+	if p.TopologyRequest == nil {
+		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
+	}
+	p.TopologyRequest.Required = &level
+	return p
+}
+
+func (p *PodSetWrapper) PodSetGroup(name string) *PodSetWrapper {
+	if p.TopologyRequest == nil {
+		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
+	}
+	p.TopologyRequest.PodSetGroupName = &name
+	return p
+}
+
+func (p *PodSetWrapper) SliceRequiredTopologyRequest(level string) *PodSetWrapper {
+	if p.TopologyRequest == nil {
+		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
+	}
+	p.TopologyRequest.PodSetSliceRequiredTopology = &level
+	return p
+}
+
+func (p *PodSetWrapper) SliceSizeTopologyRequest(size int32) *PodSetWrapper {
+	if p.TopologyRequest == nil {
+		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
+	}
+	p.TopologyRequest.PodSetSliceSize = &size
+	return p
+}
+
+func (p *PodSetWrapper) PreferredTopologyRequest(level string) *PodSetWrapper {
+	if p.TopologyRequest == nil {
+		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
+	}
+	p.TopologyRequest.Preferred = &level
+	return p
+}
+
+func (p *PodSetWrapper) PodIndexLabel(label *string) *PodSetWrapper {
+	if p.TopologyRequest == nil {
+		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
+	}
+	p.TopologyRequest.PodIndexLabel = label
+	return p
+}
+
+func (p *PodSetWrapper) SubGroupIndexLabel(label *string) *PodSetWrapper {
+	if p.TopologyRequest == nil {
+		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
+	}
+	p.TopologyRequest.SubGroupIndexLabel = label
+	return p
+}
+
+func (p *PodSetWrapper) SubGroupCount(count *int32) *PodSetWrapper {
+	if p.TopologyRequest == nil {
+		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
+	}
+	p.TopologyRequest.SubGroupCount = count
+	return p
+}
+
+func (p *PodSetWrapper) Obj() *kueue.PodSet {
+	return &p.PodSet
+}
+
+func (p *PodSetWrapper) Clone() *PodSetWrapper {
+	return &PodSetWrapper{PodSet: *p.DeepCopy()}
+}
+
+func (p *PodSetWrapper) Request(r corev1.ResourceName, q string) *PodSetWrapper {
+	p.Template.Spec.Containers[0].Resources.Requests[r] = resource.MustParse(q)
+	return p
+}
+
+func (p *PodSetWrapper) Limit(r corev1.ResourceName, q string) *PodSetWrapper {
+	if p.Template.Spec.Containers[0].Resources.Limits == nil {
+		p.Template.Spec.Containers[0].Resources.Limits = corev1.ResourceList{}
+	}
+	p.Template.Spec.Containers[0].Resources.Limits[r] = resource.MustParse(q)
+	return p
+}
+
+func (p *PodSetWrapper) Image(image string) *PodSetWrapper {
+	p.Template.Spec.Containers[0].Image = image
+	return p
+}
+
+func (p *PodSetWrapper) SetMinimumCount(mc int32) *PodSetWrapper {
+	p.MinCount = &mc
+	return p
+}
+
+func (p *PodSetWrapper) Toleration(t corev1.Toleration) *PodSetWrapper {
+	p.Template.Spec.Tolerations = append(p.Template.Spec.Tolerations, t)
+	return p
+}
+
+func (p *PodSetWrapper) Containers(containers ...corev1.Container) *PodSetWrapper {
+	p.Template.Spec.Containers = containers
+	return p
+}
+
+func (p *PodSetWrapper) InitContainers(containers ...corev1.Container) *PodSetWrapper {
+	p.Template.Spec.InitContainers = containers
+	return p
+}
+
+func (p *PodSetWrapper) NodeSelector(kv map[string]string) *PodSetWrapper {
+	p.Template.Spec.NodeSelector = kv
+	return p
+}
+
+func (p *PodSetWrapper) RequiredDuringSchedulingIgnoredDuringExecution(nodeSelectorTerms []corev1.NodeSelectorTerm) *PodSetWrapper {
+	if p.Template.Spec.Affinity == nil {
+		p.Template.Spec.Affinity = &corev1.Affinity{}
+	}
+	if p.Template.Spec.Affinity.NodeAffinity == nil {
+		p.Template.Spec.Affinity.NodeAffinity = &corev1.NodeAffinity{}
+	}
+	if p.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution == nil {
+		p.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution = &corev1.NodeSelector{}
+	}
+	p.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms = append(
+		p.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms,
+		nodeSelectorTerms...,
+	)
+	return p
+}
+
+func (p *PodSetWrapper) NodeName(name string) *PodSetWrapper {
+	p.Template.Spec.NodeName = name
+	return p
+}
+
+func (p *PodSetWrapper) Labels(kv map[string]string) *PodSetWrapper {
+	p.Template.Labels = kv
+	return p
+}
+
+func (p *PodSetWrapper) Annotations(kv map[string]string) *PodSetWrapper {
+	p.Template.Annotations = kv
+	return p
+}
+
+func (p *PodSetWrapper) SchedulingGates(sg ...corev1.PodSchedulingGate) *PodSetWrapper {
+	p.Template.Spec.SchedulingGates = sg
+	return p
+}
+
+func (p *PodSetWrapper) PodOverHead(resources corev1.ResourceList) *PodSetWrapper {
+	p.Template.Spec.Overhead = resources
+	return p
+}
+
+func (p *PodSetWrapper) ResourceClaimTemplate(claimName, templateName string) *PodSetWrapper {
+	p.Template.Spec.ResourceClaims = append(p.Template.Spec.ResourceClaims, corev1.PodResourceClaim{
+		Name:                      claimName,
+		ResourceClaimTemplateName: ptr.To(templateName),
+	})
+	if len(p.Template.Spec.Containers) > 0 {
+		p.Template.Spec.Containers[0].Resources.Claims = append(
+			p.Template.Spec.Containers[0].Resources.Claims,
+			corev1.ResourceClaim{Name: claimName},
+		)
+	}
+	return p
+}
+
+func (p *PodSetWrapper) ResourceClaim(claimName, resourceClaimName string) *PodSetWrapper {
+	p.Template.Spec.ResourceClaims = append(p.Template.Spec.ResourceClaims, corev1.PodResourceClaim{
+		Name:              claimName,
+		ResourceClaimName: ptr.To(resourceClaimName),
+	})
+	if len(p.Template.Spec.Containers) > 0 {
+		p.Template.Spec.Containers[0].Resources.Claims = append(
+			p.Template.Spec.Containers[0].Resources.Claims,
+			corev1.ResourceClaim{Name: claimName},
+		)
+	}
+	return p
+}
+
+// AdmissionWrapper wraps an Admission
+type AdmissionWrapper struct{ kueue.Admission }
+
+func MakeAdmission(cq string, podSetNames ...kueue.PodSetReference) *AdmissionWrapper {
+	wrap := &AdmissionWrapper{kueue.Admission{
+		ClusterQueue: kueue.ClusterQueueReference(cq),
+	}}
+
+	if len(podSetNames) == 0 {
+		wrap.PodSetAssignments = []kueue.PodSetAssignment{
+			MakePodSetAssignment(kueue.DefaultPodSetName).Obj(),
+		}
+		return wrap
+	}
+
+	var psFlavors []kueue.PodSetAssignment
+	for _, name := range podSetNames {
+		psFlavors = append(psFlavors, MakePodSetAssignment(name).Obj())
+	}
+	wrap.PodSetAssignments = psFlavors
+	return wrap
+}
+
+func (w *AdmissionWrapper) Obj() *kueue.Admission {
+	return &w.Admission
+}
+
+func (w *AdmissionWrapper) PodSets(podSets ...kueue.PodSetAssignment) *AdmissionWrapper {
+	w.PodSetAssignments = podSets
+	return w
+}
+
+// LocalQueueWrapper wraps a Queue.
+type LocalQueueWrapper struct{ kueue.LocalQueue }
+
+// MakeLocalQueue creates a wrapper for a LocalQueue.
+func MakeLocalQueue(name, ns string) *LocalQueueWrapper {
+	return &LocalQueueWrapper{kueue.LocalQueue{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: ns,
+		},
+	}}
+}
+
+// Creation sets the creation timestamp of the LocalQueue.
+func (q *LocalQueueWrapper) Creation(t time.Time) *LocalQueueWrapper {
+	q.CreationTimestamp = metav1.NewTime(t)
+	return q
+}
+
+// Label sets the label on the LocalQueue.
+func (q *LocalQueueWrapper) Label(k, v string) *LocalQueueWrapper {
+	if q.Labels == nil {
+		q.Labels = make(map[string]string)
+	}
+	q.Labels[k] = v
+	return q
+}
+
+// Obj returns the inner LocalQueue.
+func (q *LocalQueueWrapper) Obj() *kueue.LocalQueue {
+	return &q.LocalQueue
+}
+
+// ClusterQueue updates the clusterQueue the queue points to.
+func (q *LocalQueueWrapper) ClusterQueue(c string) *LocalQueueWrapper {
+	q.Spec.ClusterQueue = kueue.ClusterQueueReference(c)
+	return q
+}
+
+// StopPolicy sets the stop policy.
+func (q *LocalQueueWrapper) StopPolicy(p kueue.StopPolicy) *LocalQueueWrapper {
+	q.Spec.StopPolicy = &p
+	return q
+}
+
+// FairSharing sets the fair sharing config.
+func (q *LocalQueueWrapper) FairSharing(fs *kueue.FairSharing) *LocalQueueWrapper {
+	q.Spec.FairSharing = fs
+	return q
+}
+
+// PendingWorkloads updates the pendingWorkloads in status.
+func (q *LocalQueueWrapper) PendingWorkloads(n int32) *LocalQueueWrapper {
+	q.Status.PendingWorkloads = n
+	return q
+}
+
+// ReservingWorkloads updates the reservingWorkloads in status.
+func (q *LocalQueueWrapper) ReservingWorkloads(n int32) *LocalQueueWrapper {
+	q.Status.ReservingWorkloads = n
+	return q
+}
+
+// AdmittedWorkloads updates the admittedWorkloads in status.
+func (q *LocalQueueWrapper) AdmittedWorkloads(n int32) *LocalQueueWrapper {
+	q.Status.AdmittedWorkloads = n
+	return q
+}
+
+// Condition sets a condition on the LocalQueue.
+func (q *LocalQueueWrapper) Condition(conditionType string, status metav1.ConditionStatus, reason, message string, generation int64) *LocalQueueWrapper {
+	apimeta.SetStatusCondition(&q.Status.Conditions, metav1.Condition{
+		Type:               conditionType,
+		Status:             status,
+		Reason:             reason,
+		Message:            message,
+		ObservedGeneration: generation,
+	})
+	return q
+}
+
+func (q *LocalQueueWrapper) Active(status metav1.ConditionStatus) *LocalQueueWrapper {
+	apimeta.SetStatusCondition(&q.Status.Conditions, metav1.Condition{
+		Type:    kueue.LocalQueueActive,
+		Status:  status,
+		Reason:  "Ready",
+		Message: "Can submit new workloads to localQueue",
+	})
+	return q
+}
+
+// FairSharingStatus updates the fairSharing in status.
+func (q *LocalQueueWrapper) FairSharingStatus(status *kueue.FairSharingStatus) *LocalQueueWrapper {
+	q.Status.FairSharing = status
+	return q
+}
+
+// Generation sets the generation of the LocalQueue.
+func (q *LocalQueueWrapper) Generation(num int64) *LocalQueueWrapper {
+	q.ObjectMeta.Generation = num
+	return q
+}
+
+// GeneratedName sets the prefix for the server to generate unique name.
+// No name should be given in the MakeClusterQueue for the GeneratedName to work.
+func (q *LocalQueueWrapper) GeneratedName(name string) *LocalQueueWrapper {
+	q.GenerateName = name
+	return q
+}
+
+type CohortWrapper struct {
+	kueue.Cohort
+}
+
+func MakeCohort(name kueue.CohortReference) *CohortWrapper {
+	return &CohortWrapper{kueue.Cohort{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: string(name),
+		},
+	}}
+}
+
+func (c *CohortWrapper) Obj() *kueue.Cohort {
+	return &c.Cohort
+}
+
+func (c *CohortWrapper) Parent(parentName kueue.CohortReference) *CohortWrapper {
+	c.Spec.ParentName = parentName
+	return c
+}
+
+// ResourceGroup adds a ResourceGroup with flavors.
+func (c *CohortWrapper) ResourceGroup(flavors ...kueue.FlavorQuotas) *CohortWrapper {
+	c.Spec.ResourceGroups = append(c.Spec.ResourceGroups, ResourceGroup(flavors...))
+	return c
+}
+
+func (c *CohortWrapper) FairWeight(w resource.Quantity) *CohortWrapper {
+	if c.Spec.FairSharing == nil {
+		c.Spec.FairSharing = &kueue.FairSharing{}
+	}
+	c.Spec.FairSharing.Weight = &w
+	return c
+}
+
+// ClusterQueueWrapper wraps a ClusterQueue.
+type ClusterQueueWrapper struct{ kueue.ClusterQueue }
+
+// MakeClusterQueue creates a wrapper for a ClusterQueue with a
+// select-all NamespaceSelector.
+func MakeClusterQueue(name string) *ClusterQueueWrapper {
+	return &ClusterQueueWrapper{kueue.ClusterQueue{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: name,
+		},
+		Spec: kueue.ClusterQueueSpec{
+			NamespaceSelector: &metav1.LabelSelector{},
+			QueueingStrategy:  kueue.BestEffortFIFO,
+			FlavorFungibility: &kueue.FlavorFungibility{
+				WhenCanBorrow:  kueue.MayStopSearch,
+				WhenCanPreempt: kueue.TryNextFlavor,
+			},
+		},
+	}}
+}
+
+func (c *ClusterQueueWrapper) Clone() *ClusterQueueWrapper {
+	return &ClusterQueueWrapper{ClusterQueue: *c.DeepCopy()}
+}
+
+// Obj returns the inner ClusterQueue.
+func (c *ClusterQueueWrapper) Obj() *kueue.ClusterQueue {
+	return &c.ClusterQueue
+}
+
+// Cohort sets the borrowing cohort.
+func (c *ClusterQueueWrapper) Cohort(cohort kueue.CohortReference) *ClusterQueueWrapper {
+	c.Spec.Cohort = cohort
+	return c
+}
+
+func (c *ClusterQueueWrapper) AdmissionCheckStrategy(acs ...kueue.AdmissionCheckStrategyRule) *ClusterQueueWrapper {
+	if c.Spec.AdmissionChecksStrategy == nil {
+		c.Spec.AdmissionChecksStrategy = &kueue.AdmissionChecksStrategy{}
+	}
+	c.Spec.AdmissionChecksStrategy.AdmissionChecks = acs
+	return c
+}
+
+func (c *ClusterQueueWrapper) AdmissionMode(am kueue.AdmissionMode) *ClusterQueueWrapper {
+	if c.Spec.AdmissionScope == nil {
+		c.Spec.AdmissionScope = &kueue.AdmissionScope{}
+	}
+	c.Spec.AdmissionScope.AdmissionMode = am
+	return c
+}
+
+func (c *ClusterQueueWrapper) Active(status metav1.ConditionStatus) *ClusterQueueWrapper {
+	apimeta.SetStatusCondition(&c.Status.Conditions, metav1.Condition{
+		Type:    kueue.ClusterQueueActive,
+		Status:  status,
+		Reason:  "By test",
+		Message: "by test",
+	})
+	return c
+}
+
+// GeneratedName sets the prefix for the server to generate unique name.
+// No name should be given in the MakeClusterQueue for the GeneratedName to work.
+func (c *ClusterQueueWrapper) GeneratedName(name string) *ClusterQueueWrapper {
+	c.GenerateName = name
+	return c
+}
+
+// ResourceGroup creates a ResourceGroup with the given FlavorQuotas.
+func ResourceGroup(flavors ...kueue.FlavorQuotas) kueue.ResourceGroup {
+	rg := kueue.ResourceGroup{
+		Flavors: flavors,
+	}
+	if len(flavors) > 0 {
+		var resources []corev1.ResourceName
+		for _, r := range flavors[0].Resources {
+			resources = append(resources, r.Name)
+		}
+		for i := 1; i < len(flavors); i++ {
+			if len(flavors[i].Resources) != len(resources) {
+				panic("Must list the same resources in all flavors in a ResourceGroup")
+			}
+			for j, r := range flavors[i].Resources {
+				if r.Name != resources[j] {
+					panic("Must list the same resources in all flavors in a ResourceGroup")
+				}
+			}
+		}
+		rg.CoveredResources = resources
+	}
+	return rg
+}
+
+// ResourceGroup adds a ResourceGroup with flavors.
+func (c *ClusterQueueWrapper) ResourceGroup(flavors ...kueue.FlavorQuotas) *ClusterQueueWrapper {
+	c.Spec.ResourceGroups = append(c.Spec.ResourceGroups, ResourceGroup(flavors...))
+	return c
+}
+
+// AdmissionChecks replaces the queue additional checks
+func (c *ClusterQueueWrapper) AdmissionChecks(checks ...kueue.AdmissionCheckReference) *ClusterQueueWrapper {
+	c.Spec.AdmissionChecks = checks
+	return c
+}
+
+// QueueingStrategy sets the queueing strategy in this ClusterQueue.
+func (c *ClusterQueueWrapper) QueueingStrategy(strategy kueue.QueueingStrategy) *ClusterQueueWrapper {
+	c.Spec.QueueingStrategy = strategy
+	return c
+}
+
+// NamespaceSelector sets the namespace selector.
+func (c *ClusterQueueWrapper) NamespaceSelector(s *metav1.LabelSelector) *ClusterQueueWrapper {
+	c.Spec.NamespaceSelector = s
+	return c
+}
+
+// Preemption sets the preemption policies.
+func (c *ClusterQueueWrapper) Preemption(p kueue.ClusterQueuePreemption) *ClusterQueueWrapper {
+	c.Spec.Preemption = &p
+	return c
+}
+
+// FlavorFungibility sets the flavorFungibility policies.
+func (c *ClusterQueueWrapper) FlavorFungibility(p kueue.FlavorFungibility) *ClusterQueueWrapper {
+	c.Spec.FlavorFungibility = &p
+	return c
+}
+
+// StopPolicy sets the stop policy.
+func (c *ClusterQueueWrapper) StopPolicy(p kueue.StopPolicy) *ClusterQueueWrapper {
+	c.Spec.StopPolicy = &p
+	return c
+}
+
+// DeletionTimestamp sets a deletion timestamp for the cluster queue.
+func (c *ClusterQueueWrapper) DeletionTimestamp(t time.Time) *ClusterQueueWrapper {
+	c.ClusterQueue.DeletionTimestamp = ptr.To(metav1.NewTime(t).Rfc3339Copy())
+	return c
+}
+
+func (c *ClusterQueueWrapper) Label(k, v string) *ClusterQueueWrapper {
+	if c.Labels == nil {
+		c.Labels = make(map[string]string)
+	}
+	c.Labels[k] = v
+	return c
+}
+
+func (c *ClusterQueueWrapper) FairWeight(w resource.Quantity) *ClusterQueueWrapper {
+	if c.Spec.FairSharing == nil {
+		c.Spec.FairSharing = &kueue.FairSharing{}
+	}
+	c.Spec.FairSharing.Weight = &w
+	return c
+}
+
+// Condition sets a condition on the ClusterQueue.
+func (c *ClusterQueueWrapper) Condition(conditionType string, status metav1.ConditionStatus, reason, message string) *ClusterQueueWrapper {
+	apimeta.SetStatusCondition(&c.Status.Conditions, metav1.Condition{
+		Type:    conditionType,
+		Status:  status,
+		Reason:  reason,
+		Message: message,
+	})
+	return c
+}
+
+// Generation sets the generation of the ClusterQueue.
+func (c *ClusterQueueWrapper) Generation(num int64) *ClusterQueueWrapper {
+	c.ObjectMeta.Generation = num
+	return c
+}
+
+// Creation sets the creation timestamp of the ClusterQueue.
+func (c *ClusterQueueWrapper) Creation(t time.Time) *ClusterQueueWrapper {
+	c.CreationTimestamp = metav1.NewTime(t)
+	return c
+}
+
+// PendingWorkloads sets the pendingWorkloads in status.
+func (c *ClusterQueueWrapper) PendingWorkloads(n int32) *ClusterQueueWrapper {
+	c.Status.PendingWorkloads = n
+	return c
+}
+
+// AdmittedWorkloads sets the admittedWorkloads in status.
+func (c *ClusterQueueWrapper) AdmittedWorkloads(n int32) *ClusterQueueWrapper {
+	c.Status.AdmittedWorkloads = n
+	return c
+}
+
+// FlavorQuotasWrapper wraps a FlavorQuotas object.
+type FlavorQuotasWrapper struct{ kueue.FlavorQuotas }
+
+// MakeFlavorQuotas creates a wrapper for a resource flavor.
+func MakeFlavorQuotas(name string) *FlavorQuotasWrapper {
+	return &FlavorQuotasWrapper{kueue.FlavorQuotas{
+		Name: kueue.ResourceFlavorReference(name),
+	}}
+}
+
+// Obj returns the inner flavor.
+func (f *FlavorQuotasWrapper) Obj() *kueue.FlavorQuotas {
+	return &f.FlavorQuotas
+}
+
+// Resource takes ResourceName, followed by the optional NominalQuota, BorrowingLimit, LendingLimit.
+func (f *FlavorQuotasWrapper) Resource(name corev1.ResourceName, qs ...string) *FlavorQuotasWrapper {
+	resourceWrapper := f.ResourceQuotaWrapper(name)
+	if len(qs) > 0 {
+		resourceWrapper.NominalQuota(qs[0])
+	}
+	if len(qs) > 1 && len(qs[1]) > 0 {
+		resourceWrapper.BorrowingLimit(qs[1])
+	}
+	if len(qs) > 2 && len(qs[2]) > 0 {
+		resourceWrapper.LendingLimit(qs[2])
+	}
+	if len(qs) > 3 {
+		panic("Must have at most 3 quantities for nominalQuota, borrowingLimit and lendingLimit")
+	}
+	return resourceWrapper.Append()
+}
+
+// ResourceQuotaWrapper allows creation the creation of a Resource in a type-safe manner.
+func (f *FlavorQuotasWrapper) ResourceQuotaWrapper(name corev1.ResourceName) *ResourceQuotaWrapper {
+	rq := kueue.ResourceQuota{
+		Name: name,
+	}
+	return &ResourceQuotaWrapper{parent: f, ResourceQuota: rq}
+}
+
+// ResourceQuotaWrapper wraps a ResourceQuota object.
+type ResourceQuotaWrapper struct {
+	parent *FlavorQuotasWrapper
+	kueue.ResourceQuota
+}
+
+func (rq *ResourceQuotaWrapper) NominalQuota(quantity string) *ResourceQuotaWrapper {
+	rq.ResourceQuota.NominalQuota = resource.MustParse(quantity)
+	return rq
+}
+
+func (rq *ResourceQuotaWrapper) BorrowingLimit(quantity string) *ResourceQuotaWrapper {
+	rq.ResourceQuota.BorrowingLimit = ptr.To(resource.MustParse(quantity))
+	return rq
+}
+
+func (rq *ResourceQuotaWrapper) LendingLimit(quantity string) *ResourceQuotaWrapper {
+	rq.ResourceQuota.LendingLimit = ptr.To(resource.MustParse(quantity))
+	return rq
+}
+
+// Append appends the ResourceQuotaWrapper to its parent
+func (rq *ResourceQuotaWrapper) Append() *FlavorQuotasWrapper {
+	rq.parent.Resources = append(rq.parent.Resources, rq.ResourceQuota)
+	return rq.parent
+}
+
+// ResourceFlavorWrapper wraps a ResourceFlavor.
+type ResourceFlavorWrapper struct{ kueue.ResourceFlavor }
+
+// MakeResourceFlavor creates a wrapper for a ResourceFlavor.
+func MakeResourceFlavor(name string) *ResourceFlavorWrapper {
+	return &ResourceFlavorWrapper{kueue.ResourceFlavor{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: name,
+		},
+		Spec: kueue.ResourceFlavorSpec{
+			NodeLabels: make(map[string]string),
+		},
+	}}
+}
+
+// Obj returns the inner ResourceFlavor.
+func (rf *ResourceFlavorWrapper) Obj() *kueue.ResourceFlavor {
+	return &rf.ResourceFlavor
+}
+
+// TopologyName sets the topology name
+func (rf *ResourceFlavorWrapper) TopologyName(name string) *ResourceFlavorWrapper {
+	rf.Spec.TopologyName = ptr.To(kueue.TopologyReference(name))
+	return rf
+}
+
+// Label sets the label on the ResourceFlavor.
+func (rf *ResourceFlavorWrapper) Label(k, v string) *ResourceFlavorWrapper {
+	if rf.Labels == nil {
+		rf.Labels = map[string]string{}
+	}
+	rf.Labels[k] = v
+	return rf
+}
+
+// NodeLabel add a label kueue and value pair to the ResourceFlavor.
+func (rf *ResourceFlavorWrapper) NodeLabel(k, v string) *ResourceFlavorWrapper {
+	rf.Spec.NodeLabels[k] = v
+	return rf
+}
+
+// Taint adds a taint to the ResourceFlavor.
+func (rf *ResourceFlavorWrapper) Taint(t corev1.Taint) *ResourceFlavorWrapper {
+	rf.Spec.NodeTaints = append(rf.Spec.NodeTaints, t)
+	return rf
+}
+
+// Toleration  adds a taint to the ResourceFlavor.
+func (rf *ResourceFlavorWrapper) Toleration(t corev1.Toleration) *ResourceFlavorWrapper {
+	rf.Spec.Tolerations = append(rf.Spec.Tolerations, t)
+	return rf
+}
+
+// Creation sets the creation timestamp of the LocalQueue.
+func (rf *ResourceFlavorWrapper) Creation(t time.Time) *ResourceFlavorWrapper {
+	rf.CreationTimestamp = metav1.NewTime(t)
+	return rf
+}
+
+// TopologyWrapper wraps a Topology.
+type TopologyWrapper struct{ kueue.Topology }
+
+// MakeTopology creates a wrapper for a Topology.
+func MakeTopology(name string) *TopologyWrapper {
+	return &TopologyWrapper{kueue.Topology{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: name,
+		},
+	}}
+}
+
+// Levels sets the levels for a Topology.
+func (t *TopologyWrapper) Levels(levels ...string) *TopologyWrapper {
+	t.Spec.Levels = make([]kueue.TopologyLevel, len(levels))
+	for i, level := range levels {
+		t.Spec.Levels[i] = kueue.TopologyLevel{
+			NodeLabel: level,
+		}
+	}
+	return t
+}
+
+func (t *TopologyWrapper) Obj() *kueue.Topology {
+	return &t.Topology
+}
+
+type TopologyDomainAssignmentWrapper struct {
+	kueue.TopologyDomainAssignment
+}
+
+func MakeTopologyDomainAssignment(values []string, count int32) *TopologyDomainAssignmentWrapper {
+	return &TopologyDomainAssignmentWrapper{
+		TopologyDomainAssignment: kueue.TopologyDomainAssignment{
+			Values: values,
+			Count:  count,
+		},
+	}
+}
+
+func (t *TopologyDomainAssignmentWrapper) Obj() kueue.TopologyDomainAssignment {
+	return t.TopologyDomainAssignment
+}
+
+type TopologyAssignmentWrapper struct {
+	kueue.TopologyAssignment
+}
+
+func MakeTopologyAssignment(levels []string) *TopologyAssignmentWrapper {
+	return &TopologyAssignmentWrapper{
+		TopologyAssignment: kueue.TopologyAssignment{
+			Levels: levels,
+		},
+	}
+}
+
+func (t *TopologyAssignmentWrapper) Levels(levels ...string) *TopologyAssignmentWrapper {
+	t.TopologyAssignment.Levels = levels
+	return t
+}
+
+func (t *TopologyAssignmentWrapper) Domains(domains ...kueue.TopologyDomainAssignment) *TopologyAssignmentWrapper {
+	t.TopologyAssignment.Domains = domains
+	return t
+}
+
+func (t *TopologyAssignmentWrapper) Domain(domain kueue.TopologyDomainAssignment) *TopologyAssignmentWrapper {
+	t.TopologyAssignment.Domains = append(t.TopologyAssignment.Domains, domain)
+	return t
+}
+
+func (t *TopologyAssignmentWrapper) Obj() *kueue.TopologyAssignment {
+	return &t.TopologyAssignment
+}
+
+type PodSetAssignmentWrapper struct {
+	kueue.PodSetAssignment
+}
+
+func MakePodSetAssignment(name kueue.PodSetReference) *PodSetAssignmentWrapper {
+	return &PodSetAssignmentWrapper{
+		PodSetAssignment: kueue.PodSetAssignment{
+			Name:          name,
+			Flavors:       make(map[corev1.ResourceName]kueue.ResourceFlavorReference),
+			ResourceUsage: make(corev1.ResourceList),
+			Count:         ptr.To[int32](1),
+		},
+	}
+}
+
+func (p *PodSetAssignmentWrapper) Obj() kueue.PodSetAssignment {
+	return p.PodSetAssignment
+}
+
+func (p *PodSetAssignmentWrapper) Flavor(resource corev1.ResourceName, flavor kueue.ResourceFlavorReference) *PodSetAssignmentWrapper {
+	if p.Flavors == nil {
+		p.Flavors = make(map[corev1.ResourceName]kueue.ResourceFlavorReference)
+	}
+	p.Flavors[resource] = flavor
+	return p
+}
+
+func (p *PodSetAssignmentWrapper) ResourceUsage(resourceName corev1.ResourceName, quantity string) *PodSetAssignmentWrapper {
+	if p.PodSetAssignment.ResourceUsage == nil {
+		p.PodSetAssignment.ResourceUsage = make(corev1.ResourceList)
+	}
+	p.PodSetAssignment.ResourceUsage[resourceName] = resource.MustParse(quantity)
+	return p
+}
+
+func (p *PodSetAssignmentWrapper) Count(count int32) *PodSetAssignmentWrapper {
+	p.PodSetAssignment.Count = ptr.To(count)
+	return p
+}
+
+func (p *PodSetAssignmentWrapper) TopologyAssignment(ta *kueue.TopologyAssignment) *PodSetAssignmentWrapper {
+	p.PodSetAssignment.TopologyAssignment = ta
+	return p
+}
+
+func (p *PodSetAssignmentWrapper) DelayedTopologyRequest(state kueue.DelayedTopologyRequestState) *PodSetAssignmentWrapper {
+	p.PodSetAssignment.DelayedTopologyRequest = ptr.To(state)
+	return p
+}
+
+func (p *PodSetAssignmentWrapper) Assignment(r corev1.ResourceName, f kueue.ResourceFlavorReference, value string) *PodSetAssignmentWrapper {
+	return p.Flavor(r, f).ResourceUsage(r, value)
+}
+
+type AdmissionCheckWrapper struct{ kueue.AdmissionCheck }
+
+func MakeAdmissionCheck(name string) *AdmissionCheckWrapper {
+	return &AdmissionCheckWrapper{
+		AdmissionCheck: kueue.AdmissionCheck{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: name,
+			},
+		},
+	}
+}
+
+type AdmissionCheckStrategyRuleWrapper struct {
+	kueue.AdmissionCheckStrategyRule
+}
+
+func MakeAdmissionCheckStrategyRule(name kueue.AdmissionCheckReference, flavors ...kueue.ResourceFlavorReference) *AdmissionCheckStrategyRuleWrapper {
+	if len(flavors) == 0 {
+		flavors = make([]kueue.ResourceFlavorReference, 0)
+	}
+	return &AdmissionCheckStrategyRuleWrapper{
+		AdmissionCheckStrategyRule: kueue.AdmissionCheckStrategyRule{
+			Name:      name,
+			OnFlavors: flavors,
+		},
+	}
+}
+
+func (acs *AdmissionCheckStrategyRuleWrapper) OnFlavors(flavors []kueue.ResourceFlavorReference) *AdmissionCheckStrategyRuleWrapper {
+	acs.AdmissionCheckStrategyRule.OnFlavors = flavors
+	return acs
+}
+
+func (acs *AdmissionCheckStrategyRuleWrapper) Obj() *kueue.AdmissionCheckStrategyRule {
+	return &acs.AdmissionCheckStrategyRule
+}
+
+func (ac *AdmissionCheckWrapper) Active(status metav1.ConditionStatus) *AdmissionCheckWrapper {
+	apimeta.SetStatusCondition(&ac.Status.Conditions, metav1.Condition{
+		Type:    kueue.AdmissionCheckActive,
+		Status:  status,
+		Reason:  "ByTest",
+		Message: "by test",
+	})
+	return ac
+}
+
+func (ac *AdmissionCheckWrapper) Condition(cond metav1.Condition) *AdmissionCheckWrapper {
+	apimeta.SetStatusCondition(&ac.Status.Conditions, cond)
+	return ac
+}
+
+// Generation sets the generation of the AdmissionCheck.
+func (ac *AdmissionCheckWrapper) Generation(num int64) *AdmissionCheckWrapper {
+	ac.ObjectMeta.Generation = num
+	return ac
+}
+
+func (ac *AdmissionCheckWrapper) ControllerName(c string) *AdmissionCheckWrapper {
+	ac.Spec.ControllerName = c
+	return ac
+}
+
+func (ac *AdmissionCheckWrapper) Parameters(apigroup, kind, name string) *AdmissionCheckWrapper {
+	ac.Spec.Parameters = &kueue.AdmissionCheckParametersReference{
+		APIGroup: apigroup,
+		Kind:     kind,
+		Name:     name,
+	}
+	return ac
+}
+
+func (ac *AdmissionCheckWrapper) Obj() *kueue.AdmissionCheck {
+	return &ac.AdmissionCheck
+}
+
+// WorkloadPriorityClassWrapper wraps a WorkloadPriorityClass.
+type WorkloadPriorityClassWrapper struct {
+	kueue.WorkloadPriorityClass
+}
+
+// MakeWorkloadPriorityClass creates a wrapper for a WorkloadPriorityClass.
+func MakeWorkloadPriorityClass(name string) *WorkloadPriorityClassWrapper {
+	return &WorkloadPriorityClassWrapper{kueue.WorkloadPriorityClass{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: name,
+		}},
+	}
+}
+
+// PriorityValue updates value of WorkloadPriorityClass.
+func (p *WorkloadPriorityClassWrapper) PriorityValue(v int32) *WorkloadPriorityClassWrapper {
+	p.Value = v
+	return p
+}
+
+// Obj returns the inner WorkloadPriorityClass.
+func (p *WorkloadPriorityClassWrapper) Obj() *kueue.WorkloadPriorityClass {
+	return &p.WorkloadPriorityClass
+}
+
+type MultiKueueConfigWrapper struct {
+	kueue.MultiKueueConfig
+}
+
+func MakeMultiKueueConfig(name string) *MultiKueueConfigWrapper {
+	return &MultiKueueConfigWrapper{
+		MultiKueueConfig: kueue.MultiKueueConfig{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: name,
+			},
+		},
+	}
+}
+
+func (mkc *MultiKueueConfigWrapper) Obj() *kueue.MultiKueueConfig {
+	return &mkc.MultiKueueConfig
+}
+
+func (mkc *MultiKueueConfigWrapper) Clusters(clusters ...string) *MultiKueueConfigWrapper {
+	mkc.Spec.Clusters = append(mkc.Spec.Clusters, clusters...)
+	return mkc
+}
+
+type MultiKueueClusterWrapper struct {
+	kueue.MultiKueueCluster
+}
+
+func MakeMultiKueueCluster(name string) *MultiKueueClusterWrapper {
+	return &MultiKueueClusterWrapper{
+		MultiKueueCluster: kueue.MultiKueueCluster{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: name,
+			},
+		},
+	}
+}
+
+func (mkc *MultiKueueClusterWrapper) Obj() *kueue.MultiKueueCluster {
+	return &mkc.MultiKueueCluster
+}
+
+func (mkc *MultiKueueClusterWrapper) KubeConfig(locationType kueue.LocationType, location string) *MultiKueueClusterWrapper {
+	mkc.Spec.KubeConfig = kueue.KubeConfig{
+		Location:     location,
+		LocationType: locationType,
+	}
+	return mkc
+}
+
+func (mkc *MultiKueueClusterWrapper) Active(state metav1.ConditionStatus, reason, message string, generation int64) *MultiKueueClusterWrapper {
+	cond := metav1.Condition{
+		Type:               kueue.MultiKueueClusterActive,
+		Status:             state,
+		Reason:             reason,
+		Message:            message,
+		ObservedGeneration: generation,
+	}
+	apimeta.SetStatusCondition(&mkc.Status.Conditions, cond)
+	return mkc
+}
+
+// Generation sets the generation of the MultiKueueCluster.
+func (mkc *MultiKueueClusterWrapper) Generation(num int64) *MultiKueueClusterWrapper {
+	mkc.ObjectMeta.Generation = num
+	return mkc
+}
+
+// ProvisioningRequestConfigWrapper wraps a ProvisioningRequestConfig
+type ProvisioningRequestConfigWrapper struct {
+	kueue.ProvisioningRequestConfig
+}
+
+// MakeProvisioningRequestConfig creates a wrapper for a ProvisioningRequestConfig.
+func MakeProvisioningRequestConfig(name string) *ProvisioningRequestConfigWrapper {
+	return &ProvisioningRequestConfigWrapper{kueue.ProvisioningRequestConfig{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: name,
+		}},
+	}
+}
+
+func (prc *ProvisioningRequestConfigWrapper) ProvisioningClass(pc string) *ProvisioningRequestConfigWrapper {
+	prc.Spec.ProvisioningClassName = pc
+	return prc
+}
+
+func (prc *ProvisioningRequestConfigWrapper) Parameters(parameters map[string]kueue.Parameter) *ProvisioningRequestConfigWrapper {
+	if prc.Spec.Parameters == nil {
+		prc.Spec.Parameters = make(map[string]kueue.Parameter, len(parameters))
+	}
+
+	maps.Copy(prc.Spec.Parameters, parameters)
+
+	return prc
+}
+
+func (prc *ProvisioningRequestConfigWrapper) WithParameter(key string, value kueue.Parameter) *ProvisioningRequestConfigWrapper {
+	if prc.Spec.Parameters == nil {
+		prc.Spec.Parameters = make(map[string]kueue.Parameter, 1)
+	}
+
+	prc.Spec.Parameters[key] = value
+	return prc
+}
+
+func (prc *ProvisioningRequestConfigWrapper) ManagedResources(r []corev1.ResourceName) *ProvisioningRequestConfigWrapper {
+	prc.Spec.ManagedResources = r
+	return prc
+}
+
+func (prc *ProvisioningRequestConfigWrapper) WithManagedResource(managedResource corev1.ResourceName) *ProvisioningRequestConfigWrapper {
+	prc.Spec.ManagedResources = append(prc.Spec.ManagedResources, managedResource)
+	return prc
+}
+
+func (prc *ProvisioningRequestConfigWrapper) RetryStrategy(retryStrategy *kueue.ProvisioningRequestRetryStrategy) *ProvisioningRequestConfigWrapper {
+	prc.Spec.RetryStrategy = retryStrategy
+	return prc
+}
+
+func (prc *ProvisioningRequestConfigWrapper) PodSetUpdate(update kueue.ProvisioningRequestPodSetUpdates) *ProvisioningRequestConfigWrapper {
+	prc.Spec.PodSetUpdates = &update
+	return prc
+}
+
+func (prc *ProvisioningRequestConfigWrapper) BaseBackoff(backoffBaseSeconds int32) *ProvisioningRequestConfigWrapper {
+	if prc.Spec.RetryStrategy == nil {
+		prc.Spec.RetryStrategy = &kueue.ProvisioningRequestRetryStrategy{}
+	}
+
+	prc.Spec.RetryStrategy.BackoffBaseSeconds = &backoffBaseSeconds
+	return prc
+}
+
+func (prc *ProvisioningRequestConfigWrapper) MaxBackoff(backoffMaxSeconds int32) *ProvisioningRequestConfigWrapper {
+	if prc.Spec.RetryStrategy == nil {
+		prc.Spec.RetryStrategy = &kueue.ProvisioningRequestRetryStrategy{}
+	}
+
+	prc.Spec.RetryStrategy.BackoffMaxSeconds = &backoffMaxSeconds
+	return prc
+}
+
+func (prc *ProvisioningRequestConfigWrapper) RetryLimit(backoffLimitCount int32) *ProvisioningRequestConfigWrapper {
+	if prc.Spec.RetryStrategy == nil {
+		prc.Spec.RetryStrategy = &kueue.ProvisioningRequestRetryStrategy{}
+	}
+
+	prc.Spec.RetryStrategy.BackoffLimitCount = &backoffLimitCount
+	return prc
+}
+
+func (prc *ProvisioningRequestConfigWrapper) PodSetMergePolicy(mode kueue.ProvisioningRequestConfigPodSetMergePolicy) *ProvisioningRequestConfigWrapper {
+	prc.Spec.PodSetMergePolicy = &mode
+	return prc
+}
+
+func (prc *ProvisioningRequestConfigWrapper) Clone() *ProvisioningRequestConfigWrapper {
+	return &ProvisioningRequestConfigWrapper{ProvisioningRequestConfig: *prc.DeepCopy()}
+}
+
+func (prc *ProvisioningRequestConfigWrapper) Obj() *kueue.ProvisioningRequestConfig {
+	return &prc.ProvisioningRequestConfig
+}
diff --git a/pkg/util/testing/wrappers.go b/pkg/util/testing/wrappers.go
index 8b57d0096..e65b2cd18 100644
--- a/pkg/util/testing/wrappers.go
+++ b/pkg/util/testing/wrappers.go
@@ -17,1159 +17,42 @@ limitations under the License.
 package testing
 
 import (
-	"fmt"
-	"maps"
-	"time"
-
-	corev1 "k8s.io/api/core/v1"
-	nodev1 "k8s.io/api/node/v1"
-	schedulingv1 "k8s.io/api/scheduling/v1"
-	apimeta "k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/apimachinery/pkg/api/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/ptr"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	utilResource "sigs.k8s.io/kueue/pkg/util/resource"
-)
-
-// PriorityClassWrapper wraps a PriorityClass.
-type PriorityClassWrapper struct {
-	schedulingv1.PriorityClass
-}
-
-// MakePriorityClass creates a wrapper for a PriorityClass.
-func MakePriorityClass(name string) *PriorityClassWrapper {
-	return &PriorityClassWrapper{schedulingv1.PriorityClass{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: name,
-		}},
-	}
-}
-
-// PriorityValue update value of PriorityClass。
-func (p *PriorityClassWrapper) PriorityValue(v int32) *PriorityClassWrapper {
-	p.Value = v
-	return p
-}
-
-// Obj returns the inner PriorityClass.
-func (p *PriorityClassWrapper) Obj() *schedulingv1.PriorityClass {
-	return &p.PriorityClass
-}
-
-type WorkloadWrapper struct{ kueue.Workload }
-
-// MakeWorkload creates a wrapper for a Workload with a single pod
-// with a single container.
-func MakeWorkload(name, ns string) *WorkloadWrapper {
-	return &WorkloadWrapper{kueue.Workload{
-		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: ns},
-		Spec: kueue.WorkloadSpec{
-			PodSets: []kueue.PodSet{
-				*MakePodSet(kueue.DefaultPodSetName, 1).Obj(),
-			},
-		},
-	}}
-}
-
-// MakeWorkloadWithGeneratedName creates a wrapper for a Workload with a single pod
-// with a single container.
-func MakeWorkloadWithGeneratedName(namePrefix, ns string) *WorkloadWrapper {
-	wl := MakeWorkload("", ns)
-	wl.GenerateName = namePrefix
-	return wl
-}
-
-func (w *WorkloadWrapper) Obj() *kueue.Workload {
-	return &w.Workload
-}
-
-func (w *WorkloadWrapper) Clone() *WorkloadWrapper {
-	return &WorkloadWrapper{Workload: *w.DeepCopy()}
-}
-
-func (w *WorkloadWrapper) UID(uid types.UID) *WorkloadWrapper {
-	w.Workload.UID = uid
-	return w
-}
-
-// Generation sets the generation of the Workload.
-func (w *WorkloadWrapper) Generation(num int64) *WorkloadWrapper {
-	w.ObjectMeta.Generation = num
-	return w
-}
-
-func (w *WorkloadWrapper) Name(name string) *WorkloadWrapper {
-	w.Workload.Name = name
-	return w
-}
-
-func (w *WorkloadWrapper) Finalizers(fin ...string) *WorkloadWrapper {
-	w.ObjectMeta.Finalizers = fin
-	return w
-}
-
-func (w *WorkloadWrapper) Request(r corev1.ResourceName, q string) *WorkloadWrapper {
-	w.Spec.PodSets[0].Template.Spec.Containers[0].Resources.Requests[r] = resource.MustParse(q)
-	return w
-}
-
-func (w *WorkloadWrapper) Limit(r corev1.ResourceName, q string) *WorkloadWrapper {
-	res := &w.Spec.PodSets[0].Template.Spec.Containers[0].Resources
-	if res.Limits == nil {
-		res.Limits = corev1.ResourceList{
-			r: resource.MustParse(q),
-		}
-	} else {
-		res.Limits[r] = resource.MustParse(q)
-	}
-	return w
-}
-
-func (w *WorkloadWrapper) RequestAndLimit(r corev1.ResourceName, q string) *WorkloadWrapper {
-	return w.Request(r, q).Limit(r, q)
-}
-
-func (w *WorkloadWrapper) Queue(q kueue.LocalQueueName) *WorkloadWrapper {
-	w.Spec.QueueName = q
-	return w
-}
-
-func (w *WorkloadWrapper) Active(a bool) *WorkloadWrapper {
-	w.Spec.Active = ptr.To(a)
-	return w
-}
-
-// SimpleReserveQuota reserves the quota for all the requested resources in one flavor.
-// It assumes one podset with one container.
-func (w *WorkloadWrapper) SimpleReserveQuota(cq, flavor string, now time.Time) *WorkloadWrapper {
-	admission := MakeAdmission(cq, w.Spec.PodSets[0].Name)
-	resReq := make(corev1.ResourceList)
-	flavors := make(map[corev1.ResourceName]kueue.ResourceFlavorReference)
-	for res, val := range w.Spec.PodSets[0].Template.Spec.Containers[0].Resources.Requests {
-		val.Mul(int64(w.Spec.PodSets[0].Count))
-		resReq[res] = val
-		flavors[res] = kueue.ResourceFlavorReference(flavor)
-	}
-	admission.PodSetAssignments[0].Count = ptr.To(w.Spec.PodSets[0].Count)
-	admission.PodSetAssignments[0].Flavors = flavors
-	admission.PodSetAssignments[0].ResourceUsage = resReq
-
-	return w.ReserveQuotaAt(admission.Obj(), now)
-}
-
-// ReserveQuota sets workload admission and adds a "QuotaReserved" status condition
-func (w *WorkloadWrapper) ReserveQuota(a *kueue.Admission) *WorkloadWrapper {
-	return w.ReserveQuotaAt(a, time.Now())
-}
-
-// ReserveQuotaAt sets workload admission and adds a "QuotaReserved" status condition
-func (w *WorkloadWrapper) ReserveQuotaAt(a *kueue.Admission, now time.Time) *WorkloadWrapper {
-	w.Status.Admission = a
-	w.Status.Conditions = []metav1.Condition{{
-		Type:               kueue.WorkloadQuotaReserved,
-		Status:             metav1.ConditionTrue,
-		LastTransitionTime: metav1.NewTime(now),
-		Reason:             "AdmittedByTest",
-		Message:            fmt.Sprintf("Admitted by ClusterQueue %s", w.Status.Admission.ClusterQueue),
-	}}
-	return w
-}
-
-// QuotaReservedTime - sets the LastTransitionTime of the QuotaReserved condition if found.
-func (w *WorkloadWrapper) QuotaReservedTime(t time.Time) *WorkloadWrapper {
-	cond := apimeta.FindStatusCondition(w.Status.Conditions, kueue.WorkloadQuotaReserved)
-	cond.LastTransitionTime = metav1.NewTime(t)
-	return w
-}
-
-func (w *WorkloadWrapper) Admitted(a bool) *WorkloadWrapper {
-	return w.AdmittedAt(a, time.Now())
-}
-
-func (w *WorkloadWrapper) AdmittedAt(a bool, t time.Time) *WorkloadWrapper {
-	cond := metav1.Condition{
-		Type:               kueue.WorkloadAdmitted,
-		Status:             metav1.ConditionTrue,
-		LastTransitionTime: metav1.NewTime(t),
-		Reason:             "ByTest",
-		Message:            fmt.Sprintf("Admitted by ClusterQueue %s", w.Status.Admission.ClusterQueue),
-	}
-	if !a {
-		cond.Status = metav1.ConditionFalse
-	}
-	apimeta.SetStatusCondition(&w.Status.Conditions, cond)
-	return w
-}
-
-func (w *WorkloadWrapper) Finished() *WorkloadWrapper {
-	return w.FinishedAt(time.Now())
-}
-
-func (w *WorkloadWrapper) FinishedAt(t time.Time) *WorkloadWrapper {
-	cond := metav1.Condition{
-		Type:               kueue.WorkloadFinished,
-		Status:             metav1.ConditionTrue,
-		LastTransitionTime: metav1.NewTime(t),
-		Reason:             "ByTest",
-		Message:            "Finished by test",
-	}
-	apimeta.SetStatusCondition(&w.Status.Conditions, cond)
-	return w
-}
-
-func (w *WorkloadWrapper) Evicted() *WorkloadWrapper {
-	cond := metav1.Condition{
-		Type:               kueue.WorkloadEvicted,
-		Status:             metav1.ConditionTrue,
-		LastTransitionTime: metav1.Now(),
-		Reason:             "ByTest",
-		Message:            "Evicted by test",
-	}
-	apimeta.SetStatusCondition(&w.Status.Conditions, cond)
-	return w
-}
-
-func (w *WorkloadWrapper) Creation(t time.Time) *WorkloadWrapper {
-	w.CreationTimestamp = metav1.NewTime(t)
-	return w
-}
-
-func (w *WorkloadWrapper) PriorityClass(priorityClassName string) *WorkloadWrapper {
-	w.Spec.PriorityClassName = priorityClassName
-	return w
-}
-
-func (w *WorkloadWrapper) RuntimeClass(name string) *WorkloadWrapper {
-	for i := range w.Spec.PodSets {
-		w.Spec.PodSets[i].Template.Spec.RuntimeClassName = &name
-	}
-	return w
-}
-
-func (w *WorkloadWrapper) Priority(priority int32) *WorkloadWrapper {
-	w.Spec.Priority = &priority
-	return w
-}
-
-func (w *WorkloadWrapper) PriorityClassSource(source string) *WorkloadWrapper {
-	w.Spec.PriorityClassSource = source
-	return w
-}
-
-func (w *WorkloadWrapper) PodSets(podSets ...kueue.PodSet) *WorkloadWrapper {
-	w.Spec.PodSets = podSets
-	return w
-}
-
-func (w *WorkloadWrapper) Toleration(t corev1.Toleration) *WorkloadWrapper {
-	w.Spec.PodSets[0].Template.Spec.Tolerations = append(w.Spec.PodSets[0].Template.Spec.Tolerations, t)
-	return w
-}
-
-func (w *WorkloadWrapper) NodeSelector(kv map[string]string) *WorkloadWrapper {
-	w.Spec.PodSets[0].Template.Spec.NodeSelector = kv
-	return w
-}
-
-func (w *WorkloadWrapper) Condition(condition metav1.Condition) *WorkloadWrapper {
-	apimeta.SetStatusCondition(&w.Status.Conditions, condition)
-	return w
-}
-
-func (w *WorkloadWrapper) AdmissionCheck(ac kueue.AdmissionCheckState) *WorkloadWrapper {
-	w.Status.AdmissionChecks = append(w.Status.AdmissionChecks, ac)
-	return w
-}
-
-func (w *WorkloadWrapper) ResourceRequests(rr ...kueue.PodSetRequest) *WorkloadWrapper {
-	w.Status.ResourceRequests = rr
-	return w
-}
-
-func (w *WorkloadWrapper) SetOrReplaceCondition(condition metav1.Condition) *WorkloadWrapper {
-	existingCondition := apimeta.FindStatusCondition(w.Status.Conditions, condition.Type)
-	if existingCondition != nil {
-		apimeta.RemoveStatusCondition(&w.Status.Conditions, condition.Type)
-	}
-	apimeta.SetStatusCondition(&w.Status.Conditions, condition)
-	return w
-}
-
-func (w *WorkloadWrapper) ReclaimablePods(rps ...kueue.ReclaimablePod) *WorkloadWrapper {
-	w.Status.ReclaimablePods = rps
-	return w
-}
-
-func (w *WorkloadWrapper) Labels(l map[string]string) *WorkloadWrapper {
-	w.ObjectMeta.Labels = l
-	return w
-}
-
-func (w *WorkloadWrapper) Label(k, v string) *WorkloadWrapper {
-	if w.ObjectMeta.Labels == nil {
-		w.ObjectMeta.Labels = make(map[string]string)
-	}
-	w.ObjectMeta.Labels[k] = v
-	return w
-}
-
-func (w *WorkloadWrapper) Annotation(k, v string) *WorkloadWrapper {
-	if w.ObjectMeta.Annotations == nil {
-		w.ObjectMeta.Annotations = make(map[string]string)
-	}
-	w.ObjectMeta.Annotations[k] = v
-	return w
-}
-
-func (w *WorkloadWrapper) AdmissionChecks(checks ...kueue.AdmissionCheckState) *WorkloadWrapper {
-	w.Status.AdmissionChecks = checks
-	return w
-}
-
-func (w *WorkloadWrapper) Admission(admission *kueue.Admission) *WorkloadWrapper {
-	w.Status.Admission = admission
-	return w
-}
-
-func (w *WorkloadWrapper) Conditions(conditions ...metav1.Condition) *WorkloadWrapper {
-	w.Status.Conditions = conditions
-	return w
-}
-
-func (w *WorkloadWrapper) ControllerReference(gvk schema.GroupVersionKind, name, uid string) *WorkloadWrapper {
-	AppendOwnerReference(&w.Workload, gvk, name, uid, ptr.To(true), ptr.To(true))
-	return w
-}
-
-func (w *WorkloadWrapper) OwnerReference(gvk schema.GroupVersionKind, name, uid string) *WorkloadWrapper {
-	AppendOwnerReference(&w.Workload, gvk, name, uid, nil, nil)
-	return w
-}
-
-func (w *WorkloadWrapper) Annotations(annotations map[string]string) *WorkloadWrapper {
-	w.ObjectMeta.Annotations = annotations
-	return w
-}
-
-func (w *WorkloadWrapper) UnhealthyNodes(nodeNames ...string) *WorkloadWrapper {
-	for _, nodeName := range nodeNames {
-		w.Status.UnhealthyNodes = append(w.Status.UnhealthyNodes, kueue.UnhealthyNode{Name: nodeName})
-	}
-	return w
-}
-
-// DeletionTimestamp sets a deletion timestamp for the workload.
-func (w *WorkloadWrapper) DeletionTimestamp(t time.Time) *WorkloadWrapper {
-	w.Workload.DeletionTimestamp = ptr.To(metav1.NewTime(t).Rfc3339Copy())
-	return w
-}
-
-func (w *WorkloadWrapper) RequeueState(count *int32, requeueAt *metav1.Time) *WorkloadWrapper {
-	if count == nil && requeueAt == nil {
-		w.Status.RequeueState = nil
-		return w
-	}
-	if w.Status.RequeueState == nil {
-		w.Status.RequeueState = &kueue.RequeueState{}
-	}
-	if count != nil {
-		w.Status.RequeueState.Count = count
-	}
-	if requeueAt != nil {
-		w.Status.RequeueState.RequeueAt = requeueAt
-	}
-	return w
-}
-
-func (w *WorkloadWrapper) ResourceVersion(v string) *WorkloadWrapper {
-	w.SetResourceVersion(v)
-	return w
-}
-
-func (w *WorkloadWrapper) MaximumExecutionTimeSeconds(v int32) *WorkloadWrapper {
-	w.Spec.MaximumExecutionTimeSeconds = &v
-	return w
-}
-
-func (w *WorkloadWrapper) PastAdmittedTime(v int32) *WorkloadWrapper {
-	w.Status.AccumulatedPastExexcutionTimeSeconds = &v
-	return w
-}
-
-func (w *WorkloadWrapper) SchedulingStatsEviction(evictionState kueue.WorkloadSchedulingStatsEviction) *WorkloadWrapper {
-	if w.Status.SchedulingStats == nil {
-		w.Status.SchedulingStats = &kueue.SchedulingStats{}
-	}
-	w.Status.SchedulingStats.Evictions = append(w.Status.SchedulingStats.Evictions, evictionState)
-	return w
-}
-
-func (w *WorkloadWrapper) ClusterName(clusterName string) *WorkloadWrapper {
-	w.Status.ClusterName = &clusterName
-	return w
-}
-
-func (w *WorkloadWrapper) NominatedClusterNames(nominatedClusterNames ...string) *WorkloadWrapper {
-	w.Status.NominatedClusterNames = nominatedClusterNames
-	return w
-}
-
-type PodSetWrapper struct{ kueue.PodSet }
-
-func MakePodSet(name kueue.PodSetReference, count int) *PodSetWrapper {
-	return &PodSetWrapper{
-		kueue.PodSet{
-			Name:  name,
-			Count: int32(count),
-			Template: corev1.PodTemplateSpec{
-				Spec: corev1.PodSpec{
-					RestartPolicy: corev1.RestartPolicyNever,
-					Containers: []corev1.Container{
-						{
-							Name: "c",
-							Resources: corev1.ResourceRequirements{
-								Requests: make(corev1.ResourceList),
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func (p *PodSetWrapper) PodSpec(ps corev1.PodSpec) *PodSetWrapper {
-	p.Template.Spec = ps
-	return p
-}
-
-func (p *PodSetWrapper) PriorityClass(pc string) *PodSetWrapper {
-	p.Template.Spec.PriorityClassName = pc
-	return p
-}
-
-func (p *PodSetWrapper) RuntimeClass(name string) *PodSetWrapper {
-	p.Template.Spec.RuntimeClassName = &name
-	return p
-}
-
-func (p *PodSetWrapper) RestartPolicy(policy corev1.RestartPolicy) *PodSetWrapper {
-	p.Template.Spec.RestartPolicy = policy
-	return p
-}
-
-func (p *PodSetWrapper) RequiredTopologyRequest(level string) *PodSetWrapper {
-	if p.TopologyRequest == nil {
-		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
-	}
-	p.TopologyRequest.Required = &level
-	return p
-}
-
-func (p *PodSetWrapper) PodSetGroup(name string) *PodSetWrapper {
-	if p.TopologyRequest == nil {
-		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
-	}
-	p.TopologyRequest.PodSetGroupName = &name
-	return p
-}
-
-func (p *PodSetWrapper) SliceRequiredTopologyRequest(level string) *PodSetWrapper {
-	if p.TopologyRequest == nil {
-		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
-	}
-	p.TopologyRequest.PodSetSliceRequiredTopology = &level
-	return p
-}
-
-func (p *PodSetWrapper) SliceSizeTopologyRequest(size int32) *PodSetWrapper {
-	if p.TopologyRequest == nil {
-		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
-	}
-	p.TopologyRequest.PodSetSliceSize = &size
-	return p
-}
-
-func (p *PodSetWrapper) PreferredTopologyRequest(level string) *PodSetWrapper {
-	if p.TopologyRequest == nil {
-		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
-	}
-	p.TopologyRequest.Preferred = &level
-	return p
-}
-
-func (p *PodSetWrapper) PodIndexLabel(label *string) *PodSetWrapper {
-	if p.TopologyRequest == nil {
-		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
-	}
-	p.TopologyRequest.PodIndexLabel = label
-	return p
-}
-
-func (p *PodSetWrapper) SubGroupIndexLabel(label *string) *PodSetWrapper {
-	if p.TopologyRequest == nil {
-		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
-	}
-	p.TopologyRequest.SubGroupIndexLabel = label
-	return p
-}
-
-func (p *PodSetWrapper) SubGroupCount(count *int32) *PodSetWrapper {
-	if p.TopologyRequest == nil {
-		p.TopologyRequest = &kueue.PodSetTopologyRequest{}
-	}
-	p.TopologyRequest.SubGroupCount = count
-	return p
-}
-
-func (p *PodSetWrapper) Obj() *kueue.PodSet {
-	return &p.PodSet
-}
-
-func (p *PodSetWrapper) Clone() *PodSetWrapper {
-	return &PodSetWrapper{PodSet: *p.DeepCopy()}
-}
-
-func (p *PodSetWrapper) Request(r corev1.ResourceName, q string) *PodSetWrapper {
-	p.Template.Spec.Containers[0].Resources.Requests[r] = resource.MustParse(q)
-	return p
-}
-
-func (p *PodSetWrapper) Limit(r corev1.ResourceName, q string) *PodSetWrapper {
-	if p.Template.Spec.Containers[0].Resources.Limits == nil {
-		p.Template.Spec.Containers[0].Resources.Limits = corev1.ResourceList{}
-	}
-	p.Template.Spec.Containers[0].Resources.Limits[r] = resource.MustParse(q)
-	return p
-}
-
-func (p *PodSetWrapper) Image(image string) *PodSetWrapper {
-	p.Template.Spec.Containers[0].Image = image
-	return p
-}
-
-func (p *PodSetWrapper) SetMinimumCount(mc int32) *PodSetWrapper {
-	p.MinCount = &mc
-	return p
-}
-
-func (p *PodSetWrapper) Toleration(t corev1.Toleration) *PodSetWrapper {
-	p.Template.Spec.Tolerations = append(p.Template.Spec.Tolerations, t)
-	return p
-}
-
-func (p *PodSetWrapper) Containers(containers ...corev1.Container) *PodSetWrapper {
-	p.Template.Spec.Containers = containers
-	return p
-}
-
-func (p *PodSetWrapper) InitContainers(containers ...corev1.Container) *PodSetWrapper {
-	p.Template.Spec.InitContainers = containers
-	return p
-}
-
-func (p *PodSetWrapper) NodeSelector(kv map[string]string) *PodSetWrapper {
-	p.Template.Spec.NodeSelector = kv
-	return p
-}
-
-func (p *PodSetWrapper) RequiredDuringSchedulingIgnoredDuringExecution(nodeSelectorTerms []corev1.NodeSelectorTerm) *PodSetWrapper {
-	if p.Template.Spec.Affinity == nil {
-		p.Template.Spec.Affinity = &corev1.Affinity{}
-	}
-	if p.Template.Spec.Affinity.NodeAffinity == nil {
-		p.Template.Spec.Affinity.NodeAffinity = &corev1.NodeAffinity{}
-	}
-	if p.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution == nil {
-		p.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution = &corev1.NodeSelector{}
-	}
-	p.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms = append(
-		p.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms,
-		nodeSelectorTerms...,
-	)
-	return p
-}
-
-func (p *PodSetWrapper) NodeName(name string) *PodSetWrapper {
-	p.Template.Spec.NodeName = name
-	return p
-}
-
-func (p *PodSetWrapper) Labels(kv map[string]string) *PodSetWrapper {
-	p.Template.Labels = kv
-	return p
-}
-
-func (p *PodSetWrapper) Annotations(kv map[string]string) *PodSetWrapper {
-	p.Template.Annotations = kv
-	return p
-}
-
-func (p *PodSetWrapper) SchedulingGates(sg ...corev1.PodSchedulingGate) *PodSetWrapper {
-	p.Template.Spec.SchedulingGates = sg
-	return p
-}
-
-func (p *PodSetWrapper) PodOverHead(resources corev1.ResourceList) *PodSetWrapper {
-	p.Template.Spec.Overhead = resources
-	return p
-}
-
-func (p *PodSetWrapper) ResourceClaimTemplate(claimName, templateName string) *PodSetWrapper {
-	p.Template.Spec.ResourceClaims = append(p.Template.Spec.ResourceClaims, corev1.PodResourceClaim{
-		Name:                      claimName,
-		ResourceClaimTemplateName: ptr.To(templateName),
-	})
-	if len(p.Template.Spec.Containers) > 0 {
-		p.Template.Spec.Containers[0].Resources.Claims = append(
-			p.Template.Spec.Containers[0].Resources.Claims,
-			corev1.ResourceClaim{Name: claimName},
-		)
-	}
-	return p
-}
-
-func (p *PodSetWrapper) ResourceClaim(claimName, resourceClaimName string) *PodSetWrapper {
-	p.Template.Spec.ResourceClaims = append(p.Template.Spec.ResourceClaims, corev1.PodResourceClaim{
-		Name:              claimName,
-		ResourceClaimName: ptr.To(resourceClaimName),
-	})
-	if len(p.Template.Spec.Containers) > 0 {
-		p.Template.Spec.Containers[0].Resources.Claims = append(
-			p.Template.Spec.Containers[0].Resources.Claims,
-			corev1.ResourceClaim{Name: claimName},
-		)
-	}
-	return p
-}
-
-// AdmissionWrapper wraps an Admission
-type AdmissionWrapper struct{ kueue.Admission }
-
-func MakeAdmission(cq string, podSetNames ...kueue.PodSetReference) *AdmissionWrapper {
-	wrap := &AdmissionWrapper{kueue.Admission{
-		ClusterQueue: kueue.ClusterQueueReference(cq),
-	}}
-
-	if len(podSetNames) == 0 {
-		wrap.PodSetAssignments = []kueue.PodSetAssignment{
-			MakePodSetAssignment(kueue.DefaultPodSetName).Obj(),
-		}
-		return wrap
-	}
-
-	var psFlavors []kueue.PodSetAssignment
-	for _, name := range podSetNames {
-		psFlavors = append(psFlavors, MakePodSetAssignment(name).Obj())
-	}
-	wrap.PodSetAssignments = psFlavors
-	return wrap
-}
-
-func (w *AdmissionWrapper) Obj() *kueue.Admission {
-	return &w.Admission
-}
-
-func (w *AdmissionWrapper) PodSets(podSets ...kueue.PodSetAssignment) *AdmissionWrapper {
-	w.PodSetAssignments = podSets
-	return w
-}
-
-// LocalQueueWrapper wraps a Queue.
-type LocalQueueWrapper struct{ kueue.LocalQueue }
-
-// MakeLocalQueue creates a wrapper for a LocalQueue.
-func MakeLocalQueue(name, ns string) *LocalQueueWrapper {
-	return &LocalQueueWrapper{kueue.LocalQueue{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
-			Namespace: ns,
-		},
-	}}
-}
-
-// Creation sets the creation timestamp of the LocalQueue.
-func (q *LocalQueueWrapper) Creation(t time.Time) *LocalQueueWrapper {
-	q.CreationTimestamp = metav1.NewTime(t)
-	return q
-}
-
-// Label sets the label on the LocalQueue.
-func (q *LocalQueueWrapper) Label(k, v string) *LocalQueueWrapper {
-	if q.Labels == nil {
-		q.Labels = make(map[string]string)
-	}
-	q.Labels[k] = v
-	return q
-}
-
-// Obj returns the inner LocalQueue.
-func (q *LocalQueueWrapper) Obj() *kueue.LocalQueue {
-	return &q.LocalQueue
-}
-
-// ClusterQueue updates the clusterQueue the queue points to.
-func (q *LocalQueueWrapper) ClusterQueue(c string) *LocalQueueWrapper {
-	q.Spec.ClusterQueue = kueue.ClusterQueueReference(c)
-	return q
-}
-
-// StopPolicy sets the stop policy.
-func (q *LocalQueueWrapper) StopPolicy(p kueue.StopPolicy) *LocalQueueWrapper {
-	q.Spec.StopPolicy = &p
-	return q
-}
-
-// FairSharing sets the fair sharing config.
-func (q *LocalQueueWrapper) FairSharing(fs *kueue.FairSharing) *LocalQueueWrapper {
-	q.Spec.FairSharing = fs
-	return q
-}
-
-// PendingWorkloads updates the pendingWorkloads in status.
-func (q *LocalQueueWrapper) PendingWorkloads(n int32) *LocalQueueWrapper {
-	q.Status.PendingWorkloads = n
-	return q
-}
-
-// ReservingWorkloads updates the reservingWorkloads in status.
-func (q *LocalQueueWrapper) ReservingWorkloads(n int32) *LocalQueueWrapper {
-	q.Status.ReservingWorkloads = n
-	return q
-}
-
-// AdmittedWorkloads updates the admittedWorkloads in status.
-func (q *LocalQueueWrapper) AdmittedWorkloads(n int32) *LocalQueueWrapper {
-	q.Status.AdmittedWorkloads = n
-	return q
-}
-
-// Condition sets a condition on the LocalQueue.
-func (q *LocalQueueWrapper) Condition(conditionType string, status metav1.ConditionStatus, reason, message string, generation int64) *LocalQueueWrapper {
-	apimeta.SetStatusCondition(&q.Status.Conditions, metav1.Condition{
-		Type:               conditionType,
-		Status:             status,
-		Reason:             reason,
-		Message:            message,
-		ObservedGeneration: generation,
-	})
-	return q
-}
-
-func (q *LocalQueueWrapper) Active(status metav1.ConditionStatus) *LocalQueueWrapper {
-	apimeta.SetStatusCondition(&q.Status.Conditions, metav1.Condition{
-		Type:    kueue.LocalQueueActive,
-		Status:  status,
-		Reason:  "Ready",
-		Message: "Can submit new workloads to localQueue",
-	})
-	return q
-}
-
-// FairSharingStatus updates the fairSharing in status.
-func (q *LocalQueueWrapper) FairSharingStatus(status *kueue.FairSharingStatus) *LocalQueueWrapper {
-	q.Status.FairSharing = status
-	return q
-}
-
-// Generation sets the generation of the LocalQueue.
-func (q *LocalQueueWrapper) Generation(num int64) *LocalQueueWrapper {
-	q.ObjectMeta.Generation = num
-	return q
-}
-
-// GeneratedName sets the prefix for the server to generate unique name.
-// No name should be given in the MakeClusterQueue for the GeneratedName to work.
-func (q *LocalQueueWrapper) GeneratedName(name string) *LocalQueueWrapper {
-	q.GenerateName = name
-	return q
-}
-
-type CohortWrapper struct {
-	kueue.Cohort
-}
-
-func MakeCohort(name kueue.CohortReference) *CohortWrapper {
-	return &CohortWrapper{kueue.Cohort{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: string(name),
-		},
-	}}
-}
-
-func (c *CohortWrapper) Obj() *kueue.Cohort {
-	return &c.Cohort
-}
-
-func (c *CohortWrapper) Parent(parentName kueue.CohortReference) *CohortWrapper {
-	c.Spec.ParentName = parentName
-	return c
-}
-
-// ResourceGroup adds a ResourceGroup with flavors.
-func (c *CohortWrapper) ResourceGroup(flavors ...kueue.FlavorQuotas) *CohortWrapper {
-	c.Spec.ResourceGroups = append(c.Spec.ResourceGroups, ResourceGroup(flavors...))
-	return c
-}
-
-func (c *CohortWrapper) FairWeight(w resource.Quantity) *CohortWrapper {
-	if c.Spec.FairSharing == nil {
-		c.Spec.FairSharing = &kueue.FairSharing{}
-	}
-	c.Spec.FairSharing.Weight = &w
-	return c
-}
-
-// ClusterQueueWrapper wraps a ClusterQueue.
-type ClusterQueueWrapper struct{ kueue.ClusterQueue }
-
-// MakeClusterQueue creates a wrapper for a ClusterQueue with a
-// select-all NamespaceSelector.
-func MakeClusterQueue(name string) *ClusterQueueWrapper {
-	return &ClusterQueueWrapper{kueue.ClusterQueue{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: name,
-		},
-		Spec: kueue.ClusterQueueSpec{
-			NamespaceSelector: &metav1.LabelSelector{},
-			QueueingStrategy:  kueue.BestEffortFIFO,
-			FlavorFungibility: &kueue.FlavorFungibility{
-				WhenCanBorrow:  kueue.MayStopSearch,
-				WhenCanPreempt: kueue.TryNextFlavor,
-			},
-		},
-	}}
-}
-
-func (c *ClusterQueueWrapper) Clone() *ClusterQueueWrapper {
-	return &ClusterQueueWrapper{ClusterQueue: *c.DeepCopy()}
-}
-
-// Obj returns the inner ClusterQueue.
-func (c *ClusterQueueWrapper) Obj() *kueue.ClusterQueue {
-	return &c.ClusterQueue
-}
-
-// Cohort sets the borrowing cohort.
-func (c *ClusterQueueWrapper) Cohort(cohort kueue.CohortReference) *ClusterQueueWrapper {
-	c.Spec.Cohort = cohort
-	return c
-}
-
-func (c *ClusterQueueWrapper) AdmissionCheckStrategy(acs ...kueue.AdmissionCheckStrategyRule) *ClusterQueueWrapper {
-	if c.Spec.AdmissionChecksStrategy == nil {
-		c.Spec.AdmissionChecksStrategy = &kueue.AdmissionChecksStrategy{}
-	}
-	c.Spec.AdmissionChecksStrategy.AdmissionChecks = acs
-	return c
-}
-
-func (c *ClusterQueueWrapper) AdmissionMode(am kueue.AdmissionMode) *ClusterQueueWrapper {
-	if c.Spec.AdmissionScope == nil {
-		c.Spec.AdmissionScope = &kueue.AdmissionScope{}
-	}
-	c.Spec.AdmissionScope.AdmissionMode = am
-	return c
-}
-
-func (c *ClusterQueueWrapper) Active(status metav1.ConditionStatus) *ClusterQueueWrapper {
-	apimeta.SetStatusCondition(&c.Status.Conditions, metav1.Condition{
-		Type:    kueue.ClusterQueueActive,
-		Status:  status,
-		Reason:  "By test",
-		Message: "by test",
-	})
-	return c
-}
-
-// GeneratedName sets the prefix for the server to generate unique name.
-// No name should be given in the MakeClusterQueue for the GeneratedName to work.
-func (c *ClusterQueueWrapper) GeneratedName(name string) *ClusterQueueWrapper {
-	c.GenerateName = name
-	return c
-}
-
-// ResourceGroup creates a ResourceGroup with the given FlavorQuotas.
-func ResourceGroup(flavors ...kueue.FlavorQuotas) kueue.ResourceGroup {
-	rg := kueue.ResourceGroup{
-		Flavors: flavors,
-	}
-	if len(flavors) > 0 {
-		var resources []corev1.ResourceName
-		for _, r := range flavors[0].Resources {
-			resources = append(resources, r.Name)
-		}
-		for i := 1; i < len(flavors); i++ {
-			if len(flavors[i].Resources) != len(resources) {
-				panic("Must list the same resources in all flavors in a ResourceGroup")
-			}
-			for j, r := range flavors[i].Resources {
-				if r.Name != resources[j] {
-					panic("Must list the same resources in all flavors in a ResourceGroup")
-				}
-			}
-		}
-		rg.CoveredResources = resources
-	}
-	return rg
-}
-
-// ResourceGroup adds a ResourceGroup with flavors.
-func (c *ClusterQueueWrapper) ResourceGroup(flavors ...kueue.FlavorQuotas) *ClusterQueueWrapper {
-	c.Spec.ResourceGroups = append(c.Spec.ResourceGroups, ResourceGroup(flavors...))
-	return c
-}
-
-// AdmissionChecks replaces the queue additional checks
-func (c *ClusterQueueWrapper) AdmissionChecks(checks ...kueue.AdmissionCheckReference) *ClusterQueueWrapper {
-	c.Spec.AdmissionChecks = checks
-	return c
-}
-
-// QueueingStrategy sets the queueing strategy in this ClusterQueue.
-func (c *ClusterQueueWrapper) QueueingStrategy(strategy kueue.QueueingStrategy) *ClusterQueueWrapper {
-	c.Spec.QueueingStrategy = strategy
-	return c
-}
-
-// NamespaceSelector sets the namespace selector.
-func (c *ClusterQueueWrapper) NamespaceSelector(s *metav1.LabelSelector) *ClusterQueueWrapper {
-	c.Spec.NamespaceSelector = s
-	return c
-}
-
-// Preemption sets the preemption policies.
-func (c *ClusterQueueWrapper) Preemption(p kueue.ClusterQueuePreemption) *ClusterQueueWrapper {
-	c.Spec.Preemption = &p
-	return c
-}
-
-// FlavorFungibility sets the flavorFungibility policies.
-func (c *ClusterQueueWrapper) FlavorFungibility(p kueue.FlavorFungibility) *ClusterQueueWrapper {
-	c.Spec.FlavorFungibility = &p
-	return c
-}
-
-// StopPolicy sets the stop policy.
-func (c *ClusterQueueWrapper) StopPolicy(p kueue.StopPolicy) *ClusterQueueWrapper {
-	c.Spec.StopPolicy = &p
-	return c
-}
-
-// DeletionTimestamp sets a deletion timestamp for the cluster queue.
-func (c *ClusterQueueWrapper) DeletionTimestamp(t time.Time) *ClusterQueueWrapper {
-	c.ClusterQueue.DeletionTimestamp = ptr.To(metav1.NewTime(t).Rfc3339Copy())
-	return c
-}
-
-func (c *ClusterQueueWrapper) Label(k, v string) *ClusterQueueWrapper {
-	if c.Labels == nil {
-		c.Labels = make(map[string]string)
-	}
-	c.Labels[k] = v
-	return c
-}
-
-func (c *ClusterQueueWrapper) FairWeight(w resource.Quantity) *ClusterQueueWrapper {
-	if c.Spec.FairSharing == nil {
-		c.Spec.FairSharing = &kueue.FairSharing{}
-	}
-	c.Spec.FairSharing.Weight = &w
-	return c
-}
-
-// Condition sets a condition on the ClusterQueue.
-func (c *ClusterQueueWrapper) Condition(conditionType string, status metav1.ConditionStatus, reason, message string) *ClusterQueueWrapper {
-	apimeta.SetStatusCondition(&c.Status.Conditions, metav1.Condition{
-		Type:    conditionType,
-		Status:  status,
-		Reason:  reason,
-		Message: message,
-	})
-	return c
-}
-
-// Generation sets the generation of the ClusterQueue.
-func (c *ClusterQueueWrapper) Generation(num int64) *ClusterQueueWrapper {
-	c.ObjectMeta.Generation = num
-	return c
-}
-
-// Creation sets the creation timestamp of the ClusterQueue.
-func (c *ClusterQueueWrapper) Creation(t time.Time) *ClusterQueueWrapper {
-	c.CreationTimestamp = metav1.NewTime(t)
-	return c
-}
-
-// PendingWorkloads sets the pendingWorkloads in status.
-func (c *ClusterQueueWrapper) PendingWorkloads(n int32) *ClusterQueueWrapper {
-	c.Status.PendingWorkloads = n
-	return c
-}
-
-// AdmittedWorkloads sets the admittedWorkloads in status.
-func (c *ClusterQueueWrapper) AdmittedWorkloads(n int32) *ClusterQueueWrapper {
-	c.Status.AdmittedWorkloads = n
-	return c
-}
-
-// FlavorQuotasWrapper wraps a FlavorQuotas object.
-type FlavorQuotasWrapper struct{ kueue.FlavorQuotas }
-
-// MakeFlavorQuotas creates a wrapper for a resource flavor.
-func MakeFlavorQuotas(name string) *FlavorQuotasWrapper {
-	return &FlavorQuotasWrapper{kueue.FlavorQuotas{
-		Name: kueue.ResourceFlavorReference(name),
-	}}
-}
-
-// Obj returns the inner flavor.
-func (f *FlavorQuotasWrapper) Obj() *kueue.FlavorQuotas {
-	return &f.FlavorQuotas
-}
-
-// Resource takes ResourceName, followed by the optional NominalQuota, BorrowingLimit, LendingLimit.
-func (f *FlavorQuotasWrapper) Resource(name corev1.ResourceName, qs ...string) *FlavorQuotasWrapper {
-	resourceWrapper := f.ResourceQuotaWrapper(name)
-	if len(qs) > 0 {
-		resourceWrapper.NominalQuota(qs[0])
-	}
-	if len(qs) > 1 && len(qs[1]) > 0 {
-		resourceWrapper.BorrowingLimit(qs[1])
-	}
-	if len(qs) > 2 && len(qs[2]) > 0 {
-		resourceWrapper.LendingLimit(qs[2])
-	}
-	if len(qs) > 3 {
-		panic("Must have at most 3 quantities for nominalQuota, borrowingLimit and lendingLimit")
-	}
-	return resourceWrapper.Append()
-}
-
-// ResourceQuotaWrapper allows creation the creation of a Resource in a type-safe manner.
-func (f *FlavorQuotasWrapper) ResourceQuotaWrapper(name corev1.ResourceName) *ResourceQuotaWrapper {
-	rq := kueue.ResourceQuota{
-		Name: name,
-	}
-	return &ResourceQuotaWrapper{parent: f, ResourceQuota: rq}
-}
-
-// ResourceQuotaWrapper wraps a ResourceQuota object.
-type ResourceQuotaWrapper struct {
-	parent *FlavorQuotasWrapper
-	kueue.ResourceQuota
-}
-
-func (rq *ResourceQuotaWrapper) NominalQuota(quantity string) *ResourceQuotaWrapper {
-	rq.ResourceQuota.NominalQuota = resource.MustParse(quantity)
-	return rq
-}
-
-func (rq *ResourceQuotaWrapper) BorrowingLimit(quantity string) *ResourceQuotaWrapper {
-	rq.ResourceQuota.BorrowingLimit = ptr.To(resource.MustParse(quantity))
-	return rq
-}
+	corev1 "k8s.io/api/core/v1"
+	nodev1 "k8s.io/api/node/v1"
+	schedulingv1 "k8s.io/api/scheduling/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/ptr"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
-func (rq *ResourceQuotaWrapper) LendingLimit(quantity string) *ResourceQuotaWrapper {
-	rq.ResourceQuota.LendingLimit = ptr.To(resource.MustParse(quantity))
-	return rq
-}
+	utilResource "sigs.k8s.io/kueue/pkg/util/resource"
+)
 
-// Append appends the ResourceQuotaWrapper to its parent
-func (rq *ResourceQuotaWrapper) Append() *FlavorQuotasWrapper {
-	rq.parent.Resources = append(rq.parent.Resources, rq.ResourceQuota)
-	return rq.parent
+// PriorityClassWrapper wraps a PriorityClass.
+type PriorityClassWrapper struct {
+	schedulingv1.PriorityClass
 }
 
-// ResourceFlavorWrapper wraps a ResourceFlavor.
-type ResourceFlavorWrapper struct{ kueue.ResourceFlavor }
-
-// MakeResourceFlavor creates a wrapper for a ResourceFlavor.
-func MakeResourceFlavor(name string) *ResourceFlavorWrapper {
-	return &ResourceFlavorWrapper{kueue.ResourceFlavor{
+// MakePriorityClass creates a wrapper for a PriorityClass.
+func MakePriorityClass(name string) *PriorityClassWrapper {
+	return &PriorityClassWrapper{schedulingv1.PriorityClass{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: name,
-		},
-		Spec: kueue.ResourceFlavorSpec{
-			NodeLabels: make(map[string]string),
-		},
-	}}
-}
-
-// Obj returns the inner ResourceFlavor.
-func (rf *ResourceFlavorWrapper) Obj() *kueue.ResourceFlavor {
-	return &rf.ResourceFlavor
-}
-
-// TopologyName sets the topology name
-func (rf *ResourceFlavorWrapper) TopologyName(name string) *ResourceFlavorWrapper {
-	rf.Spec.TopologyName = ptr.To(kueue.TopologyReference(name))
-	return rf
-}
-
-// Label sets the label on the ResourceFlavor.
-func (rf *ResourceFlavorWrapper) Label(k, v string) *ResourceFlavorWrapper {
-	if rf.Labels == nil {
-		rf.Labels = map[string]string{}
+		}},
 	}
-	rf.Labels[k] = v
-	return rf
-}
-
-// NodeLabel add a label kueue and value pair to the ResourceFlavor.
-func (rf *ResourceFlavorWrapper) NodeLabel(k, v string) *ResourceFlavorWrapper {
-	rf.Spec.NodeLabels[k] = v
-	return rf
-}
-
-// Taint adds a taint to the ResourceFlavor.
-func (rf *ResourceFlavorWrapper) Taint(t corev1.Taint) *ResourceFlavorWrapper {
-	rf.Spec.NodeTaints = append(rf.Spec.NodeTaints, t)
-	return rf
 }
 
-// Toleration  adds a taint to the ResourceFlavor.
-func (rf *ResourceFlavorWrapper) Toleration(t corev1.Toleration) *ResourceFlavorWrapper {
-	rf.Spec.Tolerations = append(rf.Spec.Tolerations, t)
-	return rf
-}
-
-// Creation sets the creation timestamp of the LocalQueue.
-func (rf *ResourceFlavorWrapper) Creation(t time.Time) *ResourceFlavorWrapper {
-	rf.CreationTimestamp = metav1.NewTime(t)
-	return rf
-}
-
-// TopologyWrapper wraps a Topology.
-type TopologyWrapper struct{ kueue.Topology }
-
-// MakeTopology creates a wrapper for a Topology.
-func MakeTopology(name string) *TopologyWrapper {
-	return &TopologyWrapper{kueue.Topology{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: name,
-		},
-	}}
-}
-
-// Levels sets the levels for a Topology.
-func (t *TopologyWrapper) Levels(levels ...string) *TopologyWrapper {
-	t.Spec.Levels = make([]kueue.TopologyLevel, len(levels))
-	for i, level := range levels {
-		t.Spec.Levels[i] = kueue.TopologyLevel{
-			NodeLabel: level,
-		}
-	}
-	return t
+// PriorityValue update value of PriorityClass。
+func (p *PriorityClassWrapper) PriorityValue(v int32) *PriorityClassWrapper {
+	p.Value = v
+	return p
 }
 
-func (t *TopologyWrapper) Obj() *kueue.Topology {
-	return &t.Topology
+// Obj returns the inner PriorityClass.
+func (p *PriorityClassWrapper) Obj() *schedulingv1.PriorityClass {
+	return &p.PriorityClass
 }
 
 // RuntimeClassWrapper wraps a RuntimeClass.
@@ -1252,174 +135,6 @@ func (lr *LimitRangeWrapper) Obj() *corev1.LimitRange {
 	return &lr.LimitRange
 }
 
-type AdmissionCheckWrapper struct{ kueue.AdmissionCheck }
-
-func MakeAdmissionCheck(name string) *AdmissionCheckWrapper {
-	return &AdmissionCheckWrapper{
-		AdmissionCheck: kueue.AdmissionCheck{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: name,
-			},
-		},
-	}
-}
-
-type AdmissionCheckStrategyRuleWrapper struct {
-	kueue.AdmissionCheckStrategyRule
-}
-
-func MakeAdmissionCheckStrategyRule(name kueue.AdmissionCheckReference, flavors ...kueue.ResourceFlavorReference) *AdmissionCheckStrategyRuleWrapper {
-	if len(flavors) == 0 {
-		flavors = make([]kueue.ResourceFlavorReference, 0)
-	}
-	return &AdmissionCheckStrategyRuleWrapper{
-		AdmissionCheckStrategyRule: kueue.AdmissionCheckStrategyRule{
-			Name:      name,
-			OnFlavors: flavors,
-		},
-	}
-}
-
-func (acs *AdmissionCheckStrategyRuleWrapper) OnFlavors(flavors []kueue.ResourceFlavorReference) *AdmissionCheckStrategyRuleWrapper {
-	acs.AdmissionCheckStrategyRule.OnFlavors = flavors
-	return acs
-}
-
-func (acs *AdmissionCheckStrategyRuleWrapper) Obj() *kueue.AdmissionCheckStrategyRule {
-	return &acs.AdmissionCheckStrategyRule
-}
-
-func (ac *AdmissionCheckWrapper) Active(status metav1.ConditionStatus) *AdmissionCheckWrapper {
-	apimeta.SetStatusCondition(&ac.Status.Conditions, metav1.Condition{
-		Type:    kueue.AdmissionCheckActive,
-		Status:  status,
-		Reason:  "ByTest",
-		Message: "by test",
-	})
-	return ac
-}
-
-func (ac *AdmissionCheckWrapper) Condition(cond metav1.Condition) *AdmissionCheckWrapper {
-	apimeta.SetStatusCondition(&ac.Status.Conditions, cond)
-	return ac
-}
-
-// Generation sets the generation of the AdmissionCheck.
-func (ac *AdmissionCheckWrapper) Generation(num int64) *AdmissionCheckWrapper {
-	ac.ObjectMeta.Generation = num
-	return ac
-}
-
-func (ac *AdmissionCheckWrapper) ControllerName(c string) *AdmissionCheckWrapper {
-	ac.Spec.ControllerName = c
-	return ac
-}
-
-func (ac *AdmissionCheckWrapper) Parameters(apigroup, kind, name string) *AdmissionCheckWrapper {
-	ac.Spec.Parameters = &kueue.AdmissionCheckParametersReference{
-		APIGroup: apigroup,
-		Kind:     kind,
-		Name:     name,
-	}
-	return ac
-}
-
-func (ac *AdmissionCheckWrapper) Obj() *kueue.AdmissionCheck {
-	return &ac.AdmissionCheck
-}
-
-// WorkloadPriorityClassWrapper wraps a WorkloadPriorityClass.
-type WorkloadPriorityClassWrapper struct {
-	kueue.WorkloadPriorityClass
-}
-
-// MakeWorkloadPriorityClass creates a wrapper for a WorkloadPriorityClass.
-func MakeWorkloadPriorityClass(name string) *WorkloadPriorityClassWrapper {
-	return &WorkloadPriorityClassWrapper{kueue.WorkloadPriorityClass{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: name,
-		}},
-	}
-}
-
-// PriorityValue updates value of WorkloadPriorityClass.
-func (p *WorkloadPriorityClassWrapper) PriorityValue(v int32) *WorkloadPriorityClassWrapper {
-	p.Value = v
-	return p
-}
-
-// Obj returns the inner WorkloadPriorityClass.
-func (p *WorkloadPriorityClassWrapper) Obj() *kueue.WorkloadPriorityClass {
-	return &p.WorkloadPriorityClass
-}
-
-type MultiKueueConfigWrapper struct {
-	kueue.MultiKueueConfig
-}
-
-func MakeMultiKueueConfig(name string) *MultiKueueConfigWrapper {
-	return &MultiKueueConfigWrapper{
-		MultiKueueConfig: kueue.MultiKueueConfig{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: name,
-			},
-		},
-	}
-}
-
-func (mkc *MultiKueueConfigWrapper) Obj() *kueue.MultiKueueConfig {
-	return &mkc.MultiKueueConfig
-}
-
-func (mkc *MultiKueueConfigWrapper) Clusters(clusters ...string) *MultiKueueConfigWrapper {
-	mkc.Spec.Clusters = append(mkc.Spec.Clusters, clusters...)
-	return mkc
-}
-
-type MultiKueueClusterWrapper struct {
-	kueue.MultiKueueCluster
-}
-
-func MakeMultiKueueCluster(name string) *MultiKueueClusterWrapper {
-	return &MultiKueueClusterWrapper{
-		MultiKueueCluster: kueue.MultiKueueCluster{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: name,
-			},
-		},
-	}
-}
-
-func (mkc *MultiKueueClusterWrapper) Obj() *kueue.MultiKueueCluster {
-	return &mkc.MultiKueueCluster
-}
-
-func (mkc *MultiKueueClusterWrapper) KubeConfig(locationType kueue.LocationType, location string) *MultiKueueClusterWrapper {
-	mkc.Spec.KubeConfig = kueue.KubeConfig{
-		Location:     location,
-		LocationType: locationType,
-	}
-	return mkc
-}
-
-func (mkc *MultiKueueClusterWrapper) Active(state metav1.ConditionStatus, reason, message string, generation int64) *MultiKueueClusterWrapper {
-	cond := metav1.Condition{
-		Type:               kueue.MultiKueueClusterActive,
-		Status:             state,
-		Reason:             reason,
-		Message:            message,
-		ObservedGeneration: generation,
-	}
-	apimeta.SetStatusCondition(&mkc.Status.Conditions, cond)
-	return mkc
-}
-
-// Generation sets the generation of the MultiKueueCluster.
-func (mkc *MultiKueueClusterWrapper) Generation(num int64) *MultiKueueClusterWrapper {
-	mkc.ObjectMeta.Generation = num
-	return mkc
-}
-
 // ContainerWrapper wraps a corev1.Container.
 type ContainerWrapper struct{ corev1.Container }
 
@@ -1472,104 +187,6 @@ func (c *ContainerWrapper) AsSidecar() *ContainerWrapper {
 	return c
 }
 
-// ProvisioningRequestConfigWrapper wraps a ProvisioningRequestConfig
-type ProvisioningRequestConfigWrapper struct {
-	kueue.ProvisioningRequestConfig
-}
-
-// MakeProvisioningRequestConfig creates a wrapper for a ProvisioningRequestConfig.
-func MakeProvisioningRequestConfig(name string) *ProvisioningRequestConfigWrapper {
-	return &ProvisioningRequestConfigWrapper{kueue.ProvisioningRequestConfig{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: name,
-		}},
-	}
-}
-
-func (prc *ProvisioningRequestConfigWrapper) ProvisioningClass(pc string) *ProvisioningRequestConfigWrapper {
-	prc.Spec.ProvisioningClassName = pc
-	return prc
-}
-
-func (prc *ProvisioningRequestConfigWrapper) Parameters(parameters map[string]kueue.Parameter) *ProvisioningRequestConfigWrapper {
-	if prc.Spec.Parameters == nil {
-		prc.Spec.Parameters = make(map[string]kueue.Parameter, len(parameters))
-	}
-
-	maps.Copy(prc.Spec.Parameters, parameters)
-
-	return prc
-}
-
-func (prc *ProvisioningRequestConfigWrapper) WithParameter(key string, value kueue.Parameter) *ProvisioningRequestConfigWrapper {
-	if prc.Spec.Parameters == nil {
-		prc.Spec.Parameters = make(map[string]kueue.Parameter, 1)
-	}
-
-	prc.Spec.Parameters[key] = value
-	return prc
-}
-
-func (prc *ProvisioningRequestConfigWrapper) ManagedResources(r []corev1.ResourceName) *ProvisioningRequestConfigWrapper {
-	prc.Spec.ManagedResources = r
-	return prc
-}
-
-func (prc *ProvisioningRequestConfigWrapper) WithManagedResource(managedResource corev1.ResourceName) *ProvisioningRequestConfigWrapper {
-	prc.Spec.ManagedResources = append(prc.Spec.ManagedResources, managedResource)
-	return prc
-}
-
-func (prc *ProvisioningRequestConfigWrapper) RetryStrategy(retryStrategy *kueue.ProvisioningRequestRetryStrategy) *ProvisioningRequestConfigWrapper {
-	prc.Spec.RetryStrategy = retryStrategy
-	return prc
-}
-
-func (prc *ProvisioningRequestConfigWrapper) PodSetUpdate(update kueue.ProvisioningRequestPodSetUpdates) *ProvisioningRequestConfigWrapper {
-	prc.Spec.PodSetUpdates = &update
-	return prc
-}
-
-func (prc *ProvisioningRequestConfigWrapper) BaseBackoff(backoffBaseSeconds int32) *ProvisioningRequestConfigWrapper {
-	if prc.Spec.RetryStrategy == nil {
-		prc.Spec.RetryStrategy = &kueue.ProvisioningRequestRetryStrategy{}
-	}
-
-	prc.Spec.RetryStrategy.BackoffBaseSeconds = &backoffBaseSeconds
-	return prc
-}
-
-func (prc *ProvisioningRequestConfigWrapper) MaxBackoff(backoffMaxSeconds int32) *ProvisioningRequestConfigWrapper {
-	if prc.Spec.RetryStrategy == nil {
-		prc.Spec.RetryStrategy = &kueue.ProvisioningRequestRetryStrategy{}
-	}
-
-	prc.Spec.RetryStrategy.BackoffMaxSeconds = &backoffMaxSeconds
-	return prc
-}
-
-func (prc *ProvisioningRequestConfigWrapper) RetryLimit(backoffLimitCount int32) *ProvisioningRequestConfigWrapper {
-	if prc.Spec.RetryStrategy == nil {
-		prc.Spec.RetryStrategy = &kueue.ProvisioningRequestRetryStrategy{}
-	}
-
-	prc.Spec.RetryStrategy.BackoffLimitCount = &backoffLimitCount
-	return prc
-}
-
-func (prc *ProvisioningRequestConfigWrapper) PodSetMergePolicy(mode kueue.ProvisioningRequestConfigPodSetMergePolicy) *ProvisioningRequestConfigWrapper {
-	prc.Spec.PodSetMergePolicy = &mode
-	return prc
-}
-
-func (prc *ProvisioningRequestConfigWrapper) Clone() *ProvisioningRequestConfigWrapper {
-	return &ProvisioningRequestConfigWrapper{ProvisioningRequestConfig: *prc.DeepCopy()}
-}
-
-func (prc *ProvisioningRequestConfigWrapper) Obj() *kueue.ProvisioningRequestConfig {
-	return &prc.ProvisioningRequestConfig
-}
-
 type PodTemplateWrapper struct {
 	corev1.PodTemplate
 }
@@ -1714,105 +331,3 @@ func (e *EventRecordWrapper) Message(message string) *EventRecordWrapper {
 func (e *EventRecordWrapper) Obj() EventRecord {
 	return e.EventRecord
 }
-
-type TopologyDomainAssignmentWrapper struct {
-	kueue.TopologyDomainAssignment
-}
-
-func MakeTopologyDomainAssignment(values []string, count int32) *TopologyDomainAssignmentWrapper {
-	return &TopologyDomainAssignmentWrapper{
-		TopologyDomainAssignment: kueue.TopologyDomainAssignment{
-			Values: values,
-			Count:  count,
-		},
-	}
-}
-
-func (t *TopologyDomainAssignmentWrapper) Obj() kueue.TopologyDomainAssignment {
-	return t.TopologyDomainAssignment
-}
-
-type TopologyAssignmentWrapper struct {
-	kueue.TopologyAssignment
-}
-
-func MakeTopologyAssignment(levels []string) *TopologyAssignmentWrapper {
-	return &TopologyAssignmentWrapper{
-		TopologyAssignment: kueue.TopologyAssignment{
-			Levels: levels,
-		},
-	}
-}
-
-func (t *TopologyAssignmentWrapper) Levels(levels ...string) *TopologyAssignmentWrapper {
-	t.TopologyAssignment.Levels = levels
-	return t
-}
-
-func (t *TopologyAssignmentWrapper) Domains(domains ...kueue.TopologyDomainAssignment) *TopologyAssignmentWrapper {
-	t.TopologyAssignment.Domains = domains
-	return t
-}
-
-func (t *TopologyAssignmentWrapper) Domain(domain kueue.TopologyDomainAssignment) *TopologyAssignmentWrapper {
-	t.TopologyAssignment.Domains = append(t.TopologyAssignment.Domains, domain)
-	return t
-}
-
-func (t *TopologyAssignmentWrapper) Obj() *kueue.TopologyAssignment {
-	return &t.TopologyAssignment
-}
-
-type PodSetAssignmentWrapper struct {
-	kueue.PodSetAssignment
-}
-
-func MakePodSetAssignment(name kueue.PodSetReference) *PodSetAssignmentWrapper {
-	return &PodSetAssignmentWrapper{
-		PodSetAssignment: kueue.PodSetAssignment{
-			Name:          name,
-			Flavors:       make(map[corev1.ResourceName]kueue.ResourceFlavorReference),
-			ResourceUsage: make(corev1.ResourceList),
-			Count:         ptr.To[int32](1),
-		},
-	}
-}
-
-func (p *PodSetAssignmentWrapper) Obj() kueue.PodSetAssignment {
-	return p.PodSetAssignment
-}
-
-func (p *PodSetAssignmentWrapper) Flavor(resource corev1.ResourceName, flavor kueue.ResourceFlavorReference) *PodSetAssignmentWrapper {
-	if p.Flavors == nil {
-		p.Flavors = make(map[corev1.ResourceName]kueue.ResourceFlavorReference)
-	}
-	p.Flavors[resource] = flavor
-	return p
-}
-
-func (p *PodSetAssignmentWrapper) ResourceUsage(resourceName corev1.ResourceName, quantity string) *PodSetAssignmentWrapper {
-	if p.PodSetAssignment.ResourceUsage == nil {
-		p.PodSetAssignment.ResourceUsage = make(corev1.ResourceList)
-	}
-	p.PodSetAssignment.ResourceUsage[resourceName] = resource.MustParse(quantity)
-	return p
-}
-
-func (p *PodSetAssignmentWrapper) Count(count int32) *PodSetAssignmentWrapper {
-	p.PodSetAssignment.Count = ptr.To(count)
-	return p
-}
-
-func (p *PodSetAssignmentWrapper) TopologyAssignment(ta *kueue.TopologyAssignment) *PodSetAssignmentWrapper {
-	p.PodSetAssignment.TopologyAssignment = ta
-	return p
-}
-
-func (p *PodSetAssignmentWrapper) DelayedTopologyRequest(state kueue.DelayedTopologyRequestState) *PodSetAssignmentWrapper {
-	p.PodSetAssignment.DelayedTopologyRequest = ptr.To(state)
-	return p
-}
-
-func (p *PodSetAssignmentWrapper) Assignment(r corev1.ResourceName, f kueue.ResourceFlavorReference, value string) *PodSetAssignmentWrapper {
-	return p.Flavor(r, f).ResourceUsage(r, value)
-}
diff --git a/pkg/util/testingjobs/job/wrappers.go b/pkg/util/testingjobs/job/wrappers.go
index 11e70b893..29db73a38 100644
--- a/pkg/util/testingjobs/job/wrappers.go
+++ b/pkg/util/testingjobs/job/wrappers.go
@@ -146,11 +146,6 @@ func (j *JobWrapper) Label(key, value string) *JobWrapper {
 	return j
 }
 
-// QueueNameAnnotation updates the queue name of the job by annotation (deprecated)
-func (j *JobWrapper) QueueNameAnnotation(queue string) *JobWrapper {
-	return j.SetAnnotation(constants.QueueAnnotation, queue)
-}
-
 func (j *JobWrapper) SetAnnotation(key, content string) *JobWrapper {
 	j.Annotations[key] = content
 	return j
diff --git a/pkg/util/testingjobs/statefulset/wrappers.go b/pkg/util/testingjobs/statefulset/wrappers.go
index 298d80de6..645b62283 100644
--- a/pkg/util/testingjobs/statefulset/wrappers.go
+++ b/pkg/util/testingjobs/statefulset/wrappers.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/constants"
 	controllerconstants "sigs.k8s.io/kueue/pkg/controller/constants"
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
@@ -199,7 +199,7 @@ func (ss *StatefulSetWrapper) PodTemplateSpecPodGroupServingAnnotation() *Statef
 }
 
 func (ss *StatefulSetWrapper) PodTemplateSpecPodGroupPodIndexLabelAnnotation(labelName string) *StatefulSetWrapper {
-	return ss.PodTemplateSpecAnnotation(v1beta1.PodGroupPodIndexLabelAnnotation, labelName)
+	return ss.PodTemplateSpecAnnotation(kueue.PodGroupPodIndexLabelAnnotation, labelName)
 }
 
 func (ss *StatefulSetWrapper) Image(image string, args []string) *StatefulSetWrapper {
diff --git a/pkg/visibility/api/v1beta1/pending_workloads_cq_test.go b/pkg/visibility/api/v1beta1/pending_workloads_cq_test.go
index 02c78e279..5f060a1d7 100644
--- a/pkg/visibility/api/v1beta1/pending_workloads_cq_test.go
+++ b/pkg/visibility/api/v1beta1/pending_workloads_cq_test.go
@@ -32,6 +32,7 @@ import (
 	qcache "sigs.k8s.io/kueue/pkg/cache/queue"
 	"sigs.k8s.io/kueue/pkg/constants"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestPendingWorkloadsInCQ(t *testing.T) {
@@ -66,14 +67,14 @@ func TestPendingWorkloadsInCQ(t *testing.T) {
 	}{
 		"single ClusterQueue and single LocalQueue setup with two workloads and default query parameters": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsName).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsName).ClusterQueue(cqNameA).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", nsName).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("b", nsName).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("a", nsName).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("b", nsName).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
 			},
 			req: &req{
 				queueName:   cqNameA,
@@ -107,17 +108,17 @@ func TestPendingWorkloadsInCQ(t *testing.T) {
 		},
 		"single ClusterQueue and two LocalQueue setup with four workloads and default query parameters": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsName).ClusterQueue(cqNameA).Obj(),
-				utiltesting.MakeLocalQueue(lqNameB, nsName).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsName).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameB, nsName).ClusterQueue(cqNameA).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("lqA-high-prio", nsName).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("lqA-low-prio", nsName).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("lqB-high-prio", nsName).Queue(lqNameB).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
-				utiltesting.MakeWorkload("lqB-low-prio", nsName).Queue(lqNameB).Priority(lowPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("lqA-high-prio", nsName).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("lqA-low-prio", nsName).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("lqB-high-prio", nsName).Queue(lqNameB).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("lqB-low-prio", nsName).Queue(lqNameB).Priority(lowPrio).Creation(now.Add(time.Second)).Obj(),
 			},
 			req: &req{
 				queueName:   cqNameA,
@@ -173,15 +174,15 @@ func TestPendingWorkloadsInCQ(t *testing.T) {
 		},
 		"limit query parameter set": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsName).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsName).ClusterQueue(cqNameA).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", nsName).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("b", nsName).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
-				utiltesting.MakeWorkload("c", nsName).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second * 2)).Obj(),
+				utiltestingapi.MakeWorkload("a", nsName).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("b", nsName).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("c", nsName).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second * 2)).Obj(),
 			},
 			req: &req{
 				queueName: cqNameA,
@@ -217,15 +218,15 @@ func TestPendingWorkloadsInCQ(t *testing.T) {
 		},
 		"offset query parameter set": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsName).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsName).ClusterQueue(cqNameA).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", nsName).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("b", nsName).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
-				utiltesting.MakeWorkload("c", nsName).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second * 2)).Obj(),
+				utiltestingapi.MakeWorkload("a", nsName).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("b", nsName).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("c", nsName).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second * 2)).Obj(),
 			},
 			req: &req{
 				queueName: cqNameA,
@@ -262,15 +263,15 @@ func TestPendingWorkloadsInCQ(t *testing.T) {
 		},
 		"limit offset query parameters set": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsName).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsName).ClusterQueue(cqNameA).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", nsName).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("b", nsName).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
-				utiltesting.MakeWorkload("c", nsName).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second * 2)).Obj(),
+				utiltestingapi.MakeWorkload("a", nsName).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("b", nsName).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("c", nsName).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second * 2)).Obj(),
 			},
 			req: &req{
 				queueName: cqNameA,
@@ -296,7 +297,7 @@ func TestPendingWorkloadsInCQ(t *testing.T) {
 		},
 		"empty cluster queue": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
 			},
 			req: &req{
 				queueName:   cqNameA,
diff --git a/pkg/visibility/api/v1beta1/pending_workloads_lq_test.go b/pkg/visibility/api/v1beta1/pending_workloads_lq_test.go
index 44a7ab9e6..7944b8df7 100644
--- a/pkg/visibility/api/v1beta1/pending_workloads_lq_test.go
+++ b/pkg/visibility/api/v1beta1/pending_workloads_lq_test.go
@@ -33,6 +33,7 @@ import (
 	qcache "sigs.k8s.io/kueue/pkg/cache/queue"
 	"sigs.k8s.io/kueue/pkg/constants"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestPendingWorkloadsInLQ(t *testing.T) {
@@ -67,14 +68,14 @@ func TestPendingWorkloadsInLQ(t *testing.T) {
 	}{
 		"single ClusterQueue and single LocalQueue setup with two workloads and default query parameters": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("b", nsNameA).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("a", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("b", nsNameA).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
 			},
 			req: &req{
 				nsName:      nsNameA,
@@ -109,17 +110,17 @@ func TestPendingWorkloadsInLQ(t *testing.T) {
 		},
 		"single ClusterQueue and two LocalQueue setup with four workloads and default query parameters; LocalQueue A request": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
-				utiltesting.MakeLocalQueue(lqNameB, nsNameA).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameB, nsNameA).ClusterQueue(cqNameA).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("lqA-high-prio", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("lqA-low-prio", nsNameA).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("lqB-high-prio", nsNameA).Queue(lqNameB).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
-				utiltesting.MakeWorkload("lqB-low-prio", nsNameA).Queue(lqNameB).Priority(lowPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("lqA-high-prio", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("lqA-low-prio", nsNameA).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("lqB-high-prio", nsNameA).Queue(lqNameB).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("lqB-low-prio", nsNameA).Queue(lqNameB).Priority(lowPrio).Creation(now.Add(time.Second)).Obj(),
 			},
 			req: &req{
 				nsName:      nsNameA,
@@ -154,17 +155,17 @@ func TestPendingWorkloadsInLQ(t *testing.T) {
 		},
 		"single ClusterQueue and two LocalQueue setup with four workloads and default query parameters; LocalQueue B request": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
-				utiltesting.MakeLocalQueue(lqNameB, nsNameA).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameB, nsNameA).ClusterQueue(cqNameA).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("lqA-high-prio", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("lqA-low-prio", nsNameA).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("lqB-high-prio", nsNameA).Queue(lqNameB).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
-				utiltesting.MakeWorkload("lqB-low-prio", nsNameA).Queue(lqNameB).Priority(lowPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("lqA-high-prio", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("lqA-low-prio", nsNameA).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("lqB-high-prio", nsNameA).Queue(lqNameB).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("lqB-low-prio", nsNameA).Queue(lqNameB).Priority(lowPrio).Creation(now.Add(time.Second)).Obj(),
 			},
 			req: &req{
 				nsName:      nsNameA,
@@ -200,18 +201,18 @@ func TestPendingWorkloadsInLQ(t *testing.T) {
 		},
 		"two Namespaces, two ClusterQueue and two LocalQueue setup with four workloads and default query parameters, LocalQueue A request": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
-				utiltesting.MakeClusterQueue(cqNameB).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameB).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
-				utiltesting.MakeLocalQueue(lqNameB, nsNameB).ClusterQueue(cqNameB).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameB, nsNameB).ClusterQueue(cqNameB).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("lqA-high-prio", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("lqA-low-prio", nsNameA).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("lqB-high-prio", nsNameB).Queue(lqNameB).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
-				utiltesting.MakeWorkload("lqB-low-prio", nsNameB).Queue(lqNameB).Priority(lowPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("lqA-high-prio", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("lqA-low-prio", nsNameA).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("lqB-high-prio", nsNameB).Queue(lqNameB).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("lqB-low-prio", nsNameB).Queue(lqNameB).Priority(lowPrio).Creation(now.Add(time.Second)).Obj(),
 			},
 			req: &req{
 				nsName:      nsNameA,
@@ -247,18 +248,18 @@ func TestPendingWorkloadsInLQ(t *testing.T) {
 		},
 		"two Namespaces, two ClusterQueue and two LocalQueue setup with four workloads and default query parameters, LocalQueue B request": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
-				utiltesting.MakeClusterQueue(cqNameB).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameB).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
-				utiltesting.MakeLocalQueue(lqNameB, nsNameB).ClusterQueue(cqNameB).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameB, nsNameB).ClusterQueue(cqNameB).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("lqA-high-prio", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("lqA-low-prio", nsNameA).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("lqB-high-prio", nsNameB).Queue(lqNameB).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
-				utiltesting.MakeWorkload("lqB-low-prio", nsNameB).Queue(lqNameB).Priority(lowPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("lqA-high-prio", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("lqA-low-prio", nsNameA).Queue(lqNameA).Priority(lowPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("lqB-high-prio", nsNameB).Queue(lqNameB).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("lqB-low-prio", nsNameB).Queue(lqNameB).Priority(lowPrio).Creation(now.Add(time.Second)).Obj(),
 			},
 			req: &req{
 				nsName:      nsNameB,
@@ -294,15 +295,15 @@ func TestPendingWorkloadsInLQ(t *testing.T) {
 		},
 		"limit query parameter set": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("b", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
-				utiltesting.MakeWorkload("c", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second * 2)).Obj(),
+				utiltestingapi.MakeWorkload("a", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("b", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("c", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second * 2)).Obj(),
 			},
 			req: &req{
 				nsName:    nsNameA,
@@ -340,15 +341,15 @@ func TestPendingWorkloadsInLQ(t *testing.T) {
 		},
 		"offset query parameter set": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("b", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
-				utiltesting.MakeWorkload("c", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second * 2)).Obj(),
+				utiltestingapi.MakeWorkload("a", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("b", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("c", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second * 2)).Obj(),
 			},
 			req: &req{
 				nsName:    nsNameA,
@@ -387,15 +388,15 @@ func TestPendingWorkloadsInLQ(t *testing.T) {
 		},
 		"limit and offset query parameters set": {
 			clusterQueues: []*kueue.ClusterQueue{
-				utiltesting.MakeClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeClusterQueue(cqNameA).Obj(),
 			},
 			queues: []*kueue.LocalQueue{
-				utiltesting.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
+				utiltestingapi.MakeLocalQueue(lqNameA, nsNameA).ClusterQueue(cqNameA).Obj(),
 			},
 			workloads: []*kueue.Workload{
-				utiltesting.MakeWorkload("a", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
-				utiltesting.MakeWorkload("b", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
-				utiltesting.MakeWorkload("c", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second * 2)).Obj(),
+				utiltestingapi.MakeWorkload("a", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now).Obj(),
+				utiltestingapi.MakeWorkload("b", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second)).Obj(),
+				utiltestingapi.MakeWorkload("c", nsNameA).Queue(lqNameA).Priority(highPrio).Creation(now.Add(time.Second * 2)).Obj(),
 			},
 			req: &req{
 				nsName:    nsNameA,
diff --git a/pkg/webhooks/clusterqueue_webhook_test.go b/pkg/webhooks/clusterqueue_webhook_test.go
index f0a1fef94..739cf09f8 100644
--- a/pkg/webhooks/clusterqueue_webhook_test.go
+++ b/pkg/webhooks/clusterqueue_webhook_test.go
@@ -30,7 +30,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/features"
-	testingutil "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestValidateClusterQueue(t *testing.T) {
@@ -45,14 +45,14 @@ func TestValidateClusterQueue(t *testing.T) {
 	}{
 		{
 			name: "built-in resources with qualified names",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
-				ResourceGroup(*testingutil.MakeFlavorQuotas("default").Resource("cpu").Obj()).
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource("cpu").Obj()).
 				Obj(),
 		},
 		{
 			name: "invalid resource name",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
-				ResourceGroup(*testingutil.MakeFlavorQuotas("default").Resource("@cpu").Obj()).
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource("@cpu").Obj()).
 				Obj(),
 			wantErr: field.ErrorList{
 				field.Invalid(resourceGroupsPath.Index(0).Child("coveredResources").Index(0), "@cpu", ""),
@@ -60,20 +60,20 @@ func TestValidateClusterQueue(t *testing.T) {
 		},
 		{
 			name: "admissionChecks defined",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				AdmissionChecks("ac1").
 				Obj(),
 		},
 		{
 			name: "admissionCheckStrategy defined",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				AdmissionCheckStrategy(
-					*testingutil.MakeAdmissionCheckStrategyRule("ac1", "flavor1").Obj(),
+					*utiltestingapi.MakeAdmissionCheckStrategyRule("ac1", "flavor1").Obj(),
 				).Obj(),
 		},
 		{
 			name: "both admissionChecks and admissionCheckStrategy is defined",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				AdmissionChecks("ac1").
 				AdmissionCheckStrategy().Obj(),
 			wantErr: field.ErrorList{
@@ -82,25 +82,25 @@ func TestValidateClusterQueue(t *testing.T) {
 		},
 		{
 			name:         "in cohort",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").Cohort("prod").Obj(),
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").Cohort("prod").Obj(),
 		},
 		{
 			name: "extended resources with qualified names",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
-				ResourceGroup(*testingutil.MakeFlavorQuotas("default").Resource("example.com/gpu").Obj()).
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource("example.com/gpu").Obj()).
 				Obj(),
 		},
 		{
 			name: "flavor with qualified names",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
-				ResourceGroup(*testingutil.MakeFlavorQuotas("x86").Obj()).
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Obj()).
 				Obj(),
 		},
 		{
 			name: "flavor quota with negative value",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("x86").Resource("cpu", "-1").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "-1").Obj()).
 				Obj(),
 			wantErr: field.ErrorList{
 				field.Invalid(resourceGroupsPath.Index(0).Child("flavors").Index(0).Child("resources").Index(0).Child("nominalQuota"), "-1", ""),
@@ -108,24 +108,24 @@ func TestValidateClusterQueue(t *testing.T) {
 		},
 		{
 			name: "flavor quota with zero value",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("x86").Resource("cpu", "0").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "0").Obj()).
 				Obj(),
 		},
 		{
 			name: "flavor quota with borrowingLimit 0",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("x86").Resource("cpu", "1", "0").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "1", "0").Obj()).
 				Cohort("cohort").
 				Obj(),
 		},
 		{
 			name: "flavor quota with negative borrowingLimit",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("x86").Resource("cpu", "1", "-1").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "1", "-1").Obj()).
 				Cohort("cohort").
 				Obj(),
 			wantErr: field.ErrorList{
@@ -134,17 +134,17 @@ func TestValidateClusterQueue(t *testing.T) {
 		},
 		{
 			name: "flavor quota with lendingLimit 0",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("x86").Resource("cpu", "1", "", "0").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "1", "", "0").Obj()).
 				Cohort("cohort").
 				Obj(),
 		},
 		{
 			name: "flavor quota with negative lendingLimit",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("x86").Resource("cpu", "1", "", "-1").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "1", "", "-1").Obj()).
 				Cohort("cohort").
 				Obj(),
 			wantErr: field.ErrorList{
@@ -153,9 +153,9 @@ func TestValidateClusterQueue(t *testing.T) {
 		},
 		{
 			name: "flavor quota with lendingLimit and empty cohort",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("x86").Resource("cpu", "1", "", "1").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "1", "", "1").Obj()).
 				Obj(),
 			wantErr: field.ErrorList{
 				field.Invalid(resourceGroupsPath.Index(0).Child("flavors").Index(0).Child("resources").Index(0).Child("lendingLimit"), "1", "must be nil when cohort is empty"),
@@ -163,9 +163,9 @@ func TestValidateClusterQueue(t *testing.T) {
 		},
 		{
 			name: "flavor quota with lendingLimit greater than nominalQuota",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("x86").Resource("cpu", "1", "", "2").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "1", "", "2").Obj()).
 				Cohort("cohort").
 				Obj(),
 			wantErr: field.ErrorList{
@@ -175,20 +175,20 @@ func TestValidateClusterQueue(t *testing.T) {
 		{
 			name:                "flavor quota with lendingLimit and empty cohort, but feature disabled",
 			disableLendingLimit: true,
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("x86").Resource("cpu", "1", "", "1").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "1", "", "1").Obj()).
 				Obj(),
 		},
 		{
 			name: "empty queueing strategy is supported",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				QueueingStrategy("").
 				Obj(),
 		},
 		{
 			name: "namespaceSelector with invalid labels",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").NamespaceSelector(&metav1.LabelSelector{
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").NamespaceSelector(&metav1.LabelSelector{
 				MatchLabels: map[string]string{"nospecialchars^=@": "bar"},
 			}).Obj(),
 			wantErr: field.ErrorList{
@@ -198,7 +198,7 @@ func TestValidateClusterQueue(t *testing.T) {
 		},
 		{
 			name: "namespaceSelector with invalid expressions",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").NamespaceSelector(&metav1.LabelSelector{
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").NamespaceSelector(&metav1.LabelSelector{
 				MatchExpressions: []metav1.LabelSelectorRequirement{
 					{
 						Key:      "key",
@@ -212,22 +212,22 @@ func TestValidateClusterQueue(t *testing.T) {
 		},
 		{
 			name: "multiple resource groups",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("alpha").
+					*utiltestingapi.MakeFlavorQuotas("alpha").
 						Resource("cpu", "0").
 						Resource("memory", "0").
 						Obj(),
-					*testingutil.MakeFlavorQuotas("beta").
+					*utiltestingapi.MakeFlavorQuotas("beta").
 						Resource("cpu", "0").
 						Resource("memory", "0").
 						Obj(),
 				).
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("gamma").
+					*utiltestingapi.MakeFlavorQuotas("gamma").
 						Resource("example.com/gpu", "0").
 						Obj(),
-					*testingutil.MakeFlavorQuotas("omega").
+					*utiltestingapi.MakeFlavorQuotas("omega").
 						Resource("example.com/gpu", "0").
 						Obj(),
 				).
@@ -244,11 +244,11 @@ func TestValidateClusterQueue(t *testing.T) {
 						{
 							CoveredResources: []corev1.ResourceName{"cpu", "memory"},
 							Flavors: []kueue.FlavorQuotas{
-								*testingutil.MakeFlavorQuotas("alpha").
+								*utiltestingapi.MakeFlavorQuotas("alpha").
 									Resource("cpu", "0").
 									Resource("memory", "0").
 									Obj(),
-								*testingutil.MakeFlavorQuotas("beta").
+								*utiltestingapi.MakeFlavorQuotas("beta").
 									Resource("memory", "0").
 									Resource("cpu", "0").
 									Obj(),
@@ -264,15 +264,15 @@ func TestValidateClusterQueue(t *testing.T) {
 		},
 		{
 			name: "resource in more than one resource group",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("alpha").
+					*utiltestingapi.MakeFlavorQuotas("alpha").
 						Resource("cpu", "0").
 						Resource("memory", "0").
 						Obj(),
 				).
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("beta").
+					*utiltestingapi.MakeFlavorQuotas("beta").
 						Resource("memory", "0").
 						Obj(),
 				).
@@ -283,13 +283,13 @@ func TestValidateClusterQueue(t *testing.T) {
 		},
 		{
 			name: "flavor in more than one resource group",
-			clusterQueue: testingutil.MakeClusterQueue("cluster-queue").
+			clusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("alpha").Resource("cpu").Obj(),
-					*testingutil.MakeFlavorQuotas("beta").Resource("cpu").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("alpha").Resource("cpu").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("beta").Resource("cpu").Obj(),
 				).
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("beta").Resource("memory").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("beta").Resource("memory").Obj(),
 				).
 				Obj(),
 			wantErr: field.ErrorList{
@@ -350,14 +350,14 @@ func TestValidateClusterQueueUpdate(t *testing.T) {
 	}{
 		{
 			name:            "queueingStrategy can be updated",
-			newClusterQueue: testingutil.MakeClusterQueue("cluster-queue").QueueingStrategy("BestEffortFIFO").Obj(),
-			oldClusterQueue: testingutil.MakeClusterQueue("cluster-queue").QueueingStrategy("StrictFIFO").Obj(),
+			newClusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").QueueingStrategy("BestEffortFIFO").Obj(),
+			oldClusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").QueueingStrategy("StrictFIFO").Obj(),
 			wantErr:         nil,
 		},
 		{
 			name:            "same queueingStrategy",
-			newClusterQueue: testingutil.MakeClusterQueue("cluster-queue").QueueingStrategy("BestEffortFIFO").Obj(),
-			oldClusterQueue: testingutil.MakeClusterQueue("cluster-queue").QueueingStrategy("BestEffortFIFO").Obj(),
+			newClusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").QueueingStrategy("BestEffortFIFO").Obj(),
+			oldClusterQueue: utiltestingapi.MakeClusterQueue("cluster-queue").QueueingStrategy("BestEffortFIFO").Obj(),
 			wantErr:         nil,
 		},
 	}
@@ -399,7 +399,7 @@ func TestValidateTotalFlavors(t *testing.T) {
 
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
-			cq := testingutil.MakeClusterQueue("cluster-queue").
+			cq := utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(makeFlavors(tc.numFlavors)...).Obj()
 
 			gotErr := ValidateClusterQueue(cq)
@@ -445,7 +445,7 @@ func TestValidateTotalCoveredResources(t *testing.T) {
 
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
-			cq := testingutil.MakeClusterQueue("cluster-queue").
+			cq := utiltestingapi.MakeClusterQueue("cluster-queue").
 				Obj()
 			cq.Spec.ResourceGroups = makeCoveredResources(tc.numCoveredRes)
 
@@ -499,7 +499,7 @@ func TestValidateFlavorResourceCombinations(t *testing.T) {
 
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
-			cq := testingutil.MakeClusterQueue("cluster-queue").Obj()
+			cq := utiltestingapi.MakeClusterQueue("cluster-queue").Obj()
 			cq.Spec.ResourceGroups = makeFlavorResourceCombinations(tc.numFlavors, tc.numResources)
 
 			gotErr := ValidateClusterQueue(cq)
diff --git a/pkg/webhooks/cohort_webhook_test.go b/pkg/webhooks/cohort_webhook_test.go
index c9f06195a..cf6d154f4 100644
--- a/pkg/webhooks/cohort_webhook_test.go
+++ b/pkg/webhooks/cohort_webhook_test.go
@@ -25,7 +25,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/features"
-	testingutil "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestValidateCohort(t *testing.T) {
@@ -40,9 +40,9 @@ func TestValidateCohort(t *testing.T) {
 	}{
 		{
 			name: "flavor quota with lendingLimit and empty parent",
-			cohort: testingutil.MakeCohort("cohort").
+			cohort: utiltestingapi.MakeCohort("cohort").
 				ResourceGroup(
-					*testingutil.MakeFlavorQuotas("x86").Resource("cpu", "1", "", "1").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("x86").Resource("cpu", "1", "", "1").Obj()).
 				Obj(),
 			wantErr: field.ErrorList{
 				field.Invalid(resourceGroupsPath.Index(0).Child("flavors").Index(0).Child("resources").Index(0).Child("lendingLimit"), "1", "must be nil when parent is empty"),
diff --git a/pkg/webhooks/resourceflavor_webhook_test.go b/pkg/webhooks/resourceflavor_webhook_test.go
index 466969534..a7b88d639 100644
--- a/pkg/webhooks/resourceflavor_webhook_test.go
+++ b/pkg/webhooks/resourceflavor_webhook_test.go
@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestValidateResourceFlavor(t *testing.T) {
@@ -37,11 +37,11 @@ func TestValidateResourceFlavor(t *testing.T) {
 	}{
 		{
 			name: "empty",
-			rf:   utiltesting.MakeResourceFlavor("resource-flavor").Obj(),
+			rf:   utiltestingapi.MakeResourceFlavor("resource-flavor").Obj(),
 		},
 		{
 			name: "valid",
-			rf: utiltesting.MakeResourceFlavor("resource-flavor").
+			rf: utiltestingapi.MakeResourceFlavor("resource-flavor").
 				NodeLabel("foo", "bar").
 				Taint(corev1.Taint{
 					Key:    "spot",
@@ -51,7 +51,7 @@ func TestValidateResourceFlavor(t *testing.T) {
 		},
 		{
 			name: "invalid label name",
-			rf:   utiltesting.MakeResourceFlavor("resource-flavor").NodeLabel("@abc", "foo").Obj(),
+			rf:   utiltestingapi.MakeResourceFlavor("resource-flavor").NodeLabel("@abc", "foo").Obj(),
 			wantErr: field.ErrorList{
 				field.Invalid(field.NewPath("spec", "nodeLabels"), "@abc", "").
 					WithOrigin("labelKey"),
@@ -59,7 +59,7 @@ func TestValidateResourceFlavor(t *testing.T) {
 		},
 		{
 			name: "invalid label value",
-			rf:   utiltesting.MakeResourceFlavor("resource-flavor").NodeLabel("foo", "@abc").Obj(),
+			rf:   utiltestingapi.MakeResourceFlavor("resource-flavor").NodeLabel("foo", "@abc").Obj(),
 			wantErr: field.ErrorList{
 				field.Invalid(field.NewPath("spec", "nodeLabels"), "@abc", ""),
 			},
diff --git a/pkg/webhooks/workload_webhook_test.go b/pkg/webhooks/workload_webhook_test.go
index 377dbcd4d..5dbc0d6be 100644
--- a/pkg/webhooks/workload_webhook_test.go
+++ b/pkg/webhooks/workload_webhook_test.go
@@ -30,7 +30,8 @@ import (
 	configapi "sigs.k8s.io/kueue/apis/config/v1beta1"
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/features"
-	testingutil "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 const (
@@ -50,26 +51,26 @@ func TestValidateWorkload(t *testing.T) {
 		wantErr  field.ErrorList
 	}{
 		"valid": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
-				*testingutil.MakePodSet("driver", 1).Obj(),
-				*testingutil.MakePodSet("workers", 100).Obj(),
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
+				*utiltestingapi.MakePodSet("driver", 1).Obj(),
+				*utiltestingapi.MakePodSet("workers", 100).Obj(),
 			).Obj(),
 		},
 		"should have a valid podSet name in status assignment": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
-				ReserveQuota(testingutil.MakeAdmission("cluster-queue", "@invalid").Obj()).
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+				ReserveQuota(utiltestingapi.MakeAdmission("cluster-queue", "@invalid").Obj()).
 				Obj(),
 			wantErr: field.ErrorList{
 				field.NotFound(statusPath.Child("admission", "podSetAssignments").Index(0).Child("name"), nil),
 			},
 		},
 		"assignment usage should be divisible by count": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
-				PodSets(*testingutil.MakePodSet(kueue.DefaultPodSetName, 3).
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					Request(corev1.ResourceCPU, "1").
 					Obj()).
-				ReserveQuota(testingutil.MakeAdmission("cluster-queue").
-					PodSets(testingutil.MakePodSetAssignment(kueue.DefaultPodSetName).
+				ReserveQuota(utiltestingapi.MakeAdmission("cluster-queue").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "flv", "1").
 						Count(3).
 						Obj()).
@@ -80,13 +81,13 @@ func TestValidateWorkload(t *testing.T) {
 			},
 		},
 		"should not request num-pods resource": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("bad", 1).
-						InitContainers(testingutil.SingleContainerForRequest(map[corev1.ResourceName]string{
+					*utiltestingapi.MakePodSet("bad", 1).
+						InitContainers(utiltesting.SingleContainerForRequest(map[corev1.ResourceName]string{
 							corev1.ResourcePods: "1",
 						})...).
-						Containers(testingutil.SingleContainerForRequest(map[corev1.ResourceName]string{
+						Containers(utiltesting.SingleContainerForRequest(map[corev1.ResourceName]string{
 							corev1.ResourcePods: "1",
 						})...).
 						Obj(),
@@ -98,22 +99,22 @@ func TestValidateWorkload(t *testing.T) {
 			},
 		},
 		"empty podSetUpdates": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).AdmissionChecks(kueue.AdmissionCheckState{}).Obj(),
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).AdmissionChecks(kueue.AdmissionCheckState{}).Obj(),
 			wantErr:  nil,
 		},
 		"should accept podSetUpdates for only a subset of podSets": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
-				*testingutil.MakePodSet("first", 1).Obj(),
-				*testingutil.MakePodSet("second", 1).Obj(),
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
+				*utiltestingapi.MakePodSet("first", 1).Obj(),
+				*utiltestingapi.MakePodSet("second", 1).Obj(),
 			).AdmissionChecks(
 				kueue.AdmissionCheckState{PodSetUpdates: []kueue.PodSetUpdate{{Name: "first"}}},
 			).Obj(),
 			wantErr: nil,
 		},
 		"mismatched names in podSetUpdates with names in podSets": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
-				*testingutil.MakePodSet("first", 1).Obj(),
-				*testingutil.MakePodSet("second", 1).Obj(),
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
+				*utiltestingapi.MakePodSet("first", 1).Obj(),
+				*utiltestingapi.MakePodSet("second", 1).Obj(),
 			).AdmissionChecks(
 				kueue.AdmissionCheckState{PodSetUpdates: []kueue.PodSetUpdate{{Name: "first"}, {Name: "third"}}},
 			).Obj(),
@@ -122,9 +123,9 @@ func TestValidateWorkload(t *testing.T) {
 			},
 		},
 		"matched names in podSetUpdates with names in podSets": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
-				*testingutil.MakePodSet("first", 1).Obj(),
-				*testingutil.MakePodSet("second", 1).Obj(),
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
+				*utiltestingapi.MakePodSet("first", 1).Obj(),
+				*utiltestingapi.MakePodSet("second", 1).Obj(),
 			).AdmissionChecks(
 				kueue.AdmissionCheckState{
 					PodSetUpdates: []kueue.PodSetUpdate{
@@ -163,7 +164,7 @@ func TestValidateWorkload(t *testing.T) {
 			).Obj(),
 		},
 		"invalid label name of podSetUpdate": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				AdmissionChecks(
 					kueue.AdmissionCheckState{PodSetUpdates: []kueue.PodSetUpdate{{Name: kueue.DefaultPodSetName, Labels: map[string]string{"@abc": "foo"}}}},
 				).
@@ -174,7 +175,7 @@ func TestValidateWorkload(t *testing.T) {
 			},
 		},
 		"invalid node selector name of podSetUpdate": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				AdmissionChecks(
 					kueue.AdmissionCheckState{PodSetUpdates: []kueue.PodSetUpdate{{Name: kueue.DefaultPodSetName, NodeSelector: map[string]string{"@abc": "foo"}}}},
 				).
@@ -185,7 +186,7 @@ func TestValidateWorkload(t *testing.T) {
 			},
 		},
 		"invalid label value of podSetUpdate": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				AdmissionChecks(
 					kueue.AdmissionCheckState{PodSetUpdates: []kueue.PodSetUpdate{{Name: kueue.DefaultPodSetName, Labels: map[string]string{"foo": "@abc"}}}},
 				).
@@ -195,9 +196,9 @@ func TestValidateWorkload(t *testing.T) {
 			},
 		},
 		"invalid reclaimablePods": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
 				).
 				ReclaimablePods(
 					kueue.ReclaimablePod{Name: "ps1", Count: 4},
@@ -210,10 +211,10 @@ func TestValidateWorkload(t *testing.T) {
 			},
 		},
 		"too many variable count podSets": {
-			workload: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			workload: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).SetMinimumCount(2).Obj(),
-					*testingutil.MakePodSet("ps2", 3).SetMinimumCount(1).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).SetMinimumCount(2).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).SetMinimumCount(1).Obj(),
 				).
 				Obj(),
 			wantErr: field.ErrorList{
@@ -240,13 +241,13 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 		wantErr       field.ErrorList
 	}{
 		"reclaimable pod count can change up": {
-			before: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			before: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 				).
 				ReserveQuota(
-					testingutil.MakeAdmission("cluster-queue").
+					utiltestingapi.MakeAdmission("cluster-queue").
 						PodSets(kueue.PodSetAssignment{Name: "ps1"}, kueue.PodSetAssignment{Name: "ps2"}).
 						Obj(),
 				).
@@ -254,13 +255,13 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 					kueue.ReclaimablePod{Name: "ps1", Count: 1},
 				).
 				Obj(),
-			after: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			after: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 				).
 				ReserveQuota(
-					testingutil.MakeAdmission("cluster-queue").
+					utiltestingapi.MakeAdmission("cluster-queue").
 						PodSets(kueue.PodSetAssignment{Name: "ps1"}, kueue.PodSetAssignment{Name: "ps2"}).
 						Obj(),
 				).
@@ -272,13 +273,13 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 			wantErr: nil,
 		},
 		"reclaimable pod count cannot change down": {
-			before: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			before: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 				).
 				ReserveQuota(
-					testingutil.MakeAdmission("cluster-queue").
+					utiltestingapi.MakeAdmission("cluster-queue").
 						PodSets(kueue.PodSetAssignment{Name: "ps1"}, kueue.PodSetAssignment{Name: "ps2"}).
 						Obj(),
 				).
@@ -287,13 +288,13 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 					kueue.ReclaimablePod{Name: "ps2", Count: 1},
 				).
 				Obj(),
-			after: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			after: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 				).
 				ReserveQuota(
-					testingutil.MakeAdmission("cluster-queue").
+					utiltestingapi.MakeAdmission("cluster-queue").
 						PodSets(kueue.PodSetAssignment{Name: "ps1"}, kueue.PodSetAssignment{Name: "ps2"}).
 						Obj(),
 				).
@@ -307,13 +308,13 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 			},
 		},
 		"reclaimable pod count can go to 0 if the job is suspended": {
-			before: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			before: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 				).
 				ReserveQuota(
-					testingutil.MakeAdmission("cluster-queue").
+					utiltestingapi.MakeAdmission("cluster-queue").
 						PodSets(kueue.PodSetAssignment{Name: "ps1"}, kueue.PodSetAssignment{Name: "ps2"}).
 						Obj(),
 				).
@@ -322,10 +323,10 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 					kueue.ReclaimablePod{Name: "ps2", Count: 1},
 				).
 				Obj(),
-			after: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			after: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 				).
 				AdmissionChecks(kueue.AdmissionCheckState{
 					PodSetUpdates: []kueue.PodSetUpdate{{Name: "ps1"}, {Name: "ps2"}},
@@ -339,16 +340,16 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 			wantErr: nil,
 		},
 		"podSetUpdates should be immutable when state is ready": {
-			before: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
-				*testingutil.MakePodSet("first", 1).Obj(),
-				*testingutil.MakePodSet("second", 1).Obj(),
+			before: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
+				*utiltestingapi.MakePodSet("first", 1).Obj(),
+				*utiltestingapi.MakePodSet("second", 1).Obj(),
 			).AdmissionChecks(kueue.AdmissionCheckState{
 				PodSetUpdates: []kueue.PodSetUpdate{{Name: "first", Labels: map[string]string{"foo": "bar"}}, {Name: "second"}},
 				State:         kueue.CheckStateReady,
 			}).Obj(),
-			after: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
-				*testingutil.MakePodSet("first", 1).Obj(),
-				*testingutil.MakePodSet("second", 1).Obj(),
+			after: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
+				*utiltestingapi.MakePodSet("first", 1).Obj(),
+				*utiltestingapi.MakePodSet("second", 1).Obj(),
 			).AdmissionChecks(kueue.AdmissionCheckState{
 				PodSetUpdates: []kueue.PodSetUpdate{{Name: "first", Labels: map[string]string{"foo": "baz"}}, {Name: "second"}},
 				State:         kueue.CheckStateReady,
@@ -358,18 +359,18 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 			},
 		},
 		"should change other fields of admissionchecks when podSetUpdates is immutable": {
-			before: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
-				*testingutil.MakePodSet("first", 1).Obj(),
-				*testingutil.MakePodSet("second", 1).Obj(),
+			before: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
+				*utiltestingapi.MakePodSet("first", 1).Obj(),
+				*utiltestingapi.MakePodSet("second", 1).Obj(),
 			).AdmissionChecks(kueue.AdmissionCheckState{
 				Name:          "ac1",
 				Message:       "old",
 				PodSetUpdates: []kueue.PodSetUpdate{{Name: "first", Labels: map[string]string{"foo": "bar"}}, {Name: "second"}},
 				State:         kueue.CheckStateReady,
 			}).Obj(),
-			after: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
-				*testingutil.MakePodSet("first", 1).Obj(),
-				*testingutil.MakePodSet("second", 1).Obj(),
+			after: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).PodSets(
+				*utiltestingapi.MakePodSet("first", 1).Obj(),
+				*utiltestingapi.MakePodSet("second", 1).Obj(),
 			).AdmissionChecks(kueue.AdmissionCheckState{
 				Name:               "ac1",
 				Message:            "new",
@@ -380,12 +381,12 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 		},
 		"TopologyAssignment can be mutated": {
 			enableTopologyAwareScheduling: true,
-			before: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			before: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
 				).
 				ReserveQuota(
-					testingutil.MakeAdmission("cluster-queue").
+					utiltestingapi.MakeAdmission("cluster-queue").
 						PodSets(kueue.PodSetAssignment{
 							Name: "ps1",
 							TopologyAssignment: &kueue.TopologyAssignment{
@@ -401,12 +402,12 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 						Obj(),
 				).
 				Obj(),
-			after: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			after: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
 				).
 				ReserveQuota(
-					testingutil.MakeAdmission("cluster-queue").
+					utiltestingapi.MakeAdmission("cluster-queue").
 						PodSets(kueue.PodSetAssignment{
 							Name: "ps1",
 							TopologyAssignment: &kueue.TopologyAssignment{
@@ -426,13 +427,13 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 		},
 		"PodSets cannot be removed from admission": {
 			enableTopologyAwareScheduling: true,
-			before: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			before: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 				).
 				ReserveQuota(
-					testingutil.MakeAdmission("cluster-queue").
+					utiltestingapi.MakeAdmission("cluster-queue").
 						PodSets(kueue.PodSetAssignment{
 							Name: "ps1",
 						}).
@@ -442,13 +443,13 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 						Obj(),
 				).
 				Obj(),
-			after: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			after: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 				).
 				ReserveQuota(
-					testingutil.MakeAdmission("cluster-queue").
+					utiltestingapi.MakeAdmission("cluster-queue").
 						PodSets(kueue.PodSetAssignment{
 							Name: "ps1",
 						}).
@@ -461,26 +462,26 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 		},
 		"PodSets cannot be added to admission": {
 			enableTopologyAwareScheduling: true,
-			before: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			before: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 				).
 				ReserveQuota(
-					testingutil.MakeAdmission("cluster-queue").
+					utiltestingapi.MakeAdmission("cluster-queue").
 						PodSets(kueue.PodSetAssignment{
 							Name: "ps1",
 						}).
 						Obj(),
 				).
 				Obj(),
-			after: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			after: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 				).
 				ReserveQuota(
-					testingutil.MakeAdmission("cluster-queue").
+					utiltestingapi.MakeAdmission("cluster-queue").
 						PodSets(kueue.PodSetAssignment{
 							Name: "ps1",
 						}).
@@ -496,18 +497,18 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 		},
 
 		"workload.podSets[].count is immutable": {
-			before: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			before: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 4).Obj()).
-				ReserveQuota(testingutil.MakeAdmission("cluster-queue").PodSets(
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 4).Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("cluster-queue").PodSets(
 					kueue.PodSetAssignment{Name: "ps1"},
 					kueue.PodSetAssignment{Name: "ps2"}).Obj()).Obj(),
-			after: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			after: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 3).Obj()).
-				ReserveQuota(testingutil.MakeAdmission("cluster-queue").PodSets(
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("cluster-queue").PodSets(
 					kueue.PodSetAssignment{Name: "ps1"},
 					kueue.PodSetAssignment{Name: "ps2"}).Obj()).Obj(),
 			wantErr: field.ErrorList{
@@ -516,18 +517,18 @@ func TestValidateWorkloadUpdate(t *testing.T) {
 		},
 		"workload.podSets[].count is mutable with ElasticJobs feature gate": {
 			enableElasticJobsFeature: true,
-			before: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			before: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 4).Obj()).
-				ReserveQuota(testingutil.MakeAdmission("cluster-queue").PodSets(
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 4).Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("cluster-queue").PodSets(
 					kueue.PodSetAssignment{Name: "ps1"},
 					kueue.PodSetAssignment{Name: "ps2"}).Obj()).Obj(),
-			after: testingutil.MakeWorkload(testWorkloadName, testWorkloadNamespace).
+			after: utiltestingapi.MakeWorkload(testWorkloadName, testWorkloadNamespace).
 				PodSets(
-					*testingutil.MakePodSet("ps1", 3).Obj(),
-					*testingutil.MakePodSet("ps2", 3).Obj()).
-				ReserveQuota(testingutil.MakeAdmission("cluster-queue").PodSets(
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj()).
+				ReserveQuota(utiltestingapi.MakeAdmission("cluster-queue").PodSets(
 					kueue.PodSetAssignment{Name: "ps1"},
 					kueue.PodSetAssignment{Name: "ps2"}).Obj()).Obj(),
 		},
diff --git a/pkg/workload/admissionchecks_test.go b/pkg/workload/admissionchecks_test.go
index 7a0699a26..bfd84c65d 100644
--- a/pkg/workload/admissionchecks_test.go
+++ b/pkg/workload/admissionchecks_test.go
@@ -30,7 +30,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/admissioncheck"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestSyncAdmittedCondition(t *testing.T) {
@@ -344,7 +344,7 @@ func TestSyncAdmittedCondition(t *testing.T) {
 	for name, tc := range cases {
 		t.Run(name, func(t *testing.T) {
 			features.SetFeatureGateDuringTest(t, features.TopologyAwareScheduling, tc.enableTopologyAwareScheduling)
-			builder := utiltesting.MakeWorkload("foo", "bar").
+			builder := utiltestingapi.MakeWorkload("foo", "bar").
 				Admission(tc.admission).
 				AdmissionChecks(tc.checkStates...).
 				Conditions(tc.conditions...).
diff --git a/pkg/workload/resources_test.go b/pkg/workload/resources_test.go
index 562b5242a..b69deb013 100644
--- a/pkg/workload/resources_test.go
+++ b/pkg/workload/resources_test.go
@@ -31,6 +31,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/resources"
 	"sigs.k8s.io/kueue/pkg/util/limitrange"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestAdjustResources(t *testing.T) {
@@ -49,14 +50,14 @@ func TestAdjustResources(t *testing.T) {
 					}).
 					RuntimeClass,
 			},
-			wl: utiltesting.MakeWorkload("foo", "").
+			wl: utiltestingapi.MakeWorkload("foo", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						RuntimeClass("runtime-a").
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						Obj(),
-					*utiltesting.MakePodSet("c", 1).
+					*utiltestingapi.MakePodSet("c", 1).
 						RuntimeClass("runtime-a").
 						PodOverHead(
 							corev1.ResourceList{
@@ -64,10 +65,10 @@ func TestAdjustResources(t *testing.T) {
 								corev1.ResourceMemory: resources.ResourceQuantity(corev1.ResourceMemory, 2048),
 							}).
 						Obj(),
-					*utiltesting.MakePodSet("d", 1).
+					*utiltestingapi.MakePodSet("d", 1).
 						RuntimeClass("runtime-d").
 						Obj(),
-					*utiltesting.MakePodSet("e", 1).
+					*utiltestingapi.MakePodSet("e", 1).
 						RuntimeClass("runtime-e").
 						PodOverHead(
 							corev1.ResourceList{
@@ -77,9 +78,9 @@ func TestAdjustResources(t *testing.T) {
 						Obj(),
 				).
 				Obj(),
-			wantWl: utiltesting.MakeWorkload("foo", "").
+			wantWl: utiltestingapi.MakeWorkload("foo", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						RuntimeClass("runtime-a").
 						PodOverHead(
 							corev1.ResourceList{
@@ -87,9 +88,9 @@ func TestAdjustResources(t *testing.T) {
 								corev1.ResourceMemory: resources.ResourceQuantity(corev1.ResourceMemory, 1024),
 							}).
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						Obj(),
-					*utiltesting.MakePodSet("c", 1).
+					*utiltestingapi.MakePodSet("c", 1).
 						RuntimeClass("runtime-a").
 						PodOverHead(
 							corev1.ResourceList{
@@ -97,10 +98,10 @@ func TestAdjustResources(t *testing.T) {
 								corev1.ResourceMemory: resources.ResourceQuantity(corev1.ResourceMemory, 2048),
 							}).
 						Obj(),
-					*utiltesting.MakePodSet("d", 1).
+					*utiltestingapi.MakePodSet("d", 1).
 						RuntimeClass("runtime-d").
 						Obj(),
-					*utiltesting.MakePodSet("e", 1).
+					*utiltestingapi.MakePodSet("e", 1).
 						RuntimeClass("runtime-e").
 						PodOverHead(
 							corev1.ResourceList{
@@ -116,14 +117,14 @@ func TestAdjustResources(t *testing.T) {
 				utiltesting.MakeRuntimeClass("runtime-a", "handler-a").
 					RuntimeClass,
 			},
-			wl: utiltesting.MakeWorkload("foo", "").
+			wl: utiltestingapi.MakeWorkload("foo", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						RuntimeClass("runtime-a").
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						Obj(),
-					*utiltesting.MakePodSet("c", 1).
+					*utiltestingapi.MakePodSet("c", 1).
 						RuntimeClass("runtime-a").
 						PodOverHead(
 							corev1.ResourceList{
@@ -131,10 +132,10 @@ func TestAdjustResources(t *testing.T) {
 								corev1.ResourceMemory: resources.ResourceQuantity(corev1.ResourceMemory, 1024),
 							}).
 						Obj(),
-					*utiltesting.MakePodSet("d", 1).
+					*utiltestingapi.MakePodSet("d", 1).
 						RuntimeClass("runtime-d").
 						Obj(),
-					*utiltesting.MakePodSet("e", 1).
+					*utiltestingapi.MakePodSet("e", 1).
 						RuntimeClass("runtime-e").
 						PodOverHead(
 							corev1.ResourceList{
@@ -144,14 +145,14 @@ func TestAdjustResources(t *testing.T) {
 						Obj(),
 				).
 				Obj(),
-			wantWl: utiltesting.MakeWorkload("foo", "").
+			wantWl: utiltestingapi.MakeWorkload("foo", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						RuntimeClass("runtime-a").
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						Obj(),
-					*utiltesting.MakePodSet("c", 1).
+					*utiltestingapi.MakePodSet("c", 1).
 						RuntimeClass("runtime-a").
 						PodOverHead(
 							corev1.ResourceList{
@@ -159,10 +160,10 @@ func TestAdjustResources(t *testing.T) {
 								corev1.ResourceMemory: resources.ResourceQuantity(corev1.ResourceMemory, 1024),
 							}).
 						Obj(),
-					*utiltesting.MakePodSet("d", 1).
+					*utiltestingapi.MakePodSet("d", 1).
 						RuntimeClass("runtime-d").
 						Obj(),
-					*utiltesting.MakePodSet("e", 1).
+					*utiltestingapi.MakePodSet("e", 1).
 						RuntimeClass("runtime-e").
 						PodOverHead(
 							corev1.ResourceList{
@@ -191,24 +192,24 @@ func TestAdjustResources(t *testing.T) {
 					).
 					LimitRange,
 			},
-			wl: utiltesting.MakeWorkload("foo", "").
+			wl: utiltestingapi.MakeWorkload("foo", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						InitContainers(corev1.Container{}).
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						InitContainers(corev1.Container{}).
 						Limit(corev1.ResourceCPU, "6").
 						Obj(),
-					*utiltesting.MakePodSet("c", 1).
+					*utiltestingapi.MakePodSet("c", 1).
 						InitContainers(corev1.Container{}).
 						Request(corev1.ResourceCPU, "1").
 						Obj(),
 				).
 				Obj(),
-			wantWl: utiltesting.MakeWorkload("foo", "").
+			wantWl: utiltestingapi.MakeWorkload("foo", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						Limit(corev1.ResourceCPU, "4").
 						Request(corev1.ResourceCPU, "3").
 						InitContainers(corev1.Container{
@@ -222,7 +223,7 @@ func TestAdjustResources(t *testing.T) {
 							},
 						}).
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						Limit(corev1.ResourceCPU, "6").
 						Request(corev1.ResourceCPU, "3").
 						InitContainers(corev1.Container{
@@ -236,7 +237,7 @@ func TestAdjustResources(t *testing.T) {
 							},
 						}).
 						Obj(),
-					*utiltesting.MakePodSet("c", 1).
+					*utiltestingapi.MakePodSet("c", 1).
 						Limit(corev1.ResourceCPU, "4").
 						Request(corev1.ResourceCPU, "1").
 						InitContainers(corev1.Container{
@@ -271,21 +272,21 @@ func TestAdjustResources(t *testing.T) {
 					).
 					LimitRange,
 			},
-			wl: utiltesting.MakeWorkload("foo", "").
+			wl: utiltestingapi.MakeWorkload("foo", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						Limit(corev1.ResourceCPU, "6").
 						Request(corev1.ResourceCPU, "1").
 						Obj(),
 				).
 				Obj(),
-			wantWl: utiltesting.MakeWorkload("foo", "").
+			wantWl: utiltestingapi.MakeWorkload("foo", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						Limit(corev1.ResourceCPU, "6").
 						Request(corev1.ResourceCPU, "1").
 						Obj(),
@@ -298,21 +299,21 @@ func TestAdjustResources(t *testing.T) {
 					WithType(corev1.LimitTypeContainer).
 					LimitRange,
 			},
-			wl: utiltesting.MakeWorkload("foo", "").
+			wl: utiltestingapi.MakeWorkload("foo", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						Limit(corev1.ResourceCPU, "6").
 						Request(corev1.ResourceCPU, "1").
 						Obj(),
 				).
 				Obj(),
-			wantWl: utiltesting.MakeWorkload("foo", "").
+			wantWl: utiltestingapi.MakeWorkload("foo", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						Limit(corev1.ResourceCPU, "6").
 						Request(corev1.ResourceCPU, "1").
 						Obj(),
@@ -320,9 +321,9 @@ func TestAdjustResources(t *testing.T) {
 				Obj(),
 		},
 		"Apply limits to requests": {
-			wl: utiltesting.MakeWorkload("foo", "").
+			wl: utiltestingapi.MakeWorkload("foo", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						Limit(corev1.ResourceCPU, "1").
 						Limit(corev1.ResourceMemory, "1Gi").
 						InitContainers(corev1.Container{
@@ -334,7 +335,7 @@ func TestAdjustResources(t *testing.T) {
 							},
 						}).
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						Request(corev1.ResourceCPU, "2").
 						Limit(corev1.ResourceCPU, "3").
 						Limit(corev1.ResourceMemory, "1Gi").
@@ -350,7 +351,7 @@ func TestAdjustResources(t *testing.T) {
 							},
 						}).
 						Obj(),
-					*utiltesting.MakePodSet("c", 1).
+					*utiltestingapi.MakePodSet("c", 1).
 						Request(corev1.ResourceMemory, "1Gi").
 						Limit(corev1.ResourceCPU, "1").
 						Limit(corev1.ResourceMemory, "3Gi").
@@ -366,7 +367,7 @@ func TestAdjustResources(t *testing.T) {
 							},
 						}).
 						Obj(),
-					*utiltesting.MakePodSet("d", 1).
+					*utiltestingapi.MakePodSet("d", 1).
 						Limit(corev1.ResourceCPU, "1").
 						InitContainers(corev1.Container{
 							Resources: corev1.ResourceRequirements{
@@ -376,7 +377,7 @@ func TestAdjustResources(t *testing.T) {
 							},
 						}).
 						Obj(),
-					*utiltesting.MakePodSet("e", 1).
+					*utiltestingapi.MakePodSet("e", 1).
 						Request(corev1.ResourceMemory, "1Gi").
 						InitContainers(corev1.Container{
 							Resources: corev1.ResourceRequirements{
@@ -388,9 +389,9 @@ func TestAdjustResources(t *testing.T) {
 						Obj(),
 				).
 				Obj(),
-			wantWl: utiltesting.MakeWorkload("foo", "").
+			wantWl: utiltestingapi.MakeWorkload("foo", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						Limit(corev1.ResourceCPU, "1").
 						Limit(corev1.ResourceMemory, "1Gi").
 						Request(corev1.ResourceCPU, "1").
@@ -408,7 +409,7 @@ func TestAdjustResources(t *testing.T) {
 							},
 						}).
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						Limit(corev1.ResourceCPU, "3").
 						Limit(corev1.ResourceMemory, "1Gi").
 						Request(corev1.ResourceCPU, "2").
@@ -426,7 +427,7 @@ func TestAdjustResources(t *testing.T) {
 							},
 						}).
 						Obj(),
-					*utiltesting.MakePodSet("c", 1).
+					*utiltestingapi.MakePodSet("c", 1).
 						Limit(corev1.ResourceCPU, "1").
 						Limit(corev1.ResourceMemory, "3Gi").
 						Request(corev1.ResourceCPU, "1").
@@ -444,7 +445,7 @@ func TestAdjustResources(t *testing.T) {
 							},
 						}).
 						Obj(),
-					*utiltesting.MakePodSet("d", 1).
+					*utiltestingapi.MakePodSet("d", 1).
 						Limit(corev1.ResourceCPU, "1").
 						Request(corev1.ResourceCPU, "1").
 						InitContainers(corev1.Container{
@@ -458,7 +459,7 @@ func TestAdjustResources(t *testing.T) {
 							},
 						}).
 						Obj(),
-					*utiltesting.MakePodSet("e", 1).
+					*utiltestingapi.MakePodSet("e", 1).
 						Request(corev1.ResourceMemory, "1Gi").
 						InitContainers(corev1.Container{
 							Resources: corev1.ResourceRequirements{
@@ -495,9 +496,9 @@ func TestValidateResources(t *testing.T) {
 	}{
 		"valid workload": {
 			workloadInfo: &Info{
-				Obj: utiltesting.MakeWorkload("alpha", metav1.NamespaceDefault).
+				Obj: utiltestingapi.MakeWorkload("alpha", metav1.NamespaceDefault).
 					PodSets(
-						*utiltesting.MakePodSet("a", 1).
+						*utiltestingapi.MakePodSet("a", 1).
 							Containers(
 								*utiltesting.MakeContainer().
 									WithResourceReq(corev1.ResourceCPU, "100m").
@@ -506,7 +507,7 @@ func TestValidateResources(t *testing.T) {
 									WithResourceLimit(corev1.ResourceMemory, "200Mi").
 									Obj()).
 							Obj(),
-						*utiltesting.MakePodSet("b", 1).
+						*utiltestingapi.MakePodSet("b", 1).
 							InitContainers(
 								*utiltesting.MakeContainer().
 									WithResourceReq(corev1.ResourceCPU, "100m").
@@ -518,8 +519,8 @@ func TestValidateResources(t *testing.T) {
 		},
 		"invalid workload; multiple PodSet has invalid initContainers and containers": {
 			workloadInfo: &Info{
-				Obj: utiltesting.MakeWorkload("alpha", metav1.NamespaceDefault).PodSets(
-					*utiltesting.MakePodSet("a", 1).
+				Obj: utiltestingapi.MakeWorkload("alpha", metav1.NamespaceDefault).PodSets(
+					*utiltestingapi.MakePodSet("a", 1).
 						InitContainers(
 							*utiltesting.MakeContainer().
 								WithResourceReq(corev1.ResourceMemory, "200Mi").
@@ -533,7 +534,7 @@ func TestValidateResources(t *testing.T) {
 								WithResourceLimit(corev1.ResourceCPU, "200m").
 								Obj()).
 						Obj(),
-					*utiltesting.MakePodSet("b", 1).
+					*utiltestingapi.MakePodSet("b", 1).
 						InitContainers(
 							*utiltesting.MakeContainer().
 								WithResourceReq(corev1.ResourceCPU, "300m").
@@ -578,24 +579,24 @@ func TestValidateLimitRange(t *testing.T) {
 				WithType(corev1.LimitTypePod).
 				WithValue("Max", corev1.ResourceCPU, "1000m").
 				Obj(),
-			workload: utiltesting.MakeWorkload("", metav1.NamespaceDefault).
+			workload: utiltestingapi.MakeWorkload("", metav1.NamespaceDefault).
 				PodSets(
-					*utiltesting.MakePodSet("alpha", 1).
+					*utiltestingapi.MakePodSet("alpha", 1).
 						Request(corev1.ResourceCPU, "300m").
 						Obj(),
-					*utiltesting.MakePodSet("beta", 1).
+					*utiltestingapi.MakePodSet("beta", 1).
 						Request(corev1.ResourceCPU, "200m").
 						Obj(),
 				).
 				Obj(),
 		},
 		"valid case without LimitRange": {
-			workload: utiltesting.MakeWorkload("test", metav1.NamespaceDefault).
+			workload: utiltestingapi.MakeWorkload("test", metav1.NamespaceDefault).
 				PodSets(
-					*utiltesting.MakePodSet("alpha", 1).
+					*utiltestingapi.MakePodSet("alpha", 1).
 						Request(corev1.ResourceCPU, "300m").
 						Obj(),
-					*utiltesting.MakePodSet("beta", 1).
+					*utiltestingapi.MakePodSet("beta", 1).
 						Request(corev1.ResourceCPU, "200m").
 						Obj(),
 				).
@@ -606,9 +607,9 @@ func TestValidateLimitRange(t *testing.T) {
 				WithType(corev1.LimitTypePod).
 				WithValue("Max", corev1.ResourceCPU, "500m").
 				Obj(),
-			workload: utiltesting.MakeWorkload("test", metav1.NamespaceDefault).
+			workload: utiltestingapi.MakeWorkload("test", metav1.NamespaceDefault).
 				PodSets(
-					*utiltesting.MakePodSet("alpha", 1).
+					*utiltestingapi.MakePodSet("alpha", 1).
 						Request(corev1.ResourceCPU, "300m").
 						InitContainers(
 							*utiltesting.MakeContainer().
diff --git a/pkg/workload/workload_test.go b/pkg/workload/workload_test.go
index 54c098e65..3797617a1 100644
--- a/pkg/workload/workload_test.go
+++ b/pkg/workload/workload_test.go
@@ -40,6 +40,7 @@ import (
 	qutil "sigs.k8s.io/kueue/pkg/util/queue"
 	utiltas "sigs.k8s.io/kueue/pkg/util/tas"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 func TestNewInfo(t *testing.T) {
@@ -49,7 +50,7 @@ func TestNewInfo(t *testing.T) {
 		wantInfo    Info
 	}{
 		"pending": {
-			workload: *utiltesting.MakeWorkload("", "").
+			workload: *utiltestingapi.MakeWorkload("", "").
 				Request(corev1.ResourceCPU, "10m").
 				Request(corev1.ResourceMemory, "512Ki").
 				Obj(),
@@ -67,9 +68,9 @@ func TestNewInfo(t *testing.T) {
 			},
 		},
 		"pending with reclaim": {
-			workload: *utiltesting.MakeWorkload("", "").
+			workload: *utiltestingapi.MakeWorkload("", "").
 				PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "10m").
 						Request(corev1.ResourceMemory, "512Ki").
 						Obj(),
@@ -95,19 +96,19 @@ func TestNewInfo(t *testing.T) {
 			},
 		},
 		"admitted": {
-			workload: *utiltesting.MakeWorkload("", "").
+			workload: *utiltestingapi.MakeWorkload("", "").
 				PodSets(
-					*utiltesting.MakePodSet("driver", 1).
+					*utiltestingapi.MakePodSet("driver", 1).
 						Request(corev1.ResourceCPU, "10m").
 						Request(corev1.ResourceMemory, "512Ki").
 						Obj(),
-					*utiltesting.MakePodSet("workers", 3).
+					*utiltestingapi.MakePodSet("workers", 3).
 						Request(corev1.ResourceCPU, "5m").
 						Request(corev1.ResourceMemory, "1Mi").
 						Request("ex.com/gpu", "1").
 						Obj(),
 				).
-				ReserveQuota(utiltesting.MakeAdmission("foo").
+				ReserveQuota(utiltestingapi.MakeAdmission("foo").
 					PodSets(
 						kueue.PodSetAssignment{
 							Name: "driver",
@@ -159,16 +160,16 @@ func TestNewInfo(t *testing.T) {
 			},
 		},
 		"admitted with reclaim": {
-			workload: *utiltesting.MakeWorkload("", "").
+			workload: *utiltestingapi.MakeWorkload("", "").
 				PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "10m").
 						Request(corev1.ResourceMemory, "10Ki").
 						Obj(),
 				).
 				ReserveQuota(
-					utiltesting.MakeAdmission("").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					utiltestingapi.MakeAdmission("").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "f1", "30m").
 							Assignment(corev1.ResourceMemory, "f1", "30Ki").
 							Count(3).
@@ -200,16 +201,16 @@ func TestNewInfo(t *testing.T) {
 			},
 		},
 		"admitted with reclaim and increased reclaim": {
-			workload: *utiltesting.MakeWorkload("", "").
+			workload: *utiltestingapi.MakeWorkload("", "").
 				PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "10m").
 						Request(corev1.ResourceMemory, "10Ki").
 						Obj(),
 				).
 				ReserveQuota(
-					utiltesting.MakeAdmission("").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					utiltestingapi.MakeAdmission("").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "f1", "30m").
 							Assignment(corev1.ResourceMemory, "f1", "30Ki").
 							Count(3).
@@ -241,16 +242,16 @@ func TestNewInfo(t *testing.T) {
 			},
 		},
 		"partially admitted": {
-			workload: *utiltesting.MakeWorkload("", "").
+			workload: *utiltestingapi.MakeWorkload("", "").
 				PodSets(
-					*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).
+					*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).
 						Request(corev1.ResourceCPU, "10m").
 						Request(corev1.ResourceMemory, "10Ki").
 						Obj(),
 				).
 				ReserveQuota(
-					utiltesting.MakeAdmission("").
-						PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+					utiltestingapi.MakeAdmission("").
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "f1", "30m").
 							Assignment(corev1.ResourceMemory, "f1", "30Ki").
 							Count(3).
@@ -276,7 +277,7 @@ func TestNewInfo(t *testing.T) {
 			},
 		},
 		"filterResources": {
-			workload: *utiltesting.MakeWorkload("", "").
+			workload: *utiltestingapi.MakeWorkload("", "").
 				Request(corev1.ResourceCPU, "10m").
 				Request(corev1.ResourceMemory, "512Ki").
 				Request("networking.example.com/vpc1", "1").
@@ -296,14 +297,14 @@ func TestNewInfo(t *testing.T) {
 			},
 		},
 		"transformResources": {
-			workload: *utiltesting.MakeWorkload("transform", "").
+			workload: *utiltestingapi.MakeWorkload("transform", "").
 				PodSets(
-					*utiltesting.MakePodSet("a", 1).
+					*utiltestingapi.MakePodSet("a", 1).
 						Request("nvidia.com/mig-1g.5gb", "2").
 						Request("nvidia.com/mig-2g.10gb", "1").
 						Request(corev1.ResourceCPU, "1").
 						Obj(),
-					*utiltesting.MakePodSet("b", 2).
+					*utiltestingapi.MakePodSet("b", 2).
 						Request("nvidia.com/gpu", "1").
 						Request(corev1.ResourceCPU, "2").
 						Obj(),
@@ -427,7 +428,7 @@ func TestUpdateWorkloadStatus(t *testing.T) {
 	for name, tc := range cases {
 		t.Run(name, func(t *testing.T) {
 			ctx, _ := utiltesting.ContextWithLog(t)
-			workload := utiltesting.MakeWorkload("foo", "bar").Generation(1).Obj()
+			workload := utiltestingapi.MakeWorkload("foo", "bar").Generation(1).Obj()
 			workload.Status = tc.oldStatus
 			cl := utiltesting.NewFakeClientSSAAsSM(workload)
 			err := UpdateStatus(ctx, cl, workload, tc.condType, tc.condStatus, tc.reason, tc.message, "manager-prefix", fakeClock)
@@ -463,7 +464,7 @@ func TestGetQueueOrderTimestamp(t *testing.T) {
 		want map[Ordering]metav1.Time
 	}{
 		"no condition": {
-			wl: utiltesting.MakeWorkload("name", "ns").
+			wl: utiltestingapi.MakeWorkload("name", "ns").
 				Creation(creationTime.Time).
 				Obj(),
 			want: map[Ordering]metav1.Time{
@@ -472,7 +473,7 @@ func TestGetQueueOrderTimestamp(t *testing.T) {
 			},
 		},
 		"evicted by preemption": {
-			wl: utiltesting.MakeWorkload("name", "ns").
+			wl: utiltestingapi.MakeWorkload("name", "ns").
 				Creation(creationTime.Time).
 				Condition(metav1.Condition{
 					Type:               kueue.WorkloadEvicted,
@@ -487,7 +488,7 @@ func TestGetQueueOrderTimestamp(t *testing.T) {
 			},
 		},
 		"evicted by PodsReady timeout": {
-			wl: utiltesting.MakeWorkload("name", "ns").
+			wl: utiltestingapi.MakeWorkload("name", "ns").
 				Creation(creationTime.Time).
 				Condition(metav1.Condition{
 					Type:               kueue.WorkloadEvicted,
@@ -502,7 +503,7 @@ func TestGetQueueOrderTimestamp(t *testing.T) {
 			},
 		},
 		"after eviction": {
-			wl: utiltesting.MakeWorkload("name", "ns").
+			wl: utiltestingapi.MakeWorkload("name", "ns").
 				Creation(creationTime.Time).
 				Condition(metav1.Condition{
 					Type:               kueue.WorkloadEvicted,
@@ -640,10 +641,10 @@ func TestIsEvictedByDeactivation(t *testing.T) {
 		want     bool
 	}{
 		"evicted condition doesn't exist": {
-			workload: utiltesting.MakeWorkload("test", "test").Obj(),
+			workload: utiltestingapi.MakeWorkload("test", "test").Obj(),
 		},
 		"evicted condition with false status": {
-			workload: utiltesting.MakeWorkload("test", "test").
+			workload: utiltestingapi.MakeWorkload("test", "test").
 				Condition(metav1.Condition{
 					Type:   kueue.WorkloadEvicted,
 					Reason: kueue.WorkloadDeactivated,
@@ -652,7 +653,7 @@ func TestIsEvictedByDeactivation(t *testing.T) {
 				Obj(),
 		},
 		"evicted condition with PodsReadyTimeout reason": {
-			workload: utiltesting.MakeWorkload("test", "test").
+			workload: utiltestingapi.MakeWorkload("test", "test").
 				Condition(metav1.Condition{
 					Type:   kueue.WorkloadEvicted,
 					Reason: kueue.WorkloadEvictedByPodsReadyTimeout,
@@ -661,7 +662,7 @@ func TestIsEvictedByDeactivation(t *testing.T) {
 				Obj(),
 		},
 		"evicted condition with Deactivated reason": {
-			workload: utiltesting.MakeWorkload("test", "test").
+			workload: utiltestingapi.MakeWorkload("test", "test").
 				Condition(metav1.Condition{
 					Type:   kueue.WorkloadEvicted,
 					Reason: kueue.WorkloadDeactivated,
@@ -688,10 +689,10 @@ func TestIsEvictedByPodsReadyTimeout(t *testing.T) {
 		wantCondition        *metav1.Condition
 	}{
 		"evicted condition doesn't exist": {
-			workload: utiltesting.MakeWorkload("test", "test").Obj(),
+			workload: utiltestingapi.MakeWorkload("test", "test").Obj(),
 		},
 		"evicted condition with false status": {
-			workload: utiltesting.MakeWorkload("test", "test").
+			workload: utiltestingapi.MakeWorkload("test", "test").
 				Condition(metav1.Condition{
 					Type:   kueue.WorkloadEvicted,
 					Reason: kueue.WorkloadEvictedByPodsReadyTimeout,
@@ -700,7 +701,7 @@ func TestIsEvictedByPodsReadyTimeout(t *testing.T) {
 				Obj(),
 		},
 		"evicted condition with Preempted reason": {
-			workload: utiltesting.MakeWorkload("test", "test").
+			workload: utiltestingapi.MakeWorkload("test", "test").
 				Condition(metav1.Condition{
 					Type:   kueue.WorkloadEvicted,
 					Reason: kueue.WorkloadEvictedByPreemption,
@@ -709,7 +710,7 @@ func TestIsEvictedByPodsReadyTimeout(t *testing.T) {
 				Obj(),
 		},
 		"evicted condition with PodsReadyTimeout reason": {
-			workload: utiltesting.MakeWorkload("test", "test").
+			workload: utiltestingapi.MakeWorkload("test", "test").
 				Condition(metav1.Condition{
 					Type:   kueue.WorkloadEvicted,
 					Reason: kueue.WorkloadEvictedByPodsReadyTimeout,
@@ -837,86 +838,86 @@ func TestAdmissionCheckStrategy(t *testing.T) {
 		wantAdmissionChecks sets.Set[kueue.AdmissionCheckReference]
 	}{
 		"AdmissionCheckStrategy with a flavor": {
-			wl: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("cq").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			wl: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("cpu", "flavor1", "1").
 						Obj()).
 					Obj()).
 				Obj(),
-			cq: utiltesting.MakeClusterQueue("cq").
-				ResourceGroup(*utiltesting.MakeFlavorQuotas("flavor1").Obj(), *utiltesting.MakeFlavorQuotas("flavor2").Obj()).
-				AdmissionCheckStrategy(*utiltesting.MakeAdmissionCheckStrategyRule("ac1", "flavor1").Obj()).
+			cq: utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("flavor1").Obj(), *utiltestingapi.MakeFlavorQuotas("flavor2").Obj()).
+				AdmissionCheckStrategy(*utiltestingapi.MakeAdmissionCheckStrategyRule("ac1", "flavor1").Obj()).
 				Obj(),
 			wantAdmissionChecks: sets.New[kueue.AdmissionCheckReference]("ac1"),
 		},
 		"AdmissionCheckStrategy with an unmatched flavor": {
-			wl: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("cq").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			wl: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("cpu", "flavor1", "1").
 						Obj()).
 					Obj()).
 				Obj(),
-			cq: utiltesting.MakeClusterQueue("cq").
-				ResourceGroup(*utiltesting.MakeFlavorQuotas("flavor1").Obj(), *utiltesting.MakeFlavorQuotas("flavor2").Obj()).
-				AdmissionCheckStrategy(*utiltesting.MakeAdmissionCheckStrategyRule("ac1", "unmatched-flavor").Obj()).
+			cq: utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("flavor1").Obj(), *utiltestingapi.MakeFlavorQuotas("flavor2").Obj()).
+				AdmissionCheckStrategy(*utiltestingapi.MakeAdmissionCheckStrategyRule("ac1", "unmatched-flavor").Obj()).
 				Obj(),
 			wantAdmissionChecks: nil,
 		},
 		"AdmissionCheckStrategy without a flavor": {
-			wl: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("cq").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			wl: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("cpu", "flavor1", "1").
 						Obj()).
 					Obj()).
 				Obj(),
-			cq: utiltesting.MakeClusterQueue("cq").
-				ResourceGroup(*utiltesting.MakeFlavorQuotas("flavor1").Obj(), *utiltesting.MakeFlavorQuotas("flavor2").Obj()).
-				AdmissionCheckStrategy(*utiltesting.MakeAdmissionCheckStrategyRule("ac1").Obj()).
+			cq: utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("flavor1").Obj(), *utiltestingapi.MakeFlavorQuotas("flavor2").Obj()).
+				AdmissionCheckStrategy(*utiltestingapi.MakeAdmissionCheckStrategyRule("ac1").Obj()).
 				Obj(),
 			wantAdmissionChecks: sets.New[kueue.AdmissionCheckReference]("ac1"),
 		},
 		"Two AdmissionCheckStrategies, one with flavor, one without flavor": {
-			wl: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("cq").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			wl: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("cpu", "flavor1", "1").
 						Obj()).
 					Obj()).
 				Obj(),
-			cq: utiltesting.MakeClusterQueue("cq").
-				ResourceGroup(*utiltesting.MakeFlavorQuotas("flavor1").Obj(), *utiltesting.MakeFlavorQuotas("flavor2").Obj()).
+			cq: utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("flavor1").Obj(), *utiltestingapi.MakeFlavorQuotas("flavor2").Obj()).
 				AdmissionCheckStrategy(
-					*utiltesting.MakeAdmissionCheckStrategyRule("ac1", "flavor1").Obj(),
-					*utiltesting.MakeAdmissionCheckStrategyRule("ac2").Obj()).
+					*utiltestingapi.MakeAdmissionCheckStrategyRule("ac1", "flavor1").Obj(),
+					*utiltestingapi.MakeAdmissionCheckStrategyRule("ac2").Obj()).
 				Obj(),
 			wantAdmissionChecks: sets.New[kueue.AdmissionCheckReference]("ac1", "ac2"),
 		},
 		"AdmissionCheckStrategy with a non-existent flavor": {
-			wl: utiltesting.MakeWorkload("wl", "ns").
-				ReserveQuota(utiltesting.MakeAdmission("cq").
-					PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).
+			wl: utiltestingapi.MakeWorkload("wl", "ns").
+				ReserveQuota(utiltestingapi.MakeAdmission("cq").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment("cpu", "flavor1", "1").
 						Obj()).
 					Obj()).
 				Obj(),
-			cq: utiltesting.MakeClusterQueue("cq").
-				ResourceGroup(*utiltesting.MakeFlavorQuotas("flavor1").Obj()).
+			cq: utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("flavor1").Obj()).
 				AdmissionCheckStrategy(
-					*utiltesting.MakeAdmissionCheckStrategyRule("ac1", "flavor-nonexistent").Obj()).
+					*utiltestingapi.MakeAdmissionCheckStrategyRule("ac1", "flavor-nonexistent").Obj()).
 				Obj(),
 			wantAdmissionChecks: sets.New[kueue.AdmissionCheckReference](),
 		},
 		"Workload has no QuotaReserved": {
-			wl: utiltesting.MakeWorkload("wl", "ns").
+			wl: utiltestingapi.MakeWorkload("wl", "ns").
 				Obj(),
-			cq: utiltesting.MakeClusterQueue("cq").
-				ResourceGroup(*utiltesting.MakeFlavorQuotas("flavor1").Obj(), *utiltesting.MakeFlavorQuotas("flavor2").Obj()).
+			cq: utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("flavor1").Obj(), *utiltestingapi.MakeFlavorQuotas("flavor2").Obj()).
 				AdmissionCheckStrategy(
-					*utiltesting.MakeAdmissionCheckStrategyRule("ac1", "flavor1").Obj(),
-					*utiltesting.MakeAdmissionCheckStrategyRule("ac2").Obj()).
+					*utiltestingapi.MakeAdmissionCheckStrategyRule("ac1", "flavor1").Obj(),
+					*utiltestingapi.MakeAdmissionCheckStrategyRule("ac2").Obj()).
 				Obj(),
 			wantAdmissionChecks: nil,
 		},
@@ -1130,25 +1131,25 @@ func TestPropagateResourceRequests(t *testing.T) {
 }
 
 func TestNeedsSecondPass(t *testing.T) {
-	defaultSingleLevelTopology := *utiltesting.MakeDefaultOneLevelTopology("tas-single-level")
+	defaultSingleLevelTopology := *utiltestingapi.MakeDefaultOneLevelTopology("tas-single-level")
 	cases := map[string]struct {
 		wl   *kueue.Workload
 		want bool
 	}{
 		"admitted workload with UnhealthyNode": {
-			wl: utiltesting.MakeWorkload("foo", "default").
+			wl: utiltestingapi.MakeWorkload("foo", "default").
 				UnhealthyNodes("x0").
 				Queue("tas-main").
-				PodSets(*utiltesting.MakePodSet("one", 1).
+				PodSets(*utiltestingapi.MakePodSet("one", 1).
 					PreferredTopologyRequest(corev1.LabelHostname).
 					Request(corev1.ResourceCPU, "1").
 					Obj()).
 				ReserveQuota(
-					utiltesting.MakeAdmission("tas-main").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					utiltestingapi.MakeAdmission("tas-main").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domains(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
 								Obj()).
 							Obj()).
 						Obj(),
@@ -1158,18 +1159,18 @@ func TestNeedsSecondPass(t *testing.T) {
 			want: true,
 		},
 		"admitted workload without UnhealthyNode": {
-			wl: utiltesting.MakeWorkload("foo", "default").
+			wl: utiltestingapi.MakeWorkload("foo", "default").
 				Queue("tas-main").
-				PodSets(*utiltesting.MakePodSet("one", 1).
+				PodSets(*utiltestingapi.MakePodSet("one", 1).
 					PreferredTopologyRequest(corev1.LabelHostname).
 					Request(corev1.ResourceCPU, "1").
 					Obj()).
 				ReserveQuota(
-					utiltesting.MakeAdmission("tas-main").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					utiltestingapi.MakeAdmission("tas-main").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domains(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
 								Obj()).
 							Obj()).
 						Obj(),
@@ -1179,19 +1180,19 @@ func TestNeedsSecondPass(t *testing.T) {
 			want: false,
 		},
 		"admitted workload with UnhealthyNode, but no node in the assignment": {
-			wl: utiltesting.MakeWorkload("foo", "default").
+			wl: utiltestingapi.MakeWorkload("foo", "default").
 				UnhealthyNodes("x0").
 				Queue("tas-main").
-				PodSets(*utiltesting.MakePodSet("one", 1).
+				PodSets(*utiltestingapi.MakePodSet("one", 1).
 					PreferredTopologyRequest(corev1.LabelHostname).
 					Request(corev1.ResourceCPU, "1").
 					Obj()).
 				ReserveQuota(
-					utiltesting.MakeAdmission("tas-main").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					utiltestingapi.MakeAdmission("tas-main").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domains(utiltesting.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"x1"}, 1).Obj()).
 								Obj()).
 							Obj()).
 						Obj(),
@@ -1201,19 +1202,19 @@ func TestNeedsSecondPass(t *testing.T) {
 			want: false,
 		},
 		"finished workload with UnhealthyNode": {
-			wl: utiltesting.MakeWorkload("foo", "default").
+			wl: utiltestingapi.MakeWorkload("foo", "default").
 				UnhealthyNodes("x0").
 				Queue("tas-main").
-				PodSets(*utiltesting.MakePodSet("one", 1).
+				PodSets(*utiltestingapi.MakePodSet("one", 1).
 					PreferredTopologyRequest(corev1.LabelHostname).
 					Request(corev1.ResourceCPU, "1").
 					Obj()).
 				ReserveQuota(
-					utiltesting.MakeAdmission("tas-main").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					utiltestingapi.MakeAdmission("tas-main").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domains(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
 								Obj()).
 							Obj()).
 						Obj(),
@@ -1224,19 +1225,19 @@ func TestNeedsSecondPass(t *testing.T) {
 			want: false,
 		},
 		"evicted workload with UnhealthyNode": {
-			wl: utiltesting.MakeWorkload("foo", "default").
+			wl: utiltestingapi.MakeWorkload("foo", "default").
 				UnhealthyNodes("x0").
 				Queue("tas-main").
-				PodSets(*utiltesting.MakePodSet("one", 1).
+				PodSets(*utiltestingapi.MakePodSet("one", 1).
 					PreferredTopologyRequest(corev1.LabelHostname).
 					Request(corev1.ResourceCPU, "1").
 					Obj()).
 				ReserveQuota(
-					utiltesting.MakeAdmission("tas-main").
-						PodSets(utiltesting.MakePodSetAssignment("one").
+					utiltestingapi.MakeAdmission("tas-main").
+						PodSets(utiltestingapi.MakePodSetAssignment("one").
 							Assignment(corev1.ResourceCPU, "tas-default", "1000m").
-							TopologyAssignment(utiltesting.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
-								Domains(utiltesting.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
+							TopologyAssignment(utiltestingapi.MakeTopologyAssignment(utiltas.Levels(&defaultSingleLevelTopology)).
+								Domains(utiltestingapi.MakeTopologyDomainAssignment([]string{"x0"}, 1).Obj()).
 								Obj()).
 							Obj()).
 						Obj(),
@@ -1247,16 +1248,16 @@ func TestNeedsSecondPass(t *testing.T) {
 			want: false,
 		},
 		"quotaReserved and admission checks Ready when workload delayedTopologyRequest=Pending": {
-			wl: utiltesting.MakeWorkload("foo", "default").
+			wl: utiltestingapi.MakeWorkload("foo", "default").
 				Queue("tas-main").
-				PodSets(*utiltesting.MakePodSet("one", 1).
+				PodSets(*utiltestingapi.MakePodSet("one", 1).
 					RequiredTopologyRequest(corev1.LabelHostname).
 					Request(corev1.ResourceCPU, "1").
 					Obj()).
 				ReserveQuota(
-					utiltesting.MakeAdmission("tas-main").
+					utiltestingapi.MakeAdmission("tas-main").
 						PodSets(
-							utiltesting.MakePodSetAssignment("one").
+							utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "1000m").
 								DelayedTopologyRequest(kueue.DelayedTopologyRequestStatePending).
 								Obj(),
@@ -1271,16 +1272,16 @@ func TestNeedsSecondPass(t *testing.T) {
 			want: true,
 		},
 		"quotaReserved and admission checks Pending": {
-			wl: utiltesting.MakeWorkload("foo", "default").
+			wl: utiltestingapi.MakeWorkload("foo", "default").
 				Queue("tas-main").
-				PodSets(*utiltesting.MakePodSet("one", 1).
+				PodSets(*utiltestingapi.MakePodSet("one", 1).
 					RequiredTopologyRequest(corev1.LabelHostname).
 					Request(corev1.ResourceCPU, "1").
 					Obj()).
 				ReserveQuota(
-					utiltesting.MakeAdmission("tas-main").
+					utiltestingapi.MakeAdmission("tas-main").
 						PodSets(
-							utiltesting.MakePodSetAssignment("one").
+							utiltestingapi.MakePodSetAssignment("one").
 								Assignment(corev1.ResourceCPU, "tas-default", "1000m").
 								DelayedTopologyRequest(kueue.DelayedTopologyRequestStatePending).
 								Obj(),
@@ -1295,9 +1296,9 @@ func TestNeedsSecondPass(t *testing.T) {
 			want: false,
 		},
 		"workload without quota": {
-			wl: utiltesting.MakeWorkload("foo", "default").
+			wl: utiltestingapi.MakeWorkload("foo", "default").
 				Queue("tas-main").
-				PodSets(*utiltesting.MakePodSet("one", 1).
+				PodSets(*utiltestingapi.MakePodSet("one", 1).
 					RequiredTopologyRequest(corev1.LabelHostname).
 					Request(corev1.ResourceCPU, "1").
 					Obj()).
@@ -1324,8 +1325,8 @@ func TestWithPreprocessedDRAResources(t *testing.T) {
 		wantInfo     Info
 	}{
 		"single podset with DRA resources": {
-			workload: *utiltesting.MakeWorkload("test-wl", "default").
-				PodSets(*utiltesting.MakePodSet("main", 1).
+			workload: *utiltestingapi.MakeWorkload("test-wl", "default").
+				PodSets(*utiltestingapi.MakePodSet("main", 1).
 					Request(corev1.ResourceCPU, "100m").
 					Obj()).
 				Obj(),
@@ -1348,12 +1349,12 @@ func TestWithPreprocessedDRAResources(t *testing.T) {
 			},
 		},
 		"multiple podsets with different DRA resources": {
-			workload: *utiltesting.MakeWorkload("test-wl", "default").
+			workload: *utiltestingapi.MakeWorkload("test-wl", "default").
 				PodSets(
-					*utiltesting.MakePodSet("main", 1).
+					*utiltestingapi.MakePodSet("main", 1).
 						Request(corev1.ResourceCPU, "100m").
 						Obj(),
-					*utiltesting.MakePodSet("worker", 2).
+					*utiltestingapi.MakePodSet("worker", 2).
 						Request(corev1.ResourceMemory, "1Gi").
 						Obj(),
 				).
@@ -1388,12 +1389,12 @@ func TestWithPreprocessedDRAResources(t *testing.T) {
 			},
 		},
 		"no DRA resources for podset": {
-			workload: *utiltesting.MakeWorkload("test-wl", "default").
+			workload: *utiltestingapi.MakeWorkload("test-wl", "default").
 				PodSets(
-					*utiltesting.MakePodSet("main", 1).
+					*utiltestingapi.MakePodSet("main", 1).
 						Request(corev1.ResourceCPU, "100m").
 						Obj(),
-					*utiltesting.MakePodSet("worker", 1).
+					*utiltestingapi.MakePodSet("worker", 1).
 						Request(corev1.ResourceMemory, "512Mi").
 						Obj(),
 				).
@@ -1443,13 +1444,13 @@ func TestSetQuotaReservation(t *testing.T) {
 	fiveMinutesAgo := now.Add(-5 * time.Minute)
 
 	// admission "constants" values used in all test cases.
-	admission := utiltesting.MakeAdmission("test-queue").Obj()
+	admission := utiltestingapi.MakeAdmission("test-queue").Obj()
 	quotaReservedReason := "QuotaReserved"
 	quotaReservedMessage := fmt.Sprintf("Quota reserved in ClusterQueue %s", admission.ClusterQueue)
 
 	// newWorkload wrapper to reduce boilerplate in test cases.
-	newWorkload := func() *utiltesting.WorkloadWrapper {
-		return utiltesting.MakeWorkload("test", "default").Generation(1)
+	newWorkload := func() *utiltestingapi.WorkloadWrapper {
+		return utiltestingapi.MakeWorkload("test", "default").Generation(1)
 	}
 
 	// newCondition helper.
@@ -1563,7 +1564,7 @@ func TestPatchAdmissionStatus(t *testing.T) {
 			t.Run(name, func(t *testing.T) {
 				features.SetFeatureGateDuringTest(t, features.WorkloadRequestUseMergePatch, featureEnabled)
 				ctx, _ := utiltesting.ContextWithLog(t)
-				wl := utiltesting.MakeWorkload("foo", "default").Obj()
+				wl := utiltestingapi.MakeWorkload("foo", "default").Obj()
 				var cl client.Client
 				if !featureEnabled {
 					cl = utiltesting.NewFakeClientSSAAsSM(wl)
diff --git a/pkg/workloadslicing/workloadslicing_test.go b/pkg/workloadslicing/workloadslicing_test.go
index 1131a7992..a0ba333c9 100644
--- a/pkg/workloadslicing/workloadslicing_test.go
+++ b/pkg/workloadslicing/workloadslicing_test.go
@@ -46,6 +46,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/scheduler/preemption"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 )
 
@@ -162,8 +163,8 @@ func testWorkloadClientBuilder() *fake.ClientBuilder {
 		WithIndex(&kueue.Workload{}, indexer.OwnerReferenceIndexKey(testJobGVK), indexer.WorkloadOwnerIndexFunc(testJobGVK))
 }
 
-func testWorkload(name, jobName string, jobUID types.UID, created time.Time) *utiltesting.WorkloadWrapper {
-	return utiltesting.MakeWorkload(name, "default").
+func testWorkload(name, jobName string, jobUID types.UID, created time.Time) *utiltestingapi.WorkloadWrapper {
+	return utiltestingapi.MakeWorkload(name, "default").
 		OwnerReference(testJobGVK, jobName, string(jobUID)).
 		Creation(created).
 		ResourceVersion("1").
@@ -494,12 +495,12 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 		"OneWorkloadSlice_IncompatibleWithJob": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet("different-name", 1).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet("different-name", 1).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
@@ -507,20 +508,20 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 		"OneWorkloadSlice_CurrentWorkload": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
 			want: want{
-				workload: utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+				workload: utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 					OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 					ResourceVersion("1").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 				compatible: true,
 			},
@@ -528,13 +529,13 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 		"OneWorkloadSlice_ReservedQuota_ScaleUp": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-						ReserveQuotaAt(utiltesting.MakeAdmission("default").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						ReserveQuotaAt(utiltestingapi.MakeAdmission("default").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
 						Obj()).Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
@@ -545,26 +546,26 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 		"OneWorkloadSlice_ReservedQuota_ScaleUp_MultiplePodSets": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						PodSets(
-							*utiltesting.MakePodSet("scale-up", 3).Request(corev1.ResourceCPU, "1").Obj(),
-							*utiltesting.MakePodSet("scale-down", 3).Request(corev1.ResourceCPU, "1").Obj(),
-							*utiltesting.MakePodSet("stay-the-same", 3).Request(corev1.ResourceCPU, "1").Obj(),
+							*utiltestingapi.MakePodSet("scale-up", 3).Request(corev1.ResourceCPU, "1").Obj(),
+							*utiltestingapi.MakePodSet("scale-down", 3).Request(corev1.ResourceCPU, "1").Obj(),
+							*utiltestingapi.MakePodSet("stay-the-same", 3).Request(corev1.ResourceCPU, "1").Obj(),
 						).
-						ReserveQuotaAt(utiltesting.MakeAdmission("default").
+						ReserveQuotaAt(utiltestingapi.MakeAdmission("default").
 							PodSets(
-								utiltesting.MakePodSetAssignment("scaled-up").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
-								utiltesting.MakePodSetAssignment("scale-down").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
-								utiltesting.MakePodSetAssignment("stay-the-same").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
+								utiltestingapi.MakePodSetAssignment("scaled-up").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
+								utiltestingapi.MakePodSetAssignment("scale-down").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
+								utiltestingapi.MakePodSetAssignment("stay-the-same").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
 							).
 							Obj(), now).
 						Obj()).Build(),
 				jobPodSets: []kueue.PodSet{
-					*utiltesting.MakePodSet("scale-up", 4).Request(corev1.ResourceCPU, "1").Obj(),      // <-- scaled-up.
-					*utiltesting.MakePodSet("stay-the-same", 3).Request(corev1.ResourceCPU, "1").Obj(), // <-- stayed the same.
-					*utiltesting.MakePodSet("scale-down", 1).Request(corev1.ResourceCPU, "1").Obj(),    // <-- scaled-down.
+					*utiltestingapi.MakePodSet("scale-up", 4).Request(corev1.ResourceCPU, "1").Obj(),      // <-- scaled-up.
+					*utiltestingapi.MakePodSet("stay-the-same", 3).Request(corev1.ResourceCPU, "1").Obj(), // <-- stayed the same.
+					*utiltestingapi.MakePodSet("scale-down", 1).Request(corev1.ResourceCPU, "1").Obj(),    // <-- scaled-down.
 				},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
@@ -576,61 +577,61 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 		"OneWorkloadSlice_ReservedQuota_ScaleDown": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
-						ReserveQuotaAt(utiltesting.MakeAdmission("default").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj()).Obj(), now).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+						ReserveQuotaAt(utiltestingapi.MakeAdmission("default").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj()).Obj(), now).
 						Obj()).Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
 			want: want{
 				compatible: true,
-				workload: utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+				workload: utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 					OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 					ResourceVersion("2").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("default").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj()).Obj(), now).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("default").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj()).Obj(), now).
 					Obj(),
 			},
 		},
 		"OneWorkloadSlice_ReservedQuota_ScaleDown_MultiplePodSets": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						PodSets(
-							*utiltesting.MakePodSet("scale-down", 3).Request(corev1.ResourceCPU, "1").Obj(),
-							*utiltesting.MakePodSet("stay-the-same", 3).Request(corev1.ResourceCPU, "1").Obj()).
-						ReserveQuotaAt(utiltesting.MakeAdmission("default").
+							*utiltestingapi.MakePodSet("scale-down", 3).Request(corev1.ResourceCPU, "1").Obj(),
+							*utiltestingapi.MakePodSet("stay-the-same", 3).Request(corev1.ResourceCPU, "1").Obj()).
+						ReserveQuotaAt(utiltestingapi.MakeAdmission("default").
 							PodSets(
-								utiltesting.MakePodSetAssignment("scale-down").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
-								utiltesting.MakePodSetAssignment("stay-the-same").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
+								utiltestingapi.MakePodSetAssignment("scale-down").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
+								utiltestingapi.MakePodSetAssignment("stay-the-same").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
 							).
 							Obj(), now).
 						Obj()).Build(),
 				jobPodSets: []kueue.PodSet{
-					*utiltesting.MakePodSet("scale-down", 1).Request(corev1.ResourceCPU, "1").Obj(),    // <-- scaled-down.
-					*utiltesting.MakePodSet("stay-the-same", 3).Request(corev1.ResourceCPU, "1").Obj(), // <-- stayed the same.
+					*utiltestingapi.MakePodSet("scale-down", 1).Request(corev1.ResourceCPU, "1").Obj(),    // <-- scaled-down.
+					*utiltestingapi.MakePodSet("stay-the-same", 3).Request(corev1.ResourceCPU, "1").Obj(), // <-- stayed the same.
 				},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
 			want: want{
 				compatible: true,
-				workload: utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+				workload: utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 					OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 					ResourceVersion("2").
 					PodSets(
-						*utiltesting.MakePodSet("scale-down", 1).Request(corev1.ResourceCPU, "1").Obj(),
-						*utiltesting.MakePodSet("stay-the-same", 3).Request(corev1.ResourceCPU, "1").Obj()).
-					ReserveQuotaAt(utiltesting.MakeAdmission("default").
+						*utiltestingapi.MakePodSet("scale-down", 1).Request(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakePodSet("stay-the-same", 3).Request(corev1.ResourceCPU, "1").Obj()).
+					ReserveQuotaAt(utiltestingapi.MakeAdmission("default").
 						PodSets(
-							utiltesting.MakePodSetAssignment("scale-down").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
-							utiltesting.MakePodSetAssignment("stay-the-same").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
+							utiltestingapi.MakePodSetAssignment("scale-down").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
+							utiltestingapi.MakePodSetAssignment("stay-the-same").Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj(),
 						).
 						Obj(), now).
 					Obj(),
@@ -639,57 +640,57 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 		"OneWorkloadSlice_UnreservedQuota_ScaleUp": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
 			want: want{
 				compatible: true,
-				workload: utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+				workload: utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 					OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 					ResourceVersion("2").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 		},
 		"OneWorkloadSlice_UnreservedQuota_ScaleDown": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
 			want: want{
 				compatible: true,
-				workload: utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+				workload: utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 					OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 					ResourceVersion("2").
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 		},
 		"OneWorkloadSlice_UpdateFailure": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).WithInterceptorFuncs(interceptor.Funcs{
 					Update: func(ctx context.Context, client client.WithWatch, obj client.Object, opts ...client.UpdateOption) error {
 						return errors.New("test-update-error")
 					}}).Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
@@ -702,17 +703,17 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 		"TwoWorkloads_BothUnreserved_NewIsCurrent": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(fiveMinutesAgo).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj(),
-					utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(now).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).
 					WithInterceptorFuncs(interceptor.Funcs{
 						SubResourcePatch: func(ctx context.Context, client client.Client, subResourceName string, obj client.Object, patch client.Patch, opts ...client.SubResourcePatchOption) error {
@@ -720,34 +721,34 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 						},
 					}).
 					Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
 			want: want{
 				compatible: true,
-				workload: utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+				workload: utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 					OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 					ResourceVersion("1").
 					Creation(now).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 		},
 		"TwoWorkloads_BothUnreserved_NewIsCurrent_FailureToPatchOldSliceStatus": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(fiveMinutesAgo).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj(),
-					utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(now).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).
 					WithInterceptorFuncs(interceptor.Funcs{
 						SubResourcePatch: func(_ context.Context, client client.Client, subResourceName string, obj client.Object, patch client.Patch, opts ...client.SubResourcePatchOption) error {
@@ -755,7 +756,7 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 						},
 					}).
 					Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
@@ -767,21 +768,21 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 		"TwoWorkloads_NewIsIncompatible": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(fiveMinutesAgo).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-						ReserveQuotaAt(utiltesting.MakeAdmission("default").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						ReserveQuotaAt(utiltestingapi.MakeAdmission("default").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
 						Obj(),
-					utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(now).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).
 					Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet("different-key", 1).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet("different-key", 1).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
@@ -789,22 +790,22 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 		"TwoWorkloads_BothWithReservedQuota": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(fiveMinutesAgo).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-						ReserveQuotaAt(utiltesting.MakeAdmission("default").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						ReserveQuotaAt(utiltestingapi.MakeAdmission("default").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
 						Obj(),
-					utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(now).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
-						ReserveQuotaAt(utiltesting.MakeAdmission("default").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj()).Obj(), now).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+						ReserveQuotaAt(utiltestingapi.MakeAdmission("default").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Count(3).Obj()).Obj(), now).
 						Obj()).
 					Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
@@ -816,22 +817,22 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 		"TwoWorkloads_OldWithReservedQuotaAndEvicted_NewWithoutQuotaReservation": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(fiveMinutesAgo).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-						ReserveQuotaAt(utiltesting.MakeAdmission("default").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						ReserveQuotaAt(utiltestingapi.MakeAdmission("default").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
 						Evicted().
 						Obj(),
-					utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(now).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).
 					Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
@@ -843,110 +844,110 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 		"TwoWorkloadSlices_NewIsUnreservedAndCurrent": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(fiveMinutesAgo).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-						ReserveQuotaAt(utiltesting.MakeAdmission("default").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						ReserveQuotaAt(utiltestingapi.MakeAdmission("default").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
 						Obj(),
-					utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(now).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
 			want: want{
 				compatible: true,
-				workload: utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+				workload: utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 					OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 					ResourceVersion("1").
 					Creation(now).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 		},
 		"TwoWorkloadSlices_NewIsUnreservedAndOutOfSync_ScaleUp": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(fiveMinutesAgo).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-						ReserveQuotaAt(utiltesting.MakeAdmission("default").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						ReserveQuotaAt(utiltestingapi.MakeAdmission("default").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
 						Obj(),
-					utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(now).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).
 					Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
 			want: want{
 				compatible: true,
-				workload: utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+				workload: utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 					OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 					ResourceVersion("2").
 					Creation(now).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 5).Request(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 		},
 		"TwoWorkloadSlices_NewIsUnreservedAndOutOfSync_ScaleDown": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(fiveMinutesAgo).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-						ReserveQuotaAt(utiltesting.MakeAdmission("default").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						ReserveQuotaAt(utiltestingapi.MakeAdmission("default").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
 						Obj(),
-					utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(now).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).
 					Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
 			want: want{
 				compatible: true,
-				workload: utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+				workload: utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 					OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 					ResourceVersion("2").
 					Creation(now).
-					PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()).
 					Obj(),
 			},
 		},
 		"TwoWorkloadSlices_NewIsUnreservedAndOutOfSync_UpdateFailure": {
 			args: args{
 				clnt: testWorkloadClientBuilder().WithObjects(
-					utiltesting.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-1", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(fiveMinutesAgo).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
-						ReserveQuotaAt(utiltesting.MakeAdmission("default").PodSets(utiltesting.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Request(corev1.ResourceCPU, "1").Obj()).
+						ReserveQuotaAt(utiltestingapi.MakeAdmission("default").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "default", "1").Obj()).Obj(), now).
 						Obj(),
-					utiltesting.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
+					utiltestingapi.MakeWorkload(testJobObject.Name+"-2", testJobObject.Namespace).
 						OwnerReference(testJobGVK, testJobObject.Name, string(testJobObject.UID)).
 						ResourceVersion("1").
 						Creation(now).
-						PodSets(*utiltesting.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).Request(corev1.ResourceCPU, "1").Obj()).
 						Obj()).
 					WithInterceptorFuncs(interceptor.Funcs{
 						Update: func(_ context.Context, _ client.WithWatch, obj client.Object, _ ...client.UpdateOption) error {
@@ -958,7 +959,7 @@ func TestEnsureWorkloadSlices(t *testing.T) {
 						},
 					}).
 					Build(),
-				jobPodSets:   []kueue.PodSet{*utiltesting.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()},
+				jobPodSets:   []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "1").Obj()},
 				jobObject:    testJobObject,
 				jobObjectGVK: testJobGVK,
 			},
@@ -1152,20 +1153,20 @@ func TestReplacedWorkloadSlice(t *testing.T) {
 		"EdgeCase_SnapshotIsNil": {
 			featureEnabled: true,
 			args: args{
-				wl: workload.NewInfo(utiltesting.MakeWorkload("test", "default").Obj()),
+				wl: workload.NewInfo(utiltestingapi.MakeWorkload("test", "default").Obj()),
 			},
 		},
 		"WorkloadWithoutReplacementAnnotation": {
 			featureEnabled: true,
 			args: args{
-				wl:   workload.NewInfo(utiltesting.MakeWorkload("test", "default").Obj()),
+				wl:   workload.NewInfo(utiltestingapi.MakeWorkload("test", "default").Obj()),
 				snap: &schdcache.Snapshot{},
 			},
 		},
 		"ReplacedWorkloadIsNotFound_MissingClusterQueue": {
 			featureEnabled: true,
 			args: args{
-				wl: workload.NewInfo(utiltesting.MakeWorkload("test-new", "default").
+				wl: workload.NewInfo(utiltestingapi.MakeWorkload("test-new", "default").
 					Annotation(WorkloadSliceReplacementFor, "test-old").
 					Obj()),
 				snap: &schdcache.Snapshot{
@@ -1178,9 +1179,9 @@ func TestReplacedWorkloadSlice(t *testing.T) {
 		"EdgeCase_ReplacedWorkloadIsNotFound_NotInClusterQueue": {
 			featureEnabled: true,
 			args: args{
-				wl: workload.NewInfo(utiltesting.MakeWorkload("test-new", "default").
+				wl: workload.NewInfo(utiltestingapi.MakeWorkload("test-new", "default").
 					Annotation(WorkloadSliceReplacementFor, "test-old").
-					Admission(utiltesting.MakeAdmission("default").Obj()).
+					Admission(utiltestingapi.MakeAdmission("default").Obj()).
 					Obj()),
 				snap: &schdcache.Snapshot{
 					Manager: hierarchy.NewManagerForTest(
@@ -1194,9 +1195,9 @@ func TestReplacedWorkloadSlice(t *testing.T) {
 		"ReplacedWorkloadIsFound": {
 			featureEnabled: true,
 			args: args{
-				wl: workload.NewInfo(utiltesting.MakeWorkload("test-new", "default").
+				wl: workload.NewInfo(utiltestingapi.MakeWorkload("test-new", "default").
 					Annotation(WorkloadSliceReplacementFor, "test-old").
-					Admission(utiltesting.MakeAdmission("default").Obj()).
+					Admission(utiltestingapi.MakeAdmission("default").Obj()).
 					Obj()),
 				snap: &schdcache.Snapshot{
 					Manager: hierarchy.NewManagerForTest(
@@ -1204,16 +1205,16 @@ func TestReplacedWorkloadSlice(t *testing.T) {
 						map[kueue.ClusterQueueReference]*schdcache.ClusterQueueSnapshot{
 							"default": {
 								Workloads: map[workload.Reference]*workload.Info{
-									"test-old": workload.NewInfo(utiltesting.MakeWorkload("test-old", "default").Obj()),
+									"test-old": workload.NewInfo(utiltestingapi.MakeWorkload("test-old", "default").Obj()),
 								},
 							},
 						}),
 				},
 			},
 			want: want{
-				wl: workload.NewInfo(utiltesting.MakeWorkload("test-old", "default").Obj()),
+				wl: workload.NewInfo(utiltestingapi.MakeWorkload("test-old", "default").Obj()),
 				targets: []*preemption.Target{
-					{WorkloadInfo: workload.NewInfo(utiltesting.MakeWorkload("test-old", "default").Obj())},
+					{WorkloadInfo: workload.NewInfo(utiltestingapi.MakeWorkload("test-old", "default").Obj())},
 				},
 			},
 		},
diff --git a/test/e2e/certmanager/certmanager_test.go b/test/e2e/certmanager/certmanager_test.go
index 47bd44d2f..134f2e8ca 100644
--- a/test/e2e/certmanager/certmanager_test.go
+++ b/test/e2e/certmanager/certmanager_test.go
@@ -25,7 +25,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	workloadjob "sigs.k8s.io/kueue/pkg/controller/jobs/job"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -44,16 +44,16 @@ var _ = ginkgo.Describe("CertManager", ginkgo.Ordered, func() {
 		}
 		util.MustCreate(ctx, k8sClient, ns)
 
-		defaultRf = testing.MakeResourceFlavor("default").Obj()
+		defaultRf = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, defaultRf)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas(defaultRf.Name).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(defaultRf.Name).
 				Resource(corev1.ResourceCPU, "2").
 				Resource(corev1.ResourceMemory, "2G").Obj()).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
diff --git a/test/e2e/certmanager/metrics_test.go b/test/e2e/certmanager/metrics_test.go
index 29e674753..550f7b29f 100644
--- a/test/e2e/certmanager/metrics_test.go
+++ b/test/e2e/certmanager/metrics_test.go
@@ -26,8 +26,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjobspod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -43,7 +44,7 @@ const (
 var _ = ginkgo.Describe("Metrics", ginkgo.Ordered, func() {
 	var (
 		ns             *corev1.Namespace
-		resourceFlavor *v1beta1.ResourceFlavor
+		resourceFlavor *kueue.ResourceFlavor
 
 		metricsReaderClusterRoleBinding *rbacv1.ClusterRoleBinding
 
@@ -54,7 +55,7 @@ var _ = ginkgo.Describe("Metrics", ginkgo.Ordered, func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-metrics-")
 
-		resourceFlavor = utiltesting.MakeResourceFlavor("test-flavor").Obj()
+		resourceFlavor = utiltestingapi.MakeResourceFlavor("test-flavor").Obj()
 		util.MustCreate(ctx, k8sClient, resourceFlavor)
 
 		metricsReaderClusterRoleBinding = &rbacv1.ClusterRoleBinding{
@@ -128,16 +129,16 @@ var _ = ginkgo.Describe("Metrics", ginkgo.Ordered, func() {
 
 	ginkgo.When("workload is admitted", func() {
 		var (
-			clusterQueue *v1beta1.ClusterQueue
-			localQueue   *v1beta1.LocalQueue
-			workload     *v1beta1.Workload
+			clusterQueue *kueue.ClusterQueue
+			localQueue   *kueue.LocalQueue
+			workload     *kueue.Workload
 		)
 
 		ginkgo.BeforeEach(func() {
-			clusterQueue = utiltesting.MakeClusterQueue("").
+			clusterQueue = utiltestingapi.MakeClusterQueue("").
 				GeneratedName("test-cq-").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas(resourceFlavor.Name).
+					*utiltestingapi.MakeFlavorQuotas(resourceFlavor.Name).
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
@@ -145,16 +146,16 @@ var _ = ginkgo.Describe("Metrics", ginkgo.Ordered, func() {
 				Obj()
 			gomega.Expect(k8sClient.Create(ctx, clusterQueue)).To(gomega.Succeed())
 
-			localQueue = utiltesting.MakeLocalQueue("", ns.Name).
+			localQueue = utiltestingapi.MakeLocalQueue("", ns.Name).
 				GeneratedName("test-lq-").
 				ClusterQueue(clusterQueue.Name).
 				Obj()
 			gomega.Expect(k8sClient.Create(ctx, localQueue)).To(gomega.Succeed())
 
-			workload = utiltesting.MakeWorkload("test-workload", ns.Name).
-				Queue(v1beta1.LocalQueueName(localQueue.Name)).
+			workload = utiltestingapi.MakeWorkload("test-workload", ns.Name).
+				Queue(kueue.LocalQueueName(localQueue.Name)).
 				PodSets(
-					*utiltesting.MakePodSet("ps1", 1).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 1).Obj(),
 				).
 				RequestAndLimit(corev1.ResourceCPU, "1").
 				Obj()
diff --git a/test/e2e/certmanager/visibility_test.go b/test/e2e/certmanager/visibility_test.go
index e3c865fec..352c41af0 100644
--- a/test/e2e/certmanager/visibility_test.go
+++ b/test/e2e/certmanager/visibility_test.go
@@ -26,7 +26,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -45,19 +45,19 @@ var _ = ginkgo.Describe("Kueue secure visibility server", func() {
 
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-")
-		defaultRF = testing.MakeResourceFlavor(defaultFlavor).Obj()
+		defaultRF = utiltestingapi.MakeResourceFlavor(defaultFlavor).Obj()
 		util.MustCreate(ctx, k8sClient, defaultRF)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(defaultFlavor).
+				*utiltestingapi.MakeFlavorQuotas(defaultFlavor).
 					Resource(corev1.ResourceCPU, "1").
 					Obj(),
 			).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 	ginkgo.AfterEach(func() {
diff --git a/test/e2e/customconfigs/managejobswithoutqueuename_test.go b/test/e2e/customconfigs/managejobswithoutqueuename_test.go
index cfbaf458c..ae4b205f8 100644
--- a/test/e2e/customconfigs/managejobswithoutqueuename_test.go
+++ b/test/e2e/customconfigs/managejobswithoutqueuename_test.go
@@ -43,6 +43,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	utilpod "sigs.k8s.io/kueue/pkg/util/pod"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	awtesting "sigs.k8s.io/kueue/pkg/util/testingjobs/appwrapper"
 	testingdeploy "sigs.k8s.io/kueue/pkg/util/testingjobs/deployment"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
@@ -69,15 +70,15 @@ var _ = ginkgo.Describe("ManageJobsWithoutQueueName", ginkgo.Ordered, func() {
 
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-")
-		defaultRf = testing.MakeResourceFlavor("default").Obj()
+		defaultRf = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, defaultRf)
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(defaultRf.Name).
+				*utiltestingapi.MakeFlavorQuotas(defaultRf.Name).
 					Resource(corev1.ResourceCPU, "2").
 					Resource(corev1.ResourceMemory, "2G").Obj()).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
-		localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 	ginkgo.AfterEach(func() {
@@ -100,7 +101,7 @@ var _ = ginkgo.Describe("ManageJobsWithoutQueueName", ginkgo.Ordered, func() {
 			})
 
 			ginkgo.By("creating a default LocalQueue", func() {
-				localQueue = testing.MakeLocalQueue("default", ns.Name).ClusterQueue("cluster-queue").Obj()
+				localQueue = utiltestingapi.MakeLocalQueue("default", ns.Name).ClusterQueue("cluster-queue").Obj()
 				util.MustCreate(ctx, k8sClient, localQueue)
 			})
 
@@ -142,7 +143,7 @@ var _ = ginkgo.Describe("ManageJobsWithoutQueueName", ginkgo.Ordered, func() {
 			var jobLookupKey types.NamespacedName
 
 			ginkgo.By("creating a default LocalQueue", func() {
-				localQueue = testing.MakeLocalQueue("default", ns.Name).ClusterQueue("cluster-queue").Obj()
+				localQueue = utiltestingapi.MakeLocalQueue("default", ns.Name).ClusterQueue("cluster-queue").Obj()
 				util.MustCreate(ctx, k8sClient, localQueue)
 			})
 
@@ -925,15 +926,15 @@ var _ = ginkgo.Describe("ManageJobsWithoutQueueName without JobSet integration",
 
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-")
-		defaultRf = testing.MakeResourceFlavor("default").Obj()
+		defaultRf = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, defaultRf)
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(defaultRf.Name).
+				*utiltestingapi.MakeFlavorQuotas(defaultRf.Name).
 					Resource(corev1.ResourceCPU, "2").
 					Resource(corev1.ResourceMemory, "2G").Obj()).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
-		localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
diff --git a/test/e2e/customconfigs/objectretentionpolicies_test.go b/test/e2e/customconfigs/objectretentionpolicies_test.go
index e9d240352..bbc015cb2 100644
--- a/test/e2e/customconfigs/objectretentionpolicies_test.go
+++ b/test/e2e/customconfigs/objectretentionpolicies_test.go
@@ -31,6 +31,7 @@ import (
 	workloadjob "sigs.k8s.io/kueue/pkg/controller/jobs/job"
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -46,15 +47,15 @@ var _ = ginkgo.Describe("ObjectRetentionPolicies", ginkgo.Ordered, ginkgo.Contin
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "orp-")
 
-		rf = testing.MakeResourceFlavor("default").Obj()
+		rf = utiltestingapi.MakeResourceFlavor("default").Obj()
 		gomega.Expect(k8sClient.Create(ctx, rf)).Should(gomega.Succeed())
 
-		cq = testing.MakeClusterQueue("cq").
-			ResourceGroup(*testing.MakeFlavorQuotas(rf.Name).Resource(corev1.ResourceCPU, "10").Obj()).
+		cq = utiltestingapi.MakeClusterQueue("cq").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).Resource(corev1.ResourceCPU, "10").Obj()).
 			Obj()
 		gomega.Expect(k8sClient.Create(ctx, cq)).Should(gomega.Succeed())
 
-		lq = testing.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
 		gomega.Expect(k8sClient.Create(ctx, lq)).Should(gomega.Succeed())
 	})
 
@@ -154,15 +155,15 @@ var _ = ginkgo.Describe("ObjectRetentionPolicies with TinyTimeout", ginkgo.Order
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "orp-")
 
-		rf = testing.MakeResourceFlavor("default").Obj()
+		rf = utiltestingapi.MakeResourceFlavor("default").Obj()
 		gomega.Expect(k8sClient.Create(ctx, rf)).Should(gomega.Succeed())
 
-		cq = testing.MakeClusterQueue("cq").
-			ResourceGroup(*testing.MakeFlavorQuotas(rf.Name).Resource(corev1.ResourceCPU, "10").Obj()).
+		cq = utiltestingapi.MakeClusterQueue("cq").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).Resource(corev1.ResourceCPU, "10").Obj()).
 			Obj()
 		gomega.Expect(k8sClient.Create(ctx, cq)).Should(gomega.Succeed())
 
-		lq = testing.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
 		gomega.Expect(k8sClient.Create(ctx, lq)).Should(gomega.Succeed())
 	})
 
@@ -296,15 +297,15 @@ var _ = ginkgo.Describe("ObjectRetentionPolicies with TinyTimeout and RequeuingL
 	ginkgo.JustBeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "orp-")
 
-		rf = testing.MakeResourceFlavor("default").Obj()
+		rf = utiltestingapi.MakeResourceFlavor("default").Obj()
 		gomega.Expect(k8sClient.Create(ctx, rf)).Should(gomega.Succeed())
 
-		cq = testing.MakeClusterQueue("cq").
-			ResourceGroup(*testing.MakeFlavorQuotas(rf.Name).Resource(corev1.ResourceCPU, "10").Obj()).
+		cq = utiltestingapi.MakeClusterQueue("cq").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).Resource(corev1.ResourceCPU, "10").Obj()).
 			Obj()
 		gomega.Expect(k8sClient.Create(ctx, cq)).Should(gomega.Succeed())
 
-		lq = testing.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
 		gomega.Expect(k8sClient.Create(ctx, lq)).Should(gomega.Succeed())
 	})
 
diff --git a/test/e2e/customconfigs/podintegrationautoenablement_test.go b/test/e2e/customconfigs/podintegrationautoenablement_test.go
index 4f801048e..a1cf25b34 100644
--- a/test/e2e/customconfigs/podintegrationautoenablement_test.go
+++ b/test/e2e/customconfigs/podintegrationautoenablement_test.go
@@ -29,6 +29,7 @@ import (
 	podconstants "sigs.k8s.io/kueue/pkg/controller/jobs/pod/constants"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/statefulset"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 	testingsts "sigs.k8s.io/kueue/pkg/util/testingjobs/statefulset"
 	"sigs.k8s.io/kueue/test/util"
@@ -58,15 +59,15 @@ var _ = ginkgo.Describe("Auto-Enablement of Pod Integration for Pod-Dependent Fr
 
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-disabled-pod-")
-		defaultRf = testing.MakeResourceFlavor("default").Obj()
+		defaultRf = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, defaultRf)
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(defaultRf.Name).
+				*utiltestingapi.MakeFlavorQuotas(defaultRf.Name).
 					Resource(corev1.ResourceCPU, "2").
 					Resource(corev1.ResourceMemory, "2G").Obj()).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
-		localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
diff --git a/test/e2e/customconfigs/reconcile_test.go b/test/e2e/customconfigs/reconcile_test.go
index 0c08a05ab..1790ef549 100644
--- a/test/e2e/customconfigs/reconcile_test.go
+++ b/test/e2e/customconfigs/reconcile_test.go
@@ -27,7 +27,7 @@ import (
 	config "sigs.k8s.io/kueue/apis/config/v1beta1"
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/features"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 	"sigs.k8s.io/kueue/test/util"
@@ -71,15 +71,15 @@ var _ = ginkgo.Describe("Job reconciliation with ManagedJobsNamespaceSelectorAlw
 		}
 		gomega.Expect(k8sClient.Create(ctx, ns)).To(gomega.Succeed())
 
-		rf = testing.MakeResourceFlavor(rfName).Obj()
+		rf = utiltestingapi.MakeResourceFlavor(rfName).Obj()
 		gomega.Expect(k8sClient.Create(ctx, rf)).To(gomega.Succeed())
 
-		cq = testing.MakeClusterQueue(cqName).
-			ResourceGroup(*testing.MakeFlavorQuotas(rfName).Resource(corev1.ResourceCPU, "5").Obj()).
+		cq = utiltestingapi.MakeClusterQueue(cqName).
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rfName).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		gomega.Expect(k8sClient.Create(ctx, cq)).To(gomega.Succeed())
 
-		lq = testing.MakeLocalQueue(lqName, ns.Name).ClusterQueue(cqName).Obj()
+		lq = utiltestingapi.MakeLocalQueue(lqName, ns.Name).ClusterQueue(cqName).Obj()
 		gomega.Expect(k8sClient.Create(ctx, lq)).To(gomega.Succeed())
 	})
 
diff --git a/test/e2e/customconfigs/waitforpodsready_test.go b/test/e2e/customconfigs/waitforpodsready_test.go
index ac84375cf..e98a02820 100644
--- a/test/e2e/customconfigs/waitforpodsready_test.go
+++ b/test/e2e/customconfigs/waitforpodsready_test.go
@@ -31,6 +31,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	workloadjob "sigs.k8s.io/kueue/pkg/controller/jobs/job"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingjobspod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 	"sigs.k8s.io/kueue/test/util"
@@ -106,15 +107,15 @@ var _ = ginkgo.Describe("WaitForPodsReady with tiny Timeout and no RecoveryTimeo
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "wfpr-")
 
-		rf = testing.MakeResourceFlavor("default").Obj()
+		rf = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, rf)
 
-		cq = testing.MakeClusterQueue("cq").
-			ResourceGroup(*testing.MakeFlavorQuotas(rf.Name).Resource(corev1.ResourceCPU, "10").Obj()).
+		cq = utiltestingapi.MakeClusterQueue("cq").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).Resource(corev1.ResourceCPU, "10").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 
@@ -261,15 +262,15 @@ var _ = ginkgo.Describe("WaitForPodsReady with default Timeout and a tiny Recove
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "wfpr-")
 
-		rf = testing.MakeResourceFlavor("default").Obj()
+		rf = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, rf)
 
-		cq = testing.MakeClusterQueue("cq").
-			ResourceGroup(*testing.MakeFlavorQuotas(rf.Name).Resource(corev1.ResourceCPU, "10").Obj()).
+		cq = utiltestingapi.MakeClusterQueue("cq").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).Resource(corev1.ResourceCPU, "10").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 
@@ -406,15 +407,15 @@ var _ = ginkgo.Describe("WaitForPodsReady with default Timeout and a long Recove
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "wfpr-")
 
-		rf = testing.MakeResourceFlavor("default").Obj()
+		rf = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, rf)
 
-		cq = testing.MakeClusterQueue("cq").
-			ResourceGroup(*testing.MakeFlavorQuotas(rf.Name).Resource(corev1.ResourceCPU, "10").Obj()).
+		cq = utiltestingapi.MakeClusterQueue("cq").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).Resource(corev1.ResourceCPU, "10").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 
diff --git a/test/e2e/multikueue/e2e_test.go b/test/e2e/multikueue/e2e_test.go
index 83afe6d34..6419b0031 100644
--- a/test/e2e/multikueue/e2e_test.go
+++ b/test/e2e/multikueue/e2e_test.go
@@ -55,6 +55,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/util/admissioncheck"
 	utilpod "sigs.k8s.io/kueue/pkg/util/pod"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingaw "sigs.k8s.io/kueue/pkg/util/testingjobs/appwrapper"
 	testingdeployment "sigs.k8s.io/kueue/pkg/util/testingjobs/deployment"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
@@ -96,16 +97,16 @@ var _ = ginkgo.Describe("MultiKueue", func() {
 		worker1Ns = util.CreateNamespaceWithLog(ctx, k8sWorker1Client, managerNs.Name)
 		worker2Ns = util.CreateNamespaceWithLog(ctx, k8sWorker2Client, managerNs.Name)
 
-		workerCluster1 = utiltesting.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, "multikueue1").Obj()
+		workerCluster1 = utiltestingapi.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, "multikueue1").Obj()
 		util.MustCreate(ctx, k8sManagerClient, workerCluster1)
 
-		workerCluster2 = utiltesting.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, "multikueue2").Obj()
+		workerCluster2 = utiltestingapi.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, "multikueue2").Obj()
 		util.MustCreate(ctx, k8sManagerClient, workerCluster2)
 
-		multiKueueConfig = utiltesting.MakeMultiKueueConfig("multikueueconfig").Clusters("worker1", "worker2").Obj()
+		multiKueueConfig = utiltestingapi.MakeMultiKueueConfig("multikueueconfig").Clusters("worker1", "worker2").Obj()
 		util.MustCreate(ctx, k8sManagerClient, multiKueueConfig)
 
-		multiKueueAc = utiltesting.MakeAdmissionCheck("ac1").
+		multiKueueAc = utiltestingapi.MakeAdmissionCheck("ac1").
 			ControllerName(kueue.MultiKueueControllerName).
 			Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", multiKueueConfig.Name).
 			Obj()
@@ -119,12 +120,12 @@ var _ = ginkgo.Describe("MultiKueue", func() {
 				g.Expect(updatedAc.Status.Conditions).To(utiltesting.HaveConditionStatusTrue(kueue.AdmissionCheckActive))
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
-		managerFlavor = utiltesting.MakeResourceFlavor("default").Obj()
+		managerFlavor = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sManagerClient, managerFlavor)
 
-		managerCq = utiltesting.MakeClusterQueue("q1").
+		managerCq = utiltestingapi.MakeClusterQueue("q1").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas(managerFlavor.Name).
+				*utiltestingapi.MakeFlavorQuotas(managerFlavor.Name).
 					Resource(corev1.ResourceCPU, "2").
 					Resource(corev1.ResourceMemory, "2G").
 					Obj(),
@@ -133,15 +134,15 @@ var _ = ginkgo.Describe("MultiKueue", func() {
 			Obj()
 		util.MustCreate(ctx, k8sManagerClient, managerCq)
 
-		managerLq = utiltesting.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
+		managerLq = utiltestingapi.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
 		util.MustCreate(ctx, k8sManagerClient, managerLq)
 
-		worker1Flavor = utiltesting.MakeResourceFlavor("default").Obj()
+		worker1Flavor = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sWorker1Client, worker1Flavor)
 
-		worker1Cq = utiltesting.MakeClusterQueue("q1").
+		worker1Cq = utiltestingapi.MakeClusterQueue("q1").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas(worker1Flavor.Name).
+				*utiltestingapi.MakeFlavorQuotas(worker1Flavor.Name).
 					Resource(corev1.ResourceCPU, "2").
 					Resource(corev1.ResourceMemory, "1G").
 					Obj(),
@@ -149,15 +150,15 @@ var _ = ginkgo.Describe("MultiKueue", func() {
 			Obj()
 		util.MustCreate(ctx, k8sWorker1Client, worker1Cq)
 
-		worker1Lq = utiltesting.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
+		worker1Lq = utiltestingapi.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
 		util.MustCreate(ctx, k8sWorker1Client, worker1Lq)
 
-		worker2Flavor = utiltesting.MakeResourceFlavor("default").Obj()
+		worker2Flavor = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sWorker2Client, worker2Flavor)
 
-		worker2Cq = utiltesting.MakeClusterQueue("q1").
+		worker2Cq = utiltestingapi.MakeClusterQueue("q1").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas(worker2Flavor.Name).
+				*utiltestingapi.MakeFlavorQuotas(worker2Flavor.Name).
 					Resource(corev1.ResourceCPU, "1").
 					Resource(corev1.ResourceMemory, "2G").
 					Obj(),
@@ -165,7 +166,7 @@ var _ = ginkgo.Describe("MultiKueue", func() {
 			Obj()
 		util.MustCreate(ctx, k8sWorker2Client, worker2Cq)
 
-		worker2Lq = utiltesting.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
+		worker2Lq = utiltestingapi.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
 		util.MustCreate(ctx, k8sWorker2Client, worker2Lq)
 	})
 
@@ -983,9 +984,9 @@ var _ = ginkgo.Describe("MultiKueue", func() {
 
 	ginkgo.When("The connection to a worker cluster is unreliable", func() {
 		ginkgo.It("Should update the cluster status to reflect the connection state", func() {
-			worker1Cq2 := utiltesting.MakeClusterQueue("q2").
+			worker1Cq2 := utiltestingapi.MakeClusterQueue("q2").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas(worker1Flavor.Name).
+					*utiltestingapi.MakeFlavorQuotas(worker1Flavor.Name).
 						Resource(corev1.ResourceCPU, "2").
 						Resource(corev1.ResourceMemory, "1G").
 						Obj(),
diff --git a/test/e2e/singlecluster/appwrapper_test.go b/test/e2e/singlecluster/appwrapper_test.go
index d41a72096..01c8ad821 100644
--- a/test/e2e/singlecluster/appwrapper_test.go
+++ b/test/e2e/singlecluster/appwrapper_test.go
@@ -28,6 +28,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/appwrapper"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	awtesting "sigs.k8s.io/kueue/pkg/util/testingjobs/appwrapper"
 	testingdeploy "sigs.k8s.io/kueue/pkg/util/testingjobs/deployment"
 	utiltestingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
@@ -51,14 +52,14 @@ var _ = ginkgo.Describe("AppWrapper", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "appwrapper-e2e-")
 
-		rf = testing.MakeResourceFlavor(resourceFlavorName).
+		rf = utiltestingapi.MakeResourceFlavor(resourceFlavorName).
 			NodeLabel("instance-type", "on-demand").
 			Obj()
 		util.MustCreate(ctx, k8sClient, rf)
 
-		cq = testing.MakeClusterQueue(clusterQueueName).
+		cq = utiltestingapi.MakeClusterQueue(clusterQueueName).
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(resourceFlavorName).
+				*utiltestingapi.MakeFlavorQuotas(resourceFlavorName).
 					Resource(corev1.ResourceCPU, "5").
 					Obj(),
 			).
@@ -68,7 +69,7 @@ var _ = ginkgo.Describe("AppWrapper", func() {
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 	ginkgo.AfterEach(func() {
diff --git a/test/e2e/singlecluster/deployment_test.go b/test/e2e/singlecluster/deployment_test.go
index bf055f874..5afebdee9 100644
--- a/test/e2e/singlecluster/deployment_test.go
+++ b/test/e2e/singlecluster/deployment_test.go
@@ -28,6 +28,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/constants"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/pod"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	deploymenttesting "sigs.k8s.io/kueue/pkg/util/testingjobs/deployment"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -49,14 +50,14 @@ var _ = ginkgo.Describe("Deployment", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "deployment-e2e-")
 
-		rf = testing.MakeResourceFlavor(resourceFlavorName).
+		rf = utiltestingapi.MakeResourceFlavor(resourceFlavorName).
 			NodeLabel("instance-type", "on-demand").
 			Obj()
 		util.MustCreate(ctx, k8sClient, rf)
 
-		cq = testing.MakeClusterQueue(clusterQueueName).
+		cq = utiltestingapi.MakeClusterQueue(clusterQueueName).
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(resourceFlavorName).
+				*utiltestingapi.MakeFlavorQuotas(resourceFlavorName).
 					Resource(corev1.ResourceCPU, "5").
 					Obj(),
 			).
@@ -66,7 +67,7 @@ var _ = ginkgo.Describe("Deployment", func() {
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 	ginkgo.AfterEach(func() {
diff --git a/test/e2e/singlecluster/e2e_test.go b/test/e2e/singlecluster/e2e_test.go
index fd144ae12..736e6bd4e 100644
--- a/test/e2e/singlecluster/e2e_test.go
+++ b/test/e2e/singlecluster/e2e_test.go
@@ -34,6 +34,7 @@ import (
 	workloadjob "sigs.k8s.io/kueue/pkg/controller/jobs/job"
 	"sigs.k8s.io/kueue/pkg/util/slices"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/util"
@@ -85,19 +86,19 @@ var _ = ginkgo.Describe("Kueue", func() {
 			clusterQueue *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			onDemandRF = testing.MakeResourceFlavor("on-demand").
+			onDemandRF = utiltestingapi.MakeResourceFlavor("on-demand").
 				NodeLabel("instance-type", "on-demand").Obj()
 			util.MustCreate(ctx, k8sClient, onDemandRF)
-			spotRF = testing.MakeResourceFlavor("spot").
+			spotRF = utiltestingapi.MakeResourceFlavor("spot").
 				NodeLabel("instance-type", "spot").Obj()
 			util.MustCreate(ctx, k8sClient, spotRF)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").
+					*utiltestingapi.MakeFlavorQuotas("on-demand").
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
-					*testing.MakeFlavorQuotas("spot").
+					*utiltestingapi.MakeFlavorQuotas("spot").
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
@@ -107,7 +108,7 @@ var _ = ginkgo.Describe("Kueue", func() {
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -228,11 +229,11 @@ var _ = ginkgo.Describe("Kueue", func() {
 					Obj()
 				testingjob.SetContainerDefaults(&sampleJob.Spec.Template.Spec.Containers[0])
 
-				wl = testing.MakeWorkload("prebuilt-wl", ns.Name).
+				wl = utiltestingapi.MakeWorkload("prebuilt-wl", ns.Name).
 					Finalizers(kueue.ResourceInUseFinalizerName).
 					Queue(kueue.LocalQueueName(localQueue.Name)).
 					PodSets(
-						*testing.MakePodSet(kueue.DefaultPodSetName, 1).Containers(sampleJob.Spec.Template.Spec.Containers[0]).Obj(),
+						*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).Containers(sampleJob.Spec.Template.Spec.Containers[0]).Obj(),
 					).
 					Obj()
 				util.MustCreate(ctx, k8sClient, wl)
@@ -319,7 +320,7 @@ var _ = ginkgo.Describe("Kueue", func() {
 		ginkgo.It("Should readmit preempted job with workloadPriorityClass into a separate flavor", func() {
 			util.MustCreate(ctx, k8sClient, sampleJob)
 
-			highWorkloadPriorityClass := testing.MakeWorkloadPriorityClass("high-workload").PriorityValue(300).Obj()
+			highWorkloadPriorityClass := utiltestingapi.MakeWorkloadPriorityClass("high-workload").PriorityValue(300).Obj()
 			util.MustCreate(ctx, k8sClient, highWorkloadPriorityClass)
 			ginkgo.DeferCleanup(func() {
 				gomega.Expect(k8sClient.Delete(ctx, highWorkloadPriorityClass)).To(gomega.Succeed())
@@ -391,21 +392,21 @@ var _ = ginkgo.Describe("Kueue", func() {
 
 		ginkgo.It("Should allow updating the workload's priority through the job", func() {
 			lowPriority := "low-priority"
-			lowPriorityClass := testing.MakeWorkloadPriorityClass(lowPriority).PriorityValue(100).Obj()
+			lowPriorityClass := utiltestingapi.MakeWorkloadPriorityClass(lowPriority).PriorityValue(100).Obj()
 			util.MustCreate(ctx, k8sClient, lowPriorityClass)
 			ginkgo.DeferCleanup(func() {
 				gomega.Expect(k8sClient.Delete(ctx, lowPriorityClass)).To(gomega.Succeed())
 			})
 
 			midPriority := "mid-priority"
-			midPriorityClass := testing.MakeWorkloadPriorityClass(midPriority).PriorityValue(200).Obj()
+			midPriorityClass := utiltestingapi.MakeWorkloadPriorityClass(midPriority).PriorityValue(200).Obj()
 			util.MustCreate(ctx, k8sClient, midPriorityClass)
 			ginkgo.DeferCleanup(func() {
 				gomega.Expect(k8sClient.Delete(ctx, midPriorityClass)).To(gomega.Succeed())
 			})
 
 			highPriority := "high-priority"
-			highPriorityClass := testing.MakeWorkloadPriorityClass(highPriority).PriorityValue(300).Obj()
+			highPriorityClass := utiltestingapi.MakeWorkloadPriorityClass(highPriority).PriorityValue(300).Obj()
 			util.MustCreate(ctx, k8sClient, highPriorityClass)
 			ginkgo.DeferCleanup(func() {
 				gomega.Expect(k8sClient.Delete(ctx, highPriorityClass)).To(gomega.Succeed())
@@ -496,7 +497,7 @@ var _ = ginkgo.Describe("Kueue", func() {
 
 		ginkgo.It("Should not allow removing the workload's priority through the job", func() {
 			samplePriority := "sample-priority"
-			samplePriorityClass := testing.MakeWorkloadPriorityClass(samplePriority).PriorityValue(100).Obj()
+			samplePriorityClass := utiltestingapi.MakeWorkloadPriorityClass(samplePriority).PriorityValue(100).Obj()
 			util.MustCreate(ctx, k8sClient, samplePriorityClass)
 			ginkgo.DeferCleanup(func() {
 				gomega.Expect(k8sClient.Delete(ctx, samplePriorityClass)).To(gomega.Succeed())
@@ -550,15 +551,15 @@ var _ = ginkgo.Describe("Kueue", func() {
 			check        *kueue.AdmissionCheck
 		)
 		ginkgo.BeforeEach(func() {
-			check = testing.MakeAdmissionCheck("check1").ControllerName("ac-controller").Obj()
+			check = utiltestingapi.MakeAdmissionCheck("check1").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, check)
 			util.SetAdmissionCheckActive(ctx, k8sClient, check, metav1.ConditionTrue)
-			onDemandRF = testing.MakeResourceFlavor("on-demand").
+			onDemandRF = utiltestingapi.MakeResourceFlavor("on-demand").
 				NodeLabel("instance-type", "on-demand").Obj()
 			util.MustCreate(ctx, k8sClient, onDemandRF)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").
+					*utiltestingapi.MakeFlavorQuotas("on-demand").
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
@@ -566,7 +567,7 @@ var _ = ginkgo.Describe("Kueue", func() {
 				AdmissionChecks("check1").
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
diff --git a/test/e2e/singlecluster/fair_sharing_test.go b/test/e2e/singlecluster/fair_sharing_test.go
index 5f215c7cc..113800999 100644
--- a/test/e2e/singlecluster/fair_sharing_test.go
+++ b/test/e2e/singlecluster/fair_sharing_test.go
@@ -24,8 +24,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	jobtesting "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -33,51 +33,51 @@ import (
 var _ = ginkgo.Describe("Fair Sharing", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
 	var (
 		ns  *corev1.Namespace
-		rf  *v1beta1.ResourceFlavor
-		cq1 *v1beta1.ClusterQueue
-		cq2 *v1beta1.ClusterQueue
-		cq3 *v1beta1.ClusterQueue
-		lq1 *v1beta1.LocalQueue
-		lq2 *v1beta1.LocalQueue
-		lq3 *v1beta1.LocalQueue
+		rf  *kueue.ResourceFlavor
+		cq1 *kueue.ClusterQueue
+		cq2 *kueue.ClusterQueue
+		cq3 *kueue.ClusterQueue
+		lq1 *kueue.LocalQueue
+		lq2 *kueue.LocalQueue
+		lq3 *kueue.LocalQueue
 	)
 
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "ns-")
 
-		rf = utiltesting.MakeResourceFlavor("rf").Obj()
+		rf = utiltestingapi.MakeResourceFlavor("rf").Obj()
 		util.MustCreate(ctx, k8sClient, rf)
 
-		cq1 = utiltesting.MakeClusterQueue("cq1").
+		cq1 = utiltestingapi.MakeClusterQueue("cq1").
 			Cohort("cohort").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas(rf.Name).
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).
 				Resource(corev1.ResourceCPU, "9").
 				Resource(corev1.ResourceMemory, "36G").
 				Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq1)
-		cq2 = utiltesting.MakeClusterQueue("cq2").
+		cq2 = utiltestingapi.MakeClusterQueue("cq2").
 			Cohort("cohort").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas(rf.Name).
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).
 				Resource(corev1.ResourceCPU, "9").
 				Resource(corev1.ResourceMemory, "36G").
 				Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq2)
-		cq3 = utiltesting.MakeClusterQueue("cq3").
+		cq3 = utiltestingapi.MakeClusterQueue("cq3").
 			Cohort("cohort").
-			ResourceGroup(*utiltesting.MakeFlavorQuotas(rf.Name).
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).
 				Resource(corev1.ResourceCPU, "9").
 				Resource(corev1.ResourceMemory, "36G").
 				Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq3)
 
-		lq1 = utiltesting.MakeLocalQueue("lq1", ns.Name).ClusterQueue(cq1.Name).Obj()
+		lq1 = utiltestingapi.MakeLocalQueue("lq1", ns.Name).ClusterQueue(cq1.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq1)
-		lq2 = utiltesting.MakeLocalQueue("lq2", ns.Name).ClusterQueue(cq2.Name).Obj()
+		lq2 = utiltestingapi.MakeLocalQueue("lq2", ns.Name).ClusterQueue(cq2.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq2)
-		lq3 = utiltesting.MakeLocalQueue("lq3", ns.Name).ClusterQueue(cq3.Name).Obj()
+		lq3 = utiltestingapi.MakeLocalQueue("lq3", ns.Name).ClusterQueue(cq3.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq3)
 	})
 
@@ -95,7 +95,7 @@ var _ = ginkgo.Describe("Fair Sharing", ginkgo.Ordered, ginkgo.ContinueOnFailure
 			ginkgo.By("create jobs")
 			for i := range 4 {
 				job := jobtesting.MakeJob(fmt.Sprintf("j%d", i+1), ns.Name).
-					Queue(v1beta1.LocalQueueName(lq1.Name)).
+					Queue(kueue.LocalQueueName(lq1.Name)).
 					Image(util.GetAgnHostImage(), util.BehaviorWaitForDeletion).
 					Parallelism(3).
 					Completions(3).
diff --git a/test/e2e/singlecluster/jaxjob_test.go b/test/e2e/singlecluster/jaxjob_test.go
index cd369df6a..ea6653403 100644
--- a/test/e2e/singlecluster/jaxjob_test.go
+++ b/test/e2e/singlecluster/jaxjob_test.go
@@ -27,7 +27,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/jaxjob"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	jaxjobtesting "sigs.k8s.io/kueue/pkg/util/testingjobs/jaxjob"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -49,12 +49,12 @@ var _ = ginkgo.Describe("JAX integration", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "jax-e2e-")
 
-		rf = testing.MakeResourceFlavor(resourceFlavorName).Obj()
+		rf = utiltestingapi.MakeResourceFlavor(resourceFlavorName).Obj()
 		util.MustCreate(ctx, k8sClient, rf)
 
-		cq = testing.MakeClusterQueue(clusterQueueName).
+		cq = utiltestingapi.MakeClusterQueue(clusterQueueName).
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(resourceFlavorName).
+				*utiltestingapi.MakeFlavorQuotas(resourceFlavorName).
 					Resource(corev1.ResourceCPU, "5").
 					Resource(corev1.ResourceMemory, "10Gi").
 					Obj(),
@@ -65,7 +65,7 @@ var _ = ginkgo.Describe("JAX integration", func() {
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 	ginkgo.AfterEach(func() {
diff --git a/test/e2e/singlecluster/jobset_test.go b/test/e2e/singlecluster/jobset_test.go
index bb961eaec..3a79aafe5 100644
--- a/test/e2e/singlecluster/jobset_test.go
+++ b/test/e2e/singlecluster/jobset_test.go
@@ -27,6 +27,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	workloadjobset "sigs.k8s.io/kueue/pkg/controller/jobs/jobset"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjobset "sigs.k8s.io/kueue/pkg/util/testingjobs/jobset"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -48,15 +49,15 @@ var _ = ginkgo.Describe("JobSet", func() {
 			clusterQueue *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			defaultRf = testing.MakeResourceFlavor("default").Obj()
+			defaultRf = utiltestingapi.MakeResourceFlavor("default").Obj()
 			util.MustCreate(ctx, k8sClient, defaultRf)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(defaultRf.Name).
+					*utiltestingapi.MakeFlavorQuotas(defaultRf.Name).
 						Resource(corev1.ResourceCPU, "2").
 						Resource(corev1.ResourceMemory, "2G").Obj()).Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -110,19 +111,19 @@ var _ = ginkgo.Describe("JobSet", func() {
 			clusterQueue *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			onDemandRF = testing.MakeResourceFlavor("on-demand").
+			onDemandRF = utiltestingapi.MakeResourceFlavor("on-demand").
 				NodeLabel("instance-type", "on-demand").Obj()
 			util.MustCreate(ctx, k8sClient, onDemandRF)
-			spotRF = testing.MakeResourceFlavor("spot").
+			spotRF = utiltestingapi.MakeResourceFlavor("spot").
 				NodeLabel("instance-type", "spot").Obj()
 			util.MustCreate(ctx, k8sClient, spotRF)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").
+					*utiltestingapi.MakeFlavorQuotas("on-demand").
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
-					*testing.MakeFlavorQuotas("spot").
+					*utiltestingapi.MakeFlavorQuotas("spot").
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
@@ -132,7 +133,7 @@ var _ = ginkgo.Describe("JobSet", func() {
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
diff --git a/test/e2e/singlecluster/kuberay_test.go b/test/e2e/singlecluster/kuberay_test.go
index 4573917bb..5ede4c326 100644
--- a/test/e2e/singlecluster/kuberay_test.go
+++ b/test/e2e/singlecluster/kuberay_test.go
@@ -28,7 +28,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	workloadraycluster "sigs.k8s.io/kueue/pkg/controller/jobs/raycluster"
 	workloadrayjob "sigs.k8s.io/kueue/pkg/controller/jobs/rayjob"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingraycluster "sigs.k8s.io/kueue/pkg/util/testingjobs/raycluster"
 	testingrayjob "sigs.k8s.io/kueue/pkg/util/testingjobs/rayjob"
 	"sigs.k8s.io/kueue/test/util"
@@ -50,19 +50,19 @@ var _ = ginkgo.Describe("Kuberay", func() {
 
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "kuberay-e2e-")
-		rf = testing.MakeResourceFlavor(resourceFlavorName).
+		rf = utiltestingapi.MakeResourceFlavor(resourceFlavorName).
 			NodeLabel("instance-type", "on-demand").
 			Obj()
 		gomega.Expect(k8sClient.Create(ctx, rf)).To(gomega.Succeed())
 
-		cq = testing.MakeClusterQueue(clusterQueueName).
+		cq = utiltestingapi.MakeClusterQueue(clusterQueueName).
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(rf.Name).
+				*utiltestingapi.MakeFlavorQuotas(rf.Name).
 					Resource(corev1.ResourceCPU, "1").Obj()).
 			Obj()
 		gomega.Expect(k8sClient.Create(ctx, cq)).To(gomega.Succeed())
 
-		lq = testing.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
 		gomega.Expect(k8sClient.Create(ctx, lq)).To(gomega.Succeed())
 	})
 	ginkgo.AfterEach(func() {
diff --git a/test/e2e/singlecluster/kueuectl_test.go b/test/e2e/singlecluster/kueuectl_test.go
index 80b5d6896..376b15b72 100644
--- a/test/e2e/singlecluster/kueuectl_test.go
+++ b/test/e2e/singlecluster/kueuectl_test.go
@@ -24,21 +24,21 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
 var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
 	var (
 		ns *corev1.Namespace
-		cq *v1beta1.ClusterQueue
+		cq *kueue.ClusterQueue
 	)
 
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-")
 
-		cq = testing.MakeClusterQueue("e2e-cq").Obj()
+		cq = utiltestingapi.MakeClusterQueue("e2e-cq").Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 	})
 
@@ -59,11 +59,11 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the local queue successfully created", func() {
-				var createdQueue v1beta1.LocalQueue
+				var createdQueue kueue.LocalQueue
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: lqName, Namespace: ns.Name}, &createdQueue)).To(gomega.Succeed())
 					g.Expect(createdQueue.Name).Should(gomega.Equal(lqName))
-					g.Expect(createdQueue.Spec.ClusterQueue).Should(gomega.Equal(v1beta1.ClusterQueueReference(cq.Name)))
+					g.Expect(createdQueue.Spec.ClusterQueue).Should(gomega.Equal(kueue.ClusterQueueReference(cq.Name)))
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
 			})
 		})
@@ -79,7 +79,7 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the local queue did not create", func() {
-				var createdQueue v1beta1.LocalQueue
+				var createdQueue kueue.LocalQueue
 				gomega.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: lqName, Namespace: ns.Name}, &createdQueue)).ToNot(gomega.Succeed())
 			})
 		})
diff --git a/test/e2e/singlecluster/leaderworkerset_test.go b/test/e2e/singlecluster/leaderworkerset_test.go
index fa57ad268..aa2c45aef 100644
--- a/test/e2e/singlecluster/leaderworkerset_test.go
+++ b/test/e2e/singlecluster/leaderworkerset_test.go
@@ -33,6 +33,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobs/leaderworkerset"
 	podconstants "sigs.k8s.io/kueue/pkg/controller/jobs/pod/constants"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	leaderworkersettesting "sigs.k8s.io/kueue/pkg/util/testingjobs/leaderworkerset"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -54,12 +55,12 @@ var _ = ginkgo.Describe("LeaderWorkerSet integration", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "lws-e2e-")
 
-		rf = testing.MakeResourceFlavor(resourceFlavorName).NodeLabel("instance-type", "on-demand").Obj()
+		rf = utiltestingapi.MakeResourceFlavor(resourceFlavorName).NodeLabel("instance-type", "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, rf)
 
-		cq = testing.MakeClusterQueue(clusterQueueName).
+		cq = utiltestingapi.MakeClusterQueue(clusterQueueName).
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(resourceFlavorName).
+				*utiltestingapi.MakeFlavorQuotas(resourceFlavorName).
 					Resource(corev1.ResourceCPU, "5").
 					Obj(),
 			).
@@ -69,7 +70,7 @@ var _ = ginkgo.Describe("LeaderWorkerSet integration", func() {
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 	ginkgo.AfterEach(func() {
@@ -692,12 +693,12 @@ var _ = ginkgo.Describe("LeaderWorkerSet integration", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			highPriorityWPC = testing.MakeWorkloadPriorityClass("high-priority").
+			highPriorityWPC = utiltestingapi.MakeWorkloadPriorityClass("high-priority").
 				PriorityValue(5000).
 				Obj()
 			util.MustCreate(ctx, k8sClient, highPriorityWPC)
 
-			lowPriorityWPC = testing.MakeWorkloadPriorityClass("low-priority").
+			lowPriorityWPC = utiltestingapi.MakeWorkloadPriorityClass("low-priority").
 				PriorityValue(1000).
 				Obj()
 			util.MustCreate(ctx, k8sClient, lowPriorityWPC)
diff --git a/test/e2e/singlecluster/metrics_test.go b/test/e2e/singlecluster/metrics_test.go
index 1ad48a45b..a6c26f609 100644
--- a/test/e2e/singlecluster/metrics_test.go
+++ b/test/e2e/singlecluster/metrics_test.go
@@ -28,9 +28,10 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/job"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingjobspod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 	"sigs.k8s.io/kueue/pkg/workload"
@@ -45,7 +46,7 @@ const (
 var _ = ginkgo.Describe("Metrics", func() {
 	var (
 		ns             *corev1.Namespace
-		resourceFlavor *v1beta1.ResourceFlavor
+		resourceFlavor *kueue.ResourceFlavor
 
 		metricsReaderClusterRoleBinding *rbacv1.ClusterRoleBinding
 
@@ -56,7 +57,7 @@ var _ = ginkgo.Describe("Metrics", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-metrics-")
 
-		resourceFlavor = utiltesting.MakeResourceFlavor("test-flavor").Obj()
+		resourceFlavor = utiltestingapi.MakeResourceFlavor("test-flavor").Obj()
 		util.MustCreate(ctx, k8sClient, resourceFlavor)
 
 		metricsReaderClusterRoleBinding = &rbacv1.ClusterRoleBinding{
@@ -100,16 +101,16 @@ var _ = ginkgo.Describe("Metrics", func() {
 
 	ginkgo.When("workload is admitted", func() {
 		var (
-			clusterQueue *v1beta1.ClusterQueue
-			localQueue   *v1beta1.LocalQueue
-			workload     *v1beta1.Workload
+			clusterQueue *kueue.ClusterQueue
+			localQueue   *kueue.LocalQueue
+			workload     *kueue.Workload
 		)
 
 		ginkgo.BeforeEach(func() {
-			clusterQueue = utiltesting.MakeClusterQueue("").
+			clusterQueue = utiltestingapi.MakeClusterQueue("").
 				GeneratedName("test-cq-").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas(resourceFlavor.Name).
+					*utiltestingapi.MakeFlavorQuotas(resourceFlavor.Name).
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
@@ -117,16 +118,16 @@ var _ = ginkgo.Describe("Metrics", func() {
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 
-			localQueue = utiltesting.MakeLocalQueue("", ns.Name).
+			localQueue = utiltestingapi.MakeLocalQueue("", ns.Name).
 				GeneratedName("test-lq-").
 				ClusterQueue(clusterQueue.Name).
 				Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 
-			workload = utiltesting.MakeWorkload("test-workload", ns.Name).
-				Queue(v1beta1.LocalQueueName(localQueue.Name)).
+			workload = utiltestingapi.MakeWorkload("test-workload", ns.Name).
+				Queue(kueue.LocalQueueName(localQueue.Name)).
 				PodSets(
-					*utiltesting.MakePodSet("ps1", 1).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 1).Obj(),
 				).
 				RequestAndLimit(corev1.ResourceCPU, "1").
 				Obj()
@@ -226,40 +227,40 @@ var _ = ginkgo.Describe("Metrics", func() {
 
 	ginkgo.When("workload is admitted with admission checks", func() {
 		var (
-			admissionCheck  *v1beta1.AdmissionCheck
-			clusterQueue    *v1beta1.ClusterQueue
-			localQueue      *v1beta1.LocalQueue
+			admissionCheck  *kueue.AdmissionCheck
+			clusterQueue    *kueue.ClusterQueue
+			localQueue      *kueue.LocalQueue
 			createdJob      *batchv1.Job
 			workloadKey     types.NamespacedName
-			createdWorkload *v1beta1.Workload
+			createdWorkload *kueue.Workload
 		)
 
 		ginkgo.BeforeEach(func() {
-			admissionCheck = utiltesting.MakeAdmissionCheck("check1").ControllerName("ac-controller").Obj()
+			admissionCheck = utiltestingapi.MakeAdmissionCheck("check1").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, admissionCheck)
 
 			util.SetAdmissionCheckActive(ctx, k8sClient, admissionCheck, metav1.ConditionTrue)
 
-			clusterQueue = utiltesting.MakeClusterQueue("").
+			clusterQueue = utiltestingapi.MakeClusterQueue("").
 				GeneratedName("test-admission-check-cq-").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas(resourceFlavor.Name).
+					*utiltestingapi.MakeFlavorQuotas(resourceFlavor.Name).
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
 				).
-				AdmissionChecks(v1beta1.AdmissionCheckReference(admissionCheck.Name)).
+				AdmissionChecks(kueue.AdmissionCheckReference(admissionCheck.Name)).
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 
-			localQueue = utiltesting.MakeLocalQueue("", ns.Name).
+			localQueue = utiltestingapi.MakeLocalQueue("", ns.Name).
 				GeneratedName("test-admission-checked-lq-").
 				ClusterQueue(clusterQueue.Name).
 				Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 
 			createdJob = testingjob.MakeJob("admission-checked-job", ns.Name).
-				Queue(v1beta1.LocalQueueName(localQueue.Name)).
+				Queue(kueue.LocalQueueName(localQueue.Name)).
 				RequestAndLimit(corev1.ResourceCPU, "1").
 				Obj()
 			util.MustCreate(ctx, k8sClient, createdJob)
@@ -270,11 +271,11 @@ var _ = ginkgo.Describe("Metrics", func() {
 				Namespace: ns.Name,
 			}
 
-			createdWorkload = &v1beta1.Workload{}
+			createdWorkload = &kueue.Workload{}
 
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, workloadKey, createdWorkload)).Should(gomega.Succeed())
-				g.Expect(createdWorkload.Status.Conditions).Should(utiltesting.HaveConditionStatusTrue(v1beta1.WorkloadQuotaReserved))
+				g.Expect(createdWorkload.Status.Conditions).Should(utiltesting.HaveConditionStatusTrue(kueue.WorkloadQuotaReserved))
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 
@@ -291,9 +292,9 @@ var _ = ginkgo.Describe("Metrics", func() {
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, workloadKey, createdWorkload)).Should(gomega.Succeed())
 					patch := util.BaseSSAWorkload(createdWorkload)
-					workload.SetAdmissionCheckState(&patch.Status.AdmissionChecks, v1beta1.AdmissionCheckState{
-						Name:  v1beta1.AdmissionCheckReference(admissionCheck.Name),
-						State: v1beta1.CheckStateReady,
+					workload.SetAdmissionCheckState(&patch.Status.AdmissionChecks, kueue.AdmissionCheckState{
+						Name:  kueue.AdmissionCheckReference(admissionCheck.Name),
+						State: kueue.CheckStateReady,
 					}, realClock)
 					g.Expect(k8sClient.Status().
 						Patch(ctx, patch, client.Apply, client.FieldOwner("test-admission-check-controller"), client.ForceOwnership)).
@@ -325,74 +326,74 @@ var _ = ginkgo.Describe("Metrics", func() {
 
 	ginkgo.When("workload is admitted with eviction and preemption", func() {
 		var (
-			clusterQueue1 *v1beta1.ClusterQueue
-			clusterQueue2 *v1beta1.ClusterQueue
+			clusterQueue1 *kueue.ClusterQueue
+			clusterQueue2 *kueue.ClusterQueue
 
-			localQueue1 *v1beta1.LocalQueue
-			localQueue2 *v1beta1.LocalQueue
+			localQueue1 *kueue.LocalQueue
+			localQueue2 *kueue.LocalQueue
 
 			highPriorityClass *schedulingv1.PriorityClass
 
 			lowerJob1         *batchv1.Job
 			lowerWorkload1Key types.NamespacedName
-			lowerWorkload1    *v1beta1.Workload
+			lowerWorkload1    *kueue.Workload
 
 			lowerJob2         *batchv1.Job
 			lowerWorkload2Key types.NamespacedName
-			lowerWorkload2    *v1beta1.Workload
+			lowerWorkload2    *kueue.Workload
 
 			blockerJob         *batchv1.Job
 			blockerWorkloadKey types.NamespacedName
-			blockerWorkload    *v1beta1.Workload
+			blockerWorkload    *kueue.Workload
 
 			higherJob1 *batchv1.Job
 			higherJob2 *batchv1.Job
 		)
 
 		ginkgo.BeforeEach(func() {
-			clusterQueue1 = utiltesting.MakeClusterQueue("").
+			clusterQueue1 = utiltestingapi.MakeClusterQueue("").
 				GeneratedName("test-cq-1-").
 				Cohort("test-cohort").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas(resourceFlavor.Name).
+					*utiltestingapi.MakeFlavorQuotas(resourceFlavor.Name).
 						Resource(corev1.ResourceCPU, "2").
 						Obj(),
 				).
-				Preemption(v1beta1.ClusterQueuePreemption{
-					ReclaimWithinCohort: v1beta1.PreemptionPolicyLowerPriority,
-					WithinClusterQueue:  v1beta1.PreemptionPolicyLowerPriority,
-					BorrowWithinCohort: &v1beta1.BorrowWithinCohort{
-						Policy: v1beta1.BorrowWithinCohortPolicyLowerPriority,
+				Preemption(kueue.ClusterQueuePreemption{
+					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
+					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
+					BorrowWithinCohort: &kueue.BorrowWithinCohort{
+						Policy: kueue.BorrowWithinCohortPolicyLowerPriority,
 					},
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue1)
 
-			clusterQueue2 = utiltesting.MakeClusterQueue("").
+			clusterQueue2 = utiltestingapi.MakeClusterQueue("").
 				GeneratedName("test-cq-2-").
 				Cohort("test-cohort").
 				ResourceGroup(
-					*utiltesting.MakeFlavorQuotas(resourceFlavor.Name).
+					*utiltestingapi.MakeFlavorQuotas(resourceFlavor.Name).
 						Resource(corev1.ResourceCPU, "3").
 						Obj(),
 				).
-				Preemption(v1beta1.ClusterQueuePreemption{
-					ReclaimWithinCohort: v1beta1.PreemptionPolicyLowerPriority,
-					WithinClusterQueue:  v1beta1.PreemptionPolicyLowerPriority,
-					BorrowWithinCohort: &v1beta1.BorrowWithinCohort{
-						Policy: v1beta1.BorrowWithinCohortPolicyLowerPriority,
+				Preemption(kueue.ClusterQueuePreemption{
+					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
+					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
+					BorrowWithinCohort: &kueue.BorrowWithinCohort{
+						Policy: kueue.BorrowWithinCohortPolicyLowerPriority,
 					},
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue2)
 
-			localQueue1 = utiltesting.MakeLocalQueue("", ns.Name).
+			localQueue1 = utiltestingapi.MakeLocalQueue("", ns.Name).
 				GeneratedName("test-lq-1-").
 				ClusterQueue(clusterQueue1.Name).
 				Obj()
 			util.MustCreate(ctx, k8sClient, localQueue1)
 
-			localQueue2 = utiltesting.MakeLocalQueue("", ns.Name).
+			localQueue2 = utiltestingapi.MakeLocalQueue("", ns.Name).
 				GeneratedName("test-lq-2-").
 				ClusterQueue(clusterQueue2.Name).
 				Obj()
@@ -402,7 +403,7 @@ var _ = ginkgo.Describe("Metrics", func() {
 			util.MustCreate(ctx, k8sClient, highPriorityClass)
 
 			lowerJob1 = testingjob.MakeJob("lower-job-1", ns.Name).
-				Queue(v1beta1.LocalQueueName(localQueue1.Name)).
+				Queue(kueue.LocalQueueName(localQueue1.Name)).
 				RequestAndLimit(corev1.ResourceCPU, "1").
 				Obj()
 			util.MustCreate(ctx, k8sClient, lowerJob1)
@@ -412,7 +413,7 @@ var _ = ginkgo.Describe("Metrics", func() {
 				Name:      lowerWLName1,
 				Namespace: ns.Name,
 			}
-			lowerWorkload1 = &v1beta1.Workload{}
+			lowerWorkload1 = &kueue.Workload{}
 
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, lowerWorkload1Key, lowerWorkload1)).To(gomega.Succeed())
@@ -421,7 +422,7 @@ var _ = ginkgo.Describe("Metrics", func() {
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, lowerWorkload1)
 
 			lowerJob2 = testingjob.MakeJob("lower-job-2", ns.Name).
-				Queue(v1beta1.LocalQueueName(localQueue2.Name)).
+				Queue(kueue.LocalQueueName(localQueue2.Name)).
 				RequestAndLimit(corev1.ResourceCPU, "1").
 				Obj()
 			util.MustCreate(ctx, k8sClient, lowerJob2)
@@ -431,7 +432,7 @@ var _ = ginkgo.Describe("Metrics", func() {
 				Name:      lowerWLName2,
 				Namespace: ns.Name,
 			}
-			lowerWorkload2 = &v1beta1.Workload{}
+			lowerWorkload2 = &kueue.Workload{}
 
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, lowerWorkload2Key, lowerWorkload2)).To(gomega.Succeed())
@@ -440,7 +441,7 @@ var _ = ginkgo.Describe("Metrics", func() {
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, lowerWorkload2)
 
 			blockerJob = testingjob.MakeJob("blocker", ns.Name).
-				Queue(v1beta1.LocalQueueName(localQueue2.Name)).
+				Queue(kueue.LocalQueueName(localQueue2.Name)).
 				PriorityClass(highPriorityClass.Name).
 				RequestAndLimit(corev1.ResourceCPU, "3").
 				Obj()
@@ -451,7 +452,7 @@ var _ = ginkgo.Describe("Metrics", func() {
 				Name:      blockerWLName,
 				Namespace: ns.Name,
 			}
-			blockerWorkload = &v1beta1.Workload{}
+			blockerWorkload = &kueue.Workload{}
 
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, blockerWorkloadKey, blockerWorkload)).To(gomega.Succeed())
@@ -460,14 +461,14 @@ var _ = ginkgo.Describe("Metrics", func() {
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, blockerWorkload)
 
 			higherJob1 = testingjob.MakeJob("high-large-1", ns.Name).
-				Queue(v1beta1.LocalQueueName(localQueue1.Name)).
+				Queue(kueue.LocalQueueName(localQueue1.Name)).
 				PriorityClass(highPriorityClass.Name).
 				RequestAndLimit(corev1.ResourceCPU, "4").
 				Obj()
 			util.MustCreate(ctx, k8sClient, higherJob1)
 
 			higherJob2 = testingjob.MakeJob("high-large-2", ns.Name).
-				Queue(v1beta1.LocalQueueName(localQueue2.Name)).
+				Queue(kueue.LocalQueueName(localQueue2.Name)).
 				PriorityClass(highPriorityClass.Name).
 				RequestAndLimit(corev1.ResourceCPU, "4").
 				Obj()
@@ -501,16 +502,16 @@ var _ = ginkgo.Describe("Metrics", func() {
 
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, blockerWorkloadKey, blockerWorkload)).To(gomega.Succeed())
-				g.Expect(blockerWorkload.Status.Conditions).To(utiltesting.HaveConditionStatusTrueAndReason(v1beta1.WorkloadEvicted, v1beta1.WorkloadDeactivated))
+				g.Expect(blockerWorkload.Status.Conditions).To(utiltesting.HaveConditionStatusTrueAndReason(kueue.WorkloadEvicted, kueue.WorkloadDeactivated))
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			ginkgo.By("Expecting at least one of the high-priority jobs to be admitted", func() {
 				util.ExpectWorkloadsToBeAdmittedCount(ctx, k8sClient, 1,
-					utiltesting.MakeWorkload(
+					utiltestingapi.MakeWorkload(
 						job.GetWorkloadNameForJob(higherJob1.Name, higherJob1.UID),
 						higherJob1.Namespace,
 					).Obj(),
-					utiltesting.MakeWorkload(
+					utiltestingapi.MakeWorkload(
 						job.GetWorkloadNameForJob(higherJob2.Name, higherJob2.UID),
 						higherJob2.Namespace,
 					).Obj(),
diff --git a/test/e2e/singlecluster/pod_test.go b/test/e2e/singlecluster/pod_test.go
index 6dc957cf8..ef7e5d1d6 100644
--- a/test/e2e/singlecluster/pod_test.go
+++ b/test/e2e/singlecluster/pod_test.go
@@ -34,6 +34,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobs/pod"
 	podconstants "sigs.k8s.io/kueue/pkg/controller/jobs/pod/constants"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	podtesting "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -46,7 +47,7 @@ var _ = ginkgo.Describe("Pod groups", func() {
 
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "pod-e2e-")
-		onDemandRF = testing.MakeResourceFlavor("on-demand").NodeLabel("instance-type", "on-demand").Obj()
+		onDemandRF = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel("instance-type", "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandRF)
 	})
 	ginkgo.AfterEach(func() {
@@ -62,16 +63,16 @@ var _ = ginkgo.Describe("Pod groups", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			cq = testing.MakeClusterQueue("cq").
+			cq = utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 				).
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
-			lq = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			lq = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, lq)
 		})
 		ginkgo.AfterEach(func() {
diff --git a/test/e2e/singlecluster/pytorchjob_test.go b/test/e2e/singlecluster/pytorchjob_test.go
index c6222cc79..00dfb0253 100644
--- a/test/e2e/singlecluster/pytorchjob_test.go
+++ b/test/e2e/singlecluster/pytorchjob_test.go
@@ -27,7 +27,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/pytorchjob"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	pytorchjobtesting "sigs.k8s.io/kueue/pkg/util/testingjobs/pytorchjob"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -49,12 +49,12 @@ var _ = ginkgo.Describe("PyTorch integration", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "pytorch-e2e-")
 
-		rf = testing.MakeResourceFlavor(resourceFlavorName).Obj()
+		rf = utiltestingapi.MakeResourceFlavor(resourceFlavorName).Obj()
 		util.MustCreate(ctx, k8sClient, rf)
 
-		cq = testing.MakeClusterQueue(clusterQueueName).
+		cq = utiltestingapi.MakeClusterQueue(clusterQueueName).
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(resourceFlavorName).
+				*utiltestingapi.MakeFlavorQuotas(resourceFlavorName).
 					Resource(corev1.ResourceCPU, "5").
 					Resource(corev1.ResourceMemory, "10Gi").
 					Obj(),
@@ -65,7 +65,7 @@ var _ = ginkgo.Describe("PyTorch integration", func() {
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 	ginkgo.AfterEach(func() {
diff --git a/test/e2e/singlecluster/statefulset_test.go b/test/e2e/singlecluster/statefulset_test.go
index a8629a493..0df4ee3b1 100644
--- a/test/e2e/singlecluster/statefulset_test.go
+++ b/test/e2e/singlecluster/statefulset_test.go
@@ -32,6 +32,7 @@ import (
 	controllerconstants "sigs.k8s.io/kueue/pkg/controller/constants"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/statefulset"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	statefulsettesting "sigs.k8s.io/kueue/pkg/util/testingjobs/statefulset"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -53,14 +54,14 @@ var _ = ginkgo.Describe("StatefulSet integration", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "sts-e2e-")
 
-		rf = testing.MakeResourceFlavor(resourceFlavorName).
+		rf = utiltestingapi.MakeResourceFlavor(resourceFlavorName).
 			NodeLabel("instance-type", "on-demand").
 			Obj()
 		util.MustCreate(ctx, k8sClient, rf)
 
-		cq = testing.MakeClusterQueue(clusterQueueName).
+		cq = utiltestingapi.MakeClusterQueue(clusterQueueName).
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(resourceFlavorName).
+				*utiltestingapi.MakeFlavorQuotas(resourceFlavorName).
 					Resource(corev1.ResourceCPU, "5").
 					Obj(),
 			).
@@ -71,7 +72,7 @@ var _ = ginkgo.Describe("StatefulSet integration", func() {
 		util.MustCreate(ctx, k8sClient, cq)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 		util.ExpectLocalQueuesToBeActive(ctx, k8sClient, lq)
 	})
@@ -438,12 +439,12 @@ var _ = ginkgo.Describe("StatefulSet integration", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			highPriorityWPC = testing.MakeWorkloadPriorityClass("high-priority").
+			highPriorityWPC = utiltestingapi.MakeWorkloadPriorityClass("high-priority").
 				PriorityValue(5000).
 				Obj()
 			util.MustCreate(ctx, k8sClient, highPriorityWPC)
 
-			lowPriorityWPC = testing.MakeWorkloadPriorityClass("low-priority").
+			lowPriorityWPC = utiltestingapi.MakeWorkloadPriorityClass("low-priority").
 				PriorityValue(1000).
 				Obj()
 			util.MustCreate(ctx, k8sClient, lowPriorityWPC)
diff --git a/test/e2e/singlecluster/tas_test.go b/test/e2e/singlecluster/tas_test.go
index 93c12247c..c513c1f3c 100644
--- a/test/e2e/singlecluster/tas_test.go
+++ b/test/e2e/singlecluster/tas_test.go
@@ -32,6 +32,7 @@ import (
 	podcontroller "sigs.k8s.io/kueue/pkg/controller/jobs/pod"
 	podconstants "sigs.k8s.io/kueue/pkg/controller/jobs/pod/constants"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingjobset "sigs.k8s.io/kueue/pkg/util/testingjobs/jobset"
 	testingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
@@ -58,15 +59,15 @@ var _ = ginkgo.Describe("TopologyAwareScheduling", func() {
 			clusterQueue *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			topology = testing.MakeDefaultOneLevelTopology("hostname")
+			topology = utiltestingapi.MakeDefaultOneLevelTopology("hostname")
 			util.MustCreate(ctx, k8sClient, topology)
 
-			onDemandRF = testing.MakeResourceFlavor("on-demand").
+			onDemandRF = utiltestingapi.MakeResourceFlavor("on-demand").
 				NodeLabel("instance-type", "on-demand").TopologyName(topology.Name).Obj()
 			util.MustCreate(ctx, k8sClient, onDemandRF)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").
+					*utiltestingapi.MakeFlavorQuotas("on-demand").
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
@@ -75,7 +76,7 @@ var _ = ginkgo.Describe("TopologyAwareScheduling", func() {
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-			localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -150,18 +151,18 @@ var _ = ginkgo.Describe("TopologyAwareScheduling", func() {
 			localQueue   *kueue.LocalQueue
 		)
 		ginkgo.BeforeEach(func() {
-			topology = testing.MakeDefaultOneLevelTopology("hostname")
+			topology = utiltestingapi.MakeDefaultOneLevelTopology("hostname")
 			util.MustCreate(ctx, k8sClient, topology)
 
-			onDemandRF = testing.MakeResourceFlavor("on-demand").
+			onDemandRF = utiltestingapi.MakeResourceFlavor("on-demand").
 				NodeLabel("instance-type", "on-demand").
 				TopologyName(topology.Name).
 				Obj()
 
 			util.MustCreate(ctx, k8sClient, onDemandRF)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").
+					*utiltestingapi.MakeFlavorQuotas("on-demand").
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
@@ -171,7 +172,7 @@ var _ = ginkgo.Describe("TopologyAwareScheduling", func() {
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-			localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -285,18 +286,18 @@ var _ = ginkgo.Describe("TopologyAwareScheduling", func() {
 			localQueue   *kueue.LocalQueue
 		)
 		ginkgo.BeforeEach(func() {
-			topology = testing.MakeDefaultOneLevelTopology("hostname")
+			topology = utiltestingapi.MakeDefaultOneLevelTopology("hostname")
 			util.MustCreate(ctx, k8sClient, topology)
 
-			onDemandRF = testing.MakeResourceFlavor("on-demand").
+			onDemandRF = utiltestingapi.MakeResourceFlavor("on-demand").
 				NodeLabel("instance-type", "on-demand").
 				TopologyName(topology.Name).
 				Obj()
 
 			util.MustCreate(ctx, k8sClient, onDemandRF)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").
+					*utiltestingapi.MakeFlavorQuotas("on-demand").
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
@@ -306,7 +307,7 @@ var _ = ginkgo.Describe("TopologyAwareScheduling", func() {
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-			localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
diff --git a/test/e2e/singlecluster/trainjob_test.go b/test/e2e/singlecluster/trainjob_test.go
index 67c91040b..b7502e898 100644
--- a/test/e2e/singlecluster/trainjob_test.go
+++ b/test/e2e/singlecluster/trainjob_test.go
@@ -28,6 +28,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	workloadtrainjob "sigs.k8s.io/kueue/pkg/controller/jobs/trainjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingtrainjob "sigs.k8s.io/kueue/pkg/util/testingjobs/trainjob"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -49,15 +50,15 @@ var _ = ginkgo.Describe("TrainJob", func() {
 			clusterQueue *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			defaultRf = testing.MakeResourceFlavor("default").Obj()
+			defaultRf = utiltestingapi.MakeResourceFlavor("default").Obj()
 			util.MustCreate(ctx, k8sClient, defaultRf)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(defaultRf.Name).
+					*utiltestingapi.MakeFlavorQuotas(defaultRf.Name).
 						Resource(corev1.ResourceCPU, "2").
 						Resource(corev1.ResourceMemory, "2G").Obj()).Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -117,19 +118,19 @@ var _ = ginkgo.Describe("TrainJob", func() {
 			clusterQueue *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			onDemandRF = testing.MakeResourceFlavor("on-demand").
+			onDemandRF = utiltestingapi.MakeResourceFlavor("on-demand").
 				NodeLabel("instance-type", "on-demand").Obj()
 			util.MustCreate(ctx, k8sClient, onDemandRF)
-			spotRF = testing.MakeResourceFlavor("spot").
+			spotRF = utiltestingapi.MakeResourceFlavor("spot").
 				NodeLabel("instance-type", "spot").Obj()
 			util.MustCreate(ctx, k8sClient, spotRF)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").
+					*utiltestingapi.MakeFlavorQuotas("on-demand").
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
-					*testing.MakeFlavorQuotas("spot").
+					*utiltestingapi.MakeFlavorQuotas("spot").
 						Resource(corev1.ResourceCPU, "1").
 						Resource(corev1.ResourceMemory, "1Gi").
 						Obj(),
@@ -139,7 +140,7 @@ var _ = ginkgo.Describe("TrainJob", func() {
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
diff --git a/test/e2e/singlecluster/visibility_test.go b/test/e2e/singlecluster/visibility_test.go
index d4abc7b61..b5b0a567d 100644
--- a/test/e2e/singlecluster/visibility_test.go
+++ b/test/e2e/singlecluster/visibility_test.go
@@ -32,6 +32,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	visibility "sigs.k8s.io/kueue/apis/visibility/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -73,22 +74,22 @@ var _ = ginkgo.Describe("Kueue visibility server", func() {
 
 	ginkgo.When("There are pending workloads due to capacity maxed by the admitted job", func() {
 		ginkgo.BeforeEach(func() {
-			defaultRF = testing.MakeResourceFlavor(defaultFlavor).Obj()
+			defaultRF = utiltestingapi.MakeResourceFlavor(defaultFlavor).Obj()
 			util.MustCreate(ctx, k8sClient, defaultRF)
 
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(defaultFlavor).
+					*utiltestingapi.MakeFlavorQuotas(defaultFlavor).
 						Resource(corev1.ResourceCPU, "1").
 						Obj(),
 				).
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 
-			localQueueA = testing.MakeLocalQueue("a", nsA.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueueA = utiltestingapi.MakeLocalQueue("a", nsA.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueueA)
 
-			localQueueB = testing.MakeLocalQueue("b", nsA.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueueB = utiltestingapi.MakeLocalQueue("b", nsA.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueueB)
 
 			highPriorityClass = testing.MakePriorityClass("high").PriorityValue(100).Obj()
@@ -386,7 +387,7 @@ var _ = ginkgo.Describe("Kueue visibility server", func() {
 		})
 		ginkgo.It("Should allow fetching information about position of pending workloads from different LocalQueues from different Namespaces", func() {
 			ginkgo.By("Create a LocalQueue in a different Namespace", func() {
-				localQueueB = testing.MakeLocalQueue("b", nsB.Name).ClusterQueue(clusterQueue.Name).Obj()
+				localQueueB = utiltestingapi.MakeLocalQueue("b", nsB.Name).ClusterQueue(clusterQueue.Name).Obj()
 				util.MustCreate(ctx, k8sClient, localQueueB)
 			})
 
diff --git a/test/e2e/tas/appwrapper_test.go b/test/e2e/tas/appwrapper_test.go
index 9da55cf68..3e6da15d9 100644
--- a/test/e2e/tas/appwrapper_test.go
+++ b/test/e2e/tas/appwrapper_test.go
@@ -27,6 +27,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	awtesting "sigs.k8s.io/kueue/pkg/util/testingjobs/appwrapper"
 	utiltestingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/test/util"
@@ -44,18 +45,18 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for AppWrapper", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-tas-aw-")
 
-		topology = testing.MakeDefaultThreeLevelTopology("datacenter")
+		topology = utiltestingapi.MakeDefaultThreeLevelTopology("datacenter")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(tasNodeGroupLabel, instanceType).
 			TopologyName(topology.Name).
 			Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(tasFlavor.Name).
+				*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).
 					Resource(corev1.ResourceCPU, "1").
 					Resource(extraResource, "8").
 					Obj(),
@@ -64,7 +65,7 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for AppWrapper", func() {
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 		util.ExpectLocalQueuesToBeActive(ctx, k8sClient, localQueue)
 	})
diff --git a/test/e2e/tas/job_test.go b/test/e2e/tas/job_test.go
index cb190226d..9f79ab309 100644
--- a/test/e2e/tas/job_test.go
+++ b/test/e2e/tas/job_test.go
@@ -31,6 +31,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	workloadjob "sigs.k8s.io/kueue/pkg/controller/jobs/job"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/util"
@@ -60,15 +61,15 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for Job", func() {
 			clusterQueue *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			topology = testing.MakeDefaultThreeLevelTopology("datacenter")
+			topology = utiltestingapi.MakeDefaultThreeLevelTopology("datacenter")
 			util.MustCreate(ctx, k8sClient, topology)
 
-			tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+			tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 				NodeLabel(tasNodeGroupLabel, instanceType).TopologyName(topology.Name).Obj()
 			util.MustCreate(ctx, k8sClient, tasFlavor)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("tas-flavor").
+					*utiltestingapi.MakeFlavorQuotas("tas-flavor").
 						Resource(extraResource, "8").
 						Obj(),
 				).
@@ -76,7 +77,7 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for Job", func() {
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-			localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
diff --git a/test/e2e/tas/jobset_test.go b/test/e2e/tas/jobset_test.go
index c3007789e..d3f1a8a36 100644
--- a/test/e2e/tas/jobset_test.go
+++ b/test/e2e/tas/jobset_test.go
@@ -30,6 +30,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjobset "sigs.k8s.io/kueue/pkg/util/testingjobs/jobset"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -52,15 +53,15 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for JobSet", func() {
 			clusterQueue *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			topology = testing.MakeDefaultThreeLevelTopology("datacenter")
+			topology = utiltestingapi.MakeDefaultThreeLevelTopology("datacenter")
 			util.MustCreate(ctx, k8sClient, topology)
 
-			tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+			tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 				NodeLabel(tasNodeGroupLabel, instanceType).TopologyName(topology.Name).Obj()
 			util.MustCreate(ctx, k8sClient, tasFlavor)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("tas-flavor").
+					*utiltestingapi.MakeFlavorQuotas("tas-flavor").
 						Resource(extraResource, "8").
 						Obj(),
 				).
@@ -68,7 +69,7 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for JobSet", func() {
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-			localQueue = testing.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("main", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
diff --git a/test/e2e/tas/leaderworkerset_test.go b/test/e2e/tas/leaderworkerset_test.go
index 9345f6398..8a7c6bfe6 100644
--- a/test/e2e/tas/leaderworkerset_test.go
+++ b/test/e2e/tas/leaderworkerset_test.go
@@ -30,6 +30,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	leaderworkersettesting "sigs.k8s.io/kueue/pkg/util/testingjobs/leaderworkerset"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -46,22 +47,22 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for LeaderWorkerSet", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-tas-lws-")
 
-		topology = testing.MakeDefaultThreeLevelTopology("datacenter")
+		topology = utiltestingapi.MakeDefaultThreeLevelTopology("datacenter")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(tasNodeGroupLabel, instanceType).
 			TopologyName(topology.Name).
 			Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas("tas-flavor").Resource(extraResource, "8").Resource(corev1.ResourceCPU, "1").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-flavor").Resource(extraResource, "8").Resource(corev1.ResourceCPU, "1").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("test-queue", ns.Name).ClusterQueue("cluster-queue").Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("test-queue", ns.Name).ClusterQueue("cluster-queue").Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 		util.ExpectLocalQueuesToBeActive(ctx, k8sClient, localQueue)
 	})
diff --git a/test/e2e/tas/mpijob_test.go b/test/e2e/tas/mpijob_test.go
index 6fe0bf0e1..3cf68ff36 100644
--- a/test/e2e/tas/mpijob_test.go
+++ b/test/e2e/tas/mpijob_test.go
@@ -30,6 +30,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingmpijob "sigs.k8s.io/kueue/pkg/util/testingjobs/mpijob"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -46,18 +47,18 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for MPIJob", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-tas-mpijob-")
 
-		topology = testing.MakeDefaultThreeLevelTopology("datacenter")
+		topology = utiltestingapi.MakeDefaultThreeLevelTopology("datacenter")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(tasNodeGroupLabel, instanceType).
 			TopologyName(topology.Name).
 			Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(tasFlavor.Name).
+				*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).
 					Resource(corev1.ResourceCPU, "1").
 					Resource(extraResource, "8").
 					Obj(),
@@ -66,7 +67,7 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for MPIJob", func() {
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 		util.ExpectLocalQueuesToBeActive(ctx, k8sClient, localQueue)
 	})
diff --git a/test/e2e/tas/pod_group_test.go b/test/e2e/tas/pod_group_test.go
index 7a8c876cf..1c49ced77 100644
--- a/test/e2e/tas/pod_group_test.go
+++ b/test/e2e/tas/pod_group_test.go
@@ -25,6 +25,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -47,15 +48,15 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for Pod group", func() {
 			clusterQueue *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			topology = testing.MakeDefaultThreeLevelTopology("datacenter")
+			topology = utiltestingapi.MakeDefaultThreeLevelTopology("datacenter")
 			util.MustCreate(ctx, k8sClient, topology)
 
-			tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+			tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 				NodeLabel(tasNodeGroupLabel, instanceType).TopologyName(topology.Name).Obj()
 			util.MustCreate(ctx, k8sClient, tasFlavor)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("tas-flavor").
+					*utiltestingapi.MakeFlavorQuotas("tas-flavor").
 						Resource(extraResource, "8").
 						Obj(),
 				).
@@ -63,7 +64,7 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for Pod group", func() {
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-			localQueue = testing.MakeLocalQueue("test-queue", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("test-queue", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -184,12 +185,12 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for Pod group", func() {
 			clusterQueue *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			flavor = testing.MakeResourceFlavor("flavor").
+			flavor = utiltestingapi.MakeResourceFlavor("flavor").
 				NodeLabel(tasNodeGroupLabel, instanceType).Obj()
 			util.MustCreate(ctx, k8sClient, flavor)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor").
+					*utiltestingapi.MakeFlavorQuotas("flavor").
 						Resource(extraResource, "8").
 						Obj(),
 				).
@@ -197,7 +198,7 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for Pod group", func() {
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-			localQueue = testing.MakeLocalQueue("test-queue", ns.Name).ClusterQueue("cluster-queue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("test-queue", ns.Name).ClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
diff --git a/test/e2e/tas/pytorch_test.go b/test/e2e/tas/pytorch_test.go
index eba2bf406..9833d0376 100644
--- a/test/e2e/tas/pytorch_test.go
+++ b/test/e2e/tas/pytorch_test.go
@@ -29,6 +29,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingpytorchjob "sigs.k8s.io/kueue/pkg/util/testingjobs/pytorchjob"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -45,18 +46,18 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for PyTorchJob", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-tas-pytorchjob-")
 
-		topology = testing.MakeDefaultThreeLevelTopology("datacenter")
+		topology = utiltestingapi.MakeDefaultThreeLevelTopology("datacenter")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(tasNodeGroupLabel, instanceType).
 			TopologyName(topology.Name).
 			Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(tasFlavor.Name).
+				*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).
 					Resource(corev1.ResourceCPU, "1").
 					Resource(extraResource, "8").
 					Obj(),
@@ -65,7 +66,7 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for PyTorchJob", func() {
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 		util.ExpectLocalQueuesToBeActive(ctx, k8sClient, localQueue)
 	})
diff --git a/test/e2e/tas/rayjob_test.go b/test/e2e/tas/rayjob_test.go
index 9eed4826f..28c1f71a7 100644
--- a/test/e2e/tas/rayjob_test.go
+++ b/test/e2e/tas/rayjob_test.go
@@ -30,6 +30,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingrayjob "sigs.k8s.io/kueue/pkg/util/testingjobs/rayjob"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -46,18 +47,18 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for RayJob", ginkgo.Ordered, fu
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-tas-rayjob-")
 
-		topology = testing.MakeDefaultThreeLevelTopology("datacenter")
+		topology = utiltestingapi.MakeDefaultThreeLevelTopology("datacenter")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(tasNodeGroupLabel, instanceType).
 			TopologyName(topology.Name).
 			Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(tasFlavor.Name).
+				*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).
 					Resource(corev1.ResourceCPU, "1").
 					Resource(corev1.ResourceMemory, "8Gi").
 					Resource(extraResource, "8").
@@ -67,7 +68,7 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for RayJob", ginkgo.Ordered, fu
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 		util.ExpectLocalQueuesToBeActive(ctx, k8sClient, localQueue)
 	})
diff --git a/test/e2e/tas/statefulset_test.go b/test/e2e/tas/statefulset_test.go
index 961ab1626..4fa97f597 100644
--- a/test/e2e/tas/statefulset_test.go
+++ b/test/e2e/tas/statefulset_test.go
@@ -26,6 +26,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testingjobs/statefulset"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -42,22 +43,22 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for StatefulSet", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-tas-sts-")
 
-		topology = testing.MakeDefaultThreeLevelTopology("datacenter")
+		topology = utiltestingapi.MakeDefaultThreeLevelTopology("datacenter")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(tasNodeGroupLabel, instanceType).
 			TopologyName(topology.Name).
 			Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas("tas-flavor").Resource(extraResource, "8").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("tas-flavor").Resource(extraResource, "8").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("test-queue", ns.Name).ClusterQueue("cluster-queue").Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("test-queue", ns.Name).ClusterQueue("cluster-queue").Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 		util.ExpectLocalQueuesToBeActive(ctx, k8sClient, localQueue)
 	})
diff --git a/test/integration/multikueue/dispatcher_test.go b/test/integration/multikueue/dispatcher_test.go
index 50dccfeae..4691376ab 100644
--- a/test/integration/multikueue/dispatcher_test.go
+++ b/test/integration/multikueue/dispatcher_test.go
@@ -36,6 +36,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/admissioncheck"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/util"
@@ -107,16 +108,16 @@ var _ = ginkgo.Describe("MultiKueueDispatcherIncremental", ginkgo.Ordered, ginkg
 		}
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerMultiKueueSecret2)).To(gomega.Succeed())
 
-		workerCluster1 = utiltesting.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
+		workerCluster1 = utiltestingapi.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, workerCluster1)).To(gomega.Succeed())
 
-		workerCluster2 = utiltesting.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
+		workerCluster2 = utiltestingapi.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, workerCluster2)).To(gomega.Succeed())
 
-		managerMultiKueueConfig = utiltesting.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
+		managerMultiKueueConfig = utiltestingapi.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerMultiKueueConfig)).Should(gomega.Succeed())
 
-		multiKueueAC = utiltesting.MakeAdmissionCheck("ac1").
+		multiKueueAC = utiltestingapi.MakeAdmissionCheck("ac1").
 			ControllerName(kueue.MultiKueueControllerName).
 			Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
 			Obj()
@@ -131,22 +132,22 @@ var _ = ginkgo.Describe("MultiKueueDispatcherIncremental", ginkgo.Ordered, ginkg
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 
-		managerCq = utiltesting.MakeClusterQueue("q1").
+		managerCq = utiltestingapi.MakeClusterQueue("q1").
 			AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
 			Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerCq)).Should(gomega.Succeed())
 
-		managerLq = utiltesting.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
+		managerLq = utiltestingapi.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerLq)).Should(gomega.Succeed())
 
-		worker1Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker1Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Cq)).Should(gomega.Succeed())
-		worker1Lq = utiltesting.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
+		worker1Lq = utiltestingapi.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
 		gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Lq)).Should(gomega.Succeed())
 
-		worker2Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker2Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		gomega.Expect(worker2TestCluster.client.Create(worker2TestCluster.ctx, worker2Cq)).Should(gomega.Succeed())
-		worker2Lq = utiltesting.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
+		worker2Lq = utiltestingapi.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
 		gomega.Expect(worker2TestCluster.client.Create(worker2TestCluster.ctx, worker2Lq)).Should(gomega.Succeed())
 	})
 
@@ -177,7 +178,7 @@ var _ = ginkgo.Describe("MultiKueueDispatcherIncremental", ginkgo.Ordered, ginkg
 		wlLookupKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: managerNs.Name}
 
 		ginkgo.By("setting workload reservation in the management cluster", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(managerTestCluster.ctx, managerTestCluster.client, wlLookupKey, admission)
 		})
 
@@ -198,7 +199,7 @@ var _ = ginkgo.Describe("MultiKueueDispatcherIncremental", ginkgo.Ordered, ginkg
 		})
 
 		ginkgo.By("setting workload reservation in worker1, workload in worker2 is removed", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(worker1TestCluster.ctx, worker1TestCluster.client, wlLookupKey, admission)
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(worker2TestCluster.client.Get(worker2TestCluster.ctx, wlLookupKey, createdWorkload)).To(utiltesting.BeNotFoundError())
@@ -303,16 +304,16 @@ var _ = ginkgo.Describe("MultiKueueDispatcherExternal", ginkgo.Ordered, ginkgo.C
 		}
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerMultiKueueSecret2)).To(gomega.Succeed())
 
-		workerCluster1 = utiltesting.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
+		workerCluster1 = utiltestingapi.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, workerCluster1)).To(gomega.Succeed())
 
-		workerCluster2 = utiltesting.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
+		workerCluster2 = utiltestingapi.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, workerCluster2)).To(gomega.Succeed())
 
-		managerMultiKueueConfig = utiltesting.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
+		managerMultiKueueConfig = utiltestingapi.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerMultiKueueConfig)).Should(gomega.Succeed())
 
-		multiKueueAC = utiltesting.MakeAdmissionCheck("ac1").
+		multiKueueAC = utiltestingapi.MakeAdmissionCheck("ac1").
 			ControllerName(kueue.MultiKueueControllerName).
 			Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
 			Obj()
@@ -327,22 +328,22 @@ var _ = ginkgo.Describe("MultiKueueDispatcherExternal", ginkgo.Ordered, ginkgo.C
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 
-		managerCq = utiltesting.MakeClusterQueue("q1").
+		managerCq = utiltestingapi.MakeClusterQueue("q1").
 			AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
 			Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerCq)).Should(gomega.Succeed())
 
-		managerLq = utiltesting.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
+		managerLq = utiltestingapi.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerLq)).Should(gomega.Succeed())
 
-		worker1Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker1Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Cq)).Should(gomega.Succeed())
-		worker1Lq = utiltesting.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
+		worker1Lq = utiltestingapi.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
 		gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Lq)).Should(gomega.Succeed())
 
-		worker2Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker2Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		gomega.Expect(worker2TestCluster.client.Create(worker2TestCluster.ctx, worker2Cq)).Should(gomega.Succeed())
-		worker2Lq = utiltesting.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
+		worker2Lq = utiltestingapi.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
 		gomega.Expect(worker2TestCluster.client.Create(worker2TestCluster.ctx, worker2Lq)).Should(gomega.Succeed())
 	})
 
@@ -373,7 +374,7 @@ var _ = ginkgo.Describe("MultiKueueDispatcherExternal", ginkgo.Ordered, ginkgo.C
 		wlLookupKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: managerNs.Name}
 
 		ginkgo.By("setting workload reservation in the management cluster", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(managerTestCluster.ctx, managerTestCluster.client, wlLookupKey, admission)
 		})
 
@@ -445,7 +446,7 @@ var _ = ginkgo.Describe("MultiKueueDispatcherExternal", ginkgo.Ordered, ginkgo.C
 		})
 
 		ginkgo.By("setting workload reservation in worker2, workload in worker1 is removed", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(worker2TestCluster.ctx, worker2TestCluster.client, wlLookupKey, admission)
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(worker1TestCluster.client.Get(worker1TestCluster.ctx, wlLookupKey, createdWorkload)).To(utiltesting.BeNotFoundError())
@@ -550,16 +551,16 @@ var _ = ginkgo.Describe("MultiKueueDispatcherAllAtOnce", ginkgo.Ordered, ginkgo.
 		}
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerMultiKueueSecret2)).To(gomega.Succeed())
 
-		workerCluster1 = utiltesting.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
+		workerCluster1 = utiltestingapi.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, workerCluster1)).To(gomega.Succeed())
 
-		workerCluster2 = utiltesting.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
+		workerCluster2 = utiltestingapi.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, workerCluster2)).To(gomega.Succeed())
 
-		managerMultiKueueConfig = utiltesting.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
+		managerMultiKueueConfig = utiltestingapi.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerMultiKueueConfig)).Should(gomega.Succeed())
 
-		multiKueueAC = utiltesting.MakeAdmissionCheck("ac1").
+		multiKueueAC = utiltestingapi.MakeAdmissionCheck("ac1").
 			ControllerName(kueue.MultiKueueControllerName).
 			Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
 			Obj()
@@ -574,22 +575,22 @@ var _ = ginkgo.Describe("MultiKueueDispatcherAllAtOnce", ginkgo.Ordered, ginkgo.
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 
-		managerCq = utiltesting.MakeClusterQueue("q1").
+		managerCq = utiltestingapi.MakeClusterQueue("q1").
 			AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
 			Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerCq)).Should(gomega.Succeed())
 
-		managerLq = utiltesting.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
+		managerLq = utiltestingapi.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerLq)).Should(gomega.Succeed())
 
-		worker1Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker1Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Cq)).Should(gomega.Succeed())
-		worker1Lq = utiltesting.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
+		worker1Lq = utiltestingapi.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
 		gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Lq)).Should(gomega.Succeed())
 
-		worker2Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker2Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		gomega.Expect(worker2TestCluster.client.Create(worker2TestCluster.ctx, worker2Cq)).Should(gomega.Succeed())
-		worker2Lq = utiltesting.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
+		worker2Lq = utiltestingapi.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
 		gomega.Expect(worker2TestCluster.client.Create(worker2TestCluster.ctx, worker2Lq)).Should(gomega.Succeed())
 	})
 
@@ -620,7 +621,7 @@ var _ = ginkgo.Describe("MultiKueueDispatcherAllAtOnce", ginkgo.Ordered, ginkgo.
 		wlLookupKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: managerNs.Name}
 
 		ginkgo.By("setting workload reservation in the management cluster", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(managerTestCluster.ctx, managerTestCluster.client, wlLookupKey, admission)
 		})
 
@@ -641,7 +642,7 @@ var _ = ginkgo.Describe("MultiKueueDispatcherAllAtOnce", ginkgo.Ordered, ginkgo.
 		})
 
 		ginkgo.By("setting workload reservation in worker1, workload in worker2 is removed", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(worker1TestCluster.ctx, worker1TestCluster.client, wlLookupKey, admission)
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(worker2TestCluster.client.Get(worker2TestCluster.ctx, wlLookupKey, createdWorkload)).To(utiltesting.BeNotFoundError())
diff --git a/test/integration/multikueue/enabled_integration_test.go b/test/integration/multikueue/enabled_integration_test.go
index b8af68ba7..a493efd26 100644
--- a/test/integration/multikueue/enabled_integration_test.go
+++ b/test/integration/multikueue/enabled_integration_test.go
@@ -41,6 +41,7 @@ import (
 	workloadmpijob "sigs.k8s.io/kueue/pkg/controller/jobs/mpijob"
 	"sigs.k8s.io/kueue/pkg/util/admissioncheck"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingmpijob "sigs.k8s.io/kueue/pkg/util/testingjobs/mpijob"
 	"sigs.k8s.io/kueue/test/util"
@@ -90,13 +91,13 @@ var _ = ginkgo.Describe("MultiKueue when not all integrations are enabled", gink
 		}
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerMultiKueueSecret1)).To(gomega.Succeed())
 
-		workerCluster1 = utiltesting.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
+		workerCluster1 = utiltestingapi.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, workerCluster1)).To(gomega.Succeed())
 
-		managerMultiKueueConfig = utiltesting.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name).Obj()
+		managerMultiKueueConfig = utiltestingapi.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerMultiKueueConfig)).Should(gomega.Succeed())
 
-		multiKueueAC = utiltesting.MakeAdmissionCheck("ac1").
+		multiKueueAC = utiltestingapi.MakeAdmissionCheck("ac1").
 			ControllerName(kueue.MultiKueueControllerName).
 			Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
 			Obj()
@@ -111,17 +112,17 @@ var _ = ginkgo.Describe("MultiKueue when not all integrations are enabled", gink
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 
-		managerCq = utiltesting.MakeClusterQueue("q1").
+		managerCq = utiltestingapi.MakeClusterQueue("q1").
 			AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
 			Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerCq)).Should(gomega.Succeed())
 
-		managerLq = utiltesting.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
+		managerLq = utiltestingapi.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerLq)).Should(gomega.Succeed())
 
-		worker1Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker1Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Cq)).Should(gomega.Succeed())
-		worker1Lq = utiltesting.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
+		worker1Lq = utiltestingapi.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
 		gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Lq)).Should(gomega.Succeed())
 	})
 
@@ -146,7 +147,7 @@ var _ = ginkgo.Describe("MultiKueue when not all integrations are enabled", gink
 		wlLookupKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: managerNs.Name}
 
 		ginkgo.By("setting workload reservation in the management cluster", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(managerTestCluster.ctx, managerTestCluster.client, wlLookupKey, admission)
 		})
 
@@ -160,7 +161,7 @@ var _ = ginkgo.Describe("MultiKueue when not all integrations are enabled", gink
 		})
 
 		ginkgo.By("setting workload reservation in worker1, AC state is updated in manager", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(worker1TestCluster.ctx, worker1TestCluster.client, wlLookupKey, admission)
 
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -227,7 +228,7 @@ var _ = ginkgo.Describe("MultiKueue when not all integrations are enabled", gink
 	})
 
 	ginkgo.It("Should not create a MPIJob workload, when MPIJob adapter is not enabled", func() {
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "launcher",
 			}, kueue.PodSetAssignment{
diff --git a/test/integration/multikueue/external_job_test.go b/test/integration/multikueue/external_job_test.go
index 7c97a547f..cbf44e97a 100644
--- a/test/integration/multikueue/external_job_test.go
+++ b/test/integration/multikueue/external_job_test.go
@@ -45,6 +45,7 @@ import (
 	dispatcher "sigs.k8s.io/kueue/pkg/controller/workloaddispatcher"
 	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingrayjob "sigs.k8s.io/kueue/pkg/util/testingjobs/rayjob"
 	"sigs.k8s.io/kueue/pkg/webhooks"
 	"sigs.k8s.io/kueue/test/util"
@@ -179,16 +180,16 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 			}
 			util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, managerMultiKueueSecret2)
 
-			workerCluster1 = utiltesting.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
+			workerCluster1 = utiltestingapi.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
 			util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, workerCluster1)
 
-			workerCluster2 = utiltesting.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
+			workerCluster2 = utiltestingapi.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
 			util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, workerCluster2)
 
-			managerMultiKueueConfig = utiltesting.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
+			managerMultiKueueConfig = utiltestingapi.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
 			util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, managerMultiKueueConfig)
 
-			multiKueueAC = utiltesting.MakeAdmissionCheck("ac1").
+			multiKueueAC = utiltestingapi.MakeAdmissionCheck("ac1").
 				ControllerName(kueue.MultiKueueControllerName).
 				Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
 				Obj()
@@ -203,27 +204,27 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
 			})
 
-			managerCq = utiltesting.MakeClusterQueue("q1").
+			managerCq = utiltestingapi.MakeClusterQueue("q1").
 				AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
 				Obj()
 			util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, managerCq)
 			util.ExpectClusterQueuesToBeActive(managerTestCluster.ctx, managerTestCluster.client, managerCq)
 
-			managerLq = utiltesting.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
+			managerLq = utiltestingapi.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
 			util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, managerLq)
 			util.ExpectLocalQueuesToBeActive(managerTestCluster.ctx, managerTestCluster.client, managerLq)
 
-			worker1Cq = utiltesting.MakeClusterQueue("q1").Obj()
+			worker1Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 			util.MustCreate(worker1TestCluster.ctx, worker1TestCluster.client, worker1Cq)
 			util.ExpectClusterQueuesToBeActive(worker1TestCluster.ctx, worker1TestCluster.client, worker1Cq)
-			worker1Lq = utiltesting.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
+			worker1Lq = utiltestingapi.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
 			util.MustCreate(worker1TestCluster.ctx, worker1TestCluster.client, worker1Lq)
 			util.ExpectLocalQueuesToBeActive(worker1TestCluster.ctx, worker1TestCluster.client, worker1Lq)
 
-			worker2Cq = utiltesting.MakeClusterQueue("q1").Obj()
+			worker2Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 			util.MustCreate(worker2TestCluster.ctx, worker2TestCluster.client, worker2Cq)
 			util.ExpectClusterQueuesToBeActive(worker2TestCluster.ctx, worker2TestCluster.client, worker2Cq)
-			worker2Lq = utiltesting.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
+			worker2Lq = utiltestingapi.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
 			util.MustCreate(worker2TestCluster.ctx, worker2TestCluster.client, worker2Lq)
 			util.ExpectLocalQueuesToBeActive(worker2TestCluster.ctx, worker2TestCluster.client, worker2Lq)
 		})
@@ -244,7 +245,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		})
 
 		ginkgo.It("Should run a RayJob on worker if admitted", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 				kueue.PodSetAssignment{
 					Name: "head",
 				}, kueue.PodSetAssignment{
@@ -290,7 +291,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		})
 
 		ginkgo.It("Should run a RayJob on worker if admitted (ManagedBy)", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 				kueue.PodSetAssignment{
 					Name: "head",
 				}, kueue.PodSetAssignment{
@@ -349,7 +350,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 			wlLookupKey := types.NamespacedName{Name: workloadrayjob.GetWorkloadNameForRayJob(rayjob.Name, rayjob.UID), Namespace: managerNs.Name}
 
 			ginkgo.By("setting workload reservation in the management cluster", func() {
-				admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+				admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 					kueue.PodSetAssignment{
 						Name: "head",
 					}, kueue.PodSetAssignment{
@@ -394,7 +395,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 			})
 
 			ginkgo.By("setting workload reservation in worker1, the RayJob is created in worker1", func() {
-				admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+				admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 					kueue.PodSetAssignment{
 						Name: "head",
 					}, kueue.PodSetAssignment{
diff --git a/test/integration/multikueue/jobs_test.go b/test/integration/multikueue/jobs_test.go
index 52ef34c90..cf81e0f1c 100644
--- a/test/integration/multikueue/jobs_test.go
+++ b/test/integration/multikueue/jobs_test.go
@@ -59,6 +59,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/admissioncheck"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingaw "sigs.k8s.io/kueue/pkg/util/testingjobs/appwrapper"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingjobset "sigs.k8s.io/kueue/pkg/util/testingjobs/jobset"
@@ -147,16 +148,16 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		}
 		util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, managerMultiKueueSecret2)
 
-		workerCluster1 = utiltesting.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
+		workerCluster1 = utiltestingapi.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
 		util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, workerCluster1)
 
-		workerCluster2 = utiltesting.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
+		workerCluster2 = utiltestingapi.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
 		util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, workerCluster2)
 
-		managerMultiKueueConfig = utiltesting.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
+		managerMultiKueueConfig = utiltestingapi.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
 		util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, managerMultiKueueConfig)
 
-		multiKueueAC = utiltesting.MakeAdmissionCheck("ac1").
+		multiKueueAC = utiltestingapi.MakeAdmissionCheck("ac1").
 			ControllerName(kueue.MultiKueueControllerName).
 			Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
 			Obj()
@@ -171,27 +172,27 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 
-		managerCq = utiltesting.MakeClusterQueue("q1").
+		managerCq = utiltestingapi.MakeClusterQueue("q1").
 			AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
 			Obj()
 		util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, managerCq)
 		util.ExpectClusterQueuesToBeActive(managerTestCluster.ctx, managerTestCluster.client, managerCq)
 
-		managerLq = utiltesting.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
+		managerLq = utiltestingapi.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
 		util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, managerLq)
 		util.ExpectLocalQueuesToBeActive(managerTestCluster.ctx, managerTestCluster.client, managerLq)
 
-		worker1Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker1Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		util.MustCreate(worker1TestCluster.ctx, worker1TestCluster.client, worker1Cq)
 		util.ExpectClusterQueuesToBeActive(worker1TestCluster.ctx, worker1TestCluster.client, worker1Cq)
-		worker1Lq = utiltesting.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
+		worker1Lq = utiltestingapi.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
 		util.MustCreate(worker1TestCluster.ctx, worker1TestCluster.client, worker1Lq)
 		util.ExpectLocalQueuesToBeActive(worker1TestCluster.ctx, worker1TestCluster.client, worker1Lq)
 
-		worker2Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker2Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		util.MustCreate(worker2TestCluster.ctx, worker2TestCluster.client, worker2Cq)
 		util.ExpectClusterQueuesToBeActive(worker2TestCluster.ctx, worker2TestCluster.client, worker2Cq)
-		worker2Lq = utiltesting.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
+		worker2Lq = utiltestingapi.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
 		util.MustCreate(worker2TestCluster.ctx, worker2TestCluster.client, worker2Lq)
 		util.ExpectLocalQueuesToBeActive(worker2TestCluster.ctx, worker2TestCluster.client, worker2Lq)
 	})
@@ -221,7 +222,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		wlLookupKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: managerNs.Name}
 
 		ginkgo.By("setting workload reservation in the management cluster", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(managerTestCluster.ctx, managerTestCluster.client, wlLookupKey, admission)
 		})
 
@@ -237,7 +238,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		})
 
 		ginkgo.By("setting workload reservation in worker1, AC state is updated in manager and worker2 wl is removed", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(worker1TestCluster.ctx, worker1TestCluster.client, wlLookupKey, admission)
 
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -318,7 +319,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		wlLookupKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: managerNs.Name}
 
 		ginkgo.By("setting workload reservation in the management cluster", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(managerTestCluster.ctx, managerTestCluster.client, wlLookupKey, admission)
 		})
 
@@ -334,7 +335,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		})
 
 		ginkgo.By("setting workload reservation in worker1, AC state is updated in manager and worker2 wl is removed", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(worker1TestCluster.ctx, worker1TestCluster.client, wlLookupKey, admission)
 
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -444,7 +445,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, jobSet)
 		wlLookupKey := types.NamespacedName{Name: workloadjobset.GetWorkloadNameForJobSet(jobSet.Name, jobSet.UID), Namespace: managerNs.Name}
 
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "replicated-job-1",
 			}, kueue.PodSetAssignment{
@@ -513,7 +514,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 			Obj()
 		util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, tfJob)
 		wlLookupKey := types.NamespacedName{Name: workloadtfjob.GetWorkloadNameForTFJob(tfJob.Name, tfJob.UID), Namespace: managerNs.Name}
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "chief",
 			}, kueue.PodSetAssignment{
@@ -602,7 +603,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, paddleJob)
 
 		wlLookupKey := types.NamespacedName{Name: workloadpaddlejob.GetWorkloadNameForPaddleJob(paddleJob.Name, paddleJob.UID), Namespace: managerNs.Name}
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "master",
 			}, kueue.PodSetAssignment{
@@ -681,7 +682,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, pyTorchJob)
 
 		wlLookupKey := types.NamespacedName{Name: workloadpytorchjob.GetWorkloadNameForPyTorchJob(pyTorchJob.Name, pyTorchJob.UID), Namespace: managerNs.Name}
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "master",
 			}, kueue.PodSetAssignment{
@@ -741,7 +742,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 	})
 
 	ginkgo.It("Should not run a PyTorchJob on worker if set to be managed by wrong external controller", func() {
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "master",
 			}, kueue.PodSetAssignment{
@@ -797,7 +798,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, xgBoostJob)
 
 		wlLookupKey := types.NamespacedName{Name: workloadxgboostjob.GetWorkloadNameForXGBoostJob(xgBoostJob.Name, xgBoostJob.UID), Namespace: managerNs.Name}
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "master",
 			}, kueue.PodSetAssignment{
@@ -868,7 +869,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, aw)
 		wlLookupKey := types.NamespacedName{Name: workloadappwrapper.GetWorkloadNameForAppWrapper(aw.Name, aw.UID), Namespace: managerNs.Name}
 
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "aw-0",
 			},
@@ -904,7 +905,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 	})
 
 	ginkgo.It("Should not run a MPIJob on worker if set to be managed by external controller", func() {
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "launcher",
 			}, kueue.PodSetAssignment{
@@ -937,7 +938,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 	})
 
 	ginkgo.It("Should run a MPIJob on worker if admitted", func() {
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "launcher",
 			}, kueue.PodSetAssignment{
@@ -1026,7 +1027,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		wlLookupKey := types.NamespacedName{Name: workloadpod.GetWorkloadNameForPod(pod.Name, pod.UID), Namespace: managerNs.Name}
 
 		ginkgo.By("setting workload reservation in the management cluster", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(managerTestCluster.ctx, managerTestCluster.client, wlLookupKey, admission)
 		})
 
@@ -1042,7 +1043,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		})
 
 		ginkgo.By("setting workload reservation in worker1, AC state is updated in manager and worker2 wl is removed", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(worker1TestCluster.ctx, worker1TestCluster.client, wlLookupKey, admission)
 
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -1130,7 +1131,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		// any pod should give the same workload Key
 		createdWorkload := &kueue.Workload{}
 		wlLookupKey := types.NamespacedName{Name: groupName, Namespace: managerNs.Name}
-		admission := utiltesting.MakeAdmission(managerCq.Name).
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).
 			PodSets(
 				kueue.PodSetAssignment{
 					Name:  "bf90803c",
@@ -1236,7 +1237,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		wlLookupKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: managerNs.Name}
 
 		ginkgo.By("setting workload reservation in the management cluster", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(managerTestCluster.ctx, managerTestCluster.client, wlLookupKey, admission)
 		})
 
@@ -1272,7 +1273,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		})
 
 		ginkgo.By("setting workload reservation in worker1, the job is created in worker1", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(worker1TestCluster.ctx, worker1TestCluster.client, wlLookupKey, admission)
 
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -1402,7 +1403,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 
 		wlLookupKey := types.NamespacedName{Name: workloadjobset.GetWorkloadNameForJobSet(jobSet.Name, jobSet.UID), Namespace: managerNs.Name}
 
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "replicated-job-1",
 			}, kueue.PodSetAssignment{
@@ -1481,7 +1482,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 	})
 
 	ginkgo.It("Should run a RayJob on worker if admitted", func() {
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "head",
 			}, kueue.PodSetAssignment{
@@ -1527,7 +1528,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 	})
 
 	ginkgo.It("Should run a RayCluster on worker if admitted", func() {
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "head",
 			}, kueue.PodSetAssignment{
@@ -1562,7 +1563,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 	})
 
 	ginkgo.It("Should run a TrainJob on worker if admitted", func() {
-		admission := utiltesting.MakeAdmission(managerCq.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(managerCq.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: "node",
 			},
@@ -1671,7 +1672,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 		ginkgo.By("admit workload on the manager cluster")
-		util.SetQuotaReservation(manager.ctx, manager.client, workloadKey, utiltesting.MakeAdmission(managerCq.Name).Obj())
+		util.SetQuotaReservation(manager.ctx, manager.client, workloadKey, utiltestingapi.MakeAdmission(managerCq.Name).Obj())
 
 		ginkgo.By("observe: workload is created on all worker clusters", func() {
 			localWorkload := getWorkload(gomega.Default, manager.ctx, manager.client, workloadKey)
@@ -1684,7 +1685,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		})
 
 		ginkgo.By("admit the workload on the worker1 cluster")
-		util.SetQuotaReservation(worker1.ctx, worker1.client, workloadKey, utiltesting.MakeAdmission(managerCq.Name).Obj())
+		util.SetQuotaReservation(worker1.ctx, worker1.client, workloadKey, utiltestingapi.MakeAdmission(managerCq.Name).Obj())
 
 		ginkgo.By("observe: the local workload admission check and local events reflect reservation on the worker1 cluster")
 		gomega.Eventually(func(g gomega.Gomega) {
@@ -1762,7 +1763,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 				oldWorkload := getWorkload(g, manager.ctx, manager.client, workloadKey)
 				g.Expect(workloadslicing.Finish(manager.ctx, manager.client, realClock, oldWorkload, kueue.WorkloadSliceReplaced, "Replaced to accommodate a new slice")).To(gomega.Succeed())
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
-			util.SetQuotaReservation(manager.ctx, manager.client, newWorkloadKey, utiltesting.MakeAdmission(managerCq.Name).Obj())
+			util.SetQuotaReservation(manager.ctx, manager.client, newWorkloadKey, utiltestingapi.MakeAdmission(managerCq.Name).Obj())
 		})
 
 		ginkgo.By("observe: the new workload is created in the worker1 cluster")
@@ -1794,7 +1795,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		})
 
 		ginkgo.By("admit the new workload replacing the old workload in the worker1 cluster", func() {
-			util.SetQuotaReservation(worker1.ctx, worker1.client, newWorkloadKey, utiltesting.MakeAdmission(managerCq.Name).Obj())
+			util.SetQuotaReservation(worker1.ctx, worker1.client, newWorkloadKey, utiltestingapi.MakeAdmission(managerCq.Name).Obj())
 			gomega.Eventually(func(g gomega.Gomega) {
 				workload := getWorkload(g, worker1.ctx, worker1.client, workloadKey)
 				g.Expect(workloadslicing.Finish(worker1.ctx, worker1.client, realClock, workload, kueue.WorkloadSliceReplaced, "Replaced to accommodate a new slice")).To(gomega.Succeed())
@@ -1913,7 +1914,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 	})
 })
 
-func admitWorkloadAndCheckWorkerCopies(acName string, wlLookupKey types.NamespacedName, admission *utiltesting.AdmissionWrapper) {
+func admitWorkloadAndCheckWorkerCopies(acName string, wlLookupKey types.NamespacedName, admission *utiltestingapi.AdmissionWrapper) {
 	ginkgo.By("setting workload reservation in the management cluster", func() {
 		util.SetQuotaReservation(managerTestCluster.ctx, managerTestCluster.client, wlLookupKey, admission.Obj())
 	})
@@ -1985,7 +1986,7 @@ func waitForWorkloadToFinishAndRemoteWorkloadToBeDeleted(wlLookupKey types.Names
 	}, util.LongTimeout, util.Interval).Should(gomega.Succeed())
 }
 
-func setQuotaReservationInCluster(wlLookupKey types.NamespacedName, admission *utiltesting.AdmissionWrapper) {
+func setQuotaReservationInCluster(wlLookupKey types.NamespacedName, admission *utiltestingapi.AdmissionWrapper) {
 	ginkgo.By("setting workload reservation in the management cluster", func() {
 		util.SetQuotaReservation(managerTestCluster.ctx, managerTestCluster.client, wlLookupKey, admission.Obj())
 	})
diff --git a/test/integration/multikueue/no_gc_test.go b/test/integration/multikueue/no_gc_test.go
index 9a26a6449..ee7828fd9 100644
--- a/test/integration/multikueue/no_gc_test.go
+++ b/test/integration/multikueue/no_gc_test.go
@@ -35,6 +35,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/admissioncheck"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/integration/framework"
@@ -107,16 +108,16 @@ var _ = ginkgo.Describe("MultiKueue no GC", ginkgo.Ordered, ginkgo.ContinueOnFai
 		}
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerMultiKueueSecret2)).To(gomega.Succeed())
 
-		workerCluster1 = utiltesting.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
+		workerCluster1 = utiltestingapi.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, workerCluster1)).To(gomega.Succeed())
 
-		workerCluster2 = utiltesting.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
+		workerCluster2 = utiltestingapi.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, workerCluster2)).To(gomega.Succeed())
 
-		managerMultiKueueConfig = utiltesting.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
+		managerMultiKueueConfig = utiltestingapi.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerMultiKueueConfig)).Should(gomega.Succeed())
 
-		multiKueueAC = utiltesting.MakeAdmissionCheck("ac1").
+		multiKueueAC = utiltestingapi.MakeAdmissionCheck("ac1").
 			ControllerName(kueue.MultiKueueControllerName).
 			Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
 			Obj()
@@ -131,22 +132,22 @@ var _ = ginkgo.Describe("MultiKueue no GC", ginkgo.Ordered, ginkgo.ContinueOnFai
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 
-		managerCq = utiltesting.MakeClusterQueue("q1").
+		managerCq = utiltestingapi.MakeClusterQueue("q1").
 			AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
 			Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerCq)).Should(gomega.Succeed())
 
-		managerLq = utiltesting.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
+		managerLq = utiltestingapi.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerLq)).Should(gomega.Succeed())
 
-		worker1Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker1Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Cq)).Should(gomega.Succeed())
-		worker1Lq = utiltesting.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
+		worker1Lq = utiltestingapi.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
 		gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Lq)).Should(gomega.Succeed())
 
-		worker2Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker2Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		gomega.Expect(worker2TestCluster.client.Create(worker2TestCluster.ctx, worker2Cq)).Should(gomega.Succeed())
-		worker2Lq = utiltesting.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
+		worker2Lq = utiltestingapi.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
 		gomega.Expect(worker2TestCluster.client.Create(worker2TestCluster.ctx, worker2Lq)).Should(gomega.Succeed())
 	})
 
@@ -175,7 +176,7 @@ var _ = ginkgo.Describe("MultiKueue no GC", ginkgo.Ordered, ginkgo.ContinueOnFai
 		wlLookupKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: managerNs.Name}
 
 		ginkgo.By("setting workload reservation in the management cluster", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(managerTestCluster.ctx, managerTestCluster.client, wlLookupKey, admission)
 		})
 
@@ -191,7 +192,7 @@ var _ = ginkgo.Describe("MultiKueue no GC", ginkgo.Ordered, ginkgo.ContinueOnFai
 		})
 
 		ginkgo.By("setting workload reservation in worker1, the job is created in worker1", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(worker1TestCluster.ctx, worker1TestCluster.client, wlLookupKey, admission)
 
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -227,7 +228,7 @@ var _ = ginkgo.Describe("MultiKueue no GC", ginkgo.Ordered, ginkgo.ContinueOnFai
 		wlLookupKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: managerNs.Name}
 
 		ginkgo.By("setting workload reservation in the management cluster", func() {
-			admission := utiltesting.MakeAdmission(managerCq.Name).Obj()
+			admission := utiltestingapi.MakeAdmission(managerCq.Name).Obj()
 			util.SetQuotaReservation(managerTestCluster.ctx, managerTestCluster.client, wlLookupKey, admission)
 		})
 
diff --git a/test/integration/multikueue/setup_test.go b/test/integration/multikueue/setup_test.go
index 825f9e9b6..a69b98395 100644
--- a/test/integration/multikueue/setup_test.go
+++ b/test/integration/multikueue/setup_test.go
@@ -33,6 +33,7 @@ import (
 	config "sigs.k8s.io/kueue/apis/config/v1beta1"
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -101,16 +102,16 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		}
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerMultiKueueSecret2)).To(gomega.Succeed())
 
-		workerCluster1 = utiltesting.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
+		workerCluster1 = utiltestingapi.MakeMultiKueueCluster("worker1").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret1.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, workerCluster1)).To(gomega.Succeed())
 
-		workerCluster2 = utiltesting.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
+		workerCluster2 = utiltestingapi.MakeMultiKueueCluster("worker2").KubeConfig(kueue.SecretLocationType, managerMultiKueueSecret2.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, workerCluster2)).To(gomega.Succeed())
 
-		managerMultiKueueConfig = utiltesting.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
+		managerMultiKueueConfig = utiltestingapi.MakeMultiKueueConfig("multikueueconfig").Clusters(workerCluster1.Name, workerCluster2.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerMultiKueueConfig)).Should(gomega.Succeed())
 
-		multiKueueAC = utiltesting.MakeAdmissionCheck("ac1").
+		multiKueueAC = utiltestingapi.MakeAdmissionCheck("ac1").
 			ControllerName(kueue.MultiKueueControllerName).
 			Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
 			Obj()
@@ -125,22 +126,22 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 
-		managerCq = utiltesting.MakeClusterQueue("q1").
+		managerCq = utiltestingapi.MakeClusterQueue("q1").
 			AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
 			Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerCq)).Should(gomega.Succeed())
 
-		managerLq = utiltesting.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
+		managerLq = utiltestingapi.MakeLocalQueue(managerCq.Name, managerNs.Name).ClusterQueue(managerCq.Name).Obj()
 		gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerLq)).Should(gomega.Succeed())
 
-		worker1Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker1Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Cq)).Should(gomega.Succeed())
-		worker1Lq = utiltesting.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
+		worker1Lq = utiltestingapi.MakeLocalQueue(worker1Cq.Name, worker1Ns.Name).ClusterQueue(worker1Cq.Name).Obj()
 		gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Lq)).Should(gomega.Succeed())
 
-		worker2Cq = utiltesting.MakeClusterQueue("q1").Obj()
+		worker2Cq = utiltestingapi.MakeClusterQueue("q1").Obj()
 		gomega.Expect(worker2TestCluster.client.Create(worker2TestCluster.ctx, worker2Cq)).Should(gomega.Succeed())
-		worker2Lq = utiltesting.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
+		worker2Lq = utiltestingapi.MakeLocalQueue(worker2Cq.Name, worker2Ns.Name).ClusterQueue(worker2Cq.Name).Obj()
 		gomega.Expect(worker2TestCluster.client.Create(worker2TestCluster.ctx, worker2Lq)).Should(gomega.Succeed())
 	})
 
@@ -159,7 +160,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		util.ExpectObjectToBeDeleted(managerTestCluster.ctx, managerTestCluster.client, managerMultiKueueSecret2, true)
 	})
 	ginkgo.It("Should properly manage the active condition of AdmissionChecks and MultiKueueClusters, kubeconfig provided by secret", func() {
-		ac := utiltesting.MakeAdmissionCheck("testing-ac").
+		ac := utiltestingapi.MakeAdmissionCheck("testing-ac").
 			ControllerName(kueue.MultiKueueControllerName).
 			Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "testing-config").
 			Obj()
@@ -185,12 +186,12 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		})
 
 		ginkgo.By("creating a config with duplicate clusters should fail", func() {
-			badConfig := utiltesting.MakeMultiKueueConfig("bad-config").Clusters("c1", "c2", "c1").Obj()
+			badConfig := utiltestingapi.MakeMultiKueueConfig("bad-config").Clusters("c1", "c2", "c1").Obj()
 			gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, badConfig).Error()).Should(gomega.Equal(
 				`MultiKueueConfig.kueue.x-k8s.io "bad-config" is invalid: spec.clusters[2]: Duplicate value: "c1"`))
 		})
 
-		config := utiltesting.MakeMultiKueueConfig("testing-config").Clusters("testing-cluster").Obj()
+		config := utiltestingapi.MakeMultiKueueConfig("testing-config").Clusters("testing-cluster").Obj()
 		ginkgo.By("creating the config, the admission check's state is updated", func() {
 			gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, config)).Should(gomega.Succeed())
 			ginkgo.DeferCleanup(func() error { return managerTestCluster.client.Delete(managerTestCluster.ctx, config) })
@@ -210,7 +211,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 			})
 		})
 
-		cluster := utiltesting.MakeMultiKueueCluster("testing-cluster").KubeConfig(kueue.SecretLocationType, "testing-secret").Obj()
+		cluster := utiltestingapi.MakeMultiKueueCluster("testing-cluster").KubeConfig(kueue.SecretLocationType, "testing-secret").Obj()
 		ginkgo.By("creating the cluster, its Active state is updated, the admission check's state is updated", func() {
 			gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, cluster)).Should(gomega.Succeed())
 			ginkgo.DeferCleanup(func() error { return managerTestCluster.client.Delete(managerTestCluster.ctx, cluster) })
@@ -291,7 +292,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 	})
 
 	ginkgo.It("Should properly manage the active condition of AdmissionChecks and MultiKueueClusters, kubeconfig provided by file", func() {
-		ac := utiltesting.MakeAdmissionCheck("testing-ac").
+		ac := utiltestingapi.MakeAdmissionCheck("testing-ac").
 			ControllerName(kueue.MultiKueueControllerName).
 			Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", "testing-config").
 			Obj()
@@ -319,7 +320,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 		tempDir := ginkgo.GinkgoT().TempDir()
 		fsKubeConfig := filepath.Join(tempDir, "testing.kubeconfig")
 
-		config := utiltesting.MakeMultiKueueConfig("testing-config").Clusters("testing-cluster").Obj()
+		config := utiltestingapi.MakeMultiKueueConfig("testing-config").Clusters("testing-cluster").Obj()
 		ginkgo.By("creating the config, the admission check's state is updated", func() {
 			gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, config)).Should(gomega.Succeed())
 			ginkgo.DeferCleanup(func() error { return managerTestCluster.client.Delete(managerTestCluster.ctx, config) })
@@ -339,7 +340,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 			})
 		})
 
-		cluster := utiltesting.MakeMultiKueueCluster("testing-cluster").KubeConfig(kueue.PathLocationType, fsKubeConfig).Obj()
+		cluster := utiltestingapi.MakeMultiKueueCluster("testing-cluster").KubeConfig(kueue.PathLocationType, fsKubeConfig).Obj()
 		ginkgo.By("creating the cluster, its Active state is updated, the admission check's state is updated", func() {
 			gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, cluster)).Should(gomega.Succeed())
 			ginkgo.DeferCleanup(func() error { return managerTestCluster.client.Delete(managerTestCluster.ctx, cluster) })
diff --git a/test/integration/singlecluster/controller/admissionchecks/provisioning/provisioning_test.go b/test/integration/singlecluster/controller/admissionchecks/provisioning/provisioning_test.go
index b8513a749..5b5e5b529 100644
--- a/test/integration/singlecluster/controller/admissionchecks/provisioning/provisioning_test.go
+++ b/test/integration/singlecluster/controller/admissionchecks/provisioning/provisioning_test.go
@@ -36,6 +36,7 @@ import (
 	workloadjob "sigs.k8s.io/kueue/pkg/controller/jobs/job"
 	"sigs.k8s.io/kueue/pkg/util/admissioncheck"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/integration/framework"
@@ -52,7 +53,7 @@ var _ = ginkgo.Describe("Provisioning", ginkgo.Ordered, ginkgo.ContinueOnFailure
 		flavorOnDemand                     = "on-demand"
 	)
 
-	baseConfig := testing.MakeProvisioningRequestConfig("prov-config").ProvisioningClass("provisioning-class")
+	baseConfig := utiltestingapi.MakeProvisioningRequestConfig("prov-config").ProvisioningClass("provisioning-class")
 
 	baseConfigWithParameters := baseConfig.Clone().Parameters(map[string]kueue.Parameter{
 		"p1": "v1",
@@ -89,24 +90,24 @@ var _ = ginkgo.Describe("Provisioning", ginkgo.Ordered, ginkgo.ContinueOnFailure
 			prc = baseConfigWithParameters.Clone().RetryLimit(0).Obj()
 			util.MustCreate(ctx, k8sClient, prc)
 
-			prc2 = testing.MakeProvisioningRequestConfig("prov-config2").ProvisioningClass("provisioning-class2").Parameters(map[string]kueue.Parameter{
+			prc2 = utiltestingapi.MakeProvisioningRequestConfig("prov-config2").ProvisioningClass("provisioning-class2").Parameters(map[string]kueue.Parameter{
 				"p1": "v1.2",
 				"p2": "v2.2",
 			}).Obj()
 
 			util.MustCreate(ctx, k8sClient, prc2)
 
-			ac = testing.MakeAdmissionCheck("ac-prov").
+			ac = utiltestingapi.MakeAdmissionCheck("ac-prov").
 				ControllerName(kueue.ProvisioningRequestControllerName).
 				Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", prc.Name).
 				Obj()
 			util.MustCreate(ctx, k8sClient, ac)
 
-			rf = testing.MakeResourceFlavor(flavorOnDemand).NodeLabel("ns1", "ns1v").Obj()
+			rf = utiltestingapi.MakeResourceFlavor(flavorOnDemand).NodeLabel("ns1", "ns1v").Obj()
 			util.MustCreate(ctx, k8sClient, rf)
 
-			cq = testing.MakeClusterQueue("cluster-queue").
-				ResourceGroup(*testing.MakeFlavorQuotas(rf.Name).
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).
 					Resource(resourceGPU, "5", "5").Obj()).
 				Cohort("cohort").
 				AdmissionChecks(kueue.AdmissionCheckReference(ac.Name)).
@@ -114,18 +115,18 @@ var _ = ginkgo.Describe("Provisioning", ginkgo.Ordered, ginkgo.ContinueOnFailure
 			util.MustCreate(ctx, k8sClient, cq)
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, cq)
 
-			lq = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			lq = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, lq)
 			util.ExpectLocalQueuesToBeActive(ctx, k8sClient, lq)
 
-			wl := testing.MakeWorkload("wl", ns.Name).
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).
 				Queue(kueue.LocalQueueName(lq.Name)).
 				PodSets(
-					*testing.MakePodSet("ps1", 3).
+					*utiltestingapi.MakePodSet("ps1", 3).
 						Request(corev1.ResourceCPU, "1").
 						Image("image").
 						Obj(),
-					*testing.MakePodSet("ps2", 6).
+					*utiltestingapi.MakePodSet("ps2", 6).
 						Request(corev1.ResourceCPU, "500m").
 						Request(customResourceOne, "1").
 						Limit(customResourceOne, "1").
@@ -144,13 +145,13 @@ var _ = ginkgo.Describe("Provisioning", ginkgo.Ordered, ginkgo.ContinueOnFailure
 				Name:      provisioning.ProvisioningRequestName(wlKey.Name, kueue.AdmissionCheckReference(ac.Name), 1),
 			}
 
-			admission = testing.MakeAdmission(cq.Name).
+			admission = utiltestingapi.MakeAdmission(cq.Name).
 				PodSets(
-					testing.MakePodSetAssignment("ps1").
+					utiltestingapi.MakePodSetAssignment("ps1").
 						Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(rf.Name), "3").
 						Count(3).
 						Obj(),
-					testing.MakePodSetAssignment("ps2").
+					utiltestingapi.MakePodSetAssignment("ps2").
 						Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(rf.Name), "2").
 						Count(4).
 						Obj(),
@@ -793,17 +794,17 @@ var _ = ginkgo.Describe("Provisioning", ginkgo.Ordered, ginkgo.ContinueOnFailure
 			prc = baseConfig.Clone().RetryLimit(1).BaseBackoff(2).Obj()
 			util.MustCreate(ctx, k8sClient, prc)
 
-			ac = testing.MakeAdmissionCheck("ac-prov").
+			ac = utiltestingapi.MakeAdmissionCheck("ac-prov").
 				ControllerName(kueue.ProvisioningRequestControllerName).
 				Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", prc.Name).
 				Obj()
 			util.MustCreate(ctx, k8sClient, ac)
 
-			rf = testing.MakeResourceFlavor("rf1").Label("ns1", "ns1v").Obj()
+			rf = utiltestingapi.MakeResourceFlavor("rf1").Label("ns1", "ns1v").Obj()
 			util.MustCreate(ctx, k8sClient, rf)
 
-			cq = testing.MakeClusterQueue("cluster-queue").
-				ResourceGroup(*testing.MakeFlavorQuotas(rf.Name).
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).
 					Resource(resourceGPU, "5", "5").Obj()).
 				Cohort("cohort").
 				AdmissionChecks(kueue.AdmissionCheckReference(ac.Name)).
@@ -811,18 +812,18 @@ var _ = ginkgo.Describe("Provisioning", ginkgo.Ordered, ginkgo.ContinueOnFailure
 			util.MustCreate(ctx, k8sClient, cq)
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, cq)
 
-			lq = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			lq = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, lq)
 			util.ExpectLocalQueuesToBeActive(ctx, k8sClient, lq)
 
-			wl := testing.MakeWorkload("wl", ns.Name).
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).
 				Queue(kueue.LocalQueueName(lq.Name)).
 				PodSets(
-					*testing.MakePodSet("ps1", 3).
+					*utiltestingapi.MakePodSet("ps1", 3).
 						Request(corev1.ResourceCPU, "1").
 						Image("image").
 						Obj(),
-					*testing.MakePodSet("ps2", 6).
+					*utiltestingapi.MakePodSet("ps2", 6).
 						Request(corev1.ResourceCPU, "500m").
 						Request(customResourceOne, "1").
 						Limit(customResourceOne, "1").
@@ -833,13 +834,13 @@ var _ = ginkgo.Describe("Provisioning", ginkgo.Ordered, ginkgo.ContinueOnFailure
 			util.MustCreate(ctx, k8sClient, wl)
 
 			wlKey = client.ObjectKeyFromObject(wl)
-			admission = testing.MakeAdmission(cq.Name).
+			admission = utiltestingapi.MakeAdmission(cq.Name).
 				PodSets(
-					testing.MakePodSetAssignment("ps1").
+					utiltestingapi.MakePodSetAssignment("ps1").
 						Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(rf.Name), "3").
 						Count(3).
 						Obj(),
-					testing.MakePodSetAssignment("ps2").
+					utiltestingapi.MakePodSetAssignment("ps2").
 						Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(rf.Name), "2").
 						Count(4).
 						Obj(),
@@ -1228,31 +1229,31 @@ var _ = ginkgo.Describe("Provisioning", ginkgo.Ordered, ginkgo.ContinueOnFailure
 			prc = baseConfig.Clone().RetryLimit(2).BaseBackoff(2).Obj()
 			util.MustCreate(ctx, k8sClient, prc)
 
-			ac = testing.MakeAdmissionCheck("ac-prov").
+			ac = utiltestingapi.MakeAdmissionCheck("ac-prov").
 				ControllerName(kueue.ProvisioningRequestControllerName).
 				Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", prc.Name).
 				Obj()
 			util.MustCreate(ctx, k8sClient, ac)
 
-			rf = testing.MakeResourceFlavor("rf1").Obj()
+			rf = utiltestingapi.MakeResourceFlavor("rf1").Obj()
 			util.MustCreate(ctx, k8sClient, rf)
 
-			cq = testing.MakeClusterQueue("cluster-queue").
-				ResourceGroup(*testing.MakeFlavorQuotas(rf.Name).
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).
 					Resource(resourceGPU, "5").Obj()).
 				AdmissionChecks(kueue.AdmissionCheckReference(ac.Name)).
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, cq)
 
-			lq = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			lq = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, lq)
 			util.ExpectLocalQueuesToBeActive(ctx, k8sClient, lq)
 
-			wl := testing.MakeWorkload("wl", ns.Name).
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).
 				Queue(kueue.LocalQueueName(lq.Name)).
 				PodSets(
-					*testing.MakePodSet("ps1", 3).
+					*utiltestingapi.MakePodSet("ps1", 3).
 						Request(corev1.ResourceCPU, "1").
 						Image("image").
 						Obj(),
@@ -1260,8 +1261,8 @@ var _ = ginkgo.Describe("Provisioning", ginkgo.Ordered, ginkgo.ContinueOnFailure
 			util.MustCreate(ctx, k8sClient, wl)
 
 			wlKey = client.ObjectKeyFromObject(wl)
-			admission = testing.MakeAdmission(cq.Name).
-				PodSets(testing.MakePodSetAssignment("ps1").
+			admission = utiltestingapi.MakeAdmission(cq.Name).
+				PodSets(utiltestingapi.MakePodSetAssignment("ps1").
 					Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(rf.Name), "3").
 					Count(3).
 					Obj()).
@@ -1402,17 +1403,17 @@ var _ = ginkgo.Describe("Provisioning", ginkgo.Ordered, ginkgo.ContinueOnFailure
 				Obj()
 			util.MustCreate(ctx, k8sClient, prc)
 
-			ac = testing.MakeAdmissionCheck("ac-prov").
+			ac = utiltestingapi.MakeAdmissionCheck("ac-prov").
 				ControllerName(kueue.ProvisioningRequestControllerName).
 				Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", "prov-config").
 				Obj()
 			util.MustCreate(ctx, k8sClient, ac)
 
-			rf = testing.MakeResourceFlavor(flavorOnDemand).NodeLabel("ns1", "ns1v").Obj()
+			rf = utiltestingapi.MakeResourceFlavor(flavorOnDemand).NodeLabel("ns1", "ns1v").Obj()
 			util.MustCreate(ctx, k8sClient, rf)
 
-			cq = testing.MakeClusterQueue("cluster-queue").
-				ResourceGroup(*testing.MakeFlavorQuotas(rf.Name).
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rf.Name).
 					Resource(resourceGPU, "5", "5").Obj()).
 				Cohort("cohort").
 				AdmissionChecks(kueue.AdmissionCheckReference(ac.Name)).
@@ -1420,20 +1421,20 @@ var _ = ginkgo.Describe("Provisioning", ginkgo.Ordered, ginkgo.ContinueOnFailure
 			util.MustCreate(ctx, k8sClient, cq)
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, cq)
 
-			lq = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			lq = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, lq)
 			util.ExpectLocalQueuesToBeActive(ctx, k8sClient, lq)
 
-			wl := testing.MakeWorkload("wl", ns.Name).
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).
 				Queue(kueue.LocalQueueName(lq.Name)).
 				PodSets(
-					*testing.MakePodSet("master", 1).
+					*utiltestingapi.MakePodSet("master", 1).
 						Request(corev1.ResourceCPU, "1").
 						Request(corev1.ResourceMemory, "2Gi").
 						Image("image").
 						Labels(map[string]string{"role": "master"}).
 						Obj(),
-					*testing.MakePodSet("worker", 4).
+					*utiltestingapi.MakePodSet("worker", 4).
 						Request(corev1.ResourceCPU, "1").
 						Request(corev1.ResourceMemory, "2Gi").
 						Image("image").
@@ -1449,13 +1450,13 @@ var _ = ginkgo.Describe("Provisioning", ginkgo.Ordered, ginkgo.ContinueOnFailure
 				Name:      provisioning.ProvisioningRequestName(wlKey.Name, kueue.AdmissionCheckReference(ac.Name), 1),
 			}
 
-			admission = testing.MakeAdmission(cq.Name).
+			admission = utiltestingapi.MakeAdmission(cq.Name).
 				PodSets(
-					testing.MakePodSetAssignment("master").
+					utiltestingapi.MakePodSetAssignment("master").
 						Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(rf.Name), "1").
 						Assignment(corev1.ResourceMemory, kueue.ResourceFlavorReference(rf.Name), "2Gi").
 						Obj(),
-					testing.MakePodSetAssignment("worker").
+					utiltestingapi.MakePodSetAssignment("worker").
 						Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(rf.Name), "1").
 						Assignment(corev1.ResourceMemory, kueue.ResourceFlavorReference(rf.Name), "2Gi").
 						Count(2).
@@ -1546,7 +1547,7 @@ var _ = ginkgo.Describe("Provisioning with scheduling", ginkgo.Ordered, ginkgo.C
 		priorityValue     = 1000
 	)
 
-	baseConfig := testing.MakeProvisioningRequestConfig("prov-config").ProvisioningClass("provisioning-class")
+	baseConfig := utiltestingapi.MakeProvisioningRequestConfig("prov-config").ProvisioningClass("provisioning-class")
 
 	ginkgo.JustBeforeEach(func() {
 		fwk.StartManager(ctx, cfg, managerSetup(runScheduler, runJobController))
@@ -1555,24 +1556,24 @@ var _ = ginkgo.Describe("Provisioning with scheduling", ginkgo.Ordered, ginkgo.C
 	ginkgo.JustBeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "provisioning-")
 
-		rf1 = testing.MakeResourceFlavor(flavor1Name).NodeLabel("ns1", "ns1v").Obj()
+		rf1 = utiltestingapi.MakeResourceFlavor(flavor1Name).NodeLabel("ns1", "ns1v").Obj()
 		util.MustCreate(ctx, k8sClient, rf1)
-		rf2 = testing.MakeResourceFlavor(flavor2Name).NodeLabel("ns2", "ns2v").Obj()
+		rf2 = utiltestingapi.MakeResourceFlavor(flavor2Name).NodeLabel("ns2", "ns2v").Obj()
 		util.MustCreate(ctx, k8sClient, rf2)
 
-		priorityClass = testing.MakeWorkloadPriorityClass(priorityClassName).PriorityValue(priorityValue).Obj()
+		priorityClass = utiltestingapi.MakeWorkloadPriorityClass(priorityClassName).PriorityValue(priorityValue).Obj()
 		util.MustCreate(ctx, k8sClient, priorityClass)
 
 		prc = baseConfig.Clone().RetryLimit(1).Obj()
 		util.MustCreate(ctx, k8sClient, prc)
 
-		ac1 = testing.MakeAdmissionCheck(ac1Name).
+		ac1 = utiltestingapi.MakeAdmissionCheck(ac1Name).
 			ControllerName(kueue.ProvisioningRequestControllerName).
 			Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", "prov-config").
 			Obj()
 		util.MustCreate(ctx, k8sClient, ac1)
 
-		ac2 = testing.MakeAdmissionCheck(ac2Name).
+		ac2 = utiltestingapi.MakeAdmissionCheck(ac2Name).
 			ControllerName(kueue.ProvisioningRequestControllerName).
 			Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", "prov-config").
 			Obj()
@@ -1598,13 +1599,13 @@ var _ = ginkgo.Describe("Provisioning with scheduling", ginkgo.Ordered, ginkgo.C
 	ginkgo.When("A workload is preempted from a flavor which uses an admission check", func() {
 		ginkgo.It("Should be successfully re-admitted on another flavor without an admission check", func() {
 			ginkgo.By("Set up ClusterQueue and LocalQueue", func() {
-				cq = testing.MakeClusterQueue("cluster-queue").
+				cq = utiltestingapi.MakeClusterQueue("cluster-queue").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas(rf1.Name).Resource(corev1.ResourceCPU, "0.75").Obj(),
-						*testing.MakeFlavorQuotas(rf2.Name).Resource(corev1.ResourceCPU, "0.5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas(rf1.Name).Resource(corev1.ResourceCPU, "0.75").Obj(),
+						*utiltestingapi.MakeFlavorQuotas(rf2.Name).Resource(corev1.ResourceCPU, "0.5").Obj(),
 					).
 					AdmissionCheckStrategy(kueue.AdmissionCheckStrategyRule{
 						Name:      ac1Ref,
@@ -1614,7 +1615,7 @@ var _ = ginkgo.Describe("Provisioning with scheduling", ginkgo.Ordered, ginkgo.C
 				util.MustCreate(ctx, k8sClient, cq)
 				util.ExpectClusterQueuesToBeActive(ctx, k8sClient, cq)
 
-				lq = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+				lq = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 				util.MustCreate(ctx, k8sClient, lq)
 				util.ExpectLocalQueuesToBeActive(ctx, k8sClient, lq)
 			})
@@ -1727,13 +1728,13 @@ var _ = ginkgo.Describe("Provisioning with scheduling", ginkgo.Ordered, ginkgo.C
 
 		ginkgo.It("Should be successfully re-admitted on another flavor with another admission check", func() {
 			ginkgo.By("Set up ClusterQueue and LocalQueue", func() {
-				cq = testing.MakeClusterQueue("cluster-queue").
+				cq = utiltestingapi.MakeClusterQueue("cluster-queue").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 					}).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas(rf1.Name).Resource(corev1.ResourceCPU, "0.75").Obj(),
-						*testing.MakeFlavorQuotas(rf2.Name).Resource(corev1.ResourceCPU, "0.5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas(rf1.Name).Resource(corev1.ResourceCPU, "0.75").Obj(),
+						*utiltestingapi.MakeFlavorQuotas(rf2.Name).Resource(corev1.ResourceCPU, "0.5").Obj(),
 					).
 					AdmissionCheckStrategy(
 						kueue.AdmissionCheckStrategyRule{
@@ -1749,7 +1750,7 @@ var _ = ginkgo.Describe("Provisioning with scheduling", ginkgo.Ordered, ginkgo.C
 				util.MustCreate(ctx, k8sClient, cq)
 				util.ExpectClusterQueuesToBeActive(ctx, k8sClient, cq)
 
-				lq = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+				lq = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 				util.MustCreate(ctx, k8sClient, lq)
 				util.ExpectLocalQueuesToBeActive(ctx, k8sClient, lq)
 			})
diff --git a/test/integration/singlecluster/controller/core/admissioncheck_controller_test.go b/test/integration/singlecluster/controller/core/admissioncheck_controller_test.go
index 27cfc621d..b3f8ec218 100644
--- a/test/integration/singlecluster/controller/core/admissioncheck_controller_test.go
+++ b/test/integration/singlecluster/controller/core/admissioncheck_controller_test.go
@@ -25,6 +25,7 @@ import (
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -52,8 +53,8 @@ var _ = ginkgo.Describe("AdmissionCheck controller", ginkgo.Ordered, ginkgo.Cont
 		var clusterQueue *kueue.ClusterQueue
 
 		ginkgo.BeforeEach(func() {
-			admissionCheck = utiltesting.MakeAdmissionCheck("check1").ControllerName("ac-controller").Obj()
-			clusterQueue = utiltesting.MakeClusterQueue("foo").
+			admissionCheck = utiltestingapi.MakeAdmissionCheck("check1").ControllerName("ac-controller").Obj()
+			clusterQueue = utiltestingapi.MakeClusterQueue("foo").
 				AdmissionChecks("check1").
 				Obj()
 
diff --git a/test/integration/singlecluster/controller/core/clusterqueue_controller_test.go b/test/integration/singlecluster/controller/core/clusterqueue_controller_test.go
index 4a8ff8b42..7cb27ffbc 100644
--- a/test/integration/singlecluster/controller/core/clusterqueue_controller_test.go
+++ b/test/integration/singlecluster/controller/core/clusterqueue_controller_test.go
@@ -30,6 +30,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/metrics"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/integration/framework"
 	"sigs.k8s.io/kueue/test/util"
@@ -108,28 +109,28 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 		)
 
 		ginkgo.BeforeEach(func() {
-			ac = testing.MakeAdmissionCheck("ac").ControllerName("ac-controller").Obj()
+			ac = utiltestingapi.MakeAdmissionCheck("ac").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, ac)
 			util.SetAdmissionCheckActive(ctx, k8sClient, ac, metav1.ConditionTrue)
 
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(flavorOnDemand).
+					*utiltestingapi.MakeFlavorQuotas(flavorOnDemand).
 						Resource(corev1.ResourceCPU, "5", "5").Obj(),
-					*testing.MakeFlavorQuotas(flavorSpot).
+					*utiltestingapi.MakeFlavorQuotas(flavorSpot).
 						Resource(corev1.ResourceCPU, "5", "5").Obj(),
 				).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(flavorModelA).
+					*utiltestingapi.MakeFlavorQuotas(flavorModelA).
 						Resource(resourceGPU, "5", "5").Obj(),
-					*testing.MakeFlavorQuotas(flavorModelB).
+					*utiltestingapi.MakeFlavorQuotas(flavorModelB).
 						Resource(resourceGPU, "5", "5").Obj(),
 				).
 				Cohort("cohort").
 				AdmissionChecks(kueue.AdmissionCheckReference(ac.Name)).
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 
@@ -144,17 +145,17 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 
 		ginkgo.It("Should update status and report metrics when workloads are assigned and finish", framework.SlowSpec, func() {
 			workloads := []*kueue.Workload{
-				testing.MakeWorkload("one", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).
+				utiltestingapi.MakeWorkload("one", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).
 					Request(corev1.ResourceCPU, "2").Request(resourceGPU, "2").Obj(),
-				testing.MakeWorkload("two", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).
+				utiltestingapi.MakeWorkload("two", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).
 					Request(corev1.ResourceCPU, "3").Request(resourceGPU, "3").Obj(),
-				testing.MakeWorkload("three", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).
+				utiltestingapi.MakeWorkload("three", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).
 					Request(corev1.ResourceCPU, "1").Request(resourceGPU, "1").Obj(),
-				testing.MakeWorkload("four", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).
+				utiltestingapi.MakeWorkload("four", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).
 					Request(corev1.ResourceCPU, "1").Request(resourceGPU, "1").Obj(),
-				testing.MakeWorkload("five", ns.Name).Queue("other").
+				utiltestingapi.MakeWorkload("five", ns.Name).Queue("other").
 					Request(corev1.ResourceCPU, "1").Request(resourceGPU, "1").Obj(),
-				testing.MakeWorkload("six", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).
+				utiltestingapi.MakeWorkload("six", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).
 					Request(corev1.ResourceCPU, "1").Request(resourceGPU, "1").Obj(),
 			}
 
@@ -203,31 +204,31 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 			util.ExpectLQReservingActiveWorkloadsMetric(localQueue, 0)
 
 			ginkgo.By("Creating ResourceFlavors")
-			onDemandFlavor = testing.MakeResourceFlavor(flavorOnDemand).Obj()
+			onDemandFlavor = utiltestingapi.MakeResourceFlavor(flavorOnDemand).Obj()
 			util.MustCreate(ctx, k8sClient, onDemandFlavor)
-			spotFlavor = testing.MakeResourceFlavor(flavorSpot).Obj()
+			spotFlavor = utiltestingapi.MakeResourceFlavor(flavorSpot).Obj()
 			util.MustCreate(ctx, k8sClient, spotFlavor)
-			modelAFlavor = testing.MakeResourceFlavor(flavorModelA).NodeLabel(resourceGPU.String(), flavorModelA).Obj()
+			modelAFlavor = utiltestingapi.MakeResourceFlavor(flavorModelA).NodeLabel(resourceGPU.String(), flavorModelA).Obj()
 			util.MustCreate(ctx, k8sClient, modelAFlavor)
-			modelBFlavor = testing.MakeResourceFlavor(flavorModelB).NodeLabel(resourceGPU.String(), flavorModelB).Obj()
+			modelBFlavor = utiltestingapi.MakeResourceFlavor(flavorModelB).NodeLabel(resourceGPU.String(), flavorModelB).Obj()
 			util.MustCreate(ctx, k8sClient, modelBFlavor)
 
 			ginkgo.By("Set workloads quota reservation")
 			admissions := []*kueue.Admission{
-				testing.MakeAdmission(clusterQueue.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeAdmission(clusterQueue.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, flavorOnDemand, "2").Assignment(resourceGPU, flavorModelA, "2").Obj()).Obj(),
-				testing.MakeAdmission(clusterQueue.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeAdmission(clusterQueue.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, flavorOnDemand, "3").Assignment(resourceGPU, flavorModelA, "3").Obj()).Obj(),
-				testing.MakeAdmission(clusterQueue.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeAdmission(clusterQueue.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, flavorOnDemand, "1").Assignment(resourceGPU, flavorModelB, "1").Obj()).Obj(),
-				testing.MakeAdmission(clusterQueue.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeAdmission(clusterQueue.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, flavorSpot, "1").Assignment(resourceGPU, flavorModelB, "1").Obj()).Obj(),
-				testing.MakeAdmission("other").
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeAdmission("other").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, flavorSpot, "1").Assignment(resourceGPU, flavorModelB, "1").Obj()).Obj(),
 				nil,
 			}
@@ -363,7 +364,7 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 		})
 
 		ginkgo.It("Should update status and report metrics when a pending workload is deleted", func() {
-			workload := testing.MakeWorkload("one", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).
+			workload := utiltestingapi.MakeWorkload("one", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).
 				Request(corev1.ResourceCPU, "5").Obj()
 
 			ginkgo.By("Creating a workload", func() {
@@ -425,23 +426,23 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 
 		ginkgo.It("Should update status when workloads have reclaimable pods", framework.SlowSpec, func() {
 			ginkgo.By("Creating ResourceFlavors", func() {
-				onDemandFlavor = testing.MakeResourceFlavor(flavorOnDemand).Obj()
+				onDemandFlavor = utiltestingapi.MakeResourceFlavor(flavorOnDemand).Obj()
 				util.MustCreate(ctx, k8sClient, onDemandFlavor)
-				spotFlavor = testing.MakeResourceFlavor(flavorSpot).Obj()
+				spotFlavor = utiltestingapi.MakeResourceFlavor(flavorSpot).Obj()
 				util.MustCreate(ctx, k8sClient, spotFlavor)
-				modelAFlavor = testing.MakeResourceFlavor(flavorModelA).NodeLabel(resourceGPU.String(), flavorModelA).Obj()
+				modelAFlavor = utiltestingapi.MakeResourceFlavor(flavorModelA).NodeLabel(resourceGPU.String(), flavorModelA).Obj()
 				util.MustCreate(ctx, k8sClient, modelAFlavor)
-				modelBFlavor = testing.MakeResourceFlavor(flavorModelB).NodeLabel(resourceGPU.String(), flavorModelB).Obj()
+				modelBFlavor = utiltestingapi.MakeResourceFlavor(flavorModelB).NodeLabel(resourceGPU.String(), flavorModelB).Obj()
 				util.MustCreate(ctx, k8sClient, modelBFlavor)
 			})
 
-			wl := testing.MakeWorkload("one", ns.Name).
+			wl := utiltestingapi.MakeWorkload("one", ns.Name).
 				Queue(kueue.LocalQueueName(localQueue.Name)).
 				PodSets(
-					*testing.MakePodSet("driver", 2).
+					*utiltestingapi.MakePodSet("driver", 2).
 						Request(corev1.ResourceCPU, "1").
 						Obj(),
-					*testing.MakePodSet("workers", 5).
+					*utiltestingapi.MakePodSet("workers", 5).
 						Request(resourceGPU, "1").
 						Obj(),
 				).
@@ -453,7 +454,7 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 			})
 
 			ginkgo.By("Admitting the workload", func() {
-				admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+				admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 					kueue.PodSetAssignment{
 						Name: "driver",
 						Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -613,19 +614,19 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 		)
 
 		ginkgo.BeforeEach(func() {
-			cq = testing.MakeClusterQueue("bar-cq").
+			cq = utiltestingapi.MakeClusterQueue("bar-cq").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(flavorCPUArchA).Resource(corev1.ResourceCPU, "5", "5").Obj(),
-					*testing.MakeFlavorQuotas(flavorCPUArchB).Resource(corev1.ResourceCPU, "5", "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas(flavorCPUArchA).Resource(corev1.ResourceCPU, "5", "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas(flavorCPUArchB).Resource(corev1.ResourceCPU, "5", "5").Obj(),
 				).
 				Cohort("bar-cohort").
 				AdmissionChecks("check1", "check2").
 				Obj()
 
 			util.MustCreate(ctx, k8sClient, cq)
-			lq = testing.MakeLocalQueue("bar-lq", ns.Name).ClusterQueue(cq.Name).Obj()
+			lq = utiltestingapi.MakeLocalQueue("bar-lq", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, lq)
-			wl = testing.MakeWorkload("bar-wl", ns.Name).Queue(kueue.LocalQueueName(lq.Name)).Obj()
+			wl = utiltestingapi.MakeWorkload("bar-wl", ns.Name).Queue(kueue.LocalQueueName(lq.Name)).Obj()
 			util.MustCreate(ctx, k8sClient, wl)
 		})
 
@@ -640,11 +641,11 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 		})
 
 		ginkgo.It("Should update status conditions when flavors are created", func() {
-			check1 = testing.MakeAdmissionCheck("check1").ControllerName("ac-controller").Obj()
+			check1 = utiltestingapi.MakeAdmissionCheck("check1").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, check1)
 			util.SetAdmissionCheckActive(ctx, k8sClient, check1, metav1.ConditionTrue)
 
-			check2 = testing.MakeAdmissionCheck("check2").ControllerName("ac-controller").Obj()
+			check2 = utiltestingapi.MakeAdmissionCheck("check2").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, check2)
 			util.SetAdmissionCheckActive(ctx, k8sClient, check2, metav1.ConditionTrue)
 
@@ -664,7 +665,7 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			ginkgo.By("One of flavors is not found")
-			cpuArchAFlavor = testing.MakeResourceFlavor(flavorCPUArchA).Obj()
+			cpuArchAFlavor = utiltestingapi.MakeResourceFlavor(flavorCPUArchA).Obj()
 			util.MustCreate(ctx, k8sClient, cpuArchAFlavor)
 			gomega.Eventually(func(g gomega.Gomega) {
 				var updatedCq kueue.ClusterQueue
@@ -680,7 +681,7 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			ginkgo.By("All flavors are created")
-			cpuArchBFlavor = testing.MakeResourceFlavor(flavorCPUArchB).Obj()
+			cpuArchBFlavor = utiltestingapi.MakeResourceFlavor(flavorCPUArchB).Obj()
 			util.MustCreate(ctx, k8sClient, cpuArchBFlavor)
 			gomega.Eventually(func(g gomega.Gomega) {
 				var updatedCq kueue.ClusterQueue
@@ -697,10 +698,10 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 		})
 
 		ginkgo.It("Should update status conditions when admission checks are created", func() {
-			cpuArchAFlavor = testing.MakeResourceFlavor(flavorCPUArchA).Obj()
+			cpuArchAFlavor = utiltestingapi.MakeResourceFlavor(flavorCPUArchA).Obj()
 			util.MustCreate(ctx, k8sClient, cpuArchAFlavor)
 
-			cpuArchBFlavor = testing.MakeResourceFlavor(flavorCPUArchB).Obj()
+			cpuArchBFlavor = utiltestingapi.MakeResourceFlavor(flavorCPUArchB).Obj()
 			util.MustCreate(ctx, k8sClient, cpuArchBFlavor)
 
 			ginkgo.By("All checks are not found")
@@ -719,7 +720,7 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			ginkgo.By("One of the checks is not found")
-			check1 = testing.MakeAdmissionCheck("check1").ControllerName("ac-controller").Active(metav1.ConditionTrue).Obj()
+			check1 = utiltestingapi.MakeAdmissionCheck("check1").ControllerName("ac-controller").Active(metav1.ConditionTrue).Obj()
 			util.MustCreate(ctx, k8sClient, check1)
 			util.SetAdmissionCheckActive(ctx, k8sClient, check1, metav1.ConditionTrue)
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -736,7 +737,7 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			ginkgo.By("One check is inactive")
-			check2 = testing.MakeAdmissionCheck("check2").ControllerName("ac-controller").Obj()
+			check2 = utiltestingapi.MakeAdmissionCheck("check2").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, check2)
 			gomega.Eventually(func(g gomega.Gomega) {
 				var updatedCq kueue.ClusterQueue
@@ -768,17 +769,17 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 		})
 
 		ginkgo.It("Should prevent workload admission due to multikueue contraints", func() {
-			cpuArchAFlavor = testing.MakeResourceFlavor(flavorCPUArchA).Obj()
+			cpuArchAFlavor = utiltestingapi.MakeResourceFlavor(flavorCPUArchA).Obj()
 			util.MustCreate(ctx, k8sClient, cpuArchAFlavor)
 
-			cpuArchBFlavor = testing.MakeResourceFlavor(flavorCPUArchB).Obj()
+			cpuArchBFlavor = utiltestingapi.MakeResourceFlavor(flavorCPUArchB).Obj()
 			util.MustCreate(ctx, k8sClient, cpuArchBFlavor)
 
-			check1 = testing.MakeAdmissionCheck("check1").ControllerName(kueue.MultiKueueControllerName).Obj()
+			check1 = utiltestingapi.MakeAdmissionCheck("check1").ControllerName(kueue.MultiKueueControllerName).Obj()
 			util.MustCreate(ctx, k8sClient, check1)
 			util.SetAdmissionCheckActive(ctx, k8sClient, check1, metav1.ConditionTrue)
 
-			check2 = testing.MakeAdmissionCheck("check2").ControllerName(kueue.MultiKueueControllerName).Obj()
+			check2 = utiltestingapi.MakeAdmissionCheck("check2").ControllerName(kueue.MultiKueueControllerName).Obj()
 			util.MustCreate(ctx, k8sClient, check2)
 			util.SetAdmissionCheckActive(ctx, k8sClient, check2, metav1.ConditionTrue)
 
@@ -804,7 +805,7 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 				updatedCq.Spec.AdmissionChecks = nil
 				updatedCq.Spec.AdmissionChecksStrategy = &kueue.AdmissionChecksStrategy{
 					AdmissionChecks: []kueue.AdmissionCheckStrategyRule{
-						*testing.MakeAdmissionCheckStrategyRule("check1", flavorCPUArchA).Obj(),
+						*utiltestingapi.MakeAdmissionCheckStrategyRule("check1", flavorCPUArchA).Obj(),
 					},
 				}
 				g.Expect(k8sClient.Update(ctx, updatedCq)).Should(gomega.Succeed())
@@ -861,11 +862,11 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 		)
 
 		ginkgo.BeforeEach(func() {
-			check = testing.MakeAdmissionCheck("check").ControllerName("check-controller").Obj()
+			check = utiltestingapi.MakeAdmissionCheck("check").ControllerName("check-controller").Obj()
 			util.MustCreate(ctx, k8sClient, check)
 
-			cq = testing.MakeClusterQueue("foo-cq").AdmissionChecks(kueue.AdmissionCheckReference(check.Name)).Obj()
-			lq = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			cq = utiltestingapi.MakeClusterQueue("foo-cq").AdmissionChecks(kueue.AdmissionCheckReference(check.Name)).Obj()
+			lq = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, lq)
 			util.MustCreate(ctx, k8sClient, cq)
 		})
@@ -884,10 +885,10 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 			util.ExpectLQByStatusMetric(lq, metav1.ConditionTrue)
 
 			ginkgo.By("Admit workload")
-			wl := testing.MakeWorkload("workload", ns.Name).Queue(kueue.LocalQueueName(lq.Name)).Obj()
+			wl := utiltestingapi.MakeWorkload("workload", ns.Name).Queue(kueue.LocalQueueName(lq.Name)).Obj()
 			util.MustCreate(ctx, k8sClient, wl)
 			key := client.ObjectKeyFromObject(wl)
-			util.SetQuotaReservation(ctx, k8sClient, key, testing.MakeAdmission(cq.Name).Obj())
+			util.SetQuotaReservation(ctx, k8sClient, key, utiltestingapi.MakeAdmission(cq.Name).Obj())
 			util.SetWorkloadsAdmissionCheck(ctx, k8sClient, wl, kueue.AdmissionCheckReference(check.Name), kueue.CheckStateReady, true)
 			gomega.Eventually(func(g gomega.Gomega) {
 				updatedWl := &kueue.Workload{}
@@ -919,9 +920,9 @@ var _ = ginkgo.Describe("ClusterQueue controller", ginkgo.Ordered, ginkgo.Contin
 			util.ExpectLQByStatusMetric(lq, metav1.ConditionTrue)
 
 			ginkgo.By("Setting quota reservation")
-			wl := testing.MakeWorkload("workload", ns.Name).Queue(kueue.LocalQueueName(lq.Name)).Obj()
+			wl := utiltestingapi.MakeWorkload("workload", ns.Name).Queue(kueue.LocalQueueName(lq.Name)).Obj()
 			util.MustCreate(ctx, k8sClient, wl)
-			util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(wl), testing.MakeAdmission(cq.Name).Obj())
+			util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(wl), utiltestingapi.MakeAdmission(cq.Name).Obj())
 
 			ginkgo.By("Delete clusterQueue")
 			util.ExpectObjectToBeDeleted(ctx, k8sClient, cq, true)
diff --git a/test/integration/singlecluster/controller/core/localqueue_controller_test.go b/test/integration/singlecluster/controller/core/localqueue_controller_test.go
index 258850379..297927886 100644
--- a/test/integration/singlecluster/controller/core/localqueue_controller_test.go
+++ b/test/integration/singlecluster/controller/core/localqueue_controller_test.go
@@ -27,6 +27,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/integration/framework"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -41,14 +42,14 @@ var _ = ginkgo.Describe("Queue controller", ginkgo.Ordered, ginkgo.ContinueOnFai
 		queue           *kueue.LocalQueue
 		clusterQueue    *kueue.ClusterQueue
 		resourceFlavors = []kueue.ResourceFlavor{
-			*testing.MakeResourceFlavor(flavorModelC).
+			*utiltestingapi.MakeResourceFlavor(flavorModelC).
 				NodeLabel(resourceGPU.String(), flavorModelC).
 				Taint(corev1.Taint{
 					Key:    "spot",
 					Value:  "true",
 					Effect: corev1.TaintEffectNoSchedule,
 				}).Obj(),
-			*testing.MakeResourceFlavor(flavorModelD).NodeLabel(resourceGPU.String(), flavorModelD).Obj(),
+			*utiltestingapi.MakeResourceFlavor(flavorModelD).NodeLabel(resourceGPU.String(), flavorModelD).Obj(),
 		}
 		emptyUsage = []kueue.LocalQueueFlavorUsage{
 			{
@@ -86,19 +87,19 @@ var _ = ginkgo.Describe("Queue controller", ginkgo.Ordered, ginkgo.ContinueOnFai
 	})
 
 	ginkgo.BeforeEach(func() {
-		ac = testing.MakeAdmissionCheck("ac").ControllerName("ac-controller").Obj()
+		ac = utiltestingapi.MakeAdmissionCheck("ac").ControllerName("ac-controller").Obj()
 		util.MustCreate(ctx, k8sClient, ac)
 		features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.LocalQueueMetrics, true)
 		util.SetAdmissionCheckActive(ctx, k8sClient, ac, metav1.ConditionTrue)
-		clusterQueue = testing.MakeClusterQueue("cluster-queue.queue-controller").
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue.queue-controller").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(flavorModelD).Resource(resourceGPU, "5", "5").Obj(),
-				*testing.MakeFlavorQuotas(flavorModelC).Resource(resourceGPU, "5", "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas(flavorModelD).Resource(resourceGPU, "5", "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas(flavorModelC).Resource(resourceGPU, "5", "5").Obj(),
 			).
 			Cohort("cohort").
 			AdmissionChecks(kueue.AdmissionCheckReference(ac.Name)).
 			Obj()
-		queue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		queue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, queue)
 	})
 
@@ -227,28 +228,28 @@ var _ = ginkgo.Describe("Queue controller", ginkgo.Ordered, ginkgo.ContinueOnFai
 
 		util.ExpectLQPendingWorkloadsMetric(queue, 0, 0)
 		workloads := []*kueue.Workload{
-			testing.MakeWorkload("one", ns.Name).
+			utiltestingapi.MakeWorkload("one", ns.Name).
 				Queue(kueue.LocalQueueName(queue.Name)).
 				Request(resourceGPU, "2").
 				Obj(),
-			testing.MakeWorkload("two", ns.Name).
+			utiltestingapi.MakeWorkload("two", ns.Name).
 				Queue(kueue.LocalQueueName(queue.Name)).
 				Request(resourceGPU, "3").
 				Obj(),
-			testing.MakeWorkload("three", ns.Name).
+			utiltestingapi.MakeWorkload("three", ns.Name).
 				Queue(kueue.LocalQueueName(queue.Name)).
 				Request(resourceGPU, "1").
 				Obj(),
 		}
 		admissions := []*kueue.Admission{
-			testing.MakeAdmission(clusterQueue.Name).
-				PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+			utiltestingapi.MakeAdmission(clusterQueue.Name).
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(resourceGPU, flavorModelC, "2").Obj()).Obj(),
-			testing.MakeAdmission(clusterQueue.Name).
-				PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+			utiltestingapi.MakeAdmission(clusterQueue.Name).
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(resourceGPU, flavorModelC, "3").Obj()).Obj(),
-			testing.MakeAdmission(clusterQueue.Name).
-				PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+			utiltestingapi.MakeAdmission(clusterQueue.Name).
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(resourceGPU, flavorModelD, "1").Obj()).Obj(),
 		}
 
@@ -461,28 +462,28 @@ var _ = ginkgo.Describe("Queue controller", ginkgo.Ordered, ginkgo.ContinueOnFai
 		})
 
 		workloads := []*kueue.Workload{
-			testing.MakeWorkload("one", ns.Name).
+			utiltestingapi.MakeWorkload("one", ns.Name).
 				Queue(kueue.LocalQueueName(queue.Name)).
 				Request(resourceGPU, "2").
 				Obj(),
-			testing.MakeWorkload("two", ns.Name).
+			utiltestingapi.MakeWorkload("two", ns.Name).
 				Queue(kueue.LocalQueueName(queue.Name)).
 				Request(resourceGPU, "3").
 				Obj(),
-			testing.MakeWorkload("three", ns.Name).
+			utiltestingapi.MakeWorkload("three", ns.Name).
 				Queue(kueue.LocalQueueName(queue.Name)).
 				Request(resourceGPU, "1").
 				Obj(),
 		}
 		admissions := []*kueue.Admission{
-			testing.MakeAdmission(clusterQueue.Name).
-				PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+			utiltestingapi.MakeAdmission(clusterQueue.Name).
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(resourceGPU, flavorModelC, "2").Obj()).Obj(),
-			testing.MakeAdmission(clusterQueue.Name).
-				PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+			utiltestingapi.MakeAdmission(clusterQueue.Name).
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(resourceGPU, flavorModelC, "3").Obj()).Obj(),
-			testing.MakeAdmission(clusterQueue.Name).
-				PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+			utiltestingapi.MakeAdmission(clusterQueue.Name).
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(resourceGPU, flavorModelD, "1").Obj()).Obj(),
 		}
 
diff --git a/test/integration/singlecluster/controller/core/resourceflavor_controller_test.go b/test/integration/singlecluster/controller/core/resourceflavor_controller_test.go
index 18f7d27f7..75f4b0d91 100644
--- a/test/integration/singlecluster/controller/core/resourceflavor_controller_test.go
+++ b/test/integration/singlecluster/controller/core/resourceflavor_controller_test.go
@@ -23,7 +23,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -51,9 +51,9 @@ var _ = ginkgo.Describe("ResourceFlavor controller", ginkgo.Ordered, ginkgo.Cont
 		var clusterQueue *kueue.ClusterQueue
 
 		ginkgo.BeforeEach(func() {
-			resourceFlavor = utiltesting.MakeResourceFlavor("flavor").Obj()
-			clusterQueue = utiltesting.MakeClusterQueue("foo").
-				ResourceGroup(*utiltesting.MakeFlavorQuotas("flavor").Resource(corev1.ResourceCPU, "5").Obj()).
+			resourceFlavor = utiltestingapi.MakeResourceFlavor("flavor").Obj()
+			clusterQueue = utiltestingapi.MakeClusterQueue("foo").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("flavor").Resource(corev1.ResourceCPU, "5").Obj()).
 				Obj()
 
 			util.MustCreate(ctx, k8sClient, resourceFlavor)
diff --git a/test/integration/singlecluster/controller/core/workload_controller_test.go b/test/integration/singlecluster/controller/core/workload_controller_test.go
index bc790ffdb..153d6afa8 100644
--- a/test/integration/singlecluster/controller/core/workload_controller_test.go
+++ b/test/integration/singlecluster/controller/core/workload_controller_test.go
@@ -36,6 +36,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/util/admissioncheck"
 	"sigs.k8s.io/kueue/pkg/util/slices"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -77,7 +78,7 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 			gomega.Expect(util.DeleteNamespace(ctx, k8sClient, ns)).To(gomega.Succeed())
 		})
 		ginkgo.It("Should update status when workloads are created", func() {
-			wl = testing.MakeWorkload("one", ns.Name).Request(corev1.ResourceCPU, "1").Obj()
+			wl = utiltestingapi.MakeWorkload("one", ns.Name).Request(corev1.ResourceCPU, "1").Obj()
 			message = fmt.Sprintf("LocalQueue %s doesn't exist", "")
 			util.MustCreate(ctx, k8sClient, wl)
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -100,7 +101,7 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 			gomega.Expect(util.DeleteNamespace(ctx, k8sClient, ns)).To(gomega.Succeed())
 		})
 		ginkgo.It("Should update status when workloads are created", func() {
-			wl = testing.MakeWorkload("two", ns.Name).Queue("non-created-queue").Request(corev1.ResourceCPU, "1").Obj()
+			wl = utiltestingapi.MakeWorkload("two", ns.Name).Queue("non-created-queue").Request(corev1.ResourceCPU, "1").Obj()
 			message = fmt.Sprintf("LocalQueue %s doesn't exist", "non-created-queue")
 			util.MustCreate(ctx, k8sClient, wl)
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -120,14 +121,14 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 
 	ginkgo.When("the clusterqueue doesn't exist", func() {
 		ginkgo.BeforeEach(func() {
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue("fooclusterqueue").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue("fooclusterqueue").Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
 			gomega.Expect(util.DeleteNamespace(ctx, k8sClient, ns)).To(gomega.Succeed())
 		})
 		ginkgo.It("Should update status when workloads are created", func() {
-			wl = testing.MakeWorkload("three", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl = utiltestingapi.MakeWorkload("three", ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 			message = fmt.Sprintf("ClusterQueue %s doesn't exist", "fooclusterqueue")
 			util.MustCreate(ctx, k8sClient, wl)
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -149,15 +150,15 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 		var flavor *kueue.ResourceFlavor
 
 		ginkgo.BeforeEach(func() {
-			flavor = testing.MakeResourceFlavor(flavorOnDemand).Obj()
+			flavor = utiltestingapi.MakeResourceFlavor(flavorOnDemand).Obj()
 			util.MustCreate(ctx, k8sClient, flavor)
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
-				ResourceGroup(*testing.MakeFlavorQuotas(flavorOnDemand).
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(flavorOnDemand).
 					Resource(resourceGPU, "5", "5").Obj()).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -175,25 +176,25 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 		)
 
 		ginkgo.BeforeEach(func() {
-			flavor = testing.MakeResourceFlavor(flavorOnDemand).Obj()
+			flavor = utiltestingapi.MakeResourceFlavor(flavorOnDemand).Obj()
 			util.MustCreate(ctx, k8sClient, flavor)
 
-			check1 = testing.MakeAdmissionCheck("check1").ControllerName("ctrl").Obj()
+			check1 = utiltestingapi.MakeAdmissionCheck("check1").ControllerName("ctrl").Obj()
 			util.MustCreate(ctx, k8sClient, check1)
 			util.SetAdmissionCheckActive(ctx, k8sClient, check1, metav1.ConditionTrue)
 
-			check2 = testing.MakeAdmissionCheck("check2").ControllerName("ctrl").Obj()
+			check2 = utiltestingapi.MakeAdmissionCheck("check2").ControllerName("ctrl").Obj()
 			util.MustCreate(ctx, k8sClient, check2)
 			util.SetAdmissionCheckActive(ctx, k8sClient, check2, metav1.ConditionTrue)
 
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
-				ResourceGroup(*testing.MakeFlavorQuotas(flavorOnDemand).
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(flavorOnDemand).
 					Resource(resourceGPU, "5", "5").Obj()).
 				Cohort("cohort").
 				AdmissionChecks("check1", "check2").
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -205,7 +206,7 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 		})
 
 		ginkgo.It("the workload should get the AdditionalChecks added", func() {
-			wl := testing.MakeWorkload("wl", ns.Name).Queue("queue").Obj()
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).Queue("queue").Obj()
 			wlKey := client.ObjectKeyFromObject(wl)
 			createdWl := kueue.Workload{}
 			ginkgo.By("creating the workload, the check conditions should be added", func() {
@@ -262,7 +263,7 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 			})
 		})
 		ginkgo.It("should finish an unadmitted workload with failure when a check is rejected", func() {
-			wl := testing.MakeWorkload("wl", ns.Name).Queue("queue").Obj()
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).Queue("queue").Obj()
 			wlKey := client.ObjectKeyFromObject(wl)
 			createdWl := kueue.Workload{}
 			ginkgo.By("creating the workload, the check conditions should be added", func() {
@@ -277,7 +278,7 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 			})
 
 			ginkgo.By("reserving quota for a Workload", func() {
-				util.SetQuotaReservation(ctx, k8sClient, wlKey, testing.MakeAdmission(clusterQueue.Name).Obj())
+				util.SetQuotaReservation(ctx, k8sClient, wlKey, utiltestingapi.MakeAdmission(clusterQueue.Name).Obj())
 			})
 
 			ginkgo.By("setting the check conditions", func() {
@@ -316,7 +317,7 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 		})
 
 		ginkgo.It("should evict then finish with failure an admitted workload when a check is rejected", func() {
-			wl := testing.MakeWorkload("wl", ns.Name).Queue("queue").Obj()
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).Queue("queue").Obj()
 			wlKey := client.ObjectKeyFromObject(wl)
 			createdWl := kueue.Workload{}
 			ginkgo.By("creating the workload, the check conditions should be added", func() {
@@ -331,7 +332,7 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 			})
 
 			ginkgo.By("setting quota reservation and the checks ready, should admit the workload", func() {
-				util.SetQuotaReservation(ctx, k8sClient, wlKey, testing.MakeAdmission(clusterQueue.Name).Obj())
+				util.SetQuotaReservation(ctx, k8sClient, wlKey, utiltestingapi.MakeAdmission(clusterQueue.Name).Obj())
 
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, wlKey, &createdWl)).To(gomega.Succeed())
@@ -400,7 +401,7 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 
 	ginkgo.When("changing the priority value of PriorityClass doesn't affect the priority of the workload", func() {
 		ginkgo.BeforeEach(func() {
-			workloadPriorityClass = testing.MakeWorkloadPriorityClass("workload-priority-class").PriorityValue(200).Obj()
+			workloadPriorityClass = utiltestingapi.MakeWorkloadPriorityClass("workload-priority-class").PriorityValue(200).Obj()
 			util.MustCreate(ctx, k8sClient, workloadPriorityClass)
 		})
 		ginkgo.AfterEach(func() {
@@ -409,7 +410,7 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 		})
 		ginkgo.It("case of WorkloadPriorityClass", func() {
 			ginkgo.By("creating workload")
-			wl = testing.MakeWorkload("wl", ns.Name).Queue("lq").Request(corev1.ResourceCPU, "1").
+			wl = utiltestingapi.MakeWorkload("wl", ns.Name).Queue("lq").Request(corev1.ResourceCPU, "1").
 				PriorityClass("workload-priority-class").PriorityClassSource(constants.WorkloadPriorityClassSource).Priority(200).Obj()
 			util.MustCreate(ctx, k8sClient, wl)
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -438,14 +439,14 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 			// due time rounding in conditions, the workload will stay admitted
 			// for a time between maxExecutionTime - 1s and maxExecutionTime
 			maxExecTime := 2 * time.Second
-			wl := testing.MakeWorkload("wl", ns.Name).
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).
 				Queue("lq").
 				MaximumExecutionTimeSeconds(int32(maxExecTime.Seconds())).
 				Obj()
 			key := client.ObjectKeyFromObject(wl)
 			ginkgo.By("creating the workload and reserving its quota", func() {
 				util.MustCreate(ctx, k8sClient, wl)
-				admission := testing.MakeAdmission("cq").Obj()
+				admission := utiltestingapi.MakeAdmission("cq").Obj()
 				util.SetQuotaReservation(ctx, k8sClient, key, admission)
 			})
 			ginkgo.By("waiting for the workload to be admitted", func() {
@@ -475,14 +476,14 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 			// due time rounding in conditions, the workload will stay admitted
 			// for a time between maxExecutionTime - 1s and maxExecutionTime
 			maxExecTime := 30 * time.Second
-			wl := testing.MakeWorkload("wl", ns.Name).
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).
 				Queue("lq").
 				MaximumExecutionTimeSeconds(int32(maxExecTime.Seconds())).
 				Obj()
 			key := client.ObjectKeyFromObject(wl)
 			ginkgo.By("creating the workload and reserving its quota", func() {
 				util.MustCreate(ctx, k8sClient, wl)
-				admission := testing.MakeAdmission("cq").Obj()
+				admission := utiltestingapi.MakeAdmission("cq").Obj()
 				util.SetQuotaReservation(ctx, k8sClient, key, admission)
 			})
 			ginkgo.By("waiting for the workload to be admitted, and for the time to change the second", func() {
@@ -523,7 +524,7 @@ var _ = ginkgo.Describe("Workload controller", ginkgo.Ordered, ginkgo.ContinueOn
 			})
 
 			ginkgo.By("reserving new quota", func() {
-				admission := testing.MakeAdmission("cq").Obj()
+				admission := utiltestingapi.MakeAdmission("cq").Obj()
 				util.SetQuotaReservation(ctx, k8sClient, key, admission)
 			})
 
@@ -571,13 +572,13 @@ var _ = ginkgo.Describe("Workload controller with resource retention", ginkgo.Or
 		ginkgo.BeforeEach(func() {
 			features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.ObjectRetentionPolicies, true)
 			ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-workload-")
-			flavor = testing.MakeResourceFlavor(flavorOnDemand).Obj()
+			flavor = utiltestingapi.MakeResourceFlavor(flavorOnDemand).Obj()
 			gomega.Expect(k8sClient.Create(ctx, flavor)).Should(gomega.Succeed())
-			clusterQueue = testing.MakeClusterQueue("cq").
-				ResourceGroup(*testing.MakeFlavorQuotas(flavorOnDemand).
+			clusterQueue = utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(flavorOnDemand).
 					Resource(corev1.ResourceCPU, "1").Obj()).
 				Obj()
-			localQueue = testing.MakeLocalQueue("q", ns.Name).ClusterQueue("cq").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("q", ns.Name).ClusterQueue("cq").Obj()
 			gomega.Expect(k8sClient.Create(ctx, localQueue)).To(gomega.Succeed())
 		})
 
@@ -594,13 +595,13 @@ var _ = ginkgo.Describe("Workload controller with resource retention", ginkgo.Or
 			)
 
 			ginkgo.By("creating a workload", func() {
-				wl = testing.MakeWorkload("wl-to-expire", ns.Name).Queue("q").Obj()
+				wl = utiltestingapi.MakeWorkload("wl-to-expire", ns.Name).Queue("q").Obj()
 				wlKey = client.ObjectKeyFromObject(wl)
 				gomega.Expect(k8sClient.Create(ctx, wl)).To(gomega.Succeed())
 			})
 
 			ginkgo.By("simulating workload admission", func() {
-				admission := testing.MakeAdmission("cq").Obj()
+				admission := utiltestingapi.MakeAdmission("cq").Obj()
 				util.SetQuotaReservation(ctx, k8sClient, wlKey, admission)
 				util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, wl)
 			})
@@ -660,13 +661,13 @@ var _ = ginkgo.Describe("Workload controller with resource retention", ginkgo.Or
 		ginkgo.BeforeEach(func() {
 			features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.ObjectRetentionPolicies, true)
 			ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-workload-")
-			flavor = testing.MakeResourceFlavor(flavorOnDemand).Obj()
+			flavor = utiltestingapi.MakeResourceFlavor(flavorOnDemand).Obj()
 			gomega.Expect(k8sClient.Create(ctx, flavor)).Should(gomega.Succeed())
-			clusterQueue = testing.MakeClusterQueue("cq").
-				ResourceGroup(*testing.MakeFlavorQuotas(flavorOnDemand).
+			clusterQueue = utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(flavorOnDemand).
 					Resource(corev1.ResourceCPU, "1").Obj()).
 				Obj()
-			localQueue = testing.MakeLocalQueue("q", ns.Name).ClusterQueue("cq").Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("q", ns.Name).ClusterQueue("cq").Obj()
 			gomega.Expect(k8sClient.Create(ctx, localQueue)).To(gomega.Succeed())
 		})
 
@@ -683,13 +684,13 @@ var _ = ginkgo.Describe("Workload controller with resource retention", ginkgo.Or
 			)
 
 			ginkgo.By("creating a workload", func() {
-				wl = testing.MakeWorkload("wl-to-stay", ns.Name).Queue("q").Obj()
+				wl = utiltestingapi.MakeWorkload("wl-to-stay", ns.Name).Queue("q").Obj()
 				wlKey = client.ObjectKeyFromObject(wl)
 				gomega.Expect(k8sClient.Create(ctx, wl)).To(gomega.Succeed())
 			})
 
 			ginkgo.By("simulating workload admission", func() {
-				admission := testing.MakeAdmission("cq").Obj()
+				admission := utiltestingapi.MakeAdmission("cq").Obj()
 				util.SetQuotaReservation(ctx, k8sClient, wlKey, admission)
 				util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, wl)
 			})
diff --git a/test/integration/singlecluster/controller/dra/dra_test.go b/test/integration/singlecluster/controller/dra/dra_test.go
index 2a5918a41..7cf332efb 100644
--- a/test/integration/singlecluster/controller/dra/dra_test.go
+++ b/test/integration/singlecluster/controller/dra/dra_test.go
@@ -30,7 +30,7 @@ import (
 
 	config "sigs.k8s.io/kueue/apis/config/v1beta1"
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -63,7 +63,7 @@ var _ = ginkgo.Describe("DRA Integration", ginkgo.Ordered, ginkgo.ContinueOnFail
 			}
 			gomega.Expect(k8sClient.Create(ctx, ns)).To(gomega.Succeed())
 
-			resourceFlavor = utiltesting.MakeResourceFlavor("").Obj()
+			resourceFlavor = utiltestingapi.MakeResourceFlavor("").Obj()
 			resourceFlavor.GenerateName = "rf-"
 			gomega.Expect(k8sClient.Create(ctx, resourceFlavor)).To(gomega.Succeed())
 
@@ -90,7 +90,7 @@ var _ = ginkgo.Describe("DRA Integration", ginkgo.Ordered, ginkgo.ContinueOnFail
 			}
 			gomega.Expect(k8sClient.Create(ctx, clusterQueue)).To(gomega.Succeed())
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
-			localQueue = utiltesting.MakeLocalQueue("test-lq", ns.Name).
+			localQueue = utiltestingapi.MakeLocalQueue("test-lq", ns.Name).
 				ClusterQueue(clusterQueue.Name).Obj()
 			gomega.Expect(k8sClient.Create(ctx, localQueue)).To(gomega.Succeed())
 		})
@@ -107,7 +107,7 @@ var _ = ginkgo.Describe("DRA Integration", ginkgo.Ordered, ginkgo.ContinueOnFail
 			gomega.Expect(k8sClient.Create(ctx, rc)).To(gomega.Succeed())
 
 			ginkgo.By("Creating a workload with DRA resource claim")
-			wl := utiltesting.MakeWorkload("test-wl", ns.Name).
+			wl := utiltestingapi.MakeWorkload("test-wl", ns.Name).
 				Queue("test-lq").
 				Obj()
 			wl.Spec.PodSets[0].Template.Spec.ResourceClaims = []corev1.PodResourceClaim{
@@ -138,7 +138,7 @@ var _ = ginkgo.Describe("DRA Integration", ginkgo.Ordered, ginkgo.ContinueOnFail
 			gomega.Expect(k8sClient.Create(ctx, rc)).To(gomega.Succeed())
 
 			ginkgo.By("Creating a workload with large DRA resource claim")
-			wl := utiltesting.MakeWorkload("test-wl-large", ns.Name).
+			wl := utiltestingapi.MakeWorkload("test-wl-large", ns.Name).
 				Queue("test-lq").
 				Obj()
 			wl.Spec.PodSets[0].Template.Spec.ResourceClaims = []corev1.PodResourceClaim{
@@ -204,7 +204,7 @@ var _ = ginkgo.Describe("DRA Integration", ginkgo.Ordered, ginkgo.ContinueOnFail
 			gomega.Expect(k8sClient.Create(ctx, rct2)).To(gomega.Succeed())
 
 			ginkgo.By("Creating first workload")
-			wl1 := utiltesting.MakeWorkload("test-wl-1", ns.Name).
+			wl1 := utiltestingapi.MakeWorkload("test-wl-1", ns.Name).
 				Queue("test-lq").
 				Obj()
 			wl1.Spec.PodSets[0].Template.Spec.ResourceClaims = []corev1.PodResourceClaim{
@@ -219,7 +219,7 @@ var _ = ginkgo.Describe("DRA Integration", ginkgo.Ordered, ginkgo.ContinueOnFail
 			gomega.Expect(k8sClient.Create(ctx, wl1)).To(gomega.Succeed())
 
 			ginkgo.By("Creating second workload")
-			wl2 := utiltesting.MakeWorkload("test-wl-2", ns.Name).
+			wl2 := utiltestingapi.MakeWorkload("test-wl-2", ns.Name).
 				Queue("test-lq").
 				Obj()
 			wl2.Spec.PodSets[0].Template.Spec.ResourceClaims = []corev1.PodResourceClaim{
@@ -288,7 +288,7 @@ var _ = ginkgo.Describe("DRA Integration", ginkgo.Ordered, ginkgo.ContinueOnFail
 			gomega.Expect(k8sClient.Create(ctx, rct)).To(gomega.Succeed())
 
 			ginkgo.By("Creating a workload that references the ResourceClaimTemplate")
-			wl := utiltesting.MakeWorkload("test-wl-template", ns.Name).
+			wl := utiltestingapi.MakeWorkload("test-wl-template", ns.Name).
 				Queue("test-lq").
 				Obj()
 			wl.Spec.PodSets[0].Template.Spec.ResourceClaims = []corev1.PodResourceClaim{
@@ -363,7 +363,7 @@ var _ = ginkgo.Describe("DRA Integration", ginkgo.Ordered, ginkgo.ContinueOnFail
 			gomega.Expect(k8sClient.Create(ctx, rct2)).To(gomega.Succeed())
 
 			ginkgo.By("Creating first workload with ResourceClaimTemplate")
-			wl1 := utiltesting.MakeWorkload("test-wl-template-1", ns.Name).
+			wl1 := utiltestingapi.MakeWorkload("test-wl-template-1", ns.Name).
 				Queue("test-lq").
 				Obj()
 			wl1.Spec.PodSets[0].Template.Spec.ResourceClaims = []corev1.PodResourceClaim{
@@ -378,7 +378,7 @@ var _ = ginkgo.Describe("DRA Integration", ginkgo.Ordered, ginkgo.ContinueOnFail
 			gomega.Expect(k8sClient.Create(ctx, wl1)).To(gomega.Succeed())
 
 			ginkgo.By("Creating second workload with ResourceClaimTemplate")
-			wl2 := utiltesting.MakeWorkload("test-wl-template-2", ns.Name).
+			wl2 := utiltestingapi.MakeWorkload("test-wl-template-2", ns.Name).
 				Queue("test-lq").
 				Obj()
 			wl2.Spec.PodSets[0].Template.Spec.ResourceClaims = []corev1.PodResourceClaim{
@@ -447,7 +447,7 @@ var _ = ginkgo.Describe("DRA Integration", ginkgo.Ordered, ginkgo.ContinueOnFail
 			gomega.Expect(k8sClient.Create(ctx, rct)).To(gomega.Succeed())
 
 			ginkgo.By("Creating a workload that references the large ResourceClaimTemplate")
-			wl := utiltesting.MakeWorkload("test-wl-template-large", ns.Name).
+			wl := utiltestingapi.MakeWorkload("test-wl-template-large", ns.Name).
 				Queue("test-lq").
 				Obj()
 			wl.Spec.PodSets[0].Template.Spec.ResourceClaims = []corev1.PodResourceClaim{
@@ -494,7 +494,7 @@ var _ = ginkgo.Describe("DRA Integration", ginkgo.Ordered, ginkgo.ContinueOnFail
 			gomega.Expect(k8sClient.Create(ctx, rct)).To(gomega.Succeed())
 
 			ginkgo.By("Creating a workload with unmapped device class")
-			wl := utiltesting.MakeWorkload("test-wl-unmapped", ns.Name).
+			wl := utiltestingapi.MakeWorkload("test-wl-unmapped", ns.Name).
 				Queue("test-lq").
 				Obj()
 			wl.Spec.PodSets[0].Template.Spec.ResourceClaims = []corev1.PodResourceClaim{
@@ -580,7 +580,7 @@ var _ = ginkgo.Describe("DRA Integration", ginkgo.Ordered, ginkgo.ContinueOnFail
 			gomega.Expect(k8sClient.Create(ctx, rct)).To(gomega.Succeed())
 
 			ginkgo.By("Creating a multi-pod workload (parallelism: 3)")
-			wl := utiltesting.MakeWorkload("test-wl-multi-pod", ns.Name).
+			wl := utiltestingapi.MakeWorkload("test-wl-multi-pod", ns.Name).
 				Queue("test-lq").
 				Obj()
 
diff --git a/test/integration/singlecluster/controller/jobframework/setup/setup_controllers_test.go b/test/integration/singlecluster/controller/jobframework/setup/setup_controllers_test.go
index 7d840b5c9..bebf9b232 100644
--- a/test/integration/singlecluster/controller/jobframework/setup/setup_controllers_test.go
+++ b/test/integration/singlecluster/controller/jobframework/setup/setup_controllers_test.go
@@ -30,7 +30,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/jobset"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjobset "sigs.k8s.io/kueue/pkg/util/testingjobs/jobset"
 	"sigs.k8s.io/kueue/test/integration/framework"
 	"sigs.k8s.io/kueue/test/util"
@@ -52,18 +52,18 @@ var _ = ginkgo.Describe("Setup Controllers", ginkgo.Ordered, ginkgo.ContinueOnFa
 
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "jobset-")
 
-		flavor = testing.MakeResourceFlavor("on-demand").Obj()
+		flavor = utiltestingapi.MakeResourceFlavor("on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, flavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(flavor.Name).
+				*utiltestingapi.MakeFlavorQuotas(flavor.Name).
 					Resource(corev1.ResourceCPU, "5").
 					Obj(),
 			).Obj()
 
 		util.MustCreate(ctx, k8sClient, clusterQueue)
-		localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 	})
 
 	ginkgo.AfterEach(func() {
diff --git a/test/integration/singlecluster/controller/jobs/appwrapper/appwrapper_controller_test.go b/test/integration/singlecluster/controller/jobs/appwrapper/appwrapper_controller_test.go
index 088f1dee9..cb975e82a 100644
--- a/test/integration/singlecluster/controller/jobs/appwrapper/appwrapper_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/appwrapper/appwrapper_controller_test.go
@@ -41,6 +41,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	workloadaw "sigs.k8s.io/kueue/pkg/controller/jobs/appwrapper"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingaw "sigs.k8s.io/kueue/pkg/util/testingjobs/appwrapper"
 	utiltestingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
@@ -87,18 +88,18 @@ var _ = ginkgo.Describe("AppWrapper controller", ginkgo.Ordered, ginkgo.Continue
 		)
 
 		ginkgo.BeforeEach(func() {
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
-					*testing.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
 				).Obj()
 
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
-			onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+			onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 			util.MustCreate(ctx, k8sClient, onDemandFlavor)
-			spotFlavor = testing.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
+			spotFlavor = utiltestingapi.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
 			util.MustCreate(ctx, k8sClient, spotFlavor)
 		})
 
@@ -147,7 +148,7 @@ var _ = ginkgo.Describe("AppWrapper controller", ginkgo.Ordered, ginkgo.Continue
 
 			ginkgo.By("checking the workload is updated with queue name when the AppWrapper does")
 			awQueueName := "test-queue"
-			createdAppWrapper.Annotations = map[string]string{constants.QueueLabel: awQueueName}
+			createdAppWrapper.Labels = map[string]string{constants.QueueLabel: awQueueName}
 			gomega.Expect(k8sClient.Update(ctx, createdAppWrapper)).Should(gomega.Succeed())
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).Should(gomega.Succeed())
@@ -175,7 +176,7 @@ var _ = ginkgo.Describe("AppWrapper controller", ginkgo.Ordered, ginkgo.Continue
 
 			ginkgo.By("checking the AppWrapper is unsuspended when workload is assigned")
 
-			admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+			admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 				kueue.PodSetAssignment{
 					Name: createdWorkload.Spec.PodSets[0].Name,
 					Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -250,7 +251,7 @@ var _ = ginkgo.Describe("AppWrapper controller", ginkgo.Ordered, ginkgo.Continue
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).To(gomega.Succeed())
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
-				admission := testing.MakeAdmission(localQueue.Name).PodSets(
+				admission := utiltestingapi.MakeAdmission(localQueue.Name).PodSets(
 					kueue.PodSetAssignment{
 						Name: createdWorkload.Spec.PodSets[0].Name,
 						Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -330,17 +331,17 @@ var _ = ginkgo.Describe("AppWrapper controller", ginkgo.Ordered, ginkgo.Continue
 		)
 
 		ginkgo.BeforeEach(func() {
-			admissionCheck = testing.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
+			admissionCheck = utiltestingapi.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, admissionCheck)
 			util.SetAdmissionCheckActive(ctx, k8sClient, admissionCheck, metav1.ConditionTrue)
-			clusterQueueAc = testing.MakeClusterQueue("prod-cq-with-checks").
+			clusterQueueAc = utiltestingapi.MakeClusterQueue("prod-cq-with-checks").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
 				).AdmissionChecks("check").Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueueAc)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
-			testFlavor = testing.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
+			testFlavor = utiltestingapi.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
 			util.MustCreate(ctx, k8sClient, testFlavor)
 
 			jobLookupKey = &types.NamespacedName{Name: awName, Namespace: ns.Name}
@@ -435,7 +436,7 @@ var _ = ginkgo.Describe("AppWrapper controller", ginkgo.Ordered, ginkgo.Continue
 			})
 
 			ginkgo.By("admit the workload", func() {
-				admission := testing.MakeAdmission(clusterQueueAc.Name).
+				admission := utiltestingapi.MakeAdmission(clusterQueueAc.Name).
 					PodSets(
 						kueue.PodSetAssignment{
 							Name: createdWorkload.Spec.PodSets[0].Name,
@@ -573,7 +574,7 @@ var _ = ginkgo.Describe("AppWrapper controller when waitForPodsReady enabled", g
 		wantCondition          *metav1.Condition
 	}
 
-	var defaultFlavor = testing.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
+	var defaultFlavor = utiltestingapi.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
 
 	ginkgo.BeforeAll(func() {
 		fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithWaitForPodsReady(&configapi.WaitForPodsReady{Enable: true})))
@@ -624,7 +625,7 @@ var _ = ginkgo.Describe("AppWrapper controller when waitForPodsReady enabled", g
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			ginkgo.By("Admit the workload created for the AppWrapper")
-			admission := testing.MakeAdmission("foo").PodSets(
+			admission := utiltestingapi.MakeAdmission("foo").PodSets(
 				kueue.PodSetAssignment{
 					Name: createdWorkload.Spec.PodSets[0].Name,
 					Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -778,16 +779,16 @@ var _ = ginkgo.Describe("AppWrapper controller interacting with scheduler", gink
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "aw-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("dev-clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "1").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "1").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 	})
@@ -800,7 +801,7 @@ var _ = ginkgo.Describe("AppWrapper controller interacting with scheduler", gink
 
 	ginkgo.It("Should schedule AppWrappers as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		ginkgo.By("checking a dev job starts")
@@ -830,7 +831,7 @@ var _ = ginkgo.Describe("AppWrapper controller interacting with scheduler", gink
 		gomega.Expect(createdAppWrapper.Spec.Components[0].PodSetInfos[0].NodeSelector[instanceKey]).Should(gomega.Equal(spotUntaintedFlavor.Name))
 		gomega.Expect(createdAppWrapper.Spec.Components[1].PodSetInfos[0].NodeSelector[instanceKey]).Should(gomega.Equal(onDemandFlavor.Name))
 		util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
-		util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 	})
 })
 
@@ -874,21 +875,21 @@ var _ = ginkgo.Describe("AppWrapper controller with TopologyAwareScheduling", gi
 		}
 		util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-		topology = testing.MakeTopology("default").Levels(tasBlockLabel).Obj()
+		topology = utiltestingapi.MakeTopology("default").Levels(tasBlockLabel).Obj()
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(nodeGroupLabel, "tas").
 			TopologyName("default").Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
@@ -937,7 +938,7 @@ var _ = ginkgo.Describe("AppWrapper controller with TopologyAwareScheduling", gi
 
 		ginkgo.By("verify the workload is admitted", func() {
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-			util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 		})
 
 		ginkgo.By("verify admission for the workload", func() {
diff --git a/test/integration/singlecluster/controller/jobs/jaxjob/jaxjob_controller_test.go b/test/integration/singlecluster/controller/jobs/jaxjob/jaxjob_controller_test.go
index 08f85fb39..17d8f61de 100644
--- a/test/integration/singlecluster/controller/jobs/jaxjob/jaxjob_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/jaxjob/jaxjob_controller_test.go
@@ -36,6 +36,7 @@ import (
 	workloadjaxjob "sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/jaxjob"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/kubeflowjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjaxjob "sigs.k8s.io/kueue/pkg/util/testingjobs/jaxjob"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
 	"sigs.k8s.io/kueue/pkg/workload"
@@ -128,7 +129,7 @@ var _ = ginkgo.Describe("Job controller for workloads when only jobs with queue
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 		ginkgo.By("checking the workload is created when queue name is set")
-		createdJob.Annotations = map[string]string{constants.QueueAnnotation: jobQueueName}
+		createdJob.Labels = map[string]string{constants.QueueLabel: jobQueueName}
 		gomega.Expect(k8sClient.Update(ctx, createdJob)).Should(gomega.Succeed())
 		gomega.Eventually(func(g gomega.Gomega) {
 			g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).Should(gomega.Succeed())
@@ -145,17 +146,17 @@ var _ = ginkgo.Describe("Job controller for workloads when only jobs with queue
 		)
 
 		ginkgo.BeforeEach(func() {
-			admissionCheck = testing.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
+			admissionCheck = utiltestingapi.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, admissionCheck)
 			util.SetAdmissionCheckActive(ctx, k8sClient, admissionCheck, metav1.ConditionTrue)
-			clusterQueueAc = testing.MakeClusterQueue("prod-cq-with-checks").
+			clusterQueueAc = utiltestingapi.MakeClusterQueue("prod-cq-with-checks").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
 				).AdmissionChecks("check").Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueueAc)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
-			testFlavor = testing.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
+			testFlavor = utiltestingapi.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
 			util.MustCreate(ctx, k8sClient, testFlavor)
 
 			jobLookupKey = &types.NamespacedName{Name: jobName, Namespace: ns.Name}
@@ -234,7 +235,7 @@ var _ = ginkgo.Describe("Job controller for workloads when only jobs with queue
 			})
 
 			ginkgo.By("admit the workload", func() {
-				admission := testing.MakeAdmission(clusterQueueAc.Name).
+				admission := utiltestingapi.MakeAdmission(clusterQueueAc.Name).
 					PodSets(
 						kueue.PodSetAssignment{
 							Name: "worker",
@@ -308,7 +309,7 @@ var _ = ginkgo.Describe("Job controller for workloads when only jobs with queue
 var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
 	var (
 		ns            *corev1.Namespace
-		defaultFlavor = testing.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
+		defaultFlavor = utiltestingapi.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
 	)
 
 	ginkgo.BeforeAll(func() {
@@ -446,16 +447,16 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("dev-clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 	})
@@ -468,7 +469,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 
 	ginkgo.It("Should schedule jobs as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		kfJob := kubeflowjob.KubeflowJob{KFJobControl: (*workloadjaxjob.JobControl)(
@@ -490,7 +491,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 
 	ginkgo.When("The workload's admission is removed", func() {
 		ginkgo.It("Should restore the original node selectors", func() {
-			localQueue := testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue := utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			job := testingjaxjob.MakeJAXJob(jobName, ns.Name).
 				JAXReplicaSpecsDefault().
 				Queue(localQueue.Name).
@@ -545,7 +546,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 
 			ginkgo.By("clear the workload's admission to stop the job", func() {
 				wlKey := types.NamespacedName{Name: workloadjaxjob.GetWorkloadNameForJAXJob(job.Name, job.UID), Namespace: job.Namespace}
-				wl := testing.MakeWorkload(wlKey.Name, wlKey.Namespace).Obj()
+				wl := utiltestingapi.MakeWorkload(wlKey.Name, wlKey.Namespace).Obj()
 				util.SetQuotaReservation(ctx, k8sClient, wlKey, nil)
 				util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, wl)
 			})
@@ -600,21 +601,21 @@ var _ = ginkgo.Describe("JAXJob controller with TopologyAwareScheduling", ginkgo
 		}
 		util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-		topology = testing.MakeDefaultTwoLevelTopology("default")
+		topology = utiltestingapi.MakeDefaultTwoLevelTopology("default")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(nodeGroupLabel, "tas").
 			TopologyName("default").Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
@@ -667,7 +668,7 @@ var _ = ginkgo.Describe("JAXJob controller with TopologyAwareScheduling", ginkgo
 
 		ginkgo.By("verify the workload is admitted", func() {
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-			util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 		})
 
 		ginkgo.By("verify admission for the workload", func() {
diff --git a/test/integration/singlecluster/controller/jobs/job/job_controller_test.go b/test/integration/singlecluster/controller/jobs/job/job_controller_test.go
index a303320de..b7a45f1e2 100644
--- a/test/integration/singlecluster/controller/jobs/job/job_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/job/job_controller_test.go
@@ -47,6 +47,7 @@ import (
 	workloadjob "sigs.k8s.io/kueue/pkg/controller/jobs/job"
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
 	"sigs.k8s.io/kueue/pkg/workload"
@@ -141,7 +142,7 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 
 		ginkgo.By("checking the workload is updated with queue name when the job does")
 		var jobQueueName kueue.LocalQueueName = "test-queue"
-		createdJob.Annotations = map[string]string{constants.QueueAnnotation: string(jobQueueName)}
+		createdJob.Labels[constants.QueueLabel] = string(jobQueueName)
 		gomega.Expect(k8sClient.Update(ctx, createdJob)).Should(gomega.Succeed())
 		gomega.Eventually(func(g gomega.Gomega) {
 			g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).Should(gomega.Succeed())
@@ -183,20 +184,20 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 		ginkgo.By("checking the job is unsuspended when workload is assigned")
-		onDemandFlavor := testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor := utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 		ginkgo.DeferCleanup(func() {
 			util.ExpectObjectToBeDeleted(ctx, k8sClient, onDemandFlavor, true)
 		})
-		spotFlavor := testing.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
+		spotFlavor := utiltestingapi.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
 		util.MustCreate(ctx, k8sClient, spotFlavor)
-		clusterQueue := testing.MakeClusterQueue("cluster-queue").
+		clusterQueue := utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
-				*testing.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
-		admission := testing.MakeAdmission(clusterQueue.Name).
-			PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+		admission := utiltestingapi.MakeAdmission(clusterQueue.Name).
+			PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 				Assignment(corev1.ResourceCPU, "on-demand", "1m").
 				Count(createdWorkload.Spec.PodSets[0].Count).
 				Obj()).
@@ -247,8 +248,8 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 		gomega.Expect(createdWorkload.Status.Admission).Should(gomega.BeNil())
 
 		ginkgo.By("checking the job is unsuspended and selectors added when workload is assigned again")
-		admission = testing.MakeAdmission(clusterQueue.Name).
-			PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+		admission = utiltestingapi.MakeAdmission(clusterQueue.Name).
+			PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 				Assignment(corev1.ResourceCPU, "spot", "1m").
 				Count(createdWorkload.Spec.PodSets[0].Count).
 				Obj()).
@@ -296,14 +297,14 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 	})
 
 	ginkgo.It("Should sync workload priority when job priority label changes", func() {
-		priorityClass := testing.MakeWorkloadPriorityClass(priorityClassName).
+		priorityClass := utiltestingapi.MakeWorkloadPriorityClass(priorityClassName).
 			PriorityValue(int32(priorityValue)).Obj()
 		util.MustCreate(ctx, k8sClient, priorityClass)
 		ginkgo.DeferCleanup(func() {
 			gomega.Expect(k8sClient.Delete(ctx, priorityClass)).To(gomega.Succeed())
 		})
 
-		highPriorityClass := testing.MakeWorkloadPriorityClass(highPriorityClassName).
+		highPriorityClass := utiltestingapi.MakeWorkloadPriorityClass(highPriorityClassName).
 			PriorityValue(int32(highPriorityValue)).Obj()
 		util.MustCreate(ctx, k8sClient, highPriorityClass)
 		ginkgo.DeferCleanup(func() {
@@ -342,10 +343,10 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 	})
 
-	ginkgo.It("Should reconcile job when queueName set by annotation (deprecated)", func() {
+	ginkgo.It("Should reconcile job when queueName set by label", func() {
 		ginkgo.By("checking the workload is created with correct queue name assigned")
 		var jobQueueName kueue.LocalQueueName = "test-queue"
-		job := testingjob.MakeJob(jobName, ns.Name).QueueNameAnnotation("test-queue").Obj()
+		job := testingjob.MakeJob(jobName, ns.Name).Label(constants.QueueLabel, "test-queue").Obj()
 		util.MustCreate(ctx, k8sClient, job)
 		createdWorkload := &kueue.Workload{}
 		wlLookupKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: ns.Name}
@@ -459,7 +460,7 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 
 		ginkgo.It("Should change the suspension status of the child job when the parent's workload is not admitted", func() {
 			ginkgo.By("Create a resource flavor")
-			defaultFlavor := testing.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
+			defaultFlavor := utiltestingapi.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
 			util.MustCreate(ctx, k8sClient, defaultFlavor)
 			ginkgo.DeferCleanup(func() {
 				util.ExpectObjectToBeDeleted(ctx, k8sClient, defaultFlavor, true)
@@ -525,8 +526,8 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
 			})
 
-			wl := testing.MakeWorkload("wl", ns.Name).
-				PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 1).
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Containers(*container.DeepCopy()).
 					Obj()).
 				Obj()
@@ -547,8 +548,8 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				Image: "pause",
 			}
 			testingjob.SetContainerDefaults(&container)
-			wl := testing.MakeWorkload("wl", ns.Name).
-				PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 1).
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Containers(*container.DeepCopy()).
 					Obj()).
 				Obj()
@@ -584,7 +585,7 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 			})
 
 			ginkgo.By("Admitting the workload, the job should unsuspend", func() {
-				admission := testing.MakeAdmission("cq", kueue.NewPodSetReference(container.Name)).Obj()
+				admission := utiltestingapi.MakeAdmission("cq", kueue.NewPodSetReference(container.Name)).Obj()
 				util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(wl), admission)
 				util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, wl)
 
@@ -653,7 +654,7 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, wlLookupKey, wl)).Should(gomega.Succeed())
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
-			admission := testing.MakeAdmission("q", kueue.NewPodSetReference(job.Spec.Template.Spec.Containers[0].Name)).Obj()
+			admission := utiltestingapi.MakeAdmission("q", kueue.NewPodSetReference(job.Spec.Template.Spec.Containers[0].Name)).Obj()
 			util.SetQuotaReservation(ctx, k8sClient, wlLookupKey, admission)
 			util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, wl)
 		})
@@ -725,17 +726,17 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 		)
 
 		ginkgo.BeforeEach(func() {
-			admissionCheck = testing.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
+			admissionCheck = utiltestingapi.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, admissionCheck)
 			util.SetAdmissionCheckActive(ctx, k8sClient, admissionCheck, metav1.ConditionTrue)
-			clusterQueueAc = testing.MakeClusterQueue("prod-cq-with-checks").
+			clusterQueueAc = utiltestingapi.MakeClusterQueue("prod-cq-with-checks").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
 				).AdmissionChecks("check").Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueueAc)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
-			testFlavor = testing.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
+			testFlavor = utiltestingapi.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
 			util.MustCreate(ctx, k8sClient, testFlavor)
 
 			jobLookupKey = &types.NamespacedName{Name: jobName, Namespace: ns.Name}
@@ -823,8 +824,8 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 			})
 
 			ginkgo.By("admit the workload", func() {
-				admission := testing.MakeAdmission(clusterQueueAc.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				admission := utiltestingapi.MakeAdmission(clusterQueueAc.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "test-flavor", "1").
 						Count(createdWorkload.Spec.PodSets[0].Count).
 						Obj()).
@@ -941,8 +942,8 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 			})
 
 			ginkgo.By("attempt to admit the workload", func() {
-				admission := testing.MakeAdmission(clusterQueueAc.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				admission := utiltestingapi.MakeAdmission(clusterQueueAc.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "test-flavor", "1").
 						Count(createdWorkload.Spec.PodSets[0].Count).
 						Obj()).
@@ -976,7 +977,7 @@ var _ = ginkgo.Describe("When waitForPodsReady enabled", ginkgo.Ordered, ginkgo.
 
 	var (
 		ns            *corev1.Namespace
-		defaultFlavor = testing.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
+		defaultFlavor = utiltestingapi.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
 	)
 
 	ginkgo.BeforeAll(func() {
@@ -1002,7 +1003,7 @@ var _ = ginkgo.Describe("When waitForPodsReady enabled", ginkgo.Ordered, ginkgo.
 			ginkgo.By("Create a job")
 			job := testingjob.MakeJob(jobName, ns.Name).Parallelism(2).Obj()
 			jobQueueName := "test-queue"
-			job.Annotations = map[string]string{constants.QueueAnnotation: jobQueueName}
+			job.Labels = map[string]string{constants.QueueLabel: jobQueueName}
 			util.MustCreate(ctx, k8sClient, job)
 			lookupKey := types.NamespacedName{Name: jobName, Namespace: ns.Name}
 			createdJob := &batchv1.Job{}
@@ -1016,8 +1017,8 @@ var _ = ginkgo.Describe("When waitForPodsReady enabled", ginkgo.Ordered, ginkgo.
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			ginkgo.By("Admit the workload created for the job")
-			admission := testing.MakeAdmission("foo").
-				PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+			admission := utiltestingapi.MakeAdmission("foo").
+				PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 					Assignment(corev1.ResourceCPU, "default", "1m").
 					Count(createdWorkload.Spec.PodSets[0].Count).
 					Obj()).
@@ -1314,10 +1315,10 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotTaintedFlavor = testing.MakeResourceFlavor("spot-tainted").
+		spotTaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-tainted").
 			NodeLabel(instanceKey, "spot-tainted").
 			Taint(corev1.Taint{
 				Key:    instanceKey,
@@ -1326,21 +1327,21 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 			}).Obj()
 		util.MustCreate(ctx, k8sClient, spotTaintedFlavor)
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		prodClusterQ = testing.MakeClusterQueue("prod-cq").
+		prodClusterQ = utiltestingapi.MakeClusterQueue("prod-cq").
 			Cohort("prod").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "5", "0").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "5", "0").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, prodClusterQ)
 
-		devClusterQ = testing.MakeClusterQueue("dev-clusterqueue").
+		devClusterQ = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 			).
 			FlavorFungibility(kueue.FlavorFungibility{
 				WhenCanBorrow:  kueue.MayStopSearch,
@@ -1352,20 +1353,20 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 			Obj()
 		util.MustCreate(ctx, k8sClient, devClusterQ)
 
-		podsCountClusterQ = testing.MakeClusterQueue("pods-clusterqueue").
+		podsCountClusterQ = utiltestingapi.MakeClusterQueue("pods-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourcePods, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourcePods, "5").Obj(),
 			).
 			Obj()
 		util.MustCreate(ctx, k8sClient, podsCountClusterQ)
 
-		prodLocalQ = testing.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
+		prodLocalQ = utiltestingapi.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
 		util.MustCreate(ctx, k8sClient, prodLocalQ)
 
-		devLocalQ = testing.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devClusterQ.Name).Obj()
+		devLocalQ = utiltestingapi.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devClusterQ.Name).Obj()
 		util.MustCreate(ctx, k8sClient, devLocalQ)
 
-		podsLocalQ = testing.MakeLocalQueue("pods-queue", ns.Name).ClusterQueue(podsCountClusterQ.Name).Obj()
+		podsLocalQ = utiltestingapi.MakeLocalQueue("pods-queue", ns.Name).ClusterQueue(podsCountClusterQ.Name).Obj()
 		util.MustCreate(ctx, k8sClient, podsLocalQ)
 	})
 
@@ -1391,7 +1392,7 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		gomega.Expect(createdProdJob1.Spec.Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(onDemandFlavor.Name))
 		util.ExpectPendingWorkloadsMetric(prodClusterQ, 0, 0)
-		util.ExpectReservingActiveWorkloadsMetric(prodClusterQ, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(prodClusterQ, "", 1)
 
 		ginkgo.By("checking a second no-fit prod job does not start")
 		prodJob2 := testingjob.MakeJob("prod-job2", ns.Name).Queue(kueue.LocalQueueName(prodLocalQ.Name)).Request(corev1.ResourceCPU, "5").Obj()
@@ -1403,7 +1404,7 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 			g.Expect(createdProdJob2.Spec.Suspend).Should(gomega.Equal(ptr.To(true)))
 		}, util.ConsistentDuration, util.ShortInterval).Should(gomega.Succeed())
 		util.ExpectPendingWorkloadsMetric(prodClusterQ, 0, 1)
-		util.ExpectReservingActiveWorkloadsMetric(prodClusterQ, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(prodClusterQ, "", 1)
 
 		ginkgo.By("checking a dev job starts")
 		devJob := testingjob.MakeJob("dev-job", ns.Name).Queue(kueue.LocalQueueName(devLocalQ.Name)).Request(corev1.ResourceCPU, "5").Obj()
@@ -1415,7 +1416,7 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		gomega.Expect(createdDevJob.Spec.Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(spotUntaintedFlavor.Name))
 		util.ExpectPendingWorkloadsMetric(devClusterQ, 0, 0)
-		util.ExpectReservingActiveWorkloadsMetric(devClusterQ, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(devClusterQ, "", 1)
 
 		ginkgo.By("checking the second prod job starts when the first finishes")
 		gomega.Eventually(func(g gomega.Gomega) {
@@ -1456,7 +1457,7 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 		}()
 
 		ginkgo.By("create a localQueue located in a different namespace as the job")
-		ns2LocalQ := testing.MakeLocalQueue("local-queue", ns2.Name).Obj()
+		ns2LocalQ := utiltestingapi.MakeLocalQueue("local-queue", ns2.Name).Obj()
 		ns2LocalQ.Spec.ClusterQueue = kueue.ClusterQueueReference(prodClusterQ.Name)
 
 		ginkgo.By("create a job")
@@ -1472,7 +1473,7 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 		ginkgo.By("creating another localQueue of the same name and in the same namespace as the job")
-		localQ := testing.MakeLocalQueue(ns2LocalQ.Name, ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
+		localQ := utiltestingapi.MakeLocalQueue(ns2LocalQ.Name, ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQ)
 
 		ginkgo.By("job should be unsuspended and NodeSelector properly set")
@@ -1488,7 +1489,7 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 
 	ginkgo.When("The workload's admission is removed", func() {
 		ginkgo.It("Should restore the original node selectors", func() {
-			localQueue := testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
+			localQueue := utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
 			job := testingjob.MakeJob(jobName, ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			lookupKey := types.NamespacedName{Name: job.Name, Namespace: job.Namespace}
 			createdJob := &batchv1.Job{}
@@ -1531,7 +1532,7 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 
 			ginkgo.By("clear the workload's admission to stop the job", func() {
 				wlKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: job.Namespace}
-				wl := testing.MakeWorkload(wlKey.Name, wlKey.Namespace).Obj()
+				wl := utiltestingapi.MakeWorkload(wlKey.Name, wlKey.Namespace).Obj()
 				util.SetQuotaReservation(ctx, k8sClient, wlKey, nil)
 				util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, wl)
 			})
@@ -1547,7 +1548,7 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 
 	ginkgo.When("The workload is deleted while admitted", func() {
 		ginkgo.It("Should restore the original node selectors", func() {
-			localQueue := testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
+			localQueue := utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
 			job := testingjob.MakeJob(jobName, ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "2").Suspend(false).Obj()
 			lookupKey := types.NamespacedName{Name: job.Name, Namespace: job.Namespace}
 			createdJob := &batchv1.Job{}
@@ -1606,7 +1607,7 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 
 	ginkgo.When("The job is deleted while admitted", func() {
 		ginkgo.It("Its workload finalizer should be removed", func() {
-			localQueue := testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
+			localQueue := utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
 			job := testingjob.MakeJob(jobName, ns.Name).Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "2").Suspend(false).Obj()
 			lookupKey := types.NamespacedName{Name: job.Name, Namespace: job.Namespace}
 			createdJob := &batchv1.Job{}
@@ -1673,7 +1674,7 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 			gomega.Expect(createdJob1.Spec.Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(onDemandFlavor.Name))
 			util.ExpectPendingWorkloadsMetric(prodClusterQ, 0, 0)
-			util.ExpectReservingActiveWorkloadsMetric(prodClusterQ, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(prodClusterQ, "", 1)
 		})
 
 		job2 := testingjob.MakeJob("job2", ns.Name).Queue(kueue.LocalQueueName(prodLocalQ.Name)).Request(corev1.ResourceCPU, "3").Obj()
@@ -1763,7 +1764,7 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 	})
 
 	ginkgo.It("Should readmit preempted Job with workloadPriorityClass in alternative flavor", func() {
-		highWorkloadPriorityClass := testing.MakeWorkloadPriorityClass("high-workload").PriorityValue(100).Obj()
+		highWorkloadPriorityClass := utiltestingapi.MakeWorkloadPriorityClass("high-workload").PriorityValue(100).Obj()
 		util.MustCreate(ctx, k8sClient, highWorkloadPriorityClass)
 		ginkgo.DeferCleanup(func() {
 			gomega.Expect(k8sClient.Delete(ctx, highWorkloadPriorityClass)).To(gomega.Succeed())
@@ -2154,23 +2155,23 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 		)
 
 		ginkgo.BeforeEach(func() {
-			highPriorityClass = testing.MakeWorkloadPriorityClass("high").PriorityValue(highPriorityValue).Obj()
+			highPriorityClass = utiltestingapi.MakeWorkloadPriorityClass("high").PriorityValue(highPriorityValue).Obj()
 			util.MustCreate(ctx, k8sClient, highPriorityClass)
 
-			lowPriorityClass = testing.MakeWorkloadPriorityClass("low").PriorityValue(priorityValue).Obj()
+			lowPriorityClass = utiltestingapi.MakeWorkloadPriorityClass("low").PriorityValue(priorityValue).Obj()
 			util.MustCreate(ctx, k8sClient, lowPriorityClass)
 
-			admissionCheck = testing.MakeAdmissionCheck("ac").ControllerName("ac-controller").Obj()
+			admissionCheck = utiltestingapi.MakeAdmissionCheck("ac").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, admissionCheck)
 
 			util.SetAdmissionCheckActive(ctx, k8sClient, admissionCheck, metav1.ConditionTrue)
 
-			resourceFlavor = testing.MakeResourceFlavor("rf").NodeLabel(instanceKey, "on-demand").Obj()
+			resourceFlavor = utiltestingapi.MakeResourceFlavor("rf").NodeLabel(instanceKey, "on-demand").Obj()
 			util.MustCreate(ctx, k8sClient, resourceFlavor)
 
-			clusterQueue = testing.MakeClusterQueue("cq").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(resourceFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas(resourceFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj(),
 				).
 				AdmissionChecks("ac").
 				Preemption(kueue.ClusterQueuePreemption{
@@ -2179,7 +2180,7 @@ var _ = ginkgo.Describe("Interacting with scheduler", ginkgo.Ordered, ginkgo.Con
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 
-			localQueue = testing.MakeLocalQueue("lq", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("lq", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 
@@ -2323,14 +2324,14 @@ var _ = ginkgo.Describe("Job controller interacting with Workload controller whe
 
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		fl = testing.MakeResourceFlavor("fl").Obj()
+		fl = utiltestingapi.MakeResourceFlavor("fl").Obj()
 		util.MustCreate(ctx, k8sClient, fl)
 
-		cq = testing.MakeClusterQueue("cq").
-			ResourceGroup(*testing.MakeFlavorQuotas("fl").Resource(corev1.ResourceCPU, "10").Obj()).Obj()
+		cq = utiltestingapi.MakeClusterQueue("cq").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("fl").Resource(corev1.ResourceCPU, "10").Obj()).Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 
@@ -2356,7 +2357,7 @@ var _ = ginkgo.Describe("Job controller interacting with Workload controller whe
 			wlKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: job.Namespace}
 
 			ginkgo.By("setting quota reservation")
-			util.SetQuotaReservation(ctx, k8sClient, wlKey, testing.MakeAdmission(cq.Name).Obj())
+			util.SetQuotaReservation(ctx, k8sClient, wlKey, utiltestingapi.MakeAdmission(cq.Name).Obj())
 
 			ginkgo.By("checking the workload is evicted")
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -2413,7 +2414,7 @@ var _ = ginkgo.Describe("Job controller interacting with Workload controller whe
 			wlKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: job.Namespace}
 
 			ginkgo.By("setting quota reservation")
-			util.SetQuotaReservation(ctx, k8sClient, wlKey, testing.MakeAdmission(cq.Name).Obj())
+			util.SetQuotaReservation(ctx, k8sClient, wlKey, utiltestingapi.MakeAdmission(cq.Name).Obj())
 
 			ginkgo.By("setting all job's pods to be ready")
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -2448,7 +2449,7 @@ var _ = ginkgo.Describe("Job controller interacting with Workload controller whe
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, wlKey, wl)).Should(gomega.Succeed())
 				util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-				util.ExpectReservingActiveWorkloadsMetric(cq, 1)
+				util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 1)
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 	})
@@ -2469,7 +2470,7 @@ var _ = ginkgo.Describe("Job controller interacting with Workload controller whe
 			wlKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: job.Namespace}
 
 			ginkgo.By("setting quota reservation")
-			util.SetQuotaReservation(ctx, k8sClient, wlKey, testing.MakeAdmission(cq.Name).Obj())
+			util.SetQuotaReservation(ctx, k8sClient, wlKey, utiltestingapi.MakeAdmission(cq.Name).Obj())
 
 			ginkgo.By("setting all job's pods to be ready")
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -2543,7 +2544,7 @@ var _ = ginkgo.Describe("Job controller interacting with Workload controller whe
 			wlKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(job.Name, job.UID), Namespace: job.Namespace}
 
 			ginkgo.By("setting quota reservation")
-			util.SetQuotaReservation(ctx, k8sClient, wlKey, testing.MakeAdmission(cq.Name).Obj())
+			util.SetQuotaReservation(ctx, k8sClient, wlKey, utiltestingapi.MakeAdmission(cq.Name).Obj())
 
 			ginkgo.By("setting all job's pods to be ready")
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -2611,7 +2612,7 @@ var _ = ginkgo.Describe("Job controller interacting with Workload controller whe
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, wlKey, wl)).Should(gomega.Succeed())
 				util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-				util.ExpectReservingActiveWorkloadsMetric(cq, 1)
+				util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 1)
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 	})
@@ -2635,8 +2636,8 @@ var _ = ginkgo.Describe("Job controller interacting with Workload controller whe
 			var admission *kueue.Admission
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, wlKey, wl)).Should(gomega.Succeed())
-				admission = testing.MakeAdmission(cq.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				admission = utiltestingapi.MakeAdmission(cq.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "1m").
 						Count(wl.Spec.PodSets[0].Count).
 						Obj()).
@@ -2742,13 +2743,13 @@ var _ = ginkgo.Describe("Job controller interacting with Workload controller whe
 			features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.LocalQueueMetrics, true)
 
 			ginkgo.By("creating workload priority classes")
-			lowPriorityClass := testing.MakeWorkloadPriorityClass("low-priority").PriorityValue(priorityValue).Obj()
+			lowPriorityClass := utiltestingapi.MakeWorkloadPriorityClass("low-priority").PriorityValue(priorityValue).Obj()
 			util.MustCreate(ctx, k8sClient, lowPriorityClass)
 			ginkgo.DeferCleanup(func() {
 				util.ExpectObjectToBeDeleted(ctx, k8sClient, lowPriorityClass, true)
 			})
 
-			highPriorityClass := testing.MakeWorkloadPriorityClass("high-priority").PriorityValue(highPriorityValue).Obj()
+			highPriorityClass := utiltestingapi.MakeWorkloadPriorityClass("high-priority").PriorityValue(highPriorityValue).Obj()
 			util.MustCreate(ctx, k8sClient, highPriorityClass)
 			ginkgo.DeferCleanup(func() {
 				util.ExpectObjectToBeDeleted(ctx, k8sClient, highPriorityClass, true)
@@ -2777,8 +2778,8 @@ var _ = ginkgo.Describe("Job controller interacting with Workload controller whe
 			highWlKey := types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(highJob.Name, highJob.UID), Namespace: highJob.Namespace}
 
 			ginkgo.By("setting quota reservation for both jobs")
-			util.SetQuotaReservation(ctx, k8sClient, lowWlKey, testing.MakeAdmission(cq.Name).Obj())
-			util.SetQuotaReservation(ctx, k8sClient, highWlKey, testing.MakeAdmission(cq.Name).Obj())
+			util.SetQuotaReservation(ctx, k8sClient, lowWlKey, utiltestingapi.MakeAdmission(cq.Name).Obj())
+			util.SetQuotaReservation(ctx, k8sClient, highWlKey, utiltestingapi.MakeAdmission(cq.Name).Obj())
 
 			ginkgo.By("setting low priority job's pods to be ready")
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -2878,21 +2879,21 @@ var _ = ginkgo.Describe("Job controller with TopologyAwareScheduling", ginkgo.Or
 		}
 		util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-		topology = testing.MakeTopology("default").Levels(tasBlockLabel).Obj()
+		topology = utiltestingapi.MakeTopology("default").Levels(tasBlockLabel).Obj()
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(nodeGroupLabel, "tas").
 			TopologyName("default").Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
@@ -2935,7 +2936,7 @@ var _ = ginkgo.Describe("Job controller with TopologyAwareScheduling", ginkgo.Or
 
 		ginkgo.By("verify the workload is admitted", func() {
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-			util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 		})
 
 		ginkgo.By("verify admission for the workload", func() {
@@ -2988,7 +2989,7 @@ var _ = ginkgo.Describe("Job controller with TopologyAwareScheduling", ginkgo.Or
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-			util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 		})
 
 		ginkgo.By("verify admission for the workload", func() {
@@ -3053,15 +3054,15 @@ var _ = ginkgo.Describe("Job controller with ObjectRetentionPolicies", ginkgo.Or
 
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		fl = testing.MakeResourceFlavor("fl").Obj()
+		fl = utiltestingapi.MakeResourceFlavor("fl").Obj()
 		util.MustCreate(ctx, k8sClient, fl)
 
-		cq = testing.MakeClusterQueue("cq").
-			ResourceGroup(*testing.MakeFlavorQuotas(fl.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+		cq = utiltestingapi.MakeClusterQueue("cq").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(fl.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 
@@ -3102,8 +3103,8 @@ var _ = ginkgo.Describe("Job controller with ObjectRetentionPolicies", ginkgo.Or
 				})
 
 				ginkgo.By("Admitting the Workload", func() {
-					admission := testing.MakeAdmission(cq.Name).
-						PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+					admission := utiltestingapi.MakeAdmission(cq.Name).
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(fl.Name), "1m").
 							Count(wl.Spec.PodSets[0].Count).
 							Obj()).
@@ -3158,8 +3159,8 @@ var _ = ginkgo.Describe("Job controller with ObjectRetentionPolicies", ginkgo.Or
 					}, util.Timeout, util.Interval).Should(gomega.Succeed())
 				})
 
-				admission := testing.MakeAdmission(cq.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				admission := utiltestingapi.MakeAdmission(cq.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(fl.Name), "1m").
 						Count(wl.Spec.PodSets[0].Count).
 						Obj()).
@@ -3256,8 +3257,8 @@ var _ = ginkgo.Describe("Job controller with ObjectRetentionPolicies", ginkgo.Or
 					}, util.Timeout, util.Interval).Should(gomega.Succeed())
 				})
 
-				admission := testing.MakeAdmission(cq.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				admission := utiltestingapi.MakeAdmission(cq.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(fl.Name), "1m").
 						Count(wl.Spec.PodSets[0].Count).
 						Obj()).
@@ -3346,18 +3347,18 @@ var _ = ginkgo.Describe("Job with elastic jobs via workload-slices support", gin
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		resourceFlavor = testing.MakeResourceFlavor("default").Obj()
+		resourceFlavor = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, resourceFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("default").
-			ResourceGroup(*testing.MakeFlavorQuotas(resourceFlavor.Name).Resource(corev1.ResourceCPU, strconv.Itoa(cpuNominalQuota)).Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(resourceFlavor.Name).Resource(corev1.ResourceCPU, strconv.Itoa(cpuNominalQuota)).Obj()).
 			Preemption(kueue.ClusterQueuePreemption{
 				WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 			}).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("default", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("default", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 	ginkgo.AfterEach(func() {
@@ -3543,14 +3544,14 @@ var _ = ginkgo.Describe("Job with elastic jobs via workload-slices support", gin
 		features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.ElasticJobsViaWorkloadSlices, true)
 
 		ginkgo.By("create low priority class")
-		lowPriorityClass := testing.MakeWorkloadPriorityClass("low").PriorityValue(int32(priorityValue)).Obj()
+		lowPriorityClass := utiltestingapi.MakeWorkloadPriorityClass("low").PriorityValue(int32(priorityValue)).Obj()
 		util.MustCreate(ctx, k8sClient, lowPriorityClass)
 		ginkgo.DeferCleanup(func() {
 			gomega.Expect(k8sClient.Delete(ctx, lowPriorityClass)).To(gomega.Succeed())
 		})
 
 		ginkgo.By("create high priority class")
-		highPriorityClass := testing.MakeWorkloadPriorityClass("high").PriorityValue(int32(highPriorityValue)).Obj()
+		highPriorityClass := utiltestingapi.MakeWorkloadPriorityClass("high").PriorityValue(int32(highPriorityValue)).Obj()
 		util.MustCreate(ctx, k8sClient, highPriorityClass)
 		ginkgo.DeferCleanup(func() {
 			gomega.Expect(k8sClient.Delete(ctx, highPriorityClass)).To(gomega.Succeed())
@@ -3672,15 +3673,15 @@ var _ = ginkgo.Describe("Job reconciliation", ginkgo.Ordered, func() {
 			Obj()
 		util.MustCreate(ctx, k8sClient, unmanagedNs)
 
-		rf = testing.MakeResourceFlavor(rfName).Obj()
+		rf = utiltestingapi.MakeResourceFlavor(rfName).Obj()
 		util.MustCreate(ctx, k8sClient, rf)
 
-		cq = testing.MakeClusterQueue(cqName).
-			ResourceGroup(*testing.MakeFlavorQuotas(rfName).Resource(corev1.ResourceCPU, "5").Obj()).
+		cq = utiltestingapi.MakeClusterQueue(cqName).
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(rfName).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue(lqName, managedNs.Name).ClusterQueue(cqName).Obj()
+		lq = utiltestingapi.MakeLocalQueue(lqName, managedNs.Name).ClusterQueue(cqName).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 
diff --git a/test/integration/singlecluster/controller/jobs/jobset/jobset_controller_test.go b/test/integration/singlecluster/controller/jobs/jobset/jobset_controller_test.go
index c9d64392b..bfdfbcbbb 100644
--- a/test/integration/singlecluster/controller/jobs/jobset/jobset_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/jobset/jobset_controller_test.go
@@ -40,6 +40,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	workloadjobset "sigs.k8s.io/kueue/pkg/controller/jobs/jobset"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjobset "sigs.k8s.io/kueue/pkg/util/testingjobs/jobset"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
 	"sigs.k8s.io/kueue/pkg/workload"
@@ -85,18 +86,18 @@ var _ = ginkgo.Describe("JobSet controller", ginkgo.Ordered, ginkgo.ContinueOnFa
 		)
 
 		ginkgo.BeforeEach(func() {
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
-					*testing.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
 				).Obj()
 
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
-			onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+			onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 			util.MustCreate(ctx, k8sClient, onDemandFlavor)
-			spotFlavor = testing.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
+			spotFlavor = utiltestingapi.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
 			util.MustCreate(ctx, k8sClient, spotFlavor)
 		})
 
@@ -151,7 +152,7 @@ var _ = ginkgo.Describe("JobSet controller", ginkgo.Ordered, ginkgo.ContinueOnFa
 
 			ginkgo.By("checking the workload is updated with queue name when the JobSet does")
 			var jobSetQueueName kueue.LocalQueueName = "test-queue"
-			createdJobSet.Annotations = map[string]string{constants.QueueLabel: string(jobSetQueueName)}
+			createdJobSet.Labels = map[string]string{constants.QueueLabel: string(jobSetQueueName)}
 			gomega.Expect(k8sClient.Update(ctx, createdJobSet)).Should(gomega.Succeed())
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).Should(gomega.Succeed())
@@ -179,7 +180,7 @@ var _ = ginkgo.Describe("JobSet controller", ginkgo.Ordered, ginkgo.ContinueOnFa
 
 			ginkgo.By("checking the JobSet is unsuspended when workload is assigned")
 
-			admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+			admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 				kueue.PodSetAssignment{
 					Name: createdWorkload.Spec.PodSets[0].Name,
 					Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -229,7 +230,7 @@ var _ = ginkgo.Describe("JobSet controller", ginkgo.Ordered, ginkgo.ContinueOnFa
 			gomega.Expect(createdWorkload.Status.Admission).Should(gomega.BeNil())
 
 			ginkgo.By("checking the JobSet is unsuspended and selectors added when workload is assigned again")
-			admission = testing.MakeAdmission(clusterQueue.Name).
+			admission = utiltestingapi.MakeAdmission(clusterQueue.Name).
 				PodSets(
 					kueue.PodSetAssignment{
 						Name: "replicated-job-1",
@@ -321,7 +322,7 @@ var _ = ginkgo.Describe("JobSet controller", ginkgo.Ordered, ginkgo.ContinueOnFa
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).To(gomega.Succeed())
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
-				admission := testing.MakeAdmission(localQueue.Name).PodSets(
+				admission := utiltestingapi.MakeAdmission(localQueue.Name).PodSets(
 					kueue.PodSetAssignment{
 						Name: createdWorkload.Spec.PodSets[0].Name,
 						Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -420,7 +421,7 @@ var _ = ginkgo.Describe("JobSet controller", ginkgo.Ordered, ginkgo.ContinueOnFa
 					g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).To(gomega.Succeed())
 					g.Expect(createdWorkload.Spec.PodSets).To(gomega.ContainElements(
 						gomega.BeComparableTo(
-							*testing.MakePodSet("replicated-job-1", 4).
+							*utiltestingapi.MakePodSet("replicated-job-1", 4).
 								PodIndexLabel(ptr.To("batch.kubernetes.io/job-completion-index")).
 								SubGroupIndexLabel(ptr.To("jobset.sigs.k8s.io/job-index")).
 								SubGroupCount(ptr.To[int32](2)).
@@ -428,7 +429,7 @@ var _ = ginkgo.Describe("JobSet controller", ginkgo.Ordered, ginkgo.ContinueOnFa
 							checkPSOpts,
 						),
 						gomega.BeComparableTo(
-							*testing.MakePodSet("replicated-job-2-empty", 0).
+							*utiltestingapi.MakePodSet("replicated-job-2-empty", 0).
 								PodIndexLabel(ptr.To("batch.kubernetes.io/job-completion-index")).
 								SubGroupIndexLabel(ptr.To("jobset.sigs.k8s.io/job-index")).
 								SubGroupCount(ptr.To[int32](1)).
@@ -442,7 +443,7 @@ var _ = ginkgo.Describe("JobSet controller", ginkgo.Ordered, ginkgo.ContinueOnFa
 			ginkgo.By("admit the workload", func() {
 				createdWorkload := &kueue.Workload{}
 				gomega.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).To(gomega.Succeed())
-				admission := testing.MakeAdmission(clusterQueue.Name).
+				admission := utiltestingapi.MakeAdmission(clusterQueue.Name).
 					PodSets(
 						kueue.PodSetAssignment{
 							Name: createdWorkload.Spec.PodSets[0].Name,
@@ -481,17 +482,17 @@ var _ = ginkgo.Describe("JobSet controller", ginkgo.Ordered, ginkgo.ContinueOnFa
 		)
 
 		ginkgo.BeforeEach(func() {
-			admissionCheck = testing.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
+			admissionCheck = utiltestingapi.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, admissionCheck)
 			util.SetAdmissionCheckActive(ctx, k8sClient, admissionCheck, metav1.ConditionTrue)
-			clusterQueueAc = testing.MakeClusterQueue("prod-cq-with-checks").
+			clusterQueueAc = utiltestingapi.MakeClusterQueue("prod-cq-with-checks").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
 				).AdmissionChecks("check").Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueueAc)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
-			testFlavor = testing.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
+			testFlavor = utiltestingapi.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
 			util.MustCreate(ctx, k8sClient, testFlavor)
 
 			jobLookupKey = &types.NamespacedName{Name: jobSetName, Namespace: ns.Name}
@@ -596,7 +597,7 @@ var _ = ginkgo.Describe("JobSet controller", ginkgo.Ordered, ginkgo.ContinueOnFa
 			})
 
 			ginkgo.By("admit the workload", func() {
-				admission := testing.MakeAdmission(clusterQueueAc.Name).
+				admission := utiltestingapi.MakeAdmission(clusterQueueAc.Name).
 					PodSets(
 						kueue.PodSetAssignment{
 							Name: createdWorkload.Spec.PodSets[0].Name,
@@ -751,7 +752,7 @@ var _ = ginkgo.Describe("JobSet controller when waitForPodsReady enabled", ginkg
 		wantCondition      *metav1.Condition
 	}
 
-	var defaultFlavor = testing.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
+	var defaultFlavor = utiltestingapi.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
 
 	ginkgo.BeforeAll(func() {
 		fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithWaitForPodsReady(&configapi.WaitForPodsReady{Enable: true})))
@@ -792,7 +793,7 @@ var _ = ginkgo.Describe("JobSet controller when waitForPodsReady enabled", ginkg
 				},
 			).Obj()
 			jobSetQueueName := "test-queue"
-			jobSet.Annotations = map[string]string{constants.QueueLabel: jobSetQueueName}
+			jobSet.Labels = map[string]string{constants.QueueLabel: jobSetQueueName}
 			util.MustCreate(ctx, k8sClient, jobSet)
 			lookupKey := types.NamespacedName{Name: jobSetName, Namespace: ns.Name}
 			createdJobSet := &jobsetapi.JobSet{}
@@ -806,7 +807,7 @@ var _ = ginkgo.Describe("JobSet controller when waitForPodsReady enabled", ginkg
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			ginkgo.By("Admit the workload created for the JobSet")
-			admission := testing.MakeAdmission("foo").PodSets(
+			admission := utiltestingapi.MakeAdmission("foo").PodSets(
 				kueue.PodSetAssignment{
 					Name: createdWorkload.Spec.PodSets[0].Name,
 					Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -972,16 +973,16 @@ var _ = ginkgo.Describe("JobSet controller interacting with scheduler", ginkgo.O
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "jobset-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("dev-clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "1").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "1").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 	})
@@ -994,7 +995,7 @@ var _ = ginkgo.Describe("JobSet controller interacting with scheduler", ginkgo.O
 
 	ginkgo.It("Should schedule JobSets as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		ginkgo.By("checking a dev job starts")
@@ -1026,12 +1027,12 @@ var _ = ginkgo.Describe("JobSet controller interacting with scheduler", ginkgo.O
 		gomega.Expect(createdJobSet.Spec.ReplicatedJobs[0].Template.Spec.Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(spotUntaintedFlavor.Name))
 		gomega.Expect(createdJobSet.Spec.ReplicatedJobs[1].Template.Spec.Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(onDemandFlavor.Name))
 		util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
-		util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 	})
 
 	ginkgo.It("Should allow reclaim of resources that are no longer needed", func() {
 		ginkgo.By("creating localQueue", func() {
-			localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 
@@ -1061,7 +1062,7 @@ var _ = ginkgo.Describe("JobSet controller interacting with scheduler", ginkgo.O
 				g.Expect(*createdJobSet1.Spec.Suspend).Should(gomega.BeFalse())
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 			util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
-			util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 		})
 
 		jobSet2 := testingjobset.MakeJobSet("dev-jobset2", ns.Name).ReplicatedJobs(
@@ -1176,21 +1177,21 @@ var _ = ginkgo.Describe("JobSet controller with TopologyAwareScheduling", ginkgo
 		}
 		util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-		topology = testing.MakeDefaultTwoLevelTopology("default")
+		topology = utiltestingapi.MakeDefaultTwoLevelTopology("default")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(nodeGroupLabel, "tas").
 			TopologyName("default").Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
@@ -1274,7 +1275,7 @@ var _ = ginkgo.Describe("JobSet controller with TopologyAwareScheduling", ginkgo
 
 		ginkgo.By("verify the workload is admitted", func() {
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-			util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 		})
 
 		ginkgo.By("verify admission for the workload", func() {
diff --git a/test/integration/singlecluster/controller/jobs/kubeflow/kubeflowjob.go b/test/integration/singlecluster/controller/jobs/kubeflow/kubeflowjob.go
index c94fcc1b5..0574eff44 100644
--- a/test/integration/singlecluster/controller/jobs/kubeflow/kubeflowjob.go
+++ b/test/integration/singlecluster/controller/jobs/kubeflow/kubeflowjob.go
@@ -36,6 +36,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/kubeflowjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -90,7 +91,7 @@ func ShouldReconcileJob(ctx context.Context, k8sClient client.Client, job, creat
 	gomega.Expect(*createdWorkload.Spec.Priority).Should(gomega.Equal(int32(priorityValue)))
 
 	ginkgo.By("checking the workload is updated with queue name when the job does")
-	createdJob.Object().SetAnnotations(map[string]string{constants.QueueAnnotation: string(jobQueueName)})
+	createdJob.Object().SetLabels(map[string]string{constants.QueueLabel: string(jobQueueName)})
 	gomega.Expect(k8sClient.Update(ctx, createdJob.Object())).Should(gomega.Succeed())
 	util.AwaitAndVerifyWorkloadQueueName(ctx, k8sClient, createdWorkload, wlLookupKey, jobQueueName)
 
@@ -116,20 +117,20 @@ func ShouldReconcileJob(ctx context.Context, k8sClient client.Client, job, creat
 	}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 	ginkgo.By("checking the job is unsuspended when workload is assigned")
-	onDemandFlavor := testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+	onDemandFlavor := utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 	util.MustCreate(ctx, k8sClient, onDemandFlavor)
-	spotFlavor := testing.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
+	spotFlavor := utiltestingapi.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
 	util.MustCreate(ctx, k8sClient, spotFlavor)
 	defer func() {
 		util.ExpectObjectToBeDeleted(ctx, k8sClient, onDemandFlavor, true)
 		util.ExpectObjectToBeDeleted(ctx, k8sClient, spotFlavor, true)
 	}()
-	clusterQueue := testing.MakeClusterQueue("cluster-queue").
+	clusterQueue := utiltestingapi.MakeClusterQueue("cluster-queue").
 		ResourceGroup(
-			*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
-			*testing.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
+			*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+			*utiltestingapi.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
 		).Obj()
-	admission := testing.MakeAdmission(clusterQueue.Name).PodSets(CreatePodSetAssignment(createdWorkload, podSetsResources)...).Obj()
+	admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(CreatePodSetAssignment(createdWorkload, podSetsResources)...).Obj()
 	util.SetQuotaReservation(ctx, k8sClient, wlLookupKey, admission)
 	util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, createdWorkload)
 	gomega.Eventually(func(g gomega.Gomega) {
@@ -172,7 +173,7 @@ func ShouldReconcileJob(ctx context.Context, k8sClient client.Client, job, creat
 	gomega.Expect(createdWorkload.Status.Admission).Should(gomega.BeNil())
 
 	ginkgo.By("checking the job is unsuspended and selectors added when workload is assigned again")
-	admission = testing.MakeAdmission(clusterQueue.Name).PodSets(CreatePodSetAssignment(createdWorkload, podSetsResources)...).Obj()
+	admission = utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(CreatePodSetAssignment(createdWorkload, podSetsResources)...).Obj()
 	util.SetQuotaReservation(ctx, k8sClient, wlLookupKey, admission)
 	util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, createdWorkload)
 	gomega.Eventually(func(g gomega.Gomega) {
@@ -222,7 +223,7 @@ func ShouldNotReconcileUnmanagedJob(ctx context.Context, k8sClient client.Client
 
 func JobControllerWhenWaitForPodsReadyEnabled(ctx context.Context, k8sClient client.Client, job, createdJob kubeflowjob.KubeflowJob, podsReadyTestSpec PodsReadyTestSpec, podSetsResources []PodSetsResource) {
 	ginkgo.By("Create a job")
-	job.Object().SetAnnotations(map[string]string{constants.QueueAnnotation: string(jobQueueName)})
+	job.Object().SetLabels(map[string]string{constants.QueueLabel: string(jobQueueName)})
 	util.MustCreate(ctx, k8sClient, job.Object())
 	lookupKey := client.ObjectKeyFromObject(job.Object())
 	gomega.ExpectWithOffset(1, k8sClient.Get(ctx, lookupKey, createdJob.Object())).Should(gomega.Succeed())
@@ -239,7 +240,7 @@ func JobControllerWhenWaitForPodsReadyEnabled(ctx context.Context, k8sClient cli
 	}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 	ginkgo.By("Admit the workload created for the job")
-	admission := testing.MakeAdmission("foo").PodSets(CreatePodSetAssignment(createdWorkload, podSetsResources)...).Obj()
+	admission := utiltestingapi.MakeAdmission("foo").PodSets(CreatePodSetAssignment(createdWorkload, podSetsResources)...).Obj()
 	util.SetQuotaReservation(ctx, k8sClient, wlLookupKey, admission)
 	util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, createdWorkload)
 	gomega.ExpectWithOffset(1, k8sClient.Get(ctx, wlLookupKey, createdWorkload)).Should(gomega.Succeed())
@@ -304,7 +305,7 @@ func ShouldScheduleJobsAsTheyFitInTheirClusterQueue(ctx context.Context, k8sClie
 		gomega.ExpectWithOffset(1, createdJob.KFJobControl.ReplicaSpecs()[psr.RoleName].Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(string(psr.ResourceCPU)))
 	}
 	util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
-	util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+	util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 }
 
 type PodSetsResource struct {
diff --git a/test/integration/singlecluster/controller/jobs/mpijob/mpijob_controller_test.go b/test/integration/singlecluster/controller/jobs/mpijob/mpijob_controller_test.go
index 8bed0cdaa..d9edce41c 100644
--- a/test/integration/singlecluster/controller/jobs/mpijob/mpijob_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/mpijob/mpijob_controller_test.go
@@ -39,6 +39,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	workloadmpijob "sigs.k8s.io/kueue/pkg/controller/jobs/mpijob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingmpijob "sigs.k8s.io/kueue/pkg/util/testingjobs/mpijob"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
@@ -109,7 +110,7 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 
 		ginkgo.By("checking the workload is updated with queue name when the job does")
 		var jobQueueName kueue.LocalQueueName = "test-queue"
-		createdJob.Annotations = map[string]string{constants.QueueAnnotation: string(jobQueueName)}
+		createdJob.Labels = map[string]string{constants.QueueLabel: string(jobQueueName)}
 		gomega.Expect(k8sClient.Update(ctx, createdJob)).Should(gomega.Succeed())
 		gomega.Eventually(func(g gomega.Gomega) {
 			g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).Should(gomega.Succeed())
@@ -138,19 +139,19 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 		ginkgo.By("checking the job is unsuspended when workload is assigned")
-		onDemandFlavor := testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor := utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 		ginkgo.DeferCleanup(func() {
 			util.ExpectObjectToBeDeleted(ctx, k8sClient, onDemandFlavor, true)
 		})
-		spotFlavor := testing.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
+		spotFlavor := utiltestingapi.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
 		util.MustCreate(ctx, k8sClient, spotFlavor)
-		clusterQueue := testing.MakeClusterQueue("cluster-queue").
+		clusterQueue := utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
-				*testing.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
-		admission := testing.MakeAdmission(clusterQueue.Name).
+		admission := utiltestingapi.MakeAdmission(clusterQueue.Name).
 			PodSets(
 				kueue.PodSetAssignment{
 					Name: kueue.NewPodSetReference("launcher"),
@@ -212,7 +213,7 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 		gomega.Expect(createdWorkload.Status.Admission).Should(gomega.BeNil())
 
 		ginkgo.By("checking the job is unsuspended and selectors added when workload is assigned again")
-		admission = testing.MakeAdmission(clusterQueue.Name).
+		admission = utiltestingapi.MakeAdmission(clusterQueue.Name).
 			PodSets(
 				kueue.PodSetAssignment{
 					Name: kueue.NewPodSetReference("launcher"),
@@ -288,17 +289,17 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 		)
 
 		ginkgo.BeforeEach(func() {
-			admissionCheck = testing.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
+			admissionCheck = utiltestingapi.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, admissionCheck)
 			util.SetAdmissionCheckActive(ctx, k8sClient, admissionCheck, metav1.ConditionTrue)
-			clusterQueueAc = testing.MakeClusterQueue("prod-cq-with-checks").
+			clusterQueueAc = utiltestingapi.MakeClusterQueue("prod-cq-with-checks").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
 				).AdmissionChecks("check").Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueueAc)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
-			testFlavor = testing.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
+			testFlavor = utiltestingapi.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
 			util.MustCreate(ctx, k8sClient, testFlavor)
 
 			jobLookupKey = &types.NamespacedName{Name: jobName, Namespace: ns.Name}
@@ -374,7 +375,7 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 			})
 
 			ginkgo.By("admit the workload", func() {
-				admission := testing.MakeAdmission(clusterQueueAc.Name).
+				admission := utiltestingapi.MakeAdmission(clusterQueueAc.Name).
 					PodSets(
 						kueue.PodSetAssignment{
 							Name: kueue.NewPodSetReference("launcher"),
@@ -503,7 +504,7 @@ var _ = ginkgo.Describe("Job controller for workloads when only jobs with queue
 
 		ginkgo.By("checking the workload is created when queue name is set")
 		jobQueueName := "test-queue"
-		createdJob.Annotations = map[string]string{constants.QueueAnnotation: jobQueueName}
+		createdJob.Labels = map[string]string{constants.QueueLabel: jobQueueName}
 		gomega.Expect(k8sClient.Update(ctx, createdJob)).Should(gomega.Succeed())
 		gomega.Eventually(func(g gomega.Gomega) {
 			g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).Should(gomega.Succeed())
@@ -568,7 +569,7 @@ var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", ginkgo.O
 
 	var (
 		ns            *corev1.Namespace
-		defaultFlavor = testing.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
+		defaultFlavor = utiltestingapi.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
 	)
 
 	ginkgo.BeforeAll(func() {
@@ -596,7 +597,7 @@ var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", ginkgo.O
 				GenericLauncherAndWorker().
 				Parallelism(2).Obj()
 			jobQueueName := "test-queue"
-			job.Annotations = map[string]string{constants.QueueAnnotation: jobQueueName}
+			job.Labels = map[string]string{constants.QueueLabel: jobQueueName}
 			util.MustCreate(ctx, k8sClient, job)
 			lookupKey := types.NamespacedName{Name: jobName, Namespace: ns.Name}
 			createdJob := &kfmpi.MPIJob{}
@@ -610,7 +611,7 @@ var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", ginkgo.O
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			ginkgo.By("Admit the workload created for the job")
-			admission := testing.MakeAdmission("foo").
+			admission := utiltestingapi.MakeAdmission("foo").
 				PodSets(
 					kueue.PodSetAssignment{
 						Name: kueue.NewPodSetReference("launcher"),
@@ -777,16 +778,16 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("dev-clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 	})
@@ -799,7 +800,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 
 	ginkgo.It("Should schedule jobs as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		ginkgo.By("checking a dev job starts")
@@ -817,12 +818,12 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 		gomega.Expect(createdJob.Spec.MPIReplicaSpecs[kfmpi.MPIReplicaTypeLauncher].Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(spotUntaintedFlavor.Name))
 		gomega.Expect(createdJob.Spec.MPIReplicaSpecs[kfmpi.MPIReplicaTypeWorker].Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(onDemandFlavor.Name))
 		util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
-		util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 	})
 
 	ginkgo.When("The workload's admission is removed", func() {
 		ginkgo.It("Should restore the original node selectors", func() {
-			localQueue := testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue := utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			job := testingmpijob.MakeMPIJob(jobName, ns.Name).Queue(localQueue.Name).
 				GenericLauncherAndWorker().
 				Request(kfmpi.MPIReplicaTypeLauncher, corev1.ResourceCPU, "3").
@@ -877,7 +878,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 
 			ginkgo.By("clear the workload's admission to stop the job", func() {
 				wlKey := types.NamespacedName{Name: workloadmpijob.GetWorkloadNameForMPIJob(job.Name, job.UID), Namespace: job.Namespace}
-				wl := testing.MakeWorkload(wlKey.Name, wlKey.Namespace).Obj()
+				wl := utiltestingapi.MakeWorkload(wlKey.Name, wlKey.Namespace).Obj()
 				util.SetQuotaReservation(ctx, k8sClient, wlKey, nil)
 				util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, wl)
 			})
@@ -932,21 +933,21 @@ var _ = ginkgo.Describe("MPIJob controller with TopologyAwareScheduling", ginkgo
 		}
 		util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-		topology = testing.MakeDefaultTwoLevelTopology("default")
+		topology = utiltestingapi.MakeDefaultTwoLevelTopology("default")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(nodeGroupLabel, "tas").
 			TopologyName("default").Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
@@ -1005,7 +1006,7 @@ var _ = ginkgo.Describe("MPIJob controller with TopologyAwareScheduling", ginkgo
 
 		ginkgo.By("verify the workload is admitted", func() {
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-			util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 		})
 
 		ginkgo.By("verify admission for the workload", func() {
diff --git a/test/integration/singlecluster/controller/jobs/paddlejob/paddlejob_controller_test.go b/test/integration/singlecluster/controller/jobs/paddlejob/paddlejob_controller_test.go
index 35b7ee67a..dd917c520 100644
--- a/test/integration/singlecluster/controller/jobs/paddlejob/paddlejob_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/paddlejob/paddlejob_controller_test.go
@@ -33,6 +33,7 @@ import (
 	workloadpaddlejob "sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/paddlejob"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/kubeflowjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
 	testingpaddlejob "sigs.k8s.io/kueue/pkg/util/testingjobs/paddlejob"
 	"sigs.k8s.io/kueue/test/integration/framework"
@@ -94,7 +95,7 @@ var _ = ginkgo.Describe("Job controller", framework.RedundantSpec, ginkgo.Ordere
 var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", framework.RedundantSpec, ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
 	var (
 		ns            *corev1.Namespace
-		defaultFlavor = testing.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
+		defaultFlavor = utiltestingapi.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
 	)
 
 	ginkgo.BeforeAll(func() {
@@ -235,16 +236,16 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", framework.R
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("dev-clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 	})
@@ -257,7 +258,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", framework.R
 
 	ginkgo.It("Should schedule jobs as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		kfJob := kubeflowjob.KubeflowJob{KFJobControl: (*workloadpaddlejob.JobControl)(
@@ -322,21 +323,21 @@ var _ = ginkgo.Describe("PaddleJob controller with TopologyAwareScheduling", fra
 		}
 		util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-		topology = testing.MakeDefaultTwoLevelTopology("default")
+		topology = utiltestingapi.MakeDefaultTwoLevelTopology("default")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(nodeGroupLabel, "tas").
 			TopologyName("default").Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
@@ -405,7 +406,7 @@ var _ = ginkgo.Describe("PaddleJob controller with TopologyAwareScheduling", fra
 
 		ginkgo.By("verify the workload is admitted", func() {
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-			util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 		})
 
 		ginkgo.By("verify admission for the workload", func() {
diff --git a/test/integration/singlecluster/controller/jobs/pod/pod_controller_test.go b/test/integration/singlecluster/controller/jobs/pod/pod_controller_test.go
index 23dc8d510..0c04874ae 100644
--- a/test/integration/singlecluster/controller/jobs/pod/pod_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/pod/pod_controller_test.go
@@ -40,6 +40,7 @@ import (
 	podcontroller "sigs.k8s.io/kueue/pkg/controller/jobs/pod"
 	podconstants "sigs.k8s.io/kueue/pkg/controller/jobs/pod/constants"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
 	testingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
@@ -62,10 +63,10 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 	var realClock = clock.RealClock{}
 
 	ginkgo.When("manageJobsWithoutQueueName is disabled", func() {
-		var defaultFlavor = testing.MakeResourceFlavor("default").NodeLabel(corev1.LabelArchStable, "arm64").Obj()
-		var clusterQueue = testing.MakeClusterQueue("cluster-queue").
+		var defaultFlavor = utiltestingapi.MakeResourceFlavor("default").NodeLabel(corev1.LabelArchStable, "arm64").Obj()
+		var clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "1").Obj(),
+				*utiltestingapi.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "1").Obj(),
 			).Obj()
 		nsSelector := &metav1.LabelSelector{
 			MatchExpressions: []metav1.LabelSelectorRequirement{
@@ -109,18 +110,18 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 		ginkgo.BeforeEach(func() {
 			ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "pod-")
 
-			fl = testing.MakeResourceFlavor("fl").Obj()
+			fl = utiltestingapi.MakeResourceFlavor("fl").Obj()
 			util.MustCreate(ctx, k8sClient, fl)
 
-			cq = testing.MakeClusterQueue("cq").
-				ResourceGroup(*testing.MakeFlavorQuotas(fl.Name).
+			cq = utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(fl.Name).
 					Resource(corev1.ResourceCPU, "9").
 					Resource(corev1.ResourceMemory, "36").
 					Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 
-			lq = testing.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
+			lq = utiltestingapi.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, lq)
 
 			lookupKey = types.NamespacedName{Name: podName, Namespace: ns.Name}
@@ -176,12 +177,12 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 
 				ginkgo.By("checking the pod is unsuspended when workload is assigned")
 
-				clusterQueue := testing.MakeClusterQueue("cluster-queue").
+				clusterQueue := utiltestingapi.MakeClusterQueue("cluster-queue").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj(),
 					).Obj()
-				admission := testing.MakeAdmission(clusterQueue.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				admission := utiltestingapi.MakeAdmission(clusterQueue.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "1").
 						Count(createdWorkload.Spec.PodSets[0].Count).
 						Obj()).
@@ -236,12 +237,12 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 				ginkgo.By("checking the pod is unsuspended when workload is assigned")
-				clusterQueue := testing.MakeClusterQueue("cluster-queue").
+				clusterQueue := utiltestingapi.MakeClusterQueue("cluster-queue").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj(),
 					).Obj()
-				admission := testing.MakeAdmission(clusterQueue.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				admission := utiltestingapi.MakeAdmission(clusterQueue.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "1").
 						Count(createdWorkload.Spec.PodSets[0].Count).
 						Obj()).
@@ -301,12 +302,12 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 					gomega.Expect(createdWorkload.Spec.QueueName).To(gomega.Equal(kueue.LocalQueueName("test-queue")), "The Workload should have .spec.queueName set")
 
 					ginkgo.By("checking that pod is unsuspended when workload is admitted")
-					clusterQueue := testing.MakeClusterQueue("cluster-queue").
+					clusterQueue := utiltestingapi.MakeClusterQueue("cluster-queue").
 						ResourceGroup(
-							*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj(),
+							*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj(),
 						).Obj()
-					admission := testing.MakeAdmission(clusterQueue.Name).
-						PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+					admission := utiltestingapi.MakeAdmission(clusterQueue.Name).
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").
 							Count(createdWorkload.Spec.PodSets[0].Count).
 							Obj()).
@@ -399,17 +400,17 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 
 				ginkgo.BeforeEach(func() {
 					ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "pod-ac-namespace-")
-					admissionCheck = testing.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
+					admissionCheck = utiltestingapi.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
 					util.MustCreate(ctx, k8sClient, admissionCheck)
 					util.SetAdmissionCheckActive(ctx, k8sClient, admissionCheck, metav1.ConditionTrue)
-					clusterQueueAc = testing.MakeClusterQueue("prod-cq-with-checks").
+					clusterQueueAc = utiltestingapi.MakeClusterQueue("prod-cq-with-checks").
 						ResourceGroup(
-							*testing.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
+							*utiltestingapi.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
 						).AdmissionChecks("check").Obj()
 					util.MustCreate(ctx, k8sClient, clusterQueueAc)
-					localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
+					localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
 					util.MustCreate(ctx, k8sClient, localQueue)
-					testFlavor = testing.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
+					testFlavor = utiltestingapi.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
 					util.MustCreate(ctx, k8sClient, testFlavor)
 
 					podLookupKey = &types.NamespacedName{Name: podName, Namespace: ns.Name}
@@ -479,8 +480,8 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 					})
 
 					ginkgo.By("admit the workload", func() {
-						admission := testing.MakeAdmission(clusterQueueAc.Name).
-							PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+						admission := utiltestingapi.MakeAdmission(clusterQueueAc.Name).
+							PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 								Assignment(corev1.ResourceCPU, "test-flavor", "1").
 								Count(createdWorkload.Spec.PodSets[0].Count).
 								Obj()).
@@ -522,9 +523,9 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 					util.MustCreate(ctx, k8sClient, pod)
 				})
 
-				wl := testing.MakeWorkload(workloadName, ns.Name).
+				wl := utiltestingapi.MakeWorkload(workloadName, ns.Name).
 					Queue(kueue.LocalQueueName(lq.Name)).
-					PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 1).PodSpec(pod.Spec).Obj()).
+					PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).PodSpec(pod.Spec).Obj()).
 					Obj()
 				wlLookupKey := types.NamespacedName{Name: workloadName, Namespace: ns.Name}
 
@@ -533,8 +534,8 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				})
 
 				ginkgo.By("Admit workload", func() {
-					admission := testing.MakeAdmission(clusterQueue.Name).
-						PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+					admission := utiltestingapi.MakeAdmission(clusterQueue.Name).
+						PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 							Assignment(corev1.ResourceCPU, "default", "1").
 							Count(wl.Spec.PodSets[0].Count).
 							Obj()).
@@ -615,7 +616,7 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				gomega.Expect(createdWorkload.Spec.QueueName).To(gomega.Equal(kueue.LocalQueueName("test-queue")), "The Workload should have .spec.queueName set")
 
 				ginkgo.By("checking that all pods in group are unsuspended when workload is admitted", func() {
-					admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+					admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 						kueue.PodSetAssignment{
 							Name: "4b0469f7",
 							Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -689,7 +690,7 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				gomega.Expect(createdWorkload.Spec.QueueName).To(gomega.Equal(kueue.LocalQueueName("test-queue")), "The Workload should have .spec.queueName set")
 
 				ginkgo.By("checking that all pods in group are unsuspended when workload is admitted", func() {
-					admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+					admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 						kueue.PodSetAssignment{
 							Name: "bf90803c",
 							Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -765,8 +766,8 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				gomega.Expect(createdWorkload.Spec.QueueName).To(gomega.Equal(kueue.LocalQueueName("test-queue")), "The Workload should have .spec.queueName set")
 				originalWorkloadUID := createdWorkload.UID
 
-				admission := testing.MakeAdmission(clusterQueue.Name).
-					PodSets(testing.MakePodSetAssignment("bf90803c").
+				admission := utiltestingapi.MakeAdmission(clusterQueue.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment("bf90803c").
 						Assignment(corev1.ResourceCPU, "default", "1").
 						Count(createdWorkload.Spec.PodSets[0].Count).
 						Obj()).
@@ -919,8 +920,8 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				gomega.Expect(createdWorkload.Spec.QueueName).To(gomega.Equal(kueue.LocalQueueName("test-queue")), "The Workload should have .spec.queueName set")
 
 				ginkgo.By("checking that pod is unsuspended when workload is admitted")
-				admission := testing.MakeAdmission(clusterQueue.Name).
-					PodSets(testing.MakePodSetAssignment("bf90803c").
+				admission := utiltestingapi.MakeAdmission(clusterQueue.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment("bf90803c").
 						Assignment(corev1.ResourceCPU, "default", "1").
 						Count(createdWorkload.Spec.PodSets[0].Count).
 						Obj()).
@@ -1072,7 +1073,7 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 
 				createdPod := &corev1.Pod{}
 				ginkgo.By("checking that all pods in group are unsuspended when workload is admitted", func() {
-					admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+					admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 						kueue.PodSetAssignment{
 							Name: "4b0469f7",
 							Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -1198,7 +1199,7 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				})
 
 				ginkgo.By("checking that all pods in group are unsuspended when workload is admitted", func() {
-					admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+					admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 						kueue.PodSetAssignment{
 							Name: "4b0469f7",
 							Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -1264,7 +1265,7 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 				ginkgo.By("Admitting workload", func() {
-					admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+					admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 						kueue.PodSetAssignment{
 							Name: "4b0469f7",
 							Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -1376,8 +1377,8 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 					}, util.Timeout, util.Interval).Should(gomega.Succeed())
 				})
 
-				admission := testing.MakeAdmission(cq.Name).
-					PodSets(testing.MakePodSetAssignment(wl.Spec.PodSets[0].Name).
+				admission := utiltestingapi.MakeAdmission(cq.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(wl.Spec.PodSets[0].Name).
 						Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(fl.Name), "1").
 						Count(wl.Spec.PodSets[0].Count).
 						Obj()).
@@ -1501,7 +1502,7 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 				ginkgo.By("checking that all pods in group are unsuspended when workload is admitted", func() {
-					admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+					admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 						kueue.PodSetAssignment{
 							Name: "4b0469f7",
 							Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -1601,12 +1602,12 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 					util.MustCreate(ctx, k8sClient, pod1)
 				})
 
-				wl := testing.MakeWorkload(workloadName, ns.Name).
+				wl := utiltestingapi.MakeWorkload(workloadName, ns.Name).
 					Queue(kueue.LocalQueueName(lq.Name)).
 					Annotation(podconstants.IsGroupWorkloadAnnotationKey, podconstants.IsGroupWorkloadAnnotationValue).
 					PodSets(
-						*testing.MakePodSet("leader", 1).PodSpec(pod1.Spec).Obj(),
-						*testing.MakePodSet("worker", 1).PodSpec(pod2.Spec).Obj(),
+						*utiltestingapi.MakePodSet("leader", 1).PodSpec(pod1.Spec).Obj(),
+						*utiltestingapi.MakePodSet("worker", 1).PodSpec(pod2.Spec).Obj(),
 					).
 					Obj()
 				wlLookupKey := types.NamespacedName{Name: workloadName, Namespace: ns.Name}
@@ -1616,7 +1617,7 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				})
 
 				ginkgo.By("Admit workload", func() {
-					admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+					admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 						kueue.PodSetAssignment{
 							Name: "leader",
 							Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -1715,12 +1716,12 @@ var _ = ginkgo.Describe("Pod controller interacting with scheduler", ginkgo.Orde
 			jobframework.WithManagedJobsNamespaceSelector(mjnsSelector),
 			jobframework.WithEnabledFrameworks([]string{"pod"}),
 		))
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("dev-clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 	})
@@ -1748,7 +1749,7 @@ var _ = ginkgo.Describe("Pod controller interacting with scheduler", ginkgo.Orde
 
 	ginkgo.It("Should schedule pods as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		ginkgo.By("checking if dev pod starts")
@@ -1769,7 +1770,7 @@ var _ = ginkgo.Describe("Pod controller interacting with scheduler", ginkgo.Orde
 
 	ginkgo.It("Should schedule pod groups as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		basePod := testingpod.MakePod("pod", ns.Name).
@@ -1868,7 +1869,7 @@ var _ = ginkgo.Describe("Pod controller interacting with scheduler", ginkgo.Orde
 
 	ginkgo.When("The workload's admission is removed", func() {
 		ginkgo.It("Should not restore the original node selectors", func() {
-			localQueue := testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue := utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			pod := testingpod.MakePod("dev-pod", ns.Name).Queue(localQueue.Name).
 				Request(corev1.ResourceCPU, "2").
 				Obj()
@@ -1916,7 +1917,7 @@ var _ = ginkgo.Describe("Pod controller interacting with scheduler", ginkgo.Orde
 
 			ginkgo.By("clearing the workload's admission to stop the job", func() {
 				wlKey := types.NamespacedName{Name: podcontroller.GetWorkloadNameForPod(pod.Name, pod.UID), Namespace: pod.Namespace}
-				wl := testing.MakeWorkload(wlKey.Name, wlKey.Namespace).Obj()
+				wl := utiltestingapi.MakeWorkload(wlKey.Name, wlKey.Namespace).Obj()
 				util.SetQuotaReservation(ctx, k8sClient, wlKey, nil)
 				util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, wl)
 			})
@@ -1974,18 +1975,18 @@ var _ = ginkgo.Describe("Pod controller interacting with Workload controller whe
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		fl = testing.MakeResourceFlavor("fl").Obj()
+		fl = utiltestingapi.MakeResourceFlavor("fl").Obj()
 		util.MustCreate(ctx, k8sClient, fl)
 
-		cq = testing.MakeClusterQueue("cq").
-			ResourceGroup(*testing.MakeFlavorQuotas(fl.Name).
+		cq = utiltestingapi.MakeClusterQueue("cq").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(fl.Name).
 				Resource(corev1.ResourceCPU, "9").
 				Resource(corev1.ResourceMemory, "36").
 				Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = testing.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
+		lq = utiltestingapi.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 
@@ -2009,7 +2010,7 @@ var _ = ginkgo.Describe("Pod controller interacting with Workload controller whe
 			})
 
 			wlKey := types.NamespacedName{Name: podGroupName, Namespace: pod.Namespace}
-			wl := testing.MakeWorkload(wlKey.Name, wlKey.Namespace).Obj()
+			wl := utiltestingapi.MakeWorkload(wlKey.Name, wlKey.Namespace).Obj()
 
 			ginkgo.By("checking that workload was created")
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -2024,8 +2025,8 @@ var _ = ginkgo.Describe("Pod controller interacting with Workload controller whe
 				))
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
-			admission := testing.MakeAdmission(cq.Name).
-				PodSets(testing.MakePodSetAssignment(wl.Spec.PodSets[0].Name).
+			admission := utiltestingapi.MakeAdmission(cq.Name).
+				PodSets(utiltestingapi.MakePodSetAssignment(wl.Spec.PodSets[0].Name).
 					Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(fl.Name), "1").
 					Count(wl.Spec.PodSets[0].Count).
 					Obj()).
@@ -2184,21 +2185,21 @@ var _ = ginkgo.Describe("Pod controller with TopologyAwareScheduling", ginkgo.Or
 		}
 		util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-		topology = testing.MakeTopology("default").Levels(tasBlockLabel).Obj()
+		topology = utiltestingapi.MakeTopology("default").Levels(tasBlockLabel).Obj()
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(nodeGroupLabel, "tas").
 			TopologyName("default").Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
@@ -2247,7 +2248,7 @@ var _ = ginkgo.Describe("Pod controller with TopologyAwareScheduling", ginkgo.Or
 		})
 
 		util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-		util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 
 		ginkgo.By("verify admission for the workload", func() {
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -2298,7 +2299,7 @@ var _ = ginkgo.Describe("Pod controller with TopologyAwareScheduling", ginkgo.Or
 		})
 
 		util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-		util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 
 		ginkgo.By("verify admission for the workload", func() {
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -2394,21 +2395,21 @@ var _ = ginkgo.Describe("Pod controller with TASReplaceNodeOnPodTermination", gi
 		}
 		util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-		topology = testing.MakeDefaultThreeLevelTopology("default")
+		topology = utiltestingapi.MakeDefaultThreeLevelTopology("default")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(nodeGroupLabel, "tas").
 			TopologyName(topology.Name).Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
diff --git a/test/integration/singlecluster/controller/jobs/pytorchjob/pytorchjob_controller_test.go b/test/integration/singlecluster/controller/jobs/pytorchjob/pytorchjob_controller_test.go
index 782eadd6f..0228ebd27 100644
--- a/test/integration/singlecluster/controller/jobs/pytorchjob/pytorchjob_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/pytorchjob/pytorchjob_controller_test.go
@@ -36,6 +36,7 @@ import (
 	workloadpytorchjob "sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/pytorchjob"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/kubeflowjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
 	testingpytorchjob "sigs.k8s.io/kueue/pkg/util/testingjobs/pytorchjob"
 	"sigs.k8s.io/kueue/pkg/workload"
@@ -132,7 +133,7 @@ var _ = ginkgo.Describe("Job controller for workloads when only jobs with queue
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 		ginkgo.By("checking the workload is created when queue name is set")
-		createdJob.Annotations = map[string]string{constants.QueueAnnotation: jobQueueName}
+		createdJob.Labels = map[string]string{constants.QueueLabel: jobQueueName}
 		gomega.Expect(k8sClient.Update(ctx, createdJob)).Should(gomega.Succeed())
 		gomega.Eventually(func(g gomega.Gomega) {
 			g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).Should(gomega.Succeed())
@@ -149,17 +150,17 @@ var _ = ginkgo.Describe("Job controller for workloads when only jobs with queue
 		)
 
 		ginkgo.BeforeEach(func() {
-			admissionCheck = testing.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
+			admissionCheck = utiltestingapi.MakeAdmissionCheck("check").ControllerName("ac-controller").Obj()
 			util.MustCreate(ctx, k8sClient, admissionCheck)
 			util.SetAdmissionCheckActive(ctx, k8sClient, admissionCheck, metav1.ConditionTrue)
-			clusterQueueAc = testing.MakeClusterQueue("prod-cq-with-checks").
+			clusterQueueAc = utiltestingapi.MakeClusterQueue("prod-cq-with-checks").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("test-flavor").Resource(corev1.ResourceCPU, "5").Obj(),
 				).AdmissionChecks("check").Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueueAc)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueueAc.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
-			testFlavor = testing.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
+			testFlavor = utiltestingapi.MakeResourceFlavor("test-flavor").NodeLabel(instanceKey, "test-flavor").Obj()
 			util.MustCreate(ctx, k8sClient, testFlavor)
 
 			jobLookupKey = &types.NamespacedName{Name: jobName, Namespace: ns.Name}
@@ -238,7 +239,7 @@ var _ = ginkgo.Describe("Job controller for workloads when only jobs with queue
 			})
 
 			ginkgo.By("admit the workload", func() {
-				admission := testing.MakeAdmission(clusterQueueAc.Name).
+				admission := utiltestingapi.MakeAdmission(clusterQueueAc.Name).
 					PodSets(
 						kueue.PodSetAssignment{
 							Name: "master",
@@ -319,7 +320,7 @@ var _ = ginkgo.Describe("Job controller for workloads when only jobs with queue
 var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
 	var (
 		ns            *corev1.Namespace
-		defaultFlavor = testing.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
+		defaultFlavor = utiltestingapi.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
 	)
 
 	ginkgo.BeforeAll(func() {
@@ -461,16 +462,16 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("dev-clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 	})
@@ -483,7 +484,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 
 	ginkgo.It("Should schedule jobs as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		kfJob := kubeflowjob.KubeflowJob{KFJobControl: (*workloadpytorchjob.JobControl)(
@@ -510,7 +511,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 
 	ginkgo.When("The workload's admission is removed", func() {
 		ginkgo.It("Should restore the original node selectors", func() {
-			localQueue := testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue := utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			job := testingpytorchjob.MakePyTorchJob(jobName, ns.Name).
 				PyTorchReplicaSpecsDefault().
 				Queue(localQueue.Name).
@@ -566,7 +567,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 
 			ginkgo.By("clear the workload's admission to stop the job", func() {
 				wlKey := types.NamespacedName{Name: workloadpytorchjob.GetWorkloadNameForPyTorchJob(job.Name, job.UID), Namespace: job.Namespace}
-				wl := testing.MakeWorkload(wlKey.Name, wlKey.Namespace).Obj()
+				wl := utiltestingapi.MakeWorkload(wlKey.Name, wlKey.Namespace).Obj()
 				util.SetQuotaReservation(ctx, k8sClient, wlKey, nil)
 				util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, wl)
 			})
@@ -621,21 +622,21 @@ var _ = ginkgo.Describe("PyTorchJob controller with TopologyAwareScheduling", gi
 		}
 		util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-		topology = testing.MakeDefaultTwoLevelTopology("default")
+		topology = utiltestingapi.MakeDefaultTwoLevelTopology("default")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(nodeGroupLabel, "tas").
 			TopologyName("default").Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
@@ -704,7 +705,7 @@ var _ = ginkgo.Describe("PyTorchJob controller with TopologyAwareScheduling", gi
 
 		ginkgo.By("verify the workload is admitted", func() {
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-			util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 		})
 
 		ginkgo.By("verify admission for the workload", func() {
diff --git a/test/integration/singlecluster/controller/jobs/raycluster/raycluster_controller_test.go b/test/integration/singlecluster/controller/jobs/raycluster/raycluster_controller_test.go
index 89035a896..ec37b656d 100644
--- a/test/integration/singlecluster/controller/jobs/raycluster/raycluster_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/raycluster/raycluster_controller_test.go
@@ -41,6 +41,7 @@ import (
 	workloadraycluster "sigs.k8s.io/kueue/pkg/controller/jobs/raycluster"
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingraycluster "sigs.k8s.io/kueue/pkg/util/testingjobs/raycluster"
 	testingrayjob "sigs.k8s.io/kueue/pkg/util/testingjobs/rayjob"
 	"sigs.k8s.io/kueue/pkg/workload"
@@ -112,7 +113,7 @@ var _ = ginkgo.Describe("RayCluster controller", ginkgo.Ordered, ginkgo.Continue
 
 		ginkgo.By("checking the workload is updated with queue name when the job does")
 		var jobQueueName kueue.LocalQueueName = "test-queue"
-		createdJob.Annotations = map[string]string{constants.QueueAnnotation: string(jobQueueName)}
+		createdJob.Labels = map[string]string{constants.QueueLabel: string(jobQueueName)}
 		gomega.Expect(k8sClient.Update(ctx, createdJob)).Should(gomega.Succeed())
 		gomega.Eventually(func(g gomega.Gomega) {
 			g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).Should(gomega.Succeed())
@@ -142,20 +143,20 @@ var _ = ginkgo.Describe("RayCluster controller", ginkgo.Ordered, ginkgo.Continue
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 		ginkgo.By("checking the job is unsuspended when workload is assigned")
-		onDemandFlavor := testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor := utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
-		spotFlavor := testing.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
+		spotFlavor := utiltestingapi.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
 		util.MustCreate(ctx, k8sClient, spotFlavor)
 		defer func() {
 			util.ExpectObjectToBeDeleted(ctx, k8sClient, spotFlavor, true)
 			util.ExpectObjectToBeDeleted(ctx, k8sClient, onDemandFlavor, true)
 		}()
-		clusterQueue := testing.MakeClusterQueue("cluster-queue").
+		clusterQueue := utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
-				*testing.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
-		admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: createdWorkload.Spec.PodSets[0].Name,
 				Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -265,7 +266,7 @@ var _ = ginkgo.Describe("Job controller RayCluster for workloads when only jobs
 		ginkgo.By("checking the workload is created when queue name is set")
 		jobQueueName := "test-queue"
 		if createdJob.Labels == nil {
-			createdJob.Labels = map[string]string{constants.QueueAnnotation: jobQueueName}
+			createdJob.Labels = map[string]string{constants.QueueLabel: jobQueueName}
 		} else {
 			createdJob.Labels[constants.QueueLabel] = jobQueueName
 		}
@@ -308,7 +309,7 @@ var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", ginkgo.O
 		wantCondition   *metav1.Condition
 	}
 
-	var defaultFlavor = testing.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
+	var defaultFlavor = utiltestingapi.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
 
 	ginkgo.BeforeAll(func() {
 		fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithWaitForPodsReady(&configapi.WaitForPodsReady{Enable: true})))
@@ -337,7 +338,7 @@ var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", ginkgo.O
 			ginkgo.By("Create a job")
 			job := testingraycluster.MakeCluster(jobName, ns.Name).Obj()
 			jobQueueName := "test-queue"
-			job.Annotations = map[string]string{constants.QueueAnnotation: jobQueueName}
+			job.Labels = map[string]string{constants.QueueLabel: jobQueueName}
 			util.MustCreate(ctx, k8sClient, job)
 			lookupKey := types.NamespacedName{Name: jobName, Namespace: ns.Name}
 			createdJob := &rayv1.RayCluster{}
@@ -351,7 +352,7 @@ var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", ginkgo.O
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			ginkgo.By("Admit the workload created for the job")
-			admission := testing.MakeAdmission("foo").PodSets(
+			admission := utiltestingapi.MakeAdmission("foo").PodSets(
 				kueue.PodSetAssignment{
 					Name: createdWorkload.Spec.PodSets[0].Name,
 					Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -492,16 +493,16 @@ var _ = ginkgo.Describe("RayCluster Job controller interacting with scheduler",
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("dev-clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "4").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "4").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "4").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "4").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 	})
@@ -514,7 +515,7 @@ var _ = ginkgo.Describe("RayCluster Job controller interacting with scheduler",
 
 	ginkgo.It("Should schedule jobs as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		ginkgo.By("checking a dev job starts")
@@ -531,7 +532,7 @@ var _ = ginkgo.Describe("RayCluster Job controller interacting with scheduler",
 		gomega.Expect(createdJob.Spec.HeadGroupSpec.Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(spotUntaintedFlavor.Name))
 		gomega.Expect(createdJob.Spec.WorkerGroupSpecs[0].Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(onDemandFlavor.Name))
 		util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
-		util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 
 		ginkgo.By("checking a second no-fit RayCluster does not start")
 		job2 := testingraycluster.MakeCluster("dev-job2", ns.Name).Queue(localQueue.Name).
@@ -545,7 +546,7 @@ var _ = ginkgo.Describe("RayCluster Job controller interacting with scheduler",
 			g.Expect(createdJob2.Spec.Suspend).Should(gomega.Equal(ptr.To(true)))
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 1)
-		util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 
 		ginkgo.By("deleting the job", func() {
 			gomega.Expect(k8sClient.Delete(ctx, job)).Should(gomega.Succeed())
@@ -571,7 +572,7 @@ var _ = ginkgo.Describe("RayCluster Job controller interacting with scheduler",
 		gomega.Expect(createdJob2.Spec.HeadGroupSpec.Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(spotUntaintedFlavor.Name))
 		gomega.Expect(createdJob2.Spec.WorkerGroupSpecs[0].Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(spotUntaintedFlavor.Name))
 		util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
-		util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 2)
 	})
 })
 
@@ -594,12 +595,12 @@ var _ = ginkgo.Describe("Job controller with preemption enabled", ginkgo.Ordered
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "4").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "4").Obj(),
 			).
 			Preemption(kueue.ClusterQueuePreemption{
 				WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
@@ -608,7 +609,7 @@ var _ = ginkgo.Describe("Job controller with preemption enabled", ginkgo.Ordered
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		ginkgo.By("creating priority")
@@ -712,18 +713,18 @@ var _ = ginkgo.Describe("RayCluster with elastic jobs via workload-slices suppor
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		resourceFlavor = testing.MakeResourceFlavor("default").Obj()
+		resourceFlavor = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, resourceFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("default").
-			ResourceGroup(*testing.MakeFlavorQuotas(resourceFlavor.Name).Resource(corev1.ResourceCPU, strconv.Itoa(cpuNominalQuota)).Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("default").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(resourceFlavor.Name).Resource(corev1.ResourceCPU, strconv.Itoa(cpuNominalQuota)).Obj()).
 			Preemption(kueue.ClusterQueuePreemption{
 				WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 			}).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("default", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("default", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 	ginkgo.AfterEach(func() {
diff --git a/test/integration/singlecluster/controller/jobs/rayjob/rayjob_controller_test.go b/test/integration/singlecluster/controller/jobs/rayjob/rayjob_controller_test.go
index c4c6be96b..ffd488711 100644
--- a/test/integration/singlecluster/controller/jobs/rayjob/rayjob_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/rayjob/rayjob_controller_test.go
@@ -37,6 +37,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	workloadrayjob "sigs.k8s.io/kueue/pkg/controller/jobs/rayjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingrayjob "sigs.k8s.io/kueue/pkg/util/testingjobs/rayjob"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -117,7 +118,7 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 
 		ginkgo.By("checking the workload is updated with queue name when the job does")
 		var jobQueueName kueue.LocalQueueName = "test-queue"
-		createdJob.Annotations = map[string]string{constants.QueueAnnotation: string(jobQueueName)}
+		createdJob.Labels = map[string]string{constants.QueueLabel: string(jobQueueName)}
 		gomega.Expect(k8sClient.Update(ctx, createdJob)).Should(gomega.Succeed())
 		gomega.Eventually(func(g gomega.Gomega) {
 			g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).Should(gomega.Succeed())
@@ -147,20 +148,20 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 		ginkgo.By("checking the job is unsuspended when workload is assigned")
-		onDemandFlavor := testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor := utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
-		spotFlavor := testing.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
+		spotFlavor := utiltestingapi.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
 		util.MustCreate(ctx, k8sClient, spotFlavor)
 		defer func() {
 			util.ExpectObjectToBeDeleted(ctx, k8sClient, spotFlavor, true)
 			util.ExpectObjectToBeDeleted(ctx, k8sClient, onDemandFlavor, true)
 		}()
-		clusterQueue := testing.MakeClusterQueue("cluster-queue").
+		clusterQueue := utiltestingapi.MakeClusterQueue("cluster-queue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
-				*testing.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
-		admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+		admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 			kueue.PodSetAssignment{
 				Name: createdWorkload.Spec.PodSets[0].Name,
 				Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -303,7 +304,7 @@ var _ = ginkgo.Describe("Job controller for workloads when only jobs with queue
 		ginkgo.By("checking the workload is created when queue name is set")
 		jobQueueName := "test-queue"
 		if createdJob.Labels == nil {
-			createdJob.Labels = map[string]string{constants.QueueAnnotation: jobQueueName}
+			createdJob.Labels = map[string]string{constants.QueueLabel: jobQueueName}
 		} else {
 			createdJob.Labels[constants.QueueLabel] = jobQueueName
 		}
@@ -323,7 +324,7 @@ var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", ginkgo.O
 		wantCondition   *metav1.Condition
 	}
 
-	var defaultFlavor = testing.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
+	var defaultFlavor = utiltestingapi.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
 
 	ginkgo.BeforeAll(func() {
 		fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithWaitForPodsReady(&configapi.WaitForPodsReady{Enable: true})))
@@ -352,7 +353,7 @@ var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", ginkgo.O
 			ginkgo.By("Create a job")
 			job := testingrayjob.MakeJob(jobName, ns.Name).WithSubmissionMode(rayv1.K8sJobMode).Obj()
 			jobQueueName := "test-queue"
-			job.Annotations = map[string]string{constants.QueueAnnotation: jobQueueName}
+			job.Labels = map[string]string{constants.QueueLabel: jobQueueName}
 			util.MustCreate(ctx, k8sClient, job)
 			lookupKey := types.NamespacedName{Name: jobName, Namespace: ns.Name}
 			setInitStatus(jobName, ns.Name)
@@ -367,7 +368,7 @@ var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", ginkgo.O
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			ginkgo.By("Admit the workload created for the job")
-			admission := testing.MakeAdmission("foo").PodSets(
+			admission := utiltestingapi.MakeAdmission("foo").PodSets(
 				kueue.PodSetAssignment{
 					Name: createdWorkload.Spec.PodSets[0].Name,
 					Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -519,16 +520,16 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("dev-clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Resource(corev1.ResourceMemory, "1Gi").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Resource(corev1.ResourceMemory, "1Gi").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Resource(corev1.ResourceMemory, "1Gi").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Resource(corev1.ResourceMemory, "1Gi").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 	})
@@ -541,7 +542,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 
 	ginkgo.It("Should schedule jobs as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		ginkgo.By("checking a dev job starts")
@@ -560,7 +561,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 		gomega.Expect(createdJob.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(spotUntaintedFlavor.Name))
 		gomega.Expect(createdJob.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Spec.NodeSelector[instanceKey]).Should(gomega.Equal(onDemandFlavor.Name))
 		util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
-		util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 	})
 })
 
@@ -583,12 +584,12 @@ var _ = ginkgo.Describe("Job controller with preemption enabled", ginkgo.Ordered
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Resource(corev1.ResourceMemory, "4Gi").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Resource(corev1.ResourceMemory, "4Gi").Obj(),
 			).
 			Preemption(kueue.ClusterQueuePreemption{
 				WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
@@ -597,7 +598,7 @@ var _ = ginkgo.Describe("Job controller with preemption enabled", ginkgo.Ordered
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		ginkgo.By("creating priority")
diff --git a/test/integration/singlecluster/controller/jobs/tfjob/tfjob_controller_test.go b/test/integration/singlecluster/controller/jobs/tfjob/tfjob_controller_test.go
index 602a983ab..ecc468159 100644
--- a/test/integration/singlecluster/controller/jobs/tfjob/tfjob_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/tfjob/tfjob_controller_test.go
@@ -33,6 +33,7 @@ import (
 	workloadtfjob "sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/tfjob"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/kubeflowjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
 	testingtfjob "sigs.k8s.io/kueue/pkg/util/testingjobs/tfjob"
 	"sigs.k8s.io/kueue/test/integration/framework"
@@ -98,7 +99,7 @@ var _ = ginkgo.Describe("Job controller", framework.RedundantSpec, ginkgo.Ordere
 var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", framework.RedundantSpec, ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
 	var (
 		ns            *corev1.Namespace
-		defaultFlavor = testing.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
+		defaultFlavor = utiltestingapi.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
 	)
 
 	ginkgo.BeforeAll(func() {
@@ -244,16 +245,16 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", framework.R
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("dev-clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "8").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "8").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 	})
@@ -266,7 +267,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", framework.R
 
 	ginkgo.It("Should schedule jobs as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		kfJob := kubeflowjob.KubeflowJob{KFJobControl: (*workloadtfjob.JobControl)(
@@ -336,21 +337,21 @@ var _ = ginkgo.Describe("TFJob controller with TopologyAwareScheduling", framewo
 		}
 		util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-		topology = testing.MakeDefaultTwoLevelTopology("default")
+		topology = utiltestingapi.MakeDefaultTwoLevelTopology("default")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(nodeGroupLabel, "tas").
 			TopologyName("default").Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
@@ -435,7 +436,7 @@ var _ = ginkgo.Describe("TFJob controller with TopologyAwareScheduling", framewo
 
 		ginkgo.By("verify the workload is admitted", func() {
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-			util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 		})
 
 		ginkgo.By("verify admission for the workload", func() {
diff --git a/test/integration/singlecluster/controller/jobs/trainjob/trainjob_controller_test.go b/test/integration/singlecluster/controller/jobs/trainjob/trainjob_controller_test.go
index df5da554b..b74e35f0c 100644
--- a/test/integration/singlecluster/controller/jobs/trainjob/trainjob_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/trainjob/trainjob_controller_test.go
@@ -35,6 +35,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	workloadtrainjob "sigs.k8s.io/kueue/pkg/controller/jobs/trainjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingjobset "sigs.k8s.io/kueue/pkg/util/testingjobs/jobset"
 	testingtrainjob "sigs.k8s.io/kueue/pkg/util/testingjobs/trainjob"
 	"sigs.k8s.io/kueue/pkg/workload"
@@ -76,10 +77,10 @@ var _ = ginkgo.Describe("Trainjob controller", ginkgo.Ordered, ginkgo.ContinueOn
 		)
 
 		ginkgo.BeforeEach(func() {
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
-					*testing.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot").Resource(corev1.ResourceCPU, "5").Obj(),
 				).Obj()
 
 			testJobSet := testingjobset.MakeJobSet("", "").ReplicatedJobs(
@@ -92,11 +93,11 @@ var _ = ginkgo.Describe("Trainjob controller", ginkgo.Ordered, ginkgo.ContinueOn
 
 			util.MustCreate(ctx, k8sClient, testCtr)
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
-			onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+			onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 			util.MustCreate(ctx, k8sClient, onDemandFlavor)
-			spotFlavor = testing.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
+			spotFlavor = utiltestingapi.MakeResourceFlavor("spot").NodeLabel(instanceKey, "spot").Obj()
 			util.MustCreate(ctx, k8sClient, spotFlavor)
 		})
 
@@ -147,7 +148,7 @@ var _ = ginkgo.Describe("Trainjob controller", ginkgo.Ordered, ginkgo.ContinueOn
 			})
 
 			ginkgo.By("checking the Trainjob is unsuspended when workload is assigned", func() {
-				admission := testing.MakeAdmission(clusterQueue.Name).PodSets(
+				admission := utiltestingapi.MakeAdmission(clusterQueue.Name).PodSets(
 					kueue.PodSetAssignment{
 						Name: createdWorkload.Spec.PodSets[0].Name,
 						Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -221,7 +222,7 @@ var _ = ginkgo.Describe("Trainjob controller", ginkgo.Ordered, ginkgo.ContinueOn
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, wlLookupKey, createdWorkload)).To(gomega.Succeed())
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
-				admission := testing.MakeAdmission(localQueue.Name).PodSets(
+				admission := utiltestingapi.MakeAdmission(localQueue.Name).PodSets(
 					kueue.PodSetAssignment{
 						Name: createdWorkload.Spec.PodSets[0].Name,
 						Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -367,16 +368,16 @@ var _ = ginkgo.Describe("TrainJob controller interacting with scheduler", ginkgo
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "trainjob-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("dev-clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "1").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "1").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 	})
@@ -389,7 +390,7 @@ var _ = ginkgo.Describe("TrainJob controller interacting with scheduler", ginkgo
 
 	ginkgo.It("Should schedule TrainJobs as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		ginkgo.By("checking a dev job starts")
@@ -433,12 +434,12 @@ var _ = ginkgo.Describe("TrainJob controller interacting with scheduler", ginkgo
 		}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 		util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
-		util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+		util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 	})
 
 	ginkgo.It("Should allow reclaim of resources that are no longer needed", func() {
 		ginkgo.By("creating localQueue", func() {
-			localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 
@@ -477,7 +478,7 @@ var _ = ginkgo.Describe("TrainJob controller interacting with scheduler", ginkgo
 				g.Expect(*createdTrainJob1.Spec.Suspend).Should(gomega.BeFalse())
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 			util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
-			util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 		})
 
 		testJobset2 := testingjobset.MakeJobSet("", "").ReplicatedJobs(
diff --git a/test/integration/singlecluster/controller/jobs/xgboostjob/xgboostjob_controller_test.go b/test/integration/singlecluster/controller/jobs/xgboostjob/xgboostjob_controller_test.go
index 09e8abf49..efec6877a 100644
--- a/test/integration/singlecluster/controller/jobs/xgboostjob/xgboostjob_controller_test.go
+++ b/test/integration/singlecluster/controller/jobs/xgboostjob/xgboostjob_controller_test.go
@@ -33,6 +33,7 @@ import (
 	workloadxgboostjob "sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/xgboostjob"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/kubeflowjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
 	testingxgboostjob "sigs.k8s.io/kueue/pkg/util/testingjobs/xgboostjob"
 	"sigs.k8s.io/kueue/test/integration/framework"
@@ -93,7 +94,7 @@ var _ = ginkgo.Describe("Job controller", framework.RedundantSpec, ginkgo.Ordere
 var _ = ginkgo.Describe("Job controller when waitForPodsReady enabled", framework.RedundantSpec, ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
 	var (
 		ns            *corev1.Namespace
-		defaultFlavor = testing.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
+		defaultFlavor = utiltestingapi.MakeResourceFlavor("default").NodeLabel(instanceKey, "default").Obj()
 	)
 
 	ginkgo.BeforeAll(func() {
@@ -233,16 +234,16 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", framework.R
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 		util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("dev-clusterqueue").
+		clusterQueue = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 			ResourceGroup(
-				*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
-				*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 			).Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 	})
@@ -255,7 +256,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", framework.R
 
 	ginkgo.It("Should schedule jobs as they fit in their ClusterQueue", func() {
 		ginkgo.By("creating localQueue")
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 
 		kfJob := kubeflowjob.KubeflowJob{KFJobControl: (*workloadxgboostjob.JobControl)(
@@ -319,21 +320,21 @@ var _ = ginkgo.Describe("XGBoostJob controller with TopologyAwareScheduling", fr
 		}
 		util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-		topology = testing.MakeDefaultTwoLevelTopology("default")
+		topology = utiltestingapi.MakeDefaultTwoLevelTopology("default")
 		util.MustCreate(ctx, k8sClient, topology)
 
-		tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+		tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 			NodeLabel(nodeGroupLabel, "tas").
 			TopologyName("default").Obj()
 		util.MustCreate(ctx, k8sClient, tasFlavor)
 
-		clusterQueue = testing.MakeClusterQueue("cluster-queue").
-			ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+		clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, clusterQueue)
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-		localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+		localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		util.MustCreate(ctx, k8sClient, localQueue)
 	})
 
@@ -402,7 +403,7 @@ var _ = ginkgo.Describe("XGBoostJob controller with TopologyAwareScheduling", fr
 
 		ginkgo.By("verify the workload is admitted", func() {
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-			util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 		})
 
 		ginkgo.By("verify admission for the workload", func() {
diff --git a/test/integration/singlecluster/importer/importer_test.go b/test/integration/singlecluster/importer/importer_test.go
index ccee7e3e9..7168888a3 100644
--- a/test/integration/singlecluster/importer/importer_test.go
+++ b/test/integration/singlecluster/importer/importer_test.go
@@ -29,7 +29,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/constants"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/pod"
 	"sigs.k8s.io/kueue/pkg/metrics"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	utiltestingpod "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -45,17 +45,17 @@ var _ = ginkgo.Describe("Importer", func() {
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "import-")
 
-		flavor = utiltesting.MakeResourceFlavor("f1").Obj()
+		flavor = utiltestingapi.MakeResourceFlavor("f1").Obj()
 		util.MustCreate(ctx, k8sClient, flavor)
 
-		cq = utiltesting.MakeClusterQueue("cq1").
+		cq = utiltestingapi.MakeClusterQueue("cq1").
 			ResourceGroup(
-				*utiltesting.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "4").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "4").Obj(),
 			).
 			Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 
-		lq = utiltesting.MakeLocalQueue("lq1", ns.Name).ClusterQueue("cq1").Obj()
+		lq = utiltestingapi.MakeLocalQueue("lq1", ns.Name).ClusterQueue("cq1").Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 	})
 
diff --git a/test/integration/singlecluster/kueuectl/create_test.go b/test/integration/singlecluster/kueuectl/create_test.go
index 002fda597..4a5af61b8 100644
--- a/test/integration/singlecluster/kueuectl/create_test.go
+++ b/test/integration/singlecluster/kueuectl/create_test.go
@@ -31,22 +31,23 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
 var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
 	var (
 		ns *corev1.Namespace
-		cq *v1beta1.ClusterQueue
+		cq *kueue.ClusterQueue
 	)
 
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "ns-")
 
-		cq = testing.MakeClusterQueue("cq").Obj()
+		cq = utiltestingapi.MakeClusterQueue("cq").Obj()
 		util.MustCreate(ctx, k8sClient, cq)
 	})
 
@@ -72,11 +73,11 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the local queue successfully created", func() {
-				var createdQueue v1beta1.LocalQueue
+				var createdQueue kueue.LocalQueue
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: lqName, Namespace: ns.Name}, &createdQueue)).To(gomega.Succeed())
 					g.Expect(createdQueue.Name).Should(gomega.Equal(lqName))
-					g.Expect(createdQueue.Spec.ClusterQueue).Should(gomega.Equal(v1beta1.ClusterQueueReference(cq.Name)))
+					g.Expect(createdQueue.Spec.ClusterQueue).Should(gomega.Equal(kueue.ClusterQueueReference(cq.Name)))
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
 			})
 		})
@@ -98,11 +99,11 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the local queue successfully created", func() {
-				var createdQueue v1beta1.LocalQueue
+				var createdQueue kueue.LocalQueue
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: lqName, Namespace: ns.Name}, &createdQueue)).To(gomega.Succeed())
 					g.Expect(createdQueue.Name).Should(gomega.Equal(lqName))
-					g.Expect(createdQueue.Spec.ClusterQueue).Should(gomega.Equal(v1beta1.ClusterQueueReference(cqName)))
+					g.Expect(createdQueue.Spec.ClusterQueue).Should(gomega.Equal(kueue.ClusterQueueReference(cqName)))
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
 			})
 		})
@@ -125,11 +126,11 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the local queue successfully created", func() {
-				var createdQueue v1beta1.LocalQueue
+				var createdQueue kueue.LocalQueue
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: lqName, Namespace: ns.Name}, &createdQueue)).To(gomega.Succeed())
 					g.Expect(createdQueue.Name).Should(gomega.Equal(lqName))
-					g.Expect(createdQueue.Spec.ClusterQueue).Should(gomega.Equal(v1beta1.ClusterQueueReference(cq.Name)))
+					g.Expect(createdQueue.Spec.ClusterQueue).Should(gomega.Equal(kueue.ClusterQueueReference(cq.Name)))
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
 			})
 		})
@@ -139,7 +140,7 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 		const cqName = "cluster-queue"
 
 		ginkgo.AfterEach(func() {
-			var createdQueue v1beta1.ClusterQueue
+			var createdQueue kueue.ClusterQueue
 			err := k8sClient.Get(ctx, types.NamespacedName{Name: cqName, Namespace: ns.Name}, &createdQueue)
 			gomega.Expect(client.IgnoreNotFound(err)).To(gomega.Succeed())
 			if !apierrors.IsNotFound(err) {
@@ -163,15 +164,15 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the cluster queue successfully created", func() {
-				var createdQueue v1beta1.ClusterQueue
+				var createdQueue kueue.ClusterQueue
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: cqName, Namespace: ns.Name}, &createdQueue)).To(gomega.Succeed())
 					g.Expect(createdQueue.Name).Should(gomega.Equal(cqName))
 					g.Expect(createdQueue.Spec.Cohort).Should(gomega.BeEmpty())
-					g.Expect(createdQueue.Spec.QueueingStrategy).Should(gomega.Equal(v1beta1.BestEffortFIFO))
+					g.Expect(createdQueue.Spec.QueueingStrategy).Should(gomega.Equal(kueue.BestEffortFIFO))
 					g.Expect(*createdQueue.Spec.NamespaceSelector).Should(gomega.Equal(metav1.LabelSelector{}))
-					g.Expect(createdQueue.Spec.Preemption.ReclaimWithinCohort).Should(gomega.Equal(v1beta1.PreemptionPolicyNever))
-					g.Expect(createdQueue.Spec.Preemption.WithinClusterQueue).Should(gomega.Equal(v1beta1.PreemptionPolicyNever))
+					g.Expect(createdQueue.Spec.Preemption.ReclaimWithinCohort).Should(gomega.Equal(kueue.PreemptionPolicyNever))
+					g.Expect(createdQueue.Spec.Preemption.WithinClusterQueue).Should(gomega.Equal(kueue.PreemptionPolicyNever))
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
 			})
 		})
@@ -199,22 +200,22 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the cluster queue successfully created", func() {
-				var createdQueue v1beta1.ClusterQueue
+				var createdQueue kueue.ClusterQueue
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: cqName, Namespace: ns.Name}, &createdQueue)).To(gomega.Succeed())
 					g.Expect(createdQueue.Name).Should(gomega.Equal(cqName))
-					g.Expect(createdQueue.Spec.Cohort).Should(gomega.Equal(v1beta1.CohortReference("cohort")))
-					g.Expect(createdQueue.Spec.QueueingStrategy).Should(gomega.Equal(v1beta1.StrictFIFO))
+					g.Expect(createdQueue.Spec.Cohort).Should(gomega.Equal(kueue.CohortReference("cohort")))
+					g.Expect(createdQueue.Spec.QueueingStrategy).Should(gomega.Equal(kueue.StrictFIFO))
 					g.Expect(*createdQueue.Spec.NamespaceSelector).Should(gomega.Equal(metav1.LabelSelector{
 						MatchLabels: map[string]string{"fooX": "barX", "fooY": "barY"},
 					}))
-					g.Expect(createdQueue.Spec.Preemption.ReclaimWithinCohort).Should(gomega.Equal(v1beta1.PreemptionPolicyAny))
-					g.Expect(createdQueue.Spec.Preemption.WithinClusterQueue).Should(gomega.Equal(v1beta1.PreemptionPolicyLowerPriority))
-					g.Expect(createdQueue.Spec.ResourceGroups).Should(gomega.Equal([]v1beta1.ResourceGroup{
+					g.Expect(createdQueue.Spec.Preemption.ReclaimWithinCohort).Should(gomega.Equal(kueue.PreemptionPolicyAny))
+					g.Expect(createdQueue.Spec.Preemption.WithinClusterQueue).Should(gomega.Equal(kueue.PreemptionPolicyLowerPriority))
+					g.Expect(createdQueue.Spec.ResourceGroups).Should(gomega.Equal([]kueue.ResourceGroup{
 						{
 							CoveredResources: []corev1.ResourceName{corev1.ResourceCPU, corev1.ResourceMemory},
-							Flavors: []v1beta1.FlavorQuotas{
-								*testing.MakeFlavorQuotas("alpha").
+							Flavors: []kueue.FlavorQuotas{
+								*utiltestingapi.MakeFlavorQuotas("alpha").
 									Resource(corev1.ResourceCPU, "0").
 									Resource(corev1.ResourceMemory, "0").
 									Obj(),
@@ -243,19 +244,19 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the cluster queue successfully created", func() {
-				var createdQueue v1beta1.ClusterQueue
+				var createdQueue kueue.ClusterQueue
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: cqName, Namespace: ns.Name}, &createdQueue)).To(gomega.Succeed())
 					g.Expect(createdQueue.Name).Should(gomega.Equal(cqName))
-					g.Expect(createdQueue.Spec.ResourceGroups).Should(gomega.Equal([]v1beta1.ResourceGroup{
+					g.Expect(createdQueue.Spec.ResourceGroups).Should(gomega.Equal([]kueue.ResourceGroup{
 						{
 							CoveredResources: []corev1.ResourceName{corev1.ResourceCPU, corev1.ResourceMemory},
-							Flavors: []v1beta1.FlavorQuotas{
-								*testing.MakeFlavorQuotas("alpha").
+							Flavors: []kueue.FlavorQuotas{
+								*utiltestingapi.MakeFlavorQuotas("alpha").
 									Resource(corev1.ResourceCPU, "0").
 									Resource(corev1.ResourceMemory, "0").
 									Obj(),
-								*testing.MakeFlavorQuotas("beta").
+								*utiltestingapi.MakeFlavorQuotas("beta").
 									Resource(corev1.ResourceCPU, "0").
 									Resource(corev1.ResourceMemory, "0").
 									Obj(),
@@ -284,19 +285,19 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the cluster queue successfully created", func() {
-				var createdQueue v1beta1.ClusterQueue
+				var createdQueue kueue.ClusterQueue
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: cqName, Namespace: ns.Name}, &createdQueue)).To(gomega.Succeed())
 					g.Expect(createdQueue.Name).Should(gomega.Equal(cqName))
-					g.Expect(createdQueue.Spec.ResourceGroups).Should(gomega.Equal([]v1beta1.ResourceGroup{
+					g.Expect(createdQueue.Spec.ResourceGroups).Should(gomega.Equal([]kueue.ResourceGroup{
 						{
 							CoveredResources: []corev1.ResourceName{corev1.ResourceCPU, corev1.ResourceMemory},
-							Flavors: []v1beta1.FlavorQuotas{
-								*testing.MakeFlavorQuotas("alpha").
+							Flavors: []kueue.FlavorQuotas{
+								*utiltestingapi.MakeFlavorQuotas("alpha").
 									Resource(corev1.ResourceCPU, "0").
 									Resource(corev1.ResourceMemory, "0").
 									Obj(),
-								*testing.MakeFlavorQuotas("gamma").
+								*utiltestingapi.MakeFlavorQuotas("gamma").
 									Resource(corev1.ResourceCPU, "0").
 									Resource(corev1.ResourceMemory, "0").
 									Obj(),
@@ -304,8 +305,8 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 						},
 						{
 							CoveredResources: []corev1.ResourceName{"gpu"},
-							Flavors: []v1beta1.FlavorQuotas{
-								*testing.MakeFlavorQuotas("beta").
+							Flavors: []kueue.FlavorQuotas{
+								*utiltestingapi.MakeFlavorQuotas("beta").
 									Resource("gpu", "0").
 									Obj(),
 							},
@@ -340,15 +341,15 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the cluster queue successfully created", func() {
-				var createdQueue v1beta1.ClusterQueue
+				var createdQueue kueue.ClusterQueue
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: cqName, Namespace: ns.Name}, &createdQueue)).To(gomega.Succeed())
 					g.Expect(createdQueue.Name).Should(gomega.Equal(cqName))
-					g.Expect(createdQueue.Spec.ResourceGroups).Should(gomega.Equal([]v1beta1.ResourceGroup{
+					g.Expect(createdQueue.Spec.ResourceGroups).Should(gomega.Equal([]kueue.ResourceGroup{
 						{
 							CoveredResources: []corev1.ResourceName{corev1.ResourceCPU, corev1.ResourceMemory},
-							Flavors: []v1beta1.FlavorQuotas{
-								*testing.MakeFlavorQuotas("alpha").
+							Flavors: []kueue.FlavorQuotas{
+								*utiltestingapi.MakeFlavorQuotas("alpha").
 									Resource(corev1.ResourceCPU, "0", "0", "0").
 									Resource(corev1.ResourceMemory, "0", "0", "0").
 									Obj(),
@@ -387,26 +388,26 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the cluster queue successfully created", func() {
-				var createdQueue v1beta1.ClusterQueue
+				var createdQueue kueue.ClusterQueue
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: cqName, Namespace: ns.Name}, &createdQueue)).To(gomega.Succeed())
 					g.Expect(createdQueue.Name).Should(gomega.Equal(cqName))
-					g.Expect(createdQueue.Spec.Cohort).Should(gomega.Equal(v1beta1.CohortReference("cohort")))
-					g.Expect(createdQueue.Spec.QueueingStrategy).Should(gomega.Equal(v1beta1.StrictFIFO))
+					g.Expect(createdQueue.Spec.Cohort).Should(gomega.Equal(kueue.CohortReference("cohort")))
+					g.Expect(createdQueue.Spec.QueueingStrategy).Should(gomega.Equal(kueue.StrictFIFO))
 					g.Expect(*createdQueue.Spec.NamespaceSelector).Should(gomega.Equal(metav1.LabelSelector{
 						MatchLabels: map[string]string{"fooX": "barX", "fooY": "barY"},
 					}))
-					g.Expect(createdQueue.Spec.Preemption.ReclaimWithinCohort).Should(gomega.Equal(v1beta1.PreemptionPolicyAny))
-					g.Expect(createdQueue.Spec.Preemption.WithinClusterQueue).Should(gomega.Equal(v1beta1.PreemptionPolicyLowerPriority))
-					g.Expect(createdQueue.Spec.ResourceGroups).Should(gomega.Equal([]v1beta1.ResourceGroup{
+					g.Expect(createdQueue.Spec.Preemption.ReclaimWithinCohort).Should(gomega.Equal(kueue.PreemptionPolicyAny))
+					g.Expect(createdQueue.Spec.Preemption.WithinClusterQueue).Should(gomega.Equal(kueue.PreemptionPolicyLowerPriority))
+					g.Expect(createdQueue.Spec.ResourceGroups).Should(gomega.Equal([]kueue.ResourceGroup{
 						{
 							CoveredResources: []corev1.ResourceName{corev1.ResourceCPU, corev1.ResourceMemory},
-							Flavors: []v1beta1.FlavorQuotas{
-								*testing.MakeFlavorQuotas("alpha").
+							Flavors: []kueue.FlavorQuotas{
+								*utiltestingapi.MakeFlavorQuotas("alpha").
 									Resource(corev1.ResourceCPU, "2", "1", "0").
 									Resource(corev1.ResourceMemory, "2", "1", "0").
 									Obj(),
-								*testing.MakeFlavorQuotas("gamma").
+								*utiltestingapi.MakeFlavorQuotas("gamma").
 									Resource(corev1.ResourceCPU, "2", "1", "0").
 									Resource(corev1.ResourceMemory, "2", "1", "0").
 									Obj(),
@@ -414,8 +415,8 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 						},
 						{
 							CoveredResources: []corev1.ResourceName{"gpu"},
-							Flavors: []v1beta1.FlavorQuotas{
-								*testing.MakeFlavorQuotas("beta").
+							Flavors: []kueue.FlavorQuotas{
+								*utiltestingapi.MakeFlavorQuotas("beta").
 									Resource("gpu", "2", "1", "0").
 									Obj(),
 							},
@@ -430,7 +431,7 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 		const rfName = "resource-flavor"
 
 		ginkgo.AfterEach(func() {
-			var resourceFlavor v1beta1.ResourceFlavor
+			var resourceFlavor kueue.ResourceFlavor
 			err := k8sClient.Get(ctx, types.NamespacedName{Name: rfName}, &resourceFlavor)
 			gomega.Expect(client.IgnoreNotFound(err)).To(gomega.Succeed())
 			if !apierrors.IsNotFound(err) {
@@ -456,7 +457,7 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the resource flavor successfully created", func() {
-				var resourceFlavor v1beta1.ResourceFlavor
+				var resourceFlavor kueue.ResourceFlavor
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: rfName, Namespace: ns.Name}, &resourceFlavor)).To(gomega.Succeed())
 					g.Expect(resourceFlavor.Name).Should(gomega.Equal(rfName))
@@ -489,7 +490,7 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the resource flavor successfully created", func() {
-				var resourceFlavor v1beta1.ResourceFlavor
+				var resourceFlavor kueue.ResourceFlavor
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, types.NamespacedName{Name: rfName, Namespace: ns.Name}, &resourceFlavor)).To(gomega.Succeed())
 					g.Expect(resourceFlavor.Name).Should(gomega.Equal(rfName))
@@ -544,7 +545,7 @@ var _ = ginkgo.Describe("Kueuectl Create", ginkgo.Ordered, ginkgo.ContinueOnFail
 			})
 
 			ginkgo.By("Check that the resource flavor not created", func() {
-				var resourceFlavor v1beta1.ResourceFlavor
+				var resourceFlavor kueue.ResourceFlavor
 				gomega.Eventually(func(g gomega.Gomega) {
 					rfKey := types.NamespacedName{Name: rfName, Namespace: ns.Name}
 					g.Expect(k8sClient.Get(ctx, rfKey, &resourceFlavor)).Should(testing.BeNotFoundError())
diff --git a/test/integration/singlecluster/kueuectl/list_test.go b/test/integration/singlecluster/kueuectl/list_test.go
index f9dd797cc..83ecfbce5 100644
--- a/test/integration/singlecluster/kueuectl/list_test.go
+++ b/test/integration/singlecluster/kueuectl/list_test.go
@@ -28,10 +28,10 @@ import (
 	"k8s.io/cli-runtime/pkg/genericiooptions"
 	testingclock "k8s.io/utils/clock/testing"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app/list"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -49,19 +49,19 @@ var _ = ginkgo.Describe("Kueuectl List", ginkgo.Ordered, ginkgo.ContinueOnFailur
 
 	ginkgo.When("List LocalQueue", func() {
 		var (
-			lq1 *v1beta1.LocalQueue
-			lq2 *v1beta1.LocalQueue
-			lq3 *v1beta1.LocalQueue
+			lq1 *kueue.LocalQueue
+			lq2 *kueue.LocalQueue
+			lq3 *kueue.LocalQueue
 		)
 
 		ginkgo.JustBeforeEach(func() {
-			lq1 = testing.MakeLocalQueue("lq1", ns.Name).ClusterQueue("cq1").Obj()
+			lq1 = utiltestingapi.MakeLocalQueue("lq1", ns.Name).ClusterQueue("cq1").Obj()
 			util.MustCreate(ctx, k8sClient, lq1)
 
-			lq2 = testing.MakeLocalQueue("lq2", ns.Name).ClusterQueue("very-long-cluster-queue-name").Obj()
+			lq2 = utiltestingapi.MakeLocalQueue("lq2", ns.Name).ClusterQueue("very-long-cluster-queue-name").Obj()
 			util.MustCreate(ctx, k8sClient, lq2)
 
-			lq3 = testing.MakeLocalQueue("very-long-local-queue-name", ns.Name).ClusterQueue("cq1").Obj()
+			lq3 = utiltestingapi.MakeLocalQueue("very-long-local-queue-name", ns.Name).ClusterQueue("cq1").Obj()
 			util.MustCreate(ctx, k8sClient, lq3)
 		})
 
@@ -114,15 +114,15 @@ very-long-local-queue-name   cq1                            0
 
 	ginkgo.When("List ClusterQueue", func() {
 		var (
-			cq1 *v1beta1.ClusterQueue
-			cq2 *v1beta1.ClusterQueue
+			cq1 *kueue.ClusterQueue
+			cq2 *kueue.ClusterQueue
 		)
 
 		ginkgo.JustBeforeEach(func() {
-			cq1 = testing.MakeClusterQueue("cq1").Obj()
+			cq1 = utiltestingapi.MakeClusterQueue("cq1").Obj()
 			util.MustCreate(ctx, k8sClient, cq1)
 
-			cq2 = testing.MakeClusterQueue("very-long-cluster-queue-name").Obj()
+			cq2 = utiltestingapi.MakeClusterQueue("very-long-cluster-queue-name").Obj()
 			util.MustCreate(ctx, k8sClient, cq2)
 
 			util.ExpectClusterQueuesToBeActive(ctx, k8sClient, cq1, cq2)
@@ -177,19 +177,19 @@ very-long-cluster-queue-name            0                   0
 
 	ginkgo.When("List Workloads", func() {
 		var (
-			wl1 *v1beta1.Workload
-			wl2 *v1beta1.Workload
-			wl3 *v1beta1.Workload
+			wl1 *kueue.Workload
+			wl2 *kueue.Workload
+			wl3 *kueue.Workload
 		)
 
 		ginkgo.JustBeforeEach(func() {
-			wl1 = testing.MakeWorkload("wl1", ns.Name).Queue("lq1").Obj()
+			wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).Queue("lq1").Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
 
-			wl2 = testing.MakeWorkload("wl2", ns.Name).Queue("very-long-local-queue-name").Obj()
+			wl2 = utiltestingapi.MakeWorkload("wl2", ns.Name).Queue("very-long-local-queue-name").Obj()
 			util.MustCreate(ctx, k8sClient, wl2)
 
-			wl3 = testing.MakeWorkload("very-long-workload-name", ns.Name).Queue("lq1").Obj()
+			wl3 = utiltestingapi.MakeWorkload("very-long-workload-name", ns.Name).Queue("lq1").Obj()
 			util.MustCreate(ctx, k8sClient, wl3)
 		})
 
@@ -239,15 +239,15 @@ wl2                                             very-long-local-queue-name
 
 	ginkgo.When("List ResourceFlavors", func() {
 		var (
-			rf1 *v1beta1.ResourceFlavor
-			rf2 *v1beta1.ResourceFlavor
+			rf1 *kueue.ResourceFlavor
+			rf2 *kueue.ResourceFlavor
 		)
 
 		ginkgo.JustBeforeEach(func() {
-			rf1 = testing.MakeResourceFlavor("rf1").Obj()
+			rf1 = utiltestingapi.MakeResourceFlavor("rf1").Obj()
 			util.MustCreate(ctx, k8sClient, rf1)
 
-			rf2 = testing.MakeResourceFlavor("very-long-resource-flavor-name").Obj()
+			rf2 = utiltestingapi.MakeResourceFlavor("very-long-resource-flavor-name").Obj()
 			util.MustCreate(ctx, k8sClient, rf2)
 		})
 
diff --git a/test/integration/singlecluster/kueuectl/passthrough_test.go b/test/integration/singlecluster/kueuectl/passthrough_test.go
index 1cf2dbf73..e28cb4c6a 100644
--- a/test/integration/singlecluster/kueuectl/passthrough_test.go
+++ b/test/integration/singlecluster/kueuectl/passthrough_test.go
@@ -29,23 +29,24 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
 func makePassThroughWorkload(ns string) client.Object {
-	return testing.MakeWorkload("pass-through-wl", ns).Obj()
+	return utiltestingapi.MakeWorkload("pass-through-wl", ns).Obj()
 }
 
 func makePassThroughLocalQueue(ns string) client.Object {
-	return testing.MakeLocalQueue("pass-through-lq", ns).Obj()
+	return utiltestingapi.MakeLocalQueue("pass-through-lq", ns).Obj()
 }
 
 func makePassThroughClusterQueue(_ string) client.Object {
-	return testing.MakeClusterQueue("pass-through-cq").Obj()
+	return utiltestingapi.MakeClusterQueue("pass-through-cq").Obj()
 }
 
 func makePassThroughResourceFlavor(_ string) client.Object {
-	return testing.MakeResourceFlavor("pass-through-resource-flavor").NodeLabel("type", "small").Obj()
+	return utiltestingapi.MakeResourceFlavor("pass-through-resource-flavor").NodeLabel("type", "small").Obj()
 }
 
 func setupEnv(c *exec.Cmd, kassetsPath string, kubeconfigPath string) {
diff --git a/test/integration/singlecluster/kueuectl/resume_test.go b/test/integration/singlecluster/kueuectl/resume_test.go
index cee8fae16..d844998e7 100644
--- a/test/integration/singlecluster/kueuectl/resume_test.go
+++ b/test/integration/singlecluster/kueuectl/resume_test.go
@@ -28,9 +28,9 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -50,11 +50,11 @@ var _ = ginkgo.Describe("Kueuectl Resume", ginkgo.Ordered, ginkgo.ContinueOnFail
 
 	ginkgo.When("Resuming the Workload", func() {
 		ginkgo.It("Should resume the Workload", func() {
-			wl := testing.MakeWorkload("wl", ns.Name).Active(false).Obj()
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).Active(false).Obj()
 			ginkgo.By("Create a Workload")
 			util.MustCreate(ctx, k8sClient, wl)
 
-			createdWorkload := &v1beta1.Workload{}
+			createdWorkload := &kueue.Workload{}
 
 			ginkgo.By("Get the created Workload", func() {
 				gomega.Eventually(func(g gomega.Gomega) {
@@ -84,18 +84,18 @@ var _ = ginkgo.Describe("Kueuectl Resume", ginkgo.Ordered, ginkgo.ContinueOnFail
 
 	ginkgo.When("Resuming a LocalQueue", func() {
 		ginkgo.DescribeTable("Should resume a LocalQueue",
-			func(name string, wantInitialStopPolicy v1beta1.StopPolicy) {
-				lq := testing.MakeLocalQueue(name, ns.Name).StopPolicy(wantInitialStopPolicy).Obj()
+			func(name string, wantInitialStopPolicy kueue.StopPolicy) {
+				lq := utiltestingapi.MakeLocalQueue(name, ns.Name).StopPolicy(wantInitialStopPolicy).Obj()
 
 				ginkgo.By("Create a LocalQueue", func() {
 					util.MustCreate(ctx, k8sClient, lq)
 				})
 
-				createdLocalQueue := &v1beta1.LocalQueue{}
+				createdLocalQueue := &kueue.LocalQueue{}
 				ginkgo.By("Get created LocalQueue", func() {
 					gomega.Eventually(func(g gomega.Gomega) {
 						g.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(lq), createdLocalQueue)).To(gomega.Succeed())
-						g.Expect(ptr.Deref(createdLocalQueue.Spec.StopPolicy, v1beta1.None)).Should(gomega.Equal(wantInitialStopPolicy))
+						g.Expect(ptr.Deref(createdLocalQueue.Spec.StopPolicy, kueue.None)).Should(gomega.Equal(wantInitialStopPolicy))
 					}, util.Timeout, util.Interval).Should(gomega.Succeed())
 				})
 
@@ -112,24 +112,24 @@ var _ = ginkgo.Describe("Kueuectl Resume", ginkgo.Ordered, ginkgo.ContinueOnFail
 				ginkgo.By("Check that the LocalQueue is successfully resumed", func() {
 					gomega.Eventually(func(g gomega.Gomega) {
 						g.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(createdLocalQueue), createdLocalQueue)).To(gomega.Succeed())
-						g.Expect(ptr.Deref(createdLocalQueue.Spec.StopPolicy, v1beta1.None)).Should(gomega.Equal(v1beta1.None))
+						g.Expect(ptr.Deref(createdLocalQueue.Spec.StopPolicy, kueue.None)).Should(gomega.Equal(kueue.None))
 					}, util.Timeout, util.Interval).Should(gomega.Succeed())
 				})
 			},
 			ginkgo.Entry("HoldAndDrain",
 				"lq-1",
-				v1beta1.HoldAndDrain,
+				kueue.HoldAndDrain,
 			),
 			ginkgo.Entry("Hold",
 				"lq-2",
-				v1beta1.Hold,
+				kueue.Hold,
 			),
 		)
 	})
 
 	ginkgo.When("Resuming a ClusterQueue", func() {
 		ginkgo.DescribeTable("Should resume a ClusterQueue",
-			func(cq *v1beta1.ClusterQueue, wantInitialStopPolicy v1beta1.StopPolicy) {
+			func(cq *kueue.ClusterQueue, wantInitialStopPolicy kueue.StopPolicy) {
 				ginkgo.By("Create a ClusterQueue", func() {
 					util.MustCreate(ctx, k8sClient, cq)
 				})
@@ -138,11 +138,11 @@ var _ = ginkgo.Describe("Kueuectl Resume", ginkgo.Ordered, ginkgo.ContinueOnFail
 					util.ExpectObjectToBeDeleted(ctx, k8sClient, cq, true)
 				})
 
-				createdClusterQueue := &v1beta1.ClusterQueue{}
+				createdClusterQueue := &kueue.ClusterQueue{}
 				ginkgo.By("Get created ClusterQueue", func() {
 					gomega.Eventually(func(g gomega.Gomega) {
 						g.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(cq), createdClusterQueue)).To(gomega.Succeed())
-						g.Expect(ptr.Deref(createdClusterQueue.Spec.StopPolicy, v1beta1.None)).Should(gomega.Equal(wantInitialStopPolicy))
+						g.Expect(ptr.Deref(createdClusterQueue.Spec.StopPolicy, kueue.None)).Should(gomega.Equal(wantInitialStopPolicy))
 					}, util.Timeout, util.Interval).Should(gomega.Succeed())
 				})
 
@@ -159,17 +159,17 @@ var _ = ginkgo.Describe("Kueuectl Resume", ginkgo.Ordered, ginkgo.ContinueOnFail
 				ginkgo.By("Check that the ClusterQueue is successfully resumed", func() {
 					gomega.Eventually(func(g gomega.Gomega) {
 						g.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(createdClusterQueue), createdClusterQueue)).To(gomega.Succeed())
-						g.Expect(ptr.Deref(createdClusterQueue.Spec.StopPolicy, v1beta1.None)).Should(gomega.Equal(v1beta1.None))
+						g.Expect(ptr.Deref(createdClusterQueue.Spec.StopPolicy, kueue.None)).Should(gomega.Equal(kueue.None))
 					}, util.Timeout, util.Interval).Should(gomega.Succeed())
 				})
 			},
 			ginkgo.Entry("HoldAndDrain",
-				testing.MakeClusterQueue("cq-1").StopPolicy(v1beta1.HoldAndDrain).Obj(),
-				v1beta1.HoldAndDrain,
+				utiltestingapi.MakeClusterQueue("cq-1").StopPolicy(kueue.HoldAndDrain).Obj(),
+				kueue.HoldAndDrain,
 			),
 			ginkgo.Entry("Hold",
-				testing.MakeClusterQueue("cq-2").StopPolicy(v1beta1.Hold).Obj(),
-				v1beta1.Hold,
+				utiltestingapi.MakeClusterQueue("cq-2").StopPolicy(kueue.Hold).Obj(),
+				kueue.Hold,
 			),
 		)
 	})
diff --git a/test/integration/singlecluster/kueuectl/stop_test.go b/test/integration/singlecluster/kueuectl/stop_test.go
index 6fb1779c5..d0ce45e5b 100644
--- a/test/integration/singlecluster/kueuectl/stop_test.go
+++ b/test/integration/singlecluster/kueuectl/stop_test.go
@@ -28,9 +28,9 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/cmd/kueuectl/app"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -50,11 +50,11 @@ var _ = ginkgo.Describe("Kueuectl Stop", ginkgo.Ordered, ginkgo.ContinueOnFailur
 
 	ginkgo.When("Stopping the Workload", func() {
 		ginkgo.It("Should stop the Workload", func() {
-			wl := testing.MakeWorkload("wl", ns.Name).Active(true).Obj()
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).Active(true).Obj()
 			ginkgo.By("Create a Workload")
 			util.MustCreate(ctx, k8sClient, wl)
 
-			createdWorkload := &v1beta1.Workload{}
+			createdWorkload := &kueue.Workload{}
 
 			ginkgo.By("Get the created Workload", func() {
 				gomega.Eventually(func(g gomega.Gomega) {
@@ -84,18 +84,18 @@ var _ = ginkgo.Describe("Kueuectl Stop", ginkgo.Ordered, ginkgo.ContinueOnFailur
 
 	ginkgo.When("Stopping a LocalQueue", func() {
 		ginkgo.DescribeTable("Should stop a LocalQueue",
-			func(name string, stopCmdArgs []string, wantStopPolicy v1beta1.StopPolicy) {
-				lq := testing.MakeLocalQueue(name, ns.Name).Obj()
+			func(name string, stopCmdArgs []string, wantStopPolicy kueue.StopPolicy) {
+				lq := utiltestingapi.MakeLocalQueue(name, ns.Name).Obj()
 
 				ginkgo.By("Create a LocalQueue", func() {
 					util.MustCreate(ctx, k8sClient, lq)
 				})
 
-				createdLocalQueue := &v1beta1.LocalQueue{}
+				createdLocalQueue := &kueue.LocalQueue{}
 				ginkgo.By("Get created LocalQueue", func() {
 					gomega.Eventually(func(g gomega.Gomega) {
 						g.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(lq), createdLocalQueue)).To(gomega.Succeed())
-						g.Expect(ptr.Deref(createdLocalQueue.Spec.StopPolicy, v1beta1.None)).Should(gomega.Equal(v1beta1.None))
+						g.Expect(ptr.Deref(createdLocalQueue.Spec.StopPolicy, kueue.None)).Should(gomega.Equal(kueue.None))
 					}, util.Timeout, util.Interval).Should(gomega.Succeed())
 				})
 
@@ -112,26 +112,26 @@ var _ = ginkgo.Describe("Kueuectl Stop", ginkgo.Ordered, ginkgo.ContinueOnFailur
 				ginkgo.By("Check that the LocalQueue is successfully stopped", func() {
 					gomega.Eventually(func(g gomega.Gomega) {
 						g.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(createdLocalQueue), createdLocalQueue)).To(gomega.Succeed())
-						g.Expect(ptr.Deref(createdLocalQueue.Spec.StopPolicy, v1beta1.None)).Should(gomega.Equal(wantStopPolicy))
+						g.Expect(ptr.Deref(createdLocalQueue.Spec.StopPolicy, kueue.None)).Should(gomega.Equal(wantStopPolicy))
 					}, util.Timeout, util.Interval).Should(gomega.Succeed())
 				})
 			},
 			ginkgo.Entry("Stop a LocalQueue and drain workloads",
 				"lq-1",
 				[]string{},
-				v1beta1.HoldAndDrain,
+				kueue.HoldAndDrain,
 			),
 			ginkgo.Entry("Stop a LocalQueue and let the admitted workloads finish",
 				"lq-2",
 				[]string{"--keep-already-running"},
-				v1beta1.Hold,
+				kueue.Hold,
 			),
 		)
 	})
 
 	ginkgo.When("Stopping a ClusterQueue", func() {
 		ginkgo.DescribeTable("Should stop a ClusterQueue",
-			func(cq *v1beta1.ClusterQueue, stopCmdArgs []string, wantStopPolicy v1beta1.StopPolicy) {
+			func(cq *kueue.ClusterQueue, stopCmdArgs []string, wantStopPolicy kueue.StopPolicy) {
 				ginkgo.By("Create a ClusterQueue", func() {
 					util.MustCreate(ctx, k8sClient, cq)
 				})
@@ -140,11 +140,11 @@ var _ = ginkgo.Describe("Kueuectl Stop", ginkgo.Ordered, ginkgo.ContinueOnFailur
 					util.ExpectObjectToBeDeleted(ctx, k8sClient, cq, true)
 				})
 
-				createdClusterQueue := &v1beta1.ClusterQueue{}
+				createdClusterQueue := &kueue.ClusterQueue{}
 				ginkgo.By("Get created ClusterQueue", func() {
 					gomega.Eventually(func(g gomega.Gomega) {
 						g.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(cq), createdClusterQueue)).To(gomega.Succeed())
-						g.Expect(ptr.Deref(createdClusterQueue.Spec.StopPolicy, v1beta1.None)).Should(gomega.Equal(v1beta1.None))
+						g.Expect(ptr.Deref(createdClusterQueue.Spec.StopPolicy, kueue.None)).Should(gomega.Equal(kueue.None))
 					}, util.Timeout, util.Interval).Should(gomega.Succeed())
 				})
 
@@ -161,19 +161,19 @@ var _ = ginkgo.Describe("Kueuectl Stop", ginkgo.Ordered, ginkgo.ContinueOnFailur
 				ginkgo.By("Check that the ClusterQueue is successfully stopped", func() {
 					gomega.Eventually(func(g gomega.Gomega) {
 						g.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(createdClusterQueue), createdClusterQueue)).To(gomega.Succeed())
-						g.Expect(ptr.Deref(createdClusterQueue.Spec.StopPolicy, v1beta1.None)).Should(gomega.Equal(wantStopPolicy))
+						g.Expect(ptr.Deref(createdClusterQueue.Spec.StopPolicy, kueue.None)).Should(gomega.Equal(wantStopPolicy))
 					}, util.Timeout, util.Interval).Should(gomega.Succeed())
 				})
 			},
 			ginkgo.Entry("Stop a ClusterQueue and drain workloads",
-				testing.MakeClusterQueue("cq-1").Obj(),
+				utiltestingapi.MakeClusterQueue("cq-1").Obj(),
 				[]string{},
-				v1beta1.HoldAndDrain,
+				kueue.HoldAndDrain,
 			),
 			ginkgo.Entry("Stop a ClusterQueue and let the admitted workloads finish",
-				testing.MakeClusterQueue("cq-2").Obj(),
+				utiltestingapi.MakeClusterQueue("cq-2").Obj(),
 				[]string{"--keep-already-running"},
-				v1beta1.Hold,
+				kueue.Hold,
 			),
 		)
 	})
diff --git a/test/integration/singlecluster/scheduler/fairsharing/fair_sharing_test.go b/test/integration/singlecluster/scheduler/fairsharing/fair_sharing_test.go
index c96e8083a..2ccb030ba 100644
--- a/test/integration/singlecluster/scheduler/fairsharing/fair_sharing_test.go
+++ b/test/integration/singlecluster/scheduler/fairsharing/fair_sharing_test.go
@@ -32,7 +32,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/metrics"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/integration/framework"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -60,14 +60,14 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 		util.MustCreate(ctx, k8sClient, cq)
 		cqs = append(cqs, cq)
 
-		lq := testing.MakeLocalQueue(cq.Name, ns.Name).ClusterQueue(cq.Name).Obj()
+		lq := utiltestingapi.MakeLocalQueue(cq.Name, ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 		lqs = append(lqs, lq)
 		return cq
 	}
 
 	var createWorkloadWithPriority = func(queue kueue.LocalQueueName, cpuRequests string, priority int32) *kueue.Workload {
-		wl := testing.MakeWorkloadWithGeneratedName("workload-", ns.Name).
+		wl := utiltestingapi.MakeWorkloadWithGeneratedName("workload-", ns.Name).
 			Priority(priority).
 			Queue(queue).
 			Request(corev1.ResourceCPU, cpuRequests).Obj()
@@ -98,11 +98,11 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 	})
 
 	ginkgo.BeforeEach(func() {
-		defaultFlavor = testing.MakeResourceFlavor("default").Obj()
+		defaultFlavor = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, defaultFlavor)
-		flavor1 = testing.MakeResourceFlavor("flavor1").Obj()
+		flavor1 = utiltestingapi.MakeResourceFlavor("flavor1").Obj()
 		util.MustCreate(ctx, k8sClient, flavor1)
-		flavor2 = testing.MakeResourceFlavor("flavor2").Obj()
+		flavor2 = utiltestingapi.MakeResourceFlavor("flavor2").Obj()
 		util.MustCreate(ctx, k8sClient, flavor2)
 
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
@@ -134,22 +134,22 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			cqShared *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			cqA = createQueue(testing.MakeClusterQueue("a").
+			cqA = createQueue(utiltestingapi.MakeClusterQueue("a").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "3").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "3").Obj(),
 				).Obj())
 
-			cqB = createQueue(testing.MakeClusterQueue("b").
+			cqB = createQueue(utiltestingapi.MakeClusterQueue("b").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj(),
 				).Obj())
 
-			cqShared = createQueue(testing.MakeClusterQueue("shared").
+			cqShared = createQueue(utiltestingapi.MakeClusterQueue("shared").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "4").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "4").Obj(),
 				).Obj())
 		})
 
@@ -217,7 +217,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 						Type:    kueue.WorkloadQuotaReserved,
 						Status:  metav1.ConditionFalse,
 						Reason:  "Pending",
-						Message: "couldn't assign flavors to pod set main: insufficient quota for cpu in flavor default, request > maximum capacity (10 > 8)",
+						Message: "couldn't assign flavors to pod set main: insufficient quota for cpu in flavor default, previously considered podsets requests (0) + current podset request (10) > maximum capacity (8)",
 					}, util.IgnoreConditionTimestampsAndObservedGeneration),
 				))
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
@@ -231,28 +231,28 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			cqC *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			cqA = createQueue(testing.MakeClusterQueue("a").
+			cqA = createQueue(utiltestingapi.MakeClusterQueue("a").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "3").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "3").Obj(),
 				).Preemption(kueue.ClusterQueuePreemption{
 				ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 			}).Obj())
 
-			cqB = createQueue(testing.MakeClusterQueue("b").
+			cqB = createQueue(utiltestingapi.MakeClusterQueue("b").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "3").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "3").Obj(),
 				).Preemption(kueue.ClusterQueuePreemption{
 				ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 			}).Obj())
 
-			cqC = createQueue(testing.MakeClusterQueue("c").
+			cqC = createQueue(utiltestingapi.MakeClusterQueue("c").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "3").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "3").Obj(),
 				).Preemption(kueue.ClusterQueuePreemption{
 				ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -284,7 +284,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			util.ExpectClusterQueueWeightedShareMetric(cqC, 0)
 
 			ginkgo.By("cq-c reclaims one unit, preemption happens in cq-a")
-			cWorkload := testing.MakeWorkload("c0", ns.Name).Queue("c").Request(corev1.ResourceCPU, "1").Obj()
+			cWorkload := utiltestingapi.MakeWorkload("c0", ns.Name).Queue("c").Request(corev1.ResourceCPU, "1").Obj()
 			util.MustCreate(ctx, k8sClient, cWorkload)
 			util.ExpectPendingWorkloadsMetric(cqC, 1, 0)
 			util.ExpectClusterQueueWeightedShareMetric(cqA, 223)
@@ -315,29 +315,29 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			cqB *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			createCohort(testing.MakeCohort("top-cohort").
+			createCohort(utiltestingapi.MakeCohort("top-cohort").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "8").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "8").Obj(),
 				).Obj())
 
-			cqA = createQueue(testing.MakeClusterQueue("best-effort-cq-a").
+			cqA = createQueue(utiltestingapi.MakeClusterQueue("best-effort-cq-a").
 				Cohort("top-cohort").
 				FairWeight(resource.MustParse("0")).
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				}).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj(),
 				).Obj())
 
-			cqB = createQueue(testing.MakeClusterQueue("best-effort-cq-b").
+			cqB = createQueue(utiltestingapi.MakeClusterQueue("best-effort-cq-b").
 				Cohort("top-cohort").
 				FairWeight(resource.MustParse("0")).
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				}).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj(),
 				).Obj())
 		})
 
@@ -346,7 +346,10 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			wlA1 := createWorkloadWithPriority("best-effort-cq-a", "4", 9001)
 			wlA2 := createWorkloadWithPriority("best-effort-cq-a", "4", 100)
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wlA1, wlA2)
+			util.ExpectAdmittedWorkloadsTotalMetric(cqA, "", 2)
+			// Sanity check asserting reserving_active_workloads to verify metric correctness after update
 			util.ExpectReservingActiveWorkloadsMetric(cqA, 2)
+			util.ExpectAdmittedWorkloadsTotalMetric(cqB, "", 0)
 			util.ExpectReservingActiveWorkloadsMetric(cqB, 0)
 
 			ginkgo.By("Creating a workload in cqB that should preempt one from cqA")
@@ -386,25 +389,25 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			//    sl   sr    bank
 			//    /     \
 			//   cqL    cqR
-			cohortFirstLeft := createCohort(testing.MakeCohort("first-left").Parent("root").Obj())
-			cohortFirstRight := createCohort(testing.MakeCohort("first-right").Parent("root").Obj())
-			cohortSecondLeft := createCohort(testing.MakeCohort("second-left").Parent("first-left").Obj())
-			cohortSecondRight := createCohort(testing.MakeCohort("second-right").Parent("first-left").Obj())
-			cohortBank := createCohort(testing.MakeCohort("bank").Parent("first-right").
+			cohortFirstLeft := createCohort(utiltestingapi.MakeCohort("first-left").Parent("root").Obj())
+			cohortFirstRight := createCohort(utiltestingapi.MakeCohort("first-right").Parent("root").Obj())
+			cohortSecondLeft := createCohort(utiltestingapi.MakeCohort("second-left").Parent("first-left").Obj())
+			cohortSecondRight := createCohort(utiltestingapi.MakeCohort("second-right").Parent("first-left").Obj())
+			cohortBank := createCohort(utiltestingapi.MakeCohort("bank").Parent("first-right").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "10").Obj(),
 				).Obj())
 
-			cqSecondLeft := createQueue(testing.MakeClusterQueue("second-left").
+			cqSecondLeft := createQueue(utiltestingapi.MakeClusterQueue("second-left").
 				Cohort("second-left").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "2").Obj(),
+					*utiltestingapi.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "2").Obj(),
 				).Obj())
 
-			cqSecondRight := createQueue(testing.MakeClusterQueue("second-right").
+			cqSecondRight := createQueue(utiltestingapi.MakeClusterQueue("second-right").
 				Cohort("second-right").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "2").Obj(),
+					*utiltestingapi.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "2").Obj(),
 				).Obj())
 			expectCohortWeightedShare(cohortFirstLeft.Name, 0)
 			expectCohortWeightedShare(cohortFirstRight.Name, 0)
@@ -416,7 +419,9 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 				createWorkload("second-right", "1")
 			}
 
+			util.ExpectAdmittedWorkloadsTotalMetric(cqSecondLeft, "", 5)
 			util.ExpectReservingActiveWorkloadsMetric(cqSecondLeft, 5)
+			util.ExpectAdmittedWorkloadsTotalMetric(cqSecondRight, "", 5)
 			util.ExpectReservingActiveWorkloadsMetric(cqSecondRight, 5)
 			expectCohortWeightedShare(cohortFirstLeft.Name, 429)
 			expectCohortWeightedShare(cohortFirstRight.Name, 0)
@@ -435,22 +440,22 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			//                   /   |    \
 			//                  /    |     \
 			//          chemistry  physics   llm(2.0)
-			createCohort(testing.MakeCohort("root").ResourceGroup(*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "12").Obj()).Obj())
-			createCohort(testing.MakeCohort("research").Parent("root").Obj())
-			createCohort(testing.MakeCohort("chemistry").Parent("research").Obj())
-			createCohort(testing.MakeCohort("physics").Parent("research").Obj())
-			createCohort(testing.MakeCohort("llm").FairWeight(resource.MustParse("2.0")).Parent("research").Obj())
-			createCohort(testing.MakeCohort("best-effort").FairWeight(resource.MustParse("0.5")).Parent("root").Obj())
+			createCohort(utiltestingapi.MakeCohort("root").ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "12").Obj()).Obj())
+			createCohort(utiltestingapi.MakeCohort("research").Parent("root").Obj())
+			createCohort(utiltestingapi.MakeCohort("chemistry").Parent("research").Obj())
+			createCohort(utiltestingapi.MakeCohort("physics").Parent("research").Obj())
+			createCohort(utiltestingapi.MakeCohort("llm").FairWeight(resource.MustParse("2.0")).Parent("research").Obj())
+			createCohort(utiltestingapi.MakeCohort("best-effort").FairWeight(resource.MustParse("0.5")).Parent("root").Obj())
 
 			preemptionPolicy := kueue.ClusterQueuePreemption{
 				ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 			}
-			zeroQuota := *testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj()
+			zeroQuota := *utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj()
 
-			chemistryQueue := createQueue(testing.MakeClusterQueue("chemistry-queue").Cohort("chemistry").ResourceGroup(zeroQuota).Preemption(preemptionPolicy).Obj())
-			physicsQueue := createQueue(testing.MakeClusterQueue("physics-queue").Cohort("physics").ResourceGroup(zeroQuota).Preemption(preemptionPolicy).Obj())
-			llmQueue := createQueue(testing.MakeClusterQueue("llm-queue").Cohort("llm").ResourceGroup(zeroQuota).Preemption(preemptionPolicy).Obj())
-			bestEffortQueue := createQueue(testing.MakeClusterQueue("best-effort-queue").Cohort("best-effort").ResourceGroup(zeroQuota).Obj())
+			chemistryQueue := createQueue(utiltestingapi.MakeClusterQueue("chemistry-queue").Cohort("chemistry").ResourceGroup(zeroQuota).Preemption(preemptionPolicy).Obj())
+			physicsQueue := createQueue(utiltestingapi.MakeClusterQueue("physics-queue").Cohort("physics").ResourceGroup(zeroQuota).Preemption(preemptionPolicy).Obj())
+			llmQueue := createQueue(utiltestingapi.MakeClusterQueue("llm-queue").Cohort("llm").ResourceGroup(zeroQuota).Preemption(preemptionPolicy).Obj())
+			bestEffortQueue := createQueue(utiltestingapi.MakeClusterQueue("best-effort-queue").Cohort("best-effort").ResourceGroup(zeroQuota).Obj())
 
 			ginkgo.By("all capacity used")
 			for range 6 {
@@ -459,7 +464,9 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			}
 			expectCohortWeightedShare("best-effort", 1000)
 			expectCohortWeightedShare("physics", 500)
+			util.ExpectAdmittedWorkloadsTotalMetric(bestEffortQueue, "", 6)
 			util.ExpectReservingActiveWorkloadsMetric(bestEffortQueue, 6)
+			util.ExpectAdmittedWorkloadsTotalMetric(physicsQueue, "", 6)
 			util.ExpectReservingActiveWorkloadsMetric(physicsQueue, 6)
 
 			ginkgo.By("create high priority workloads")
@@ -496,21 +503,21 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			cqp5 *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			createCohort(testing.MakeCohort("root-cohort").Obj())
-			createCohort(testing.MakeCohort("cohort-a").
+			createCohort(utiltestingapi.MakeCohort("root-cohort").Obj())
+			createCohort(utiltestingapi.MakeCohort("cohort-a").
 				Parent("root-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0", "10").Obj(),
-					*testing.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "0", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "0", "10").Obj(),
 				).
 				Obj())
-			createCohort(testing.MakeCohort("cohort-b").
+			createCohort(utiltestingapi.MakeCohort("cohort-b").
 				Parent("root-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0", "10").Obj(),
-					*testing.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "0", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "0", "10").Obj(),
 				).
 				Obj())
 
@@ -523,56 +530,56 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 			}
 
-			cqp1 = createQueue(testing.MakeClusterQueue("cq-p1").
+			cqp1 = createQueue(utiltestingapi.MakeClusterQueue("cq-p1").
 				Cohort("cohort-a").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "3", "10").Obj(),
-					*testing.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "3", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "3", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "3", "10").Obj(),
 				).
 				FlavorFungibility(fungibility).
 				Preemption(preemption).
 				Obj())
 
-			createQueue(testing.MakeClusterQueue("cq-p2").
+			createQueue(utiltestingapi.MakeClusterQueue("cq-p2").
 				Cohort("cohort-a").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "3", "10").Obj(),
-					*testing.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "3", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "3", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "3", "10").Obj(),
 				).
 				FlavorFungibility(fungibility).
 				Preemption(preemption).
 				Obj())
 
-			createQueue(testing.MakeClusterQueue("cq-p3").
+			createQueue(utiltestingapi.MakeClusterQueue("cq-p3").
 				Cohort("cohort-a").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "2", "10").Obj(),
-					*testing.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "4", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "2", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "4", "10").Obj(),
 				).
 				FlavorFungibility(fungibility).
 				Preemption(preemption).
 				Obj())
 
-			createQueue(testing.MakeClusterQueue("cq-p4").
+			createQueue(utiltestingapi.MakeClusterQueue("cq-p4").
 				Cohort("cohort-b").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "2", "10").Obj(),
-					*testing.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "0", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "2", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "0", "10").Obj(),
 				).
 				FlavorFungibility(fungibility).
 				Preemption(preemption).
 				Obj())
 
-			cqp5 = createQueue(testing.MakeClusterQueue("cq-p5").
+			cqp5 = createQueue(utiltestingapi.MakeClusterQueue("cq-p5").
 				Cohort("cohort-b").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0", "10").Obj(),
-					*testing.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "0", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor2").Resource(corev1.ResourceCPU, "0", "10").Obj(),
 				).
 				FlavorFungibility(fungibility).
 				Preemption(preemption).
@@ -597,6 +604,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 				createWorkload("cq-p1", "1")
 			}
 			ginkgo.By("Workloads active")
+			util.ExpectAdmittedWorkloadsTotalMetric(cqp1, "", 18)
 			util.ExpectReservingActiveWorkloadsMetric(cqp1, 18)
 
 			ginkgo.By("Expected Weighted Shares")
@@ -609,6 +617,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 				createWorkload("cq-p1", "1")
 			}
 			ginkgo.By("Workloads active")
+			util.ExpectAdmittedWorkloadsTotalMetric(cqp1, "", 18)
 			util.ExpectReservingActiveWorkloadsMetric(cqp1, 18)
 
 			ginkgo.By("Expected Weighted Shares")
@@ -627,6 +636,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			for range 20 {
 				createWorkload("cq-p1", "1")
 			}
+			util.ExpectAdmittedWorkloadsTotalMetric(cqp1, "", 20)
 			util.ExpectReservingActiveWorkloadsMetric(cqp1, 20)
 			expectCohortWeightedShare("cohort-a", 100)
 
@@ -656,11 +666,11 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			cqp2 *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			createCohort(testing.MakeCohort("cohort-a").
+			createCohort(utiltestingapi.MakeCohort("cohort-a").
 				Parent("root-cohort").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "9").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "9").Obj(),
 				).
 				Obj())
 
@@ -673,21 +683,21 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 			}
 
-			cqp1 = createQueue(testing.MakeClusterQueue("cq-p1").
+			cqp1 = createQueue(utiltestingapi.MakeClusterQueue("cq-p1").
 				Cohort("cohort-a").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0").Obj(),
 				).
 				FlavorFungibility(fungibility).
 				Preemption(preemption).
 				Obj())
 
-			cqp2 = createQueue(testing.MakeClusterQueue("cq-p2").
+			cqp2 = createQueue(utiltestingapi.MakeClusterQueue("cq-p2").
 				Cohort("cohort-a").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0").Obj(),
 				).
 				FlavorFungibility(fungibility).
 				Preemption(preemption).
@@ -826,28 +836,28 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 			}
 
-			cohortA = createCohort(testing.MakeCohort("cohort-a").
+			cohortA = createCohort(utiltestingapi.MakeCohort("cohort-a").
 				Parent("root").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "3").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "3").Obj(),
 				).Obj())
 
-			cq1 = createQueue(testing.MakeClusterQueue("cq1").
+			cq1 = createQueue(utiltestingapi.MakeClusterQueue("cq1").
 				Cohort("cohort-a").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0").Obj(),
 				).
 				FlavorFungibility(fungibility).
 				Preemption(preemption).
 				Obj())
 
-			cq2 = createQueue(testing.MakeClusterQueue("cq2").
+			cq2 = createQueue(utiltestingapi.MakeClusterQueue("cq2").
 				Cohort("root").
 				FairWeight(resource.MustParse("1")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("flavor1").Resource(corev1.ResourceCPU, "0").Obj(),
 				).
 				FlavorFungibility(fungibility).
 				Preemption(preemption).
@@ -960,20 +970,20 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 
 		ginkgo.BeforeEach(func() {
 			features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.AdmissionFairSharing, true)
-			cq1 = testing.MakeClusterQueue("cq1").
-				ResourceGroup(*testing.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "8").Obj()).
+			cq1 = utiltestingapi.MakeClusterQueue("cq1").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "8").Obj()).
 				AdmissionMode(kueue.UsageBasedAdmissionFairSharing).
 				Obj()
 			cqs = append(cqs, cq1)
 			util.MustCreate(ctx, k8sClient, cq1)
 
-			lqA = testing.MakeLocalQueue("lq-a", ns.Name).
+			lqA = utiltestingapi.MakeLocalQueue("lq-a", ns.Name).
 				FairSharing(&kueue.FairSharing{Weight: ptr.To(resource.MustParse("1"))}).
 				ClusterQueue(cq1.Name).Obj()
-			lqB = testing.MakeLocalQueue("lq-b", ns.Name).
+			lqB = utiltestingapi.MakeLocalQueue("lq-b", ns.Name).
 				FairSharing(&kueue.FairSharing{Weight: ptr.To(resource.MustParse("1"))}).
 				ClusterQueue(cq1.Name).Obj()
-			lqC = testing.MakeLocalQueue("lq-c", ns.Name).
+			lqC = utiltestingapi.MakeLocalQueue("lq-c", ns.Name).
 				FairSharing(&kueue.FairSharing{Weight: ptr.To(resource.MustParse("1"))}).
 				ClusterQueue(cq1.Name).Obj()
 			lqs = append(lqs, lqA)
@@ -991,6 +1001,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 				createWorkload("lq-a", "4"),
 				createWorkload("lq-b", "4"),
 			}
+			util.ExpectAdmittedWorkloadsTotalMetric(cq1, "", 2)
 			util.ExpectReservingActiveWorkloadsMetric(cq1, 2)
 
 			ginkgo.By("Creating two pending workloads for each lq")
@@ -1024,6 +1035,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 				createWorkload("lq-a", "4"),
 				createWorkload("lq-a", "4"),
 			}
+			util.ExpectAdmittedWorkloadsTotalMetric(cq1, "", 2)
 			util.ExpectReservingActiveWorkloadsMetric(cq1, 2)
 
 			ginkgo.By("Creating pending workloads for lq-a")
@@ -1052,6 +1064,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 				createWorkload("lq-a", "4"),
 				createWorkload("lq-b", "4"),
 			}
+			util.ExpectAdmittedWorkloadsTotalMetric(cq1, "", 2)
 			util.ExpectReservingActiveWorkloadsMetric(cq1, 2)
 
 			ginkgo.By("Creating pending workloads for lq-a and lq-b")
@@ -1083,6 +1096,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 				createWorkload("lq-a", "4"),
 				createWorkload("lq-a", "4"),
 			}
+			util.ExpectAdmittedWorkloadsTotalMetric(cq1, "", 2)
 			util.ExpectReservingActiveWorkloadsMetric(cq1, 2)
 
 			ginkgo.By("Creating pending workloads for lq-b")
@@ -1116,19 +1130,19 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			cqB *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			cqA = createQueue(testing.MakeClusterQueue("a").
+			cqA = createQueue(utiltestingapi.MakeClusterQueue("a").
 				Cohort("all").FairWeight(resource.MustParse("300")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "600").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "600").Obj(),
 				).Preemption(kueue.ClusterQueuePreemption{
 				ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 			}).Obj())
 
-			cqB = createQueue(testing.MakeClusterQueue("b").
+			cqB = createQueue(utiltestingapi.MakeClusterQueue("b").
 				Cohort("all").FairWeight(resource.MustParse("300")).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "600").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "600").Obj(),
 				).Preemption(kueue.ClusterQueuePreemption{
 				ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -1156,22 +1170,22 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			bestEffortCQB *kueue.ClusterQueue
 		)
 		ginkgo.BeforeEach(func() {
-			bestEffortCQA = createQueue(testing.MakeClusterQueue("best-effort-a").
+			bestEffortCQA = createQueue(utiltestingapi.MakeClusterQueue("best-effort-a").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj(),
 				).Obj())
 
-			bestEffortCQB = createQueue(testing.MakeClusterQueue("best-effort-b").
+			bestEffortCQB = createQueue(utiltestingapi.MakeClusterQueue("best-effort-b").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj(),
 				).Obj())
 
-			createQueue(testing.MakeClusterQueue("guaranteed").
+			createQueue(utiltestingapi.MakeClusterQueue("guaranteed").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "8").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "8").Obj(),
 				).Preemption(kueue.ClusterQueuePreemption{
 				ReclaimWithinCohort: kueue.PreemptionPolicyAny}).
 				Obj())
@@ -1184,8 +1198,10 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			wlBestEffortA := createWorkload("best-effort-a", "4")
 			util.WaitForNextSecondAfterCreation(wlBestEffortA)
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wlBestEffortA)
+			util.ExpectAdmittedWorkloadsTotalMetric(bestEffortCQA, "", 1)
 			util.ExpectReservingActiveWorkloadsMetric(bestEffortCQA, 1)
 			wlBestEffortB := createWorkload("best-effort-b", "4")
+			util.ExpectAdmittedWorkloadsTotalMetric(bestEffortCQB, "", 1)
 			util.ExpectReservingActiveWorkloadsMetric(bestEffortCQB, 1)
 
 			ginkgo.By("Creating a guaranteed workload in the guaranteed CQ, that should reclaim quota")
@@ -1231,7 +1247,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 	)
 
 	var createWorkloadWithPriority = func(queue kueue.LocalQueueName, cpuRequests string, priority int32) *kueue.Workload {
-		wl := testing.MakeWorkloadWithGeneratedName("workload-", ns.Name).
+		wl := utiltestingapi.MakeWorkloadWithGeneratedName("workload-", ns.Name).
 			Priority(priority).
 			Queue(queue).
 			Request(corev1.ResourceCPU, cpuRequests).Obj()
@@ -1262,7 +1278,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 	})
 
 	ginkgo.BeforeEach(func() {
-		defaultFlavor = testing.MakeResourceFlavor("default").Obj()
+		defaultFlavor = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, defaultFlavor)
 
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
@@ -1297,9 +1313,9 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 		ginkgo.BeforeEach(func() {
 			features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.AdmissionFairSharing, true)
 
-			cq1 = testing.MakeClusterQueue("cq1").
+			cq1 = utiltestingapi.MakeClusterQueue("cq1").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "16").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "16").Obj()).
 				Preemption(kueue.ClusterQueuePreemption{WithinClusterQueue: kueue.PreemptionPolicyNever}).
 				QueueingStrategy(kueue.StrictFIFO).
 				AdmissionMode(kueue.UsageBasedAdmissionFairSharing).
@@ -1307,10 +1323,10 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			util.MustCreate(ctx, k8sClient, cq1)
 			cqs = append(cqs, cq1)
 
-			cq2 = testing.MakeClusterQueue("cq2").
+			cq2 = utiltestingapi.MakeClusterQueue("cq2").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "16").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "16").Obj(),
 				).Preemption(kueue.ClusterQueuePreemption{
 				ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -1318,13 +1334,13 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			util.MustCreate(ctx, k8sClient, cq2)
 			cqs = append(cqs, cq2)
 
-			lqA = testing.MakeLocalQueue("lq-a", ns.Name).
+			lqA = utiltestingapi.MakeLocalQueue("lq-a", ns.Name).
 				FairSharing(&kueue.FairSharing{Weight: ptr.To(resource.MustParse("1"))}).
 				ClusterQueue(cq1.Name).Obj()
-			lqB = testing.MakeLocalQueue("lq-b", ns.Name).
+			lqB = utiltestingapi.MakeLocalQueue("lq-b", ns.Name).
 				FairSharing(&kueue.FairSharing{Weight: ptr.To(resource.MustParse("1"))}).
 				ClusterQueue(cq1.Name).Obj()
-			lqC = testing.MakeLocalQueue("lq-c", ns.Name).
+			lqC = utiltestingapi.MakeLocalQueue("lq-c", ns.Name).
 				FairSharing(&kueue.FairSharing{Weight: ptr.To(resource.MustParse("1"))}).
 				ClusterQueue(cq2.Name).Obj()
 			lqs = append(lqs, lqA)
@@ -1341,6 +1357,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 
 			ginkgo.By("Admitting the workload")
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
+			util.ExpectAdmittedWorkloadsTotalMetric(cq1, "", 1)
 			util.ExpectReservingActiveWorkloadsMetric(cq1, 1)
 
 			ginkgo.By("Checking that LQ's resource usage is updated")
@@ -1362,6 +1379,7 @@ var _ = ginkgo.Describe("Scheduler", ginkgo.Ordered, ginkgo.ContinueOnFailure, f
 			ginkgo.By("Creating workloads in CQ1 that borrow from CQ2")
 			wlHighA := createWorkloadWithPriority("lq-a", "20", 10)
 			_ = createWorkloadWithPriority("lq-b", "12", 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(cq1, "", 2)
 			util.ExpectReservingActiveWorkloadsMetric(cq1, 2)
 
 			ginkgo.By("Checking that LQs' resource usage is updated")
@@ -1388,7 +1406,7 @@ var _ = ginkgo.Describe("Scheduler with AdmissionFairSharing = nil", ginkgo.Orde
 	)
 
 	var createWorkloadWithPriority = func(queue kueue.LocalQueueName, cpuRequests string, priority int32) *kueue.Workload {
-		wl := testing.MakeWorkloadWithGeneratedName("workload-", ns.Name).
+		wl := utiltestingapi.MakeWorkloadWithGeneratedName("workload-", ns.Name).
 			Priority(priority).
 			Queue(queue).
 			Request(corev1.ResourceCPU, cpuRequests).Obj()
@@ -1410,7 +1428,7 @@ var _ = ginkgo.Describe("Scheduler with AdmissionFairSharing = nil", ginkgo.Orde
 	})
 
 	ginkgo.BeforeEach(func() {
-		defaultFlavor = testing.MakeResourceFlavor("default").Obj()
+		defaultFlavor = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, defaultFlavor)
 
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
@@ -1442,9 +1460,9 @@ var _ = ginkgo.Describe("Scheduler with AdmissionFairSharing = nil", ginkgo.Orde
 		ginkgo.BeforeEach(func() {
 			features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.AdmissionFairSharing, true)
 
-			cq1 = testing.MakeClusterQueue("cq1").
+			cq1 = utiltestingapi.MakeClusterQueue("cq1").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "32").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "32").Obj()).
 				Preemption(kueue.ClusterQueuePreemption{WithinClusterQueue: kueue.PreemptionPolicyNever}).
 				QueueingStrategy(kueue.StrictFIFO).
 				AdmissionMode(kueue.UsageBasedAdmissionFairSharing).
@@ -1452,7 +1470,7 @@ var _ = ginkgo.Describe("Scheduler with AdmissionFairSharing = nil", ginkgo.Orde
 			util.MustCreate(ctx, k8sClient, cq1)
 			cqs = append(cqs, cq1)
 
-			lqA = testing.MakeLocalQueue("lq-a", ns.Name).
+			lqA = utiltestingapi.MakeLocalQueue("lq-a", ns.Name).
 				FairSharing(&kueue.FairSharing{Weight: ptr.To(resource.MustParse("1"))}).
 				ClusterQueue(cq1.Name).Obj()
 			lqs = append(lqs, lqA)
@@ -1465,6 +1483,7 @@ var _ = ginkgo.Describe("Scheduler with AdmissionFairSharing = nil", ginkgo.Orde
 
 			ginkgo.By("Admitting the workload")
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
+			util.ExpectAdmittedWorkloadsTotalMetric(cq1, "", 1)
 			util.ExpectReservingActiveWorkloadsMetric(cq1, 1)
 
 			ginkgo.By("Checking that FairSharing status is nil")
diff --git a/test/integration/singlecluster/scheduler/podsready/scheduler_test.go b/test/integration/singlecluster/scheduler/podsready/scheduler_test.go
index 5a6c0f767..7b9f5c933 100644
--- a/test/integration/singlecluster/scheduler/podsready/scheduler_test.go
+++ b/test/integration/singlecluster/scheduler/podsready/scheduler_test.go
@@ -32,7 +32,7 @@ import (
 
 	config "sigs.k8s.io/kueue/apis/config/v1beta1"
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/integration/framework"
 	"sigs.k8s.io/kueue/test/util"
@@ -82,27 +82,27 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 		}
 		fwk.StartManager(ctx, cfg, managerAndSchedulerSetup(configuration))
 
-		defaultFlavor = testing.MakeResourceFlavor("default").Obj()
+		defaultFlavor = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, defaultFlavor)
 
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "podsready-")
 
-		prodClusterQ = testing.MakeClusterQueue("prod-cq").
+		prodClusterQ = utiltestingapi.MakeClusterQueue("prod-cq").
 			Cohort("all").
-			ResourceGroup(*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "5").Obj()).
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, prodClusterQ)
 
-		devClusterQ = testing.MakeClusterQueue("dev-cq").
+		devClusterQ = utiltestingapi.MakeClusterQueue("dev-cq").
 			Cohort("all").
-			ResourceGroup(*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "5").Obj()).
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, devClusterQ)
 
-		prodQueue = testing.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
+		prodQueue = utiltestingapi.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
 		util.MustCreate(ctx, k8sClient, prodQueue)
 
-		devQueue = testing.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devClusterQ.Name).Obj()
+		devQueue = utiltestingapi.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devClusterQ.Name).Obj()
 		util.MustCreate(ctx, k8sClient, devQueue)
 
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, prodClusterQ, devClusterQ)
@@ -128,9 +128,9 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 
 		ginkgo.It("Should unblock admission of new workloads in other ClusterQueues once the admitted workload exceeds timeout", func() {
 			ginkgo.By("checking the first prod workload gets admitted while the second is waiting")
-			prodWl := testing.MakeWorkload("prod-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			prodWl := utiltestingapi.MakeWorkload("prod-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl)
-			devWl := testing.MakeWorkload("dev-wl", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			devWl := utiltestingapi.MakeWorkload("dev-wl", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, devWl)
 			util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, prodClusterQ.Name, prodWl)
 			util.ExpectWorkloadsToBeWaiting(ctx, k8sClient, devWl)
@@ -150,9 +150,9 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 
 		ginkgo.It("Should unblock admission of new workloads in other ClusterQueues once the admitted workload exceeds timeout", func() {
 			ginkgo.By("checking the first prod workload gets admitted while the second is waiting")
-			prodWl := testing.MakeWorkload("prod-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			prodWl := utiltestingapi.MakeWorkload("prod-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl)
-			devWl := testing.MakeWorkload("dev-wl", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			devWl := utiltestingapi.MakeWorkload("dev-wl", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, devWl)
 			util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, prodClusterQ.Name, prodWl)
 			util.ExpectWorkloadsToBeWaiting(ctx, k8sClient, devWl)
@@ -172,7 +172,7 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 
 		ginkgo.It("Should emit the PodsReadyToEvictedTimeSeconds metric", func() {
 			ginkgo.By("create a workload and await its admission")
-			prodWl := testing.MakeWorkload("prod-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			prodWl := utiltestingapi.MakeWorkload("prod-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl)
 			// This resolve the issue that PodsReady status (while set manually) is overwritten by scheduler admission
 			// Recheck after scheduler refactor to use strict mode - when WorkloadRequestUseMergePatch goes beta
@@ -204,11 +204,11 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 
 		ginkgo.It("Should unblock admission of new workloads once the admitted workload is deleted", func() {
 			ginkgo.By("checking the first prod workload gets admitted while the second is waiting")
-			prodWl := testing.MakeWorkload("prod-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			prodWl := utiltestingapi.MakeWorkload("prod-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl)
 			util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, prodClusterQ.Name, prodWl)
 
-			devWl := testing.MakeWorkload("dev-wl", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			devWl := utiltestingapi.MakeWorkload("dev-wl", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, devWl)
 			util.ExpectWorkloadsToBeWaiting(ctx, k8sClient, devWl)
 
@@ -219,9 +219,9 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 
 		ginkgo.It("Should block admission of one new workload if two are considered in the same scheduling cycle", framework.SlowSpec, func() {
 			ginkgo.By("creating two workloads but delaying cluster queue creation which has enough capacity")
-			prodWl := testing.MakeWorkload("prod-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "11").Obj()
+			prodWl := utiltestingapi.MakeWorkload("prod-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "11").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl)
-			devWl := testing.MakeWorkload("dev-wl", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "11").Obj()
+			devWl := utiltestingapi.MakeWorkload("dev-wl", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "11").Obj()
 			util.WaitForNextSecondAfterCreation(prodWl)
 			util.MustCreate(ctx, k8sClient, devWl)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, prodWl, devWl)
@@ -229,9 +229,9 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 			ginkgo.By("creating the cluster queue")
 			// Delay cluster queue creation to make sure workloads are in the same
 			// scheduling cycle.
-			testCQ := testing.MakeClusterQueue("test-cq").
+			testCQ := utiltestingapi.MakeClusterQueue("test-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "25", "0").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "25", "0").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, testCQ)
 			defer func() {
@@ -256,11 +256,11 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 			const lowPrio, highPrio = 0, 100
 
 			ginkgo.By("create the 'prod1' workload")
-			prodWl1 := testing.MakeWorkload("prod1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Priority(highPrio).Request(corev1.ResourceCPU, "2").Obj()
+			prodWl1 := utiltestingapi.MakeWorkload("prod1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Priority(highPrio).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl1)
 
 			ginkgo.By("create the 'prod2' workload")
-			prodWl2 := testing.MakeWorkload("prod2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Priority(lowPrio).Request(corev1.ResourceCPU, "2").Obj()
+			prodWl2 := utiltestingapi.MakeWorkload("prod2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Priority(lowPrio).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl2)
 
 			ginkgo.By("checking the 'prod1' workload is admitted and the 'prod2' workload is waiting")
@@ -296,7 +296,7 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 
 		ginkgo.It("Should re-admit a timed out workload and deactivate a workload exceeded the re-queue count limit. After that re-activating a workload", framework.SlowSpec, func() {
 			ginkgo.By("create the 'prod' workload")
-			prodWl := testing.MakeWorkload("prod", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			prodWl := utiltestingapi.MakeWorkload("prod", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl)
 
 			ginkgo.By("checking the 'prod' workload is admitted")
@@ -370,10 +370,10 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 
 		ginkgo.It("Should unblock admission of new workloads in other ClusterQueues once the admitted workload exceeds timeout", func() {
 			ginkgo.By("create the 'prod' workload")
-			prodWl := testing.MakeWorkload("prod", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			prodWl := utiltestingapi.MakeWorkload("prod", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl)
 			util.WaitForNextSecondAfterCreation(prodWl)
-			devWl := testing.MakeWorkload("dev", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			devWl := utiltestingapi.MakeWorkload("dev", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, devWl)
 
 			ginkgo.By("wait for the 'prod' workload to be admitted and the 'dev' to be waiting")
@@ -464,9 +464,9 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 
 		// the workloads are created with a 5 cpu resource requirement to ensure only one can fit at a given time,
 		// letting them all to time out, we should see a circular buffer admission pattern
-		wl1 := testing.MakeWorkload("prod1", ns.Name).Queue(kueue.LocalQueueName(localQueueName)).Request(corev1.ResourceCPU, "5").Obj()
-		wl2 := testing.MakeWorkload("prod2", ns.Name).Queue(kueue.LocalQueueName(localQueueName)).Request(corev1.ResourceCPU, "5").Obj()
-		wl3 := testing.MakeWorkload("prod3", ns.Name).Queue(kueue.LocalQueueName(localQueueName)).Request(corev1.ResourceCPU, "5").Obj()
+		wl1 := utiltestingapi.MakeWorkload("prod1", ns.Name).Queue(kueue.LocalQueueName(localQueueName)).Request(corev1.ResourceCPU, "5").Obj()
+		wl2 := utiltestingapi.MakeWorkload("prod2", ns.Name).Queue(kueue.LocalQueueName(localQueueName)).Request(corev1.ResourceCPU, "5").Obj()
+		wl3 := utiltestingapi.MakeWorkload("prod3", ns.Name).Queue(kueue.LocalQueueName(localQueueName)).Request(corev1.ResourceCPU, "5").Obj()
 
 		ginkgo.By("create the workloads", func() {
 			util.MustCreate(ctx, k8sClient, wl1)
@@ -477,7 +477,7 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 		})
 
 		ginkgo.By("create the local queue to start admission", func() {
-			lq := testing.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
+			lq := utiltestingapi.MakeLocalQueue(localQueueName, ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, lq)
 		})
 
@@ -533,12 +533,12 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 		ginkgo.JustBeforeEach(func() {
 			// Build a standalone cluster queue with just enough capacity for a single workload.
 			// (Avoid using prod/dev queues to avoid borrowing)
-			standaloneClusterQ = testing.MakeClusterQueue("standalone-cq").
-				ResourceGroup(*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj()).
+			standaloneClusterQ = utiltestingapi.MakeClusterQueue("standalone-cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, standaloneClusterQ)
 
-			standaloneQueue = testing.MakeLocalQueue("standalone-queue", ns.Name).ClusterQueue(standaloneClusterQ.Name).Obj()
+			standaloneQueue = utiltestingapi.MakeLocalQueue("standalone-queue", ns.Name).ClusterQueue(standaloneClusterQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, standaloneQueue)
 		})
 
@@ -549,9 +549,9 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReady", func() {
 
 		ginkgo.It("Should prioritize workloads submitted earlier", framework.SlowSpec, func() {
 			// the workloads are created with a 1 cpu resource requirement to ensure only one can fit at a given time
-			wl1 := testing.MakeWorkload("wl-1", ns.Name).Queue(kueue.LocalQueueName(standaloneQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
-			wl2 := testing.MakeWorkload("wl-2", ns.Name).Queue(kueue.LocalQueueName(standaloneQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
-			wl3 := testing.MakeWorkload("wl-3", ns.Name).Queue(kueue.LocalQueueName(standaloneQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl1 := utiltestingapi.MakeWorkload("wl-1", ns.Name).Queue(kueue.LocalQueueName(standaloneQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl2 := utiltestingapi.MakeWorkload("wl-2", ns.Name).Queue(kueue.LocalQueueName(standaloneQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl3 := utiltestingapi.MakeWorkload("wl-3", ns.Name).Queue(kueue.LocalQueueName(standaloneQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 
 			ginkgo.By("create the workloads", func() {
 				util.MustCreate(ctx, k8sClient, wl1)
@@ -619,27 +619,27 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReadyNonblockingMode", func() {
 		}
 		fwk.StartManager(ctx, cfg, managerAndSchedulerSetup(configuration))
 
-		defaultFlavor = testing.MakeResourceFlavor("default").Obj()
+		defaultFlavor = utiltestingapi.MakeResourceFlavor("default").Obj()
 		util.MustCreate(ctx, k8sClient, defaultFlavor)
 
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "podsready-nonblocking-")
 
-		prodClusterQ = testing.MakeClusterQueue("prod-cq").
+		prodClusterQ = utiltestingapi.MakeClusterQueue("prod-cq").
 			Cohort("all").
-			ResourceGroup(*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "5").Obj()).
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, prodClusterQ)
 
-		devClusterQ = testing.MakeClusterQueue("dev-cq").
+		devClusterQ = utiltestingapi.MakeClusterQueue("dev-cq").
 			Cohort("all").
-			ResourceGroup(*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "5").Obj()).
+			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "5").Obj()).
 			Obj()
 		util.MustCreate(ctx, k8sClient, devClusterQ)
 
-		prodQueue = testing.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
+		prodQueue = utiltestingapi.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodClusterQ.Name).Obj()
 		util.MustCreate(ctx, k8sClient, prodQueue)
 
-		devQueue = testing.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devClusterQ.Name).Obj()
+		devQueue = utiltestingapi.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devClusterQ.Name).Obj()
 		util.MustCreate(ctx, k8sClient, devQueue)
 
 		util.ExpectClusterQueuesToBeActive(ctx, k8sClient, prodClusterQ, devClusterQ)
@@ -665,18 +665,18 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReadyNonblockingMode", func() {
 
 		ginkgo.It("Should not block admission of one new workload if two are considered in the same scheduling cycle", func() {
 			ginkgo.By("creating two workloads but delaying cluster queue creation which has enough capacity")
-			prodWl := testing.MakeWorkload("prod-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "11").Obj()
+			prodWl := utiltestingapi.MakeWorkload("prod-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "11").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl)
-			devWl := testing.MakeWorkload("dev-wl", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "11").Obj()
+			devWl := utiltestingapi.MakeWorkload("dev-wl", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "11").Obj()
 			util.MustCreate(ctx, k8sClient, devWl)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, prodWl, devWl)
 
 			ginkgo.By("creating the cluster queue")
 			// Delay cluster queue creation to make sure workloads are in the same
 			// scheduling cycle.
-			testCQ := testing.MakeClusterQueue("test-cq").
+			testCQ := utiltestingapi.MakeClusterQueue("test-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "25", "0").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "25", "0").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, testCQ)
 			defer func() {
@@ -696,7 +696,7 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReadyNonblockingMode", func() {
 
 		ginkgo.It("Should re-admit a timed out workload", func() {
 			ginkgo.By("create the 'prod' workload")
-			prodWl := testing.MakeWorkload("prod", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			prodWl := utiltestingapi.MakeWorkload("prod", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl)
 			ginkgo.By("checking the 'prod' workload is admitted")
 			util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, prodClusterQ.Name, prodWl)
@@ -735,12 +735,12 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReadyNonblockingMode", func() {
 		ginkgo.JustBeforeEach(func() {
 			// Build a standalone cluster queue with just enough capacity for a single workload.
 			// (Avoid using prod/dev queues to avoid borrowing)
-			standaloneClusterQ = testing.MakeClusterQueue("standalone-cq").
-				ResourceGroup(*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj()).
+			standaloneClusterQ = utiltestingapi.MakeClusterQueue("standalone-cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "1").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, standaloneClusterQ)
 
-			standaloneQueue = testing.MakeLocalQueue("standalone-queue", ns.Name).ClusterQueue(standaloneClusterQ.Name).Obj()
+			standaloneQueue = utiltestingapi.MakeLocalQueue("standalone-queue", ns.Name).ClusterQueue(standaloneClusterQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, standaloneQueue)
 		})
 
@@ -751,9 +751,9 @@ var _ = ginkgo.Describe("SchedulerWithWaitForPodsReadyNonblockingMode", func() {
 
 		ginkgo.It("Should keep the evicted workload at the front of the queue", framework.SlowSpec, func() {
 			// the workloads are created with a 1 cpu resource requirement to ensure only one can fit at a given time
-			wl1 := testing.MakeWorkload("wl-1", ns.Name).Queue(kueue.LocalQueueName(standaloneQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
-			wl2 := testing.MakeWorkload("wl-2", ns.Name).Queue(kueue.LocalQueueName(standaloneQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
-			wl3 := testing.MakeWorkload("wl-3", ns.Name).Queue(kueue.LocalQueueName(standaloneQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl1 := utiltestingapi.MakeWorkload("wl-1", ns.Name).Queue(kueue.LocalQueueName(standaloneQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl2 := utiltestingapi.MakeWorkload("wl-2", ns.Name).Queue(kueue.LocalQueueName(standaloneQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl3 := utiltestingapi.MakeWorkload("wl-3", ns.Name).Queue(kueue.LocalQueueName(standaloneQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 
 			ginkgo.By("create the workloads", func() {
 				util.MustCreate(ctx, k8sClient, wl1)
diff --git a/test/integration/singlecluster/scheduler/preemption_test.go b/test/integration/singlecluster/scheduler/preemption_test.go
index 63a0f3d66..6d7fc69ed 100644
--- a/test/integration/singlecluster/scheduler/preemption_test.go
+++ b/test/integration/singlecluster/scheduler/preemption_test.go
@@ -32,7 +32,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/scheduler/preemption"
-	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/pkg/workloadslicing"
 	"sigs.k8s.io/kueue/test/util"
@@ -53,7 +53,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "preemption-")
-		alphaFlavor = testing.MakeResourceFlavor("alpha").Obj()
+		alphaFlavor = utiltestingapi.MakeResourceFlavor("alpha").Obj()
 		util.MustCreate(ctx, k8sClient, alphaFlavor)
 	})
 
@@ -69,15 +69,15 @@ var _ = ginkgo.Describe("Preemption", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			cq = testing.MakeClusterQueue("cq").
-				ResourceGroup(*testing.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "4").Obj()).
+			cq = utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "4").Obj()).
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue: kueue.PreemptionPolicyLowerOrNewerEqualPriority,
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 
-			q = testing.MakeLocalQueue("q", ns.Name).ClusterQueue(cq.Name).Obj()
+			q = utiltestingapi.MakeLocalQueue("q", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, q)
 		})
 
@@ -89,22 +89,22 @@ var _ = ginkgo.Describe("Preemption", func() {
 		ginkgo.It("Should preempt Workloads with lower priority when there is not enough quota", func() {
 			features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.LocalQueueMetrics, true)
 			ginkgo.By("Creating initial Workloads with different priorities")
-			lowWl1 := testing.MakeWorkload("low-wl-1", ns.Name).
+			lowWl1 := utiltestingapi.MakeWorkload("low-wl-1", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Priority(lowPriority).
 				Request(corev1.ResourceCPU, "1").
 				Obj()
-			lowWl2 := testing.MakeWorkload("low-wl-2", ns.Name).
+			lowWl2 := utiltestingapi.MakeWorkload("low-wl-2", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Priority(lowPriority).
 				Request(corev1.ResourceCPU, "1").
 				Obj()
-			midWl := testing.MakeWorkload("mid-wl", ns.Name).
+			midWl := utiltestingapi.MakeWorkload("mid-wl", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Priority(midPriority).
 				Request(corev1.ResourceCPU, "1").
 				Obj()
-			highWl1 := testing.MakeWorkload("high-wl-1", ns.Name).
+			highWl1 := utiltestingapi.MakeWorkload("high-wl-1", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Priority(highPriority).
 				Request(corev1.ResourceCPU, "1").
@@ -117,7 +117,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 			util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, cq.Name, lowWl1, lowWl2, midWl, highWl1)
 
 			ginkgo.By("Creating a low priority Workload")
-			lowWl3 := testing.MakeWorkload("low-wl-3", ns.Name).
+			lowWl3 := utiltestingapi.MakeWorkload("low-wl-3", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Priority(lowPriority).
 				Request(corev1.ResourceCPU, "1").
@@ -127,7 +127,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, lowWl3)
 
 			ginkgo.By("Creating a high priority Workload")
-			highWl2 := testing.MakeWorkload("high-wl-2", ns.Name).
+			highWl2 := utiltestingapi.MakeWorkload("high-wl-2", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Priority(highPriority).
 				Request(corev1.ResourceCPU, "2").
@@ -146,17 +146,17 @@ var _ = ginkgo.Describe("Preemption", func() {
 
 		ginkgo.It("Should preempt newer Workloads with the same priority when there is not enough quota", func() {
 			ginkgo.By("Creating initial Workloads")
-			wl1 := testing.MakeWorkload("wl-1", ns.Name).
+			wl1 := utiltestingapi.MakeWorkload("wl-1", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Priority(lowPriority).
 				Request(corev1.ResourceCPU, "1").
 				Obj()
-			wl2 := testing.MakeWorkload("wl-2", ns.Name).
+			wl2 := utiltestingapi.MakeWorkload("wl-2", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Priority(lowPriority).
 				Request(corev1.ResourceCPU, "1").
 				Obj()
-			wl3 := testing.MakeWorkload("wl-3", ns.Name).
+			wl3 := utiltestingapi.MakeWorkload("wl-3", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Priority(lowPriority).
 				Request(corev1.ResourceCPU, "3").
@@ -169,7 +169,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, wl3)
 			util.WaitForNextSecondAfterCreation(wl3)
 			ginkgo.By("Creating a new Workload")
-			wl4 := testing.MakeWorkload("wl-4", ns.Name).
+			wl4 := utiltestingapi.MakeWorkload("wl-4", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Priority(lowPriority).
 				Request(corev1.ResourceCPU, "1").
@@ -191,7 +191,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 
 		ginkgo.It("Should include job UID in preemption condition when the label is set", func() {
 			ginkgo.By("Creating a low priority Workload")
-			lowWl := testing.MakeWorkload("low", ns.Name).
+			lowWl := utiltestingapi.MakeWorkload("low", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Priority(lowPriority).
 				Request(corev1.ResourceCPU, "4").
@@ -201,7 +201,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 			util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, cq.Name, lowWl)
 
 			ginkgo.By("Creating a high priority Workload with JobUID label")
-			highWl := testing.MakeWorkload("high", ns.Name).
+			highWl := utiltestingapi.MakeWorkload("high", ns.Name).
 				Label(constants.JobUIDLabel, "job-uid").
 				Queue(kueue.LocalQueueName(q.Name)).
 				Priority(highPriority).
@@ -220,36 +220,36 @@ var _ = ginkgo.Describe("Preemption", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			alphaCQ = testing.MakeClusterQueue("alpha-cq").
+			alphaCQ = utiltestingapi.MakeClusterQueue("alpha-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "2").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "2").Obj()).
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, alphaCQ)
-			alphaLQ = testing.MakeLocalQueue("alpha-q", ns.Name).ClusterQueue(alphaCQ.Name).Obj()
+			alphaLQ = utiltestingapi.MakeLocalQueue("alpha-q", ns.Name).ClusterQueue(alphaCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, alphaLQ)
 
-			betaCQ = testing.MakeClusterQueue("beta-cq").
+			betaCQ = utiltestingapi.MakeClusterQueue("beta-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "2").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "2").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, betaCQ)
-			betaLQ = testing.MakeLocalQueue("beta-q", ns.Name).ClusterQueue(betaCQ.Name).Obj()
+			betaLQ = utiltestingapi.MakeLocalQueue("beta-q", ns.Name).ClusterQueue(betaCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, betaLQ)
 
-			gammaCQ = testing.MakeClusterQueue("gamma-cq").
+			gammaCQ = utiltestingapi.MakeClusterQueue("gamma-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "2").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "2").Obj()).
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, gammaCQ)
-			gammaLQ = testing.MakeLocalQueue("gamma-q", ns.Name).ClusterQueue(gammaCQ.Name).Obj()
+			gammaLQ = utiltestingapi.MakeLocalQueue("gamma-q", ns.Name).ClusterQueue(gammaCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, gammaLQ)
 		})
 
@@ -263,20 +263,20 @@ var _ = ginkgo.Describe("Preemption", func() {
 		ginkgo.It("Should preempt Workloads in the cohort borrowing quota, when the ClusterQueue is using less than nominal quota", func() {
 			ginkgo.By("Creating workloads in beta-cq that borrow quota")
 
-			alphaLowWl := testing.MakeWorkload("alpha-low", ns.Name).
+			alphaLowWl := utiltestingapi.MakeWorkload("alpha-low", ns.Name).
 				Queue(kueue.LocalQueueName(alphaLQ.Name)).
 				Priority(lowPriority).
 				Request(corev1.ResourceCPU, "1").
 				Obj()
 			util.MustCreate(ctx, k8sClient, alphaLowWl)
 
-			betaMidWl := testing.MakeWorkload("beta-mid", ns.Name).
+			betaMidWl := utiltestingapi.MakeWorkload("beta-mid", ns.Name).
 				Queue(kueue.LocalQueueName(betaLQ.Name)).
 				Priority(midPriority).
 				Request(corev1.ResourceCPU, "1").
 				Obj()
 			util.MustCreate(ctx, k8sClient, betaMidWl)
-			betaHighWl := testing.MakeWorkload("beta-high", ns.Name).
+			betaHighWl := utiltestingapi.MakeWorkload("beta-high", ns.Name).
 				Queue(kueue.LocalQueueName(betaLQ.Name)).
 				Priority(highPriority).
 				Request(corev1.ResourceCPU, "4").
@@ -287,7 +287,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 			util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, betaCQ.Name, betaMidWl, betaHighWl)
 
 			ginkgo.By("Creating workload in alpha-cq to preempt workloads in both ClusterQueues")
-			alphaMidWl := testing.MakeWorkload("alpha-mid", ns.Name).
+			alphaMidWl := utiltestingapi.MakeWorkload("alpha-mid", ns.Name).
 				Queue(kueue.LocalQueueName(alphaLQ.Name)).
 				Priority(midPriority).
 				Request(corev1.ResourceCPU, "2").
@@ -342,13 +342,13 @@ var _ = ginkgo.Describe("Preemption", func() {
 		ginkgo.It("Should not preempt Workloads in the cohort, if the ClusterQueue requires borrowing", func() {
 			ginkgo.By("Creating workloads in beta-cq that borrow quota")
 
-			alphaHighWl1 := testing.MakeWorkload("alpha-high-1", ns.Name).
+			alphaHighWl1 := utiltestingapi.MakeWorkload("alpha-high-1", ns.Name).
 				Queue(kueue.LocalQueueName(alphaLQ.Name)).
 				Priority(highPriority).
 				Request(corev1.ResourceCPU, "2").
 				Obj()
 			util.MustCreate(ctx, k8sClient, alphaHighWl1)
-			betaLowWl := testing.MakeWorkload("beta-low", ns.Name).
+			betaLowWl := utiltestingapi.MakeWorkload("beta-low", ns.Name).
 				Queue(kueue.LocalQueueName(betaLQ.Name)).
 				Priority(lowPriority).
 				Request(corev1.ResourceCPU, "4").
@@ -359,7 +359,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 			util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, betaCQ.Name, betaLowWl)
 
 			ginkgo.By("Creating high priority workload in alpha-cq that doesn't fit without borrowing")
-			alphaHighWl2 := testing.MakeWorkload("alpha-high-2", ns.Name).
+			alphaHighWl2 := utiltestingapi.MakeWorkload("alpha-high-2", ns.Name).
 				Queue(kueue.LocalQueueName(alphaLQ.Name)).
 				Priority(highPriority).
 				Request(corev1.ResourceCPU, "2").
@@ -375,13 +375,13 @@ var _ = ginkgo.Describe("Preemption", func() {
 		ginkgo.It("Should preempt all necessary workloads in concurrent scheduling with different priorities", func() {
 			ginkgo.By("Creating workloads in beta-cq that borrow quota")
 
-			betaMidWl := testing.MakeWorkload("beta-mid", ns.Name).
+			betaMidWl := utiltestingapi.MakeWorkload("beta-mid", ns.Name).
 				Queue(kueue.LocalQueueName(betaLQ.Name)).
 				Priority(midPriority).
 				Request(corev1.ResourceCPU, "3").
 				Obj()
 			util.MustCreate(ctx, k8sClient, betaMidWl)
-			betaHighWl := testing.MakeWorkload("beta-high", ns.Name).
+			betaHighWl := utiltestingapi.MakeWorkload("beta-high", ns.Name).
 				Queue(kueue.LocalQueueName(betaLQ.Name)).
 				Priority(highPriority).
 				Request(corev1.ResourceCPU, "3").
@@ -391,13 +391,13 @@ var _ = ginkgo.Describe("Preemption", func() {
 			util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, betaCQ.Name, betaMidWl, betaHighWl)
 
 			ginkgo.By("Creating workload in alpha-cq and gamma-cq that need to preempt")
-			alphaMidWl := testing.MakeWorkload("alpha-mid", ns.Name).
+			alphaMidWl := utiltestingapi.MakeWorkload("alpha-mid", ns.Name).
 				Queue(kueue.LocalQueueName(alphaLQ.Name)).
 				Priority(midPriority).
 				Request(corev1.ResourceCPU, "2").
 				Obj()
 
-			gammaMidWl := testing.MakeWorkload("gamma-mid", ns.Name).
+			gammaMidWl := utiltestingapi.MakeWorkload("gamma-mid", ns.Name).
 				Queue(kueue.LocalQueueName(gammaLQ.Name)).
 				Priority(midPriority).
 				Request(corev1.ResourceCPU, "2").
@@ -426,7 +426,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 		ginkgo.It("Should preempt all necessary workloads in concurrent scheduling with the same priority", func() {
 			var betaWls []*kueue.Workload
 			for i := range 3 {
-				wl := testing.MakeWorkload(fmt.Sprintf("beta-%d", i), ns.Name).
+				wl := utiltestingapi.MakeWorkload(fmt.Sprintf("beta-%d", i), ns.Name).
 					Queue(kueue.LocalQueueName(betaLQ.Name)).
 					Request(corev1.ResourceCPU, "2").
 					Obj()
@@ -437,13 +437,13 @@ var _ = ginkgo.Describe("Preemption", func() {
 
 			ginkgo.By("Creating preempting pods")
 
-			alphaWl := testing.MakeWorkload("alpha", ns.Name).
+			alphaWl := utiltestingapi.MakeWorkload("alpha", ns.Name).
 				Queue(kueue.LocalQueueName(alphaLQ.Name)).
 				Request(corev1.ResourceCPU, "2").
 				Obj()
 			util.MustCreate(ctx, k8sClient, alphaWl)
 
-			gammaWl := testing.MakeWorkload("gamma", ns.Name).
+			gammaWl := utiltestingapi.MakeWorkload("gamma", ns.Name).
 				Queue(kueue.LocalQueueName(gammaLQ.Name)).
 				Request(corev1.ResourceCPU, "2").
 				Obj()
@@ -479,32 +479,32 @@ var _ = ginkgo.Describe("Preemption", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			oneFlavor = testing.MakeResourceFlavor("one").Obj()
+			oneFlavor = utiltestingapi.MakeResourceFlavor("one").Obj()
 			util.MustCreate(ctx, k8sClient, oneFlavor)
 
-			alphaCQ = testing.MakeClusterQueue("alpha-cq").
+			alphaCQ = utiltestingapi.MakeClusterQueue("alpha-cq").
 				Cohort("all").
 				QueueingStrategy(kueue.StrictFIFO).
-				ResourceGroup(*testing.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "2").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "2").Obj()).
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, alphaCQ)
-			alphaLQ = testing.MakeLocalQueue("alpha-lq", ns.Name).ClusterQueue("alpha-cq").Obj()
+			alphaLQ = utiltestingapi.MakeLocalQueue("alpha-lq", ns.Name).ClusterQueue("alpha-cq").Obj()
 			util.MustCreate(ctx, k8sClient, alphaLQ)
-			betaCQ = testing.MakeClusterQueue("beta-cq").
+			betaCQ = utiltestingapi.MakeClusterQueue("beta-cq").
 				Cohort("all").
 				QueueingStrategy(kueue.StrictFIFO).
-				ResourceGroup(*testing.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "2").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "2").Obj()).
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, betaCQ)
-			betaLQ = testing.MakeLocalQueue("beta-lq", ns.Name).ClusterQueue("beta-cq").Obj()
+			betaLQ = utiltestingapi.MakeLocalQueue("beta-lq", ns.Name).ClusterQueue("beta-cq").Obj()
 			util.MustCreate(ctx, k8sClient, betaLQ)
 		})
 
@@ -518,7 +518,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 		})
 
 		ginkgo.It("Should reclaim from cohort even if another CQ has pending workloads", func() {
-			useAllAlphaWl := testing.MakeWorkload("use-all", ns.Name).
+			useAllAlphaWl := utiltestingapi.MakeWorkload("use-all", ns.Name).
 				Queue("alpha-lq").
 				Priority(1).
 				Request(corev1.ResourceCPU, "4").
@@ -526,7 +526,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 			util.MustCreate(ctx, k8sClient, useAllAlphaWl)
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, useAllAlphaWl)
 
-			pendingAlphaWl := testing.MakeWorkload("pending", ns.Name).
+			pendingAlphaWl := utiltestingapi.MakeWorkload("pending", ns.Name).
 				Queue("alpha-lq").
 				Priority(0).
 				Request(corev1.ResourceCPU, "1").
@@ -536,7 +536,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 
 			ginkgo.By("Creating a workload to reclaim quota")
 
-			preemptorBetaWl := testing.MakeWorkload("preemptor", ns.Name).
+			preemptorBetaWl := utiltestingapi.MakeWorkload("preemptor", ns.Name).
 				Queue("beta-lq").
 				Priority(-1).
 				Request(corev1.ResourceCPU, "1").
@@ -557,17 +557,17 @@ var _ = ginkgo.Describe("Preemption", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			oneFlavor = testing.MakeResourceFlavor("one").Obj()
+			oneFlavor = utiltestingapi.MakeResourceFlavor("one").Obj()
 			util.MustCreate(ctx, k8sClient, oneFlavor)
 
-			fallbackFlavor = testing.MakeResourceFlavor("fallback").Obj()
+			fallbackFlavor = utiltestingapi.MakeResourceFlavor("fallback").Obj()
 			util.MustCreate(ctx, k8sClient, fallbackFlavor)
 
-			aStandardCQ = testing.MakeClusterQueue("a-standard-cq").
+			aStandardCQ = utiltestingapi.MakeClusterQueue("a-standard-cq").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "1", "10").Obj(),
-					*testing.MakeFlavorQuotas("fallback").Resource(corev1.ResourceCPU, "10", "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "1", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("fallback").Resource(corev1.ResourceCPU, "10", "0").Obj(),
 				).
 				FlavorFungibility(kueue.FlavorFungibility{
 					WhenCanBorrow:  kueue.MayStopSearch,
@@ -582,14 +582,14 @@ var _ = ginkgo.Describe("Preemption", func() {
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, aStandardCQ)
-			aStandardLQ = testing.MakeLocalQueue("a-standard-lq", ns.Name).ClusterQueue(aStandardCQ.Name).Obj()
+			aStandardLQ = utiltestingapi.MakeLocalQueue("a-standard-lq", ns.Name).ClusterQueue(aStandardCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, aStandardLQ)
 
-			aBestEffortCQ = testing.MakeClusterQueue("a-best-effort-cq").
+			aBestEffortCQ = utiltestingapi.MakeClusterQueue("a-best-effort-cq").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "1", "10").Obj(),
-					*testing.MakeFlavorQuotas("fallback").Resource(corev1.ResourceCPU, "10", "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "1", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("fallback").Resource(corev1.ResourceCPU, "10", "0").Obj(),
 				).
 				FlavorFungibility(kueue.FlavorFungibility{
 					WhenCanBorrow:  kueue.MayStopSearch,
@@ -603,14 +603,14 @@ var _ = ginkgo.Describe("Preemption", func() {
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, aBestEffortCQ)
-			aBestEffortLQ = testing.MakeLocalQueue("a-best-effort-lq", ns.Name).ClusterQueue(aBestEffortCQ.Name).Obj()
+			aBestEffortLQ = utiltestingapi.MakeLocalQueue("a-best-effort-lq", ns.Name).ClusterQueue(aBestEffortCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, aBestEffortLQ)
 
-			bBestEffortCQ = testing.MakeClusterQueue("b-best-effort-cq").
+			bBestEffortCQ = utiltestingapi.MakeClusterQueue("b-best-effort-cq").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "1", "10").Obj(),
-					*testing.MakeFlavorQuotas("fallback").Resource(corev1.ResourceCPU, "10", "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "1", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("fallback").Resource(corev1.ResourceCPU, "10", "0").Obj(),
 				).
 				FlavorFungibility(kueue.FlavorFungibility{
 					WhenCanBorrow:  kueue.MayStopSearch,
@@ -624,14 +624,14 @@ var _ = ginkgo.Describe("Preemption", func() {
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, bBestEffortCQ)
-			bBestEffortLQ = testing.MakeLocalQueue("b-best-effort-lq", ns.Name).ClusterQueue(bBestEffortCQ.Name).Obj()
+			bBestEffortLQ = utiltestingapi.MakeLocalQueue("b-best-effort-lq", ns.Name).ClusterQueue(bBestEffortCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, bBestEffortLQ)
 
-			bStandardCQ = testing.MakeClusterQueue("b-standard-cq").
+			bStandardCQ = utiltestingapi.MakeClusterQueue("b-standard-cq").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "1", "10").Obj(),
-					*testing.MakeFlavorQuotas("fallback").Resource(corev1.ResourceCPU, "10", "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "1", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("fallback").Resource(corev1.ResourceCPU, "10", "0").Obj(),
 				).
 				FlavorFungibility(kueue.FlavorFungibility{
 					WhenCanBorrow:  kueue.MayStopSearch,
@@ -646,12 +646,12 @@ var _ = ginkgo.Describe("Preemption", func() {
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, bStandardCQ)
-			bStandardLQ = testing.MakeLocalQueue("b-standard-lq", ns.Name).ClusterQueue(bStandardCQ.Name).Obj()
+			bStandardLQ = utiltestingapi.MakeLocalQueue("b-standard-lq", ns.Name).ClusterQueue(bStandardCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, bStandardLQ)
 
-			sharedCQ = testing.MakeClusterQueue("shared-cq").
+			sharedCQ = utiltestingapi.MakeClusterQueue("shared-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "10").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("one").Resource(corev1.ResourceCPU, "10").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, sharedCQ)
 		})
@@ -669,7 +669,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 
 		ginkgo.It("should allow preempting workloads while borrowing", func() {
 			ginkgo.By("Create a low priority workload which requires borrowing")
-			aBestEffortLowWl := testing.MakeWorkload("a-best-effort-low", ns.Name).
+			aBestEffortLowWl := utiltestingapi.MakeWorkload("a-best-effort-low", ns.Name).
 				Queue(kueue.LocalQueueName(aBestEffortLQ.Name)).
 				Priority(lowPriority).
 				Request(corev1.ResourceCPU, "5").
@@ -678,11 +678,11 @@ var _ = ginkgo.Describe("Preemption", func() {
 
 			ginkgo.By("Await for the a-best-effort-low workload to be admitted")
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, aBestEffortLowWl,
-				testing.MakeAdmission(aBestEffortCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "one", "5").Obj()).Obj(),
+				utiltestingapi.MakeAdmission(aBestEffortCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "one", "5").Obj()).Obj(),
 			)
 
 			ginkgo.By("Create a low priority workload which is not borrowing")
-			bBestEffortLowWl := testing.MakeWorkload("b-best-effort-low", ns.Name).
+			bBestEffortLowWl := utiltestingapi.MakeWorkload("b-best-effort-low", ns.Name).
 				Queue(kueue.LocalQueueName(bBestEffortLQ.Name)).
 				Priority(lowPriority).
 				Request(corev1.ResourceCPU, "1").
@@ -691,11 +691,11 @@ var _ = ginkgo.Describe("Preemption", func() {
 
 			ginkgo.By("Await for the b-best-effort-low workload to be admitted")
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, bBestEffortLowWl,
-				testing.MakeAdmission(bBestEffortCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "one", "1").Obj()).Obj(),
+				utiltestingapi.MakeAdmission(bBestEffortCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "one", "1").Obj()).Obj(),
 			)
 
 			ginkgo.By("Create a high priority workload (above MaxPriorityThreshold) which requires borrowing")
-			bStandardWl := testing.MakeWorkload("b-standard-high", ns.Name).
+			bStandardWl := utiltestingapi.MakeWorkload("b-standard-high", ns.Name).
 				Queue(kueue.LocalQueueName(bStandardLQ.Name)).
 				Priority(highPriority).
 				Request(corev1.ResourceCPU, "5").
@@ -704,11 +704,11 @@ var _ = ginkgo.Describe("Preemption", func() {
 
 			ginkgo.By("Await for the b-standard-high workload to be admitted")
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, bStandardWl,
-				testing.MakeAdmission(bStandardCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "one", "5").Obj()).Obj(),
+				utiltestingapi.MakeAdmission(bStandardCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "one", "5").Obj()).Obj(),
 			)
 
 			ginkgo.By("Create the a-standard-very-high workload")
-			aStandardVeryHighWl := testing.MakeWorkload("a-standard-very-high", ns.Name).
+			aStandardVeryHighWl := utiltestingapi.MakeWorkload("a-standard-very-high", ns.Name).
 				Queue(kueue.LocalQueueName(aStandardLQ.Name)).
 				Priority(veryHighPriority).
 				Request(corev1.ResourceCPU, "7").
@@ -724,22 +724,22 @@ var _ = ginkgo.Describe("Preemption", func() {
 
 			ginkgo.By("Verify the a-standard-very-high workload is admitted")
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, aStandardVeryHighWl,
-				testing.MakeAdmission(aStandardCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "one", "7").Obj()).Obj(),
+				utiltestingapi.MakeAdmission(aStandardCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "one", "7").Obj()).Obj(),
 			)
 
 			ginkgo.By("Verify the a-best-effort-low workload is re-admitted, but using flavor 2")
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, aBestEffortLowWl,
-				testing.MakeAdmission(aBestEffortCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "fallback", "5").Obj()).Obj(),
+				utiltestingapi.MakeAdmission(aBestEffortCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "fallback", "5").Obj()).Obj(),
 			)
 
 			ginkgo.By("Verify the b-standard-high workload remains admitted")
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, bStandardWl,
-				testing.MakeAdmission(bStandardCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "one", "5").Obj()).Obj(),
+				utiltestingapi.MakeAdmission(bStandardCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "one", "5").Obj()).Obj(),
 			)
 
 			ginkgo.By("Verify for the b-best-effort-low workload remains admitted")
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, bBestEffortLowWl,
-				testing.MakeAdmission(bBestEffortCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "one", "1").Obj()).Obj(),
+				utiltestingapi.MakeAdmission(bBestEffortCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "one", "1").Obj()).Obj(),
 			)
 		})
 	})
@@ -759,10 +759,10 @@ var _ = ginkgo.Describe("Preemption", func() {
 		})
 
 		ginkgo.It("Should be able to preempt when lending limit enabled", func() {
-			prodCQ = testing.MakeClusterQueue("prod-cq").
+			prodCQ = utiltestingapi.MakeClusterQueue("prod-cq").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "5", "", "4").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "5", "", "4").Obj(),
 				).
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
@@ -770,34 +770,34 @@ var _ = ginkgo.Describe("Preemption", func() {
 				Obj()
 			util.MustCreate(ctx, k8sClient, prodCQ)
 
-			devCQ = testing.MakeClusterQueue("dev-cq").
+			devCQ = utiltestingapi.MakeClusterQueue("dev-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "5").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "5").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, devCQ)
 
-			prodQueue := testing.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
+			prodQueue := utiltestingapi.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, prodQueue)
 
-			devQueue := testing.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devCQ.Name).Obj()
+			devQueue := utiltestingapi.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, devQueue)
 
 			ginkgo.By("Creating two workloads")
-			wl1 := testing.MakeWorkload("wl-1", ns.Name).Priority(0).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "4").Obj()
-			wl2 := testing.MakeWorkload("wl-2", ns.Name).Priority(1).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
+			wl1 := utiltestingapi.MakeWorkload("wl-1", ns.Name).Priority(0).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "4").Obj()
+			wl2 := utiltestingapi.MakeWorkload("wl-2", ns.Name).Priority(1).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
 			util.MustCreate(ctx, k8sClient, wl2)
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1, wl2)
 
 			ginkgo.By("Creating another workload")
-			wl3 := testing.MakeWorkload("wl-3", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "4").Obj()
+			wl3 := utiltestingapi.MakeWorkload("wl-3", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "4").Obj()
 			util.MustCreate(ctx, k8sClient, wl3)
 			util.ExpectWorkloadsToBePreempted(ctx, k8sClient, wl1)
 
 			util.FinishEvictionForWorkloads(ctx, k8sClient, wl1)
 
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl3,
-				testing.MakeAdmission(prodCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "alpha", "4").Obj()).Obj())
+				utiltestingapi.MakeAdmission(prodCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "alpha", "4").Obj()).Obj())
 		})
 	})
 
@@ -810,13 +810,13 @@ var _ = ginkgo.Describe("Preemption", func() {
 
 		ginkgo.BeforeEach(func() {
 			features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.PrioritySortingWithinCohort, false)
-			defaultFlavor = testing.MakeResourceFlavor("default").Obj()
+			defaultFlavor = utiltestingapi.MakeResourceFlavor("default").Obj()
 			util.MustCreate(ctx, k8sClient, defaultFlavor)
 
-			aCQ = testing.MakeClusterQueue("a-cq").
+			aCQ = utiltestingapi.MakeClusterQueue("a-cq").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0", "10").Obj(),
 				).
 				FlavorFungibility(kueue.FlavorFungibility{
 					WhenCanBorrow:  kueue.MayStopSearch,
@@ -828,13 +828,13 @@ var _ = ginkgo.Describe("Preemption", func() {
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, aCQ)
-			aLQ = testing.MakeLocalQueue("a-lq", ns.Name).ClusterQueue(aCQ.Name).Obj()
+			aLQ = utiltestingapi.MakeLocalQueue("a-lq", ns.Name).ClusterQueue(aCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, aLQ)
 
-			bCQ = testing.MakeClusterQueue("b-cq").
+			bCQ = utiltestingapi.MakeClusterQueue("b-cq").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "5", "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "5", "5").Obj(),
 				).
 				FlavorFungibility(kueue.FlavorFungibility{
 					WhenCanBorrow:  kueue.MayStopSearch,
@@ -850,13 +850,13 @@ var _ = ginkgo.Describe("Preemption", func() {
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, bCQ)
-			bLQ = testing.MakeLocalQueue("b-lq", ns.Name).ClusterQueue(bCQ.Name).Obj()
+			bLQ = utiltestingapi.MakeLocalQueue("b-lq", ns.Name).ClusterQueue(bCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, bLQ)
 
-			cCQ = testing.MakeClusterQueue("c-cq").
+			cCQ = utiltestingapi.MakeClusterQueue("c-cq").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "5").Obj(),
 				).
 				FlavorFungibility(kueue.FlavorFungibility{
 					WhenCanBorrow:  kueue.MayStopSearch,
@@ -882,7 +882,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 			var aWl, b1Wl, b2Wl *kueue.Workload
 
 			ginkgo.By("Create a mid priority workload in aCQ and await for admission", func() {
-				aWl = testing.MakeWorkload("a-low", ns.Name).
+				aWl = utiltestingapi.MakeWorkload("a-low", ns.Name).
 					Queue(kueue.LocalQueueName(aLQ.Name)).
 					Priority(midPriority).
 					Request(corev1.ResourceCPU, "4").
@@ -892,7 +892,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 			})
 
 			ginkgo.By("Create a high priority workload b1 in bCQ and await for admission", func() {
-				b1Wl = testing.MakeWorkload("b1-high", ns.Name).
+				b1Wl = utiltestingapi.MakeWorkload("b1-high", ns.Name).
 					Queue(kueue.LocalQueueName(bLQ.Name)).
 					Priority(highPriority).
 					Request(corev1.ResourceCPU, "4").
@@ -902,7 +902,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 			})
 
 			ginkgo.By("Create a high priority workload b2 in bCQ", func() {
-				b2Wl = testing.MakeWorkload("b2-high", ns.Name).
+				b2Wl = utiltestingapi.MakeWorkload("b2-high", ns.Name).
 					Queue(kueue.LocalQueueName(bLQ.Name)).
 					Priority(highPriority).
 					Request(corev1.ResourceCPU, "4").
@@ -924,20 +924,20 @@ var _ = ginkgo.Describe("Preemption", func() {
 		var defaultFlavor *kueue.ResourceFlavor
 
 		ginkgo.BeforeEach(func() {
-			defaultFlavor = testing.MakeResourceFlavor("default").Obj()
+			defaultFlavor = utiltestingapi.MakeResourceFlavor("default").Obj()
 			gomega.Expect(k8sClient.Create(ctx, defaultFlavor)).To(gomega.Succeed())
 
-			rootCohort = testing.MakeCohort("root").Obj()
+			rootCohort = utiltestingapi.MakeCohort("root").Obj()
 			gomega.Expect(k8sClient.Create(ctx, rootCohort)).To(gomega.Succeed())
-			guaranteedCohort = testing.MakeCohort("guaranteed").Parent("root").
+			guaranteedCohort = utiltestingapi.MakeCohort("guaranteed").Parent("root").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "3").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "3").Obj(),
 				).Obj()
 			gomega.Expect(k8sClient.Create(ctx, guaranteedCohort)).To(gomega.Succeed())
-			bestEffortCQ = testing.MakeClusterQueue("best-effort").
+			bestEffortCQ = utiltestingapi.MakeClusterQueue("best-effort").
 				Cohort("root").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj(),
 				).
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -945,9 +945,9 @@ var _ = ginkgo.Describe("Preemption", func() {
 				}).
 				Obj()
 			gomega.Expect(k8sClient.Create(ctx, bestEffortCQ)).To(gomega.Succeed())
-			guaranteedCQ = testing.MakeClusterQueue("guaranteed").
+			guaranteedCQ = utiltestingapi.MakeClusterQueue("guaranteed").
 				Cohort("guaranteed").ResourceGroup(
-				*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj(),
+				*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU, "0").Obj(),
 			).
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
@@ -971,14 +971,14 @@ var _ = ginkgo.Describe("Preemption", func() {
 			var bestEffortWl, guaranteedWl *kueue.Workload
 
 			ginkgo.By("Create local queues", func() {
-				bestEffortLQ = testing.MakeLocalQueue("best-effort-lq", ns.Name).ClusterQueue(bestEffortCQ.Name).Obj()
+				bestEffortLQ = utiltestingapi.MakeLocalQueue("best-effort-lq", ns.Name).ClusterQueue(bestEffortCQ.Name).Obj()
 				gomega.Expect(k8sClient.Create(ctx, bestEffortLQ)).Should(gomega.Succeed())
-				guaranteedLQ = testing.MakeLocalQueue("guaranteed-lq", ns.Name).ClusterQueue(guaranteedCQ.Name).Obj()
+				guaranteedLQ = utiltestingapi.MakeLocalQueue("guaranteed-lq", ns.Name).ClusterQueue(guaranteedCQ.Name).Obj()
 				gomega.Expect(k8sClient.Create(ctx, guaranteedLQ)).Should(gomega.Succeed())
 			})
 
 			ginkgo.By("Create a workload in bestEffortCQ and await for admission", func() {
-				bestEffortWl = testing.MakeWorkload("best-effort-wl", ns.Name).
+				bestEffortWl = utiltestingapi.MakeWorkload("best-effort-wl", ns.Name).
 					Queue(kueue.LocalQueueName(bestEffortLQ.Name)).
 					Priority(highPriority).
 					Request(corev1.ResourceCPU, "3").
@@ -988,7 +988,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 			})
 
 			ginkgo.By("Create a workload in guaranteedCQ", func() {
-				guaranteedWl = testing.MakeWorkload("guaranteed-wl", ns.Name).
+				guaranteedWl = utiltestingapi.MakeWorkload("guaranteed-wl", ns.Name).
 					Queue(kueue.LocalQueueName(guaranteedLQ.Name)).
 					Priority(midPriority).
 					Request(corev1.ResourceCPU, "3").
@@ -1012,15 +1012,15 @@ var _ = ginkgo.Describe("Preemption", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			cq = testing.MakeClusterQueue("cq").
-				ResourceGroup(*testing.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "2").Obj()).
+			cq = utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU, "2").Obj()).
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue: kueue.PreemptionPolicyLowerOrNewerEqualPriority,
 				}).
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 
-			q = testing.MakeLocalQueue("q", ns.Name).ClusterQueue(cq.Name).Obj()
+			q = utiltestingapi.MakeLocalQueue("q", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, q)
 		})
 
@@ -1032,7 +1032,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 		ginkgo.It("Should preempt on-scale-up Workloads with lower priority when there is not enough quota", func() {
 			features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.ElasticJobsViaWorkloadSlices, true)
 			ginkgo.By("Creating low priority workload")
-			lowWl := testing.MakeWorkload("low", ns.Name).
+			lowWl := utiltestingapi.MakeWorkload("low", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Annotation(workloadslicing.EnabledAnnotationKey, workloadslicing.EnabledAnnotationValue).
 				Priority(lowPriority).
@@ -1042,7 +1042,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 			util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, cq.Name, lowWl)
 
 			ginkgo.By("Creating a high priority workload")
-			highWl := testing.MakeWorkload("high", ns.Name).
+			highWl := utiltestingapi.MakeWorkload("high", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Annotation(workloadslicing.EnabledAnnotationKey, workloadslicing.EnabledAnnotationValue).
 				Priority(highPriority).
@@ -1053,7 +1053,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 
 			ginkgo.By("Scaling up a high priority workload")
 			highWl.Spec.PodSets[0].Count = 2 // Scaled up.
-			highWlScaledUp := testing.MakeWorkload("high-2", ns.Name).
+			highWlScaledUp := utiltestingapi.MakeWorkload("high-2", ns.Name).
 				Queue(kueue.LocalQueueName(q.Name)).
 				Annotation(workloadslicing.EnabledAnnotationKey, workloadslicing.EnabledAnnotationValue).
 				Annotation(workloadslicing.WorkloadSliceReplacementFor, string(workload.Key(highWl))).
diff --git a/test/integration/singlecluster/scheduler/scheduler_test.go b/test/integration/singlecluster/scheduler/scheduler_test.go
index 983bf98bd..ff361cf67 100644
--- a/test/integration/singlecluster/scheduler/scheduler_test.go
+++ b/test/integration/singlecluster/scheduler/scheduler_test.go
@@ -34,6 +34,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/metrics"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/integration/framework"
 	"sigs.k8s.io/kueue/test/util"
@@ -57,13 +58,13 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		util.MustCreate(ctx, k8sClient, cq)
 		cqs = append(cqs, cq)
 
-		lq := testing.MakeLocalQueue(cq.Name, ns.Name).ClusterQueue(cq.Name).Obj()
+		lq := utiltestingapi.MakeLocalQueue(cq.Name, ns.Name).ClusterQueue(cq.Name).Obj()
 		util.MustCreate(ctx, k8sClient, lq)
 		return cq
 	}
 
 	var createWorkloadWithPriority = func(queue kueue.LocalQueueName, cpuRequests string, priority int32) *kueue.Workload {
-		wl := testing.MakeWorkloadWithGeneratedName("workload-", ns.Name).
+		wl := utiltestingapi.MakeWorkloadWithGeneratedName("workload-", ns.Name).
 			Priority(priority).
 			Queue(queue).
 			Request(corev1.ResourceCPU, cpuRequests).Obj()
@@ -75,10 +76,10 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.FlavorFungibility, true)
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-")
 
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").NodeLabel(instanceKey, "on-demand").Obj()
 		util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-		spotTaintedFlavor = testing.MakeResourceFlavor("spot-tainted").
+		spotTaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-tainted").
 			NodeLabel(instanceKey, "spot-tainted").
 			Taint(corev1.Taint{
 				Key:    instanceKey,
@@ -93,7 +94,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			Effect:   corev1.TaintEffectNoSchedule,
 		}
 
-		spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
+		spotUntaintedFlavor = utiltestingapi.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
 	})
 	ginkgo.JustAfterEach(func() {
 		gomega.Expect(util.DeleteNamespace(ctx, k8sClient, ns)).To(gomega.Succeed())
@@ -131,36 +132,36 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			cqsStopPolicy := ptr.Deref(cqsStopPolicy, kueue.None)
 			lqsStopPolicy := ptr.Deref(lqsStopPolicy, kueue.None)
 
-			admissionCheck1 = testing.MakeAdmissionCheck("check1").ControllerName("ctrl").Obj()
+			admissionCheck1 = utiltestingapi.MakeAdmissionCheck("check1").ControllerName("ctrl").Obj()
 			util.MustCreate(ctx, k8sClient, admissionCheck1)
 			util.SetAdmissionCheckActive(ctx, k8sClient, admissionCheck1, metav1.ConditionTrue)
 
-			admissionCheck2 = testing.MakeAdmissionCheck("check2").ControllerName("ctrl").Obj()
+			admissionCheck2 = utiltestingapi.MakeAdmissionCheck("check2").ControllerName("ctrl").Obj()
 			util.MustCreate(ctx, k8sClient, admissionCheck2)
 			util.SetAdmissionCheckActive(ctx, k8sClient, admissionCheck2, metav1.ConditionTrue)
 
-			prodClusterQ = testing.MakeClusterQueue("prod-cq").
+			prodClusterQ = utiltestingapi.MakeClusterQueue("prod-cq").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "5", "5").Obj(),
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "5", "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 				).
 				Cohort("prod-cohort").
 				StopPolicy(cqsStopPolicy).
 				Obj()
 			util.MustCreate(ctx, k8sClient, prodClusterQ)
 
-			devClusterQ = testing.MakeClusterQueue("dev-clusterqueue").
+			devClusterQ = utiltestingapi.MakeClusterQueue("dev-clusterqueue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 				).
 				StopPolicy(cqsStopPolicy).
 				Obj()
 			util.MustCreate(ctx, k8sClient, devClusterQ)
 
-			podsCountClusterQ = testing.MakeClusterQueue("pods-count-cq").
+			podsCountClusterQ = utiltestingapi.MakeClusterQueue("pods-count-cq").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").
+					*utiltestingapi.MakeFlavorQuotas("on-demand").
 						Resource(corev1.ResourceCPU, "100").
 						Resource(corev1.ResourcePods, "5").
 						Obj(),
@@ -169,9 +170,9 @@ var _ = ginkgo.Describe("Scheduler", func() {
 				Obj()
 			util.MustCreate(ctx, k8sClient, podsCountClusterQ)
 
-			podsCountOnlyClusterQ = testing.MakeClusterQueue("pods-count-only-cq").
+			podsCountOnlyClusterQ = utiltestingapi.MakeClusterQueue("pods-count-only-cq").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").
+					*utiltestingapi.MakeFlavorQuotas("on-demand").
 						Resource(corev1.ResourcePods, "5").
 						Obj(),
 				).
@@ -179,9 +180,9 @@ var _ = ginkgo.Describe("Scheduler", func() {
 				Obj()
 			util.MustCreate(ctx, k8sClient, podsCountOnlyClusterQ)
 
-			preemptionClusterQ = testing.MakeClusterQueue("preemption-cq").
+			preemptionClusterQ = utiltestingapi.MakeClusterQueue("preemption-cq").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "3").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "3").Obj(),
 				).
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
@@ -190,46 +191,46 @@ var _ = ginkgo.Describe("Scheduler", func() {
 				Obj()
 			util.MustCreate(ctx, k8sClient, preemptionClusterQ)
 
-			admissionCheckClusterQ = testing.MakeClusterQueue("admission-check-cq").
+			admissionCheckClusterQ = utiltestingapi.MakeClusterQueue("admission-check-cq").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 				).
 				AdmissionChecks("check1", "check2").
 				StopPolicy(cqsStopPolicy).
 				Obj()
 			util.MustCreate(ctx, k8sClient, admissionCheckClusterQ)
 
-			prodQueue = testing.MakeLocalQueue("prod-queue", ns.Name).
+			prodQueue = utiltestingapi.MakeLocalQueue("prod-queue", ns.Name).
 				StopPolicy(lqsStopPolicy).
 				ClusterQueue(prodClusterQ.Name).
 				Obj()
 			util.MustCreate(ctx, k8sClient, prodQueue)
 
-			devQueue = testing.MakeLocalQueue("dev-queue", ns.Name).
+			devQueue = utiltestingapi.MakeLocalQueue("dev-queue", ns.Name).
 				ClusterQueue(devClusterQ.Name).
 				StopPolicy(lqsStopPolicy).
 				Obj()
 			util.MustCreate(ctx, k8sClient, devQueue)
 
-			podsCountQueue = testing.MakeLocalQueue("pods-count-queue", ns.Name).
+			podsCountQueue = utiltestingapi.MakeLocalQueue("pods-count-queue", ns.Name).
 				ClusterQueue(podsCountClusterQ.Name).
 				StopPolicy(lqsStopPolicy).
 				Obj()
 			util.MustCreate(ctx, k8sClient, podsCountQueue)
 
-			podsCountOnlyQueue = testing.MakeLocalQueue("pods-count-only-queue", ns.Name).
+			podsCountOnlyQueue = utiltestingapi.MakeLocalQueue("pods-count-only-queue", ns.Name).
 				ClusterQueue(podsCountOnlyClusterQ.Name).
 				StopPolicy(lqsStopPolicy).
 				Obj()
 			util.MustCreate(ctx, k8sClient, podsCountOnlyQueue)
 
-			preemptionQueue = testing.MakeLocalQueue("preemption-queue", ns.Name).
+			preemptionQueue = utiltestingapi.MakeLocalQueue("preemption-queue", ns.Name).
 				ClusterQueue(preemptionClusterQ.Name).
 				StopPolicy(lqsStopPolicy).
 				Obj()
 			util.MustCreate(ctx, k8sClient, preemptionQueue)
 
-			admissionCheckQueue = testing.MakeLocalQueue("admission-check-queue", ns.Name).
+			admissionCheckQueue = utiltestingapi.MakeLocalQueue("admission-check-queue", ns.Name).
 				ClusterQueue(admissionCheckClusterQ.Name).
 				StopPolicy(lqsStopPolicy).
 				Obj()
@@ -252,9 +253,9 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 		ginkgo.It("Should admit workloads as they fit in their ClusterQueue", framework.SlowSpec, func() {
 			ginkgo.By("checking the first prod workload gets admitted")
-			prodWl1 := testing.MakeWorkload("prod-wl1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			prodWl1 := utiltestingapi.MakeWorkload("prod-wl1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl1)
-			prodWl1Admission := testing.MakeAdmission(prodClusterQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "2").Obj()).Obj()
+			prodWl1Admission := utiltestingapi.MakeAdmission(prodClusterQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "2").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, prodWl1, prodWl1Admission)
 			util.ExpectPendingWorkloadsMetric(prodClusterQ, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(prodClusterQ, 1)
@@ -262,22 +263,22 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectAdmittedWorkloadsTotalMetric(prodClusterQ, "", 1)
 
 			ginkgo.By("checking a second no-fit workload does not get admitted")
-			prodWl2 := testing.MakeWorkload("prod-wl2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
+			prodWl2 := utiltestingapi.MakeWorkload("prod-wl2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
 			util.MustCreate(ctx, k8sClient, prodWl2)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, prodWl2)
 			util.ExpectPendingWorkloadsMetric(prodClusterQ, 0, 1)
 
 			ginkgo.By("checking a workload with replica count 0 gets admitted")
-			emptyWl := testing.MakeWorkload("empty-wl", ns.Name).
+			emptyWl := utiltestingapi.MakeWorkload("empty-wl", ns.Name).
 				Queue(kueue.LocalQueueName(prodQueue.Name)).
-				PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 0).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 0).
 					Request(corev1.ResourceCPU, "1").
 					Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, emptyWl)
 
 			ginkgo.By("checking jobSet with no replica do nopt modify metrics", func() {
-				emptyWlAdmission := testing.MakeAdmission(prodClusterQ.Name).PodSets(
+				emptyWlAdmission := utiltestingapi.MakeAdmission(prodClusterQ.Name).PodSets(
 					kueue.PodSetAssignment{
 						Name: kueue.DefaultPodSetName,
 						Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
@@ -302,9 +303,9 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			})
 
 			ginkgo.By("checking a dev workload gets admitted")
-			devWl := testing.MakeWorkload("dev-wl", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
+			devWl := utiltestingapi.MakeWorkload("dev-wl", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
 			util.MustCreate(ctx, k8sClient, devWl)
-			spotUntaintedFlavorAdmission := testing.MakeAdmission(devClusterQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "spot-untainted", "5").Obj()).Obj()
+			spotUntaintedFlavorAdmission := utiltestingapi.MakeAdmission(devClusterQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "spot-untainted", "5").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, devWl, spotUntaintedFlavorAdmission)
 			util.ExpectPendingWorkloadsMetric(devClusterQ, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(devClusterQ, 1)
@@ -313,7 +314,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 			ginkgo.By("checking the second workload gets admitted when the first workload finishes")
 			util.FinishWorkloads(ctx, k8sClient, prodWl1)
-			prodWl2Admission := testing.MakeAdmission(prodClusterQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "5").Obj()).Obj()
+			prodWl2Admission := utiltestingapi.MakeAdmission(prodClusterQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "5").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, prodWl2, prodWl2Admission)
 			util.ExpectPendingWorkloadsMetric(prodClusterQ, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(prodClusterQ, 1)
@@ -323,17 +324,17 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 		ginkgo.It("Should admit workloads as number of pods allows it", func() {
 			features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.LocalQueueMetrics, true)
-			wl1 := testing.MakeWorkload("wl1", ns.Name).
+			wl1 := utiltestingapi.MakeWorkload("wl1", ns.Name).
 				Queue(kueue.LocalQueueName(podsCountQueue.Name)).
-				PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 3).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					Request(corev1.ResourceCPU, "2").
 					Obj()).
 				Obj()
 
 			ginkgo.By("checking the first workload gets created and admitted", func() {
 				util.MustCreate(ctx, k8sClient, wl1)
-				wl1Admission := testing.MakeAdmission(podsCountClusterQ.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				wl1Admission := utiltestingapi.MakeAdmission(podsCountClusterQ.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "on-demand", "6").
 						Assignment(corev1.ResourcePods, "on-demand", "3").
 						Count(3).
@@ -348,16 +349,16 @@ var _ = ginkgo.Describe("Scheduler", func() {
 				util.ExpectAdmittedWorkloadsTotalMetric(podsCountClusterQ, "", 1)
 			})
 
-			wl2 := testing.MakeWorkload("wl2", ns.Name).
+			wl2 := utiltestingapi.MakeWorkload("wl2", ns.Name).
 				Queue(kueue.LocalQueueName(podsCountQueue.Name)).
-				PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 3).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					Request(corev1.ResourceCPU, "2").
 					Obj()).
 				Obj()
 
-			wl3 := testing.MakeWorkload("wl3", ns.Name).
+			wl3 := utiltestingapi.MakeWorkload("wl3", ns.Name).
 				Queue(kueue.LocalQueueName(podsCountQueue.Name)).
-				PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 2).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).
 					Request(corev1.ResourceCPU, "2").
 					Obj()).
 				Obj()
@@ -392,16 +393,16 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should admit workloads as the number of pods (only) allows it", func() {
-			wl1 := testing.MakeWorkload("wl1", ns.Name).
+			wl1 := utiltestingapi.MakeWorkload("wl1", ns.Name).
 				Queue(kueue.LocalQueueName(podsCountOnlyQueue.Name)).
-				PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 3).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					Obj()).
 				Obj()
 
 			ginkgo.By("checking the first workload gets created and admitted", func() {
 				util.MustCreate(ctx, k8sClient, wl1)
-				wl1Admission := testing.MakeAdmission(podsCountOnlyClusterQ.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				wl1Admission := utiltestingapi.MakeAdmission(podsCountOnlyClusterQ.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourcePods, "on-demand", "3").
 						Count(3).
 						Obj()).
@@ -413,15 +414,15 @@ var _ = ginkgo.Describe("Scheduler", func() {
 				util.ExpectAdmittedWorkloadsTotalMetric(podsCountOnlyClusterQ, "", 1)
 			})
 
-			wl2 := testing.MakeWorkload("wl2", ns.Name).
+			wl2 := utiltestingapi.MakeWorkload("wl2", ns.Name).
 				Queue(kueue.LocalQueueName(podsCountOnlyQueue.Name)).
-				PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 3).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 					Obj()).
 				Obj()
 
-			wl3 := testing.MakeWorkload("wl3", ns.Name).
+			wl3 := utiltestingapi.MakeWorkload("wl3", ns.Name).
 				Queue(kueue.LocalQueueName(podsCountOnlyQueue.Name)).
-				PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 2).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).
 					Obj()).
 				Obj()
 
@@ -453,11 +454,11 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should admit workloads when resources are dynamically reclaimed", func() {
-			firstWl := testing.MakeWorkload("first-wl", ns.Name).Queue(kueue.LocalQueueName(preemptionQueue.Name)).
+			firstWl := utiltestingapi.MakeWorkload("first-wl", ns.Name).Queue(kueue.LocalQueueName(preemptionQueue.Name)).
 				PodSets(
-					*testing.MakePodSet("first", 1).Request(corev1.ResourceCPU, "1").Obj(),
-					*testing.MakePodSet("second", 1).Request(corev1.ResourceCPU, "1").Obj(),
-					*testing.MakePodSet("third", 1).Request(corev1.ResourceCPU, "1").Obj(),
+					*utiltestingapi.MakePodSet("first", 1).Request(corev1.ResourceCPU, "1").Obj(),
+					*utiltestingapi.MakePodSet("second", 1).Request(corev1.ResourceCPU, "1").Obj(),
+					*utiltestingapi.MakePodSet("third", 1).Request(corev1.ResourceCPU, "1").Obj(),
 				).
 				Obj()
 			ginkgo.By("Creating first workload", func() {
@@ -465,21 +466,21 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 				util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, firstWl)
 				util.ExpectPendingWorkloadsMetric(preemptionClusterQ, 0, 0)
-				util.ExpectReservingActiveWorkloadsMetric(preemptionClusterQ, 1)
+				util.ExpectAdmittedWorkloadsTotalMetric(preemptionClusterQ, "", 1)
 			})
 
 			ginkgo.By("Reclaim one pod from the first workload", func() {
 				gomega.Expect(workload.UpdateReclaimablePods(ctx, k8sClient, firstWl, []kueue.ReclaimablePod{{Name: "third", Count: 1}})).To(gomega.Succeed())
 
 				util.ExpectPendingWorkloadsMetric(preemptionClusterQ, 0, 0)
-				util.ExpectReservingActiveWorkloadsMetric(preemptionClusterQ, 1)
+				util.ExpectAdmittedWorkloadsTotalMetric(preemptionClusterQ, "", 1)
 			})
 
-			secondWl := testing.MakeWorkload("second-wl", ns.Name).Queue(kueue.LocalQueueName(preemptionQueue.Name)).
+			secondWl := utiltestingapi.MakeWorkload("second-wl", ns.Name).Queue(kueue.LocalQueueName(preemptionQueue.Name)).
 				PodSets(
-					*testing.MakePodSet("first", 1).Request(corev1.ResourceCPU, "1").Obj(),
-					*testing.MakePodSet("second", 1).Request(corev1.ResourceCPU, "1").Obj(),
-					*testing.MakePodSet("third", 1).Request(corev1.ResourceCPU, "1").Obj(),
+					*utiltestingapi.MakePodSet("first", 1).Request(corev1.ResourceCPU, "1").Obj(),
+					*utiltestingapi.MakePodSet("second", 1).Request(corev1.ResourceCPU, "1").Obj(),
+					*utiltestingapi.MakePodSet("third", 1).Request(corev1.ResourceCPU, "1").Obj(),
 				).
 				Priority(100).
 				Obj()
@@ -502,15 +503,15 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should admit workloads with admission checks", func() {
-			wl1 := testing.MakeWorkload("admission-check-wl1", ns.Name).
+			wl1 := utiltestingapi.MakeWorkload("admission-check-wl1", ns.Name).
 				Queue(kueue.LocalQueueName(admissionCheckQueue.Name)).
 				Request(corev1.ResourceCPU, "2").
 				Obj()
 
 			ginkgo.By("checking the first workload gets created and gets quota reserved", func() {
 				util.MustCreate(ctx, k8sClient, wl1)
-				wl1Admission := testing.MakeAdmission(admissionCheckClusterQ.Name).
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				wl1Admission := utiltestingapi.MakeAdmission(admissionCheckClusterQ.Name).
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, kueue.ResourceFlavorReference(onDemandFlavor.Name), "2").
 						Obj()).
 					Obj()
@@ -532,19 +533,19 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			ginkgo.It("Should admit workloads according to their priorities", func() {
 				const lowPrio, midPrio, highPrio = 0, 10, 100
 
-				wlLow := testing.MakeWorkload("wl-low-priority", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(lowPrio).Obj()
+				wlLow := utiltestingapi.MakeWorkload("wl-low-priority", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(lowPrio).Obj()
 				util.MustCreate(ctx, k8sClient, wlLow)
-				wlMid1 := testing.MakeWorkload("wl-mid-priority-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(midPrio).Obj()
+				wlMid1 := utiltestingapi.MakeWorkload("wl-mid-priority-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(midPrio).Obj()
 				util.MustCreate(ctx, k8sClient, wlMid1)
-				wlMid2 := testing.MakeWorkload("wl-mid-priority-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(midPrio).Obj()
+				wlMid2 := utiltestingapi.MakeWorkload("wl-mid-priority-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(midPrio).Obj()
 				util.MustCreate(ctx, k8sClient, wlMid2)
-				wlHigh1 := testing.MakeWorkload("wl-high-priority-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(highPrio).Obj()
+				wlHigh1 := utiltestingapi.MakeWorkload("wl-high-priority-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(highPrio).Obj()
 				util.MustCreate(ctx, k8sClient, wlHigh1)
-				wlHigh2 := testing.MakeWorkload("wl-high-priority-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(highPrio).Obj()
+				wlHigh2 := utiltestingapi.MakeWorkload("wl-high-priority-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(highPrio).Obj()
 				util.MustCreate(ctx, k8sClient, wlHigh2)
 
 				util.ExpectPendingWorkloadsMetric(prodClusterQ, 0, 5)
-				util.ExpectReservingActiveWorkloadsMetric(prodClusterQ, 0)
+				util.ExpectAdmittedWorkloadsTotalMetric(prodClusterQ, "", 0)
 
 				util.UnholdClusterQueue(ctx, k8sClient, prodClusterQ)
 
@@ -580,19 +581,19 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			ginkgo.It("Should admit workloads according to their priorities", func() {
 				const lowPrio, midPrio, highPrio = 0, 10, 100
 
-				wlLow := testing.MakeWorkload("wl-low-priority", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(lowPrio).Obj()
+				wlLow := utiltestingapi.MakeWorkload("wl-low-priority", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(lowPrio).Obj()
 				util.MustCreate(ctx, k8sClient, wlLow)
-				wlMid1 := testing.MakeWorkload("wl-mid-priority-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(midPrio).Obj()
+				wlMid1 := utiltestingapi.MakeWorkload("wl-mid-priority-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(midPrio).Obj()
 				util.MustCreate(ctx, k8sClient, wlMid1)
-				wlMid2 := testing.MakeWorkload("wl-mid-priority-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(midPrio).Obj()
+				wlMid2 := utiltestingapi.MakeWorkload("wl-mid-priority-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(midPrio).Obj()
 				util.MustCreate(ctx, k8sClient, wlMid2)
-				wlHigh1 := testing.MakeWorkload("wl-high-priority-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(highPrio).Obj()
+				wlHigh1 := utiltestingapi.MakeWorkload("wl-high-priority-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(highPrio).Obj()
 				util.MustCreate(ctx, k8sClient, wlHigh1)
-				wlHigh2 := testing.MakeWorkload("wl-high-priority-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(highPrio).Obj()
+				wlHigh2 := utiltestingapi.MakeWorkload("wl-high-priority-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(highPrio).Obj()
 				util.MustCreate(ctx, k8sClient, wlHigh2)
 
 				util.ExpectPendingWorkloadsMetric(prodClusterQ, 0, 0)
-				util.ExpectReservingActiveWorkloadsMetric(prodClusterQ, 0)
+				util.ExpectAdmittedWorkloadsTotalMetric(prodClusterQ, "", 0)
 
 				util.UnholdLocalQueue(ctx, k8sClient, prodQueue)
 
@@ -619,7 +620,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should admit two small workloads after a big one finishes", func() {
-			bigWl := testing.MakeWorkload("big-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
+			bigWl := utiltestingapi.MakeWorkload("big-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
 			ginkgo.By("Creating big workload")
 			util.MustCreate(ctx, k8sClient, bigWl)
 
@@ -629,15 +630,15 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectQuotaReservedWorkloadsTotalMetric(prodClusterQ, "", 1)
 			util.ExpectAdmittedWorkloadsTotalMetric(prodClusterQ, "", 1)
 
-			smallWl1 := testing.MakeWorkload("small-wl-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2.5").Obj()
-			smallWl2 := testing.MakeWorkload("small-wl-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2.5").Obj()
+			smallWl1 := utiltestingapi.MakeWorkload("small-wl-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2.5").Obj()
+			smallWl2 := utiltestingapi.MakeWorkload("small-wl-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2.5").Obj()
 			ginkgo.By("Creating two small workloads")
 			util.MustCreate(ctx, k8sClient, smallWl1)
 			util.MustCreate(ctx, k8sClient, smallWl2)
 
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, smallWl1, smallWl2)
 			util.ExpectPendingWorkloadsMetric(prodClusterQ, 0, 2)
-			util.ExpectReservingActiveWorkloadsMetric(prodClusterQ, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(prodClusterQ, "", 1)
 
 			ginkgo.By("Marking the big workload as finished")
 			util.FinishWorkloads(ctx, k8sClient, bigWl)
@@ -650,22 +651,22 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Reclaimed resources are not accounted during admission", func() {
-			wl := testing.MakeWorkload("first-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).
-				PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "3").Obj()).
+			wl := utiltestingapi.MakeWorkload("first-wl", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Request(corev1.ResourceCPU, "3").Obj()).
 				Obj()
 			ginkgo.By("Creating the workload", func() {
 				util.MustCreate(ctx, k8sClient, wl)
 
 				util.ExpectWorkloadsToBePending(ctx, k8sClient, wl)
 				util.ExpectPendingWorkloadsMetric(prodClusterQ, 0, 1)
-				util.ExpectReservingActiveWorkloadsMetric(prodClusterQ, 0)
+				util.ExpectAdmittedWorkloadsTotalMetric(prodClusterQ, "", 0)
 			})
 			ginkgo.By("Mark one pod as reclaimable", func() {
 				gomega.Expect(workload.UpdateReclaimablePods(ctx, k8sClient, wl, []kueue.ReclaimablePod{{Name: kueue.DefaultPodSetName, Count: 1}})).To(gomega.Succeed())
 
 				util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, prodClusterQ.Name, wl)
 				util.ExpectPendingWorkloadsMetric(prodClusterQ, 0, 0)
-				util.ExpectReservingActiveWorkloadsMetric(prodClusterQ, 1)
+				util.ExpectAdmittedWorkloadsTotalMetric(prodClusterQ, "", 1)
 
 				createWl := &kueue.Workload{}
 				gomega.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(wl), createWl)).To(gomega.Succeed())
@@ -683,14 +684,14 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		ginkgo.BeforeEach(func() {
 			util.MustCreate(ctx, k8sClient, spotTaintedFlavor)
 
-			cq = testing.MakeClusterQueue("cluster-queue").
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue").
 				Cohort("prod").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "5", "5").Obj(),
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "5", "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 				).Obj()
 			util.MustCreate(ctx, k8sClient, cq)
-			queue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			queue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, queue)
 		})
 
@@ -701,9 +702,9 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 		ginkgo.It("Should re-enqueue by the delete event of workload belonging to the same ClusterQueue", func() {
 			ginkgo.By("First big workload starts")
-			wl1 := testing.MakeWorkload("on-demand-wl1", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "4").Obj()
+			wl1 := utiltestingapi.MakeWorkload("on-demand-wl1", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "4").Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
-			expectWl1Admission := testing.MakeAdmission(cq.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "4").Obj()).Obj()
+			expectWl1Admission := utiltestingapi.MakeAdmission(cq.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "4").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl1, expectWl1Admission)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(cq, 1)
@@ -711,7 +712,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 1)
 
 			ginkgo.By("Second big workload is pending")
-			wl2 := testing.MakeWorkload("on-demand-wl2", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "4").Obj()
+			wl2 := utiltestingapi.MakeWorkload("on-demand-wl2", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "4").Obj()
 			util.MustCreate(ctx, k8sClient, wl2)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, wl2)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 1)
@@ -720,9 +721,9 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 1)
 
 			ginkgo.By("Third small workload starts")
-			wl3 := testing.MakeWorkload("on-demand-wl3", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl3 := utiltestingapi.MakeWorkload("on-demand-wl3", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 			util.MustCreate(ctx, k8sClient, wl3)
-			expectWl3Admission := testing.MakeAdmission(cq.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()).Obj()
+			expectWl3Admission := utiltestingapi.MakeAdmission(cq.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl3, expectWl3Admission)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 1)
 			util.ExpectReservingActiveWorkloadsMetric(cq, 2)
@@ -731,7 +732,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 			ginkgo.By("Second big workload starts after the first one is deleted")
 			gomega.Expect(k8sClient.Delete(ctx, wl1, client.PropagationPolicy(metav1.DeletePropagationBackground))).Should(gomega.Succeed())
-			expectWl2Admission := testing.MakeAdmission(cq.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "4").Obj()).Obj()
+			expectWl2Admission := utiltestingapi.MakeAdmission(cq.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "4").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl2, expectWl2Admission)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(cq, 2)
@@ -740,22 +741,22 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should re-enqueue by the delete event of workload belonging to the same Cohort", func() {
-			fooCQ := testing.MakeClusterQueue("foo-clusterqueue").
+			fooCQ := utiltestingapi.MakeClusterQueue("foo-clusterqueue").
 				Cohort(cq.Spec.Cohort).
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, fooCQ)
 			defer func() {
 				gomega.Expect(util.DeleteObject(ctx, k8sClient, fooCQ)).Should(gomega.Succeed())
 			}()
 
-			fooQ := testing.MakeLocalQueue("foo-queue", ns.Name).ClusterQueue(fooCQ.Name).Obj()
+			fooQ := utiltestingapi.MakeLocalQueue("foo-queue", ns.Name).ClusterQueue(fooCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, fooQ)
 
 			ginkgo.By("First big workload starts")
-			wl1 := testing.MakeWorkload("on-demand-wl1", ns.Name).Queue(kueue.LocalQueueName(fooQ.Name)).Request(corev1.ResourceCPU, "8").Obj()
+			wl1 := utiltestingapi.MakeWorkload("on-demand-wl1", ns.Name).Queue(kueue.LocalQueueName(fooQ.Name)).Request(corev1.ResourceCPU, "8").Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
-			expectAdmission := testing.MakeAdmission(fooCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "8").Obj()).Obj()
+			expectAdmission := utiltestingapi.MakeAdmission(fooCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "8").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl1, expectAdmission)
 			util.ExpectPendingWorkloadsMetric(fooCQ, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(fooCQ, 1)
@@ -763,7 +764,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectAdmittedWorkloadsTotalMetric(fooCQ, "", 1)
 
 			ginkgo.By("Second big workload is pending")
-			wl2 := testing.MakeWorkload("on-demand-wl2", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "8").Obj()
+			wl2 := utiltestingapi.MakeWorkload("on-demand-wl2", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "8").Obj()
 			util.MustCreate(ctx, k8sClient, wl2)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, wl2)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 1)
@@ -772,9 +773,9 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 0)
 
 			ginkgo.By("Third small workload starts")
-			wl3 := testing.MakeWorkload("on-demand-wl3", ns.Name).Queue(kueue.LocalQueueName(fooQ.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			wl3 := utiltestingapi.MakeWorkload("on-demand-wl3", ns.Name).Queue(kueue.LocalQueueName(fooQ.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, wl3)
-			expectAdmission = testing.MakeAdmission(fooCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "2").Obj()).Obj()
+			expectAdmission = utiltestingapi.MakeAdmission(fooCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "2").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl3, expectAdmission)
 			util.ExpectPendingWorkloadsMetric(fooCQ, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(fooCQ, 2)
@@ -783,7 +784,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 			ginkgo.By("Second big workload starts after the first one is deleted")
 			gomega.Expect(k8sClient.Delete(ctx, wl1, client.PropagationPolicy(metav1.DeletePropagationBackground))).Should(gomega.Succeed())
-			expectAdmission = testing.MakeAdmission(cq.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "8").Obj()).Obj()
+			expectAdmission = utiltestingapi.MakeAdmission(cq.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "8").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl2, expectAdmission)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(cq, 1)
@@ -799,11 +800,11 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			cq = testing.MakeClusterQueue("cluster-queue").
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj()).
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
-			queue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			queue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, queue)
 		})
 
@@ -812,7 +813,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 		ginkgo.It("Should re-enqueue by the update event of ClusterQueue", func() {
 			metrics.AdmissionAttemptsTotal.Reset()
-			wl := testing.MakeWorkload("on-demand-wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "6").Obj()
+			wl := utiltestingapi.MakeWorkload("on-demand-wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "6").Obj()
 			util.MustCreate(ctx, k8sClient, wl)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, wl)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 1)
@@ -835,7 +836,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 				g.Expect(k8sClient.Update(ctx, updatedCq)).Should(gomega.Succeed())
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
-			expectAdmission := testing.MakeAdmission(cq.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "6").Obj()).Obj()
+			expectAdmission := utiltestingapi.MakeAdmission(cq.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "6").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl, expectAdmission)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(cq, 1)
@@ -854,7 +855,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			cq = testing.MakeClusterQueue("cluster-queue-with-selector").
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue-with-selector").
 				NamespaceSelector(&metav1.LabelSelector{
 					MatchExpressions: []metav1.LabelSelectorRequirement{
 						{
@@ -864,15 +865,15 @@ var _ = ginkgo.Describe("Scheduler", func() {
 						},
 					},
 				}).
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 
-			queue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			queue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, queue)
 
 			nsFoo = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "foo-")
-			queueFoo = testing.MakeLocalQueue("foo", nsFoo.Name).ClusterQueue(cq.Name).Obj()
+			queueFoo = utiltestingapi.MakeLocalQueue("foo", nsFoo.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, queueFoo)
 		})
 
@@ -882,9 +883,9 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 		ginkgo.It("Should admit workloads from the selected namespaces", func() {
 			ginkgo.By("checking the workloads don't get admitted at first")
-			wl1 := testing.MakeWorkload("wl1", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl1 := utiltestingapi.MakeWorkload("wl1", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
-			wl2 := testing.MakeWorkload("wl2", nsFoo.Name).Queue(kueue.LocalQueueName(queueFoo.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl2 := utiltestingapi.MakeWorkload("wl2", nsFoo.Name).Queue(kueue.LocalQueueName(queueFoo.Name)).Request(corev1.ResourceCPU, "1").Obj()
 			util.MustCreate(ctx, k8sClient, wl2)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, wl1, wl2)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 2)
@@ -910,12 +911,12 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			fooCQ = testing.MakeClusterQueue("foo-cq").
+			fooCQ = utiltestingapi.MakeClusterQueue("foo-cq").
 				QueueingStrategy(kueue.BestEffortFIFO).
-				ResourceGroup(*testing.MakeFlavorQuotas("foo-flavor").Resource(corev1.ResourceCPU, "15").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("foo-flavor").Resource(corev1.ResourceCPU, "15").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, fooCQ)
-			fooQ = testing.MakeLocalQueue("foo-queue", ns.Name).ClusterQueue(fooCQ.Name).Obj()
+			fooQ = utiltestingapi.MakeLocalQueue("foo-queue", ns.Name).ClusterQueue(fooCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, fooQ)
 		})
 
@@ -926,7 +927,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		ginkgo.It("Should be inactive until the flavor is created", func() {
 			ginkgo.By("Creating one workload")
 			util.ExpectClusterQueueStatusMetric(fooCQ, metrics.CQStatusPending)
-			wl := testing.MakeWorkload("workload", ns.Name).Queue(kueue.LocalQueueName(fooQ.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl := utiltestingapi.MakeWorkload("workload", ns.Name).Queue(kueue.LocalQueueName(fooQ.Name)).Request(corev1.ResourceCPU, "1").Obj()
 			util.MustCreate(ctx, k8sClient, wl)
 			util.ExpectWorkloadsToBeFrozen(ctx, k8sClient, fooCQ.Name, wl)
 			util.ExpectPendingWorkloadsMetric(fooCQ, 0, 1)
@@ -935,7 +936,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectAdmittedWorkloadsTotalMetric(fooCQ, "", 0)
 
 			ginkgo.By("Creating foo flavor")
-			fooFlavor := testing.MakeResourceFlavor("foo-flavor").Obj()
+			fooFlavor := utiltestingapi.MakeResourceFlavor("foo-flavor").Obj()
 			util.MustCreate(ctx, k8sClient, fooFlavor)
 			defer func() {
 				gomega.Expect(util.DeleteObject(ctx, k8sClient, fooFlavor)).To(gomega.Succeed())
@@ -958,17 +959,17 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		ginkgo.BeforeEach(func() {
 			util.MustCreate(ctx, k8sClient, spotTaintedFlavor)
 
-			cq = testing.MakeClusterQueue("cluster-queue").
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue").
 				QueueingStrategy(kueue.BestEffortFIFO).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "5", "5").Obj(),
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "5", "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 				).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 
-			queue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			queue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, queue)
 		})
 
@@ -979,10 +980,10 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 		ginkgo.It("Should schedule workloads on tolerated flavors", func() {
 			ginkgo.By("checking a workload without toleration starts on the non-tainted flavor")
-			wl1 := testing.MakeWorkload("on-demand-wl1", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "5").Obj()
+			wl1 := utiltestingapi.MakeWorkload("on-demand-wl1", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "5").Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
 
-			expectAdmission := testing.MakeAdmission(cq.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "5").Obj()).Obj()
+			expectAdmission := utiltestingapi.MakeAdmission(cq.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "5").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl1, expectAdmission)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(cq, 1)
@@ -990,7 +991,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 1)
 
 			ginkgo.By("checking a second workload without toleration doesn't start")
-			wl2 := testing.MakeWorkload("on-demand-wl2", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "5").Obj()
+			wl2 := utiltestingapi.MakeWorkload("on-demand-wl2", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "5").Obj()
 			util.MustCreate(ctx, k8sClient, wl2)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, wl2)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 1)
@@ -999,10 +1000,10 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 1)
 
 			ginkgo.By("checking a third workload with toleration starts")
-			wl3 := testing.MakeWorkload("on-demand-wl3", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Toleration(spotToleration).Request(corev1.ResourceCPU, "5").Obj()
+			wl3 := utiltestingapi.MakeWorkload("on-demand-wl3", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Toleration(spotToleration).Request(corev1.ResourceCPU, "5").Obj()
 			util.MustCreate(ctx, k8sClient, wl3)
 
-			expectAdmission = testing.MakeAdmission(cq.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "spot-tainted", "5").Obj()).Obj()
+			expectAdmission = utiltestingapi.MakeAdmission(cq.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "spot-tainted", "5").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl3, expectAdmission)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 1)
 			util.ExpectReservingActiveWorkloadsMetric(cq, 2)
@@ -1020,14 +1021,14 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		ginkgo.BeforeEach(func() {
 			util.MustCreate(ctx, k8sClient, spotUntaintedFlavor)
 
-			cq = testing.MakeClusterQueue("cluster-queue").
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 				).Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 
-			queue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			queue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, queue)
 		})
 
@@ -1038,9 +1039,9 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 		ginkgo.It("Should admit workloads with affinity to specific flavor", func() {
 			ginkgo.By("checking a workload without affinity gets admitted on the first flavor")
-			wl1 := testing.MakeWorkload("no-affinity-workload", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl1 := utiltestingapi.MakeWorkload("no-affinity-workload", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
-			expectAdmission := testing.MakeAdmission(cq.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "spot-untainted", "1").Obj()).Obj()
+			expectAdmission := utiltestingapi.MakeAdmission(cq.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "spot-untainted", "1").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl1, expectAdmission)
 			util.ExpectReservingActiveWorkloadsMetric(cq, 1)
 			util.ExpectQuotaReservedWorkloadsTotalMetric(cq, "", 1)
@@ -1048,12 +1049,12 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
 
 			ginkgo.By("checking a second workload with affinity to on-demand gets admitted")
-			wl2 := testing.MakeWorkload("affinity-wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).
+			wl2 := utiltestingapi.MakeWorkload("affinity-wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).
 				NodeSelector(map[string]string{instanceKey: onDemandFlavor.Name, "foo": "bar"}).
 				Request(corev1.ResourceCPU, "1").Obj()
 			util.MustCreate(ctx, k8sClient, wl2)
 			gomega.Expect(wl2.Spec.PodSets[0].Template.Spec.NodeSelector).Should(gomega.HaveLen(2))
-			expectAdmission = testing.MakeAdmission(cq.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()).Obj()
+			expectAdmission = utiltestingapi.MakeAdmission(cq.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl2, expectAdmission)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(cq, 2)
@@ -1070,11 +1071,11 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			cq = testing.MakeClusterQueue("cq").
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj()).
+			cq = utiltestingapi.MakeClusterQueue("cq").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj()).
 				Obj()
-			q = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
-			w = testing.MakeWorkload("workload", ns.Name).Queue(kueue.LocalQueueName(q.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			q = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			w = utiltestingapi.MakeWorkload("workload", ns.Name).Queue(kueue.LocalQueueName(q.Name)).Request(corev1.ResourceCPU, "2").Obj()
 		})
 
 		ginkgo.AfterEach(func() {
@@ -1131,19 +1132,19 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should admit workloads using borrowed ClusterQueue", func() {
-			prodCQ = testing.MakeClusterQueue("prod-cq").
+			prodCQ = utiltestingapi.MakeClusterQueue("prod-cq").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "5", "0").Obj(),
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "5", "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 				).Obj()
 			util.MustCreate(ctx, k8sClient, prodCQ)
 
-			queue := testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
+			queue := utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, queue)
 
 			ginkgo.By("checking a no-fit workload does not get admitted")
-			wl := testing.MakeWorkload("wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).
 				Request(corev1.ResourceCPU, "10").Toleration(spotToleration).Obj()
 			util.MustCreate(ctx, k8sClient, wl)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, wl)
@@ -1153,18 +1154,18 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectQuotaReservedWorkloadsTotalMetric(prodCQ, "", 0)
 
 			ginkgo.By("checking the workload gets admitted when a fallback ClusterQueue gets added")
-			fallbackClusterQueue := testing.MakeClusterQueue("fallback-cq").
+			fallbackClusterQueue := utiltestingapi.MakeClusterQueue("fallback-cq").
 				Cohort(prodCQ.Spec.Cohort).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "5").Obj(), // prod-cq can't borrow this due to its borrowingLimit
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "5").Obj(), // prod-cq can't borrow this due to its borrowingLimit
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 				).Obj()
 			util.MustCreate(ctx, k8sClient, fallbackClusterQueue)
 			defer func() {
 				gomega.Expect(util.DeleteObject(ctx, k8sClient, fallbackClusterQueue)).ToNot(gomega.HaveOccurred())
 			}()
 
-			expectAdmission := testing.MakeAdmission(prodCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "10").Obj()).Obj()
+			expectAdmission := utiltestingapi.MakeAdmission(prodCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "10").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl, expectAdmission)
 			util.ExpectPendingWorkloadsMetric(prodCQ, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(prodCQ, 1)
@@ -1173,25 +1174,25 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should schedule workloads borrowing quota from ClusterQueues in the same Cohort", func() {
-			prodCQ = testing.MakeClusterQueue("prod-cq").
+			prodCQ = utiltestingapi.MakeClusterQueue("prod-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "10").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "10").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, prodCQ)
 
-			devCQ = testing.MakeClusterQueue("dev-cq").
+			devCQ = utiltestingapi.MakeClusterQueue("dev-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "10").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "10").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, devCQ)
 
-			prodQueue := testing.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
+			prodQueue := utiltestingapi.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, prodQueue)
 
-			devQueue := testing.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devCQ.Name).Obj()
+			devQueue := utiltestingapi.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, devQueue)
-			wl1 := testing.MakeWorkload("wl-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "11").Obj()
-			wl2 := testing.MakeWorkload("wl-2", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "11").Obj()
+			wl1 := utiltestingapi.MakeWorkload("wl-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "11").Obj()
+			wl2 := utiltestingapi.MakeWorkload("wl-2", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "11").Obj()
 
 			ginkgo.By("Creating two workloads")
 			util.MustCreate(ctx, k8sClient, wl1)
@@ -1208,9 +1209,9 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 			// Delay cluster queue creation to make sure workloads are in the same
 			// scheduling cycle.
-			testCQ := testing.MakeClusterQueue("test-cq").
+			testCQ := utiltestingapi.MakeClusterQueue("test-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "15", "0").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "15", "0").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, testCQ)
 			defer func() {
@@ -1230,34 +1231,34 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should start workloads that are under min quota before borrowing", func() {
-			prodCQ = testing.MakeClusterQueue("prod-cq").
+			prodCQ = utiltestingapi.MakeClusterQueue("prod-cq").
 				Cohort("all").
 				QueueingStrategy(kueue.StrictFIFO).
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "2").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "2").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, prodCQ)
 
-			devCQ = testing.MakeClusterQueue("dev-cq").
+			devCQ = utiltestingapi.MakeClusterQueue("dev-cq").
 				Cohort("all").
 				QueueingStrategy(kueue.StrictFIFO).
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "0").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "0").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, devCQ)
 
-			prodQueue := testing.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
+			prodQueue := utiltestingapi.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, prodQueue)
 
-			devQueue := testing.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devCQ.Name).Obj()
+			devQueue := utiltestingapi.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, devQueue)
 
 			ginkgo.By("Creating the first workload for the prod ClusterQueue")
-			pWl1 := testing.MakeWorkload("p-wl-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			pWl1 := utiltestingapi.MakeWorkload("p-wl-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, pWl1)
 			util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, prodCQ.Name, pWl1)
 
 			ginkgo.By("Creating a workload for each ClusterQueue")
-			dWl1 := testing.MakeWorkload("d-wl-1", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
-			pWl2 := testing.MakeWorkload("p-wl-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
+			dWl1 := utiltestingapi.MakeWorkload("d-wl-1", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			pWl2 := utiltestingapi.MakeWorkload("p-wl-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 			util.MustCreate(ctx, k8sClient, dWl1)
 			util.WaitForNextSecondAfterCreation(dWl1)
 			util.MustCreate(ctx, k8sClient, pWl2)
@@ -1277,12 +1278,12 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should try next flavor if can't preempt on first", func() {
-			prodCQ = testing.MakeClusterQueue("prod-cq").
+			prodCQ = utiltestingapi.MakeClusterQueue("prod-cq").
 				QueueingStrategy(kueue.StrictFIFO).
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "2").Obj(),
-					*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "2").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "2").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "2").Obj()).
 				Preemption(kueue.ClusterQueuePreemption{
 					WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 				}).
@@ -1292,24 +1293,24 @@ var _ = ginkgo.Describe("Scheduler", func() {
 				Obj()
 			util.MustCreate(ctx, k8sClient, prodCQ)
 
-			prodQueue := testing.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
+			prodQueue := utiltestingapi.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, prodQueue)
 
 			ginkgo.By("Creating 2 workloads and ensuring they are admitted")
-			wl1 := testing.MakeWorkload("wl-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
-			wl2 := testing.MakeWorkload("wl-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl1 := utiltestingapi.MakeWorkload("wl-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl2 := utiltestingapi.MakeWorkload("wl-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
 			util.MustCreate(ctx, k8sClient, wl2)
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl1,
-				testing.MakeAdmission(prodCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()).Obj())
+				utiltestingapi.MakeAdmission(prodCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()).Obj())
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl2,
-				testing.MakeAdmission(prodCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()).Obj())
+				utiltestingapi.MakeAdmission(prodCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()).Obj())
 
 			ginkgo.By("Creating an additional workload that can't fit in the first flavor")
-			wl3 := testing.MakeWorkload("wl-3", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
+			wl3 := utiltestingapi.MakeWorkload("wl-3", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 			util.MustCreate(ctx, k8sClient, wl3)
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl3,
-				testing.MakeAdmission(prodCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "spot-untainted", "1").Obj()).Obj())
+				utiltestingapi.MakeAdmission(prodCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "spot-untainted", "1").Obj()).Obj())
 			util.ExpectPendingWorkloadsMetric(prodCQ, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(prodCQ, 3)
 			util.ExpectQuotaReservedWorkloadsTotalMetric(prodCQ, "", 3)
@@ -1317,31 +1318,31 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should try next flavor instead of borrowing", func() {
-			prodCQ = testing.MakeClusterQueue("prod-cq").
+			prodCQ = utiltestingapi.MakeClusterQueue("prod-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "10", "10").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "10", "10").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, prodCQ)
 
-			devCQ = testing.MakeClusterQueue("dev-cq").
+			devCQ = utiltestingapi.MakeClusterQueue("dev-cq").
 				Cohort("all").
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.TryNextFlavor}).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "10", "10").Obj(),
-					*testing.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "11").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "10", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot-tainted").Resource(corev1.ResourceCPU, "11").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, devCQ)
 
-			prodQueue := testing.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
+			prodQueue := utiltestingapi.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, prodQueue)
 
-			devQueue := testing.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devCQ.Name).Obj()
+			devQueue := utiltestingapi.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, devQueue)
 
 			ginkgo.By("Creating one workload")
-			wl1 := testing.MakeWorkload("wl-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "9").Obj()
+			wl1 := utiltestingapi.MakeWorkload("wl-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "9").Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
-			prodWl1Admission := testing.MakeAdmission(prodCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "9").Obj()).Obj()
+			prodWl1Admission := utiltestingapi.MakeAdmission(prodCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "9").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl1, prodWl1Admission)
 			util.ExpectPendingWorkloadsMetric(prodCQ, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(prodCQ, 1)
@@ -1349,9 +1350,9 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectAdmittedWorkloadsTotalMetric(prodCQ, "", 1)
 
 			ginkgo.By("Creating another workload")
-			wl2 := testing.MakeWorkload("wl-2", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "11").Toleration(spotToleration).Obj()
+			wl2 := utiltestingapi.MakeWorkload("wl-2", ns.Name).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "11").Toleration(spotToleration).Obj()
 			util.MustCreate(ctx, k8sClient, wl2)
-			prodWl2Admission := testing.MakeAdmission(devCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "spot-tainted", "11").Obj()).Obj()
+			prodWl2Admission := utiltestingapi.MakeAdmission(devCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "spot-tainted", "11").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl2, prodWl2Admission)
 			util.ExpectPendingWorkloadsMetric(devCQ, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(devCQ, 1)
@@ -1360,11 +1361,11 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should preempt before try next flavor", func() {
-			prodCQ = testing.MakeClusterQueue("prod-cq").
+			prodCQ = utiltestingapi.MakeClusterQueue("prod-cq").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "10", "10").Obj(),
-					*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "11").Obj()).
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "10", "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "11").Obj()).
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				}).
@@ -1372,35 +1373,35 @@ var _ = ginkgo.Describe("Scheduler", func() {
 				Obj()
 			util.MustCreate(ctx, k8sClient, prodCQ)
 
-			devCQ = testing.MakeClusterQueue("dev-cq").
+			devCQ = utiltestingapi.MakeClusterQueue("dev-cq").
 				Cohort("all").
 				FlavorFungibility(kueue.FlavorFungibility{WhenCanBorrow: kueue.TryNextFlavor}).
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "10", "10").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "10", "10").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, devCQ)
 
-			prodQueue := testing.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
+			prodQueue := utiltestingapi.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, prodQueue)
 
-			devQueue := testing.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devCQ.Name).Obj()
+			devQueue := utiltestingapi.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, devQueue)
 
 			ginkgo.By("Creating two workloads")
-			wl1 := testing.MakeWorkload("wl-1", ns.Name).Priority(0).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "9").Obj()
-			wl2 := testing.MakeWorkload("wl-2", ns.Name).Priority(1).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "9").Obj()
+			wl1 := utiltestingapi.MakeWorkload("wl-1", ns.Name).Priority(0).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "9").Obj()
+			wl2 := utiltestingapi.MakeWorkload("wl-2", ns.Name).Priority(1).Queue(kueue.LocalQueueName(devQueue.Name)).Request(corev1.ResourceCPU, "9").Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
 			util.MustCreate(ctx, k8sClient, wl2)
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1, wl2)
 
 			ginkgo.By("Creating another workload")
-			wl3 := testing.MakeWorkload("wl-3", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
+			wl3 := utiltestingapi.MakeWorkload("wl-3", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
 			util.MustCreate(ctx, k8sClient, wl3)
 			util.ExpectWorkloadsToBePreempted(ctx, k8sClient, wl1)
 
 			util.FinishEvictionForWorkloads(ctx, k8sClient, wl1)
 
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl3,
-				testing.MakeAdmission(prodCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "5").Obj()).Obj())
+				utiltestingapi.MakeAdmission(prodCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "5").Obj()).Obj())
 		})
 	})
 
@@ -1418,26 +1419,26 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should admit workload using resources borrowed from cohort", func() {
-			cq = testing.MakeClusterQueue("clusterqueue").
+			cq = utiltestingapi.MakeClusterQueue("clusterqueue").
 				Cohort("cohort").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "0").Obj(),
 				).Obj()
-			queue := testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			queue := utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 			util.MustCreate(ctx, k8sClient, queue)
 
 			ginkgo.By("workload not admitted when Cohort doesn't provide any resources")
-			wl = testing.MakeWorkload("wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).
+			wl = utiltestingapi.MakeWorkload("wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).
 				Request(corev1.ResourceCPU, "10").Obj()
 			util.MustCreate(ctx, k8sClient, wl)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, wl)
 			util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 0)
 
 			ginkgo.By("workload not admitted when Cohort provides too few resources")
-			cohort = testing.MakeCohort("cohort").
+			cohort = utiltestingapi.MakeCohort("cohort").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 				).Obj()
 			util.MustCreate(ctx, k8sClient, cohort)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, wl)
@@ -1449,32 +1450,32 @@ var _ = ginkgo.Describe("Scheduler", func() {
 				cohort.Spec.ResourceGroups[0].Flavors[0].Resources[0].NominalQuota = resource.MustParse("10")
 				g.Expect(k8sClient.Update(ctx, cohort)).Should(gomega.Succeed())
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
-			expectAdmission := testing.MakeAdmission(cq.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "10").Obj()).Obj()
+			expectAdmission := utiltestingapi.MakeAdmission(cq.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "10").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl, expectAdmission)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
 			util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 1)
 		})
 
 		ginkgo.It("Should admit workload when cq switches into cohort with capacity", func() {
-			cq = testing.MakeClusterQueue("clusterqueue").
+			cq = utiltestingapi.MakeClusterQueue("clusterqueue").
 				Cohort("impecunious-cohort").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "0").Obj(),
 				).Obj()
-			queue := testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			queue := utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 			util.MustCreate(ctx, k8sClient, queue)
 
 			ginkgo.By("workload not admitted")
-			wl = testing.MakeWorkload("wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).
+			wl = utiltestingapi.MakeWorkload("wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).
 				Request(corev1.ResourceCPU, "10").Obj()
 			util.MustCreate(ctx, k8sClient, wl)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, wl)
 			util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 0)
 
 			ginkgo.By("cohort created")
-			cohort = testing.MakeCohort("cohort").
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "10").Obj()).Obj()
+			cohort = utiltestingapi.MakeCohort("cohort").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "10").Obj()).Obj()
 			util.MustCreate(ctx, k8sClient, cohort)
 
 			ginkgo.By("cq switches and workload admitted")
@@ -1483,24 +1484,24 @@ var _ = ginkgo.Describe("Scheduler", func() {
 				cq.Spec.Cohort = "cohort"
 				g.Expect(k8sClient.Update(ctx, cq)).Should(gomega.Succeed())
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
-			expectAdmission := testing.MakeAdmission(cq.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "10").Obj()).Obj()
+			expectAdmission := utiltestingapi.MakeAdmission(cq.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "10").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl, expectAdmission)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
 			util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 1)
 		})
 		ginkgo.It("Long distance resource allows workload to be scheduled", func() {
-			cq = testing.MakeClusterQueue("cq").
+			cq = utiltestingapi.MakeClusterQueue("cq").
 				Cohort("left").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "0").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "0").Obj(),
 				).Obj()
-			queue := testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			queue := utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 			util.MustCreate(ctx, k8sClient, queue)
 
 			ginkgo.By("cohorts created")
-			cohortLeft := testing.MakeCohort("left").Parent("root").Obj()
-			cohortRight := testing.MakeCohort("right").Parent("root").Obj()
+			cohortLeft := utiltestingapi.MakeCohort("left").Parent("root").Obj()
+			cohortRight := utiltestingapi.MakeCohort("right").Parent("root").Obj()
 			util.MustCreate(ctx, k8sClient, cohortLeft)
 			util.MustCreate(ctx, k8sClient, cohortRight)
 
@@ -1510,7 +1511,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			//     /
 			//    cq
 			ginkgo.By("workload not admitted")
-			wl = testing.MakeWorkload("wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).
+			wl = utiltestingapi.MakeWorkload("wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).
 				Request(corev1.ResourceCPU, "10").Obj()
 			util.MustCreate(ctx, k8sClient, wl)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, wl)
@@ -1522,12 +1523,12 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			//     /           \
 			//    cq            bank
 			ginkgo.By("cohort with resources created and workload admitted")
-			cohortBank := testing.MakeCohort("bank").Parent("right").
+			cohortBank := utiltestingapi.MakeCohort("bank").Parent("right").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "10").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "10").Obj(),
 				).Obj()
 			util.MustCreate(ctx, k8sClient, cohortBank)
-			expectAdmission := testing.MakeAdmission(cq.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "10").Obj()).Obj()
+			expectAdmission := utiltestingapi.MakeAdmission(cq.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "10").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl, expectAdmission)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
 			util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 1)
@@ -1548,18 +1549,18 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should admit workloads using borrowed ClusterQueue", func() {
-			prodCQ = testing.MakeClusterQueue("prod-cq").
+			prodCQ = utiltestingapi.MakeClusterQueue("prod-cq").
 				Cohort("all").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "", "1").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "", "1").Obj(),
 				).Obj()
 			util.MustCreate(ctx, k8sClient, prodCQ)
 
-			queue := testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
+			queue := utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, queue)
 
 			ginkgo.By("checking a no-fit workload does not get admitted")
-			wl := testing.MakeWorkload("wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).
 				Request(corev1.ResourceCPU, "9").Obj()
 			util.MustCreate(ctx, k8sClient, wl)
 			util.ExpectWorkloadsToBePending(ctx, k8sClient, wl)
@@ -1569,17 +1570,17 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectAdmittedWorkloadsTotalMetric(prodCQ, "", 0)
 
 			ginkgo.By("checking the workload gets admitted when another ClusterQueue gets added")
-			devCQ := testing.MakeClusterQueue("dev-cq").
+			devCQ := utiltestingapi.MakeClusterQueue("dev-cq").
 				Cohort(prodCQ.Spec.Cohort).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "", "4").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "", "4").Obj(),
 				).Obj()
 			util.MustCreate(ctx, k8sClient, devCQ)
 			defer func() {
 				gomega.Expect(util.DeleteObject(ctx, k8sClient, devCQ)).ToNot(gomega.HaveOccurred())
 			}()
 
-			expectAdmission := testing.MakeAdmission(prodCQ.Name).PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "9").Obj()).Obj()
+			expectAdmission := utiltestingapi.MakeAdmission(prodCQ.Name).PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "on-demand", "9").Obj()).Obj()
 			util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, wl, expectAdmission)
 			util.ExpectPendingWorkloadsMetric(prodCQ, 0, 0)
 			util.ExpectReservingActiveWorkloadsMetric(prodCQ, 1)
@@ -1588,26 +1589,26 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should admit workloads after updating lending limit", func() {
-			prodCQ = testing.MakeClusterQueue("prod-cq").
+			prodCQ = utiltestingapi.MakeClusterQueue("prod-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "", "0").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "", "0").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, prodCQ)
 
-			devCQ = testing.MakeClusterQueue("dev-cq").
+			devCQ = utiltestingapi.MakeClusterQueue("dev-cq").
 				Cohort("all").
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "", "0").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "", "0").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, devCQ)
 
-			prodQueue := testing.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
+			prodQueue := utiltestingapi.MakeLocalQueue("prod-queue", ns.Name).ClusterQueue(prodCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, prodQueue)
 
-			devQueue := testing.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devCQ.Name).Obj()
+			devQueue := utiltestingapi.MakeLocalQueue("dev-queue", ns.Name).ClusterQueue(devCQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, devQueue)
 
-			wl1 := testing.MakeWorkload("wl-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
-			wl2 := testing.MakeWorkload("wl-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
+			wl1 := utiltestingapi.MakeWorkload("wl-1", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
+			wl2 := utiltestingapi.MakeWorkload("wl-2", ns.Name).Queue(kueue.LocalQueueName(prodQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
 
 			ginkgo.By("Creating two workloads")
 			util.MustCreate(ctx, k8sClient, wl1)
@@ -1655,7 +1656,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 		ginkgo.BeforeEach(func() {
 			chName = "cohort"
-			strictFIFOClusterQ = testing.MakeClusterQueue("strict-fifo-cq").
+			strictFIFOClusterQ = utiltestingapi.MakeClusterQueue("strict-fifo-cq").
 				QueueingStrategy(kueue.StrictFIFO).
 				NamespaceSelector(&metav1.LabelSelector{
 					MatchExpressions: []metav1.LabelSelectorRequirement{
@@ -1666,7 +1667,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 						},
 					},
 				}).
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "0").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5", "0").Obj()).
 				Cohort(chName).
 				Obj()
 			util.MustCreate(ctx, k8sClient, strictFIFOClusterQ)
@@ -1679,17 +1680,17 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Should schedule workloads by their priority strictly", func() {
-			strictFIFOQueue := testing.MakeLocalQueue("strict-fifo-q", matchingNS.Name).ClusterQueue(strictFIFOClusterQ.Name).Obj()
+			strictFIFOQueue := utiltestingapi.MakeLocalQueue("strict-fifo-q", matchingNS.Name).ClusterQueue(strictFIFOClusterQ.Name).Obj()
 
 			ginkgo.By("Creating workloads")
-			wl1 := testing.MakeWorkload("wl1", matchingNS.Name).
+			wl1 := utiltestingapi.MakeWorkload("wl1", matchingNS.Name).
 				Queue(kueue.LocalQueueName(strictFIFOQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(100).Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
-			wl2 := testing.MakeWorkload("wl2", matchingNS.Name).
+			wl2 := utiltestingapi.MakeWorkload("wl2", matchingNS.Name).
 				Queue(kueue.LocalQueueName(strictFIFOQueue.Name)).Request(corev1.ResourceCPU, "5").Priority(10).Obj()
 			util.MustCreate(ctx, k8sClient, wl2)
 			// wl3 can't be scheduled before wl2 even though there is enough quota.
-			wl3 := testing.MakeWorkload("wl3", matchingNS.Name).
+			wl3 := utiltestingapi.MakeWorkload("wl3", matchingNS.Name).
 				Queue(kueue.LocalQueueName(strictFIFOQueue.Name)).Request(corev1.ResourceCPU, "1").Priority(1).Obj()
 			util.MustCreate(ctx, k8sClient, wl3)
 
@@ -1709,21 +1710,21 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("Workloads not matching namespaceSelector should not block others", func() {
-			notMatchingQueue := testing.MakeLocalQueue("not-matching-queue", ns.Name).ClusterQueue(strictFIFOClusterQ.Name).Obj()
+			notMatchingQueue := utiltestingapi.MakeLocalQueue("not-matching-queue", ns.Name).ClusterQueue(strictFIFOClusterQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, notMatchingQueue)
 
-			matchingQueue := testing.MakeLocalQueue("matching-queue", matchingNS.Name).ClusterQueue(strictFIFOClusterQ.Name).Obj()
+			matchingQueue := utiltestingapi.MakeLocalQueue("matching-queue", matchingNS.Name).ClusterQueue(strictFIFOClusterQ.Name).Obj()
 			util.MustCreate(ctx, k8sClient, matchingQueue)
 
 			ginkgo.By("Creating workloads")
-			wl1 := testing.MakeWorkload("wl1", matchingNS.Name).
+			wl1 := utiltestingapi.MakeWorkload("wl1", matchingNS.Name).
 				Queue(kueue.LocalQueueName(matchingQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(100).Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
-			wl2 := testing.MakeWorkload("wl2", ns.Name).
+			wl2 := utiltestingapi.MakeWorkload("wl2", ns.Name).
 				Queue(kueue.LocalQueueName(notMatchingQueue.Name)).Request(corev1.ResourceCPU, "5").Priority(10).Obj()
 			util.MustCreate(ctx, k8sClient, wl2)
 			// wl2 can't block wl3 from getting scheduled.
-			wl3 := testing.MakeWorkload("wl3", matchingNS.Name).
+			wl3 := utiltestingapi.MakeWorkload("wl3", matchingNS.Name).
 				Queue(kueue.LocalQueueName(matchingQueue.Name)).Request(corev1.ResourceCPU, "1").Priority(1).Obj()
 			util.MustCreate(ctx, k8sClient, wl3)
 
@@ -1734,8 +1735,8 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 		ginkgo.It("Pending workload with StrictFIFO doesn't block other CQ from borrowing from a third CQ", func() {
 			ginkgo.By("Creating ClusterQueues and LocalQueues")
-			cqTeamA := testing.MakeClusterQueue("team-a").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+			cqTeamA := utiltestingapi.MakeClusterQueue("team-a").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 				Cohort(chName).
 				Obj()
 			util.MustCreate(ctx, k8sClient, cqTeamA)
@@ -1744,15 +1745,15 @@ var _ = ginkgo.Describe("Scheduler", func() {
 				util.ExpectObjectToBeDeleted(ctx, k8sClient, cqTeamA, true)
 			}()
 
-			strictFIFOLocalQueue := testing.MakeLocalQueue("strict-fifo-q", matchingNS.Name).ClusterQueue(strictFIFOClusterQ.Name).Obj()
-			lqTeamA := testing.MakeLocalQueue("team-a-lq", matchingNS.Name).ClusterQueue(cqTeamA.Name).Obj()
+			strictFIFOLocalQueue := utiltestingapi.MakeLocalQueue("strict-fifo-q", matchingNS.Name).ClusterQueue(strictFIFOClusterQ.Name).Obj()
+			lqTeamA := utiltestingapi.MakeLocalQueue("team-a-lq", matchingNS.Name).ClusterQueue(cqTeamA.Name).Obj()
 
 			util.MustCreate(ctx, k8sClient, strictFIFOLocalQueue)
 			util.MustCreate(ctx, k8sClient, lqTeamA)
 
-			cqSharedResources := testing.MakeClusterQueue("shared-resources").
+			cqSharedResources := utiltestingapi.MakeClusterQueue("shared-resources").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(onDemandFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+					*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 				Cohort(chName).
 				Obj()
 			util.MustCreate(ctx, k8sClient, cqSharedResources)
@@ -1762,11 +1763,11 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			}()
 
 			ginkgo.By("Creating workloads")
-			admittedWl1 := testing.MakeWorkload("wl", matchingNS.Name).
+			admittedWl1 := utiltestingapi.MakeWorkload("wl", matchingNS.Name).
 				Queue(kueue.LocalQueueName(strictFIFOLocalQueue.Name)).Request(corev1.ResourceCPU, "3").Priority(10).Obj()
 			util.MustCreate(ctx, k8sClient, admittedWl1)
 
-			admittedWl2 := testing.MakeWorkload("player1-a", matchingNS.Name).
+			admittedWl2 := utiltestingapi.MakeWorkload("player1-a", matchingNS.Name).
 				Queue(kueue.LocalQueueName(lqTeamA.Name)).Request(corev1.ResourceCPU, "5").Priority(1).Obj()
 			util.MustCreate(ctx, k8sClient, admittedWl2)
 
@@ -1780,19 +1781,19 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 			// pendingWl exceed nominal+borrowing quota and cannot preempt as priority based
 			// premption within CQ is disabled.
-			pendingWl := testing.MakeWorkload("pending-wl", matchingNS.Name).
+			pendingWl := utiltestingapi.MakeWorkload("pending-wl", matchingNS.Name).
 				Queue(kueue.LocalQueueName(strictFIFOLocalQueue.Name)).Request(corev1.ResourceCPU, "3").Priority(99).Obj()
 			util.MustCreate(ctx, k8sClient, pendingWl)
 
 			// borrowingWL can borrow shared resources, so it should be scheduled even if workloads
 			// in other cluster queues are waiting to reclaim nominal resources.
-			borrowingWl := testing.MakeWorkload("player2-a", matchingNS.Name).
+			borrowingWl := utiltestingapi.MakeWorkload("player2-a", matchingNS.Name).
 				Queue(kueue.LocalQueueName(lqTeamA.Name)).Request(corev1.ResourceCPU, "5").Priority(11).Obj()
 			util.MustCreate(ctx, k8sClient, borrowingWl)
 
 			// blockedWL wants to borrow resources from strictFIFO CQ, but should be blocked
 			// from borrowing because there is a pending workload in strictFIFO CQ.
-			blockedWl := testing.MakeWorkload("player3-a", matchingNS.Name).
+			blockedWl := utiltestingapi.MakeWorkload("player3-a", matchingNS.Name).
 				Queue(kueue.LocalQueueName(lqTeamA.Name)).Request(corev1.ResourceCPU, "1").Priority(10).Obj()
 			util.MustCreate(ctx, k8sClient, blockedWl)
 
@@ -1820,13 +1821,13 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 		ginkgo.It("Should not admit new created workloads", func() {
 			ginkgo.By("Create clusterQueue")
-			cq = testing.MakeClusterQueue("cluster-queue").Obj()
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue").Obj()
 			util.MustCreate(ctx, k8sClient, cq)
-			queue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			queue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, queue)
 
 			ginkgo.By("New created workloads should be admitted")
-			wl1 := testing.MakeWorkload("workload1", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Obj()
+			wl1 := utiltestingapi.MakeWorkload("workload1", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
 			defer func() {
 				gomega.Expect(util.DeleteObject(ctx, k8sClient, wl1)).To(gomega.Succeed())
@@ -1844,7 +1845,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			}, util.ConsistentDuration, util.ShortInterval).Should(gomega.Succeed())
 
 			ginkgo.By("New created workloads should be frozen")
-			wl2 := testing.MakeWorkload("workload2", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Obj()
+			wl2 := utiltestingapi.MakeWorkload("workload2", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Obj()
 			util.MustCreate(ctx, k8sClient, wl2)
 			defer func() {
 				gomega.Expect(util.DeleteObject(ctx, k8sClient, wl2)).To(gomega.Succeed())
@@ -1863,13 +1864,13 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			cq = testing.MakeClusterQueue("cluster-queue").
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj(),
 				).
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
-			queue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			queue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, queue)
 		})
 
@@ -1901,7 +1902,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			lr := lrBuilder.Obj()
 			util.MustCreate(ctx, k8sClient, lr)
 
-			wlBuilder := testing.MakeWorkload("workload", ns.Name).Queue(kueue.LocalQueueName(queue.Name))
+			wlBuilder := utiltestingapi.MakeWorkload("workload", ns.Name).Queue(kueue.LocalQueueName(queue.Name))
 
 			if tp.reqCPU != "" {
 				wlBuilder.Request(corev1.ResourceCPU, tp.reqCPU)
@@ -1943,15 +1944,15 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			cq = testing.MakeClusterQueue("cluster-queue").
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").
+					*utiltestingapi.MakeFlavorQuotas("on-demand").
 						Resource(corev1.ResourceCPU, "5", "5").Obj(),
 				).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
-			queue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			queue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, queue)
 		})
 
@@ -1961,11 +1962,11 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 		ginkgo.It("Should evict workloads when stop policy is drain", func() {
 			ginkgo.By("Creating first workload")
-			wl1 := testing.MakeWorkload("one", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Obj()
+			wl1 := utiltestingapi.MakeWorkload("one", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
-			util.ExpectReservingActiveWorkloadsMetric(cq, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 1)
 
 			ginkgo.By("Stopping the ClusterQueue")
 			var clusterQueue kueue.ClusterQueue
@@ -1997,7 +1998,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.FinishEvictionForWorkloads(ctx, k8sClient, wl1)
 
 			ginkgo.By("Creating another workload")
-			wl2 := testing.MakeWorkload("two", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Obj()
+			wl2 := utiltestingapi.MakeWorkload("two", ns.Name).Queue(kueue.LocalQueueName(queue.Name)).Obj()
 			util.MustCreate(ctx, k8sClient, wl2)
 
 			util.ExpectPendingWorkloadsMetric(cq, 0, 2)
@@ -2025,16 +2026,16 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			cq = testing.MakeClusterQueue("cluster-queue").
+			cq = utiltestingapi.MakeClusterQueue("cluster-queue").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas("on-demand").
+					*utiltestingapi.MakeFlavorQuotas("on-demand").
 						Resource(corev1.ResourceCPU, "5", "5").Obj(),
 				).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 
-			lq = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			lq = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(cq.Name).Obj()
 			util.MustCreate(ctx, k8sClient, lq)
 		})
 
@@ -2044,12 +2045,12 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 		ginkgo.It("Should evict workloads when stop policy is drain", func() {
 			ginkgo.By("Creating first workload")
-			wl1 := testing.MakeWorkload("wl1", ns.Name).Queue(kueue.LocalQueueName(lq.Name)).Obj()
+			wl1 := utiltestingapi.MakeWorkload("wl1", ns.Name).Queue(kueue.LocalQueueName(lq.Name)).Obj()
 			util.MustCreate(ctx, k8sClient, wl1)
 
 			util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
-			util.ExpectReservingActiveWorkloadsMetric(cq, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(cq, "", 1)
 
 			createdLq := &kueue.LocalQueue{}
 
@@ -2112,7 +2113,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.FinishEvictionForWorkloads(ctx, k8sClient, wl1)
 
 			ginkgo.By("Creating second workload")
-			wl2 := testing.MakeWorkload("wl2", ns.Name).Queue(kueue.LocalQueueName(lq.Name)).Obj()
+			wl2 := utiltestingapi.MakeWorkload("wl2", ns.Name).Queue(kueue.LocalQueueName(lq.Name)).Obj()
 			util.MustCreate(ctx, k8sClient, wl2)
 
 			util.ExpectPendingWorkloadsMetric(cq, 0, 0)
@@ -2154,13 +2155,13 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			clusterQueue = testing.MakeClusterQueue("cq").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cq").
 				QueueingStrategy(kueue.StrictFIFO).
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "5").Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 
-			localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 
@@ -2171,10 +2172,10 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		ginkgo.It("Should report pending workloads properly when blocked", func() {
 			var wl1, wl2, wl3 *kueue.Workload
 			ginkgo.By("Create two workloads", func() {
-				wl1 = testing.MakeWorkload("wl1", ns.Name).
+				wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(100).Obj()
 				util.MustCreate(ctx, k8sClient, wl1)
-				wl2 = testing.MakeWorkload("wl2", ns.Name).
+				wl2 = utiltestingapi.MakeWorkload("wl2", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "5").Priority(10).Obj()
 				util.MustCreate(ctx, k8sClient, wl2)
 
@@ -2187,7 +2188,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			})
 
 			ginkgo.By("Create wl3 which is now also pending", func() {
-				wl3 = testing.MakeWorkload("wl3", ns.Name).
+				wl3 = utiltestingapi.MakeWorkload("wl3", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Priority(1).Obj()
 				util.MustCreate(ctx, k8sClient, wl3)
 
@@ -2225,13 +2226,13 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		ginkgo.It("Should allow mutating the requeueingStrategy", func() {
 			var wl1, wl2, wl3 *kueue.Workload
 			ginkgo.By("Create initial set of workloads, verify counters", func() {
-				wl1 = testing.MakeWorkload("wl1", ns.Name).
+				wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "2").Priority(100).Obj()
 				util.MustCreate(ctx, k8sClient, wl1)
-				wl2 = testing.MakeWorkload("wl2", ns.Name).
+				wl2 = utiltestingapi.MakeWorkload("wl2", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "5").Priority(10).Obj()
 				util.MustCreate(ctx, k8sClient, wl2)
-				wl3 = testing.MakeWorkload("wl3", ns.Name).
+				wl3 = utiltestingapi.MakeWorkload("wl3", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Priority(1).Obj()
 				util.MustCreate(ctx, k8sClient, wl3)
 
@@ -2285,7 +2286,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 			var wl4 *kueue.Workload
 			ginkgo.By("Creating workload wl4, verify the counter of pending workloads is incremented", func() {
-				wl4 = testing.MakeWorkload("wl4", ns.Name).
+				wl4 = utiltestingapi.MakeWorkload("wl4", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Priority(1).Obj()
 				util.MustCreate(ctx, k8sClient, wl4)
 
@@ -2314,28 +2315,28 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			cq1 = testing.MakeClusterQueue("cq1").
+			cq1 = utiltestingapi.MakeClusterQueue("cq1").
 				Cohort("cohort").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "1").
 					Resource(corev1.ResourceMemory, "1Gi").
 					Obj(),
 				).Obj()
 			util.MustCreate(ctx, k8sClient, cq1)
 
-			cq2 = testing.MakeClusterQueue("cq2").
+			cq2 = utiltestingapi.MakeClusterQueue("cq2").
 				Cohort("cohort").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "2").
 					Resource(corev1.ResourceMemory, "1Gi").
 					Obj(),
 				).Obj()
 			util.MustCreate(ctx, k8sClient, cq2)
 
-			lq1 = testing.MakeLocalQueue("lq1", ns.Name).ClusterQueue(cq1.Name).Obj()
+			lq1 = utiltestingapi.MakeLocalQueue("lq1", ns.Name).ClusterQueue(cq1.Name).Obj()
 			util.MustCreate(ctx, k8sClient, lq1)
 
-			lq2 = testing.MakeLocalQueue("lq2", ns.Name).ClusterQueue(cq2.Name).Obj()
+			lq2 = utiltestingapi.MakeLocalQueue("lq2", ns.Name).ClusterQueue(cq2.Name).Obj()
 			util.MustCreate(ctx, k8sClient, lq2)
 		})
 
@@ -2346,7 +2347,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 
 		ginkgo.It("shouldn't admit second workload on over admission", func() {
 			ginkgo.By("creating first workload")
-			wl1 := testing.MakeWorkload("wl1", ns.Name).
+			wl1 := utiltestingapi.MakeWorkload("wl1", ns.Name).
 				Queue(kueue.LocalQueueName(lq1.Name)).
 				Request(corev1.ResourceCPU, "2").
 				Request(corev1.ResourceMemory, "2Gi").
@@ -2354,7 +2355,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.MustCreate(ctx, k8sClient, wl1)
 
 			ginkgo.By("creating second workload")
-			wl2 := testing.MakeWorkload("wl2", ns.Name).
+			wl2 := utiltestingapi.MakeWorkload("wl2", ns.Name).
 				Queue(kueue.LocalQueueName(lq2.Name)).
 				Request(corev1.ResourceCPU, "1").
 				Request(corev1.ResourceMemory, "1Gi").
@@ -2394,8 +2395,8 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(cq1), cq1)).Should(gomega.Succeed())
 				cq1.Spec.ResourceGroups = nil
-				cq1Wrapper := &testing.ClusterQueueWrapper{ClusterQueue: *cq1}
-				cq1Wrapper.ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+				cq1Wrapper := &utiltestingapi.ClusterQueueWrapper{ClusterQueue: *cq1}
+				cq1Wrapper.ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "1").
 					Obj(),
 				)
@@ -2435,27 +2436,27 @@ var _ = ginkgo.Describe("Scheduler", func() {
 	})
 	ginkgo.When("Reserving Resources in Cohort", func() {
 		ginkgo.It("foundation-queue allows best-effort queue to use capacity until it is ready to admit next workload", func() {
-			cq1 := createQueue(testing.MakeClusterQueue("foundation-queue").
+			cq1 := createQueue(utiltestingapi.MakeClusterQueue("foundation-queue").
 				Cohort("cohort").
 				QueueingStrategy(kueue.StrictFIFO).
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 				}).
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "2").
 					Obj(),
 				).Obj())
 
-			cq2 := createQueue(testing.MakeClusterQueue("best-effort-queue").
+			cq2 := createQueue(utiltestingapi.MakeClusterQueue("best-effort-queue").
 				Cohort("cohort").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "0").
 					Obj(),
 				).Obj())
 
 			ginkgo.By("creating first foundation workload which admits immediately")
 			createWorkloadWithPriority("foundation-queue", "1", 1000)
-			util.ExpectReservingActiveWorkloadsMetric(cq1, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(cq1, "", 1)
 			util.ExpectPendingWorkloadsMetric(cq1, 0, 0)
 
 			ginkgo.By("creating second foundation workload which cannot admit")
@@ -2467,7 +2468,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			createWorkloadWithPriority("best-effort-queue", "1", 0)
 			createWorkloadWithPriority("best-effort-queue", "1", 0)
 
-			util.ExpectReservingActiveWorkloadsMetric(cq2, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(cq2, "", 1)
 			util.ExpectPendingWorkloadsMetric(cq2, 0, 1)
 
 			ginkgo.By("finish first foundation workload")
@@ -2492,27 +2493,27 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		})
 
 		ginkgo.It("foundation-queue blocks capacity when it is not sure that it can reclaim", func() {
-			cq1 := createQueue(testing.MakeClusterQueue("foundation-queue").
+			cq1 := createQueue(utiltestingapi.MakeClusterQueue("foundation-queue").
 				Cohort("cohort").
 				QueueingStrategy(kueue.StrictFIFO).
 				Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyLowerPriority,
 				}).
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "2").
 					Obj(),
 				).Obj())
 
-			cq2 := createQueue(testing.MakeClusterQueue("best-effort-queue").
+			cq2 := createQueue(utiltestingapi.MakeClusterQueue("best-effort-queue").
 				Cohort("cohort").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "0").
 					Obj(),
 				).Obj())
 
 			ginkgo.By("creating first foundation workload which admits immediately")
 			createWorkloadWithPriority("foundation-queue", "1", 1000)
-			util.ExpectReservingActiveWorkloadsMetric(cq1, 1)
+			util.ExpectAdmittedWorkloadsTotalMetric(cq1, "", 1)
 			util.ExpectPendingWorkloadsMetric(cq1, 0, 0)
 
 			ginkgo.By("creating second foundation workload which cannot admit")
@@ -2547,9 +2548,9 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		)
 
 		ginkgo.BeforeAll(func() {
-			f1 = testing.MakeResourceFlavor("f1").Obj()
+			f1 = utiltestingapi.MakeResourceFlavor("f1").Obj()
 			util.MustCreate(ctx, k8sClient, f1)
-			f2 = testing.MakeResourceFlavor("f2").Obj()
+			f2 = utiltestingapi.MakeResourceFlavor("f2").Obj()
 			util.MustCreate(ctx, k8sClient, f2)
 		})
 
@@ -2572,31 +2573,31 @@ var _ = ginkgo.Describe("Scheduler", func() {
 				fungibility := kueue.FlavorFungibility{WhenCanBorrow: kueue.TryNextFlavor, WhenCanPreempt: kueue.TryNextFlavor}
 				preemption := kueue.ClusterQueuePreemption{WithinClusterQueue: kueue.PreemptionPolicyLowerPriority, ReclaimWithinCohort: kueue.PreemptionPolicyAny, BorrowWithinCohort: &kueue.BorrowWithinCohort{Policy: kueue.BorrowWithinCohortPolicyLowerPriority}}
 
-				cq1 = createQueue(testing.MakeClusterQueue("cq1").
+				cq1 = createQueue(utiltestingapi.MakeClusterQueue("cq1").
 					FlavorFungibility(fungibility).Cohort("cohort").
 					Preemption(preemption).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "0").Obj(),
-						*testing.MakeFlavorQuotas("f2").Resource(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("f2").Resource(corev1.ResourceCPU, "1").Obj(),
 					).Obj())
 
-				cq2 = createQueue(testing.MakeClusterQueue("cq2").Cohort("cohort").
+				cq2 = createQueue(utiltestingapi.MakeClusterQueue("cq2").Cohort("cohort").
 					FlavorFungibility(fungibility).
 					Preemption(preemption).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "1").Obj(),
-						*testing.MakeFlavorQuotas("f2").Resource(corev1.ResourceCPU, "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("f2").Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj())
 
 				cq1LowPriority := createWorkloadWithPriority("cq1", "1", 0)
 				{
-					admission := testing.MakeAdmission("cq1").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f2", "1").Obj()).Obj()
+					admission := utiltestingapi.MakeAdmission("cq1").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f2", "1").Obj()).Obj()
 					util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, cq1LowPriority, admission)
 				}
 
 				cq2HighPriority := createWorkloadWithPriority("cq1", "1", 9999)
 				{
-					admission := testing.MakeAdmission("cq1").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f1", "1").Obj()).Obj()
+					admission := utiltestingapi.MakeAdmission("cq1").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f1", "1").Obj()).Obj()
 					util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, cq2HighPriority, admission)
 				}
 
@@ -2605,7 +2606,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 					util.ExpectWorkloadsToBePreempted(ctx, k8sClient, cq2HighPriority)
 					util.FinishEvictionForWorkloads(ctx, k8sClient, cq2HighPriority)
 
-					admission := testing.MakeAdmission("cq2").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f1", "1").Obj()).Obj()
+					admission := utiltestingapi.MakeAdmission("cq2").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f1", "1").Obj()).Obj()
 					util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, cq2MiddlePriority, admission)
 				}
 
@@ -2613,7 +2614,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 					util.ExpectWorkloadsToBePreempted(ctx, k8sClient, cq1LowPriority)
 					util.FinishEvictionForWorkloads(ctx, k8sClient, cq1LowPriority)
 
-					admission := testing.MakeAdmission("cq1").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f2", "1").Obj()).Obj()
+					admission := utiltestingapi.MakeAdmission("cq1").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f2", "1").Obj()).Obj()
 					util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, cq2HighPriority, admission)
 				}
 			})
@@ -2628,24 +2629,24 @@ var _ = ginkgo.Describe("Scheduler", func() {
 					WhenCanPreempt: kueue.MayStopSearch}
 				preemption := kueue.ClusterQueuePreemption{WithinClusterQueue: kueue.PreemptionPolicyLowerPriority, ReclaimWithinCohort: kueue.PreemptionPolicyAny, BorrowWithinCohort: &kueue.BorrowWithinCohort{Policy: kueue.BorrowWithinCohortPolicyLowerPriority}}
 
-				cq1 = createQueue(testing.MakeClusterQueue("cq1").
+				cq1 = createQueue(utiltestingapi.MakeClusterQueue("cq1").
 					FlavorFungibility(fungibility).Cohort("cohort").
 					Preemption(preemption).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "0").Obj(),
-						*testing.MakeFlavorQuotas("f2").Resource(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("f2").Resource(corev1.ResourceCPU, "1").Obj(),
 					).Obj())
 
-				cq2 = createQueue(testing.MakeClusterQueue("cq2").Cohort("cohort").
+				cq2 = createQueue(utiltestingapi.MakeClusterQueue("cq2").Cohort("cohort").
 					FlavorFungibility(fungibility).
 					Preemption(preemption).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "1").Obj(),
-						*testing.MakeFlavorQuotas("f2").Resource(corev1.ResourceCPU, "0").Obj()).Obj())
+						*utiltestingapi.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("f2").Resource(corev1.ResourceCPU, "0").Obj()).Obj())
 
 				cq1LowPriority := createWorkloadWithPriority("cq1", "1", 0)
 				{
-					admission := testing.MakeAdmission("cq1").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f2", "1").Obj()).Obj()
+					admission := utiltestingapi.MakeAdmission("cq1").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f2", "1").Obj()).Obj()
 					util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, cq1LowPriority, admission)
 				}
 
@@ -2654,10 +2655,10 @@ var _ = ginkgo.Describe("Scheduler", func() {
 					util.ExpectWorkloadsToBePreempted(ctx, k8sClient, cq1LowPriority)
 					util.FinishEvictionForWorkloads(ctx, k8sClient, cq1LowPriority)
 
-					admission := testing.MakeAdmission("cq1").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f2", "1").Obj()).Obj()
+					admission := utiltestingapi.MakeAdmission("cq1").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f2", "1").Obj()).Obj()
 					util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, cq2HighPriority, admission)
 
-					admission = testing.MakeAdmission("cq1").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f1", "1").Obj()).Obj()
+					admission = utiltestingapi.MakeAdmission("cq1").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f1", "1").Obj()).Obj()
 					util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, cq1LowPriority, admission)
 				}
 
@@ -2666,7 +2667,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 					util.ExpectWorkloadsToBePreempted(ctx, k8sClient, cq1LowPriority)
 					util.FinishEvictionForWorkloads(ctx, k8sClient, cq1LowPriority)
 
-					admission := testing.MakeAdmission("cq2").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f1", "1").Obj()).Obj()
+					admission := utiltestingapi.MakeAdmission("cq2").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f1", "1").Obj()).Obj()
 					util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, cq2MiddlePriority, admission)
 				}
 			})
@@ -2676,31 +2677,31 @@ var _ = ginkgo.Describe("Scheduler", func() {
 					WhenCanPreempt: kueue.TryNextFlavor}
 				preemption := kueue.ClusterQueuePreemption{WithinClusterQueue: kueue.PreemptionPolicyLowerPriority, ReclaimWithinCohort: kueue.PreemptionPolicyAny, BorrowWithinCohort: &kueue.BorrowWithinCohort{Policy: kueue.BorrowWithinCohortPolicyLowerPriority}}
 
-				cq1 = createQueue(testing.MakeClusterQueue("cq1").
+				cq1 = createQueue(utiltestingapi.MakeClusterQueue("cq1").
 					FlavorFungibility(fungibility).Cohort("cohort").
 					Preemption(preemption).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "1").Obj(),
-						*testing.MakeFlavorQuotas("f2").Resource(corev1.ResourceCPU, "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("f2").Resource(corev1.ResourceCPU, "0").Obj(),
 					).Obj())
 
-				cq2 = createQueue(testing.MakeClusterQueue("cq2").Cohort("cohort").
+				cq2 = createQueue(utiltestingapi.MakeClusterQueue("cq2").Cohort("cohort").
 					FlavorFungibility(fungibility).
 					Preemption(preemption).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "0").Obj(),
-						*testing.MakeFlavorQuotas("f2").Resource(corev1.ResourceCPU, "1").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("f1").Resource(corev1.ResourceCPU, "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas("f2").Resource(corev1.ResourceCPU, "1").Obj(),
 					).Obj())
 
 				cq1LowPriority := createWorkloadWithPriority("cq1", "1", 0)
 				{
-					admission := testing.MakeAdmission("cq1").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f1", "1").Obj()).Obj()
+					admission := utiltestingapi.MakeAdmission("cq1").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f1", "1").Obj()).Obj()
 					util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, cq1LowPriority, admission)
 				}
 
 				cq2HighPriority := createWorkloadWithPriority("cq1", "1", 9999)
 				{
-					admission := testing.MakeAdmission("cq1").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f2", "1").Obj()).Obj()
+					admission := utiltestingapi.MakeAdmission("cq1").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f2", "1").Obj()).Obj()
 					util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, cq2HighPriority, admission)
 				}
 
@@ -2709,7 +2710,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 					util.ExpectWorkloadsToBePreempted(ctx, k8sClient, cq2HighPriority)
 					util.FinishEvictionForWorkloads(ctx, k8sClient, cq2HighPriority)
 
-					admission := testing.MakeAdmission("cq2").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f2", "1").Obj()).Obj()
+					admission := utiltestingapi.MakeAdmission("cq2").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f2", "1").Obj()).Obj()
 					util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, cq2MiddlePriority, admission)
 				}
 
@@ -2717,7 +2718,7 @@ var _ = ginkgo.Describe("Scheduler", func() {
 					util.ExpectWorkloadsToBePreempted(ctx, k8sClient, cq1LowPriority)
 					util.FinishEvictionForWorkloads(ctx, k8sClient, cq1LowPriority)
 
-					admission := testing.MakeAdmission("cq1").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f1", "1").Obj()).Obj()
+					admission := utiltestingapi.MakeAdmission("cq1").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment(corev1.ResourceCPU, "f1", "1").Obj()).Obj()
 					util.ExpectWorkloadToBeAdmittedAs(ctx, k8sClient, cq2HighPriority, admission)
 				}
 			})
@@ -2727,15 +2728,15 @@ var _ = ginkgo.Describe("Scheduler", func() {
 		ginkgo.It("Should prevent incorrect admission through borrowing after ClusterQueue deletion", func() {
 			ginkgo.By("Creating two ClusterQueues in the same cohort")
 			// ClusterQueue with 8 CPU nominal quota - this will be the lender
-			cq1 := createQueue(testing.MakeClusterQueue("queue-1").
+			cq1 := createQueue(utiltestingapi.MakeClusterQueue("queue-1").
 				Cohort("bug-test").
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "8").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "8").Obj()).
 				Obj())
 
 			// ClusterQueue with 0 CPU nominal quota - this will need to borrow
-			cq2 := createQueue(testing.MakeClusterQueue("queue-2").
+			cq2 := createQueue(utiltestingapi.MakeClusterQueue("queue-2").
 				Cohort("bug-test").
-				ResourceGroup(*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "0").Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "0").Obj()).
 				Obj())
 
 			ginkgo.By("Deleting cluster-queue-1 which has 8 CPU nominal quota")
diff --git a/test/integration/singlecluster/scheduler/workload_controller_test.go b/test/integration/singlecluster/scheduler/workload_controller_test.go
index 1f4701628..ab1dc0b17 100644
--- a/test/integration/singlecluster/scheduler/workload_controller_test.go
+++ b/test/integration/singlecluster/scheduler/workload_controller_test.go
@@ -30,6 +30,7 @@ import (
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/slices"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/integration/framework"
 	"sigs.k8s.io/kueue/test/util"
@@ -56,7 +57,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 
 	ginkgo.BeforeEach(func() {
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "core-workload-")
-		onDemandFlavor = testing.MakeResourceFlavor("on-demand").Obj()
+		onDemandFlavor = utiltestingapi.MakeResourceFlavor("on-demand").Obj()
 	})
 
 	ginkgo.AfterEach(func() {
@@ -79,37 +80,37 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			flavor1 = testing.MakeResourceFlavor(flavorOnDemand).Obj()
+			flavor1 = utiltestingapi.MakeResourceFlavor(flavorOnDemand).Obj()
 			util.MustCreate(ctx, k8sClient, flavor1)
 
-			flavor2 = testing.MakeResourceFlavor(reservationFlavor).Obj()
+			flavor2 = utiltestingapi.MakeResourceFlavor(reservationFlavor).Obj()
 			util.MustCreate(ctx, k8sClient, flavor2)
 
-			check1 = testing.MakeAdmissionCheck("check1").ControllerName("ctrl1").Obj()
+			check1 = utiltestingapi.MakeAdmissionCheck("check1").ControllerName("ctrl1").Obj()
 			util.MustCreate(ctx, k8sClient, check1)
 			util.SetAdmissionCheckActive(ctx, k8sClient, check1, metav1.ConditionTrue)
 
-			check2 = testing.MakeAdmissionCheck("check2").ControllerName("ctrl2").Obj()
+			check2 = utiltestingapi.MakeAdmissionCheck("check2").ControllerName("ctrl2").Obj()
 			util.MustCreate(ctx, k8sClient, check2)
 			util.SetAdmissionCheckActive(ctx, k8sClient, check2, metav1.ConditionTrue)
 
-			check3 = testing.MakeAdmissionCheck("check3").ControllerName("ctrl3").Obj()
+			check3 = utiltestingapi.MakeAdmissionCheck("check3").ControllerName("ctrl3").Obj()
 			util.MustCreate(ctx, k8sClient, check3)
 			util.SetAdmissionCheckActive(ctx, k8sClient, check3, metav1.ConditionTrue)
 
-			clusterQueue = testing.MakeClusterQueue("cluster-queue").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 				AdmissionCheckStrategy(
-					*testing.MakeAdmissionCheckStrategyRule("check1", kueue.ResourceFlavorReference(flavorOnDemand)).Obj(),
-					*testing.MakeAdmissionCheckStrategyRule("check2").Obj(),
-					*testing.MakeAdmissionCheckStrategyRule("check3", kueue.ResourceFlavorReference(reservationFlavor)).Obj()).
+					*utiltestingapi.MakeAdmissionCheckStrategyRule("check1", kueue.ResourceFlavorReference(flavorOnDemand)).Obj(),
+					*utiltestingapi.MakeAdmissionCheckStrategyRule("check2").Obj(),
+					*utiltestingapi.MakeAdmissionCheckStrategyRule("check3", kueue.ResourceFlavorReference(reservationFlavor)).Obj()).
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(reservationFlavor).Resource(resourceGPU, "1", "1").Obj(),
-					*testing.MakeFlavorQuotas(flavorOnDemand).Resource(resourceGPU, "5", "5").Obj()).
+					*utiltestingapi.MakeFlavorQuotas(reservationFlavor).Resource(resourceGPU, "1", "1").Obj(),
+					*utiltestingapi.MakeFlavorQuotas(flavorOnDemand).Resource(resourceGPU, "5", "5").Obj()).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 
@@ -126,7 +127,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 
 		ginkgo.It("the workload should have appropriate AdditionalChecks added", framework.SlowSpec, func() {
 			var realClock = clock.RealClock{}
-			wl := testing.MakeWorkload("wl", ns.Name).
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).
 				Queue("queue").
 				Request(resourceGPU, "3").
 				Obj()
@@ -150,9 +151,9 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sClient.Get(ctx, queueKey, &createdQueue)).To(gomega.Succeed())
 					createdQueue.Spec.AdmissionChecksStrategy.AdmissionChecks = []kueue.AdmissionCheckStrategyRule{
-						*testing.MakeAdmissionCheckStrategyRule("check1", kueue.ResourceFlavorReference(flavorOnDemand)).Obj(),
-						*testing.MakeAdmissionCheckStrategyRule("check2", kueue.ResourceFlavorReference(reservationFlavor)).Obj(),
-						*testing.MakeAdmissionCheckStrategyRule("check3").Obj()}
+						*utiltestingapi.MakeAdmissionCheckStrategyRule("check1", kueue.ResourceFlavorReference(flavorOnDemand)).Obj(),
+						*utiltestingapi.MakeAdmissionCheckStrategyRule("check2", kueue.ResourceFlavorReference(reservationFlavor)).Obj(),
+						*utiltestingapi.MakeAdmissionCheckStrategyRule("check3").Obj()}
 					g.Expect(k8sClient.Update(ctx, &createdQueue)).To(gomega.Succeed())
 					g.Expect(k8sClient.Get(ctx, wlKey, &updatedWl)).To(gomega.Succeed())
 					checks := slices.Map(updatedWl.Status.AdmissionChecks, func(c *kueue.AdmissionCheckState) kueue.AdmissionCheckReference { return c.Name })
@@ -187,13 +188,13 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 
 			runtimeClass = testing.MakeRuntimeClass("kata", "bar-handler").PodOverhead(resources).Obj()
 			util.MustCreate(ctx, k8sClient, runtimeClass)
-			clusterQueue = testing.MakeClusterQueue("clusterqueue").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+			clusterQueue = utiltestingapi.MakeClusterQueue("clusterqueue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "5", "5").Obj()).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -205,7 +206,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 
 		ginkgo.It("Should accumulate RuntimeClass's overhead", func() {
 			ginkgo.By("Create and wait for workload admission", func() {
-				wl = testing.MakeWorkload("one", ns.Name).
+				wl = utiltestingapi.MakeWorkload("one", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).
 					Request(corev1.ResourceCPU, "1").
 					RuntimeClass("kata").
@@ -242,13 +243,13 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 		ginkgo.BeforeEach(func() {
 			util.MustCreate(ctx, k8sClient, onDemandFlavor)
 
-			clusterQueue = testing.MakeClusterQueue("clusterqueue").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+			clusterQueue = utiltestingapi.MakeClusterQueue("clusterqueue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "5", "5").Obj()).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -259,7 +260,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 
 		ginkgo.It("Should not accumulate RuntimeClass's overhead", func() {
 			ginkgo.By("Create and wait for workload admission", func() {
-				wl = testing.MakeWorkload("one", ns.Name).
+				wl = utiltestingapi.MakeWorkload("one", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).
 					Request(corev1.ResourceCPU, "1").
 					RuntimeClass("kata").
@@ -297,13 +298,13 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 			limitRange := testing.MakeLimitRange("limits", ns.Name).WithValue("DefaultRequest", corev1.ResourceCPU, "3").Obj()
 			util.MustCreate(ctx, k8sClient, limitRange)
 			util.MustCreate(ctx, k8sClient, onDemandFlavor)
-			clusterQueue = testing.MakeClusterQueue("clusterqueue").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+			clusterQueue = utiltestingapi.MakeClusterQueue("clusterqueue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "5", "5").Obj()).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -314,7 +315,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 
 		ginkgo.It("Should use the range defined default requests, if provided", func() {
 			ginkgo.By("Create and wait for workload admission", func() {
-				wl = testing.MakeWorkload("one", ns.Name).
+				wl = utiltestingapi.MakeWorkload("one", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).
 					Obj()
 				util.MustCreate(ctx, k8sClient, wl)
@@ -353,7 +354,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 		})
 		ginkgo.It("Should not use the range defined requests, if provided by the workload", func() {
 			ginkgo.By("Create and wait for workload admission", func() {
-				wl = testing.MakeWorkload("one", ns.Name).
+				wl = utiltestingapi.MakeWorkload("one", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).
 					Request(corev1.ResourceCPU, "1").
 					Obj()
@@ -396,13 +397,13 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 	ginkgo.When("the workload defines only resource limits and the LocalQueue is created late", func() {
 		ginkgo.BeforeEach(func() {
 			util.MustCreate(ctx, k8sClient, onDemandFlavor)
-			clusterQueue = testing.MakeClusterQueue("clusterqueue").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+			clusterQueue = utiltestingapi.MakeClusterQueue("clusterqueue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "5", "5").Obj()).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		})
 		ginkgo.AfterEach(func() {
 			gomega.Expect(util.DeleteNamespace(ctx, k8sClient, ns)).To(gomega.Succeed())
@@ -412,7 +413,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 
 		ginkgo.It("The limits should be used as request values", func() {
 			ginkgo.By("Create and wait for workload admission", func() {
-				wl = testing.MakeWorkload("one", ns.Name).
+				wl = utiltestingapi.MakeWorkload("one", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).
 					Limit(corev1.ResourceCPU, "1").
 					Obj()
@@ -455,13 +456,13 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 	ginkgo.When("Resource transformations are applied", func() {
 		ginkgo.BeforeEach(func() {
 			util.MustCreate(ctx, k8sClient, onDemandFlavor)
-			clusterQueue = testing.MakeClusterQueue("clusterqueue").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+			clusterQueue = utiltestingapi.MakeClusterQueue("clusterqueue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "5", "5").Obj()).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 		})
 		ginkgo.AfterEach(func() {
 			gomega.Expect(util.DeleteNamespace(ctx, k8sClient, ns)).To(gomega.Succeed())
@@ -473,7 +474,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 			var wl2 *kueue.Workload
 			ginkgo.By("Create and wait for workload admission", func() {
 				util.MustCreate(ctx, k8sClient, localQueue)
-				wl = testing.MakeWorkload("one", ns.Name).
+				wl = utiltestingapi.MakeWorkload("one", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).
 					Request(pseudoCPU, "1").
 					Obj()
@@ -505,7 +506,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 			})
 
 			ginkgo.By("Create a pending workload and validate its resourceRequests", func() {
-				wl2 = testing.MakeWorkload("two", ns.Name).
+				wl2 = utiltestingapi.MakeWorkload("two", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).
 					Request(pseudoCPU, "2").
 					Obj()
@@ -575,13 +576,13 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 				Obj()
 			util.MustCreate(ctx, k8sClient, runtimeClass)
 			util.MustCreate(ctx, k8sClient, onDemandFlavor)
-			clusterQueue = testing.MakeClusterQueue("clusterqueue").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+			clusterQueue = utiltestingapi.MakeClusterQueue("clusterqueue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "5", "5").Obj()).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -593,7 +594,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 
 		ginkgo.It("Should sync the resource requests with the new overhead", func() {
 			ginkgo.By("Create and wait for the first workload admission", func() {
-				wl = testing.MakeWorkload("one", ns.Name).
+				wl = utiltestingapi.MakeWorkload("one", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).
 					Request(corev1.ResourceCPU, "1").
 					RuntimeClass("kata").
@@ -609,7 +610,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 
 			var wl2 *kueue.Workload
 			ginkgo.By("Create a second workload, should stay pending", func() {
-				wl2 = testing.MakeWorkload("two", ns.Name).
+				wl2 = utiltestingapi.MakeWorkload("two", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).
 					Request(corev1.ResourceCPU, "1").
 					RuntimeClass("kata").
@@ -665,13 +666,13 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 			limitRange = testing.MakeLimitRange("limits", ns.Name).WithValue("DefaultRequest", corev1.ResourceCPU, "3").Obj()
 			util.MustCreate(ctx, k8sClient, limitRange)
 			util.MustCreate(ctx, k8sClient, onDemandFlavor)
-			clusterQueue = testing.MakeClusterQueue("clusterqueue").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+			clusterQueue = utiltestingapi.MakeClusterQueue("clusterqueue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "5", "5").Obj()).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -682,7 +683,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 
 		ginkgo.It("Should sync the resource requests with the limit", func() {
 			ginkgo.By("Create and wait for the first workload admission", func() {
-				wl = testing.MakeWorkload("one", ns.Name).
+				wl = utiltestingapi.MakeWorkload("one", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).
 					Obj()
 				util.MustCreate(ctx, k8sClient, wl)
@@ -696,7 +697,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 
 			var wl2 *kueue.Workload
 			ginkgo.By("Create a second workload, should stay pending", func() {
-				wl2 = testing.MakeWorkload("two", ns.Name).
+				wl2 = utiltestingapi.MakeWorkload("two", ns.Name).
 					Queue(kueue.LocalQueueName(localQueue.Name)).
 					Obj()
 				util.MustCreate(ctx, k8sClient, wl2)
@@ -751,13 +752,13 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 			limitRange = testing.MakeLimitRange("limits", ns.Name).WithValue("DefaultRequest", corev1.ResourceCPU, "3").Obj()
 			util.MustCreate(ctx, k8sClient, limitRange)
 			util.MustCreate(ctx, k8sClient, onDemandFlavor)
-			clusterQueue = testing.MakeClusterQueue("clusterqueue").
-				ResourceGroup(*testing.MakeFlavorQuotas(onDemandFlavor.Name).
+			clusterQueue = utiltestingapi.MakeClusterQueue("clusterqueue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas(onDemandFlavor.Name).
 					Resource(corev1.ResourceCPU, "5", "5").Obj()).
 				Cohort("cohort").
 				Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
-			localQueue = testing.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+			localQueue = utiltestingapi.MakeLocalQueue("queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 			util.MustCreate(ctx, k8sClient, localQueue)
 		})
 		ginkgo.AfterEach(func() {
@@ -786,7 +787,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 			ginkgo.It("Should not consume resources", func() {
 				var wl *kueue.Workload
 				ginkgo.By("Create the workload", func() {
-					wl = testing.MakeWorkload("one", ns.Name).
+					wl = utiltestingapi.MakeWorkload("one", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).
 						Request(corev1.ResourceCPU, "1").
 						Obj()
@@ -809,7 +810,7 @@ var _ = ginkgo.Describe("Workload controller with scheduler", func() {
 			ginkgo.It("Should not consume resources", func() {
 				var wl *kueue.Workload
 				ginkgo.By("Create the workload", func() {
-					wl = testing.MakeWorkload("one", ns.Name).
+					wl = utiltestingapi.MakeWorkload("one", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).
 						Request(corev1.ResourceCPU, "7").
 						Obj()
diff --git a/test/integration/singlecluster/tas/tas_test.go b/test/integration/singlecluster/tas/tas_test.go
index 09f969267..2473d8d45 100644
--- a/test/integration/singlecluster/tas/tas_test.go
+++ b/test/integration/singlecluster/tas/tas_test.go
@@ -41,6 +41,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/util/admissioncheck"
 	utiltas "sigs.k8s.io/kueue/pkg/util/tas"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/integration/framework"
@@ -83,7 +84,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 		ginkgo.When("ResourceFlavor does not exist", func() {
 			ginkgo.BeforeEach(func() {
-				topology = testing.MakeDefaultOneLevelTopology("topology")
+				topology = utiltestingapi.MakeDefaultOneLevelTopology("topology")
 				util.MustCreate(ctx, k8sClient, topology)
 			})
 
@@ -94,17 +95,17 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 		ginkgo.When("ResourceFlavor exists", func() {
 			ginkgo.BeforeEach(func() {
-				tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+				tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 					NodeLabel("node-group", "tas").
 					TopologyName("topology").Obj()
 				util.MustCreate(ctx, k8sClient, tasFlavor)
 
-				topology = testing.MakeDefaultOneLevelTopology("topology")
+				topology = utiltestingapi.MakeDefaultOneLevelTopology("topology")
 				util.MustCreate(ctx, k8sClient, topology)
 
-				clusterQueue = testing.MakeClusterQueue("cq").
+				clusterQueue = utiltestingapi.MakeClusterQueue("cq").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas(tasFlavor.Name).
+						*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).
 							Resource(corev1.ResourceCPU, "5").
 							Obj(),
 					).Obj()
@@ -143,14 +144,14 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 	ginkgo.When("Negative scenarios for ResourceFlavor configuration", func() {
 		ginkgo.It("should not allow to create ResourceFlavor with invalid topology name", func() {
-			tasFlavor := testing.MakeResourceFlavor("tas-flavor").
+			tasFlavor := utiltestingapi.MakeResourceFlavor("tas-flavor").
 				NodeLabel("node-group", "tas").
 				TopologyName("invalid topology name").Obj()
 			gomega.Expect(k8sClient.Create(ctx, tasFlavor)).Should(gomega.HaveOccurred())
 		})
 
 		ginkgo.It("should not allow to create ResourceFlavor without any node labels", func() {
-			tasFlavor := testing.MakeResourceFlavor("tas-flavor").TopologyName("default").Obj()
+			tasFlavor := utiltestingapi.MakeResourceFlavor("tas-flavor").TopologyName("default").Obj()
 			gomega.Expect(k8sClient.Create(ctx, tasFlavor)).Should(gomega.HaveOccurred())
 		})
 	})
@@ -159,7 +160,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 		var tasFlavor *kueue.ResourceFlavor
 
 		ginkgo.BeforeEach(func() {
-			tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+			tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 				TopologyName("default").
 				NodeLabel("node-group", "tas").
 				NodeLabel("foo", "bar").
@@ -220,10 +221,10 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 		)
 
 		ginkgo.BeforeEach(func() {
-			topology = testing.MakeDefaultTwoLevelTopology("default")
+			topology = utiltestingapi.MakeDefaultTwoLevelTopology("default")
 			util.MustCreate(ctx, k8sClient, topology)
 
-			tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+			tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 				NodeLabel("node-group", "tas").
 				TopologyName("default").Obj()
 			util.MustCreate(ctx, k8sClient, tasFlavor)
@@ -237,13 +238,13 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 		})
 
 		ginkgo.It("should mark TAS ClusterQueue as inactive if used with MultiKueue", func() {
-			admissionCheck = testing.MakeAdmissionCheck("multikueue").ControllerName(kueue.MultiKueueControllerName).Obj()
+			admissionCheck = utiltestingapi.MakeAdmissionCheck("multikueue").ControllerName(kueue.MultiKueueControllerName).Obj()
 			util.MustCreate(ctx, k8sClient, admissionCheck)
 			util.SetAdmissionCheckActive(ctx, k8sClient, admissionCheck, metav1.ConditionTrue)
 
-			clusterQueue = testing.MakeClusterQueue("cq").
+			clusterQueue = utiltestingapi.MakeClusterQueue("cq").
 				ResourceGroup(
-					*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj(),
+					*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj(),
 				).AdmissionChecks(kueue.AdmissionCheckReference(admissionCheck.Name)).Obj()
 			util.MustCreate(ctx, k8sClient, clusterQueue)
 
@@ -324,21 +325,21 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				}
 				util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-				topology = testing.MakeDefaultTwoLevelTopology("default")
+				topology = utiltestingapi.MakeDefaultTwoLevelTopology("default")
 				util.MustCreate(ctx, k8sClient, topology)
 
-				tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+				tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 					NodeLabel("node-group", "tas").
 					TopologyName("default").Obj()
 				util.MustCreate(ctx, k8sClient, tasFlavor)
 
-				clusterQueue = testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+				clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 					Obj()
 				util.MustCreate(ctx, k8sClient, clusterQueue)
 				util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-				localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+				localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 				util.MustCreate(ctx, k8sClient, localQueue)
 			})
 
@@ -366,7 +367,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 			ginkgo.It("should not admit workload which does not fit to the required topology domain", func() {
 				ginkgo.By("creating a workload which requires rack, but does not fit in any", func() {
-					wl1 := testing.MakeWorkload("wl1-inadmissible", ns.Name).
+					wl1 := utiltestingapi.MakeWorkload("wl1-inadmissible", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
 					wl1.Spec.PodSets[0].TopologyRequest = &kueue.PodSetTopologyRequest{
 						Required: ptr.To(testing.DefaultRackTopologyLevel),
@@ -382,7 +383,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 			ginkgo.It("should admit workload which fits in a required topology domain", func() {
 				var wl1, wl2, wl3, wl4 *kueue.Workload
 				ginkgo.By("creating a workload which requires block and can fit", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 					wl1.Spec.PodSets[0].Count = 2
 					wl1.Spec.PodSets[0].TopologyRequest = &kueue.PodSetTopologyRequest{
@@ -393,7 +394,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the workload is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 				})
 
 				ginkgo.By("verify admission for the workload1", func() {
@@ -425,7 +426,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				})
 
 				ginkgo.By("creating the second workload to see it lands on another rack", func() {
-					wl2 = testing.MakeWorkload("wl2", ns.Name).
+					wl2 = utiltestingapi.MakeWorkload("wl2", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 					wl2.Spec.PodSets[0].TopologyRequest = &kueue.PodSetTopologyRequest{
 						Required: ptr.To(testing.DefaultRackTopologyLevel),
@@ -435,7 +436,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the workload is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1, wl2)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 2)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 2)
 				})
 
 				ginkgo.By("verify admission for the workload2", func() {
@@ -460,7 +461,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				})
 
 				ginkgo.By("creating the wl3", func() {
-					wl3 = testing.MakeWorkload("wl3", ns.Name).
+					wl3 = utiltestingapi.MakeWorkload("wl3", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 					wl3.Spec.PodSets[0].TopologyRequest = &kueue.PodSetTopologyRequest{
 						Required: ptr.To(testing.DefaultRackTopologyLevel),
@@ -470,7 +471,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the wl3 is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1, wl2, wl3)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 3)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 3)
 				})
 
 				ginkgo.By("verify admission for the wl3", func() {
@@ -495,7 +496,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				})
 
 				ginkgo.By("creating wl4", func() {
-					wl4 = testing.MakeWorkload("wl4", ns.Name).
+					wl4 = utiltestingapi.MakeWorkload("wl4", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 					wl4.Spec.PodSets[0].TopologyRequest = &kueue.PodSetTopologyRequest{
 						Required: ptr.To(testing.DefaultRackTopologyLevel),
@@ -511,7 +512,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the wl4 is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1, wl2, wl4)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 3)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 4)
 				})
 
 				ginkgo.By("verify admission for the wl4", func() {
@@ -539,7 +540,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 			ginkgo.It("should respect TAS usage by admitted workloads after reboot; second workload created before reboot", func() {
 				var wl1, wl2, wl3 *kueue.Workload
 				ginkgo.By("creating wl1 which consumes the entire TAS capacity", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 					wl1.Spec.PodSets[0].Count = 4
 					wl1.Spec.PodSets[0].TopologyRequest = &kueue.PodSetTopologyRequest{
@@ -550,11 +551,11 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify wl1 is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 				})
 
 				ginkgo.By("create wl2 which is blocked by wl1", func() {
-					wl2 = testing.MakeWorkload("wl2", ns.Name).
+					wl2 = utiltestingapi.MakeWorkload("wl2", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 					wl2.Spec.PodSets[0].TopologyRequest = &kueue.PodSetTopologyRequest{
 						Required: ptr.To(testing.DefaultRackTopologyLevel),
@@ -583,7 +584,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				})
 
 				ginkgo.By("create wl3 to ensure ClusterQueue is reconciled", func() {
-					wl3 = testing.MakeWorkload("wl3", ns.Name).
+					wl3 = utiltestingapi.MakeWorkload("wl3", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 					wl3.Spec.PodSets[0].TopologyRequest = &kueue.PodSetTopologyRequest{
 						Preferred: ptr.To(testing.DefaultRackTopologyLevel),
@@ -639,8 +640,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				var wl *kueue.Workload
 				ginkgo.By("creating a workload which requires block and can fit", func() {
-					wl = testing.MakeWorkload("wl", ns.Name).
-						Queue(kueue.LocalQueueName(localQueue.Name)).PodSets(*testing.MakePodSet("worker", 2).
+					wl = utiltestingapi.MakeWorkload("wl", ns.Name).
+						Queue(kueue.LocalQueueName(localQueue.Name)).PodSets(*utiltestingapi.MakePodSet("worker", 2).
 						RequiredTopologyRequest(testing.DefaultBlockTopologyLevel).
 						Obj()).Request(corev1.ResourceCPU, "1").Obj()
 					util.MustCreate(ctx, k8sClient, wl)
@@ -651,14 +652,14 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				})
 
 				ginkgo.By("recreate the Topology and wait for the queue to become active", func() {
-					topology = testing.MakeDefaultTwoLevelTopology("default")
+					topology = utiltestingapi.MakeDefaultTwoLevelTopology("default")
 					util.MustCreate(ctx, k8sClient, topology)
 					util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 				})
 
 				ginkgo.By("verify the workload is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 				})
 
 				ginkgo.By("verify admission for the workload", func() {
@@ -706,8 +707,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				var wl *kueue.Workload
 				ginkgo.By("creating a workload which requires block and can fit", func() {
-					wl = testing.MakeWorkload("wl", ns.Name).
-						Queue(kueue.LocalQueueName(localQueue.Name)).PodSets(*testing.MakePodSet("worker", 2).
+					wl = utiltestingapi.MakeWorkload("wl", ns.Name).
+						Queue(kueue.LocalQueueName(localQueue.Name)).PodSets(*utiltestingapi.MakePodSet("worker", 2).
 						RequiredTopologyRequest(testing.DefaultBlockTopologyLevel).
 						Obj()).Request(corev1.ResourceCPU, "1").Obj()
 					util.MustCreate(ctx, k8sClient, wl)
@@ -718,7 +719,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				})
 
 				ginkgo.By("recreate the ResourceFlavor and wait for the queue to become active", func() {
-					tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+					tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 						NodeLabel("node-group", "tas").
 						TopologyName("default").Obj()
 					util.MustCreate(ctx, k8sClient, tasFlavor)
@@ -727,7 +728,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the workload is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 				})
 
 				ginkgo.By("verify admission for the workload", func() {
@@ -807,21 +808,21 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				}
 				util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-				topology = testing.MakeDefaultThreeLevelTopology("default")
+				topology = utiltestingapi.MakeDefaultThreeLevelTopology("default")
 				util.MustCreate(ctx, k8sClient, topology)
 
-				tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+				tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 					NodeLabel("node-group", "tas").
 					TopologyName("default").Obj()
 				util.MustCreate(ctx, k8sClient, tasFlavor)
 
-				clusterQueue = testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+				clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 					Obj()
 				util.MustCreate(ctx, k8sClient, clusterQueue)
 				util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-				localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+				localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 				util.MustCreate(ctx, k8sClient, localQueue)
 			})
 
@@ -839,8 +840,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 			ginkgo.It("should not admit workload which does not fit to the required topology domain", func() {
 				ginkgo.By("creating a workload which requires rack, but does not fit in any", func() {
-					wl1 := testing.MakeWorkload("wl1-inadmissible", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 4).
+					wl1 := utiltestingapi.MakeWorkload("wl1-inadmissible", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 4).
 							PreferredTopologyRequest(testing.DefaultRackTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "2").Obj()
@@ -855,8 +856,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 			ginkgo.It("should admit workload which fits", func() {
 				var wl1, wl2 *kueue.Workload
 				ginkgo.By("creating a workload which can fit", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 1).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 1).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
@@ -865,12 +866,12 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the workload is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 				})
 
 				ginkgo.By("creating second a workload which cannot fit", func() {
-					wl2 = testing.MakeWorkload("wl2", ns.Name).
-						PodSets(*testing.MakePodSet("worker-2", 4).
+					wl2 = utiltestingapi.MakeWorkload("wl2", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker-2", 4).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
@@ -886,8 +887,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 			ginkgo.It("should admit workload using TAS without explicit TAS annotation", func() {
 				var wl1, wl2 *kueue.Workload
 				ginkgo.By("creating a workload without explicit TAS annotation which can fit", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 2).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 2).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 					util.MustCreate(ctx, k8sClient, wl1)
@@ -908,8 +909,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				})
 
 				ginkgo.By("creating the second workload without explicit TAS annotation which cannot fit", func() {
-					wl2 = testing.MakeWorkload("wl2", ns.Name).
-						PodSets(*testing.MakePodSet("worker-2", 3).
+					wl2 = utiltestingapi.MakeWorkload("wl2", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker-2", 3).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 					util.MustCreate(ctx, k8sClient, wl2)
@@ -930,8 +931,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				nodeName := nodes[0].Name
 
 				ginkgo.By("creating a workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 2).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 2).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
@@ -979,8 +980,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				nodeName := nodes[0].Name
 
 				ginkgo.By("creating a workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 2).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 2).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
@@ -1033,8 +1034,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				nodeName := nodes[0].Name
 
 				ginkgo.By("creating a workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 2).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 2).
 							// requiring the same block makes sure that no replacement is possible
 							RequiredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
@@ -1098,8 +1099,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				nodeName := nodes[0].Name
 
 				ginkgo.By("creating a workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 2).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 2).
 							RequiredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
@@ -1152,8 +1153,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				nodeName := nodes[0].Name
 
 				ginkgo.By("creating a workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 2).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 2).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
@@ -1175,8 +1176,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				})
 
 				ginkgo.By("creating a second workload", func() {
-					wl2 = testing.MakeWorkload("wl2", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 2).
+					wl2 = utiltestingapi.MakeWorkload("wl2", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 2).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
@@ -1249,8 +1250,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				node2Name := "x1"
 
 				ginkgo.By("creating a workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 2).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 2).
 							NodeSelector(map[string]string{testing.DefaultBlockTopologyLevel: "b1"}).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
@@ -1300,8 +1301,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				node2Name := "x1"
 
 				ginkgo.By("creating a workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 2).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 2).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
@@ -1414,21 +1415,21 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				}
 				util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-				topology = testing.MakeDefaultThreeLevelTopology("default")
+				topology = utiltestingapi.MakeDefaultThreeLevelTopology("default")
 				util.MustCreate(ctx, k8sClient, topology)
 
-				tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+				tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 					NodeLabel("node-group", "tas").
 					TopologyName("default").Obj()
 				util.MustCreate(ctx, k8sClient, tasFlavor)
 
-				clusterQueue = testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+				clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 					Obj()
 				util.MustCreate(ctx, k8sClient, clusterQueue)
 				util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-				localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+				localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 				util.MustCreate(ctx, k8sClient, localQueue)
 			})
 
@@ -1449,8 +1450,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				nodeName := nodes[0].Name
 
 				ginkgo.By("creating a workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 2).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 2).
 							RequiredTopologyRequest(testing.DefaultRackTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
@@ -1546,28 +1547,28 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				}
 				util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-				topology = testing.MakeDefaultThreeLevelTopology("default")
+				topology = utiltestingapi.MakeDefaultThreeLevelTopology("default")
 				util.MustCreate(ctx, k8sClient, topology)
 
-				tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+				tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 					NodeLabel("node-group", "tas").
 					TopologyName("default").Obj()
 				util.MustCreate(ctx, k8sClient, tasFlavor)
 
-				clusterQueue = testing.MakeClusterQueue("cluster-queue").
+				clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
 					}).
 					// We set the quota above what is physically available to meet
 					// the topology requirements rather than the quota.
-					ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).
 						Resource(corev1.ResourceCPU, "20").
 						Resource(corev1.ResourceMemory, "20Gi").Obj()).
 					Obj()
 				util.MustCreate(ctx, k8sClient, clusterQueue)
 				util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-				localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+				localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 				util.MustCreate(ctx, k8sClient, localQueue)
 			})
 
@@ -1586,9 +1587,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 			ginkgo.It("should preempt the low and mid priority workloads to fit the high-priority workload", func() {
 				var wl1, wl2, wl3 *kueue.Workload
 				ginkgo.By("creating a low priority workload which can fit", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 						Priority(1).
-						PodSets(*testing.MakePodSet("worker", 1).
+						PodSets(*utiltestingapi.MakePodSet("worker", 1).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
@@ -1597,13 +1598,13 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the workload is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 				})
 
 				ginkgo.By("creating a mid priority workload which can fit", func() {
-					wl2 = testing.MakeWorkload("wl2", ns.Name).
+					wl2 = utiltestingapi.MakeWorkload("wl2", ns.Name).
 						Priority(2).
-						PodSets(*testing.MakePodSet("worker", 1).
+						PodSets(*utiltestingapi.MakePodSet("worker", 1).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
@@ -1612,13 +1613,13 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the wl2 gets admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1, wl2)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 2)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 2)
 				})
 
 				ginkgo.By("creating a high priority workload which requires preemption", func() {
-					wl3 = testing.MakeWorkload("wl3", ns.Name).
+					wl3 = utiltestingapi.MakeWorkload("wl3", ns.Name).
 						Priority(3).
-						PodSets(*testing.MakePodSet("worker", 2).
+						PodSets(*utiltestingapi.MakePodSet("worker", 2).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "5").Obj()
@@ -1674,44 +1675,44 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				}
 				util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-				topology = testing.MakeDefaultThreeLevelTopology("default")
+				topology = utiltestingapi.MakeDefaultThreeLevelTopology("default")
 				util.MustCreate(ctx, k8sClient, topology)
 
-				tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+				tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 					NodeLabel("node-group", "tas").
 					TopologyName("default").Obj()
 				util.MustCreate(ctx, k8sClient, tasFlavor)
 
-				clusterQueue = testing.MakeClusterQueue("cluster-queue").
+				clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 					Cohort("cohort").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
-					ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).
 						Resource(corev1.ResourceCPU, "5").
 						Resource(corev1.ResourceMemory, "5Gi").Obj()).
 					Obj()
 				util.MustCreate(ctx, k8sClient, clusterQueue)
 				util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-				localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+				localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 				util.MustCreate(ctx, k8sClient, localQueue)
 
-				clusterQueueB = testing.MakeClusterQueue("cluster-queue-b").
+				clusterQueueB = utiltestingapi.MakeClusterQueue("cluster-queue-b").
 					Cohort("cohort").
 					Preemption(kueue.ClusterQueuePreemption{
 						WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 						ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					}).
-					ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).
 						Resource(corev1.ResourceCPU, "5").
 						Resource(corev1.ResourceMemory, "5Gi").Obj()).
 					Obj()
 				util.MustCreate(ctx, k8sClient, clusterQueueB)
 				util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueueB)
 
-				localQueueB = testing.MakeLocalQueue("local-queue-b", ns.Name).ClusterQueue(clusterQueueB.Name).Obj()
+				localQueueB = utiltestingapi.MakeLocalQueue("local-queue-b", ns.Name).ClusterQueue(clusterQueueB.Name).Obj()
 				util.MustCreate(ctx, k8sClient, localQueueB)
 			})
 
@@ -1733,8 +1734,8 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 			ginkgo.It("should allow to borrow within cohort and reclaim the capacity", func() {
 				var wl1, wl2 *kueue.Workload
 				ginkgo.By("creating a workload which can fit only when borrowing quota", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
-						PodSets(*testing.MakePodSet("worker", 2).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
+						PodSets(*utiltestingapi.MakePodSet("worker", 2).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "4").Obj()
@@ -1743,7 +1744,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the workload is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 				})
 
 				ginkgo.By("creating a workload in CQB which reclaims its quota", func() {
@@ -1751,9 +1752,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 					// without preempting wl1. However, there is only 1 CPU left
 					// on both nodes, so wl1 needs to be preempted to allow
 					// scheduling of wl2.
-					wl2 = testing.MakeWorkload("wl2", ns.Name).
+					wl2 = utiltestingapi.MakeWorkload("wl2", ns.Name).
 						Priority(2).
-						PodSets(*testing.MakePodSet("worker", 1).
+						PodSets(*utiltestingapi.MakePodSet("worker", 1).
 							PreferredTopologyRequest(testing.DefaultBlockTopologyLevel).
 							Obj()).
 						Queue(kueue.LocalQueueName(localQueueB.Name)).Request(corev1.ResourceCPU, "2").Obj()
@@ -1776,21 +1777,21 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 			)
 
 			ginkgo.BeforeEach(func() {
-				topology = testing.MakeDefaultTwoLevelTopology("default")
+				topology = utiltestingapi.MakeDefaultTwoLevelTopology("default")
 				util.MustCreate(ctx, k8sClient, topology)
 
-				tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+				tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 					NodeLabel("node-group", "tas").
 					TopologyName("default").
 					Obj()
 				util.MustCreate(ctx, k8sClient, tasFlavor)
 
-				clusterQueue = testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+				clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 					Obj()
 				util.MustCreate(ctx, k8sClient, clusterQueue)
 
-				localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+				localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 				util.MustCreate(ctx, k8sClient, localQueue)
 			})
 
@@ -1812,7 +1813,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				)
 
 				ginkgo.By("creating a workload which requires rack, but does not fit in any", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 					wl1.Spec.PodSets[0].TopologyRequest = &kueue.PodSetTopologyRequest{
 						Required: ptr.To(testing.DefaultRackTopologyLevel),
@@ -1843,7 +1844,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the workload is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 					util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
 				})
 			})
@@ -1855,22 +1856,22 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 			)
 
 			ginkgo.BeforeEach(func() {
-				topology = testing.MakeDefaultThreeLevelTopology("default")
+				topology = utiltestingapi.MakeDefaultThreeLevelTopology("default")
 				util.MustCreate(ctx, k8sClient, topology)
 
-				tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+				tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 					NodeLabel("node-group", "tas").
 					TopologyName("default").
 					Obj()
 				util.MustCreate(ctx, k8sClient, tasFlavor)
 
-				clusterQueue = testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
+				clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj()).
 					Obj()
 				util.MustCreate(ctx, k8sClient, clusterQueue)
 				util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-				localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+				localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 				util.MustCreate(ctx, k8sClient, localQueue)
 			})
 
@@ -1915,7 +1916,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				})
 
 				ginkgo.By("creating a workload which does not tolerate the taint", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
 					wl1.Spec.PodSets[0].TopologyRequest = &kueue.PodSetTopologyRequest{
 						Required: ptr.To(testing.DefaultRackTopologyLevel),
@@ -1936,7 +1937,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the workload gets admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 					util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
 				})
 			})
@@ -1968,9 +1969,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				})
 
 				ginkgo.By("creating a workload requiring the missing label via NodeSelector", func() {
-					wl1 = testing.MakeWorkload("wl-needs-label", ns.Name).
+					wl1 = utiltestingapi.MakeWorkload("wl-needs-label", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).
-						PodSets(*testing.MakePodSet("main", 1).
+						PodSets(*utiltestingapi.MakePodSet("main", 1).
 							NodeSelector(map[string]string{customLabelKey: customLabelCorrectValue}).
 							Request(corev1.ResourceCPU, "1").
 							Obj()).
@@ -2004,7 +2005,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the workload gets admitted after label is added", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 					util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
 				})
 			})
@@ -2020,16 +2021,16 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 			)
 
 			ginkgo.BeforeEach(func() {
-				topology = testing.MakeDefaultThreeLevelTopology("default")
+				topology = utiltestingapi.MakeDefaultThreeLevelTopology("default")
 				util.MustCreate(ctx, k8sClient, topology)
 
-				tasFlavor = testing.MakeResourceFlavor("tas-flavor").
+				tasFlavor = utiltestingapi.MakeResourceFlavor("tas-flavor").
 					NodeLabel("node-group", "tas").
 					TopologyName("default").
 					Obj()
 				util.MustCreate(ctx, k8sClient, tasFlavor)
 
-				prc = testing.MakeProvisioningRequestConfig("prov-config").
+				prc = utiltestingapi.MakeProvisioningRequestConfig("prov-config").
 					ProvisioningClass("provisioning-class").
 					RetryLimit(1).
 					BaseBackoff(1).
@@ -2042,21 +2043,21 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 					Obj()
 				util.MustCreate(ctx, k8sClient, prc)
 
-				ac = testing.MakeAdmissionCheck("provisioning").
+				ac = utiltestingapi.MakeAdmissionCheck("provisioning").
 					ControllerName(kueue.ProvisioningRequestControllerName).
 					Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", prc.Name).
 					Obj()
 				util.MustCreate(ctx, k8sClient, ac)
 				util.SetAdmissionCheckActive(ctx, k8sClient, ac, metav1.ConditionTrue)
 
-				clusterQueue = testing.MakeClusterQueue("cq").
+				clusterQueue = utiltestingapi.MakeClusterQueue("cq").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas(tasFlavor.Name).Resource(corev1.ResourceCPU, "5").Obj(),
 					).AdmissionChecks(kueue.AdmissionCheckReference(ac.Name)).Obj()
 				util.MustCreate(ctx, k8sClient, clusterQueue)
 				util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-				localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+				localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 				util.MustCreate(ctx, k8sClient, localQueue)
 			})
 
@@ -2081,9 +2082,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				)
 
 				ginkgo.By("create workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
-					wl1.Spec.PodSets[0] = *testing.MakePodSet(kueue.DefaultPodSetName, 1).
+					wl1.Spec.PodSets[0] = *utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						Request(corev1.ResourceCPU, "1").
 						PreferredTopologyRequest(testing.DefaultRackTopologyLevel).
 						Image("image").
@@ -2200,7 +2201,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the workload is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 					util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
 				})
 			})
@@ -2211,9 +2212,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				)
 
 				ginkgo.By("create workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
-					wl1.Spec.PodSets[0] = *testing.MakePodSet(kueue.DefaultPodSetName, 1).
+					wl1.Spec.PodSets[0] = *utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						Request(corev1.ResourceCPU, "1").
 						PreferredTopologyRequest(testing.DefaultRackTopologyLevel).
 						Image("image").
@@ -2320,7 +2321,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the workload is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 					util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
 				})
 			})
@@ -2331,9 +2332,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				)
 
 				ginkgo.By("creating a workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
-					wl1.Spec.PodSets[0] = *testing.MakePodSet(kueue.DefaultPodSetName, 1).
+					wl1.Spec.PodSets[0] = *utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						Request(corev1.ResourceCPU, "1").
 						PreferredTopologyRequest(testing.DefaultRackTopologyLevel).
 						Image("image").
@@ -2443,7 +2444,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("Verify the workload is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 					util.ExpectPendingWorkloadsMetric(clusterQueue, 0, 0)
 				})
 
@@ -2479,9 +2480,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				)
 
 				ginkgo.By("create workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").Obj()
-					wl1.Spec.PodSets[0] = *testing.MakePodSet(kueue.DefaultPodSetName, 1).
+					wl1.Spec.PodSets[0] = *utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 						Request(corev1.ResourceCPU, "1").
 						PreferredTopologyRequest(testing.DefaultRackTopologyLevel).
 						Image("image").
@@ -2587,9 +2588,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				)
 
 				ginkgo.By("create workload", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Request(corev1.ResourceCPU, "1").
-						PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 1).
+						PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 							Request(corev1.ResourceCPU, "1").
 							PreferredTopologyRequest(testing.DefaultRackTopologyLevel).
 							Image("image").
@@ -2759,31 +2760,31 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				}
 				util.CreateNodesWithStatus(ctx, k8sClient, nodes)
 
-				topology = testing.MakeTopology("default").Levels(
+				topology = utiltestingapi.MakeTopology("default").Levels(
 					testing.DefaultRackTopologyLevel,
 				).Obj()
 				util.MustCreate(ctx, k8sClient, topology)
 
-				tasGPUFlavor = testing.MakeResourceFlavor("tas-gpu-flavor").
+				tasGPUFlavor = utiltestingapi.MakeResourceFlavor("tas-gpu-flavor").
 					NodeLabel(corev1.LabelInstanceTypeStable, "gpu-node").
 					TopologyName("default").
 					Obj()
 				util.MustCreate(ctx, k8sClient, tasGPUFlavor)
 
-				tasCPUFlavor = testing.MakeResourceFlavor("tas-cpu-flavor").
+				tasCPUFlavor = utiltestingapi.MakeResourceFlavor("tas-cpu-flavor").
 					NodeLabel(corev1.LabelInstanceTypeStable, "cpu-node").
 					TopologyName("default").
 					Obj()
 				util.MustCreate(ctx, k8sClient, tasCPUFlavor)
 
-				clusterQueue = testing.MakeClusterQueue("cluster-queue").
+				clusterQueue = utiltestingapi.MakeClusterQueue("cluster-queue").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas(tasGPUFlavor.Name).Resource(corev1.ResourceCPU, "1").Resource(gpuResName, "5").Obj(),
-						*testing.MakeFlavorQuotas(tasCPUFlavor.Name).Resource(corev1.ResourceCPU, "5").Resource(gpuResName, "0").Obj(),
+						*utiltestingapi.MakeFlavorQuotas(tasGPUFlavor.Name).Resource(corev1.ResourceCPU, "1").Resource(gpuResName, "5").Obj(),
+						*utiltestingapi.MakeFlavorQuotas(tasCPUFlavor.Name).Resource(corev1.ResourceCPU, "5").Resource(gpuResName, "0").Obj(),
 					).Obj()
 				util.MustCreate(ctx, k8sClient, clusterQueue)
 
-				localQueue = testing.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
+				localQueue = utiltestingapi.MakeLocalQueue("local-queue", ns.Name).ClusterQueue(clusterQueue.Name).Obj()
 				util.MustCreate(ctx, k8sClient, localQueue)
 			})
 
@@ -2815,15 +2816,15 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 			ginkgo.It("should admit workload which fits in a required topology domain", func() {
 				var wl1 *kueue.Workload
 				ginkgo.By("creating a workload which requires block and can fit", func() {
-					wl1 = testing.MakeWorkload("wl1", ns.Name).
+					wl1 = utiltestingapi.MakeWorkload("wl1", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).Obj()
-					ps1 := *testing.MakePodSet("manager", 1).NodeSelector(
+					ps1 := *utiltestingapi.MakePodSet("manager", 1).NodeSelector(
 						map[string]string{corev1.LabelInstanceTypeStable: "cpu-node"},
 					).Request(corev1.ResourceCPU, "5").Obj()
 					ps1.TopologyRequest = &kueue.PodSetTopologyRequest{
 						Required: ptr.To(testing.DefaultRackTopologyLevel),
 					}
-					ps2 := *testing.MakePodSet("worker", 2).NodeSelector(
+					ps2 := *utiltestingapi.MakePodSet("worker", 2).NodeSelector(
 						map[string]string{corev1.LabelInstanceTypeStable: "gpu-node"},
 					).Request(gpuResName, "2").Obj()
 					ps2.TopologyRequest = &kueue.PodSetTopologyRequest{
@@ -2835,7 +2836,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.By("verify the workload is admitted", func() {
 					util.ExpectWorkloadsToBeAdmitted(ctx, k8sClient, wl1)
-					util.ExpectReservingActiveWorkloadsMetric(clusterQueue, 1)
+					util.ExpectAdmittedWorkloadsTotalMetric(clusterQueue, "", 1)
 				})
 
 				ginkgo.By("verify admission for the workload1", func() {
@@ -2936,15 +2937,15 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 			ginkgo.BeforeEach(func() {
 				// Create a ResourceFlavor without topology
-				nonTasFlavor = testing.MakeResourceFlavor("non-tas-gpu-flavor").
+				nonTasFlavor = utiltestingapi.MakeResourceFlavor("non-tas-gpu-flavor").
 					NodeLabel("nodepool", "gpu-nodes").
 					// No TopologyName - this simulates non-TAS behavior
 					Obj()
 				util.MustCreate(ctx, k8sClient, nonTasFlavor)
 
-				nonTasClusterQueue = testing.MakeClusterQueue("non-tas-gpu-cluster-queue").
+				nonTasClusterQueue = utiltestingapi.MakeClusterQueue("non-tas-gpu-cluster-queue").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("non-tas-gpu-flavor").
+						*utiltestingapi.MakeFlavorQuotas("non-tas-gpu-flavor").
 							Resource("nvidia.com/gpu", "64"). // Total 64 GPUs available (8 nodes × 8 GPUs)
 							Obj(),
 					).
@@ -2952,7 +2953,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				util.MustCreate(ctx, k8sClient, nonTasClusterQueue)
 				util.ExpectClusterQueuesToBeActive(ctx, k8sClient, nonTasClusterQueue)
 
-				nonTasLocalQueue = testing.MakeLocalQueue("non-tas-gpu-queue", ns.Name).
+				nonTasLocalQueue = utiltestingapi.MakeLocalQueue("non-tas-gpu-queue", ns.Name).
 					ClusterQueue("non-tas-gpu-cluster-queue").
 					Obj()
 				util.MustCreate(ctx, k8sClient, nonTasLocalQueue)
@@ -2960,9 +2961,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				// Create existing workloads that consume 7 GPUs on each node
 				// This simulates the scenario where only 1 GPU is available per node
 				for i := range 8 {
-					existingWl := testing.MakeWorkload(fmt.Sprintf("existing-workload-%d", i+1), ns.Name).
+					existingWl := utiltestingapi.MakeWorkload(fmt.Sprintf("existing-workload-%d", i+1), ns.Name).
 						Queue(kueue.LocalQueueName(nonTasLocalQueue.Name)).
-						PodSets(*testing.MakePodSet("worker", 1).
+						PodSets(*utiltestingapi.MakePodSet("worker", 1).
 							Request("nvidia.com/gpu", "7"). // Single pod needs 7 GPUs
 							NodeSelector(map[string]string{
 								"nodepool":           "gpu-nodes",
@@ -2986,9 +2987,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				// This should cause fragmentation because:
 				// - Kueue sees 8 GPUs available total (1 GPU per node across 8 nodes)
 				// - But a single pod requiring 8 GPUs cannot fit on any single node
-				wl := testing.MakeWorkload("fragmented-workload", ns.Name).
+				wl := utiltestingapi.MakeWorkload("fragmented-workload", ns.Name).
 					Queue(kueue.LocalQueueName(nonTasLocalQueue.Name)).
-					PodSets(*testing.MakePodSet("worker", 1).
+					PodSets(*utiltestingapi.MakePodSet("worker", 1).
 						Request("nvidia.com/gpu", "8"). // Single pod needs 8 GPUs
 						NodeSelector(map[string]string{"nodepool": "gpu-nodes"}).
 						Obj()).
@@ -3044,12 +3045,12 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 			ginkgo.Context("Single pod fitting into single node scenario", func() {
 				ginkgo.BeforeEach(func() {
 					ginkgo.By("Creating TAS topology", func() {
-						topology = testing.MakeDefaultOneLevelTopology("node")
+						topology = utiltestingapi.MakeDefaultOneLevelTopology("node")
 						util.MustCreate(ctx, k8sClient, topology)
 					})
 
 					ginkgo.By("Creating TAS ResourceFlavor", func() {
-						tasFlavor = testing.MakeResourceFlavor("gpu-flavor").
+						tasFlavor = utiltestingapi.MakeResourceFlavor("gpu-flavor").
 							NodeLabel("nodepool", "gpu-nodes").
 							TopologyName("node").
 							Obj()
@@ -3057,9 +3058,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 					})
 
 					ginkgo.By("Creating ClusterQueue and LocalQueue", func() {
-						clusterQueue = testing.MakeClusterQueue("gpu-cluster-queue").
+						clusterQueue = utiltestingapi.MakeClusterQueue("gpu-cluster-queue").
 							ResourceGroup(
-								*testing.MakeFlavorQuotas("gpu-flavor").
+								*utiltestingapi.MakeFlavorQuotas("gpu-flavor").
 									Resource("nvidia.com/gpu", "64"). // Total 64 GPUs available (8 nodes × 8 GPUs)
 									Obj(),
 							).
@@ -3067,7 +3068,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 						util.MustCreate(ctx, k8sClient, clusterQueue)
 						util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-						localQueue = testing.MakeLocalQueue("gpu-queue", ns.Name).
+						localQueue = utiltestingapi.MakeLocalQueue("gpu-queue", ns.Name).
 							ClusterQueue("gpu-cluster-queue").
 							Obj()
 						util.MustCreate(ctx, k8sClient, localQueue)
@@ -3086,9 +3087,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 					// Create existing workloads that consume 7 GPUs on each node
 					// This simulates the scenario where only 1 GPU is available per node
 					for i := range 8 {
-						existingWl := testing.MakeWorkload(fmt.Sprintf("existing-tas-workload-%d", i+1), ns.Name).
+						existingWl := utiltestingapi.MakeWorkload(fmt.Sprintf("existing-tas-workload-%d", i+1), ns.Name).
 							Queue(kueue.LocalQueueName(localQueue.Name)).
-							PodSets(*testing.MakePodSet("worker", 1).
+							PodSets(*utiltestingapi.MakePodSet("worker", 1).
 								Request("nvidia.com/gpu", "7").                // Single pod needs 7 GPUs
 								RequiredTopologyRequest(corev1.LabelHostname). // Require hostname topology
 								Obj()).
@@ -3108,9 +3109,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 				ginkgo.It("Should prevent unschedulable admission by rejecting 8-GPU workload that requires 8-GPUs on single node", func() {
 					// Create a workload that needs 8 GPUs on a single pod
 					// With TAS, this should be rejected because no single node has 8 available GPUs
-					wl := testing.MakeWorkload("tas-workload", ns.Name).
+					wl := utiltestingapi.MakeWorkload("tas-workload", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).
-						PodSets(*testing.MakePodSet("worker", 1).
+						PodSets(*utiltestingapi.MakePodSet("worker", 1).
 							Request("nvidia.com/gpu", "8"). // Single pod needs 8 GPUs
 							NodeSelector(map[string]string{"nodepool": "gpu-nodes"}).
 							RequiredTopologyRequest(corev1.LabelHostname). // Require pod on single hostname
@@ -3138,9 +3139,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.It("Should allow workload that fits within topology constraints", func() {
 					// Create a workload that needs only 1 GPU (fits on any single node)
-					wl := testing.MakeWorkload("tas-fitting-workload", ns.Name).
+					wl := utiltestingapi.MakeWorkload("tas-fitting-workload", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).
-						PodSets(*testing.MakePodSet("worker", 1).
+						PodSets(*utiltestingapi.MakePodSet("worker", 1).
 							Request("nvidia.com/gpu", "1").
 							NodeSelector(map[string]string{"nodepool": "gpu-nodes"}).
 							RequiredTopologyRequest(corev1.LabelHostname). // Require pod on single hostname
@@ -3179,20 +3180,20 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 
 				ginkgo.BeforeEach(func() {
 					// Create TAS topology
-					topology = testing.MakeDefaultOneLevelTopology("gpu-topology")
+					topology = utiltestingapi.MakeDefaultOneLevelTopology("gpu-topology")
 					util.MustCreate(ctx, k8sClient, topology)
 
 					// Create TAS ResourceFlavor
-					tasFlavor = testing.MakeResourceFlavor("gpu-tas-flavor").
+					tasFlavor = utiltestingapi.MakeResourceFlavor("gpu-tas-flavor").
 						NodeLabel("nodepool", "gpu-nodes").
 						TopologyName("gpu-topology").
 						Obj()
 					util.MustCreate(ctx, k8sClient, tasFlavor)
 
 					// Create ClusterQueue and LocalQueue
-					clusterQueue = testing.MakeClusterQueue("gpu-tas-cluster-queue").
+					clusterQueue = utiltestingapi.MakeClusterQueue("gpu-tas-cluster-queue").
 						ResourceGroup(
-							*testing.MakeFlavorQuotas("gpu-tas-flavor").
+							*utiltestingapi.MakeFlavorQuotas("gpu-tas-flavor").
 								Resource("nvidia.com/gpu", "64"). // Total 64 GPUs available (8 nodes × 8 GPUs)
 								Obj(),
 						).
@@ -3200,7 +3201,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 					util.MustCreate(ctx, k8sClient, clusterQueue)
 					util.ExpectClusterQueuesToBeActive(ctx, k8sClient, clusterQueue)
 
-					localQueue = testing.MakeLocalQueue("gpu-tas-queue", ns.Name).
+					localQueue = utiltestingapi.MakeLocalQueue("gpu-tas-queue", ns.Name).
 						ClusterQueue("gpu-tas-cluster-queue").
 						Obj()
 					util.MustCreate(ctx, k8sClient, localQueue)
@@ -3218,9 +3219,9 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 					// Create 7 workloads that consume 7 GPUs each on different nodes
 					// Here, 7 nodes have 1 GPU available each, and 1 node has 8 GPUs available
 					for i := range 7 {
-						existingWl := testing.MakeWorkload(fmt.Sprintf("existing-7gpu-workload-%d", i+1), ns.Name).
+						existingWl := utiltestingapi.MakeWorkload(fmt.Sprintf("existing-7gpu-workload-%d", i+1), ns.Name).
 							Queue(kueue.LocalQueueName(localQueue.Name)).
-							PodSets(*testing.MakePodSet("worker", 1).
+							PodSets(*utiltestingapi.MakePodSet("worker", 1).
 								Request("nvidia.com/gpu", "7").                // Single pod needs 7 GPUs
 								RequiredTopologyRequest(corev1.LabelHostname). // Require hostname topology
 								Obj()).
@@ -3242,19 +3243,19 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 					// With TAS, this should be rejected because:
 					// - The 8-GPU pod can fit on the one remaining node with 8 GPUs available
 					// - But the 7-GPU pod cannot fit on any single node (7 nodes have only 1 GPU available each)
-					wl := testing.MakeWorkload("mixed-gpu-workload", ns.Name).
+					wl := utiltestingapi.MakeWorkload("mixed-gpu-workload", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).
 						Obj()
 
 					// First pod set: 1 pod needing 8 GPUs
-					ps1 := *testing.MakePodSet("gpu8-worker", 1).
+					ps1 := *utiltestingapi.MakePodSet("gpu8-worker", 1).
 						Request("nvidia.com/gpu", "8"). // Single pod needs 8 GPUs
 						NodeSelector(map[string]string{"nodepool": "gpu-nodes"}).
 						RequiredTopologyRequest(corev1.LabelHostname). // Require pod on single hostname
 						Obj()
 
 					// Second pod set: 1 pod needing 7 GPUs
-					ps2 := *testing.MakePodSet("gpu7-worker", 1).
+					ps2 := *utiltestingapi.MakePodSet("gpu7-worker", 1).
 						Request("nvidia.com/gpu", "7"). // Single pod needs 7 GPUs
 						NodeSelector(map[string]string{"nodepool": "gpu-nodes"}).
 						RequiredTopologyRequest(corev1.LabelHostname). // Require pod on single hostname
@@ -3290,19 +3291,19 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
 					// - The 8-GPU pod can fit on the one remaining node with 8 GPUs available
 					// - The 1-GPU pod can fit on any of the 7 nodes with 1 GPU available each
 					// - TAS allows admission when all pods can be scheduled
-					wl := testing.MakeWorkload("admissible-mixed-gpu-workload", ns.Name).
+					wl := utiltestingapi.MakeWorkload("admissible-mixed-gpu-workload", ns.Name).
 						Queue(kueue.LocalQueueName(localQueue.Name)).
 						Obj()
 
 					// First pod set: 1 pod needing 8 GPUs
-					ps1 := *testing.MakePodSet("gpu8-worker", 1).
+					ps1 := *utiltestingapi.MakePodSet("gpu8-worker", 1).
 						Request("nvidia.com/gpu", "8"). // Single pod needs 8 GPUs
 						NodeSelector(map[string]string{"nodepool": "gpu-nodes"}).
 						RequiredTopologyRequest(corev1.LabelHostname). // Require pod on single hostname
 						Obj()
 
 					// Second pod set: 1 pod needing 1 GPU
-					ps2 := *testing.MakePodSet("gpu1-worker", 1).
+					ps2 := *utiltestingapi.MakePodSet("gpu1-worker", 1).
 						Request("nvidia.com/gpu", "1"). // Single pod needs 1 GPU
 						NodeSelector(map[string]string{"nodepool": "gpu-nodes"}).
 						RequiredTopologyRequest(corev1.LabelHostname). // Require pod on single hostname
@@ -3367,25 +3368,25 @@ var _ = ginkgo.Describe("Topology validations", func() {
 			gomega.Expect(err).Should(matcher)
 		},
 			ginkgo.Entry("valid Topology",
-				testing.MakeDefaultOneLevelTopology("valid"),
+				utiltestingapi.MakeDefaultOneLevelTopology("valid"),
 				gomega.Succeed()),
 			ginkgo.Entry("no levels",
-				testing.MakeTopology("no-levels").Obj(),
+				utiltestingapi.MakeTopology("no-levels").Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("invalid levels",
-				testing.MakeTopology("invalid-level").Levels("@invalid").Obj(),
+				utiltestingapi.MakeTopology("invalid-level").Levels("@invalid").Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("non-unique levels",
-				testing.MakeTopology("default").Levels(testing.DefaultBlockTopologyLevel, testing.DefaultBlockTopologyLevel).Obj(),
+				utiltestingapi.MakeTopology("default").Levels(testing.DefaultBlockTopologyLevel, testing.DefaultBlockTopologyLevel).Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("kubernetes.io/hostname first",
-				testing.MakeTopology("default").Levels(corev1.LabelHostname, testing.DefaultBlockTopologyLevel, testing.DefaultRackTopologyLevel).Obj(),
+				utiltestingapi.MakeTopology("default").Levels(corev1.LabelHostname, testing.DefaultBlockTopologyLevel, testing.DefaultRackTopologyLevel).Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("kubernetes.io/hostname middle",
-				testing.MakeTopology("default").Levels(testing.DefaultBlockTopologyLevel, corev1.LabelHostname, testing.DefaultRackTopologyLevel).Obj(),
+				utiltestingapi.MakeTopology("default").Levels(testing.DefaultBlockTopologyLevel, corev1.LabelHostname, testing.DefaultRackTopologyLevel).Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("kubernetes.io/hostname last",
-				testing.MakeTopology("default").Levels(testing.DefaultBlockTopologyLevel, testing.DefaultRackTopologyLevel, corev1.LabelHostname).Obj(),
+				utiltestingapi.MakeTopology("default").Levels(testing.DefaultBlockTopologyLevel, testing.DefaultRackTopologyLevel, corev1.LabelHostname).Obj(),
 				gomega.Succeed()),
 		)
 	})
@@ -3401,7 +3402,7 @@ var _ = ginkgo.Describe("Topology validations", func() {
 			gomega.Expect(k8sClient.Update(ctx, topology)).Should(matcher)
 		},
 			ginkgo.Entry("succeed to update topology",
-				testing.MakeDefaultOneLevelTopology("valid"),
+				utiltestingapi.MakeDefaultOneLevelTopology("valid"),
 				func(topology *kueue.Topology) {
 					topology.Labels = map[string]string{
 						"alpha": "beta",
@@ -3409,7 +3410,7 @@ var _ = ginkgo.Describe("Topology validations", func() {
 				},
 				gomega.Succeed()),
 			ginkgo.Entry("updating levels is prohibited",
-				testing.MakeDefaultOneLevelTopology("valid"),
+				utiltestingapi.MakeDefaultOneLevelTopology("valid"),
 				func(topology *kueue.Topology) {
 					topology.Spec.Levels = append(topology.Spec.Levels, kueue.TopologyLevel{
 						NodeLabel: "added",
@@ -3417,7 +3418,7 @@ var _ = ginkgo.Describe("Topology validations", func() {
 				},
 				testing.BeInvalidError()),
 			ginkgo.Entry("updating levels order is prohibited",
-				testing.MakeDefaultThreeLevelTopology("default"),
+				utiltestingapi.MakeDefaultThreeLevelTopology("default"),
 				func(topology *kueue.Topology) {
 					topology.Spec.Levels[0], topology.Spec.Levels[1] = topology.Spec.Levels[1], topology.Spec.Levels[0]
 				},
diff --git a/test/integration/singlecluster/webhook/core/admissioncheck_test.go b/test/integration/singlecluster/webhook/core/admissioncheck_test.go
index 97596f5fe..6b3158249 100644
--- a/test/integration/singlecluster/webhook/core/admissioncheck_test.go
+++ b/test/integration/singlecluster/webhook/core/admissioncheck_test.go
@@ -31,6 +31,7 @@ import (
 	config "sigs.k8s.io/kueue/apis/config/v1beta1"
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -202,7 +203,7 @@ var _ = ginkgo.Describe("AdmissionCheck Webhook", ginkgo.Ordered, func() {
 
 	ginkgo.It("Should allow to update AdmissionCheck when changing parameters", func() {
 		ginkgo.By("Creating a new AdmissionCheck")
-		ac := testing.MakeAdmissionCheck("admission-check").
+		ac := utiltestingapi.MakeAdmissionCheck("admission-check").
 			ControllerName("controller-name").
 			Parameters("ref.api.group", "RefKind", "ref-name").
 			Obj()
@@ -224,7 +225,7 @@ var _ = ginkgo.Describe("AdmissionCheck Webhook", ginkgo.Ordered, func() {
 
 	ginkgo.It("Should allow to update AdmissionCheck when removing parameters", func() {
 		ginkgo.By("Creating a new AdmissionCheck")
-		ac := testing.MakeAdmissionCheck("admission-check").
+		ac := utiltestingapi.MakeAdmissionCheck("admission-check").
 			ControllerName("controller-name").
 			Parameters("ref.api.group", "RefKind", "ref-name").
 			Obj()
@@ -244,7 +245,7 @@ var _ = ginkgo.Describe("AdmissionCheck Webhook", ginkgo.Ordered, func() {
 
 	ginkgo.It("Should fail to update AdmissionCheck when breaking parameters", func() {
 		ginkgo.By("Creating a new AdmissionCheck")
-		ac := testing.MakeAdmissionCheck("admission-check").
+		ac := utiltestingapi.MakeAdmissionCheck("admission-check").
 			ControllerName("controller-name").
 			Parameters("ref.api.group", "RefKind", "ref-name").
 			Obj()
@@ -264,7 +265,7 @@ var _ = ginkgo.Describe("AdmissionCheck Webhook", ginkgo.Ordered, func() {
 
 	ginkgo.It("Should fail to update AdmissionCheck when breaking parameters", func() {
 		ginkgo.By("Creating a new AdmissionCheck")
-		ac := testing.MakeAdmissionCheck("admission-check").
+		ac := utiltestingapi.MakeAdmissionCheck("admission-check").
 			ControllerName("controller-name").
 			Parameters("ref.api.group", "RefKind", "ref-name").
 			Obj()
diff --git a/test/integration/singlecluster/webhook/core/clusterqueue_test.go b/test/integration/singlecluster/webhook/core/clusterqueue_test.go
index 256529056..08e3740c6 100644
--- a/test/integration/singlecluster/webhook/core/clusterqueue_test.go
+++ b/test/integration/singlecluster/webhook/core/clusterqueue_test.go
@@ -34,6 +34,7 @@ import (
 	config "sigs.k8s.io/kueue/apis/config/v1beta1"
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -172,8 +173,8 @@ var _ = ginkgo.Describe("ClusterQueue Webhook", ginkgo.Ordered, func() {
 
 		ginkgo.It("Should have qualified flavor names when updating", func() {
 			ginkgo.By("Creating a new clusterQueue")
-			cq := testing.MakeClusterQueue("cluster-queue").
-				ResourceGroup(*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceMemory).Obj()).
+			cq := utiltestingapi.MakeClusterQueue("cluster-queue").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceMemory).Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 
@@ -191,9 +192,9 @@ var _ = ginkgo.Describe("ClusterQueue Webhook", ginkgo.Ordered, func() {
 
 		ginkgo.It("Should allow to update queueingStrategy with different value", func() {
 			ginkgo.By("Creating a new clusterQueue")
-			cq := testing.MakeClusterQueue("cluster-queue").
+			cq := utiltestingapi.MakeClusterQueue("cluster-queue").
 				QueueingStrategy(kueue.StrictFIFO).
-				ResourceGroup(*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceMemory).Obj()).
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceMemory).Obj()).
 				Obj()
 			util.MustCreate(ctx, k8sClient, cq)
 
@@ -228,155 +229,155 @@ var _ = ginkgo.Describe("ClusterQueue Webhook", ginkgo.Ordered, func() {
 			}
 		},
 			ginkgo.Entry("Should have non-negative borrowing limit",
-				testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "2", "-1").Obj()).
+				utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "2", "-1").Obj()).
 					Cohort("cohort").
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should have non-negative quota value",
-				testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "-1").Obj()).
+				utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "-1").Obj()).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should have at least one flavor",
-				testing.MakeClusterQueue("cluster-queue").ResourceGroup().Obj(),
+				utiltestingapi.MakeClusterQueue("cluster-queue").ResourceGroup().Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should have at least one resource",
-				testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas("foo").Obj()).
+				utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("foo").Obj()).
 					Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should have qualified flavor name",
-				testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas("invalid_name").Resource(corev1.ResourceCPU, "5").Obj()).
+				utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("invalid_name").Resource(corev1.ResourceCPU, "5").Obj()).
 					Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should have qualified resource name",
-				testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas("x86").Resource("@cpu", "5").Obj()).
+				utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource("@cpu", "5").Obj()).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should have valid resources quantity",
 				func() *kueue.ClusterQueue {
-					flvQuotas := testing.MakeFlavorQuotas("flavor")
+					flvQuotas := utiltestingapi.MakeFlavorQuotas("flavor")
 					for i := range resourcesMaxItems + 1 {
 						flvQuotas = flvQuotas.Resource(corev1.ResourceName(fmt.Sprintf("r%d", i)))
 					}
-					return testing.MakeClusterQueue("cluster-queue").ResourceGroup(*flvQuotas.Obj()).Obj()
+					return utiltestingapi.MakeClusterQueue("cluster-queue").ResourceGroup(*flvQuotas.Obj()).Obj()
 				}(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should have valid flavors quantity",
 				func() *kueue.ClusterQueue {
 					flavors := make([]kueue.FlavorQuotas, flavorsMaxItems+1)
 					for i := range flavors {
-						flavors[i] = *testing.MakeFlavorQuotas(fmt.Sprintf("f%d", i)).
+						flavors[i] = *utiltestingapi.MakeFlavorQuotas(fmt.Sprintf("f%d", i)).
 							Resource(corev1.ResourceCPU).
 							Obj()
 					}
-					return testing.MakeClusterQueue("cluster-queue").ResourceGroup(flavors...).Obj()
+					return utiltestingapi.MakeClusterQueue("cluster-queue").ResourceGroup(flavors...).Obj()
 				}(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should forbid clusterQueue creation with unqualified labelSelector",
-				testing.MakeClusterQueue("cluster-queue").NamespaceSelector(&metav1.LabelSelector{
+				utiltestingapi.MakeClusterQueue("cluster-queue").NamespaceSelector(&metav1.LabelSelector{
 					MatchLabels: map[string]string{"nospecialchars^=@": "bar"},
 				}).Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should forbid to create clusterQueue with unknown clusterQueueingStrategy",
-				testing.MakeClusterQueue("cluster-queue").QueueingStrategy(kueue.QueueingStrategy("unknown")).Obj(),
+				utiltestingapi.MakeClusterQueue("cluster-queue").QueueingStrategy(kueue.QueueingStrategy("unknown")).Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should allow to create clusterQueue with empty clusterQueueingStrategy",
-				testing.MakeClusterQueue("cluster-queue").QueueingStrategy(kueue.QueueingStrategy("")).Obj(),
+				utiltestingapi.MakeClusterQueue("cluster-queue").QueueingStrategy(kueue.QueueingStrategy("")).Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow to create clusterQueue with empty preemption",
-				testing.MakeClusterQueue("cluster-queue").Preemption(kueue.ClusterQueuePreemption{}).Obj(),
+				utiltestingapi.MakeClusterQueue("cluster-queue").Preemption(kueue.ClusterQueuePreemption{}).Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow to create clusterQueue with preemption policies",
-				testing.MakeClusterQueue("cluster-queue").Preemption(kueue.ClusterQueuePreemption{
+				utiltestingapi.MakeClusterQueue("cluster-queue").Preemption(kueue.ClusterQueuePreemption{
 					ReclaimWithinCohort: kueue.PreemptionPolicyAny,
 					WithinClusterQueue:  kueue.PreemptionPolicyLowerPriority,
 				}).FlavorFungibility(*defaultFlavorFungibility).Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should forbid to create clusterQueue with unknown preemption.withinCohort",
-				testing.MakeClusterQueue("cluster-queue").Preemption(kueue.ClusterQueuePreemption{ReclaimWithinCohort: "unknown"}).Obj(),
+				utiltestingapi.MakeClusterQueue("cluster-queue").Preemption(kueue.ClusterQueuePreemption{ReclaimWithinCohort: "unknown"}).Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should forbid to create clusterQueue with unknown preemption.withinClusterQueue",
-				testing.MakeClusterQueue("cluster-queue").Preemption(kueue.ClusterQueuePreemption{WithinClusterQueue: "unknown"}).Obj(),
+				utiltestingapi.MakeClusterQueue("cluster-queue").Preemption(kueue.ClusterQueuePreemption{WithinClusterQueue: "unknown"}).Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should allow to create clusterQueue with built-in resources with qualified names",
-				testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU).Obj()).
+				utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU).Obj()).
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should forbid to create clusterQueue with invalid resource name",
-				testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas("default").Resource("@cpu").Obj()).
+				utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource("@cpu").Obj()).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should allow to create clusterQueue with valid cohort",
-				testing.MakeClusterQueue("cluster-queue").Cohort("prod").Obj(),
+				utiltestingapi.MakeClusterQueue("cluster-queue").Cohort("prod").Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should forbid to create clusterQueue with invalid cohort",
-				testing.MakeClusterQueue("cluster-queue").Cohort("@prod").Obj(),
+				utiltestingapi.MakeClusterQueue("cluster-queue").Cohort("@prod").Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should allow to create clusterQueue with extended resources with qualified names",
-				testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas("default").Resource("example.com/gpu").Obj()).
+				utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource("example.com/gpu").Obj()).
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow to create clusterQueue with flavor with qualified names",
-				testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU).Obj()).
+				utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU).Obj()).
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should forbid to create clusterQueue with flavor with unqualified names",
-				testing.MakeClusterQueue("cluster-queue").
-					ResourceGroup(*testing.MakeFlavorQuotas("invalid_name").Obj()).
+				utiltestingapi.MakeClusterQueue("cluster-queue").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("invalid_name").Obj()).
 					Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should forbid to create clusterQueue with flavor quota with negative value",
-				testing.MakeClusterQueue("cluster-queue").
+				utiltestingapi.MakeClusterQueue("cluster-queue").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "-1").Obj()).
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "-1").Obj()).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should allow to create clusterQueue with flavor quota with zero values",
-				testing.MakeClusterQueue("cluster-queue").
+				utiltestingapi.MakeClusterQueue("cluster-queue").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "0").Obj()).
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "0").Obj()).
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow to create clusterQueue with flavor quota with borrowingLimit 0",
-				testing.MakeClusterQueue("cluster-queue").
+				utiltestingapi.MakeClusterQueue("cluster-queue").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "0").Obj()).
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "0").Obj()).
 					Cohort("cohort").
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should forbid to create clusterQueue with flavor quota with negative borrowingLimit",
-				testing.MakeClusterQueue("cluster-queue").
+				utiltestingapi.MakeClusterQueue("cluster-queue").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "-1").Obj()).
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "-1").Obj()).
 					Cohort("cohort").
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should forbid to create clusterQueue with flavor quota with borrowingLimit and empty cohort",
-				testing.MakeClusterQueue("cluster-queue").
+				utiltestingapi.MakeClusterQueue("cluster-queue").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "1").Obj()).
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "1").Obj()).
 					Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should allow to create clusterQueue with empty queueing strategy",
-				testing.MakeClusterQueue("cluster-queue").
+				utiltestingapi.MakeClusterQueue("cluster-queue").
 					QueueingStrategy("").
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should forbid to create clusterQueue with namespaceSelector with invalid labels",
-				testing.MakeClusterQueue("cluster-queue").NamespaceSelector(&metav1.LabelSelector{
+				utiltestingapi.MakeClusterQueue("cluster-queue").NamespaceSelector(&metav1.LabelSelector{
 					MatchLabels: map[string]string{"nospecialchars^=@": "bar"},
 				}).Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should forbid to create clusterQueue with namespaceSelector with invalid expressions",
-				testing.MakeClusterQueue("cluster-queue").NamespaceSelector(&metav1.LabelSelector{
+				utiltestingapi.MakeClusterQueue("cluster-queue").NamespaceSelector(&metav1.LabelSelector{
 					MatchExpressions: []metav1.LabelSelectorRequirement{
 						{
 							Key:      "key",
@@ -386,22 +387,22 @@ var _ = ginkgo.Describe("ClusterQueue Webhook", ginkgo.Ordered, func() {
 				}).Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should allow to create clusterQueue with multiple resource groups",
-				testing.MakeClusterQueue("cluster-queue").
+				utiltestingapi.MakeClusterQueue("cluster-queue").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("alpha").
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource(corev1.ResourceCPU, "0").
 							Resource(corev1.ResourceMemory, "0").
 							Obj(),
-						*testing.MakeFlavorQuotas("beta").
+						*utiltestingapi.MakeFlavorQuotas("beta").
 							Resource(corev1.ResourceCPU, "0").
 							Resource(corev1.ResourceMemory, "0").
 							Obj(),
 					).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("gamma").
+						*utiltestingapi.MakeFlavorQuotas("gamma").
 							Resource("example.com/gpu", "0").
 							Obj(),
-						*testing.MakeFlavorQuotas("omega").
+						*utiltestingapi.MakeFlavorQuotas("omega").
 							Resource("example.com/gpu", "0").
 							Obj(),
 					).
@@ -417,11 +418,11 @@ var _ = ginkgo.Describe("ClusterQueue Webhook", ginkgo.Ordered, func() {
 							{
 								CoveredResources: []corev1.ResourceName{corev1.ResourceCPU, corev1.ResourceMemory},
 								Flavors: []kueue.FlavorQuotas{
-									*testing.MakeFlavorQuotas("alpha").
+									*utiltestingapi.MakeFlavorQuotas("alpha").
 										Resource(corev1.ResourceCPU, "0").
 										Resource(corev1.ResourceMemory, "0").
 										Obj(),
-									*testing.MakeFlavorQuotas("beta").
+									*utiltestingapi.MakeFlavorQuotas("beta").
 										Resource(corev1.ResourceMemory, "0").
 										Resource(corev1.ResourceCPU, "0").
 										Obj(),
@@ -441,7 +442,7 @@ var _ = ginkgo.Describe("ClusterQueue Webhook", ginkgo.Ordered, func() {
 							{
 								CoveredResources: []corev1.ResourceName{corev1.ResourceCPU, corev1.ResourceMemory},
 								Flavors: []kueue.FlavorQuotas{
-									*testing.MakeFlavorQuotas("alpha").
+									*utiltestingapi.MakeFlavorQuotas("alpha").
 										Resource(corev1.ResourceCPU, "0").
 										Obj(),
 								},
@@ -460,7 +461,7 @@ var _ = ginkgo.Describe("ClusterQueue Webhook", ginkgo.Ordered, func() {
 							{
 								CoveredResources: []corev1.ResourceName{corev1.ResourceCPU},
 								Flavors: []kueue.FlavorQuotas{
-									*testing.MakeFlavorQuotas("alpha").
+									*utiltestingapi.MakeFlavorQuotas("alpha").
 										Resource(corev1.ResourceCPU, "0").
 										Resource(corev1.ResourceMemory, "0").
 										Obj(),
@@ -480,7 +481,7 @@ var _ = ginkgo.Describe("ClusterQueue Webhook", ginkgo.Ordered, func() {
 							{
 								CoveredResources: []corev1.ResourceName{"blah"},
 								Flavors: []kueue.FlavorQuotas{
-									*testing.MakeFlavorQuotas("alpha").
+									*utiltestingapi.MakeFlavorQuotas("alpha").
 										Resource(corev1.ResourceCPU, "0").
 										Resource(corev1.ResourceMemory, "0").
 										Obj(),
@@ -491,28 +492,28 @@ var _ = ginkgo.Describe("ClusterQueue Webhook", ginkgo.Ordered, func() {
 				},
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should forbid to create clusterQueue with resource in more than one resource group",
-				testing.MakeClusterQueue("cluster-queue").
+				utiltestingapi.MakeClusterQueue("cluster-queue").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("alpha").
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource(corev1.ResourceCPU, "0").
 							Resource(corev1.ResourceMemory, "0").
 							Obj(),
 					).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("beta").
+						*utiltestingapi.MakeFlavorQuotas("beta").
 							Resource(corev1.ResourceMemory, "0").
 							Obj(),
 					).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should forbid to create clusterQueue with flavor in more than one resource group",
-				testing.MakeClusterQueue("cluster-queue").
+				utiltestingapi.MakeClusterQueue("cluster-queue").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU).Obj(),
-						*testing.MakeFlavorQuotas("beta").Resource(corev1.ResourceCPU).Obj(),
+						*utiltestingapi.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU).Obj(),
+						*utiltestingapi.MakeFlavorQuotas("beta").Resource(corev1.ResourceCPU).Obj(),
 					).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("beta").Resource(corev1.ResourceMemory).Obj(),
+						*utiltestingapi.MakeFlavorQuotas("beta").Resource(corev1.ResourceMemory).Obj(),
 					).
 					Obj(),
 				testing.BeForbiddenError()),
diff --git a/test/integration/singlecluster/webhook/core/cohort_test.go b/test/integration/singlecluster/webhook/core/cohort_test.go
index 2c86ca3b7..114eb8141 100644
--- a/test/integration/singlecluster/webhook/core/cohort_test.go
+++ b/test/integration/singlecluster/webhook/core/cohort_test.go
@@ -32,6 +32,7 @@ import (
 	config "sigs.k8s.io/kueue/apis/config/v1beta1"
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -55,33 +56,33 @@ var _ = ginkgo.Describe("Cohort Webhook", ginkgo.Ordered, func() {
 			gomega.Expect(err).Should(matcher)
 		},
 			ginkgo.Entry("Should disallow empty name",
-				testing.MakeCohort("").Obj(),
+				utiltestingapi.MakeCohort("").Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should allow default Cohort",
-				testing.MakeCohort("cohort").Obj(),
+				utiltestingapi.MakeCohort("cohort").Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow valid parent name",
-				testing.MakeCohort("cohort").Parent("prod").Obj(),
+				utiltestingapi.MakeCohort("cohort").Parent("prod").Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should reject invalid parent name",
-				testing.MakeCohort("cohort").Parent("@prod").Obj(),
+				utiltestingapi.MakeCohort("cohort").Parent("@prod").Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("ResourceGroup should have at least one flavor",
-				testing.MakeCohort("cohort").ResourceGroup().Obj(),
+				utiltestingapi.MakeCohort("cohort").ResourceGroup().Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("FlavorQuota should have at least one resource",
-				testing.MakeCohort("cohort").
-					ResourceGroup(*testing.MakeFlavorQuotas("foo").Obj()).
+				utiltestingapi.MakeCohort("cohort").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("foo").Obj()).
 					Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should reject invalid flavor name",
-				testing.MakeCohort("cohort").
-					ResourceGroup(*testing.MakeFlavorQuotas("@x86").Resource(corev1.ResourceCPU, "5").Obj()).
+				utiltestingapi.MakeCohort("cohort").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("@x86").Resource(corev1.ResourceCPU, "5").Obj()).
 					Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should allow valid resource name",
-				testing.MakeCohort("cohort").
-					ResourceGroup(*testing.MakeFlavorQuotas("x86").Resource("@cpu", "5").Obj()).
+				utiltestingapi.MakeCohort("cohort").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource("@cpu", "5").Obj()).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should reject too many flavors in resource group",
@@ -89,100 +90,100 @@ var _ = ginkgo.Describe("Cohort Webhook", ginkgo.Ordered, func() {
 					var flavors []kueue.FlavorQuotas
 					for i := range 65 {
 						flavors = append(flavors,
-							*testing.MakeFlavorQuotas(fmt.Sprintf("f%d", i)).
+							*utiltestingapi.MakeFlavorQuotas(fmt.Sprintf("f%d", i)).
 								Resource(corev1.ResourceCPU).
 								Obj(),
 						)
 					}
-					return testing.MakeCohort("cohort").
+					return utiltestingapi.MakeCohort("cohort").
 						ResourceGroup(flavors...).
 						Obj()
 				}(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should reject too many resources in resource group",
 				func() *kueue.Cohort {
-					fq := testing.MakeFlavorQuotas("flavor")
+					fq := utiltestingapi.MakeFlavorQuotas("flavor")
 					for i := range 65 {
 						fq = fq.Resource(corev1.ResourceName(fmt.Sprintf("cpu%d", i)))
 					}
-					return testing.MakeCohort("cohort").
+					return utiltestingapi.MakeCohort("cohort").
 						ResourceGroup(*fq.Obj()).
 						Obj()
 				}(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should allow resource with valid name",
-				testing.MakeCohort("cohort").
-					ResourceGroup(*testing.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU).Obj()).
+				utiltestingapi.MakeCohort("cohort").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource(corev1.ResourceCPU).Obj()).
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should reject resource with invalid name",
-				testing.MakeCohort("cohort").
-					ResourceGroup(*testing.MakeFlavorQuotas("default").Resource("@cpu").Obj()).
+				utiltestingapi.MakeCohort("cohort").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource("@cpu").Obj()).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should allow extended resources with valid name",
-				testing.MakeCohort("cohort").
-					ResourceGroup(*testing.MakeFlavorQuotas("default").Resource("example.com/gpu").Obj()).
+				utiltestingapi.MakeCohort("cohort").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("default").Resource("example.com/gpu").Obj()).
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow flavor with valid name",
-				testing.MakeCohort("cohort").
-					ResourceGroup(*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU).Obj()).
+				utiltestingapi.MakeCohort("cohort").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU).Obj()).
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should reject flavor with invalid name",
-				testing.MakeCohort("cohort").
-					ResourceGroup(*testing.MakeFlavorQuotas("x_86").Resource(corev1.ResourceCPU).Obj()).
+				utiltestingapi.MakeCohort("cohort").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x_86").Resource(corev1.ResourceCPU).Obj()).
 					Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should reject negative nominal quota",
-				testing.MakeCohort("cohort").
-					ResourceGroup(*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "-1").Obj()).
+				utiltestingapi.MakeCohort("cohort").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "-1").Obj()).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should reject negative borrowing limit",
-				testing.MakeCohort("cohort").
-					ResourceGroup(*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "-1").Obj()).
+				utiltestingapi.MakeCohort("cohort").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "-1").Obj()).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should reject negative lending limit",
-				testing.MakeCohort("cohort").
-					ResourceGroup(*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "", "-1").Obj()).
+				utiltestingapi.MakeCohort("cohort").
+					ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "", "-1").Obj()).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should reject borrowingLimit when no parent",
-				testing.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "1").Obj()).
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "1").Obj()).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should allow borrowingLimit 0 when parent exists",
-				testing.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "0").Obj()).
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "0").Obj()).
 					Parent("parent").
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow borrowingLimit when parent exists",
-				testing.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "1").Obj()).
+						*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "1", "1").Obj()).
 					Parent("parent").
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should reject lendingLimit when no parent",
-				testing.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("x86").
+						*utiltestingapi.MakeFlavorQuotas("x86").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("1").LendingLimit("1").Append().
 							Obj(),
 					).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should allow lendingLimit when parent exists",
-				testing.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("x86").
+						*utiltestingapi.MakeFlavorQuotas("x86").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("1").LendingLimit("1").Append().
 							Obj(),
 					).
@@ -190,9 +191,9 @@ var _ = ginkgo.Describe("Cohort Webhook", ginkgo.Ordered, func() {
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow lendingLimit 0 when parent exists",
-				testing.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("x86").
+						*utiltestingapi.MakeFlavorQuotas("x86").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("0").LendingLimit("0").Append().
 							Obj(),
 					).
@@ -200,9 +201,9 @@ var _ = ginkgo.Describe("Cohort Webhook", ginkgo.Ordered, func() {
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow lending limit to exceed nominal quota",
-				testing.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("x86").
+						*utiltestingapi.MakeFlavorQuotas("x86").
 							ResourceQuotaWrapper(corev1.ResourceCPU).NominalQuota("3").LendingLimit("5").Append().
 							Obj(),
 					).
@@ -210,22 +211,22 @@ var _ = ginkgo.Describe("Cohort Webhook", ginkgo.Ordered, func() {
 					Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow multiple resource groups",
-				testing.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("alpha").
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource(corev1.ResourceCPU, "0").
 							Resource(corev1.ResourceMemory, "0").
 							Obj(),
-						*testing.MakeFlavorQuotas("beta").
+						*utiltestingapi.MakeFlavorQuotas("beta").
 							Resource(corev1.ResourceCPU, "0").
 							Resource(corev1.ResourceMemory, "0").
 							Obj(),
 					).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("gamma").
+						*utiltestingapi.MakeFlavorQuotas("gamma").
 							Resource("example.com/gpu", "0").
 							Obj(),
-						*testing.MakeFlavorQuotas("omega").
+						*utiltestingapi.MakeFlavorQuotas("omega").
 							Resource("example.com/gpu", "0").
 							Obj(),
 					).
@@ -241,11 +242,11 @@ var _ = ginkgo.Describe("Cohort Webhook", ginkgo.Ordered, func() {
 							{
 								CoveredResources: []corev1.ResourceName{corev1.ResourceCPU, corev1.ResourceMemory},
 								Flavors: []kueue.FlavorQuotas{
-									*testing.MakeFlavorQuotas("alpha").
+									*utiltestingapi.MakeFlavorQuotas("alpha").
 										Resource(corev1.ResourceCPU, "0").
 										Resource(corev1.ResourceMemory, "0").
 										Obj(),
-									*testing.MakeFlavorQuotas("beta").
+									*utiltestingapi.MakeFlavorQuotas("beta").
 										Resource(corev1.ResourceMemory, "0").
 										Resource(corev1.ResourceCPU, "0").
 										Obj(),
@@ -265,7 +266,7 @@ var _ = ginkgo.Describe("Cohort Webhook", ginkgo.Ordered, func() {
 							{
 								CoveredResources: []corev1.ResourceName{corev1.ResourceCPU, corev1.ResourceMemory},
 								Flavors: []kueue.FlavorQuotas{
-									*testing.MakeFlavorQuotas("alpha").
+									*utiltestingapi.MakeFlavorQuotas("alpha").
 										Resource(corev1.ResourceCPU, "0").
 										Obj(),
 								},
@@ -284,7 +285,7 @@ var _ = ginkgo.Describe("Cohort Webhook", ginkgo.Ordered, func() {
 							{
 								CoveredResources: []corev1.ResourceName{corev1.ResourceCPU},
 								Flavors: []kueue.FlavorQuotas{
-									*testing.MakeFlavorQuotas("alpha").
+									*utiltestingapi.MakeFlavorQuotas("alpha").
 										Resource(corev1.ResourceCPU, "0").
 										Resource(corev1.ResourceMemory, "0").
 										Obj(),
@@ -295,62 +296,62 @@ var _ = ginkgo.Describe("Cohort Webhook", ginkgo.Ordered, func() {
 				},
 				testing.BeInvalidError()),
 			ginkgo.Entry("Should reject resource in more than one resource group",
-				testing.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("alpha").
+						*utiltestingapi.MakeFlavorQuotas("alpha").
 							Resource(corev1.ResourceCPU, "0").
 							Resource(corev1.ResourceMemory, "0").
 							Obj(),
 					).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("beta").
+						*utiltestingapi.MakeFlavorQuotas("beta").
 							Resource(corev1.ResourceMemory, "0").
 							Obj(),
 					).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should reject flavor in more than one resource group",
-				testing.MakeCohort("cohort").
+				utiltestingapi.MakeCohort("cohort").
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU).Obj(),
-						*testing.MakeFlavorQuotas("beta").Resource(corev1.ResourceCPU).Obj(),
+						*utiltestingapi.MakeFlavorQuotas("alpha").Resource(corev1.ResourceCPU).Obj(),
+						*utiltestingapi.MakeFlavorQuotas("beta").Resource(corev1.ResourceCPU).Obj(),
 					).
 					ResourceGroup(
-						*testing.MakeFlavorQuotas("beta").Resource(corev1.ResourceMemory).Obj(),
+						*utiltestingapi.MakeFlavorQuotas("beta").Resource(corev1.ResourceMemory).Obj(),
 					).
 					Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should allow FairSharing weight",
-				testing.MakeCohort("cohort").FairWeight(resource.MustParse("1")).Obj(),
+				utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("1")).Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow zero FairSharing weight",
-				testing.MakeCohort("cohort").FairWeight(resource.MustParse("0")).Obj(),
+				utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("0")).Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should forbid negative FairSharing weight",
-				testing.MakeCohort("cohort").FairWeight(resource.MustParse("-1")).Obj(),
+				utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("-1")).Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should allow fractional FairSharing weight",
-				testing.MakeCohort("cohort").FairWeight(resource.MustParse("0.5")).Obj(),
+				utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("0.5")).Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow small FairSharing weight",
 				// 10^-3
-				testing.MakeCohort("cohort").FairWeight(resource.MustParse("1m")).Obj(),
+				utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("1m")).Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow even smaller FairSharing weight",
 				// 10^-6
-				testing.MakeCohort("cohort").FairWeight(resource.MustParse("1u")).Obj(),
+				utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("1u")).Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should allow smallest FairSharing weight",
 				// 2 * 10^-9
-				testing.MakeCohort("cohort").FairWeight(resource.MustParse("2n")).Obj(),
+				utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("2n")).Obj(),
 				gomega.Succeed()),
 			ginkgo.Entry("Should forbid threshold FairSharing weight",
 				// 10^-9
-				testing.MakeCohort("cohort").FairWeight(resource.MustParse("1n")).Obj(),
+				utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("1n")).Obj(),
 				testing.BeForbiddenError()),
 			ginkgo.Entry("Should forbid collapsed FairSharing weight",
 				// 10^-10
-				testing.MakeCohort("cohort").FairWeight(resource.MustParse("0.0000000001")).Obj(),
+				utiltestingapi.MakeCohort("cohort").FairWeight(resource.MustParse("0.0000000001")).Obj(),
 				testing.BeForbiddenError()),
 		)
 	})
@@ -365,7 +366,7 @@ var _ = ginkgo.Describe("Cohort Webhook", ginkgo.Ordered, func() {
 		})
 
 		ginkgo.It("Should update parent", func() {
-			cohort = testing.MakeCohort("cohort").Obj()
+			cohort = utiltestingapi.MakeCohort("cohort").Obj()
 			util.MustCreate(ctx, k8sClient, cohort)
 
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -376,7 +377,7 @@ var _ = ginkgo.Describe("Cohort Webhook", ginkgo.Ordered, func() {
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 		ginkgo.It("Should reject invalid parent", func() {
-			cohort = testing.MakeCohort("cohort").Obj()
+			cohort = utiltestingapi.MakeCohort("cohort").Obj()
 			util.MustCreate(ctx, k8sClient, cohort)
 
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -387,8 +388,8 @@ var _ = ginkgo.Describe("Cohort Webhook", ginkgo.Ordered, func() {
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 		ginkgo.It("Should reject negative borrowing limit", func() {
-			cohort = testing.MakeCohort("cohort").
-				ResourceGroup(*testing.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "-1").Obj()).
+			cohort = utiltestingapi.MakeCohort("cohort").
+				ResourceGroup(*utiltestingapi.MakeFlavorQuotas("x86").Resource(corev1.ResourceCPU, "-1").Obj()).
 				Obj()
 			gomega.Expect(k8sClient.Create(ctx, cohort)).ShouldNot(gomega.Succeed())
 		})
diff --git a/test/integration/singlecluster/webhook/core/localqueue_test.go b/test/integration/singlecluster/webhook/core/localqueue_test.go
index f4cdbfbe0..01da0f5ff 100644
--- a/test/integration/singlecluster/webhook/core/localqueue_test.go
+++ b/test/integration/singlecluster/webhook/core/localqueue_test.go
@@ -27,6 +27,7 @@ import (
 	config "sigs.k8s.io/kueue/apis/config/v1beta1"
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -44,12 +45,12 @@ var _ = ginkgo.Describe("Queue validating webhook", ginkgo.Ordered, func() {
 	ginkgo.When("Updating a Queue", func() {
 		ginkgo.It("Should reject bad value for spec.clusterQueue", func() {
 			ginkgo.By("Creating a new Queue")
-			obj := testing.MakeLocalQueue(queueName, ns.Name).ClusterQueue("invalid_name").Obj()
+			obj := utiltestingapi.MakeLocalQueue(queueName, ns.Name).ClusterQueue("invalid_name").Obj()
 			gomega.Expect(k8sClient.Create(ctx, obj)).Should(testing.BeInvalidError())
 		})
 		ginkgo.It("Should reject the change of spec.clusterQueue", func() {
 			ginkgo.By("Creating a new Queue")
-			obj := testing.MakeLocalQueue(queueName, ns.Name).ClusterQueue("foo").Obj()
+			obj := utiltestingapi.MakeLocalQueue(queueName, ns.Name).ClusterQueue("foo").Obj()
 			util.MustCreate(ctx, k8sClient, obj)
 
 			ginkgo.By("Updating the Queue")
diff --git a/test/integration/singlecluster/webhook/core/resourceflavor_test.go b/test/integration/singlecluster/webhook/core/resourceflavor_test.go
index 068d30e20..ac9d45d8d 100644
--- a/test/integration/singlecluster/webhook/core/resourceflavor_test.go
+++ b/test/integration/singlecluster/webhook/core/resourceflavor_test.go
@@ -31,6 +31,7 @@ import (
 	config "sigs.k8s.io/kueue/apis/config/v1beta1"
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -60,7 +61,7 @@ var _ = ginkgo.Describe("ResourceFlavor Webhook", ginkgo.Ordered, func() {
 
 	ginkgo.When("Creating a ResourceFlavor", func() {
 		ginkgo.It("Should be valid", func() {
-			resourceFlavor := testing.MakeResourceFlavor("resource-flavor").NodeLabel("foo", "bar").
+			resourceFlavor := utiltestingapi.MakeResourceFlavor("resource-flavor").NodeLabel("foo", "bar").
 				Taint(corev1.Taint{
 					Key:    "spot",
 					Value:  "true",
@@ -77,7 +78,7 @@ var _ = ginkgo.Describe("ResourceFlavor Webhook", ginkgo.Ordered, func() {
 		})
 		ginkgo.It("Should have a finalizer", func() {
 			ginkgo.By("Creating a new empty resourceFlavor")
-			resourceFlavor := testing.MakeResourceFlavor("resource-flavor").Obj()
+			resourceFlavor := utiltestingapi.MakeResourceFlavor("resource-flavor").Obj()
 			util.MustCreate(ctx, k8sClient, resourceFlavor)
 			defer func() {
 				var rf kueue.ResourceFlavor
@@ -94,7 +95,7 @@ var _ = ginkgo.Describe("ResourceFlavor Webhook", ginkgo.Ordered, func() {
 	})
 
 	ginkgo.DescribeTable("invalid number of properties", func(taintsCount int, nodeSelectorCount int, isInvalid bool) {
-		rf := testing.MakeResourceFlavor("resource-flavor")
+		rf := utiltestingapi.MakeResourceFlavor("resource-flavor")
 		for i := range taintsCount {
 			rf = rf.Taint(corev1.Taint{
 				Key:    fmt.Sprintf("t%d", i),
@@ -128,7 +129,7 @@ var _ = ginkgo.Describe("ResourceFlavor Webhook", ginkgo.Ordered, func() {
 	ginkgo.When("Updating a ResourceFlavor with invalid taints", func() {
 		ginkgo.It("Should fail to update", func() {
 			ginkgo.By("Creating a new resourceFlavor")
-			resourceFlavor := testing.MakeResourceFlavor("resource-flavor").Obj()
+			resourceFlavor := utiltestingapi.MakeResourceFlavor("resource-flavor").Obj()
 			util.MustCreate(ctx, k8sClient, resourceFlavor)
 			defer func() {
 				var rf kueue.ResourceFlavor
@@ -163,7 +164,7 @@ var _ = ginkgo.Describe("ResourceFlavor Webhook", ginkgo.Ordered, func() {
 		gomega.Expect(err).Should(matcher)
 	},
 		ginkgo.Entry("Should fail to create with invalid taints",
-			testing.MakeResourceFlavor("resource-flavor").
+			utiltestingapi.MakeResourceFlavor("resource-flavor").
 				Taint(corev1.Taint{
 					Key: "skdajf",
 				}).
@@ -174,10 +175,10 @@ var _ = ginkgo.Describe("ResourceFlavor Webhook", ginkgo.Ordered, func() {
 				}).Obj(),
 			testing.BeInvalidError()),
 		ginkgo.Entry("Should fail to create with invalid label name",
-			testing.MakeResourceFlavor("resource-flavor").NodeLabel("@abc", "foo").Obj(),
+			utiltestingapi.MakeResourceFlavor("resource-flavor").NodeLabel("@abc", "foo").Obj(),
 			testing.BeForbiddenError()),
 		ginkgo.Entry("Should fail to create with invalid tolerations",
-			testing.MakeResourceFlavor("resource-flavor").
+			utiltestingapi.MakeResourceFlavor("resource-flavor").
 				Toleration(corev1.Toleration{
 					Key:      "@abc",
 					Operator: corev1.TolerationOpEqual,
diff --git a/test/integration/singlecluster/webhook/core/workload_test.go b/test/integration/singlecluster/webhook/core/workload_test.go
index 194922002..9befc27ab 100644
--- a/test/integration/singlecluster/webhook/core/workload_test.go
+++ b/test/integration/singlecluster/webhook/core/workload_test.go
@@ -37,6 +37,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/constants"
 	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/util"
 )
@@ -74,7 +75,7 @@ var _ = ginkgo.Describe("Workload defaulting webhook", ginkgo.Ordered, func() {
 				ObjectMeta: metav1.ObjectMeta{Name: workloadName, Namespace: ns.Name},
 				Spec: kueue.WorkloadSpec{
 					PodSets: []kueue.PodSet{
-						*testing.MakePodSet("", 1).
+						*utiltestingapi.MakePodSet("", 1).
 							Containers(corev1.Container{}).
 							Obj(),
 					},
@@ -98,10 +99,10 @@ var _ = ginkgo.Describe("Workload defaulting webhook", ginkgo.Ordered, func() {
 				ObjectMeta: metav1.ObjectMeta{Name: workloadName, Namespace: ns.Name},
 				Spec: kueue.WorkloadSpec{
 					PodSets: []kueue.PodSet{
-						*testing.MakePodSet("", 1).
+						*utiltestingapi.MakePodSet("", 1).
 							Containers(corev1.Container{}).
 							Obj(),
-						*testing.MakePodSet("", 1).
+						*utiltestingapi.MakePodSet("", 1).
 							Containers(corev1.Container{}).
 							Obj(),
 					},
@@ -128,9 +129,9 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 		ginkgo.DescribeTable("Should have valid PodSet when creating", func(podSetsCapacity int, podSetCount int, isInvalid bool) {
 			podSets := make([]kueue.PodSet, podSetsCapacity)
 			for i := range podSets {
-				podSets[i] = *testing.MakePodSet(kueue.NewPodSetReference(fmt.Sprintf("ps%d", i)), podSetCount).Obj()
+				podSets[i] = *utiltestingapi.MakePodSet(kueue.NewPodSetReference(fmt.Sprintf("ps%d", i)), podSetCount).Obj()
 			}
-			workload := testing.MakeWorkload(workloadName, ns.Name).PodSets(podSets...).Obj()
+			workload := utiltestingapi.MakeWorkload(workloadName, ns.Name).PodSets(podSets...).Obj()
 			err := k8sClient.Create(ctx, workload)
 			if isInvalid {
 				gomega.Expect(err).Should(testing.BeInvalidError())
@@ -154,22 +155,22 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 		},
 			ginkgo.Entry("valid workload",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).PodSets(
-						*testing.MakePodSet("driver", 1).Obj(),
-						*testing.MakePodSet("workers", 100).Obj(),
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).PodSets(
+						*utiltestingapi.MakePodSet("driver", 1).Obj(),
+						*utiltestingapi.MakePodSet("workers", 100).Obj(),
 					).Obj()
 				},
 				nil),
 			ginkgo.Entry("invalid podSet name",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).PodSets(
-						*testing.MakePodSet("@driver", 1).Obj(),
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).PodSets(
+						*utiltestingapi.MakePodSet("@driver", 1).Obj(),
 					).Obj()
 				},
 				testing.BeInvalidError()),
 			ginkgo.Entry("invalid priorityClassName",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						PriorityClass("invalid_class").
 						Priority(0).
 						Obj()
@@ -177,29 +178,29 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 				testing.BeInvalidError()),
 			ginkgo.Entry("empty priorityClassName is valid",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						Obj()
 				},
 				nil),
 			ginkgo.Entry("priority should not be nil when priorityClassName is set",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						PriorityClass("priority").
 						Obj()
 				},
 				testing.BeInvalidError()),
 			ginkgo.Entry("invalid queueName",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						Queue("@invalid").
 						Obj()
 				},
 				testing.BeInvalidError()),
 			ginkgo.Entry("should not request num-pods resource",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						PodSets(
-							*testing.MakePodSet("bad", 1).
+							*utiltestingapi.MakePodSet("bad", 1).
 								InitContainers(
 									testing.SingleContainerForRequest(map[corev1.ResourceName]string{
 										corev1.ResourcePods: "1",
@@ -217,17 +218,17 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 				testing.BeForbiddenError()),
 			ginkgo.Entry("empty podSetUpdates should be valid since it is optional",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						AdmissionChecks(kueue.AdmissionCheckState{}).
 						Obj()
 				},
 				nil),
 			ginkgo.Entry("matched names in podSetUpdates with names in podSets",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						PodSets(
-							*testing.MakePodSet("first", 1).Obj(),
-							*testing.MakePodSet("second", 1).Obj(),
+							*utiltestingapi.MakePodSet("first", 1).Obj(),
+							*utiltestingapi.MakePodSet("second", 1).Obj(),
 						).
 						AdmissionChecks(
 							kueue.AdmissionCheckState{
@@ -270,42 +271,42 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 				nil),
 			ginkgo.Entry("invalid podSet minCount (negative)",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						PodSets(
-							*testing.MakePodSet("ps1", 3).SetMinimumCount(-1).Obj(),
+							*utiltestingapi.MakePodSet("ps1", 3).SetMinimumCount(-1).Obj(),
 						).
 						Obj()
 				},
 				testing.BeInvalidError()),
 			ginkgo.Entry("invalid podSet minCount (too big)",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						PodSets(
-							*testing.MakePodSet("ps1", 3).SetMinimumCount(4).Obj(),
+							*utiltestingapi.MakePodSet("ps1", 3).SetMinimumCount(4).Obj(),
 						).
 						Obj()
 				},
 				testing.BeInvalidError()),
 			ginkgo.Entry("too many variable count podSets",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						PodSets(
-							*testing.MakePodSet("ps1", 3).SetMinimumCount(2).Obj(),
-							*testing.MakePodSet("ps2", 3).SetMinimumCount(1).Obj(),
+							*utiltestingapi.MakePodSet("ps1", 3).SetMinimumCount(2).Obj(),
+							*utiltestingapi.MakePodSet("ps2", 3).SetMinimumCount(1).Obj(),
 						).
 						Obj()
 				},
 				testing.BeForbiddenError()),
 			ginkgo.Entry("invalid maximumExexcutionTimeSeconds",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						MaximumExecutionTimeSeconds(0).
 						Obj()
 				},
 				testing.BeInvalidError()),
 			ginkgo.Entry("valid maximumExexcutionTimeSeconds",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						MaximumExecutionTimeSeconds(1).
 						Obj()
 				},
@@ -330,41 +331,41 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 		},
 			ginkgo.Entry("invalid clusterQueue name",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						Obj()
 				},
-				testing.MakeAdmission("@invalid").Obj(),
+				utiltestingapi.MakeAdmission("@invalid").Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("invalid podSet name in status assignment",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						Obj()
 				},
-				testing.MakeAdmission("cluster-queue", "@invalid").Obj(),
+				utiltestingapi.MakeAdmission("cluster-queue", "@invalid").Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("mismatched names in admission with names in podSets",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						PodSets(
-							*testing.MakePodSet("main2", 1).Obj(),
-							*testing.MakePodSet("main1", 1).Obj(),
+							*utiltestingapi.MakePodSet("main2", 1).Obj(),
+							*utiltestingapi.MakePodSet("main1", 1).Obj(),
 						).
 						Obj()
 				},
-				testing.MakeAdmission("cluster-queue", "main1", "main2", "main3").Obj(),
+				utiltestingapi.MakeAdmission("cluster-queue", "main1", "main2", "main3").Obj(),
 				testing.BeInvalidError()),
 			ginkgo.Entry("assignment usage should be divisible by count",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						PodSets(
-							*testing.MakePodSet(kueue.DefaultPodSetName, 3).
+							*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 3).
 								Request(corev1.ResourceCPU, "1").
 								Obj(),
 						).
 						Obj()
 				},
-				testing.MakeAdmission("cluster-queue").
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				utiltestingapi.MakeAdmission("cluster-queue").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "flv", "1").
 						Count(3).
 						Obj()).
@@ -384,10 +385,10 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 		},
 			ginkgo.Entry("mismatched names in podSetUpdates with names in podSets",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						PodSets(
-							*testing.MakePodSet("first", 1).Obj(),
-							*testing.MakePodSet("second", 1).Obj(),
+							*utiltestingapi.MakePodSet("first", 1).Obj(),
+							*utiltestingapi.MakePodSet("second", 1).Obj(),
 						).
 						Obj()
 				},
@@ -398,7 +399,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("invalid label name of podSetUpdate",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						Obj()
 				},
 				kueue.AdmissionCheckState{
@@ -408,7 +409,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("invalid node selector name of podSetUpdate",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						Obj()
 				},
 				kueue.AdmissionCheckState{
@@ -418,7 +419,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("invalid label value of podSetUpdate",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						Obj()
 				},
 				kueue.AdmissionCheckState{
@@ -430,9 +431,9 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 
 		ginkgo.It("invalid reclaimablePods", func() {
 			ginkgo.By("Creating a new Workload")
-			wl := testing.MakeWorkload(workloadName, ns.Name).
+			wl := utiltestingapi.MakeWorkload(workloadName, ns.Name).
 				PodSets(
-					*testing.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
 				).
 				Obj()
 			util.MustCreate(ctx, k8sClient, wl)
@@ -453,7 +454,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			priorityClass         *schedulingv1.PriorityClass
 		)
 		ginkgo.BeforeEach(func() {
-			workloadPriorityClass = testing.MakeWorkloadPriorityClass("workload-priority-class").PriorityValue(200).Obj()
+			workloadPriorityClass = utiltestingapi.MakeWorkloadPriorityClass("workload-priority-class").PriorityValue(200).Obj()
 			priorityClass = testing.MakePriorityClass("priority-class").PriorityValue(100).Obj()
 			util.MustCreate(ctx, k8sClient, workloadPriorityClass)
 			util.MustCreate(ctx, k8sClient, priorityClass)
@@ -470,7 +471,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 				workload := w()
 				util.MustCreate(ctx, k8sClient, workload)
 				if setQuotaReservation {
-					util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(workload), testing.MakeAdmission("cq").Obj())
+					util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(workload), utiltestingapi.MakeAdmission("cq").Obj())
 					util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, workload)
 				}
 				gomega.Eventually(func(g gomega.Gomega) {
@@ -482,17 +483,17 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			},
 			ginkgo.Entry("podSets should not be updated when has quota reservation: count",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).Obj()
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).Obj()
 				},
 				true,
 				func(newWL *kueue.Workload) {
-					newWL.Spec.PodSets = []kueue.PodSet{*testing.MakePodSet(kueue.DefaultPodSetName, 2).Obj()}
+					newWL.Spec.PodSets = []kueue.PodSet{*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 2).Obj()}
 				},
 				testing.BeForbiddenError(),
 			),
 			ginkgo.Entry("podSets should not be updated: podSpec",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).Obj()
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).Obj()
 				},
 				true,
 				func(newWL *kueue.Workload) {
@@ -517,7 +518,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("queueName can be updated when not admitted",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).Queue("q1").Obj()
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).Queue("q1").Obj()
 				},
 				false,
 				func(newWL *kueue.Workload) {
@@ -527,7 +528,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("queueName can be updated when admitting",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).Obj()
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).Obj()
 				},
 				false,
 				func(newWL *kueue.Workload) {
@@ -537,7 +538,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("queueName should not be updated once admitted",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).Queue("q1").Obj()
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).Queue("q1").Obj()
 				},
 				true,
 				func(newWL *kueue.Workload) {
@@ -547,8 +548,8 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("queueName can be updated when admission is reset",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).Queue("q1").
-						ReserveQuota(testing.MakeAdmission("cq").Obj()).Obj()
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).Queue("q1").
+						ReserveQuota(utiltestingapi.MakeAdmission("cq").Obj()).Obj()
 				},
 				false,
 				func(newWL *kueue.Workload) {
@@ -559,12 +560,12 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("admission can be set",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).Obj()
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).Obj()
 				},
 				false,
 				func(newWL *kueue.Workload) {
 					newWL.Status = kueue.WorkloadStatus{
-						Admission: testing.MakeAdmission("cluster-queue").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment("on-demand", "5", "1").Obj()).Obj(),
+						Admission: utiltestingapi.MakeAdmission("cluster-queue").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment("on-demand", "5", "1").Obj()).Obj(),
 						Conditions: []metav1.Condition{{
 							Type:               kueue.WorkloadQuotaReserved,
 							Status:             metav1.ConditionTrue,
@@ -578,8 +579,8 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("admission can be unset",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).ReserveQuota(
-						testing.MakeAdmission("cluster-queue").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment("on-demand", "5", "1").Obj()).Obj(),
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).ReserveQuota(
+						utiltestingapi.MakeAdmission("cluster-queue").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment("on-demand", "5", "1").Obj()).Obj(),
 					).Obj()
 				},
 				false,
@@ -590,7 +591,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("priorityClassSource should not be updated",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						Queue("q").
 						PriorityClass("test-class").PriorityClassSource(constants.PodPriorityClassSource).
 						Priority(10).
@@ -604,7 +605,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("priorityClassName should not be updated",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						Queue("q").
 						PriorityClass("test-class-1").PriorityClassSource(constants.PodPriorityClassSource).
 						Priority(10).
@@ -618,10 +619,10 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("should change other fields of admissionchecks when podSetUpdates is immutable",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						PodSets(
-							*testing.MakePodSet("first", 1).Obj(),
-							*testing.MakePodSet("second", 1).Obj(),
+							*utiltestingapi.MakePodSet("first", 1).Obj(),
+							*utiltestingapi.MakePodSet("second", 1).Obj(),
 						).AdmissionChecks(
 						kueue.AdmissionCheckState{
 							Name:          "ac1",
@@ -646,7 +647,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("updating priorityClassName before setting reserve quota for workload",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						Queue("q").
 						PriorityClass("test-class-1").PriorityClassSource(constants.PodPriorityClassSource).
 						Priority(10).Obj()
@@ -659,7 +660,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("updating priorityClassSource before setting reserve quota for workload",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						Queue("q").
 						PriorityClass("test-class").PriorityClassSource(constants.PodPriorityClassSource).
 						Priority(10).Obj()
@@ -672,7 +673,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("updating podSets before setting reserve quota for workload",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).Obj()
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).Obj()
 				},
 				false,
 				func(newWL *kueue.Workload) {
@@ -699,7 +700,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("Should allow the change of priority",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).Obj()
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).Obj()
 				},
 				false,
 				func(newWL *kueue.Workload) {
@@ -709,7 +710,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("Should forbid the change of spec.podSet",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).Obj()
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).Obj()
 				},
 				true,
 				func(newWL *kueue.Workload) {
@@ -719,13 +720,13 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("reclaimable pod count can go to 0 if the job is suspended",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						PodSets(
-							*testing.MakePodSet("ps1", 3).Obj(),
-							*testing.MakePodSet("ps2", 3).Obj(),
+							*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+							*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 						).
 						ReserveQuota(
-							testing.MakeAdmission("cluster-queue").
+							utiltestingapi.MakeAdmission("cluster-queue").
 								PodSets(kueue.PodSetAssignment{Name: "ps1"}, kueue.PodSetAssignment{Name: "ps2"}).
 								Obj(),
 						).
@@ -752,7 +753,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("can add maximum execution time when not admitted",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).Obj()
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).Obj()
 				},
 				false,
 				func(newWL *kueue.Workload) {
@@ -762,7 +763,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("can update maximum execution time when not admitted",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						MaximumExecutionTimeSeconds(1).
 						Obj()
 				},
@@ -774,7 +775,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("cannot add maximum execution time when admitted",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).Obj()
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).Obj()
 				},
 				true,
 				func(newWL *kueue.Workload) {
@@ -784,7 +785,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			),
 			ginkgo.Entry("cannot update maximum execution time when admitted",
 				func() *kueue.Workload {
-					return testing.MakeWorkload(workloadName, ns.Name).
+					return utiltestingapi.MakeWorkload(workloadName, ns.Name).
 						MaximumExecutionTimeSeconds(1).
 						Obj()
 				},
@@ -798,9 +799,9 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 
 		ginkgo.It("Should forbid the change of spec.queueName of an admitted workload", func() {
 			ginkgo.By("Creating and admitting a new Workload")
-			workload := testing.MakeWorkload(workloadName, ns.Name).Queue("queue1").Obj()
+			workload := utiltestingapi.MakeWorkload(workloadName, ns.Name).Queue("queue1").Obj()
 			util.MustCreate(ctx, k8sClient, workload)
-			util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(workload), testing.MakeAdmission("cq").Obj())
+			util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(workload), utiltestingapi.MakeAdmission("cq").Obj())
 
 			ginkgo.By("Updating queueName")
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -813,11 +814,11 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 
 		ginkgo.It("Should forbid the change of status.admission", func() {
 			ginkgo.By("Creating a new Workload")
-			workload := testing.MakeWorkload(workloadName, ns.Name).Obj()
+			workload := utiltestingapi.MakeWorkload(workloadName, ns.Name).Obj()
 			util.MustCreate(ctx, k8sClient, workload)
 
 			ginkgo.By("Admitting the Workload", func() {
-				util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(workload), testing.MakeAdmission("cluster-queue").Obj())
+				util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(workload), utiltestingapi.MakeAdmission("cluster-queue").Obj())
 				util.SyncAdmittedConditionForWorkloads(ctx, k8sClient, workload)
 			})
 
@@ -833,14 +834,14 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 
 		ginkgo.It("Should have priority once priorityClassName is set", func() {
 			ginkgo.By("Creating a new Workload")
-			workload := testing.MakeWorkload(workloadName, ns.Name).PriorityClass("priority").Obj()
+			workload := utiltestingapi.MakeWorkload(workloadName, ns.Name).PriorityClass("priority").Obj()
 			err := k8sClient.Create(ctx, workload)
 			gomega.Expect(err).Should(testing.BeInvalidError())
 		})
 
 		ginkgo.It("workload's priority should be mutable when referencing WorkloadPriorityClass", func() {
 			ginkgo.By("creating workload")
-			wl := testing.MakeWorkload("wl", ns.Name).Queue("lq").Request(corev1.ResourceCPU, "1").
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).Queue("lq").Request(corev1.ResourceCPU, "1").
 				PriorityClass("workload-priority-class").PriorityClassSource(constants.WorkloadPriorityClassSource).Priority(200).Obj()
 			util.MustCreate(ctx, k8sClient, wl)
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -862,7 +863,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 
 		ginkgo.It("workload's priority should be mutable when referencing PriorityClass", func() {
 			ginkgo.By("creating workload")
-			wl := testing.MakeWorkload("wl", ns.Name).Queue("lq").Request(corev1.ResourceCPU, "1").
+			wl := utiltestingapi.MakeWorkload("wl", ns.Name).Queue("lq").Request(corev1.ResourceCPU, "1").
 				PriorityClass("priority-class").PriorityClassSource(constants.PodPriorityClassSource).Priority(100).Obj()
 			util.MustCreate(ctx, k8sClient, wl)
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -884,25 +885,25 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 
 		ginkgo.It("admission should not be updated once set", func() {
 			ginkgo.By("Creating a new Workload")
-			workload := testing.MakeWorkload(workloadName, ns.Name).Obj()
+			workload := utiltestingapi.MakeWorkload(workloadName, ns.Name).Obj()
 			util.MustCreate(ctx, k8sClient, workload)
-			util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(workload), testing.MakeAdmission("cluster-queue").Obj())
+			util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(workload), utiltestingapi.MakeAdmission("cluster-queue").Obj())
 
 			ginkgo.By("Updating the workload setting admission")
 			gomega.Eventually(func(g gomega.Gomega) {
 				var newWL kueue.Workload
 				g.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(workload), &newWL)).To(gomega.Succeed())
-				newWL.Status.Admission = testing.MakeAdmission("cluster-queue").PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment("on-demand", "5", "1").Obj()).Obj()
+				newWL.Status.Admission = utiltestingapi.MakeAdmission("cluster-queue").PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).Assignment("on-demand", "5", "1").Obj()).Obj()
 				g.Expect(k8sClient.Status().Update(ctx, &newWL)).Should(testing.BeForbiddenError())
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 		})
 
 		ginkgo.It("reclaimable pod count can change up", func() {
 			ginkgo.By("Creating a new Workload")
-			wl := testing.MakeWorkload(workloadName, ns.Name).
+			wl := utiltestingapi.MakeWorkload(workloadName, ns.Name).
 				PodSets(
-					*testing.MakePodSet("ps1", 3).Obj(),
-					*testing.MakePodSet("ps2", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 				).
 				Obj()
 			util.MustCreate(ctx, k8sClient, wl)
@@ -911,7 +912,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			})).Should(gomega.Succeed())
 
 			util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(wl),
-				testing.MakeAdmission("cluster-queue").
+				utiltestingapi.MakeAdmission("cluster-queue").
 					PodSets(
 						kueue.PodSetAssignment{Name: "ps1"},
 						kueue.PodSetAssignment{Name: "ps2"}).
@@ -927,10 +928,10 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 
 		ginkgo.It("reclaimable pod count cannot change down", func() {
 			ginkgo.By("Creating a new Workload")
-			wl := testing.MakeWorkload(workloadName, ns.Name).
+			wl := utiltestingapi.MakeWorkload(workloadName, ns.Name).
 				PodSets(
-					*testing.MakePodSet("ps1", 3).Obj(),
-					*testing.MakePodSet("ps2", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps1", 3).Obj(),
+					*utiltestingapi.MakePodSet("ps2", 3).Obj(),
 				).
 				Obj()
 			util.MustCreate(ctx, k8sClient, wl)
@@ -940,7 +941,7 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			})).Should(gomega.Succeed())
 
 			util.SetQuotaReservation(ctx, k8sClient, client.ObjectKeyFromObject(wl),
-				testing.MakeAdmission("cluster-queue").
+				utiltestingapi.MakeAdmission("cluster-queue").
 					PodSets(
 						kueue.PodSetAssignment{Name: "ps1"},
 						kueue.PodSetAssignment{Name: "ps2"}).
@@ -955,10 +956,10 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 
 		ginkgo.It("podSetUpdates should be immutable when state is ready", func() {
 			ginkgo.By("Creating a new Workload")
-			wl := testing.MakeWorkload(workloadName, ns.Name).
+			wl := utiltestingapi.MakeWorkload(workloadName, ns.Name).
 				PodSets(
-					*testing.MakePodSet("first", 1).Obj(),
-					*testing.MakePodSet("second", 1).Obj(),
+					*utiltestingapi.MakePodSet("first", 1).Obj(),
+					*utiltestingapi.MakePodSet("second", 1).Obj(),
 				).
 				Obj()
 			util.MustCreate(ctx, k8sClient, wl)
@@ -994,8 +995,8 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.ElasticJobsViaWorkloadSlices, true)
 
 			ginkgo.By("Creating a new Workload")
-			wl := testing.MakeWorkload(workloadName, ns.Name).
-				PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 1).
+			wl := utiltestingapi.MakeWorkload(workloadName, ns.Name).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 1).
 					Request(corev1.ResourceCPU, "1").
 					Obj()).
 				Obj()
@@ -1004,8 +1005,8 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			ginkgo.By("Admitting the Workload")
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(wl), wl)).To(gomega.Succeed())
-				admission := testing.MakeAdmission("default").
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				admission := utiltestingapi.MakeAdmission("default").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "1").
 						Obj()).
 					Obj()
@@ -1026,8 +1027,8 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.ElasticJobsViaWorkloadSlices, true)
 
 			ginkgo.By("Creating a new Workload")
-			wl := testing.MakeWorkload(workloadName, ns.Name).
-				PodSets(*testing.MakePodSet(kueue.DefaultPodSetName, 10).
+			wl := utiltestingapi.MakeWorkload(workloadName, ns.Name).
+				PodSets(*utiltestingapi.MakePodSet(kueue.DefaultPodSetName, 10).
 					Request(corev1.ResourceCPU, "1").
 					Obj()).
 				Obj()
@@ -1036,8 +1037,8 @@ var _ = ginkgo.Describe("Workload validating webhook", ginkgo.Ordered, func() {
 			ginkgo.By("Admitting the Workload")
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(wl), wl)).To(gomega.Succeed())
-				admission := testing.MakeAdmission("default").
-					PodSets(testing.MakePodSetAssignment(kueue.DefaultPodSetName).
+				admission := utiltestingapi.MakeAdmission("default").
+					PodSets(utiltestingapi.MakePodSetAssignment(kueue.DefaultPodSetName).
 						Assignment(corev1.ResourceCPU, "default", "1").
 						Count(10).
 						Obj()).
@@ -1073,7 +1074,7 @@ var _ = ginkgo.Describe("Workload validating webhook ClusterName - Dispatcher Al
 			priorityClass         *schedulingv1.PriorityClass
 		)
 		ginkgo.BeforeEach(func() {
-			workloadPriorityClass = testing.MakeWorkloadPriorityClass("workload-priority-class").PriorityValue(200).Obj()
+			workloadPriorityClass = utiltestingapi.MakeWorkloadPriorityClass("workload-priority-class").PriorityValue(200).Obj()
 			priorityClass = testing.MakePriorityClass("priority-class").PriorityValue(100).Obj()
 			util.MustCreate(ctx, k8sClient, workloadPriorityClass)
 			util.MustCreate(ctx, k8sClient, priorityClass)
@@ -1087,7 +1088,7 @@ var _ = ginkgo.Describe("Workload validating webhook ClusterName - Dispatcher Al
 		ginkgo.DescribeTable("Validate Workload status on update",
 			func(setupWlStatus func(w *kueue.Workload), updateWlStatus func(w *kueue.Workload), setupMatcher, updateMatcher gomega.OmegaMatcher) {
 				ginkgo.By("Creating a new Workload")
-				workload := testing.MakeWorkloadWithGeneratedName(workloadName, ns.Name).Obj()
+				workload := utiltestingapi.MakeWorkloadWithGeneratedName(workloadName, ns.Name).Obj()
 				util.MustCreate(ctx, k8sClient, workload)
 
 				gomega.Eventually(func(g gomega.Gomega) {
@@ -1189,7 +1190,7 @@ var _ = ginkgo.Describe("Workload validating webhook ClusterName - Dispatcher In
 			priorityClass         *schedulingv1.PriorityClass
 		)
 		ginkgo.BeforeEach(func() {
-			workloadPriorityClass = testing.MakeWorkloadPriorityClass("workload-priority-class").PriorityValue(200).Obj()
+			workloadPriorityClass = utiltestingapi.MakeWorkloadPriorityClass("workload-priority-class").PriorityValue(200).Obj()
 			priorityClass = testing.MakePriorityClass("priority-class").PriorityValue(100).Obj()
 			util.MustCreate(ctx, k8sClient, workloadPriorityClass)
 			util.MustCreate(ctx, k8sClient, priorityClass)
@@ -1203,7 +1204,7 @@ var _ = ginkgo.Describe("Workload validating webhook ClusterName - Dispatcher In
 		ginkgo.DescribeTable("Validate Workload status on update",
 			func(setupWlStatus func(w *kueue.Workload), updateWlStatus func(w *kueue.Workload), setupMatcher, updateMatcher gomega.OmegaMatcher) {
 				ginkgo.By("Creating a new Workload")
-				workload := testing.MakeWorkloadWithGeneratedName(workloadName, ns.Name).Obj()
+				workload := utiltestingapi.MakeWorkloadWithGeneratedName(workloadName, ns.Name).Obj()
 				util.MustCreate(ctx, k8sClient, workload)
 
 				gomega.Eventually(func(g gomega.Gomega) {
diff --git a/test/integration/singlecluster/webhook/jobs/job_webhook_test.go b/test/integration/singlecluster/webhook/jobs/job_webhook_test.go
index 239bc535c..9f8cc76f9 100644
--- a/test/integration/singlecluster/webhook/jobs/job_webhook_test.go
+++ b/test/integration/singlecluster/webhook/jobs/job_webhook_test.go
@@ -102,7 +102,7 @@ var _ = ginkgo.Describe("Job Webhook With manageJobsWithoutQueueName enabled", g
 		createdJob := &batchv1.Job{}
 		gomega.Expect(k8sClient.Get(ctx, lookupKey, createdJob)).Should(gomega.Succeed())
 
-		createdJob.Annotations = map[string]string{constants.QueueAnnotation: "queue"}
+		createdJob.Labels = map[string]string{constants.QueueLabel: "queue"}
 		createdJob.Spec.Suspend = ptr.To(false)
 		gomega.Expect(k8sClient.Update(ctx, createdJob)).ShouldNot(gomega.Succeed())
 	})
diff --git a/test/integration/singlecluster/webhook/jobs/jobset_webhook_test.go b/test/integration/singlecluster/webhook/jobs/jobset_webhook_test.go
index d0614ca42..dd645eddf 100644
--- a/test/integration/singlecluster/webhook/jobs/jobset_webhook_test.go
+++ b/test/integration/singlecluster/webhook/jobs/jobset_webhook_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 
-	kueuealpha "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/jobset"
 	"sigs.k8s.io/kueue/pkg/util/testing"
 	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/jobset"
@@ -66,8 +66,8 @@ var _ = ginkgo.Describe("JobSet Webhook", ginkgo.Ordered, ginkgo.ContinueOnFailu
 					testingjob.ReplicatedJobRequirements{
 						Name: "leader",
 						PodAnnotations: map[string]string{
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/block",
-							kueuealpha.PodSetRequiredTopologyAnnotation:  "cloud.com/block",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/block",
+							kueue.PodSetRequiredTopologyAnnotation:  "cloud.com/block",
 						},
 					},
 				).
@@ -92,9 +92,9 @@ var _ = ginkgo.Describe("JobSet Webhook", ginkgo.Ordered, ginkgo.ContinueOnFailu
 					Parallelism: parallelism,
 					Completions: parallelism,
 					PodAnnotations: map[string]string{
-						kueuealpha.PodSetPreferredTopologyAnnotation:     testing.DefaultBlockTopologyLevel,
-						kueuealpha.PodSetSliceRequiredTopologyAnnotation: testing.DefaultBlockTopologyLevel,
-						kueuealpha.PodSetSliceSizeAnnotation:             invalidSliceSize,
+						kueue.PodSetPreferredTopologyAnnotation:     testing.DefaultBlockTopologyLevel,
+						kueue.PodSetSliceRequiredTopologyAnnotation: testing.DefaultBlockTopologyLevel,
+						kueue.PodSetSliceSizeAnnotation:             invalidSliceSize,
 					},
 				}).
 				RequestAndLimit("replicated-job-1", "example.com/gpu", "1").
diff --git a/test/integration/singlecluster/webhook/jobs/paddlejob_webhook_test.go b/test/integration/singlecluster/webhook/jobs/paddlejob_webhook_test.go
index bde566b3f..945492ef5 100644
--- a/test/integration/singlecluster/webhook/jobs/paddlejob_webhook_test.go
+++ b/test/integration/singlecluster/webhook/jobs/paddlejob_webhook_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 
-	kueuealpha "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/paddlejob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
 	testingjobspaddlejob "sigs.k8s.io/kueue/pkg/util/testingjobs/paddlejob"
@@ -54,8 +54,8 @@ var _ = ginkgo.Describe("PaddleJob Webhook", ginkgo.Ordered, func() {
 						ReplicaType:  kftraining.PaddleJobReplicaTypeMaster,
 						ReplicaCount: 1,
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation:  "cloud.com/rack",
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/rack",
+							kueue.PodSetRequiredTopologyAnnotation:  "cloud.com/rack",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/rack",
 						},
 					},
 				).
diff --git a/test/integration/singlecluster/webhook/jobs/pytorchjob_webhook_test.go b/test/integration/singlecluster/webhook/jobs/pytorchjob_webhook_test.go
index 93378ab1c..b49334ae6 100644
--- a/test/integration/singlecluster/webhook/jobs/pytorchjob_webhook_test.go
+++ b/test/integration/singlecluster/webhook/jobs/pytorchjob_webhook_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 
-	kueuealpha "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/pytorchjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
 	testingjobspytorchjob "sigs.k8s.io/kueue/pkg/util/testingjobs/pytorchjob"
@@ -54,8 +54,8 @@ var _ = ginkgo.Describe("PyTorchJob Webhook", ginkgo.Ordered, func() {
 						ReplicaType:  kftraining.PyTorchJobReplicaTypeMaster,
 						ReplicaCount: 1,
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation:  "cloud.com/rack",
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/rack",
+							kueue.PodSetRequiredTopologyAnnotation:  "cloud.com/rack",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/rack",
 						},
 					},
 				).
diff --git a/test/integration/singlecluster/webhook/jobs/raycluster_webhook_test.go b/test/integration/singlecluster/webhook/jobs/raycluster_webhook_test.go
index e1a89da9e..05d54b7c9 100644
--- a/test/integration/singlecluster/webhook/jobs/raycluster_webhook_test.go
+++ b/test/integration/singlecluster/webhook/jobs/raycluster_webhook_test.go
@@ -34,6 +34,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobs/raycluster"
 	workloadrayjob "sigs.k8s.io/kueue/pkg/controller/jobs/rayjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 	testingraycluster "sigs.k8s.io/kueue/pkg/util/testingjobs/raycluster"
 	testingrayjob "sigs.k8s.io/kueue/pkg/util/testingjobs/rayjob"
 	"sigs.k8s.io/kueue/pkg/webhooks"
@@ -140,7 +141,7 @@ var _ = ginkgo.Describe("RayCluster Webhook", func() {
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			ginkgo.By("Admitting the workload created for the job")
-			admission := testing.MakeAdmission("foo").PodSets(
+			admission := utiltestingapi.MakeAdmission("foo").PodSets(
 				kueue.PodSetAssignment{
 					Name: createdWorkload.Spec.PodSets[0].Name,
 					Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
diff --git a/test/integration/singlecluster/webhook/jobs/tfjob_webhook_test.go b/test/integration/singlecluster/webhook/jobs/tfjob_webhook_test.go
index b67c0b672..9cbb211ca 100644
--- a/test/integration/singlecluster/webhook/jobs/tfjob_webhook_test.go
+++ b/test/integration/singlecluster/webhook/jobs/tfjob_webhook_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 
-	kueuealpha "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/tfjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
 	testingjobstfjob "sigs.k8s.io/kueue/pkg/util/testingjobs/tfjob"
@@ -54,8 +54,8 @@ var _ = ginkgo.Describe("TFJob Webhook", ginkgo.Ordered, func() {
 						ReplicaType:  kftraining.TFJobReplicaTypeChief,
 						ReplicaCount: 1,
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation:  "cloud.com/rack",
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/rack",
+							kueue.PodSetRequiredTopologyAnnotation:  "cloud.com/rack",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/rack",
 						},
 					},
 				).
diff --git a/test/integration/singlecluster/webhook/jobs/xgboostjob_webhook_test.go b/test/integration/singlecluster/webhook/jobs/xgboostjob_webhook_test.go
index e672a3f19..d6fa2145f 100644
--- a/test/integration/singlecluster/webhook/jobs/xgboostjob_webhook_test.go
+++ b/test/integration/singlecluster/webhook/jobs/xgboostjob_webhook_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 
-	kueuealpha "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/xgboostjob"
 	"sigs.k8s.io/kueue/pkg/util/testing"
 	testingjobsxgboostjob "sigs.k8s.io/kueue/pkg/util/testingjobs/xgboostjob"
@@ -54,8 +54,8 @@ var _ = ginkgo.Describe("XGBoostJob Webhook", ginkgo.Ordered, func() {
 						ReplicaType:  kftraining.XGBoostJobReplicaTypeMaster,
 						ReplicaCount: 1,
 						Annotations: map[string]string{
-							kueuealpha.PodSetRequiredTopologyAnnotation:  "cloud.com/rack",
-							kueuealpha.PodSetPreferredTopologyAnnotation: "cloud.com/rack",
+							kueue.PodSetRequiredTopologyAnnotation:  "cloud.com/rack",
+							kueue.PodSetPreferredTopologyAnnotation: "cloud.com/rack",
 						},
 					},
 				).
diff --git a/test/performance/scheduler/runner/generator/generator.go b/test/performance/scheduler/runner/generator/generator.go
index c1b201070..772d26b91 100644
--- a/test/performance/scheduler/runner/generator/generator.go
+++ b/test/performance/scheduler/runner/generator/generator.go
@@ -30,7 +30,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
-	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
+	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta1"
 )
 
 const (
@@ -115,7 +115,7 @@ func generateWlSet(ctx context.Context, c client.Client, wlSet WorkloadsSet, nam
 	for si := range wlSet.Count {
 		for i, wlt := range wlSet.Workloads {
 			<-time.After(delay)
-			wl := utiltesting.MakeWorkload(fmt.Sprintf("%s-%d-%d-%d", wlt.ClassName, wlSetIdx, si, i), namespace).
+			wl := utiltestingapi.MakeWorkload(fmt.Sprintf("%s-%d-%d-%d", wlt.ClassName, wlSetIdx, si, i), namespace).
 				Queue(localQueue).
 				Request(corev1.ResourceCPU, wlt.Request).
 				Label(RunningTimeLabel, fmt.Sprintf("%d", wlt.RuntimeMs)).
@@ -135,9 +135,9 @@ func generateQueue(ctx context.Context, c client.Client, qSet QueuesSet, cohortN
 	log := ctrl.LoggerFrom(ctx).WithName("generate queue").WithValues("idx", queueIndex, "prefix", qSet.ClassName)
 	log.Info("Start generation")
 	defer log.Info("End generation")
-	cq := utiltesting.MakeClusterQueue(fmt.Sprintf("%s-%d-%d-%s", qSet.ClassName, queueSetIdx, queueIndex, cohortName)).
+	cq := utiltestingapi.MakeClusterQueue(fmt.Sprintf("%s-%d-%d-%s", qSet.ClassName, queueSetIdx, queueIndex, cohortName)).
 		Cohort(cohortName).
-		ResourceGroup(*utiltesting.MakeFlavorQuotas(resourceFlavorName).
+		ResourceGroup(*utiltestingapi.MakeFlavorQuotas(resourceFlavorName).
 			Resource(corev1.ResourceCPU, qSet.NominalQuota, qSet.BorrowingLimit).Obj()).
 		Preemption(kueue.ClusterQueuePreemption{
 			ReclaimWithinCohort: qSet.ReclaimWithinCohort,
@@ -159,7 +159,7 @@ func generateQueue(ctx context.Context, c client.Client, qSet QueuesSet, cohortN
 		return err
 	}
 
-	lq := utiltesting.MakeLocalQueue(cq.Name, ns.Name).ClusterQueue(cq.Name).Obj()
+	lq := utiltestingapi.MakeLocalQueue(cq.Name, ns.Name).ClusterQueue(cq.Name).Obj()
 	err = c.Create(ctx, lq)
 	if err != nil {
 		return err
@@ -202,7 +202,7 @@ func Generate(ctx context.Context, c client.Client, cSets []CohortSet) error {
 	log := ctrl.LoggerFrom(ctx).WithName("generate cohort sets").WithValues("numSets", len(cSets))
 	log.Info("Start generation")
 	defer log.Info("End generation")
-	rf := utiltesting.MakeResourceFlavor(resourceFlavorName).NodeLabel(CleanupLabel, "true").Obj()
+	rf := utiltestingapi.MakeResourceFlavor(resourceFlavorName).NodeLabel(CleanupLabel, "true").Obj()
 	err := c.Create(ctx, rf)
 	if err != nil {
 		return err
diff --git a/test/performance/scheduler/runner/main.go b/test/performance/scheduler/runner/main.go
index 1b04d20f3..59863ec2f 100644
--- a/test/performance/scheduler/runner/main.go
+++ b/test/performance/scheduler/runner/main.go
@@ -292,9 +292,7 @@ func runCommand(ctx context.Context, workDir, cmdPath, kubeconfig string, withCP
 	}
 	startTime := time.Now()
 
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		err := cmd.Wait()
 		if err != nil {
 			select {
@@ -325,7 +323,7 @@ func runCommand(ctx context.Context, workDir, cmdPath, kubeconfig string, withCP
 		if err != nil {
 			log.Error(err, "Writing cmd stats")
 		}
-	}()
+	})
 	return nil
 }
 
@@ -346,9 +344,7 @@ func runGenerator(ctx context.Context, cfg *rest.Config, generatorConfig string,
 	}
 
 	statTime := time.Now()
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		defer close(genDone)
 		err := generator.Generate(ctx, c, cohorts)
 		if err != nil {
@@ -357,7 +353,7 @@ func runGenerator(ctx context.Context, cfg *rest.Config, generatorConfig string,
 			return
 		}
 		log.Info("Generator done", "duration", time.Since(statTime))
-	}()
+	})
 
 	log.Info("Generator started", "qps", cfg.QPS, "burst", cfg.Burst)
 	return nil
@@ -366,9 +362,7 @@ func runGenerator(ctx context.Context, cfg *rest.Config, generatorConfig string,
 func startRecorder(ctx context.Context, errCh chan<- error, wg *sync.WaitGroup, genDone <-chan struct{}, recordTimeout time.Duration) (*recorder.Recorder, error) {
 	log := ctrl.LoggerFrom(ctx).WithName("Start recorder")
 	recorder := recorder.New(recordTimeout)
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		err := recorder.Run(ctx, genDone)
 		if err != nil {
 			log.Error(err, "Recorder run")
@@ -376,7 +370,7 @@ func startRecorder(ctx context.Context, errCh chan<- error, wg *sync.WaitGroup,
 			log.Info("Recorder done")
 		}
 		errCh <- err
-	}()
+	})
 
 	log.Info("Recorder started", "timeout", recordTimeout)
 	return recorder, nil
@@ -408,9 +402,7 @@ func runManager(ctx context.Context, cfg *rest.Config, errCh chan<- error, wg *s
 		return err
 	}
 
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		log.Info("Starting manager")
 		if err := mgr.Start(ctx); err != nil {
 			log.Error(err, "Could not run manager")
@@ -418,7 +410,7 @@ func runManager(ctx context.Context, cfg *rest.Config, errCh chan<- error, wg *s
 		} else {
 			log.Info("End manager")
 		}
-	}()
+	})
 
 	log.Info("Manager started")
 	return nil
@@ -429,9 +421,7 @@ func runScraper(ctx context.Context, interval time.Duration, output, url string,
 
 	s := scraper.NewScraper(interval, url, "%d.prometheus")
 
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		err := s.Run(ctx, output)
 		if err != nil {
 			log.Error(err, "Running the scraper")
@@ -439,7 +429,7 @@ func runScraper(ctx context.Context, interval time.Duration, output, url string,
 			return
 		}
 		log.Info("Scrape done")
-	}()
+	})
 
 	log.Info("Scrape started")
 	return nil