diff --git a/cts/scheduler/dot/group-anticolocation.dot b/cts/scheduler/dot/group-anticolocation.dot
index def3b8bc6e..6454c1290c 100644
--- a/cts/scheduler/dot/group-anticolocation.dot
+++ b/cts/scheduler/dot/group-anticolocation.dot
@@ -1,29 +1,56 @@
digraph "g" {
+"group1_running_0" [ style=bold color="green" fontcolor="orange"]
+"group1_start_0" -> "group1_running_0" [ style = bold]
+"group1_start_0" -> "member1a_start_0 node1" [ style = bold]
+"group1_start_0" -> "member1b_start_0 node1" [ style = bold]
+"group1_start_0" [ style=bold color="green" fontcolor="orange"]
+"group1_stop_0" -> "group1_stopped_0" [ style = bold]
+"group1_stop_0" -> "member1a_stop_0 node2" [ style = bold]
+"group1_stop_0" -> "member1b_stop_0 node2" [ style = bold]
+"group1_stop_0" [ style=bold color="green" fontcolor="orange"]
+"group1_stopped_0" -> "group1_start_0" [ style = bold]
+"group1_stopped_0" [ style=bold color="green" fontcolor="orange"]
"group2_running_0" [ style=bold color="green" fontcolor="orange"]
"group2_start_0" -> "group2_running_0" [ style = bold]
"group2_start_0" -> "member2a_start_0 node2" [ style = bold]
"group2_start_0" -> "member2b_start_0 node2" [ style = bold]
"group2_start_0" [ style=bold color="green" fontcolor="orange"]
"group2_stop_0" -> "group2_stopped_0" [ style = bold]
"group2_stop_0" -> "member2a_stop_0 node1" [ style = bold]
"group2_stop_0" -> "member2b_stop_0 node1" [ style = bold]
"group2_stop_0" [ style=bold color="green" fontcolor="orange"]
"group2_stopped_0" -> "group2_start_0" [ style = bold]
"group2_stopped_0" [ style=bold color="green" fontcolor="orange"]
+"member1a_monitor_10000 node1" [ style=bold color="green" fontcolor="black"]
+"member1a_start_0 node1" -> "group1_running_0" [ style = bold]
+"member1a_start_0 node1" -> "member1a_monitor_10000 node1" [ style = bold]
+"member1a_start_0 node1" -> "member1b_start_0 node1" [ style = bold]
+"member1a_start_0 node1" [ style=bold color="green" fontcolor="black"]
+"member1a_stop_0 node2" -> "group1_stopped_0" [ style = bold]
+"member1a_stop_0 node2" -> "member1a_start_0 node1" [ style = bold]
+"member1a_stop_0 node2" [ style=bold color="green" fontcolor="black"]
+"member1b_monitor_10000 node1" [ style=bold color="green" fontcolor="black"]
+"member1b_start_0 node1" -> "group1_running_0" [ style = bold]
+"member1b_start_0 node1" -> "member1b_monitor_10000 node1" [ style = bold]
+"member1b_start_0 node1" [ style=bold color="green" fontcolor="black"]
+"member1b_stop_0 node2" -> "group1_stopped_0" [ style = bold]
+"member1b_stop_0 node2" -> "member1a_stop_0 node2" [ style = bold]
+"member1b_stop_0 node2" -> "member1b_start_0 node1" [ style = bold]
+"member1b_stop_0 node2" [ style=bold color="green" fontcolor="black"]
"member2a_monitor_10000 node2" [ style=bold color="green" fontcolor="black"]
"member2a_start_0 node2" -> "group2_running_0" [ style = bold]
"member2a_start_0 node2" -> "member2a_monitor_10000 node2" [ style = bold]
"member2a_start_0 node2" -> "member2b_start_0 node2" [ style = bold]
"member2a_start_0 node2" [ style=bold color="green" fontcolor="black"]
"member2a_stop_0 node1" -> "group2_stopped_0" [ style = bold]
"member2a_stop_0 node1" -> "member2a_start_0 node2" [ style = bold]
"member2a_stop_0 node1" [ style=bold color="green" fontcolor="black"]
"member2b_monitor_10000 node2" [ style=bold color="green" fontcolor="black"]
"member2b_start_0 node2" -> "group2_running_0" [ style = bold]
"member2b_start_0 node2" -> "member2b_monitor_10000 node2" [ style = bold]
"member2b_start_0 node2" [ style=bold color="green" fontcolor="black"]
"member2b_stop_0 node1" -> "group2_stopped_0" [ style = bold]
"member2b_stop_0 node1" -> "member2a_stop_0 node1" [ style = bold]
"member2b_stop_0 node1" -> "member2b_start_0 node2" [ style = bold]
"member2b_stop_0 node1" [ style=bold color="green" fontcolor="black"]
}
diff --git a/cts/scheduler/exp/group-anticolocation.exp b/cts/scheduler/exp/group-anticolocation.exp
index 4e57e1831a..5a37559329 100644
--- a/cts/scheduler/exp/group-anticolocation.exp
+++ b/cts/scheduler/exp/group-anticolocation.exp
@@ -1,148 +1,294 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/cts/scheduler/scores/group-anticolocation.scores b/cts/scheduler/scores/group-anticolocation.scores
index 4449511daa..5d38fa1d3a 100644
--- a/cts/scheduler/scores/group-anticolocation.scores
+++ b/cts/scheduler/scores/group-anticolocation.scores
@@ -1,23 +1,23 @@
pcmk__group_assign: group1 allocation score on node1: 0
pcmk__group_assign: group1 allocation score on node2: 0
pcmk__group_assign: group2 allocation score on node1: 0
pcmk__group_assign: group2 allocation score on node2: 0
pcmk__group_assign: member1a allocation score on node1: 0
pcmk__group_assign: member1a allocation score on node2: 0
pcmk__group_assign: member1b allocation score on node1: 0
pcmk__group_assign: member1b allocation score on node2: 0
pcmk__group_assign: member2a allocation score on node1: 0
pcmk__group_assign: member2a allocation score on node2: 0
pcmk__group_assign: member2b allocation score on node1: -INFINITY
pcmk__group_assign: member2b allocation score on node2: 0
pcmk__primitive_assign: Fencing allocation score on node1: 0
pcmk__primitive_assign: Fencing allocation score on node2: 0
-pcmk__primitive_assign: member1a allocation score on node1: 0
+pcmk__primitive_assign: member1a allocation score on node1: 5000
pcmk__primitive_assign: member1a allocation score on node2: 0
-pcmk__primitive_assign: member1b allocation score on node1: -INFINITY
-pcmk__primitive_assign: member1b allocation score on node2: 0
+pcmk__primitive_assign: member1b allocation score on node1: 5000
+pcmk__primitive_assign: member1b allocation score on node2: -INFINITY
pcmk__primitive_assign: member2a allocation score on node1: -INFINITY
pcmk__primitive_assign: member2a allocation score on node2: 0
pcmk__primitive_assign: member2b allocation score on node1: -INFINITY
pcmk__primitive_assign: member2b allocation score on node2: 0
diff --git a/cts/scheduler/summary/group-anticolocation.summary b/cts/scheduler/summary/group-anticolocation.summary
index 3ecb056029..93d2e73c31 100644
--- a/cts/scheduler/summary/group-anticolocation.summary
+++ b/cts/scheduler/summary/group-anticolocation.summary
@@ -1,41 +1,53 @@
Current cluster status:
* Node List:
* Online: [ node1 node2 ]
* Full List of Resources:
* Fencing (stonith:fence_xvm): Started node1
* Resource Group: group1:
* member1a (ocf:pacemaker:Dummy): Started node2
* member1b (ocf:pacemaker:Dummy): Started node2
* Resource Group: group2:
* member2a (ocf:pacemaker:Dummy): Started node1
* member2b (ocf:pacemaker:Dummy): FAILED node1
Transition Summary:
+ * Move member1a ( node2 -> node1 )
+ * Move member1b ( node2 -> node1 )
* Move member2a ( node1 -> node2 )
* Recover member2b ( node1 -> node2 )
Executing Cluster Transition:
+ * Pseudo action: group1_stop_0
+ * Resource action: member1b stop on node2
* Pseudo action: group2_stop_0
* Resource action: member2b stop on node1
+ * Resource action: member1a stop on node2
* Resource action: member2a stop on node1
+ * Pseudo action: group1_stopped_0
+ * Pseudo action: group1_start_0
+ * Resource action: member1a start on node1
+ * Resource action: member1b start on node1
* Pseudo action: group2_stopped_0
* Pseudo action: group2_start_0
* Resource action: member2a start on node2
* Resource action: member2b start on node2
+ * Pseudo action: group1_running_0
+ * Resource action: member1a monitor=10000 on node1
+ * Resource action: member1b monitor=10000 on node1
* Pseudo action: group2_running_0
* Resource action: member2a monitor=10000 on node2
* Resource action: member2b monitor=10000 on node2
Revised Cluster Status:
* Node List:
* Online: [ node1 node2 ]
* Full List of Resources:
* Fencing (stonith:fence_xvm): Started node1
* Resource Group: group1:
- * member1a (ocf:pacemaker:Dummy): Started node2
- * member1b (ocf:pacemaker:Dummy): Started node2
+ * member1a (ocf:pacemaker:Dummy): Started node1
+ * member1b (ocf:pacemaker:Dummy): Started node1
* Resource Group: group2:
* member2a (ocf:pacemaker:Dummy): Started node2
* member2b (ocf:pacemaker:Dummy): Started node2
diff --git a/cts/scheduler/xml/group-anticolocation.xml b/cts/scheduler/xml/group-anticolocation.xml
index 1f895ecc41..1c6c8c9907 100644
--- a/cts/scheduler/xml/group-anticolocation.xml
+++ b/cts/scheduler/xml/group-anticolocation.xml
@@ -1,162 +1,164 @@