diff --git a/cts/scheduler/dot/clone-recover-no-shuffle-5.dot b/cts/scheduler/dot/clone-recover-no-shuffle-5.dot
index 7219ee5a6d..a2356f2280 100644
--- a/cts/scheduler/dot/clone-recover-no-shuffle-5.dot
+++ b/cts/scheduler/dot/clone-recover-no-shuffle-5.dot
@@ -1,80 +1,56 @@
  digraph "g" {
 "grp-clone_running_0" [ style=bold color="green" fontcolor="orange"]
 "grp-clone_start_0" -> "grp-clone_running_0" [ style = bold]
 "grp-clone_start_0" -> "grp:0_start_0" [ style = bold]
-"grp-clone_start_0" -> "grp:1_start_0" [ style = bold]
 "grp-clone_start_0" -> "grp:2_start_0" [ style = bold]
 "grp-clone_start_0" [ style=bold color="green" fontcolor="orange"]
 "grp-clone_stop_0" -> "grp-clone_stopped_0" [ style = bold]
 "grp-clone_stop_0" -> "grp:0_stop_0" [ style = bold]
-"grp-clone_stop_0" -> "grp:1_stop_0" [ style = bold]
 "grp-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
 "grp-clone_stopped_0" -> "grp-clone_start_0" [ style = bold]
 "grp-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "grp:0_running_0" -> "grp-clone_running_0" [ style = bold]
 "grp:0_running_0" [ style=bold color="green" fontcolor="orange"]
 "grp:0_start_0" -> "grp:0_running_0" [ style = bold]
 "grp:0_start_0" -> "rsc1_start_0 node1" [ style = bold]
 "grp:0_start_0" -> "rsc2_start_0 node1" [ style = bold]
 "grp:0_start_0" [ style=bold color="green" fontcolor="orange"]
 "grp:0_stop_0" -> "grp:0_stopped_0" [ style = bold]
 "grp:0_stop_0" -> "rsc1_stop_0 node2" [ style = bold]
 "grp:0_stop_0" -> "rsc2_stop_0 node2" [ style = bold]
 "grp:0_stop_0" [ style=bold color="green" fontcolor="orange"]
 "grp:0_stopped_0" -> "grp-clone_stopped_0" [ style = bold]
 "grp:0_stopped_0" -> "grp:0_start_0" [ style = bold]
 "grp:0_stopped_0" [ style=bold color="green" fontcolor="orange"]
-"grp:1_running_0" -> "grp-clone_running_0" [ style = bold]
-"grp:1_running_0" [ style=bold color="green" fontcolor="orange"]
-"grp:1_start_0" -> "grp:1_running_0" [ style = bold]
-"grp:1_start_0" -> "rsc1_start_0 node1" [ style = bold]
-"grp:1_start_0" -> "rsc2_start_0 node1" [ style = bold]
-"grp:1_start_0" [ style=bold color="green" fontcolor="orange"]
-"grp:1_stop_0" -> "grp:1_stopped_0" [ style = bold]
-"grp:1_stop_0" -> "rsc1_stop_0 node3" [ style = bold]
-"grp:1_stop_0" -> "rsc2_stop_0 node3" [ style = bold]
-"grp:1_stop_0" [ style=bold color="green" fontcolor="orange"]
-"grp:1_stopped_0" -> "grp-clone_stopped_0" [ style = bold]
-"grp:1_stopped_0" -> "grp:1_start_0" [ style = bold]
-"grp:1_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "grp:2_running_0" -> "grp-clone_running_0" [ style = bold]
 "grp:2_running_0" [ style=bold color="green" fontcolor="orange"]
 "grp:2_start_0" -> "grp:2_running_0" [ style = bold]
-"grp:2_start_0" -> "rsc1:2_start_0 node1" [ style = bold]
-"grp:2_start_0" -> "rsc2:2_start_0 node1" [ style = bold]
+"grp:2_start_0" -> "rsc1:2_start_0 node2" [ style = bold]
+"grp:2_start_0" -> "rsc2:2_start_0 node2" [ style = bold]
 "grp:2_start_0" [ style=bold color="green" fontcolor="orange"]
-"rsc1:2_monitor_10000 node1" [ style=bold color="green" fontcolor="black"]
-"rsc1:2_start_0 node1" -> "grp:2_running_0" [ style = bold]
-"rsc1:2_start_0 node1" -> "rsc1:2_monitor_10000 node1" [ style = bold]
-"rsc1:2_start_0 node1" -> "rsc2:2_start_0 node1" [ style = bold]
-"rsc1:2_start_0 node1" [ style=bold color="green" fontcolor="black"]
+"rsc1:2_monitor_10000 node2" [ style=bold color="green" fontcolor="black"]
+"rsc1:2_start_0 node2" -> "grp:2_running_0" [ style = bold]
+"rsc1:2_start_0 node2" -> "rsc1:2_monitor_10000 node2" [ style = bold]
+"rsc1:2_start_0 node2" -> "rsc2:2_start_0 node2" [ style = bold]
+"rsc1:2_start_0 node2" [ style=bold color="green" fontcolor="black"]
 "rsc1_monitor_10000 node1" [ style=bold color="green" fontcolor="black"]
 "rsc1_start_0 node1" -> "grp:0_running_0" [ style = bold]
-"rsc1_start_0 node1" -> "grp:1_running_0" [ style = bold]
 "rsc1_start_0 node1" -> "rsc1_monitor_10000 node1" [ style = bold]
 "rsc1_start_0 node1" -> "rsc2_start_0 node1" [ style = bold]
 "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black"]
 "rsc1_stop_0 node2" -> "grp:0_stopped_0" [ style = bold]
 "rsc1_stop_0 node2" -> "rsc1_start_0 node1" [ style = bold]
 "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"]
-"rsc1_stop_0 node3" -> "grp:1_stopped_0" [ style = bold]
-"rsc1_stop_0 node3" -> "rsc1_start_0 node1" [ style = bold]
-"rsc1_stop_0 node3" [ style=bold color="green" fontcolor="black"]
-"rsc2:2_monitor_10000 node1" [ style=bold color="green" fontcolor="black"]
-"rsc2:2_start_0 node1" -> "grp:2_running_0" [ style = bold]
-"rsc2:2_start_0 node1" -> "rsc2:2_monitor_10000 node1" [ style = bold]
-"rsc2:2_start_0 node1" [ style=bold color="green" fontcolor="black"]
+"rsc2:2_monitor_10000 node2" [ style=bold color="green" fontcolor="black"]
+"rsc2:2_start_0 node2" -> "grp:2_running_0" [ style = bold]
+"rsc2:2_start_0 node2" -> "rsc2:2_monitor_10000 node2" [ style = bold]
+"rsc2:2_start_0 node2" [ style=bold color="green" fontcolor="black"]
 "rsc2_monitor_10000 node1" [ style=bold color="green" fontcolor="black"]
 "rsc2_start_0 node1" -> "grp:0_running_0" [ style = bold]
-"rsc2_start_0 node1" -> "grp:1_running_0" [ style = bold]
 "rsc2_start_0 node1" -> "rsc2_monitor_10000 node1" [ style = bold]
 "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black"]
 "rsc2_stop_0 node2" -> "grp:0_stopped_0" [ style = bold]
 "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold]
 "rsc2_stop_0 node2" -> "rsc2_start_0 node1" [ style = bold]
 "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black"]
-"rsc2_stop_0 node3" -> "grp:1_stopped_0" [ style = bold]
-"rsc2_stop_0 node3" -> "rsc1_stop_0 node3" [ style = bold]
-"rsc2_stop_0 node3" -> "rsc2_start_0 node1" [ style = bold]
-"rsc2_stop_0 node3" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-5.exp b/cts/scheduler/exp/clone-recover-no-shuffle-5.exp
index 8a8e799793..c1cee43b12 100644
--- a/cts/scheduler/exp/clone-recover-no-shuffle-5.exp
+++ b/cts/scheduler/exp/clone-recover-no-shuffle-5.exp
@@ -1,452 +1,293 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
       <pseudo_event id="17" operation="stopped" operation_key="grp:0_stopped_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="8" operation="stop" operation_key="rsc1_stop_0" internal_operation_key="rsc1:0_stop_0" on_node="node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
         <rsc_op id="11" operation="stop" operation_key="rsc2_stop_0" internal_operation_key="rsc2:0_stop_0" on_node="node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
         <pseudo_event id="16" operation="stop" operation_key="grp:0_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <pseudo_event id="16" operation="stop" operation_key="grp:0_stop_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="38" operation="stop" operation_key="grp-clone_stop_0"/>
+        <pseudo_event id="36" operation="stop" operation_key="grp-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <pseudo_event id="15" operation="running" operation_key="grp:0_running_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="9" operation="start" operation_key="rsc1_start_0" internal_operation_key="rsc1:0_start_0" on_node="node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <rsc_op id="12" operation="start" operation_key="rsc2_start_0" internal_operation_key="rsc2:0_start_0" on_node="node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <pseudo_event id="14" operation="start" operation_key="grp:0_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <pseudo_event id="14" operation="start" operation_key="grp:0_start_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="17" operation="stopped" operation_key="grp:0_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="36" operation="start" operation_key="grp-clone_start_0"/>
+        <pseudo_event id="34" operation="start" operation_key="grp-clone_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="10" operation="monitor" operation_key="rsc1_monitor_10000" internal_operation_key="rsc1:0_monitor_10000" on_node="node1" on_node_uuid="1">
         <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="9" operation="start" operation_key="rsc1_start_0" internal_operation_key="rsc1:0_start_0" on_node="node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <rsc_op id="9" operation="start" operation_key="rsc1_start_0" internal_operation_key="rsc1:0_start_0" on_node="node1" on_node_uuid="1">
         <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="8" operation="stop" operation_key="rsc1_stop_0" internal_operation_key="rsc1:0_stop_0" on_node="node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
         <pseudo_event id="14" operation="start" operation_key="grp:0_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <rsc_op id="8" operation="stop" operation_key="rsc1_stop_0" internal_operation_key="rsc1:0_stop_0" on_node="node2" on_node_uuid="2">
         <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="11" operation="stop" operation_key="rsc2_stop_0" internal_operation_key="rsc2:0_stop_0" on_node="node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
         <pseudo_event id="16" operation="stop" operation_key="grp:0_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="rsc2_monitor_10000" internal_operation_key="rsc2:0_monitor_10000" on_node="node1" on_node_uuid="1">
         <primitive id="rsc2" long-id="rsc2:0" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="12" operation="start" operation_key="rsc2_start_0" internal_operation_key="rsc2:0_start_0" on_node="node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
       <rsc_op id="12" operation="start" operation_key="rsc2_start_0" internal_operation_key="rsc2:0_start_0" on_node="node1" on_node_uuid="1">
         <primitive id="rsc2" long-id="rsc2:0" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="9" operation="start" operation_key="rsc1_start_0" internal_operation_key="rsc1:0_start_0" on_node="node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <rsc_op id="11" operation="stop" operation_key="rsc2_stop_0" internal_operation_key="rsc2:0_stop_0" on_node="node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
         <pseudo_event id="14" operation="start" operation_key="grp:0_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
       <rsc_op id="11" operation="stop" operation_key="rsc2_stop_0" internal_operation_key="rsc2:0_stop_0" on_node="node2" on_node_uuid="2">
         <primitive id="rsc2" long-id="rsc2:0" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="16" operation="stop" operation_key="grp:0_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <pseudo_event id="27" operation="stopped" operation_key="grp:1_stopped_0">
+      <pseudo_event id="31" operation="running" operation_key="grp:2_running_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="18" operation="stop" operation_key="rsc1_stop_0" internal_operation_key="rsc1:1_stop_0" on_node="node3" on_node_uuid="3"/>
+        <rsc_op id="26" operation="start" operation_key="rsc1:2_start_0" on_node="node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="21" operation="stop" operation_key="rsc2_stop_0" internal_operation_key="rsc2:1_stop_0" on_node="node3" on_node_uuid="3"/>
+        <rsc_op id="28" operation="start" operation_key="rsc2:2_start_0" on_node="node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="26" operation="stop" operation_key="grp:1_stop_0"/>
+        <pseudo_event id="30" operation="start" operation_key="grp:2_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <pseudo_event id="26" operation="stop" operation_key="grp:1_stop_0">
+      <pseudo_event id="30" operation="start" operation_key="grp:2_start_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="38" operation="stop" operation_key="grp-clone_stop_0"/>
+        <pseudo_event id="34" operation="start" operation_key="grp-clone_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <pseudo_event id="25" operation="running" operation_key="grp:1_running_0">
-        <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="19" operation="start" operation_key="rsc1_start_0" internal_operation_key="rsc1:1_start_0" on_node="node1" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="22" operation="start" operation_key="rsc2_start_0" internal_operation_key="rsc2:1_start_0" on_node="node1" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="24" operation="start" operation_key="grp:1_start_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="13">
-    <action_set>
-      <pseudo_event id="24" operation="start" operation_key="grp:1_start_0">
-        <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="27" operation="stopped" operation_key="grp:1_stopped_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="36" operation="start" operation_key="grp-clone_start_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="14">
-    <action_set>
-      <rsc_op id="20" operation="monitor" operation_key="rsc1_monitor_10000" internal_operation_key="rsc1:1_monitor_10000" on_node="node1" on_node_uuid="1">
-        <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="19" operation="start" operation_key="rsc1_start_0" internal_operation_key="rsc1:1_start_0" on_node="node1" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="15">
-    <action_set>
-      <rsc_op id="19" operation="start" operation_key="rsc1_start_0" internal_operation_key="rsc1:1_start_0" on_node="node1" on_node_uuid="1">
-        <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="18" operation="stop" operation_key="rsc1_stop_0" internal_operation_key="rsc1:1_stop_0" on_node="node3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="24" operation="start" operation_key="grp:1_start_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="16">
-    <action_set>
-      <rsc_op id="18" operation="stop" operation_key="rsc1_stop_0" internal_operation_key="rsc1:1_stop_0" on_node="node3" on_node_uuid="3">
-        <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_node="node3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" />
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="21" operation="stop" operation_key="rsc2_stop_0" internal_operation_key="rsc2:1_stop_0" on_node="node3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="26" operation="stop" operation_key="grp:1_stop_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="17">
-    <action_set>
-      <rsc_op id="23" operation="monitor" operation_key="rsc2_monitor_10000" internal_operation_key="rsc2:1_monitor_10000" on_node="node1" on_node_uuid="1">
-        <primitive id="rsc2" long-id="rsc2:1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="22" operation="start" operation_key="rsc2_start_0" internal_operation_key="rsc2:1_start_0" on_node="node1" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="18">
-    <action_set>
-      <rsc_op id="22" operation="start" operation_key="rsc2_start_0" internal_operation_key="rsc2:1_start_0" on_node="node1" on_node_uuid="1">
-        <primitive id="rsc2" long-id="rsc2:1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="19" operation="start" operation_key="rsc1_start_0" internal_operation_key="rsc1:1_start_0" on_node="node1" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="21" operation="stop" operation_key="rsc2_stop_0" internal_operation_key="rsc2:1_stop_0" on_node="node3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="24" operation="start" operation_key="grp:1_start_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="19">
-    <action_set>
-      <rsc_op id="21" operation="stop" operation_key="rsc2_stop_0" internal_operation_key="rsc2:1_stop_0" on_node="node3" on_node_uuid="3">
-        <primitive id="rsc2" long-id="rsc2:1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_node="node3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" />
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="26" operation="stop" operation_key="grp:1_stop_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="20">
-    <action_set>
-      <pseudo_event id="33" operation="running" operation_key="grp:2_running_0">
-        <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="28" operation="start" operation_key="rsc1:2_start_0" on_node="node1" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="30" operation="start" operation_key="rsc2:2_start_0" on_node="node1" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="32" operation="start" operation_key="grp:2_start_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="21">
-    <action_set>
-      <pseudo_event id="32" operation="start" operation_key="grp:2_start_0">
-        <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="36" operation="start" operation_key="grp-clone_start_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="22">
-    <action_set>
-      <rsc_op id="29" operation="monitor" operation_key="rsc1:2_monitor_10000" on_node="node1" on_node_uuid="1">
+      <rsc_op id="27" operation="monitor" operation_key="rsc1:2_monitor_10000" on_node="node2" on_node_uuid="2">
         <primitive id="rsc1" long-id="rsc1:2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="28" operation="start" operation_key="rsc1:2_start_0" on_node="node1" on_node_uuid="1"/>
+        <rsc_op id="26" operation="start" operation_key="rsc1:2_start_0" on_node="node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="23">
+  <synapse id="13">
     <action_set>
-      <rsc_op id="28" operation="start" operation_key="rsc1:2_start_0" on_node="node1" on_node_uuid="1">
+      <rsc_op id="26" operation="start" operation_key="rsc1:2_start_0" on_node="node2" on_node_uuid="2">
         <primitive id="rsc1" long-id="rsc1:2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="32" operation="start" operation_key="grp:2_start_0"/>
+        <pseudo_event id="30" operation="start" operation_key="grp:2_start_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="24">
+  <synapse id="14">
     <action_set>
-      <rsc_op id="31" operation="monitor" operation_key="rsc2:2_monitor_10000" on_node="node1" on_node_uuid="1">
+      <rsc_op id="29" operation="monitor" operation_key="rsc2:2_monitor_10000" on_node="node2" on_node_uuid="2">
         <primitive id="rsc2" long-id="rsc2:2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="30" operation="start" operation_key="rsc2:2_start_0" on_node="node1" on_node_uuid="1"/>
+        <rsc_op id="28" operation="start" operation_key="rsc2:2_start_0" on_node="node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="25">
+  <synapse id="15">
     <action_set>
-      <rsc_op id="30" operation="start" operation_key="rsc2:2_start_0" on_node="node1" on_node_uuid="1">
+      <rsc_op id="28" operation="start" operation_key="rsc2:2_start_0" on_node="node2" on_node_uuid="2">
         <primitive id="rsc2" long-id="rsc2:2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="28" operation="start" operation_key="rsc1:2_start_0" on_node="node1" on_node_uuid="1"/>
+        <rsc_op id="26" operation="start" operation_key="rsc1:2_start_0" on_node="node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="32" operation="start" operation_key="grp:2_start_0"/>
+        <pseudo_event id="30" operation="start" operation_key="grp:2_start_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="26" priority="1000000">
+  <synapse id="16" priority="1000000">
     <action_set>
-      <pseudo_event id="39" operation="stopped" operation_key="grp-clone_stopped_0">
+      <pseudo_event id="37" operation="stopped" operation_key="grp-clone_stopped_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="17" operation="stopped" operation_key="grp:0_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="27" operation="stopped" operation_key="grp:1_stopped_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="38" operation="stop" operation_key="grp-clone_stop_0"/>
+        <pseudo_event id="36" operation="stop" operation_key="grp-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="27">
+  <synapse id="17">
     <action_set>
-      <pseudo_event id="38" operation="stop" operation_key="grp-clone_stop_0">
+      <pseudo_event id="36" operation="stop" operation_key="grp-clone_stop_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="28" priority="1000000">
+  <synapse id="18" priority="1000000">
     <action_set>
-      <pseudo_event id="37" operation="running" operation_key="grp-clone_running_0">
+      <pseudo_event id="35" operation="running" operation_key="grp-clone_running_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="15" operation="running" operation_key="grp:0_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="25" operation="running" operation_key="grp:1_running_0"/>
+        <pseudo_event id="31" operation="running" operation_key="grp:2_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="33" operation="running" operation_key="grp:2_running_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="36" operation="start" operation_key="grp-clone_start_0"/>
+        <pseudo_event id="34" operation="start" operation_key="grp-clone_start_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="29">
+  <synapse id="19">
     <action_set>
-      <pseudo_event id="36" operation="start" operation_key="grp-clone_start_0">
+      <pseudo_event id="34" operation="start" operation_key="grp-clone_start_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="39" operation="stopped" operation_key="grp-clone_stopped_0"/>
+        <pseudo_event id="37" operation="stopped" operation_key="grp-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/cts/scheduler/scores/clone-recover-no-shuffle-5.scores b/cts/scheduler/scores/clone-recover-no-shuffle-5.scores
index eecba43fae..0dd9728830 100644
--- a/cts/scheduler/scores/clone-recover-no-shuffle-5.scores
+++ b/cts/scheduler/scores/clone-recover-no-shuffle-5.scores
@@ -1,79 +1,109 @@
 
 pcmk__clone_assign: grp-clone allocation score on node1: 100
 pcmk__clone_assign: grp-clone allocation score on node2: 0
 pcmk__clone_assign: grp-clone allocation score on node3: 0
 pcmk__clone_assign: grp:0 allocation score on node1: 100
 pcmk__clone_assign: grp:0 allocation score on node2: 0
 pcmk__clone_assign: grp:0 allocation score on node3: 0
 pcmk__clone_assign: grp:1 allocation score on node1: 100
 pcmk__clone_assign: grp:1 allocation score on node2: 0
 pcmk__clone_assign: grp:1 allocation score on node3: 0
 pcmk__clone_assign: grp:2 allocation score on node1: 100
 pcmk__clone_assign: grp:2 allocation score on node2: 0
 pcmk__clone_assign: grp:2 allocation score on node3: 0
 pcmk__clone_assign: rsc1:0 allocation score on node1: 100
 pcmk__clone_assign: rsc1:0 allocation score on node2: 1
 pcmk__clone_assign: rsc1:0 allocation score on node3: 0
 pcmk__clone_assign: rsc1:1 allocation score on node1: 100
 pcmk__clone_assign: rsc1:1 allocation score on node2: 0
 pcmk__clone_assign: rsc1:1 allocation score on node3: 1
 pcmk__clone_assign: rsc1:2 allocation score on node1: 100
 pcmk__clone_assign: rsc1:2 allocation score on node2: 0
 pcmk__clone_assign: rsc1:2 allocation score on node3: 0
 pcmk__clone_assign: rsc2:0 allocation score on node1: 0
 pcmk__clone_assign: rsc2:0 allocation score on node2: 1
 pcmk__clone_assign: rsc2:0 allocation score on node3: 0
 pcmk__clone_assign: rsc2:1 allocation score on node1: 0
 pcmk__clone_assign: rsc2:1 allocation score on node2: 0
 pcmk__clone_assign: rsc2:1 allocation score on node3: 1
 pcmk__clone_assign: rsc2:2 allocation score on node1: 0
 pcmk__clone_assign: rsc2:2 allocation score on node2: 0
 pcmk__clone_assign: rsc2:2 allocation score on node3: 0
 pcmk__group_assign: grp:0 allocation score on node1: 100
+pcmk__group_assign: grp:0 allocation score on node1: 100
+pcmk__group_assign: grp:0 allocation score on node2: 0
 pcmk__group_assign: grp:0 allocation score on node2: 0
 pcmk__group_assign: grp:0 allocation score on node3: 0
+pcmk__group_assign: grp:0 allocation score on node3: 0
+pcmk__group_assign: grp:1 allocation score on node1: -INFINITY
 pcmk__group_assign: grp:1 allocation score on node1: 100
 pcmk__group_assign: grp:1 allocation score on node2: 0
+pcmk__group_assign: grp:1 allocation score on node2: 0
+pcmk__group_assign: grp:1 allocation score on node3: 0
 pcmk__group_assign: grp:1 allocation score on node3: 0
-pcmk__group_assign: grp:2 allocation score on node1: 100
+pcmk__group_assign: grp:2 allocation score on node1: -INFINITY
 pcmk__group_assign: grp:2 allocation score on node2: 0
-pcmk__group_assign: grp:2 allocation score on node3: 0
+pcmk__group_assign: grp:2 allocation score on node3: -INFINITY
+pcmk__group_assign: rsc1:0 allocation score on node1: 100
 pcmk__group_assign: rsc1:0 allocation score on node1: 100
 pcmk__group_assign: rsc1:0 allocation score on node2: 1
+pcmk__group_assign: rsc1:0 allocation score on node2: 1
+pcmk__group_assign: rsc1:0 allocation score on node3: 0
 pcmk__group_assign: rsc1:0 allocation score on node3: 0
+pcmk__group_assign: rsc1:1 allocation score on node1: -INFINITY
 pcmk__group_assign: rsc1:1 allocation score on node1: 100
 pcmk__group_assign: rsc1:1 allocation score on node2: 0
+pcmk__group_assign: rsc1:1 allocation score on node2: 0
 pcmk__group_assign: rsc1:1 allocation score on node3: 1
-pcmk__group_assign: rsc1:2 allocation score on node1: 100
+pcmk__group_assign: rsc1:1 allocation score on node3: 1
+pcmk__group_assign: rsc1:2 allocation score on node1: -INFINITY
 pcmk__group_assign: rsc1:2 allocation score on node2: 0
-pcmk__group_assign: rsc1:2 allocation score on node3: 0
+pcmk__group_assign: rsc1:2 allocation score on node3: -INFINITY
+pcmk__group_assign: rsc2:0 allocation score on node1: 0
 pcmk__group_assign: rsc2:0 allocation score on node1: 0
 pcmk__group_assign: rsc2:0 allocation score on node2: 1
+pcmk__group_assign: rsc2:0 allocation score on node2: 1
 pcmk__group_assign: rsc2:0 allocation score on node3: 0
+pcmk__group_assign: rsc2:0 allocation score on node3: 0
+pcmk__group_assign: rsc2:1 allocation score on node1: -INFINITY
 pcmk__group_assign: rsc2:1 allocation score on node1: 0
 pcmk__group_assign: rsc2:1 allocation score on node2: 0
+pcmk__group_assign: rsc2:1 allocation score on node2: 0
+pcmk__group_assign: rsc2:1 allocation score on node3: 1
 pcmk__group_assign: rsc2:1 allocation score on node3: 1
-pcmk__group_assign: rsc2:2 allocation score on node1: 0
+pcmk__group_assign: rsc2:2 allocation score on node1: -INFINITY
 pcmk__group_assign: rsc2:2 allocation score on node2: 0
-pcmk__group_assign: rsc2:2 allocation score on node3: 0
+pcmk__group_assign: rsc2:2 allocation score on node3: -INFINITY
 pcmk__primitive_assign: Fencing allocation score on node1: 0
 pcmk__primitive_assign: Fencing allocation score on node2: 0
 pcmk__primitive_assign: Fencing allocation score on node3: 0
 pcmk__primitive_assign: rsc1:0 allocation score on node1: 100
+pcmk__primitive_assign: rsc1:0 allocation score on node1: 100
+pcmk__primitive_assign: rsc1:0 allocation score on node2: 2
 pcmk__primitive_assign: rsc1:0 allocation score on node2: 2
 pcmk__primitive_assign: rsc1:0 allocation score on node3: 0
+pcmk__primitive_assign: rsc1:0 allocation score on node3: 0
+pcmk__primitive_assign: rsc1:1 allocation score on node1: -INFINITY
 pcmk__primitive_assign: rsc1:1 allocation score on node1: 100
 pcmk__primitive_assign: rsc1:1 allocation score on node2: 0
+pcmk__primitive_assign: rsc1:1 allocation score on node2: 0
+pcmk__primitive_assign: rsc1:1 allocation score on node3: 2
 pcmk__primitive_assign: rsc1:1 allocation score on node3: 2
-pcmk__primitive_assign: rsc1:2 allocation score on node1: 100
+pcmk__primitive_assign: rsc1:2 allocation score on node1: -INFINITY
 pcmk__primitive_assign: rsc1:2 allocation score on node2: 0
-pcmk__primitive_assign: rsc1:2 allocation score on node3: 0
+pcmk__primitive_assign: rsc1:2 allocation score on node3: -INFINITY
+pcmk__primitive_assign: rsc2:0 allocation score on node1: 0
 pcmk__primitive_assign: rsc2:0 allocation score on node1: 0
 pcmk__primitive_assign: rsc2:0 allocation score on node2: -INFINITY
+pcmk__primitive_assign: rsc2:0 allocation score on node2: -INFINITY
+pcmk__primitive_assign: rsc2:0 allocation score on node3: -INFINITY
 pcmk__primitive_assign: rsc2:0 allocation score on node3: -INFINITY
+pcmk__primitive_assign: rsc2:1 allocation score on node1: -INFINITY
 pcmk__primitive_assign: rsc2:1 allocation score on node1: 0
 pcmk__primitive_assign: rsc2:1 allocation score on node2: -INFINITY
+pcmk__primitive_assign: rsc2:1 allocation score on node2: -INFINITY
 pcmk__primitive_assign: rsc2:1 allocation score on node3: -INFINITY
-pcmk__primitive_assign: rsc2:2 allocation score on node1: 0
-pcmk__primitive_assign: rsc2:2 allocation score on node2: -INFINITY
+pcmk__primitive_assign: rsc2:1 allocation score on node3: 1
+pcmk__primitive_assign: rsc2:2 allocation score on node1: -INFINITY
+pcmk__primitive_assign: rsc2:2 allocation score on node2: 0
 pcmk__primitive_assign: rsc2:2 allocation score on node3: -INFINITY
diff --git a/cts/scheduler/summary/clone-recover-no-shuffle-5.summary b/cts/scheduler/summary/clone-recover-no-shuffle-5.summary
index e84d0a574d..121214c42a 100644
--- a/cts/scheduler/summary/clone-recover-no-shuffle-5.summary
+++ b/cts/scheduler/summary/clone-recover-no-shuffle-5.summary
@@ -1,59 +1,46 @@
 Current cluster status:
   * Node List:
     * Online: [ node1 node2 node3 ]
 
   * Full List of Resources:
     * Fencing	(stonith:fence_xvm):	 Started node2
     * Clone Set: grp-clone [grp]:
       * Started: [ node2 node3 ]
       * Stopped: [ node1 ]
 
 Transition Summary:
   * Move       rsc1:0     ( node2 -> node1 )
   * Move       rsc2:0     ( node2 -> node1 )
-  * Move       rsc1:1     ( node3 -> node1 )
-  * Move       rsc2:1     ( node3 -> node1 )
-  * Start      rsc1:2     (          node1 )
-  * Start      rsc2:2     (          node1 )
+  * Start      rsc1:2     (          node2 )
+  * Start      rsc2:2     (          node2 )
 
 Executing Cluster Transition:
   * Pseudo action:   grp-clone_stop_0
   * Pseudo action:   grp:0_stop_0
   * Resource action: rsc2            stop on node2
-  * Pseudo action:   grp:1_stop_0
-  * Resource action: rsc2            stop on node3
   * Resource action: rsc1            stop on node2
-  * Resource action: rsc1            stop on node3
   * Pseudo action:   grp:0_stopped_0
-  * Pseudo action:   grp:1_stopped_0
   * Pseudo action:   grp-clone_stopped_0
   * Pseudo action:   grp-clone_start_0
   * Pseudo action:   grp:0_start_0
   * Resource action: rsc1            start on node1
   * Resource action: rsc2            start on node1
-  * Pseudo action:   grp:1_start_0
-  * Resource action: rsc1            start on node1
-  * Resource action: rsc2            start on node1
   * Pseudo action:   grp:2_start_0
-  * Resource action: rsc1            start on node1
-  * Resource action: rsc2            start on node1
+  * Resource action: rsc1            start on node2
+  * Resource action: rsc2            start on node2
   * Pseudo action:   grp:0_running_0
   * Resource action: rsc1            monitor=10000 on node1
   * Resource action: rsc2            monitor=10000 on node1
-  * Pseudo action:   grp:1_running_0
-  * Resource action: rsc1            monitor=10000 on node1
-  * Resource action: rsc2            monitor=10000 on node1
   * Pseudo action:   grp:2_running_0
-  * Resource action: rsc1            monitor=10000 on node1
-  * Resource action: rsc2            monitor=10000 on node1
+  * Resource action: rsc1            monitor=10000 on node2
+  * Resource action: rsc2            monitor=10000 on node2
   * Pseudo action:   grp-clone_running_0
 
 Revised Cluster Status:
   * Node List:
     * Online: [ node1 node2 node3 ]
 
   * Full List of Resources:
     * Fencing	(stonith:fence_xvm):	 Started node2
     * Clone Set: grp-clone [grp]:
-      * Started: [ node1 ]
-      * Stopped: [ node2 node3 ]
+      * Started: [ node1 node2 node3 ]
diff --git a/cts/scheduler/xml/clone-recover-no-shuffle-5.xml b/cts/scheduler/xml/clone-recover-no-shuffle-5.xml
index 67176dc1a0..45f3b5a9f3 100644
--- a/cts/scheduler/xml/clone-recover-no-shuffle-5.xml
+++ b/cts/scheduler/xml/clone-recover-no-shuffle-5.xml
@@ -1,148 +1,148 @@
 <cib crm_feature_set="3.17.4" validate-with="pacemaker-3.9" epoch="83" num_updates="0" admin_epoch="0" cib-last-written="Tue Jun 20 18:21:31 2023" update-origin="node1" update-client="cibadmin" update-user="root" have-quorum="1" dc-uuid="2">
   <configuration>
     <!-- The essential elements of this test are:
          * An anonymous clone resource (grp) is stopped on node1 and
            started on node2 and node3
          * Clone instances are resource groups consisting of primitives rsc1 and
            rsc2
          * There is no stickiness configured
          * grp-clone prefers node1 (score=100)
 
          The following should happen:
          * Instance grp:0 should remain started on node2
          * Instance grp:1 should remain started on node3
          * Instance grp:2 should start on node1
 
          This test output is incorrect:
-         * Instance grp:0 moves from node2 to node1
-         * Instance grp:1 moves from node3 to node1
-         * Instance grp:2 starts on node1 (correct)
+         * Instance grp:0 moves to node1
+         * Instance grp:1 remains started on node3 (correct)
+         * Instance grp:2 starts on node2
       -->
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-have-watchdog" name="have-watchdog" value="false"/>
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="2.1.5-1.0a457786a.git.el9-0a457786a"/>
         <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
         <nvpair id="cib-bootstrap-options-cluster-name" name="cluster-name" value="test"/>
         <nvpair id="cib-bootstrap-options-last-lrm-refresh" name="last-lrm-refresh" value="1687288330"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="1" uname="node1"/>
       <node id="2" uname="node2"/>
       <node id="3" uname="node3"/>
     </nodes>
     <resources>
       <primitive class="stonith" id="Fencing" type="fence_xvm">
         <instance_attributes id="Fencing-instance_attributes">
           <nvpair id="Fencing-instance_attributes_pcmk_host_list" name="pcmk_host_list" value="node1 node2 node3"/>
         </instance_attributes>
         <operations>
           <op id="Fencing-monitor-120s" interval="120s" name="monitor" timeout="120s"/>
         </operations>
       </primitive>
       <clone id="grp-clone">
         <group id="grp">
           <primitive id="rsc1" class="ocf" type="Dummy" provider="pacemaker">
             <operations>
               <op name="migrate_from" interval="0s" timeout="20s" id="rsc1-migrate_from-interval-0s"/>
               <op name="migrate_to" interval="0s" timeout="20s" id="rsc1-migrate_to-interval-0s"/>
               <op name="monitor" interval="10s" timeout="20s" id="rsc1-monitor-interval-10s"/>
               <op name="reload" interval="0s" timeout="20s" id="rsc1-reload-interval-0s"/>
               <op name="reload-agent" interval="0s" timeout="20s" id="rsc1-reload-agent-interval-0s"/>
               <op name="start" interval="0s" timeout="20s" id="rsc1-start-interval-0s"/>
               <op name="stop" interval="0s" timeout="20s" id="rsc1-stop-interval-0s"/>
             </operations>
           </primitive>
           <primitive id="rsc2" class="ocf" type="Dummy" provider="pacemaker">
             <operations>
               <op name="migrate_from" interval="0s" timeout="20s" id="rsc2-migrate_from-interval-0s"/>
               <op name="migrate_to" interval="0s" timeout="20s" id="rsc2-migrate_to-interval-0s"/>
               <op name="monitor" interval="10s" timeout="20s" id="rsc2-monitor-interval-10s"/>
               <op name="reload" interval="0s" timeout="20s" id="rsc2-reload-interval-0s"/>
               <op name="reload-agent" interval="0s" timeout="20s" id="rsc2-reload-agent-interval-0s"/>
               <op name="start" interval="0s" timeout="20s" id="rsc2-start-interval-0s"/>
               <op name="stop" interval="0s" timeout="20s" id="rsc2-stop-interval-0s"/>
             </operations>
           </primitive>
         </group>
         <meta_attributes id="grp-clone-meta_attributes">
           <nvpair id="grp-clone-meta_attributes-clone-node-max" name="clone-node-max" value="1"/>
         </meta_attributes>
       </clone>
     </resources>
     <constraints>
       <rsc_location id="location-grp-clone-node1-100" rsc="grp-clone" node="node1" score="100"/>
     </constraints>
     <op_defaults/>
     <alerts/>
     <rsc_defaults/>
   </configuration>
   <status>
     <node_state id="2" uname="node2" in_ccm="true" crmd="online" crm-debug-origin="controld_update_resource_history" join="member" expected="member">
       <lrm id="2">
         <lrm_resources>
           <lrm_resource id="Fencing" class="stonith" type="fence_xvm">
             <lrm_rsc_op id="Fencing_last_0" operation_key="Fencing_start_0" operation="start" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="10:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:0;10:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node2" call-id="16" rc-code="0" op-status="0" interval="0" last-rc-change="1687310527" exec-time="47" queue-time="0" op-digest="f551693977f94a4fa8883fb70e439592"/>
             <lrm_rsc_op id="Fencing_monitor_120000" operation_key="Fencing_monitor_120000" operation="monitor" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="11:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:0;11:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node2" call-id="19" rc-code="0" op-status="0" interval="120000" last-rc-change="1687310527" exec-time="42" queue-time="0" op-digest="24989640311980988fb77ddd1cc1002b"/>
           </lrm_resource>
           <lrm_resource id="rsc1" class="ocf" provider="pacemaker" type="Dummy">
             <lrm_rsc_op id="rsc1_last_0" operation_key="rsc1_start_0" operation="start" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="20:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:0;20:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node2" call-id="17" rc-code="0" op-status="0" interval="0" last-rc-change="1687310527" exec-time="14" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart="  state  " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-secure-params="  passwd  " op-secure-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="rsc1_monitor_10000" operation_key="rsc1_monitor_10000" operation="monitor" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="21:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:0;21:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node2" call-id="18" rc-code="0" op-status="0" interval="10000" last-rc-change="1687310527" exec-time="19" queue-time="0" op-digest="4811cef7f7f94e3a35a70be7916cb2fd" op-secure-params="  passwd  " op-secure-digest="4811cef7f7f94e3a35a70be7916cb2fd"/>
           </lrm_resource>
           <lrm_resource id="rsc2" class="ocf" provider="pacemaker" type="Dummy">
             <lrm_rsc_op id="rsc2_last_0" operation_key="rsc2_start_0" operation="start" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="22:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:0;22:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node2" call-id="20" rc-code="0" op-status="0" interval="0" last-rc-change="1687310527" exec-time="14" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart="  state  " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-secure-params="  passwd  " op-secure-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="rsc2_monitor_10000" operation_key="rsc2_monitor_10000" operation="monitor" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="23:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:0;23:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node2" call-id="21" rc-code="0" op-status="0" interval="10000" last-rc-change="1687310527" exec-time="10" queue-time="0" op-digest="4811cef7f7f94e3a35a70be7916cb2fd" op-secure-params="  passwd  " op-secure-digest="4811cef7f7f94e3a35a70be7916cb2fd"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="2">
         <instance_attributes id="status-2">
           <nvpair id="status-2-.feature-set" name="#feature-set" value="3.17.4"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="1" uname="node1" in_ccm="true" crmd="online" crm-debug-origin="controld_update_resource_history" join="member" expected="member">
       <lrm id="1">
         <lrm_resources>
           <lrm_resource id="Fencing" class="stonith" type="fence_xvm">
             <lrm_rsc_op id="Fencing_last_0" operation_key="Fencing_monitor_0" operation="monitor" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="1:0:7:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:7;1:0:7:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node1" call-id="9" rc-code="7" op-status="0" interval="0" last-rc-change="1687310527" exec-time="3" queue-time="0" op-digest="f551693977f94a4fa8883fb70e439592"/>
           </lrm_resource>
           <lrm_resource id="rsc1" class="ocf" provider="pacemaker" type="Dummy">
             <lrm_rsc_op id="rsc1_last_0" operation_key="rsc1_monitor_0" operation="monitor" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="2:0:7:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:7;2:0:7:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node1" call-id="14" rc-code="7" op-status="0" interval="0" last-rc-change="1687310527" exec-time="17" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart="  state  " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-secure-params="  passwd  " op-secure-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="rsc2" class="ocf" provider="pacemaker" type="Dummy">
             <lrm_rsc_op id="rsc2_last_0" operation_key="rsc2_monitor_0" operation="monitor" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="3:0:7:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:7;3:0:7:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node1" call-id="15" rc-code="7" op-status="0" interval="0" last-rc-change="1687310527" exec-time="20" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart="  state  " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-secure-params="  passwd  " op-secure-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="1">
         <instance_attributes id="status-1">
           <nvpair id="status-1-.feature-set" name="#feature-set" value="3.17.4"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="3" uname="node3" in_ccm="true" crmd="online" crm-debug-origin="controld_update_resource_history" join="member" expected="member">
       <lrm id="3">
         <lrm_resources>
           <lrm_resource id="Fencing" class="stonith" type="fence_xvm">
             <lrm_rsc_op id="Fencing_last_0" operation_key="Fencing_monitor_0" operation="monitor" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="7:0:7:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:7;7:0:7:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node3" call-id="9" rc-code="7" op-status="0" interval="0" last-rc-change="1687310526" exec-time="2" queue-time="0" op-digest="f551693977f94a4fa8883fb70e439592"/>
           </lrm_resource>
           <lrm_resource id="rsc1" class="ocf" provider="pacemaker" type="Dummy">
             <lrm_rsc_op id="rsc1_last_0" operation_key="rsc1_start_0" operation="start" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="12:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:0;12:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node3" call-id="16" rc-code="0" op-status="0" interval="0" last-rc-change="1687310526" exec-time="16" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart="  state  " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-secure-params="  passwd  " op-secure-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="rsc1_monitor_10000" operation_key="rsc1_monitor_10000" operation="monitor" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="13:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:0;13:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node3" call-id="17" rc-code="0" op-status="0" interval="10000" last-rc-change="1687310526" exec-time="19" queue-time="1" op-digest="4811cef7f7f94e3a35a70be7916cb2fd" op-secure-params="  passwd  " op-secure-digest="4811cef7f7f94e3a35a70be7916cb2fd"/>
           </lrm_resource>
           <lrm_resource id="rsc2" class="ocf" provider="pacemaker" type="Dummy">
             <lrm_rsc_op id="rsc2_last_0" operation_key="rsc2_start_0" operation="start" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="14:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:0;14:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node3" call-id="18" rc-code="0" op-status="0" interval="0" last-rc-change="1687310526" exec-time="14" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart="  state  " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-secure-params="  passwd  " op-secure-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="rsc2_monitor_10000" operation_key="rsc2_monitor_10000" operation="monitor" crm-debug-origin="controld_update_resource_history" crm_feature_set="3.17.4" transition-key="15:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" transition-magic="0:0;15:0:0:94ad4cf3-e815-4ba8-b397-29a48e0bf3c1" exit-reason="" on_node="node3" call-id="19" rc-code="0" op-status="0" interval="10000" last-rc-change="1687310526" exec-time="12" queue-time="0" op-digest="4811cef7f7f94e3a35a70be7916cb2fd" op-secure-params="  passwd  " op-secure-digest="4811cef7f7f94e3a35a70be7916cb2fd"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="3">
         <instance_attributes id="status-3">
           <nvpair id="status-3-.feature-set" name="#feature-set" value="3.17.4"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>