From 1cd8cb4a5dda9bd49e43b27aab58a705e847b8be Mon Sep 17 00:00:00 2001
From: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
Date: Fri, 3 Jan 2025 17:04:35 -0500
Subject: [PATCH] PlacementRule ==> Placement

Replaces all PlacementRule with Placement,
preparing for its pending removal.

ref: https://issues.redhat.com/browse/ACM-16843
Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
---
 Makefile                                      |   9 +-
 README.md                                     | 103 +++++++++++-------
 build/clean-up-cluster.sh                     |  11 +-
 .../audit/audit-pod-kind-field-filter.yaml    |  13 ++-
 .../audit/audit-pod-kind.yaml                 |  19 +++-
 .../audit/audit-role-multiple-ns.yaml         |  19 +++-
 .../audit/audit-role-single-ns.yaml           |  19 +++-
 .../create/create-role-multiple-ns.yaml       |  19 +++-
 .../create/create-role-single-ns.yaml         |  19 +++-
 .../delete/delete-role-multiple-ns.yaml       |  19 +++-
 .../delete/delete-role-single-ns.yaml         |  19 +++-
 .../gatekeeper/gatekeeper-install.yaml        |  19 +++-
 .../gatekeeper/gatekeeper-policy-sample.yaml  |  14 ++-
 .../merge-patch-role-multiple-ns.yaml         |  19 +++-
 .../merge-patch-role-single-ns.yaml           |  19 +++-
 .../replace-patch-role-multiple-ns.yaml       |  19 +++-
 .../replace-patch-role-single-ns.yaml         |  19 +++-
 test/common/common.go                         |  52 ++++++++-
 test/common/gvr.go                            |  10 +-
 test/common/policy_utils.go                   |  86 +++++++++++----
 test/configuration_policy_prune.go            |  75 +++++++------
 test/e2e/cert_policy_test.go                  |   4 +-
 test/e2e/configuration_policy_test.go         |  40 +++----
 test/e2e/e2e_suite_test.go                    |  25 ++++-
 test/e2e/hub_templates_encryption_test.go     |  28 ++++-
 test/e2e/policySet_e2e_test.go                |  19 ++--
 .../hubtemplates_variables_test.go            |   8 +-
 test/integration/integration_suite_test.go    |  34 ++----
 .../operator_policy_complianceconfig_test.go  |   8 +-
 .../integration/operator_policy_error_test.go |   4 +-
 .../policy_diff_generation_test.go            |   2 +-
 .../policy_hub_templates_21440_test.go        |   2 +-
 .../policy_install_operator_test.go           |   4 +-
 .../policy_multiline_templatization_test.go   |  21 ++--
 test/integration/policy_set_test.go           |   2 +-
 test/performance/performance.go               |   2 +-
 .../resources/templates/cfgmap-plc.yaml       |  22 ++--
 test/policy_ordering.go                       |  41 ++++---
 test/resources/cert_policy/cert-policy.yaml   |  19 +++-
 .../role-policy-musthave.yaml                 |  19 +++-
 .../role-policy-mustnothave.yaml              |  19 +++-
 .../role-policy-mustonlyhave.yaml             |  19 +++-
 .../cm-policy-prune-all.yaml                  |  19 +++-
 .../cm-policy-prune-default.yaml              |  19 +++-
 .../cm-policy-prune-if-created.yaml           |  19 +++-
 .../cm-policy-prune-none.yaml                 |  19 +++-
 .../diff_generation/diff_generation.yaml      |  21 ++--
 .../gatekeeper/policy-uninstall-gk.yaml       |   6 +
 .../test-hub-encryption.yaml                  |  19 +++-
 .../mclabels-fromcm-pol.yaml                  |  19 +++-
 .../mclabels-range-pol.yaml                   |  19 +++-
 .../test-op-complianceconfig-1-modified.yaml  |  19 +++-
 .../test-op-complianceconfig-1.yaml           |  19 +++-
 .../test-op-complianceconfig-modified.yaml    |  19 +++-
 .../test-op-complianceconfig.yaml             |  19 +++-
 .../operator_policy/test-op-err-correct.yaml  |  19 +++-
 .../operator_policy/test-op-err-initial.yaml  |  19 +++-
 .../policy-hub-templates-21440.yaml           |  19 +++-
 .../policy_info_metric/compliant.yaml         |  19 +++-
 .../policy_info_metric/noncompliant.yaml      |  19 +++-
 .../clean-up-grcqeoptest-ns.yaml              |  26 +++--
 .../operator_policy_all_defaults.yaml         |  26 +++--
 .../operator_policy_no_group.yaml             |  26 +++--
 .../operator_policy_with_group.yaml           |  26 +++--
 .../policy-multiline-temp-hub.yaml            |  19 +++-
 .../policy-multiline-temp-nohub.yaml          |  19 +++-
 .../dep-plcset-statuscheck.yaml               |   2 +-
 .../resources/policy_ordering/dep-plcset.yaml |  19 +++-
 .../dep-policy-dep-on-plcset.yaml             |  19 +++-
 .../policy_ordering/dep-policy-deppol.yaml    |  19 +++-
 .../dep-policy-extradepconfig.yaml            |  19 +++-
 .../dep-policy-ignorepending.yaml             |  19 +++-
 .../policy_ordering/dep-policy-initial.yaml   |  19 +++-
 .../policy_report_metric/compliant.yaml       |  19 +++-
 .../policy_report_metric/noncompliant.yaml    |  19 +++-
 test/resources/policy_set/statuscheck-1.yaml  |   2 +-
 test/resources/policy_set/statuscheck-2.yaml  |   2 +-
 test/resources/policy_set/statuscheck-3.yaml  |   2 +-
 test/resources/policy_set/statuscheck-4.yaml  |   2 +-
 test/resources/policy_set/statuscheck-5.yaml  |   2 +-
 test/resources/policy_set/statuscheck-6.yaml  |   2 +-
 test/resources/policy_set/test-policyset.yaml |  19 +++-
 .../invalid-cr-template.yaml                  |  19 +++-
 .../pretend-policy-template.yaml              |  19 +++-
 .../verify_metrics/noncompliant.yaml          |  19 +++-
 test/template_sync_errors.go                  |   8 +-
 86 files changed, 1068 insertions(+), 598 deletions(-)

diff --git a/Makefile b/Makefile
index dc0462a3..512b67a8 100644
--- a/Makefile
+++ b/Makefile
@@ -242,7 +242,6 @@ kind-delete-cluster:
 .PHONY: install-crds
 install-crds:
 	@echo installing crds on hub
-	kubectl apply -f https://raw.githubusercontent.com/$(CALLER_REPO)/multicloud-operators-subscription/$(RELEASE_BRANCH)/deploy/hub-common/apps.open-cluster-management.io_placementrules_crd.yaml --kubeconfig=$(PWD)/kubeconfig_$(HUB_CLUSTER_NAME)
 	kubectl apply -f https://raw.githubusercontent.com/open-cluster-management-io/api/$(OCM_API_COMMIT)/cluster/v1/0000_00_clusters.open-cluster-management.io_managedclusters.crd.yaml --kubeconfig=$(PWD)/kubeconfig_$(HUB_CLUSTER_NAME)
 	kubectl apply -f https://raw.githubusercontent.com/open-cluster-management-io/api/$(OCM_API_COMMIT)/cluster/v1beta1/0000_02_clusters.open-cluster-management.io_placements.crd.yaml --kubeconfig=$(PWD)/kubeconfig_$(HUB_CLUSTER_NAME)
 	kubectl apply -f https://raw.githubusercontent.com/open-cluster-management-io/api/$(OCM_API_COMMIT)/cluster/v1beta1/0000_03_clusters.open-cluster-management.io_placementdecisions.crd.yaml --kubeconfig=$(PWD)/kubeconfig_$(HUB_CLUSTER_NAME)
@@ -269,15 +268,17 @@ e2e-dependencies:
 K8SCLIENT ?= oc
 GINKGO = $(LOCAL_BIN)/ginkgo
 IS_HOSTED ?= false
+PATCH_DECISIONS ?= true
 MANAGED_CLUSTER_NAMESPACE ?= $(MANAGED_CLUSTER_NAME)
 
 .PHONY: e2e-test
 e2e-test: e2e-dependencies
-	$(GINKGO) -v $(TEST_ARGS) test/e2e -- -cluster_namespace=$(MANAGED_CLUSTER_NAMESPACE) -k8s_client=$(K8SCLIENT) -is_hosted=$(IS_HOSTED) -cluster_namespace_on_hub=$(CLUSTER_NAMESPACE_ON_HUB)
+	$(GINKGO) -v $(TEST_ARGS) test/e2e -- -cluster_namespace=$(MANAGED_CLUSTER_NAMESPACE) -k8s_client=$(K8SCLIENT) -is_hosted=$(IS_HOSTED) -patch_decisions=$(PATCH_DECISIONS) -cluster_namespace_on_hub=$(CLUSTER_NAMESPACE_ON_HUB)
 
 .PHONY: e2e-test-hosted
-e2e-test-hosted: CLUSTER_NAMESPACE_ON_HUB=cluster2 
-e2e-test-hosted: IS_HOSTED=true 
+e2e-test-hosted: CLUSTER_NAMESPACE_ON_HUB=cluster2
+e2e-test-hosted: IS_HOSTED=true
+e2e-test-hosted: PATCH_DECISIONS=false
 e2e-test-hosted: MANAGED_CLUSTER_NAMESPACE=cluster2-hosted
 e2e-test-hosted: e2e-test
 
diff --git a/README.md b/README.md
index 3c571925..9d334a61 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,22 @@
-[comment]: # ( Copyright Contributors to the Open Cluster Management project )
+[comment]: # " Copyright Contributors to the Open Cluster Management project "
 
 # Governance Policy Framework
+
 [![GRC Integration Test](https://github.com/stolostron/governance-policy-framework/actions/workflows/integration.yml/badge.svg)](https://github.com/stolostron/governance-policy-framework/actions/workflows/integration.yml)
 
 Open Cluster Management - Governance Policy Framework
 
-The policy framework provides governance capability to gain visibility, and drive remediation for various security and configuration aspects to help meet such enterprise standards.
+The policy framework provides governance capability to gain visibility, and drive remediation for
+various security and configuration aspects to help meet such enterprise standards.
 
 ## What it does
 
-View the following functions of the policy framework: 
+View the following functions of the policy framework:
 
-* Distributes policies to managed clusters from hub cluster.
-* Collects policy execution results from managed cluster to hub cluster.
-* Supports multiple policy engines and policy languages.
-* Provides an extensible mechanism to bring your own policy.
+- Distributes policies to managed clusters from hub cluster.
+- Collects policy execution results from managed cluster to hub cluster.
+- Supports multiple policy engines and policy languages.
+- Provides an extensible mechanism to bring your own policy.
 
 ## Architecture
 
@@ -22,32 +24,37 @@ View the following functions of the policy framework:
 
 The governance policy framework consists of following components:
 
-- Govenance policy framework: A framework to distribute various supported policies to managed clusters and collect results to be sent to the hub cluster.
-    - [Policy propagator](https://github.com/stolostron/governance-policy-propagator)
-    - [Governance policy framework addon](https://github.com/stolostron/governance-policy-framework-addon)
-- Policy controllers: Policy engines that run on managed clusters to evaluate policy rules distributed by the policy framework and generate results.
-    - [Configuration policy controller](https://github.com/stolostron/config-policy-controller)
-      - [Usage examples](./doc/configuration-policy/README.md)
-    - [Certificate policy controller](https://github.com/stolostron/cert-policy-controller)
-    - Third-party
-      - [Gatekeeper](https://github.com/open-policy-agent/gatekeeper)
-      - [Kyverno](https://github.com/kyverno/kyverno/)
+- Govenance policy framework: A framework to distribute various supported policies to managed
+  clusters and collect results to be sent to the hub cluster.
+  - [Policy propagator](https://github.com/stolostron/governance-policy-propagator)
+  - [Governance policy framework addon](https://github.com/stolostron/governance-policy-framework-addon)
+- Policy controllers: Policy engines that run on managed clusters to evaluate policy rules
+  distributed by the policy framework and generate results.
+  - [Configuration policy controller](https://github.com/stolostron/config-policy-controller)
+    - [Usage examples](./doc/configuration-policy/README.md)
+  - [Certificate policy controller](https://github.com/stolostron/cert-policy-controller)
+  - Third-party
+    - [Gatekeeper](https://github.com/open-policy-agent/gatekeeper)
+    - [Kyverno](https://github.com/kyverno/kyverno/)
 
 ## The Policy CRDs
 
-The `Policy` is the Custom Resource Definition (CRD), created for policy framework controllers to monitor. It acts as a vehicle to deliver policies to managed cluster and collect results to send to the hub cluster.
+The `Policy` is the Custom Resource Definition (CRD), created for policy framework controllers to
+monitor. It acts as a vehicle to deliver policies to managed cluster and collect results to send to
+the hub cluster.
 
 View the following example specification of a `Policy` object:
+
 ```yaml
 apiVersion: policy.open-cluster-management.io/v1
 kind: Policy
 metadata:
   name: policy-pod
 spec:
-  remediationAction: inform         # [inform/enforce] If set, it defines the remediationAction globally.
-  disabled: false                   # [true/false] If true, the policy will not be distributed to the managed cluster.
-  policy-templates:             
-    - objectDefinition:             # Use `objectDefinition` to wrap the policy resource to be distributed to the managed cluster
+  remediationAction: inform # [inform/enforce] If set, it defines the remediationAction globally.
+  disabled: false # [true/false] If true, the policy will not be distributed to the managed cluster.
+  policy-templates:
+    - objectDefinition: # Use `objectDefinition` to wrap the policy resource to be distributed to the managed cluster
         apiVersion: policy.open-cluster-management.io/v1
         kind: ConfigurationPolicy
         metadata:
@@ -58,21 +65,23 @@ spec:
             - complianceType: musthave
               objectDefinition:
                 apiVersion: v1
-                kind: Pod 
+                kind: Pod
                 metadata:
                   name: sample-nginx-pod
                   namespace: default
                 spec:
                   containers:
-                  - image: nginx:1.7.9
-                    name: nginx
-                    ports:
-                    - containerPort: 80
+                    - image: nginx:1.7.9
+                      name: nginx
+                      ports:
+                        - containerPort: 80
 ```
 
-The `PlacementBinding` CRD is used to bind the `Policy` with a `PlacementRule`. Only a bound `Policy` is distributed to a managed cluster by the policy framework.
+The `PlacementBinding` CRD is used to bind the `Policy` with a `Placement`. Only a bound `Policy` is
+distributed to a managed cluster by the policy framework.
 
 View the following example specification of a `PlacementBinding` object:
+
 ```yaml
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
@@ -80,35 +89,45 @@ metadata:
   name: binding-policy-pod
 placementRef:
   name: placement-policy-pod
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
-- name: policy-pod
-  kind: Policy
-  apiGroup: policy.open-cluster-management.io
+  - name: policy-pod
+    kind: Policy
+    apiGroup: policy.open-cluster-management.io
 ```
 
-The `PlacementRule` CRD is used to determine the target clusters to distribute policies to.
+The `Placement` CRD is used to determine the target clusters to distribute policies to.
+
+View the following example specification of a `Placement` object:
 
-View the following example specification of a `PlacementRule` object:
 ```yaml
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-pod
 spec:
-  clusterSelector:
-    matchExpressions:
-      - {key: environment, operator: In, values: ["dev"]}
+  predicates:
+    - requiredClusterSelector:
+        labelSelector:
+          matchExpressions:
+            - { key: environment, operator: In, values: ["dev"] }
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
 ```
 
 ## How to install it
 
-You can find installation instructions from [Open Cluster Management](https://open-cluster-management.io/) website.
+You can find installation instructions from
+[Open Cluster Management](https://open-cluster-management.io/) website.
 
 ## More policies
 
-You can find more policies or contribute to the open repository, [policy-collection](https://github.com/stolostron/policy-collection).
+You can find more policies or contribute to the open repository,
+[policy-collection](https://github.com/stolostron/policy-collection).
 
 <!---
 Date: 09/18/2024
diff --git a/build/clean-up-cluster.sh b/build/clean-up-cluster.sh
index b4d5d010..c578bc85 100755
--- a/build/clean-up-cluster.sh
+++ b/build/clean-up-cluster.sh
@@ -31,7 +31,6 @@ function hub() {
     echo "Hub: clean up"
     oc delete policies.policy.open-cluster-management.io --all-namespaces --all --ignore-not-found
     oc delete placementbindings.policy.open-cluster-management.io  --all-namespaces --all --ignore-not-found
-    oc delete placementrules.apps.open-cluster-management.io --all-namespaces --all --ignore-not-found
     # Don't clean up in all namespaces because the global-set placement shouldn't be deleted
     for ns in default policy-test e2e-rbac-test-1 e2e-rbac-test-2
         do
@@ -50,8 +49,8 @@ function managed() {
     oc delete secret -n default rsa-ca-sample-secret --ignore-not-found 
     oc delete clusterrolebinding -l e2e=true --ignore-not-found
     oc delete subscriptions.operators.coreos.com container-security-operator -n openshift-operators --ignore-not-found
-    oc delete csv -n openshift-operators `oc get -n openshift-operators csv -o jsonpath='{.items[?(@.spec.displayName=="Quay Container Security")].metadata.name}'` --ignore-not-found || true  # csv might not exist
-    oc delete csv -n openshift-operators `oc get -n openshift-operators csv -o jsonpath='{.items[?(@.spec.displayName=="Red Hat Quay Container Security Operator")].metadata.name}'` --ignore-not-found || true  # csv might not exist
+    oc delete csv -n openshift-operators "$(oc get -n openshift-operators csv -o jsonpath='{.items[?(@.spec.displayName=="Quay Container Security")].metadata.name}')" --ignore-not-found || true  # csv might not exist
+    oc delete csv -n openshift-operators "$(oc get -n openshift-operators csv -o jsonpath='{.items[?(@.spec.displayName=="Red Hat Quay Container Security Operator")].metadata.name}')" --ignore-not-found || true  # csv might not exist
     oc delete crd imagemanifestvulns.secscan.quay.redhat.com --ignore-not-found
     oc delete operatorgroup awx-resource-operator-operatorgroup -n default --ignore-not-found
     oc delete subscriptions.operators.coreos.com awx-resource-operator -n default --ignore-not-found
@@ -71,7 +70,7 @@ function managed() {
     delete_all_and_wait pods openshift-gatekeeper-system 0
     oc delete ns openshift-gatekeeper-system gatekeeper-system --ignore-not-found
     oc delete subscriptions.operators.coreos.com gatekeeper-operator-product -n openshift-operators --ignore-not-found
-    oc delete csv -n openshift-operators `oc get -n openshift-operators csv -o jsonpath='{.items[?(@.spec.displayName=="Gatekeeper Operator")].metadata.name}'` --ignore-not-found || true  # csv might not exist
+    oc delete csv -n openshift-operators "$(oc get -n openshift-operators csv -o jsonpath='{.items[?(@.spec.displayName=="Gatekeeper Operator")].metadata.name}')" --ignore-not-found || true  # csv might not exist
     oc delete ns openshift-gatekeeper-operator --ignore-not-found
     oc delete crd gatekeepers.operator.gatekeeper.sh --ignore-not-found
     oc delete validatingwebhookconfigurations.admissionregistration.k8s.io gatekeeper-validating-webhook-configuration --ignore-not-found
@@ -79,7 +78,7 @@ function managed() {
     # Compliance Operator clean up
     oc delete ScanSettingBinding -n openshift-compliance --all --ignore-not-found || true # ScanSettingBinding CRD might not exist
     RESOURCES=(ComplianceSuite ComplianceCheckResult ComplianceScan)
-    for RESOURCE in ${RESOURCES[@]}; do
+    for RESOURCE in "${RESOURCES[@]}"; do
         delete_all_and_wait $RESOURCE openshift-compliance 0
     done
     # only three pods should be left
@@ -87,7 +86,7 @@ function managed() {
     delete_all_and_wait ProfileBundle openshift-compliance 0
     oc delete subscriptions.operators.coreos.com compliance-operator -n openshift-compliance --ignore-not-found
     oc delete operatorgroup compliance-operator -n openshift-compliance --ignore-not-found
-    oc delete csv -n openshift-compliance `oc get -n openshift-compliance csv -o jsonpath='{.items[?(@.spec.displayName=="Compliance Operator")].metadata.name}'` --ignore-not-found || true  # csv might not exist
+    oc delete csv -n openshift-compliance "$(oc get -n openshift-compliance csv -o jsonpath='{.items[?(@.spec.displayName=="Compliance Operator")].metadata.name}')" --ignore-not-found || true  # csv might not exist
     oc delete ns openshift-compliance --ignore-not-found
     oc delete crd -l operators.coreos.com/compliance-operator.openshift-compliance --ignore-not-found
     # Clean up events in cluster ns
diff --git a/doc/configuration-policy/audit/audit-pod-kind-field-filter.yaml b/doc/configuration-policy/audit/audit-pod-kind-field-filter.yaml
index 64d01269..b42d46c0 100644
--- a/doc/configuration-policy/audit/audit-pod-kind-field-filter.yaml
+++ b/doc/configuration-policy/audit/audit-pod-kind-field-filter.yaml
@@ -37,17 +37,18 @@ metadata:
   name: binding-policy-pod-kind-field-filter
 placementRef:
   name: placement-policy-pod-kind-field-filter
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-pod-kind-field-filter
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-pod-kind-field-filter
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+    - requiredLabelSelector:
+        matchExpressions: []
diff --git a/doc/configuration-policy/audit/audit-pod-kind.yaml b/doc/configuration-policy/audit/audit-pod-kind.yaml
index 6bccb8f6..08bc56d0 100644
--- a/doc/configuration-policy/audit/audit-pod-kind.yaml
+++ b/doc/configuration-policy/audit/audit-pod-kind.yaml
@@ -35,17 +35,24 @@ metadata:
   name: binding-policy-pod-kind
 placementRef:
   name: placement-policy-pod-kind
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-pod-kind
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-pod-kind
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/doc/configuration-policy/audit/audit-role-multiple-ns.yaml b/doc/configuration-policy/audit/audit-role-multiple-ns.yaml
index 063fcc21..002302ae 100644
--- a/doc/configuration-policy/audit/audit-role-multiple-ns.yaml
+++ b/doc/configuration-policy/audit/audit-role-multiple-ns.yaml
@@ -45,17 +45,24 @@ metadata:
   name: binding-policy-role-audit-multiple-ns
 placementRef:
   name: placement-policy-role-audit-multiple-ns
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-role-audit-multiple-ns
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-role-audit-multiple-ns
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/doc/configuration-policy/audit/audit-role-single-ns.yaml b/doc/configuration-policy/audit/audit-role-single-ns.yaml
index 16608977..d951dde4 100644
--- a/doc/configuration-policy/audit/audit-role-single-ns.yaml
+++ b/doc/configuration-policy/audit/audit-role-single-ns.yaml
@@ -39,17 +39,24 @@ metadata:
   name: binding-policy-role-audit-single-ns
 placementRef:
   name: placement-policy-role-audit-single-ns
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-role-audit-single-ns
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-role-audit-single-ns
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/doc/configuration-policy/create/create-role-multiple-ns.yaml b/doc/configuration-policy/create/create-role-multiple-ns.yaml
index a05f1889..97e2229b 100644
--- a/doc/configuration-policy/create/create-role-multiple-ns.yaml
+++ b/doc/configuration-policy/create/create-role-multiple-ns.yaml
@@ -50,17 +50,24 @@ metadata:
   name: binding-policy-role
 placementRef:
   name: placement-policy-role
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-role
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-role
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/doc/configuration-policy/create/create-role-single-ns.yaml b/doc/configuration-policy/create/create-role-single-ns.yaml
index c952a990..a9b9ed78 100644
--- a/doc/configuration-policy/create/create-role-single-ns.yaml
+++ b/doc/configuration-policy/create/create-role-single-ns.yaml
@@ -45,17 +45,24 @@ metadata:
   name: binding-policy-role-create
 placementRef:
   name: placement-policy-role-create
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-role-create
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-role-create
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/doc/configuration-policy/delete/delete-role-multiple-ns.yaml b/doc/configuration-policy/delete/delete-role-multiple-ns.yaml
index db740223..be9df011 100644
--- a/doc/configuration-policy/delete/delete-role-multiple-ns.yaml
+++ b/doc/configuration-policy/delete/delete-role-multiple-ns.yaml
@@ -38,17 +38,24 @@ metadata:
   name: binding-policy-role
 placementRef:
   name: placement-policy-role
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-role
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-role
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/doc/configuration-policy/delete/delete-role-single-ns.yaml b/doc/configuration-policy/delete/delete-role-single-ns.yaml
index 1446c052..a305a769 100644
--- a/doc/configuration-policy/delete/delete-role-single-ns.yaml
+++ b/doc/configuration-policy/delete/delete-role-single-ns.yaml
@@ -33,17 +33,24 @@ metadata:
   name: binding-policy-role-delete
 placementRef:
   name: placement-policy-role-delete
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-role-delete
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-role-delete
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/doc/configuration-policy/gatekeeper/gatekeeper-install.yaml b/doc/configuration-policy/gatekeeper/gatekeeper-install.yaml
index 76c3b6d3..f7c6e8b0 100644
--- a/doc/configuration-policy/gatekeeper/gatekeeper-install.yaml
+++ b/doc/configuration-policy/gatekeeper/gatekeeper-install.yaml
@@ -117,17 +117,24 @@ metadata:
   name: binding-policy-gatekeeper-operator
 placementRef:
   name: placement-policy-gatekeeper-operator
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
 - name: policy-gatekeeper-operator
   kind: Policy
   apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-gatekeeper-operator
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/doc/configuration-policy/gatekeeper/gatekeeper-policy-sample.yaml b/doc/configuration-policy/gatekeeper/gatekeeper-policy-sample.yaml
index 1488addd..835be4fe 100644
--- a/doc/configuration-policy/gatekeeper/gatekeeper-policy-sample.yaml
+++ b/doc/configuration-policy/gatekeeper/gatekeeper-policy-sample.yaml
@@ -108,17 +108,19 @@ metadata:
   name: binding-policy-gatekeeper-sample
 placementRef:
   name: placement-policy-gatekeeper-sample
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
 - name: policy-gatekeeper-sample
   kind: Policy
   apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-gatekeeper-sample
 spec:
-  clusterSelector:
-    matchExpressions: []
\ No newline at end of file
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
\ No newline at end of file
diff --git a/doc/configuration-policy/merge-patch/merge-patch-role-multiple-ns.yaml b/doc/configuration-policy/merge-patch/merge-patch-role-multiple-ns.yaml
index b8a5e195..2427f149 100644
--- a/doc/configuration-policy/merge-patch/merge-patch-role-multiple-ns.yaml
+++ b/doc/configuration-policy/merge-patch/merge-patch-role-multiple-ns.yaml
@@ -45,17 +45,24 @@ metadata:
   name: binding-policy-role-merge-patch
 placementRef:
   name: placement-policy-role-merge-patch
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-role-merge-patch
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-role-merge-patch
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/doc/configuration-policy/merge-patch/merge-patch-role-single-ns.yaml b/doc/configuration-policy/merge-patch/merge-patch-role-single-ns.yaml
index a265a615..839c4fed 100644
--- a/doc/configuration-policy/merge-patch/merge-patch-role-single-ns.yaml
+++ b/doc/configuration-policy/merge-patch/merge-patch-role-single-ns.yaml
@@ -40,17 +40,24 @@ metadata:
   name: binding-policy-role-merge-patch
 placementRef:
   name: placement-policy-role-merge-patch
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-role-merge-patch
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-role-merge-patch
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/doc/configuration-policy/replace-patch/replace-patch-role-multiple-ns.yaml b/doc/configuration-policy/replace-patch/replace-patch-role-multiple-ns.yaml
index cccb3de7..80f0f1cc 100644
--- a/doc/configuration-policy/replace-patch/replace-patch-role-multiple-ns.yaml
+++ b/doc/configuration-policy/replace-patch/replace-patch-role-multiple-ns.yaml
@@ -45,17 +45,24 @@ metadata:
   name: binding-policy-role-replace-patch
 placementRef:
   name: placement-policy-role-replace-patch
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-role-replace-patch
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-role-replace-patch
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/doc/configuration-policy/replace-patch/replace-patch-role-single-ns.yaml b/doc/configuration-policy/replace-patch/replace-patch-role-single-ns.yaml
index e06cf509..c75afd97 100644
--- a/doc/configuration-policy/replace-patch/replace-patch-role-single-ns.yaml
+++ b/doc/configuration-policy/replace-patch/replace-patch-role-single-ns.yaml
@@ -40,17 +40,24 @@ metadata:
   name: binding-policy-role-replace-patch
 placementRef:
   name: placement-policy-role-replace-patch
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-role-replace-patch
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-role-replace-patch
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/common/common.go b/test/common/common.go
index cef81a56..8968872a 100644
--- a/test/common/common.go
+++ b/test/common/common.go
@@ -86,8 +86,8 @@ func InitFlags(flagset *flag.FlagSet) {
 	flagset.IntVar(&DefaultTimeoutSeconds, "timeout_seconds", 30, "Timeout seconds for assertion")
 	flagset.BoolVar(
 		&ManuallyPatchDecisions, "patch_decisions", true,
-		"Whether to 'manually' patch PlacementRules with PlacementDecisions "+
-			"(set to false if the PlacementRule controller is running)",
+		"Whether to 'manually' patch Placements with PlacementDecisions "+
+			"(set to false if the Placement controller is running)",
 	)
 	flagset.StringVar(
 		&K8sClient, "k8s_client", "oc",
@@ -199,7 +199,9 @@ func oc(args ...string) (string, error) {
 		}
 	}
 
-	output, err := exec.Command(K8sClient, args...).Output()
+	k8sCmd := exec.Command(K8sClient, args...)
+
+	output, err := k8sCmd.Output()
 	if len(args) > 0 && printOutput {
 		klog.V(2).Infof("OC command output %s\n", output)
 	}
@@ -212,7 +214,25 @@ func oc(args ...string) (string, error) {
 			return string(output), nil
 		}
 
-		return string(output), fmt.Errorf(string(exitError.Stderr))
+		// Reformat error to include command and stderr output
+		err = fmt.Errorf(
+			"error running command '%s':\n %s: %s",
+			strings.Join(k8sCmd.Args, " "),
+			output,
+			exitError.Stderr,
+		)
+
+		return string(output), err
+	}
+
+	if err != nil {
+		// Reformat error to include command and stderr output
+		err = fmt.Errorf(
+			"error running command '%s':\n %s: %s",
+			strings.Join(k8sCmd.Args, " "),
+			output,
+			err.Error(),
+		)
 	}
 
 	return string(output), err
@@ -253,7 +273,6 @@ func OutputDebugInfo(testName string, kubeconfig string, additionalResources ...
 
 	resources := []string{
 		"policies.policy.open-cluster-management.io",
-		"placementrules.apps.open-cluster-management.io",
 		"placements.cluster.open-cluster-management.io",
 		"placementbindings.policy.open-cluster-management.io",
 	}
@@ -321,3 +340,26 @@ func CleanupHubNamespace(namespace string) {
 		1,
 	).Should(BeTrue(), fmt.Sprintf("Namespace %s should be deleted.", namespace))
 }
+
+func ApplyManagedClusterSetBinding(ctx SpecContext) error {
+	managedClusterSetBinding := unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"apiVersion": GvrManagedClusterSetBinding.Group +
+				"/" + GvrManagedClusterSetBinding.Version,
+			"kind": "ManagedClusterSetBinding",
+			"metadata": map[string]interface{}{
+				"name": "global",
+			},
+			"spec": map[string]interface{}{
+				"clusterSet": "global",
+			},
+		},
+	}
+
+	_, err := ClientHubDynamic.Resource(GvrManagedClusterSetBinding).
+		Namespace(UserNamespace).Create(
+		ctx, &managedClusterSetBinding, metav1.CreateOptions{},
+	)
+
+	return err
+}
diff --git a/test/common/gvr.go b/test/common/gvr.go
index f838c341..ee703453 100644
--- a/test/common/gvr.go
+++ b/test/common/gvr.go
@@ -77,11 +77,6 @@ var (
 		Version:  "v1",
 		Resource: "placementbindings",
 	}
-	GvrPlacementRule = schema.GroupVersionResource{
-		Group:    "apps.open-cluster-management.io",
-		Version:  "v1",
-		Resource: "placementrules",
-	}
 	GvrSubscription = schema.GroupVersionResource{
 		Group:    "apps.open-cluster-management.io",
 		Version:  "v1",
@@ -167,4 +162,9 @@ var (
 		Version:  "v1beta1",
 		Resource: "placements",
 	}
+	GvrPlacementDecision = schema.GroupVersionResource{
+		Group:    "cluster.open-cluster-management.io",
+		Version:  "v1beta1",
+		Resource: "placementdecisions",
+	}
 )
diff --git a/test/common/policy_utils.go b/test/common/policy_utils.go
index bcfb677f..b86530bd 100644
--- a/test/common/policy_utils.go
+++ b/test/common/policy_utils.go
@@ -11,6 +11,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -46,22 +47,22 @@ func GetClusterComplianceState(policyName, clusterName string) func(Gomega) inte
 	}
 }
 
-// Patches the clusterSelector of the specified PlacementRule so that it will
+// Patches the requiredClusterSelector of the specified Placement so that it will
 // always only match the targetCluster.
-func PatchPlacementRule(namespace, name string) error {
-	By("Patching PlacementRule " + namespace + "/" + name +
-		" with clusterSelector {name: " + ClusterNamespaceOnHub + "}")
+func PatchPlacement(namespace, name string) error {
+	By("Patching Placement " + namespace + "/" + name +
+		" with requiredClusterSelector {name: " + ClusterNamespaceOnHub + "}")
 
 	_, err := OcHub(
 		"patch",
 		"-n",
 		namespace,
-		"placementrule.apps.open-cluster-management.io",
+		"placements.cluster.open-cluster-management.io",
 		name,
 		"--type=json",
 		`-p=[{
 			"op": "replace",
-			"path": "/spec/clusterSelector",
+			"path": "/spec/predicates/0/requiredClusterSelector/labelSelector",
 			"value":{"matchExpressions":[{"key": "name", "operator": "In", "values": ["`+ClusterNamespaceOnHub+`"]}]}
 		}]`,
 	)
@@ -69,11 +70,50 @@ func PatchPlacementRule(namespace, name string) error {
 	return err
 }
 
+// CreatePlacementDecisionStatus creates a PlacementDecision for the specified
+// Placement and returns the created decision.
+func CreatePlacementDecision(ctx context.Context, namespace, placementName string) (*unstructured.Unstructured, error) {
+	pldName := placementName + "-1"
+
+	By("Creating PlacementDecision for Placement " + namespace + "/" + placementName)
+	placementDecision := unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"apiVersion": GvrPlacementDecision.Group + "/" + GvrPlacementDecision.Version,
+			"kind":       "PlacementDecision",
+			"metadata": map[string]interface{}{
+				"name": pldName,
+				"labels": map[string]string{
+					"generated-by-policy-test":                     "",
+					"cluster.open-cluster-management.io/placement": placementName,
+				},
+			},
+		},
+	}
+
+	err := ClientHubDynamic.Resource(GvrPlacementDecision).Namespace(namespace).Delete(
+		ctx,
+		pldName,
+		metav1.DeleteOptions{},
+	)
+	if err != nil && !k8serrors.IsNotFound(err) {
+		return nil, err
+	}
+
+	decision, err := ClientHubDynamic.Resource(GvrPlacementDecision).Namespace(namespace).Create(
+		ctx, &placementDecision, metav1.CreateOptions{},
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	return decision, nil
+}
+
 // ApplyPlacement function creates Placement and PlacementBinding so that it will
 // always only match the targetCluster.
 func ApplyPlacement(ctx SpecContext, namespace, policyName string) error {
-	By("Apply Placement and PlacementBinding" + namespace + "/" +
-		"placement-" + policyName + "/" + "placement-binding-" + "policyName" +
+	By("Apply Placement and PlacementBinding " + namespace + "/" +
+		"placement-" + policyName + "/" + "placement-binding-" + policyName +
 		" with clusterSelector {name: " + ClusterNamespaceOnHub + "}")
 
 	placement := unstructured.Unstructured{
@@ -143,11 +183,11 @@ func ApplyPlacement(ctx SpecContext, namespace, policyName string) error {
 
 // DeletePlacement delete applied Placement and PlacementBinding
 func DeletePlacement(namespace, policyName string) error {
-	By("Delete Placement and PlacementBinding" + namespace + "/" +
+	By("Delete Placement and PlacementBinding " + namespace + "/" +
 		"placement-" + policyName + "/" + "placement-binding-" + "policyName")
 
 	_, err := OcHub(
-		"delete", "placement.cluster.open-cluster-management.io", "placement-"+policyName,
+		"delete", "placements.cluster.open-cluster-management.io", "placement-"+policyName,
 		"-n", namespace, "--ignore-not-found",
 	)
 	if err != nil {
@@ -155,7 +195,7 @@ func DeletePlacement(namespace, policyName string) error {
 	}
 
 	_, err = OcHub(
-		"delete", "placementbinding.policy.open-cluster-management.io",
+		"delete", "placementbindings.policy.open-cluster-management.io",
 		"placement-binding-"+policyName, "-n", namespace, "--ignore-not-found",
 	)
 
@@ -164,16 +204,16 @@ func DeletePlacement(namespace, policyName string) error {
 
 // DoCreatePolicyTest runs usual assertions around creating a policy. It will
 // create the given policy file to the hub cluster, on the user namespace. It
-// also patches the PlacementRule with a PlacementDecision if required. It
+// also patches the Placement with a PlacementDecision if required. It
 // asserts that the policy was distributed to the managed cluster, and for any
 // templateGVRs supplied, it asserts that a policy template of that type (for
 // example ConfigurationPolicy) and the same name was created on the managed
 // cluster.
 //
 // It assumes that the given filename (stripped of an extension) matches the
-// name of the policy, and that the PlacementRule has the same name, with '-plr'
+// name of the policy, and that the Placement has the same name, with '-plr'
 // appended.
-func DoCreatePolicyTest(policyFile string, templateGVRs ...schema.GroupVersionResource) {
+func DoCreatePolicyTest(ctx context.Context, policyFile string, templateGVRs ...schema.GroupVersionResource) {
 	GinkgoHelper()
 
 	policyName := strings.TrimSuffix(filepath.Base(policyFile), filepath.Ext(policyFile))
@@ -189,13 +229,13 @@ func DoCreatePolicyTest(policyFile string, templateGVRs ...schema.GroupVersionRe
 	if ManuallyPatchDecisions {
 		plrName := policyName + "-plr"
 		By("Patching " + plrName + " with decision of cluster " + ClusterNamespaceOnHub)
-		plr := utils.GetWithTimeout(
-			ClientHubDynamic, GvrPlacementRule, plrName, UserNamespace, true, DefaultTimeoutSeconds,
-		)
-		plr.Object["status"] = utils.GeneratePlrStatus(ClusterNamespaceOnHub)
-		_, err := ClientHubDynamic.Resource(GvrPlacementRule).Namespace(UserNamespace).UpdateStatus(
-			context.TODO(),
-			plr,
+		pld, err := CreatePlacementDecision(ctx, UserNamespace, plrName)
+		Expect(err).ToNot(HaveOccurred())
+
+		pld.Object["status"] = utils.GeneratePldStatus("", "", ClusterNamespaceOnHub)
+		_, err = ClientHubDynamic.Resource(GvrPlacementDecision).Namespace(UserNamespace).UpdateStatus(
+			ctx,
+			pld,
 			metav1.UpdateOptions{},
 		)
 		Expect(err).ToNot(HaveOccurred())
@@ -389,12 +429,12 @@ func DoHistoryUpdatedTest(policyName string, messages ...string) {
 		g.Expect(err).ShouldNot(HaveOccurred())
 		lenMessage := len(messages)
 		historyMsgs := []string{}
-		fmt.Println("Returned policy history:")
+		GinkgoWriter.Println("Returned policy history:")
 		for i, h := range history {
 			historyItem, _ := h.(map[string]interface{})
 			m, _, _ := unstructured.NestedString(historyItem, "message")
 			historyMsgs = append(historyMsgs, m)
-			fmt.Println(fmt.Sprint(i) + ": " + m)
+			GinkgoWriter.Println(fmt.Sprint(i) + ": " + m)
 		}
 		By("Check history length is same")
 		g.Expect(history).Should(HaveLen(lenMessage))
diff --git a/test/configuration_policy_prune.go b/test/configuration_policy_prune.go
index e8733c4a..087cca8e 100644
--- a/test/configuration_policy_prune.go
+++ b/test/configuration_policy_prune.go
@@ -4,6 +4,7 @@
 package test
 
 import (
+	"context"
 	"errors"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -57,7 +58,7 @@ func ConfigPruneBehavior(labels ...string) bool {
 		}
 	}
 
-	pruneTestCreatedByPolicy := func(policyName, policyYaml string, cmShouldBeDeleted bool) {
+	pruneTestCreatedByPolicy := func(ctx context.Context, policyName, policyYaml string, cmShouldBeDeleted bool) {
 		clientManagedDynamic := NewKubeClientDynamic("", KubeconfigManaged, "")
 
 		var clientHostingDynamic dynamic.Interface
@@ -68,7 +69,7 @@ func ConfigPruneBehavior(labels ...string) bool {
 			clientHostingDynamic = NewKubeClientDynamic("", KubeconfigManaged, "")
 		}
 
-		DoCreatePolicyTest(policyYaml, GvrConfigurationPolicy)
+		DoCreatePolicyTest(ctx, policyYaml, GvrConfigurationPolicy)
 
 		DoRootComplianceTest(policyName, policiesv1.Compliant)
 
@@ -131,7 +132,7 @@ func ConfigPruneBehavior(labels ...string) bool {
 		)
 	}
 
-	pruneTestForegroundDeletion := func(policyName, policyYaml string) {
+	pruneTestForegroundDeletion := func(ctx context.Context, policyName, policyYaml string) {
 		clientManagedDynamic := NewKubeClientDynamic("", KubeconfigManaged, "")
 		clientHubDynamic := NewKubeClientDynamic("", KubeconfigHub, "")
 
@@ -143,7 +144,7 @@ func ConfigPruneBehavior(labels ...string) bool {
 			clientHostingDynamic = NewKubeClientDynamic("", KubeconfigManaged, "")
 		}
 
-		DoCreatePolicyTest(policyYaml, GvrConfigurationPolicy)
+		DoCreatePolicyTest(ctx, policyYaml, GvrConfigurationPolicy)
 
 		DoRootComplianceTest(policyName, policiesv1.Compliant)
 
@@ -242,7 +243,7 @@ func ConfigPruneBehavior(labels ...string) bool {
 		)
 	}
 
-	pruneTestInformPolicy := func(policyName, policyYaml string, cmShouldBeDeleted bool) {
+	pruneTestInformPolicy := func(ctx context.Context, policyName, policyYaml string, cmShouldBeDeleted bool) {
 		clientManagedDynamic := NewKubeClientDynamic("", KubeconfigManaged, "")
 
 		var clientHostingDynamic dynamic.Interface
@@ -253,7 +254,7 @@ func ConfigPruneBehavior(labels ...string) bool {
 			clientHostingDynamic = NewKubeClientDynamic("", KubeconfigManaged, "")
 		}
 
-		DoCreatePolicyTest(policyYaml, GvrConfigurationPolicy)
+		DoCreatePolicyTest(ctx, policyYaml, GvrConfigurationPolicy)
 
 		DoRootComplianceTest(policyName, policiesv1.Compliant)
 
@@ -328,7 +329,7 @@ func ConfigPruneBehavior(labels ...string) bool {
 		)
 	}
 
-	pruneTestEditedByPolicy := func(policyName, policyYaml string, cmShouldBeDeleted bool) {
+	pruneTestEditedByPolicy := func(ctx context.Context, policyName, policyYaml string, cmShouldBeDeleted bool) {
 		clientManagedDynamic := NewKubeClientDynamic("", KubeconfigManaged, "")
 
 		var clientHostingDynamic dynamic.Interface
@@ -365,7 +366,7 @@ func ConfigPruneBehavior(labels ...string) bool {
 			g.Expect(initialValue).ToNot(BeEmpty())
 		}, DefaultTimeoutSeconds, 1).Should(Succeed())
 
-		DoCreatePolicyTest(policyYaml, GvrConfigurationPolicy)
+		DoCreatePolicyTest(ctx, policyYaml, GvrConfigurationPolicy)
 
 		DoRootComplianceTest(policyName, policiesv1.Compliant)
 
@@ -446,18 +447,22 @@ func ConfigPruneBehavior(labels ...string) bool {
 			BeforeEach(cleanPolicy(policyName, policyYaml))
 			AfterAll(cleanPolicy(policyName, policyYaml))
 
-			It("Should delete the configmap created by a DeleteAll policy when the policy is deleted", func() {
-				pruneTestCreatedByPolicy(policyName, policyYaml, true)
-			})
-			It("Should not remove the ConfigurationPolicy while a relatedObject is terminating", func() {
-				pruneTestForegroundDeletion(policyName, policyYaml)
-			})
-			It("Should not delete the configmap when the policy is in inform mode", func() {
-				pruneTestInformPolicy(policyName, policyYaml, false)
-			})
-			It("Should delete the configmap edited by a DeleteAll policy when the policy is deleted", func() {
-				pruneTestEditedByPolicy(policyName, policyYaml, true)
-			})
+			It("Should delete the configmap created by a DeleteAll policy when the policy is deleted",
+				func(ctx SpecContext) {
+					pruneTestCreatedByPolicy(ctx, policyName, policyYaml, true)
+				})
+			It("Should not remove the ConfigurationPolicy while a relatedObject is terminating",
+				func(ctx SpecContext) {
+					pruneTestForegroundDeletion(ctx, policyName, policyYaml)
+				})
+			It("Should not delete the configmap when the policy is in inform mode",
+				func(ctx SpecContext) {
+					pruneTestInformPolicy(ctx, policyName, policyYaml, false)
+				})
+			It("Should delete the configmap edited by a DeleteAll policy when the policy is deleted",
+				func(ctx SpecContext) {
+					pruneTestEditedByPolicy(ctx, policyName, policyYaml, true)
+				})
 		})
 
 		Describe("Test DeleteIfCreated pruning", func() {
@@ -468,12 +473,12 @@ func ConfigPruneBehavior(labels ...string) bool {
 			AfterAll(cleanPolicy(policyName, policyYaml))
 
 			It("Should delete the configmap created by "+
-				"a DeleteIfCreated policy when the policy is deleted", func() {
-				pruneTestCreatedByPolicy(policyName, policyYaml, true)
+				"a DeleteIfCreated policy when the policy is deleted", func(ctx SpecContext) {
+				pruneTestCreatedByPolicy(ctx, policyName, policyYaml, true)
 			})
 			It("Should not delete the configmap edited by "+
-				"a DeleteIfCreated policy when the policy is deleted", func() {
-				pruneTestEditedByPolicy(policyName, policyYaml, false)
+				"a DeleteIfCreated policy when the policy is deleted", func(ctx SpecContext) {
+				pruneTestEditedByPolicy(ctx, policyName, policyYaml, false)
 			})
 		})
 
@@ -484,12 +489,14 @@ func ConfigPruneBehavior(labels ...string) bool {
 			BeforeEach(cleanPolicy(policyName, policyYaml))
 			AfterAll(cleanPolicy(policyName, policyYaml))
 
-			It("Should not delete the configmap created by a None policy when the policy is deleted", func() {
-				pruneTestCreatedByPolicy(policyName, policyYaml, false)
-			})
-			It("Should not delete the configmap edited by a None policy when the policy is deleted", func() {
-				pruneTestEditedByPolicy(policyName, policyYaml, false)
-			})
+			It("Should not delete the configmap created by a None policy when the policy is deleted",
+				func(ctx SpecContext) {
+					pruneTestCreatedByPolicy(ctx, policyName, policyYaml, false)
+				})
+			It("Should not delete the configmap edited by a None policy when the policy is deleted",
+				func(ctx SpecContext) {
+					pruneTestEditedByPolicy(ctx, policyName, policyYaml, false)
+				})
 		})
 
 		Describe("Test default pruning", func() {
@@ -500,12 +507,12 @@ func ConfigPruneBehavior(labels ...string) bool {
 			AfterAll(cleanPolicy(policyName, policyYaml))
 
 			It("Should not delete the configmap created by a policy that "+
-				"doesn't specify a Prune behavior when the policy is deleted", func() {
-				pruneTestCreatedByPolicy(policyName, policyYaml, false)
+				"doesn't specify a Prune behavior when the policy is deleted", func(ctx SpecContext) {
+				pruneTestCreatedByPolicy(ctx, policyName, policyYaml, false)
 			})
 			It("Should not delete the configmap edited by a policy that "+
-				"doesn't specify a Prune behavior when the policy is deleted", func() {
-				pruneTestEditedByPolicy(policyName, policyYaml, false)
+				"doesn't specify a Prune behavior when the policy is deleted", func(ctx SpecContext) {
+				pruneTestEditedByPolicy(ctx, policyName, policyYaml, false)
 			})
 		})
 	})
diff --git a/test/e2e/cert_policy_test.go b/test/e2e/cert_policy_test.go
index 4d4b24dd..cb1e4789 100644
--- a/test/e2e/cert_policy_test.go
+++ b/test/e2e/cert_policy_test.go
@@ -20,8 +20,8 @@ var _ = Describe("Test cert policy", func() {
 	Describe("Test cert policy inform", Ordered, func() {
 		const certPolicyName string = "cert-policy"
 		const certPolicyYaml string = "../resources/cert_policy/cert-policy.yaml"
-		It("should be created on managed cluster", func() {
-			common.DoCreatePolicyTest(certPolicyYaml, common.GvrCertPolicy)
+		It("should be created on managed cluster", func(ctx SpecContext) {
+			common.DoCreatePolicyTest(ctx, certPolicyYaml, common.GvrCertPolicy)
 		})
 		It("the policy should be compliant as there is no certificate", func() {
 			common.DoRootComplianceTest(certPolicyName, policiesv1.Compliant)
diff --git a/test/e2e/configuration_policy_test.go b/test/e2e/configuration_policy_test.go
index 5e39663a..996b4616 100644
--- a/test/e2e/configuration_policy_test.go
+++ b/test/e2e/configuration_policy_test.go
@@ -9,7 +9,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/klog"
 	policiesv1 "open-cluster-management.io/governance-policy-propagator/api/v1"
 	"open-cluster-management.io/governance-policy-propagator/test/utils"
 
@@ -55,8 +54,8 @@ var _ = Describe("Test configuration policy inform", Ordered, func() {
 		const rolePolicyName string = "role-policy-musthave"
 		const rolePolicyYaml string = "../resources/configuration_policy/role-policy-musthave.yaml"
 		expectedStatusMsgs := []string{}
-		It("should be created on managed cluster", func() {
-			common.DoCreatePolicyTest(rolePolicyYaml, common.GvrConfigurationPolicy)
+		It("should be created on managed cluster", func(ctx SpecContext) {
+			common.DoCreatePolicyTest(ctx, rolePolicyYaml, common.GvrConfigurationPolicy)
 		})
 		It("the policy should be noncompliant", func() {
 			common.DoRootComplianceTest(rolePolicyName, policiesv1.NonCompliant)
@@ -168,8 +167,8 @@ var _ = Describe("Test configuration policy inform", Ordered, func() {
 		const rolePolicyName string = "role-policy-mustnothave"
 		const rolePolicyYaml string = "../resources/configuration_policy/role-policy-mustnothave.yaml"
 		expectedStatusMsgs := []string{}
-		It("should be created on managed cluster", func() {
-			common.DoCreatePolicyTest(rolePolicyYaml, common.GvrConfigurationPolicy)
+		It("should be created on managed cluster", func(ctx SpecContext) {
+			common.DoCreatePolicyTest(ctx, rolePolicyYaml, common.GvrConfigurationPolicy)
 		})
 		It("the policy should be compliant", func() {
 			common.DoRootComplianceTest(rolePolicyName, policiesv1.Compliant)
@@ -217,8 +216,8 @@ var _ = Describe("Test configuration policy inform", Ordered, func() {
 		const rolePolicyName string = "role-policy-mustonlyhave"
 		const rolePolicyYaml string = "../resources/configuration_policy/role-policy-mustonlyhave.yaml"
 		expectedStatusMsgs := []string{}
-		It("should be created on managed cluster", func() {
-			common.DoCreatePolicyTest(rolePolicyYaml, common.GvrConfigurationPolicy)
+		It("should be created on managed cluster", func(ctx SpecContext) {
+			common.DoCreatePolicyTest(ctx, rolePolicyYaml, common.GvrConfigurationPolicy)
 		})
 		It("the policy should be noncompliant", func() {
 			common.DoRootComplianceTest(rolePolicyName, policiesv1.NonCompliant)
@@ -349,8 +348,8 @@ var _ = Describe("Test configuration policy enforce", Ordered, func() {
 		const rolePolicyName string = "role-policy-musthave"
 		const rolePolicyYaml string = "../resources/configuration_policy/role-policy-musthave.yaml"
 		expectedStatusMsgs := []string{}
-		It("should be created on managed cluster", func() {
-			common.DoCreatePolicyTest(rolePolicyYaml, common.GvrConfigurationPolicy)
+		It("should be created on managed cluster", func(ctx SpecContext) {
+			common.DoCreatePolicyTest(ctx, rolePolicyYaml, common.GvrConfigurationPolicy)
 		})
 		It("the policy should be noncompliant", func() {
 			common.DoRootComplianceTest(rolePolicyName, policiesv1.NonCompliant)
@@ -374,25 +373,20 @@ var _ = Describe("Test configuration policy enforce", Ordered, func() {
 		})
 		It("should recreate the role if manually deleted", func() {
 			By("Deleting the role in default namespace on managed cluster")
-			klog.Info("deleting role")
 			del, err := common.OcManaged(
 				"delete", "role", "-n", "default", roleName,
 				"--ignore-not-found",
 			)
-			klog.Info(del)
+			GinkgoWriter.Println(del)
 			Expect(err).ToNot(HaveOccurred())
 
 			By("Checking if the role has been recreated")
-			klog.Info("checking for role")
 			Eventually(func() interface{} {
 				role, _ := clientManagedDynamic.Resource(common.GvrRole).Namespace("default").Get(
 					context.TODO(),
 					roleName,
 					metav1.GetOptions{},
 				)
-				if role != nil {
-					klog.Info(role)
-				}
 
 				return role
 			}, defaultTimeoutSeconds, 1).ShouldNot(BeNil())
@@ -416,8 +410,7 @@ var _ = Describe("Test configuration policy enforce", Ordered, func() {
 				"../resources/configuration_policy/role-policy-e2e-more.yaml",
 				"-n", "default",
 			)
-			klog.Info("patch more")
-			klog.Info(mismatch)
+			GinkgoWriter.Println(mismatch)
 			Expect(err).ToNot(HaveOccurred())
 			By("Checking if the role is not patched to match in 30s")
 			yamlRole := utils.ParseYaml("../resources/configuration_policy/role-policy-e2e-more.yaml")
@@ -430,7 +423,6 @@ var _ = Describe("Test configuration policy enforce", Ordered, func() {
 					true,
 					defaultTimeoutSeconds,
 				)
-				klog.Info(managedRole)
 
 				return managedRole.Object["rules"]
 			}, 30, 1).Should(utils.SemanticEqual(yamlRole.Object["rules"]))
@@ -445,8 +437,7 @@ var _ = Describe("Test configuration policy enforce", Ordered, func() {
 				"../resources/configuration_policy/role-policy-e2e-less.yaml",
 				"-n", "default",
 			)
-			klog.Info("patch less")
-			klog.Info(mismatch)
+			GinkgoWriter.Println(mismatch)
 			Expect(err).ToNot(HaveOccurred())
 			By("Checking if the role has been patched to match")
 			yamlRole := utils.ParseYaml("../resources/configuration_policy/role-policy-e2e.yaml")
@@ -459,7 +450,6 @@ var _ = Describe("Test configuration policy enforce", Ordered, func() {
 					true,
 					defaultTimeoutSeconds,
 				)
-				klog.Info(managedRole)
 
 				return managedRole.Object["rules"]
 			}, defaultTimeoutSeconds, 1).Should(utils.SemanticEqual(yamlRole.Object["rules"]))
@@ -484,8 +474,8 @@ var _ = Describe("Test configuration policy enforce", Ordered, func() {
 		const rolePolicyName string = "role-policy-mustnothave"
 		const rolePolicyYaml string = "../resources/configuration_policy/role-policy-mustnothave.yaml"
 		expectedStatusMsgs := []string{}
-		It("should be created on managed cluster", func() {
-			common.DoCreatePolicyTest(rolePolicyYaml, common.GvrConfigurationPolicy)
+		It("should be created on managed cluster", func(ctx SpecContext) {
+			common.DoCreatePolicyTest(ctx, rolePolicyYaml, common.GvrConfigurationPolicy)
 		})
 		It("the policy should be compliant", func() {
 			common.DoRootComplianceTest(rolePolicyName, policiesv1.Compliant)
@@ -562,8 +552,8 @@ var _ = Describe("Test configuration policy enforce", Ordered, func() {
 		const rolePolicyName string = "role-policy-mustonlyhave"
 		const rolePolicyYaml string = "../resources/configuration_policy/role-policy-mustonlyhave.yaml"
 		expectedStatusMsgs := []string{}
-		It("should be created on managed cluster", func() {
-			common.DoCreatePolicyTest(rolePolicyYaml, common.GvrConfigurationPolicy)
+		It("should be created on managed cluster", func(ctx SpecContext) {
+			common.DoCreatePolicyTest(ctx, rolePolicyYaml, common.GvrConfigurationPolicy)
 			expectedStatusMsgs = append(
 				[]string{"NonCompliant; violation - roles [role-policy-e2e] not found in namespace default"},
 				expectedStatusMsgs...,
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
index f21c5c2b..539bfffc 100644
--- a/test/e2e/e2e_suite_test.go
+++ b/test/e2e/e2e_suite_test.go
@@ -4,7 +4,6 @@
 package e2e
 
 import (
-	"context"
 	"testing"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -52,7 +51,7 @@ var _ = test.TemplateSyncErrors()
 
 var _ = test.PolicyOrdering()
 
-var _ = BeforeSuite(func() {
+var _ = BeforeSuite(func(ctx SpecContext) {
 	By("Setup hub and managed client")
 
 	common.InitInterfaces(common.KubeconfigHub, common.KubeconfigManaged, common.IsHosted)
@@ -73,15 +72,31 @@ var _ = BeforeSuite(func() {
 	By("Create Namespace if needed")
 	namespaces := clientHub.CoreV1().Namespaces()
 	if _, err := namespaces.Get(
-		context.TODO(),
+		ctx,
 		userNamespace,
 		metav1.GetOptions{},
 	); err != nil && errors.IsNotFound(err) {
-		Expect(namespaces.Create(context.TODO(), &corev1.Namespace{
+		Expect(namespaces.Create(ctx, &corev1.Namespace{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: userNamespace,
 			},
 		}, metav1.CreateOptions{})).NotTo(BeNil())
 	}
-	Expect(namespaces.Get(context.TODO(), userNamespace, metav1.GetOptions{})).NotTo(BeNil())
+	Expect(namespaces.Get(ctx, userNamespace, metav1.GetOptions{})).NotTo(BeNil())
+
+	if !common.ManuallyPatchDecisions {
+		By("Create ManagedClusterSetBinding")
+		err := common.ApplyManagedClusterSetBinding(ctx)
+		Expect(err).ToNot(HaveOccurred())
+	}
+})
+
+var _ = AfterSuite(func(ctx SpecContext) {
+	By("Cleaning up generated PlacementDecisions")
+	Expect(clientHubDynamic.Resource(common.GvrPlacementDecision).Namespace(userNamespace).DeleteCollection(
+		ctx,
+		metav1.DeleteOptions{},
+		metav1.ListOptions{
+			LabelSelector: "generated-by-policy-test",
+		})).To(Succeed())
 })
diff --git a/test/e2e/hub_templates_encryption_test.go b/test/e2e/hub_templates_encryption_test.go
index 21937a1c..8a9bc4be 100644
--- a/test/e2e/hub_templates_encryption_test.go
+++ b/test/e2e/hub_templates_encryption_test.go
@@ -56,7 +56,7 @@ var _ = Describe("Test Hub Template Encryption", Ordered, func() {
 			_, err = common.OcHub("apply", "-f", configMapYAML, "-n", userNamespace)
 			Expect(err).ToNot(HaveOccurred())
 
-			common.DoCreatePolicyTest(policyYAML, common.GvrConfigurationPolicy)
+			common.DoCreatePolicyTest(ctx, policyYAML, common.GvrConfigurationPolicy)
 		})
 
 		It("Should be compliant after enforcing it", func() {
@@ -221,6 +221,32 @@ var _ = Describe("Test Hub Template Encryption", Ordered, func() {
 				}
 			}
 
+			err = clientHubDynamic.Resource(common.GvrPlacementBinding).Namespace(userNamespace).Delete(
+				ctx, policyName+"-pb", metav1.DeleteOptions{},
+			)
+			if !k8serrors.IsNotFound(err) {
+				var exitError *exec.ExitError
+				ok := errors.As(err, &exitError)
+				if ok {
+					Expect(exitError.Stderr).To(BeNil())
+				} else {
+					Expect(err).ToNot(HaveOccurred())
+				}
+			}
+
+			err = clientHubDynamic.Resource(common.GvrPlacement).Namespace(userNamespace).Delete(
+				ctx, policyName+"-plr", metav1.DeleteOptions{},
+			)
+			if !k8serrors.IsNotFound(err) {
+				var exitError *exec.ExitError
+				ok := errors.As(err, &exitError)
+				if ok {
+					Expect(exitError.Stderr).To(BeNil())
+				} else {
+					Expect(err).ToNot(HaveOccurred())
+				}
+			}
+
 			err = clientHub.CoreV1().Secrets(userNamespace).Delete(ctx, secretName, metav1.DeleteOptions{})
 			if !k8serrors.IsNotFound(err) {
 				var exitError *exec.ExitError
diff --git a/test/e2e/policySet_e2e_test.go b/test/e2e/policySet_e2e_test.go
index 8bdbcda8..9d46a9e5 100644
--- a/test/e2e/policySet_e2e_test.go
+++ b/test/e2e/policySet_e2e_test.go
@@ -4,8 +4,6 @@
 package e2e
 
 import (
-	"context"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -25,7 +23,7 @@ const (
 
 var _ = Describe("Test policy set", func() {
 	Describe("Create policy, policyset, and placement in ns: "+userNamespace, Ordered, func() {
-		It("Should create and process policy and policyset", func() {
+		It("Should create and process policy and policyset", func(ctx SpecContext) {
 			By("Creating " + testPolicySetYaml)
 			_, err := common.OcHub("apply", "-f", testPolicySetYaml, "-n", userNamespace)
 			Expect(err).ToNot(HaveOccurred())
@@ -35,18 +33,17 @@ var _ = Describe("Test policy set", func() {
 			)
 			Expect(rootPolicy).NotTo(BeNil())
 
-			err = common.PatchPlacementRule(userNamespace, testPolicySetName+"-plr")
+			err = common.PatchPlacement(userNamespace, testPolicySetName+"-plr")
 			Expect(err).ToNot(HaveOccurred())
 
 			if common.ManuallyPatchDecisions {
 				By("Patching " + testPolicySetName + "-plr with decision of cluster " + clusterNamespaceOnHub)
-				plr := utils.GetWithTimeout(
-					clientHubDynamic, common.GvrPlacementRule, testPolicySetName+"-plr", userNamespace,
-					true, defaultTimeoutSeconds,
-				)
-				plr.Object["status"] = utils.GeneratePlrStatus(clusterNamespaceOnHub)
-				_, err = clientHubDynamic.Resource(common.GvrPlacementRule).Namespace(userNamespace).UpdateStatus(
-					context.TODO(), plr, metav1.UpdateOptions{},
+				pld, err := common.CreatePlacementDecision(ctx, userNamespace, testPolicySetName+"-plr")
+				Expect(err).ToNot(HaveOccurred())
+
+				pld.Object["status"] = utils.GeneratePldStatus("", "", clusterNamespaceOnHub)
+				_, err = clientHubDynamic.Resource(common.GvrPlacementDecision).Namespace(userNamespace).UpdateStatus(
+					ctx, pld, metav1.UpdateOptions{},
 				)
 				Expect(err).ToNot(HaveOccurred())
 			}
diff --git a/test/integration/hubtemplates_variables_test.go b/test/integration/hubtemplates_variables_test.go
index 021e443c..9a399bb1 100644
--- a/test/integration/hubtemplates_variables_test.go
+++ b/test/integration/hubtemplates_variables_test.go
@@ -29,8 +29,8 @@ var _ = Describe("GRC: [P1][Sev1][policy-grc] Test hub template variables", Orde
 			Expect(err).ToNot(HaveOccurred())
 		})
 
-		It(policyName+" should be created on the Hub", func() {
-			common.DoCreatePolicyTest(policyYAML, common.GvrConfigurationPolicy)
+		It(policyName+" should be created on the Hub", func(ctx SpecContext) {
+			common.DoCreatePolicyTest(ctx, policyYAML, common.GvrConfigurationPolicy)
 		})
 
 		It(policyName+" should be Compliant", func() {
@@ -77,8 +77,8 @@ var _ = Describe("GRC: [P1][Sev1][policy-grc] Test hub template variables", Orde
 			createdConfigmapName = "mclabels-range-created"
 		)
 
-		It(policyName+" should be created on the Hub", func() {
-			common.DoCreatePolicyTest(policyYAML, common.GvrConfigurationPolicy)
+		It(policyName+" should be created on the Hub", func(ctx SpecContext) {
+			common.DoCreatePolicyTest(ctx, policyYAML, common.GvrConfigurationPolicy)
 		})
 
 		It(policyName+" should be Compliant", func() {
diff --git a/test/integration/integration_suite_test.go b/test/integration/integration_suite_test.go
index 671eda52..9f27c320 100644
--- a/test/integration/integration_suite_test.go
+++ b/test/integration/integration_suite_test.go
@@ -12,7 +12,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/klog"
@@ -104,7 +103,7 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 	Expect(namespaces.Get(ctx, userNamespace, metav1.GetOptions{})).NotTo(BeNil())
 
 	By("Create ManagedClusterSetBinding")
-	err := applyManagedClusterSetBinding(ctx)
+	err := common.ApplyManagedClusterSetBinding(ctx)
 	Expect(err).ToNot(HaveOccurred())
 
 	By("Setting up GitOps user")
@@ -112,6 +111,14 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 })
 
 var _ = AfterSuite(func(ctx SpecContext) {
+	By("Cleaning up generated PlacementDecisions")
+	Expect(clientHubDynamic.Resource(common.GvrPlacementDecision).Namespace(userNamespace).DeleteCollection(
+		ctx,
+		metav1.DeleteOptions{},
+		metav1.ListOptions{
+			LabelSelector: "generated-by-policy-test",
+		})).To(Succeed())
+
 	if userNamespace != "open-cluster-management-global-set" {
 		By("Delete Namespace if needed")
 		_, err := common.OcHub(
@@ -170,26 +177,3 @@ func canCreateOpenshiftNamespaces() bool {
 
 	return canCreateOpenshiftNamespacesResult
 }
-
-func applyManagedClusterSetBinding(ctx SpecContext) error {
-	managedClusterSetBinding := unstructured.Unstructured{
-		Object: map[string]interface{}{
-			"apiVersion": common.GvrManagedClusterSetBinding.Group +
-				"/" + common.GvrManagedClusterSetBinding.Version,
-			"kind": "ManagedClusterSetBinding",
-			"metadata": map[string]interface{}{
-				"name": "global",
-			},
-			"spec": map[string]interface{}{
-				"clusterSet": "global",
-			},
-		},
-	}
-
-	_, err := common.ClientHubDynamic.Resource(common.GvrManagedClusterSetBinding).
-		Namespace(common.UserNamespace).Create(
-		ctx, &managedClusterSetBinding, metav1.CreateOptions{},
-	)
-
-	return err
-}
diff --git a/test/integration/operator_policy_complianceconfig_test.go b/test/integration/operator_policy_complianceconfig_test.go
index b6053847..646291de 100644
--- a/test/integration/operator_policy_complianceconfig_test.go
+++ b/test/integration/operator_policy_complianceconfig_test.go
@@ -22,9 +22,9 @@ var _ = Describe("RHACM4K-48381 GRC: [P1][Sev1][policy-grc] Test OperatorPolicy
 			operatorVersionInitial = "quay-operator.v3.8.14"
 		)
 
-		BeforeAll(func() {
+		BeforeAll(func(ctx SpecContext) {
 			By("Create policy " + policyName + " which contains " + operatorPolicyName)
-			common.DoCreatePolicyTest(policyPath, common.GvrOperatorPolicy)
+			common.DoCreatePolicyTest(ctx, policyPath, common.GvrOperatorPolicy)
 		})
 
 		AfterAll(func() {
@@ -133,9 +133,9 @@ var _ = Describe("RHACM4K-48382 GRC: [P1][Sev1][policy-grc] Test OperatorPolicy
 			subscriptionNamespace = "grcqeoptest-ns-48382"
 		)
 
-		BeforeAll(func() {
+		BeforeAll(func(ctx SpecContext) {
 			By("Create policy " + policyName + " which contains " + operatorPolicyName)
-			common.DoCreatePolicyTest(policyPath, common.GvrOperatorPolicy)
+			common.DoCreatePolicyTest(ctx, policyPath, common.GvrOperatorPolicy)
 		})
 
 		AfterAll(func() {
diff --git a/test/integration/operator_policy_error_test.go b/test/integration/operator_policy_error_test.go
index 26bdcf3a..58d3a2ec 100644
--- a/test/integration/operator_policy_error_test.go
+++ b/test/integration/operator_policy_error_test.go
@@ -21,9 +21,9 @@ var _ = Describe("GRC: [P1][Sev1][policy-grc] Test operatorpolicy errors",
 			subscriptionNamespace = "grcqeoptest-ns-43568"
 		)
 
-		BeforeAll(func() {
+		BeforeAll(func(ctx SpecContext) {
 			By("Create policy " + policyName + " which contains " + operatorPolicyName)
-			common.DoCreatePolicyTest(policyPath, common.GvrOperatorPolicy)
+			common.DoCreatePolicyTest(ctx, policyPath, common.GvrOperatorPolicy)
 		})
 
 		AfterAll(func() {
diff --git a/test/integration/policy_diff_generation_test.go b/test/integration/policy_diff_generation_test.go
index af291ac3..08d566ad 100644
--- a/test/integration/policy_diff_generation_test.go
+++ b/test/integration/policy_diff_generation_test.go
@@ -37,7 +37,7 @@ var _ = Describe("GRC: [P1][Sev1][policy-grc] Test diff generation",
 			)
 			Expect(err).ToNot(HaveOccurred())
 
-			err = common.PatchPlacementRule(userNamespace, "placement-"+policyConfigMapName)
+			err = common.PatchPlacement(userNamespace, "placement-"+policyConfigMapName)
 			Expect(err).ToNot(HaveOccurred())
 
 			By("Checking that " + policyConfigMapName + " exists on the Hub cluster")
diff --git a/test/integration/policy_hub_templates_21440_test.go b/test/integration/policy_hub_templates_21440_test.go
index debb9bfa..5f000426 100644
--- a/test/integration/policy_hub_templates_21440_test.go
+++ b/test/integration/policy_hub_templates_21440_test.go
@@ -62,7 +62,7 @@ var _ = Describe(
 		})
 
 		It(policyName+" should be created on the Hub", func() {
-			common.DoCreatePolicyTest(policyYAML, common.GvrConfigurationPolicy)
+			common.DoCreatePolicyTest(ctx, policyYAML, common.GvrConfigurationPolicy)
 		})
 
 		It(policyName+" should be Compliant", func() {
diff --git a/test/integration/policy_install_operator_test.go b/test/integration/policy_install_operator_test.go
index 773e5180..070b98f4 100644
--- a/test/integration/policy_install_operator_test.go
+++ b/test/integration/policy_install_operator_test.go
@@ -100,7 +100,7 @@ var _ = Describe("GRC: [P1][Sev1][policy-grc] Test install Operator",
 				_, err := common.OcHub("apply", "-f", policyNoGroupYAML, "-n", userNamespace)
 				Expect(err).ToNot(HaveOccurred())
 
-				err = common.PatchPlacementRule(userNamespace, policyNamePrefix+noGroupSuffix+"-plr")
+				err = common.PatchPlacement(userNamespace, policyNamePrefix+noGroupSuffix+"-plr")
 				Expect(err).ToNot(HaveOccurred())
 
 				By("Checking that it exists on the hub cluster")
@@ -358,7 +358,7 @@ var _ = Describe("GRC: [P1][Sev1][policy-grc] Test install Operator",
 			It(policyNamePrefix+withGroupSuffix+" should be created on the hub", func() {
 				_, err := common.OcHub("apply", "-f", policyWithGroupYAML, "-n", userNamespace)
 				Expect(err).ToNot(HaveOccurred())
-				err = common.PatchPlacementRule(userNamespace, policyNamePrefix+withGroupSuffix+"-plr")
+				err = common.PatchPlacement(userNamespace, policyNamePrefix+withGroupSuffix+"-plr")
 				Expect(err).ToNot(HaveOccurred())
 
 				By("Checking that it exists on the hub cluster")
diff --git a/test/integration/policy_multiline_templatization_test.go b/test/integration/policy_multiline_templatization_test.go
index 0b946658..221abbe1 100644
--- a/test/integration/policy_multiline_templatization_test.go
+++ b/test/integration/policy_multiline_templatization_test.go
@@ -4,7 +4,6 @@
 package integration
 
 import (
-	"context"
 	"fmt"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -35,9 +34,7 @@ var _ = Describe(
 			configNamespace = "config-test"
 		)
 
-		ctx := context.TODO()
-
-		It("The ConfigMaps should be created on the Hub and Managed clusters", func() {
+		It("The ConfigMaps should be created on the Hub and Managed clusters", func(ctx SpecContext) {
 			for cluster, client := range map[string]kubernetes.Interface{
 				"hub":     clientHub,
 				"managed": clientManaged,
@@ -48,7 +45,7 @@ var _ = Describe(
 						ObjectMeta: metav1.ObjectMeta{Name: nsName},
 					}
 
-					_, err := client.CoreV1().Namespaces().Create(context.TODO(), namespace, metav1.CreateOptions{})
+					_, err := client.CoreV1().Namespaces().Create(ctx, namespace, metav1.CreateOptions{})
 					if !k8serrors.IsAlreadyExists(err) {
 						if nsName == userNamespace && cluster == "managed" {
 							createdUserNamespace = true
@@ -75,15 +72,15 @@ var _ = Describe(
 			}
 		})
 
-		It(policyHubName+" should be created on the Hub", func() {
-			common.DoCreatePolicyTest(policyHubYAML, common.GvrConfigurationPolicy)
+		It(policyHubName+" should be created on the Hub", func(ctx SpecContext) {
+			common.DoCreatePolicyTest(ctx, policyHubYAML, common.GvrConfigurationPolicy)
 		})
 
 		It(policyHubName+" should be Compliant", func() {
 			common.DoRootComplianceTest(policyHubName, policiesv1.Compliant)
 		})
 
-		It("The ConfigMaps on should be patched with the correct data", func() {
+		It("The ConfigMaps on should be patched with the correct data", func(ctx SpecContext) {
 			for cluster, client := range map[string]kubernetes.Interface{
 				"hub":     clientHub,
 				"managed": clientManaged,
@@ -110,15 +107,15 @@ var _ = Describe(
 			}
 		})
 
-		It(policyNoHubName+" should be created on the Hub", func() {
-			common.DoCreatePolicyTest(policyNoHubYAML, common.GvrConfigurationPolicy)
+		It(policyNoHubName+" should be created on the Hub", func(ctx SpecContext) {
+			common.DoCreatePolicyTest(ctx, policyNoHubYAML, common.GvrConfigurationPolicy)
 		})
 
 		It(policyNoHubName+" should be Compliant", func() {
 			common.DoRootComplianceTest(policyNoHubName, policiesv1.Compliant)
 		})
 
-		It("The ConfigMaps should be copied to the new namespace with the correct data", func() {
+		It("The ConfigMaps should be copied to the new namespace with the correct data", func(ctx SpecContext) {
 			for cluster, client := range map[string]kubernetes.Interface{
 				"hub":     clientHub,
 				"managed": clientManaged,
@@ -145,7 +142,7 @@ var _ = Describe(
 			}
 		})
 
-		AfterAll(func() {
+		AfterAll(func(ctx SpecContext) {
 			By("Deleting policies")
 			common.DoCleanupPolicy(policyHubYAML, common.GvrConfigurationPolicy)
 			common.DoCleanupPolicy(policyNoHubYAML, common.GvrConfigurationPolicy)
diff --git a/test/integration/policy_set_test.go b/test/integration/policy_set_test.go
index 4212c98d..d223e781 100644
--- a/test/integration/policy_set_test.go
+++ b/test/integration/policy_set_test.go
@@ -56,7 +56,7 @@ var _ = Describe("GRC: [P1][Sev1][policy-grc] Test policy set", Ordered, Label("
 			Expect(found).Should(BeTrue())
 			Expect(templates).Should(HaveLen(1))
 
-			err = testcommon.PatchPlacementRule(userNamespace, testPolicySetName+"-plr")
+			err = testcommon.PatchPlacement(userNamespace, testPolicySetName+"-plr")
 			Expect(err).ToNot(HaveOccurred())
 
 			By("Checking " + testPolicyName + " on managed cluster in ns " + clusterNamespace)
diff --git a/test/performance/performance.go b/test/performance/performance.go
index 04aaeac0..3e7b5b00 100644
--- a/test/performance/performance.go
+++ b/test/performance/performance.go
@@ -470,7 +470,7 @@ func main() {
 	}
 
 	prDeletionOutput, err := exec.Command(
-		"kubectl", "delete", "placementrules", "-l",
+		"kubectl", "delete", "placement", "-l",
 		"grc-test=config-policy-performance",
 		"--ignore-not-found",
 	).CombinedOutput()
diff --git a/test/performance/resources/templates/cfgmap-plc.yaml b/test/performance/resources/templates/cfgmap-plc.yaml
index 993716b5..fa570e8f 100644
--- a/test/performance/resources/templates/cfgmap-plc.yaml
+++ b/test/performance/resources/templates/cfgmap-plc.yaml
@@ -71,20 +71,22 @@ spec:
                     culpa qui officia deserunt mollit anim id est laborum.
 
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: policy-config-[ID]-placement
   namespace: default
   labels:
     grc-test: config-policy-performance
 spec:
-  clusterSelector:
-    matchExpressions:
-      - key: local-cluster
-        operator: In
-        values:
-          - "true"
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions:
+        - key: local-cluster
+          operator: In
+          values:
+            - "true"
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
@@ -95,8 +97,8 @@ metadata:
     grc-test: config-policy-performance
 placementRef:
   name: policy-config-[ID]-placement
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
 subjects:
   - name: policy-config-[ID]
     apiGroup: policy.open-cluster-management.io
diff --git a/test/policy_ordering.go b/test/policy_ordering.go
index 62291cc5..fbdf3b9c 100644
--- a/test/policy_ordering.go
+++ b/test/policy_ordering.go
@@ -4,8 +4,6 @@
 package test
 
 import (
-	"context"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -62,13 +60,13 @@ func PolicyOrdering(labels ...string) bool {
 
 	Describe("GRC: [P1][Sev1][policy-grc] Test policy ordering", Ordered, Label(labels...), func() {
 		Describe("Ordering via a dependency on a Policy", Ordered, func() {
-			BeforeAll(func() {
+			BeforeAll(func(ctx SpecContext) {
 				By("Creating the initial policy to use as a dependency")
-				DoCreatePolicyTest(initialPolicyYaml, GvrConfigurationPolicy)
+				DoCreatePolicyTest(ctx, initialPolicyYaml, GvrConfigurationPolicy)
 				DoRootComplianceTest(initialPolicyName, policiesv1.NonCompliant)
 
 				By("Creating the policy that depends on the initial policy")
-				DoCreatePolicyTest(policyWithDepYaml)
+				DoCreatePolicyTest(ctx, policyWithDepYaml)
 			})
 			It("Should be pending while the initial policy is non-compliant", func() {
 				DoRootComplianceTest(policyWithDepName, policiesv1.Pending)
@@ -85,13 +83,13 @@ func PolicyOrdering(labels ...string) bool {
 			AfterAll(cleanup)
 		})
 		Describe("Ordering via an extraDependency on a ConfigurationPolicy", Ordered, func() {
-			BeforeAll(func() {
+			BeforeAll(func(ctx SpecContext) {
 				By("Creating the initial policy to use as a dependency")
-				DoCreatePolicyTest(initialPolicyYaml, GvrConfigurationPolicy)
+				DoCreatePolicyTest(ctx, initialPolicyYaml, GvrConfigurationPolicy)
 				DoRootComplianceTest(initialPolicyName, policiesv1.NonCompliant)
 
 				By("Creating the policy that depends on the initial policy")
-				DoCreatePolicyTest(policyWithExtraDepYaml)
+				DoCreatePolicyTest(ctx, policyWithExtraDepYaml)
 			})
 			It("Should be pending while the initial policy is non-compliant", func() {
 				DoRootComplianceTest(policyWithExtraDepName, policiesv1.Pending)
@@ -108,13 +106,13 @@ func PolicyOrdering(labels ...string) bool {
 			AfterAll(cleanup)
 		})
 		Describe("IgnorePending should allow policies to be compliant when one template is pending", Ordered, func() {
-			BeforeAll(func() {
+			BeforeAll(func(ctx SpecContext) {
 				By("Creating the initial policy to use as a dependency")
-				DoCreatePolicyTest(initialPolicyYaml, GvrConfigurationPolicy)
+				DoCreatePolicyTest(ctx, initialPolicyYaml, GvrConfigurationPolicy)
 				DoRootComplianceTest(initialPolicyName, policiesv1.NonCompliant)
 
 				By("Creating the policy that depends on the initial policy")
-				DoCreatePolicyTest(ignorePendingYaml)
+				DoCreatePolicyTest(ctx, ignorePendingYaml)
 			})
 			It("Should be compliant overall", func() {
 				DoRootComplianceTest(ignorePendingName, policiesv1.Compliant)
@@ -128,7 +126,7 @@ func PolicyOrdering(labels ...string) bool {
 			AfterAll(cleanup)
 		})
 		Describe("Ordering via a dependency on a PolicySet", Ordered, func() {
-			It("Should create policyset with noncompliant status", func() {
+			It("Should create policyset with noncompliant status", func(ctx SpecContext) {
 				By("Creating the initial policy set to use as a dependency")
 				_, err := OcHub("apply", "-f", testPolicySetYaml, "-n", UserNamespace)
 				Expect(err).ToNot(HaveOccurred())
@@ -138,18 +136,17 @@ func PolicyOrdering(labels ...string) bool {
 				)
 				Expect(rootPolicy).NotTo(BeNil())
 
-				err = PatchPlacementRule(UserNamespace, testPolicySetName+"-plr")
+				err = PatchPlacement(UserNamespace, testPolicySetName+"-plr")
 				Expect(err).ToNot(HaveOccurred())
 
 				if ManuallyPatchDecisions {
 					By("Patching " + testPolicySetName + "-plr with decision of cluster " + ClusterNamespaceOnHub)
-					plr := utils.GetWithTimeout(
-						ClientHubDynamic, GvrPlacementRule, testPolicySetName+"-plr", UserNamespace,
-						true, DefaultTimeoutSeconds,
-					)
-					plr.Object["status"] = utils.GeneratePlrStatus(ClusterNamespaceOnHub)
-					_, err = ClientHubDynamic.Resource(GvrPlacementRule).Namespace(UserNamespace).UpdateStatus(
-						context.TODO(), plr, metav1.UpdateOptions{},
+					pld, err := CreatePlacementDecision(ctx, UserNamespace, testPolicySetName+"-plr")
+					Expect(err).ToNot(HaveOccurred())
+
+					pld.Object["status"] = utils.GeneratePldStatus("", "", ClusterNamespaceOnHub)
+					_, err = ClientHubDynamic.Resource(GvrPlacementDecision).Namespace(UserNamespace).UpdateStatus(
+						ctx, pld, metav1.UpdateOptions{},
 					)
 					Expect(err).ToNot(HaveOccurred())
 				}
@@ -182,9 +179,9 @@ func PolicyOrdering(labels ...string) bool {
 					return rootPlcSet.Object["status"]
 				}, DefaultTimeoutSeconds, 1).Should(utils.SemanticEqual(yamlPlc.Object["status"]))
 			})
-			It("Should be pending while the initial policy is non-compliant", func() {
+			It("Should be pending while the initial policy is non-compliant", func(ctx SpecContext) {
 				By("Creating the policy that depends on the initial policy")
-				DoCreatePolicyTest(plcWithDepOnSetYaml)
+				DoCreatePolicyTest(ctx, plcWithDepOnSetYaml)
 				DoRootComplianceTest(plcWithDepOnSetName, policiesv1.Pending)
 			})
 			It("Should become active after the initial policy is enforced", func() {
diff --git a/test/resources/cert_policy/cert-policy.yaml b/test/resources/cert_policy/cert-policy.yaml
index abd8ec84..e7458f8a 100644
--- a/test/resources/cert_policy/cert-policy.yaml
+++ b/test/resources/cert_policy/cert-policy.yaml
@@ -33,18 +33,25 @@ kind: PlacementBinding
 metadata:
   name: cert-policy-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: cert-policy-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: cert-policy
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: cert-policy-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/configuration_policy/role-policy-musthave.yaml b/test/resources/configuration_policy/role-policy-musthave.yaml
index 1bafcb06..044cee79 100644
--- a/test/resources/configuration_policy/role-policy-musthave.yaml
+++ b/test/resources/configuration_policy/role-policy-musthave.yaml
@@ -40,18 +40,25 @@ kind: PlacementBinding
 metadata:
   name: role-policy-musthave-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: role-policy-musthave-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: role-policy-musthave
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: role-policy-musthave-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/configuration_policy/role-policy-mustnothave.yaml b/test/resources/configuration_policy/role-policy-mustnothave.yaml
index 8f76a569..1c01482f 100644
--- a/test/resources/configuration_policy/role-policy-mustnothave.yaml
+++ b/test/resources/configuration_policy/role-policy-mustnothave.yaml
@@ -40,18 +40,25 @@ kind: PlacementBinding
 metadata:
   name: role-policy-mustnothave-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: role-policy-mustnothave-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: role-policy-mustnothave
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: role-policy-mustnothave-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/configuration_policy/role-policy-mustonlyhave.yaml b/test/resources/configuration_policy/role-policy-mustonlyhave.yaml
index 8ead6d94..23c36993 100644
--- a/test/resources/configuration_policy/role-policy-mustonlyhave.yaml
+++ b/test/resources/configuration_policy/role-policy-mustonlyhave.yaml
@@ -40,18 +40,25 @@ kind: PlacementBinding
 metadata:
   name: role-policy-mustonlyhave-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: role-policy-mustonlyhave-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: role-policy-mustonlyhave
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: role-policy-mustonlyhave-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/configuration_policy_prune/cm-policy-prune-all.yaml b/test/resources/configuration_policy_prune/cm-policy-prune-all.yaml
index fba44b62..aaf89033 100644
--- a/test/resources/configuration_policy_prune/cm-policy-prune-all.yaml
+++ b/test/resources/configuration_policy_prune/cm-policy-prune-all.yaml
@@ -36,18 +36,25 @@ kind: PlacementBinding
 metadata:
   name: cm-policy-prune-all-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: cm-policy-prune-all-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: cm-policy-prune-all
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: cm-policy-prune-all-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/configuration_policy_prune/cm-policy-prune-default.yaml b/test/resources/configuration_policy_prune/cm-policy-prune-default.yaml
index 2e42d7b0..600551d6 100644
--- a/test/resources/configuration_policy_prune/cm-policy-prune-default.yaml
+++ b/test/resources/configuration_policy_prune/cm-policy-prune-default.yaml
@@ -35,18 +35,25 @@ kind: PlacementBinding
 metadata:
   name: cm-policy-prune-default-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: cm-policy-prune-default-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: cm-policy-prune-default
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: cm-policy-prune-default-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/configuration_policy_prune/cm-policy-prune-if-created.yaml b/test/resources/configuration_policy_prune/cm-policy-prune-if-created.yaml
index f1f7b382..35c58f54 100644
--- a/test/resources/configuration_policy_prune/cm-policy-prune-if-created.yaml
+++ b/test/resources/configuration_policy_prune/cm-policy-prune-if-created.yaml
@@ -36,18 +36,25 @@ kind: PlacementBinding
 metadata:
   name: cm-policy-prune-if-created-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: cm-policy-prune-if-created-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: cm-policy-prune-if-created
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: cm-policy-prune-if-created-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/configuration_policy_prune/cm-policy-prune-none.yaml b/test/resources/configuration_policy_prune/cm-policy-prune-none.yaml
index 19aafacc..21d4373c 100644
--- a/test/resources/configuration_policy_prune/cm-policy-prune-none.yaml
+++ b/test/resources/configuration_policy_prune/cm-policy-prune-none.yaml
@@ -36,18 +36,25 @@ kind: PlacementBinding
 metadata:
   name: cm-policy-prune-none-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: cm-policy-prune-none-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: cm-policy-prune-none
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: cm-policy-prune-none-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/diff_generation/diff_generation.yaml b/test/resources/diff_generation/diff_generation.yaml
index 4e3d8a64..8a14ae23 100644
--- a/test/resources/diff_generation/diff_generation.yaml
+++ b/test/resources/diff_generation/diff_generation.yaml
@@ -36,18 +36,25 @@ metadata:
   name: binding-policy-diff-gen-configmap
 placementRef:
   name: placement-policy-diff-gen-configmap
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
 - name: policy-diff-gen-configmap
   kind: Policy
   apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-diff-gen-configmap
 spec:
-  clusterSelector:
-    matchExpressions:
-      - {key: name, operator: In, values: ["to-be-replaced"]}
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions:
+        - {key: name, operator: In, values: ["to-be-replaced"]}
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/gatekeeper/policy-uninstall-gk.yaml b/test/resources/gatekeeper/policy-uninstall-gk.yaml
index f6698551..595fdbbb 100644
--- a/test/resources/gatekeeper/policy-uninstall-gk.yaml
+++ b/test/resources/gatekeeper/policy-uninstall-gk.yaml
@@ -53,6 +53,12 @@ spec:
           matchLabels:
             feature.open-cluster-management.io/addon-config-policy-controller: "available"
             feature.open-cluster-management.io/addon-governance-policy-framework: "available"
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
+
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
diff --git a/test/resources/hub_templates_encryption/test-hub-encryption.yaml b/test/resources/hub_templates_encryption/test-hub-encryption.yaml
index 7e8d9a6e..b26edfea 100644
--- a/test/resources/hub_templates_encryption/test-hub-encryption.yaml
+++ b/test/resources/hub_templates_encryption/test-hub-encryption.yaml
@@ -44,18 +44,25 @@ kind: PlacementBinding
 metadata:
   name: test-hub-encryption-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: test-hub-encryption-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: test-hub-encryption
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: test-hub-encryption-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/hub_templates_variables/mclabels-fromcm-pol.yaml b/test/resources/hub_templates_variables/mclabels-fromcm-pol.yaml
index c09f46f2..61107ec9 100644
--- a/test/resources/hub_templates_variables/mclabels-fromcm-pol.yaml
+++ b/test/resources/hub_templates_variables/mclabels-fromcm-pol.yaml
@@ -39,18 +39,25 @@ kind: PlacementBinding
 metadata:
   name: mclabels-fromcm-pol-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: mclabels-fromcm-pol-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: mclabels-fromcm-pol
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: mclabels-fromcm-pol-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/hub_templates_variables/mclabels-range-pol.yaml b/test/resources/hub_templates_variables/mclabels-range-pol.yaml
index 79578d85..abf312b1 100644
--- a/test/resources/hub_templates_variables/mclabels-range-pol.yaml
+++ b/test/resources/hub_templates_variables/mclabels-range-pol.yaml
@@ -33,18 +33,25 @@ kind: PlacementBinding
 metadata:
   name: mclabels-range-pol-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: mclabels-range-pol-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: mclabels-range-pol
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: mclabels-range-pol-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/operator_policy/test-op-complianceconfig-1-modified.yaml b/test/resources/operator_policy/test-op-complianceconfig-1-modified.yaml
index 309f1bd7..698ed6ad 100644
--- a/test/resources/operator_policy/test-op-complianceconfig-1-modified.yaml
+++ b/test/resources/operator_policy/test-op-complianceconfig-1-modified.yaml
@@ -45,17 +45,24 @@ metadata:
   name: test-op-complianceconfig-1-plb
 placementRef:
   name: test-op-complianceconfig-1-plr
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
 - name: test-op-complianceconfig-1
   kind: Policy
   apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: test-op-complianceconfig-1-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/operator_policy/test-op-complianceconfig-1.yaml b/test/resources/operator_policy/test-op-complianceconfig-1.yaml
index e45b8c76..3d261445 100644
--- a/test/resources/operator_policy/test-op-complianceconfig-1.yaml
+++ b/test/resources/operator_policy/test-op-complianceconfig-1.yaml
@@ -41,17 +41,24 @@ metadata:
   name: test-op-complianceconfig-1-plb
 placementRef:
   name: test-op-complianceconfig-1-plr
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
 - name: test-op-complianceconfig-1
   kind: Policy
   apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: test-op-complianceconfig-1-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/operator_policy/test-op-complianceconfig-modified.yaml b/test/resources/operator_policy/test-op-complianceconfig-modified.yaml
index 8c5f362f..a47205f8 100644
--- a/test/resources/operator_policy/test-op-complianceconfig-modified.yaml
+++ b/test/resources/operator_policy/test-op-complianceconfig-modified.yaml
@@ -42,17 +42,24 @@ metadata:
   name: test-op-complianceconfig-plb
 placementRef:
   name: test-op-complianceconfig-plr
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
 - name: test-op-complianceconfig
   kind: Policy
   apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: test-op-complianceconfig-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/operator_policy/test-op-complianceconfig.yaml b/test/resources/operator_policy/test-op-complianceconfig.yaml
index c38e899f..6ac0e843 100644
--- a/test/resources/operator_policy/test-op-complianceconfig.yaml
+++ b/test/resources/operator_policy/test-op-complianceconfig.yaml
@@ -38,17 +38,24 @@ metadata:
   name: test-op-complianceconfig-plb
 placementRef:
   name: test-op-complianceconfig-plr
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
 - name: test-op-complianceconfig
   kind: Policy
   apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: test-op-complianceconfig-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/operator_policy/test-op-err-correct.yaml b/test/resources/operator_policy/test-op-err-correct.yaml
index ad5a5fcc..6e9eca0c 100644
--- a/test/resources/operator_policy/test-op-err-correct.yaml
+++ b/test/resources/operator_policy/test-op-err-correct.yaml
@@ -32,17 +32,24 @@ metadata:
   name: test-op-err-initial-plb
 placementRef:
   name: test-op-err-initial-plr
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
 - name: test-op-err-initial
   kind: Policy
   apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: test-op-err-initial-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/operator_policy/test-op-err-initial.yaml b/test/resources/operator_policy/test-op-err-initial.yaml
index b1b337f5..bb686e08 100644
--- a/test/resources/operator_policy/test-op-err-initial.yaml
+++ b/test/resources/operator_policy/test-op-err-initial.yaml
@@ -32,17 +32,24 @@ metadata:
   name: test-op-err-initial-plb
 placementRef:
   name: test-op-err-initial-plr
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
 - name: test-op-err-initial
   kind: Policy
   apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: test-op-err-initial-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_hub_templates_21440/policy-hub-templates-21440.yaml b/test/resources/policy_hub_templates_21440/policy-hub-templates-21440.yaml
index 341f8257..d1511d10 100644
--- a/test/resources/policy_hub_templates_21440/policy-hub-templates-21440.yaml
+++ b/test/resources/policy_hub_templates_21440/policy-hub-templates-21440.yaml
@@ -29,18 +29,25 @@ kind: PlacementBinding
 metadata:
   name: policy-hub-templates-21440-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: policy-hub-templates-21440-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: policy-hub-templates-21440
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: policy-hub-templates-21440-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_info_metric/compliant.yaml b/test/resources/policy_info_metric/compliant.yaml
index f42badfb..660fe6f6 100644
--- a/test/resources/policy_info_metric/compliant.yaml
+++ b/test/resources/policy_info_metric/compliant.yaml
@@ -33,17 +33,24 @@ metadata:
   name: binding-policy-metric-compliant
 placementRef:
   name: placement-policy-metric-compliant
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-metric-compliant
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-metric-compliant
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_info_metric/noncompliant.yaml b/test/resources/policy_info_metric/noncompliant.yaml
index dd7212a3..4a588bec 100644
--- a/test/resources/policy_info_metric/noncompliant.yaml
+++ b/test/resources/policy_info_metric/noncompliant.yaml
@@ -33,17 +33,24 @@ metadata:
   name: binding-policy-metric-noncompliant
 placementRef:
   name: placement-policy-metric-noncompliant
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-metric-noncompliant
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-metric-noncompliant
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_install_operator/clean-up-grcqeoptest-ns.yaml b/test/resources/policy_install_operator/clean-up-grcqeoptest-ns.yaml
index 977965ef..970a11a3 100644
--- a/test/resources/policy_install_operator/clean-up-grcqeoptest-ns.yaml
+++ b/test/resources/policy_install_operator/clean-up-grcqeoptest-ns.yaml
@@ -30,23 +30,27 @@ kind: PlacementBinding
 metadata:
   name: cleanup-grcqeoptest-ns
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: cleanup-grcqeoptest-ns
 subjects:
   - apiGroup: policy.open-cluster-management.io
     kind: Policy
     name: cleanup-grcqeoptest-ns
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: cleanup-grcqeoptest-ns
 spec:
-  clusterSelector:
-    matchLabels:
-      feature.open-cluster-management.io/addon-config-policy-controller: "available"
-      feature.open-cluster-management.io/addon-governance-policy-framework: "available"
-  clusterConditions:
-    - type: ManagedClusterConditionAvailable
-      status: "True"
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchLabels:
+          feature.open-cluster-management.io/addon-config-policy-controller: "available"
+          feature.open-cluster-management.io/addon-governance-policy-framework: "available"
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_install_operator/operator_policy_all_defaults.yaml b/test/resources/policy_install_operator/operator_policy_all_defaults.yaml
index dcb3b1e1..fb12ab0c 100644
--- a/test/resources/policy_install_operator/operator_policy_all_defaults.yaml
+++ b/test/resources/policy_install_operator/operator_policy_all_defaults.yaml
@@ -28,22 +28,26 @@ metadata:
   name: test-op-47229
 placementRef:
   name: test-op-47229
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
 - name: test-op-47229
   kind: Policy
   apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: test-op-47229
 spec:
-  clusterSelector:
-    matchLabels:
-      feature.open-cluster-management.io/addon-config-policy-controller: "available"
-      feature.open-cluster-management.io/addon-governance-policy-framework: "available"
-  clusterConditions:
-  - type: ManagedClusterConditionAvailable
-    status: "True"
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchLabels:
+          feature.open-cluster-management.io/addon-config-policy-controller: "available"
+          feature.open-cluster-management.io/addon-governance-policy-framework: "available"
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_install_operator/operator_policy_no_group.yaml b/test/resources/policy_install_operator/operator_policy_no_group.yaml
index cbae7692..06db5330 100644
--- a/test/resources/policy_install_operator/operator_policy_no_group.yaml
+++ b/test/resources/policy_install_operator/operator_policy_no_group.yaml
@@ -31,22 +31,26 @@ metadata:
   name: test-op-43544-plb
 placementRef:
   name: test-op-43544-plr
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
 - name: test-op-43544
   kind: Policy
   apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: test-op-43544-plr
 spec:
-  clusterSelector:
-    matchLabels:
-      feature.open-cluster-management.io/addon-config-policy-controller: "available"
-      feature.open-cluster-management.io/addon-governance-policy-framework: "available"
-  clusterConditions:
-  - type: ManagedClusterConditionAvailable
-    status: "True"
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchLabels:
+          feature.open-cluster-management.io/addon-config-policy-controller: "available"
+          feature.open-cluster-management.io/addon-governance-policy-framework: "available"
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_install_operator/operator_policy_with_group.yaml b/test/resources/policy_install_operator/operator_policy_with_group.yaml
index a4f340f1..5248dcb7 100644
--- a/test/resources/policy_install_operator/operator_policy_with_group.yaml
+++ b/test/resources/policy_install_operator/operator_policy_with_group.yaml
@@ -36,22 +36,26 @@ metadata:
   name: test-op-43545-plb
 placementRef:
   name: test-op-43545-plr
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
 - name: test-op-43545
   kind: Policy
   apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: test-op-43545-plr
 spec:
-  clusterSelector:
-    matchLabels:
-      feature.open-cluster-management.io/addon-config-policy-controller: "available"
-      feature.open-cluster-management.io/addon-governance-policy-framework: "available"
-  clusterConditions:
-  - type: ManagedClusterConditionAvailable
-    status: "True"
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchLabels:
+          feature.open-cluster-management.io/addon-config-policy-controller: "available"
+          feature.open-cluster-management.io/addon-governance-policy-framework: "available"
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_multiline_templatization/policy-multiline-temp-hub.yaml b/test/resources/policy_multiline_templatization/policy-multiline-temp-hub.yaml
index 7a12e71b..37ec98ca 100644
--- a/test/resources/policy_multiline_templatization/policy-multiline-temp-hub.yaml
+++ b/test/resources/policy_multiline_templatization/policy-multiline-temp-hub.yaml
@@ -34,18 +34,25 @@ kind: PlacementBinding
 metadata:
   name: policy-multiline-temp-hub-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: policy-multiline-temp-hub-plr
 subjects:
   - apiGroup: policy.open-cluster-management.io
     kind: Policy
     name: policy-multiline-temp-hub
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: policy-multiline-temp-hub-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_multiline_templatization/policy-multiline-temp-nohub.yaml b/test/resources/policy_multiline_templatization/policy-multiline-temp-nohub.yaml
index bce724b4..179de404 100644
--- a/test/resources/policy_multiline_templatization/policy-multiline-temp-nohub.yaml
+++ b/test/resources/policy_multiline_templatization/policy-multiline-temp-nohub.yaml
@@ -34,18 +34,25 @@ kind: PlacementBinding
 metadata:
   name: policy-multiline-temp-nohub-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: policy-multiline-temp-nohub-plr
 subjects:
   - apiGroup: policy.open-cluster-management.io
     kind: Policy
     name: policy-multiline-temp-nohub
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: policy-multiline-temp-nohub-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_ordering/dep-plcset-statuscheck.yaml b/test/resources/policy_ordering/dep-plcset-statuscheck.yaml
index eb16324e..98a6f29b 100644
--- a/test/resources/policy_ordering/dep-plcset-statuscheck.yaml
+++ b/test/resources/policy_ordering/dep-plcset-statuscheck.yaml
@@ -9,5 +9,5 @@ status:
   compliant: NonCompliant
   placement:
   - placementBinding: test-policyset-pb
-    placementRule: test-policyset-plr
+    placement: test-policyset-plr
   statusMessage: "All policies are reporting status"
\ No newline at end of file
diff --git a/test/resources/policy_ordering/dep-plcset.yaml b/test/resources/policy_ordering/dep-plcset.yaml
index 500d3aa7..d5d52ba9 100644
--- a/test/resources/policy_ordering/dep-plcset.yaml
+++ b/test/resources/policy_ordering/dep-plcset.yaml
@@ -46,18 +46,25 @@ kind: PlacementBinding
 metadata:
   name: test-policyset-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: test-policyset-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: PolicySet
   name: test-policyset
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: test-policyset-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_ordering/dep-policy-dep-on-plcset.yaml b/test/resources/policy_ordering/dep-policy-dep-on-plcset.yaml
index 2fb496e2..ee6673ae 100644
--- a/test/resources/policy_ordering/dep-policy-dep-on-plcset.yaml
+++ b/test/resources/policy_ordering/dep-policy-dep-on-plcset.yaml
@@ -39,18 +39,25 @@ kind: PlacementBinding
 metadata:
   name: dep-policy-dep-on-plcset-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: dep-policy-dep-on-plcset-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: dep-policy-dep-on-plcset
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: dep-policy-dep-on-plcset-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_ordering/dep-policy-deppol.yaml b/test/resources/policy_ordering/dep-policy-deppol.yaml
index 3eddd34a..d3e481a0 100644
--- a/test/resources/policy_ordering/dep-policy-deppol.yaml
+++ b/test/resources/policy_ordering/dep-policy-deppol.yaml
@@ -39,18 +39,25 @@ kind: PlacementBinding
 metadata:
   name: dep-policy-deppol-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: dep-policy-deppol-plr
 subjects:
   - apiGroup: policy.open-cluster-management.io
     kind: Policy
     name: dep-policy-deppol
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: dep-policy-deppol-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_ordering/dep-policy-extradepconfig.yaml b/test/resources/policy_ordering/dep-policy-extradepconfig.yaml
index 23a816f7..a40938ff 100644
--- a/test/resources/policy_ordering/dep-policy-extradepconfig.yaml
+++ b/test/resources/policy_ordering/dep-policy-extradepconfig.yaml
@@ -39,18 +39,25 @@ kind: PlacementBinding
 metadata:
   name: dep-policy-extradepconfig-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: dep-policy-extradepconfig-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: dep-policy-extradepconfig
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: dep-policy-extradepconfig-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_ordering/dep-policy-ignorepending.yaml b/test/resources/policy_ordering/dep-policy-ignorepending.yaml
index a503a09b..83a6a4c9 100644
--- a/test/resources/policy_ordering/dep-policy-ignorepending.yaml
+++ b/test/resources/policy_ordering/dep-policy-ignorepending.yaml
@@ -57,18 +57,25 @@ kind: PlacementBinding
 metadata:
   name: dep-policy-ignorepending-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: dep-policy-ignorepending-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: dep-policy-ignorepending
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: dep-policy-ignorepending-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_ordering/dep-policy-initial.yaml b/test/resources/policy_ordering/dep-policy-initial.yaml
index 4e5b78e4..e80b3442 100644
--- a/test/resources/policy_ordering/dep-policy-initial.yaml
+++ b/test/resources/policy_ordering/dep-policy-initial.yaml
@@ -33,18 +33,25 @@ kind: PlacementBinding
 metadata:
   name: dep-policy-initial-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: dep-policy-initial-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: dep-policy-initial
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: dep-policy-initial-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_report_metric/compliant.yaml b/test/resources/policy_report_metric/compliant.yaml
index 613bb63e..4f913f94 100644
--- a/test/resources/policy_report_metric/compliant.yaml
+++ b/test/resources/policy_report_metric/compliant.yaml
@@ -33,17 +33,24 @@ metadata:
   name: binding-policyreport-metric-noncompliant
 placementRef:
   name: placement-policyreport-metric-noncompliant
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policyreport-metric-noncompliant
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policyreport-metric-noncompliant
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_report_metric/noncompliant.yaml b/test/resources/policy_report_metric/noncompliant.yaml
index 19f3080a..987bdb49 100644
--- a/test/resources/policy_report_metric/noncompliant.yaml
+++ b/test/resources/policy_report_metric/noncompliant.yaml
@@ -33,17 +33,24 @@ metadata:
   name: binding-policyreport-metric-noncompliant
 placementRef:
   name: placement-policyreport-metric-noncompliant
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policyreport-metric-noncompliant
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policyreport-metric-noncompliant
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/policy_set/statuscheck-1.yaml b/test/resources/policy_set/statuscheck-1.yaml
index eb16324e..98a6f29b 100644
--- a/test/resources/policy_set/statuscheck-1.yaml
+++ b/test/resources/policy_set/statuscheck-1.yaml
@@ -9,5 +9,5 @@ status:
   compliant: NonCompliant
   placement:
   - placementBinding: test-policyset-pb
-    placementRule: test-policyset-plr
+    placement: test-policyset-plr
   statusMessage: "All policies are reporting status"
\ No newline at end of file
diff --git a/test/resources/policy_set/statuscheck-2.yaml b/test/resources/policy_set/statuscheck-2.yaml
index 8067afd2..2dc26a3d 100644
--- a/test/resources/policy_set/statuscheck-2.yaml
+++ b/test/resources/policy_set/statuscheck-2.yaml
@@ -10,5 +10,5 @@ status:
   compliant: NonCompliant
   placement:
   - placementBinding: test-policyset-pb
-    placementRule: test-policyset-plr
+    placement: test-policyset-plr
   statusMessage: "Deleted policies: policyset-does-not-exist"
\ No newline at end of file
diff --git a/test/resources/policy_set/statuscheck-3.yaml b/test/resources/policy_set/statuscheck-3.yaml
index f61db5fd..a4bc1eec 100644
--- a/test/resources/policy_set/statuscheck-3.yaml
+++ b/test/resources/policy_set/statuscheck-3.yaml
@@ -9,5 +9,5 @@ status:
   compliant: Compliant
   placement:
   - placementBinding: test-policyset-pb
-    placementRule: test-policyset-plr
+    placement: test-policyset-plr
   statusMessage: "All policies are reporting status"
\ No newline at end of file
diff --git a/test/resources/policy_set/statuscheck-4.yaml b/test/resources/policy_set/statuscheck-4.yaml
index a19d0c88..a0c8ea21 100644
--- a/test/resources/policy_set/statuscheck-4.yaml
+++ b/test/resources/policy_set/statuscheck-4.yaml
@@ -8,5 +8,5 @@ spec:
 status:
   placement:
   - placementBinding: test-policyset-pb
-    placementRule: test-policyset-plr
+    placement: test-policyset-plr
   statusMessage: "Disabled policies: test-policy"
\ No newline at end of file
diff --git a/test/resources/policy_set/statuscheck-5.yaml b/test/resources/policy_set/statuscheck-5.yaml
index f61db5fd..a4bc1eec 100644
--- a/test/resources/policy_set/statuscheck-5.yaml
+++ b/test/resources/policy_set/statuscheck-5.yaml
@@ -9,5 +9,5 @@ status:
   compliant: Compliant
   placement:
   - placementBinding: test-policyset-pb
-    placementRule: test-policyset-plr
+    placement: test-policyset-plr
   statusMessage: "All policies are reporting status"
\ No newline at end of file
diff --git a/test/resources/policy_set/statuscheck-6.yaml b/test/resources/policy_set/statuscheck-6.yaml
index a19d0c88..a0c8ea21 100644
--- a/test/resources/policy_set/statuscheck-6.yaml
+++ b/test/resources/policy_set/statuscheck-6.yaml
@@ -8,5 +8,5 @@ spec:
 status:
   placement:
   - placementBinding: test-policyset-pb
-    placementRule: test-policyset-plr
+    placement: test-policyset-plr
   statusMessage: "Disabled policies: test-policy"
\ No newline at end of file
diff --git a/test/resources/policy_set/test-policyset.yaml b/test/resources/policy_set/test-policyset.yaml
index 2956eb55..ec1552ce 100644
--- a/test/resources/policy_set/test-policyset.yaml
+++ b/test/resources/policy_set/test-policyset.yaml
@@ -46,18 +46,25 @@ kind: PlacementBinding
 metadata:
   name: test-policyset-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: test-policyset-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: PolicySet
   name: test-policyset
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: test-policyset-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/template-sync-errors/invalid-cr-template.yaml b/test/resources/template-sync-errors/invalid-cr-template.yaml
index 9b0bb99d..70f09a00 100644
--- a/test/resources/template-sync-errors/invalid-cr-template.yaml
+++ b/test/resources/template-sync-errors/invalid-cr-template.yaml
@@ -36,18 +36,25 @@ kind: PlacementBinding
 metadata:
   name: invalid-cr-template-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: invalid-cr-template-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: invalid-cr-template
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: invalid-cr-template-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/template-sync-errors/pretend-policy-template.yaml b/test/resources/template-sync-errors/pretend-policy-template.yaml
index ca3514f8..c85e73d1 100644
--- a/test/resources/template-sync-errors/pretend-policy-template.yaml
+++ b/test/resources/template-sync-errors/pretend-policy-template.yaml
@@ -37,18 +37,25 @@ kind: PlacementBinding
 metadata:
   name: pretend-policy-template-pb
 placementRef:
-  apiGroup: apps.open-cluster-management.io
-  kind: PlacementRule
+  apiGroup: cluster.open-cluster-management.io
+  kind: Placement
   name: pretend-policy-template-plr
 subjects:
 - apiGroup: policy.open-cluster-management.io
   kind: Policy
   name: pretend-policy-template
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: pretend-policy-template-plr
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/resources/verify_metrics/noncompliant.yaml b/test/resources/verify_metrics/noncompliant.yaml
index 1c43fe49..de324716 100644
--- a/test/resources/verify_metrics/noncompliant.yaml
+++ b/test/resources/verify_metrics/noncompliant.yaml
@@ -28,17 +28,24 @@ metadata:
   name: binding-policy-verify-metrics-noncompliant
 placementRef:
   name: placement-policy-verify-metrics-noncompliant
-  kind: PlacementRule
-  apiGroup: apps.open-cluster-management.io
+  kind: Placement
+  apiGroup: cluster.open-cluster-management.io
 subjects:
   - name: policy-verify-metrics-noncompliant
     kind: Policy
     apiGroup: policy.open-cluster-management.io
 ---
-apiVersion: apps.open-cluster-management.io/v1
-kind: PlacementRule
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
 metadata:
   name: placement-policy-verify-metrics-noncompliant
 spec:
-  clusterSelector:
-    matchExpressions: []
+  predicates:
+  - requiredClusterSelector:
+      labelSelector:
+        matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
diff --git a/test/template_sync_errors.go b/test/template_sync_errors.go
index b860020d..bab08241 100644
--- a/test/template_sync_errors.go
+++ b/test/template_sync_errors.go
@@ -29,8 +29,8 @@ func TemplateSyncErrors(labels ...string) bool {
 				)
 				Expect(err).ToNot(HaveOccurred())
 			})
-			It("Should be noncompliant with a mapping not found status", func() {
-				DoCreatePolicyTest(nonexistentPolicyKindYaml)
+			It("Should be noncompliant with a mapping not found status", func(ctx SpecContext) {
+				DoCreatePolicyTest(ctx, nonexistentPolicyKindYaml)
 				DoRootComplianceTest(nonexistentPolicyKindName, policiesv1.NonCompliant)
 
 				Eventually(
@@ -72,8 +72,8 @@ func TemplateSyncErrors(labels ...string) bool {
 				)
 				Expect(err).ToNot(HaveOccurred())
 			})
-			It("Should be noncompliant and report the reason the CR is invalid", func() {
-				DoCreatePolicyTest(invalidCRPolicyYaml)
+			It("Should be noncompliant and report the reason the CR is invalid", func(ctx SpecContext) {
+				DoCreatePolicyTest(ctx, invalidCRPolicyYaml)
 				DoRootComplianceTest(invalidCRPolicyName, policiesv1.NonCompliant)
 
 				Eventually(