diff --git a/cts/scheduler/xml/bug-1820-1.xml b/cts/scheduler/xml/bug-1820-1.xml
index 1e73b85374..1039efdb63 100644
--- a/cts/scheduler/xml/bug-1820-1.xml
+++ b/cts/scheduler/xml/bug-1820-1.xml
@@ -1,114 +1,118 @@
-
+
-
+
+
+
-
-
+
+
-
+
+
+
diff --git a/cts/scheduler/xml/bug-1820.xml b/cts/scheduler/xml/bug-1820.xml
index 4145a3aa7a..e97a2d71f5 100644
--- a/cts/scheduler/xml/bug-1820.xml
+++ b/cts/scheduler/xml/bug-1820.xml
@@ -1,104 +1,106 @@
-
+
-
+
+
+
diff --git a/cts/scheduler/xml/bug-1822.xml b/cts/scheduler/xml/bug-1822.xml
index b4129ef0c1..94a045a890 100644
--- a/cts/scheduler/xml/bug-1822.xml
+++ b/cts/scheduler/xml/bug-1822.xml
@@ -1,169 +1,171 @@
-
+
+
+
diff --git a/cts/scheduler/xml/bug-5186-partial-migrate.xml b/cts/scheduler/xml/bug-5186-partial-migrate.xml
index 504722e5a5..e4ed4bbe15 100644
--- a/cts/scheduler/xml/bug-5186-partial-migrate.xml
+++ b/cts/scheduler/xml/bug-5186-partial-migrate.xml
@@ -1,429 +1,443 @@
-
-
+
+
-
+
+
+
-
+
+
+
-
-
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/cts/scheduler/xml/bug-cl-5212.xml b/cts/scheduler/xml/bug-cl-5212.xml
index 8cceb2c9fb..8ae9f36b49 100644
--- a/cts/scheduler/xml/bug-cl-5212.xml
+++ b/cts/scheduler/xml/bug-cl-5212.xml
@@ -1,244 +1,248 @@
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/cts/scheduler/xml/bug-cl-5213.xml b/cts/scheduler/xml/bug-cl-5213.xml
index 1471317eeb..871519f1fa 100644
--- a/cts/scheduler/xml/bug-cl-5213.xml
+++ b/cts/scheduler/xml/bug-cl-5213.xml
@@ -1,113 +1,115 @@
-
-
+
+
+
+
diff --git a/cts/scheduler/xml/bug-cl-5247.xml b/cts/scheduler/xml/bug-cl-5247.xml
index 5cc31551a2..ddbe55d2a8 100644
--- a/cts/scheduler/xml/bug-cl-5247.xml
+++ b/cts/scheduler/xml/bug-cl-5247.xml
@@ -1,296 +1,298 @@
-
-
+
+
+
+
diff --git a/cts/scheduler/xml/bug-lf-2508.xml b/cts/scheduler/xml/bug-lf-2508.xml
index 287e504f2a..c8849d27e7 100644
--- a/cts/scheduler/xml/bug-lf-2508.xml
+++ b/cts/scheduler/xml/bug-lf-2508.xml
@@ -1,514 +1,532 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/scheduler/xml/bug-lf-2574.xml b/cts/scheduler/xml/bug-lf-2574.xml
index 5a0d9cfff3..ccb08c33be 100644
--- a/cts/scheduler/xml/bug-lf-2574.xml
+++ b/cts/scheduler/xml/bug-lf-2574.xml
@@ -1,191 +1,199 @@
-
-
-
+
+
+
-
-
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
+
+
-
-
-
+
+
+
+
+
diff --git a/cts/scheduler/xml/bug-pm-11.xml b/cts/scheduler/xml/bug-pm-11.xml
index 8620b4af00..45b5fd1434 100644
--- a/cts/scheduler/xml/bug-pm-11.xml
+++ b/cts/scheduler/xml/bug-pm-11.xml
@@ -1,90 +1,92 @@
-
+
+
+
diff --git a/cts/scheduler/xml/bug-pm-12.xml b/cts/scheduler/xml/bug-pm-12.xml
index 55b9985163..766ecab8d9 100644
--- a/cts/scheduler/xml/bug-pm-12.xml
+++ b/cts/scheduler/xml/bug-pm-12.xml
@@ -1,110 +1,112 @@
-
+
+
+
diff --git a/cts/scheduler/xml/coloc-unpromoted-anti.xml b/cts/scheduler/xml/coloc-unpromoted-anti.xml
index e01e1f7c1d..e19363b9eb 100644
--- a/cts/scheduler/xml/coloc-unpromoted-anti.xml
+++ b/cts/scheduler/xml/coloc-unpromoted-anti.xml
@@ -1,291 +1,297 @@
-
-
+
+
+
+
-
-
+
+
-
+
+
+
-
-
+
+
-
+
+
+
diff --git a/cts/scheduler/xml/failcount.xml b/cts/scheduler/xml/failcount.xml
index 576c993f15..4d03414ded 100644
--- a/cts/scheduler/xml/failcount.xml
+++ b/cts/scheduler/xml/failcount.xml
@@ -1,770 +1,772 @@
-
+
+
+
diff --git a/cts/scheduler/xml/nvpair-date-rules-1.xml b/cts/scheduler/xml/nvpair-date-rules-1.xml
index 57c6b199bb..4cdb739a8c 100644
--- a/cts/scheduler/xml/nvpair-date-rules-1.xml
+++ b/cts/scheduler/xml/nvpair-date-rules-1.xml
@@ -1,309 +1,311 @@
-
+
+
+
diff --git a/cts/scheduler/xml/order-first-probes.xml b/cts/scheduler/xml/order-first-probes.xml
index 67d745c015..aa4738e350 100644
--- a/cts/scheduler/xml/order-first-probes.xml
+++ b/cts/scheduler/xml/order-first-probes.xml
@@ -1,95 +1,97 @@
+
-
-
-
+
+
+
+
diff --git a/cts/scheduler/xml/per-op-failcount.xml b/cts/scheduler/xml/per-op-failcount.xml
index 3945975bf2..61c03d3900 100644
--- a/cts/scheduler/xml/per-op-failcount.xml
+++ b/cts/scheduler/xml/per-op-failcount.xml
@@ -1,118 +1,120 @@
+
-
-
-
+
+
+
+
diff --git a/cts/scheduler/xml/promoted-3.xml b/cts/scheduler/xml/promoted-3.xml
index 209f28b86c..82873e9f14 100644
--- a/cts/scheduler/xml/promoted-3.xml
+++ b/cts/scheduler/xml/promoted-3.xml
@@ -1,56 +1,58 @@
-
+
+
+
diff --git a/cts/scheduler/xml/promoted-demote.xml b/cts/scheduler/xml/promoted-demote.xml
index 9c4f61a407..fbfbf91969 100644
--- a/cts/scheduler/xml/promoted-demote.xml
+++ b/cts/scheduler/xml/promoted-demote.xml
@@ -1,372 +1,376 @@
-
+
+
+
-
+
+
+
diff --git a/cts/scheduler/xml/promoted-failed-demote-2.xml b/cts/scheduler/xml/promoted-failed-demote-2.xml
index 7ed6aef86c..be4268a05f 100644
--- a/cts/scheduler/xml/promoted-failed-demote-2.xml
+++ b/cts/scheduler/xml/promoted-failed-demote-2.xml
@@ -1,145 +1,147 @@
-
+
+
+
diff --git a/cts/scheduler/xml/promoted-failed-demote.xml b/cts/scheduler/xml/promoted-failed-demote.xml
index 1bf82610de..a455e8fe6d 100644
--- a/cts/scheduler/xml/promoted-failed-demote.xml
+++ b/cts/scheduler/xml/promoted-failed-demote.xml
@@ -1,145 +1,147 @@
-
+
+
+
diff --git a/cts/scheduler/xml/promoted-group.xml b/cts/scheduler/xml/promoted-group.xml
index c33cd21d81..0720ea9ec5 100644
--- a/cts/scheduler/xml/promoted-group.xml
+++ b/cts/scheduler/xml/promoted-group.xml
@@ -1,147 +1,151 @@
-
+
+
+
+
+
diff --git a/cts/scheduler/xml/promoted-move.xml b/cts/scheduler/xml/promoted-move.xml
index 649d7adf92..e0638fd237 100644
--- a/cts/scheduler/xml/promoted-move.xml
+++ b/cts/scheduler/xml/promoted-move.xml
@@ -1,155 +1,157 @@
-
-
+
+
+
+
diff --git a/cts/scheduler/xml/rsc-sets-promoted.xml b/cts/scheduler/xml/rsc-sets-promoted.xml
index eb656af683..dd771aa1ba 100644
--- a/cts/scheduler/xml/rsc-sets-promoted.xml
+++ b/cts/scheduler/xml/rsc-sets-promoted.xml
@@ -1,103 +1,105 @@
-
+
+
+
diff --git a/cts/scheduler/xml/simple11.xml b/cts/scheduler/xml/simple11.xml
index 7551866e68..57ae83ea91 100644
--- a/cts/scheduler/xml/simple11.xml
+++ b/cts/scheduler/xml/simple11.xml
@@ -1,47 +1,49 @@
-
+
+
+
diff --git a/cts/scheduler/xml/simple12.xml b/cts/scheduler/xml/simple12.xml
index 861dd66dec..b7dbd4a5f6 100644
--- a/cts/scheduler/xml/simple12.xml
+++ b/cts/scheduler/xml/simple12.xml
@@ -1,39 +1,41 @@
-
+
+
+
diff --git a/cts/scheduler/xml/utilization-shuffle.xml b/cts/scheduler/xml/utilization-shuffle.xml
index 50e02b8682..a23e2b9253 100644
--- a/cts/scheduler/xml/utilization-shuffle.xml
+++ b/cts/scheduler/xml/utilization-shuffle.xml
@@ -1,691 +1,709 @@
-
-
-
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+