diff --git a/crm/pengine/testcases/594.xml b/crm/pengine/testcases/594.xml
index 63db9b09fa..bab21add98 100644
--- a/crm/pengine/testcases/594.xml
+++ b/crm/pengine/testcases/594.xml
@@ -1,195 +1,215 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/662.xml b/crm/pengine/testcases/662.xml
index 2317d432cf..181026c7df 100644
--- a/crm/pengine/testcases/662.xml
+++ b/crm/pengine/testcases/662.xml
@@ -1,224 +1,250 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/696.xml b/crm/pengine/testcases/696.xml
index 45586270b8..d3b09b1454 100644
--- a/crm/pengine/testcases/696.xml
+++ b/crm/pengine/testcases/696.xml
@@ -1,160 +1,168 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/726.xml b/crm/pengine/testcases/726.xml
index 21aee38fc2..a4725e28e8 100644
--- a/crm/pengine/testcases/726.xml
+++ b/crm/pengine/testcases/726.xml
@@ -1,189 +1,195 @@
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/735.xml b/crm/pengine/testcases/735.xml
index 12096c148a..e75586dd3f 100644
--- a/crm/pengine/testcases/735.xml
+++ b/crm/pengine/testcases/735.xml
@@ -1,202 +1,216 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/764.xml b/crm/pengine/testcases/764.xml
index 154d137636..38703bfa35 100644
--- a/crm/pengine/testcases/764.xml
+++ b/crm/pengine/testcases/764.xml
@@ -1,239 +1,263 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/797.xml b/crm/pengine/testcases/797.xml
index e40d7e6b55..1b5f098ca7 100644
--- a/crm/pengine/testcases/797.xml
+++ b/crm/pengine/testcases/797.xml
@@ -1,256 +1,284 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/829.xml b/crm/pengine/testcases/829.xml
index dc8fc52399..1a9f136bec 100644
--- a/crm/pengine/testcases/829.xml
+++ b/crm/pengine/testcases/829.xml
@@ -1,230 +1,256 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/994.exp b/crm/pengine/testcases/994.exp
index 74aafb41bb..713c966089 100644
--- a/crm/pengine/testcases/994.exp
+++ b/crm/pengine/testcases/994.exp
@@ -1,89 +1,89 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/994.xml b/crm/pengine/testcases/994.xml
index 915dfb30a6..8b64271079 100644
--- a/crm/pengine/testcases/994.xml
+++ b/crm/pengine/testcases/994.xml
@@ -1,115 +1,115 @@
-
+
-
+
diff --git a/crm/pengine/testcases/bad5.dot b/crm/pengine/testcases/bad5.dot
index 79f02e7b18..c6fde012ab 100644
--- a/crm/pengine/testcases/bad5.dot
+++ b/crm/pengine/testcases/bad5.dot
@@ -1,14 +1,11 @@
digraph "g" {
size = "30,30"
"probe_complete" [ style=bold color="green" fontcolor="orange" ]
"probe_complete node1" [ style=bold color="green" fontcolor="black" ]
"rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
-"rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc2_start_0 node1" [ font_color=black style=filled fillcolor=purple ]
"probe_complete node1" -> "probe_complete" [ style = bold]
"rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
-"rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
"probe_complete" -> "rsc1_start_0 node1" [ style = bold]
-"probe_complete" -> "rsc2_start_0 node1" [ style = bold]
}
diff --git a/crm/pengine/testcases/bad5.exp b/crm/pengine/testcases/bad5.exp
index 9d4b5063c2..93431bf43a 100644
--- a/crm/pengine/testcases/bad5.exp
+++ b/crm/pengine/testcases/bad5.exp
@@ -1,61 +1,49 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
diff --git a/crm/pengine/testcases/interleave-0.xml b/crm/pengine/testcases/interleave-0.xml
index aa8a8907d4..621ae2bd73 100644
--- a/crm/pengine/testcases/interleave-0.xml
+++ b/crm/pengine/testcases/interleave-0.xml
@@ -1,551 +1,617 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/interleave-1.xml b/crm/pengine/testcases/interleave-1.xml
index 3630be4604..82ef8068c2 100644
--- a/crm/pengine/testcases/interleave-1.xml
+++ b/crm/pengine/testcases/interleave-1.xml
@@ -1,552 +1,618 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/interleave-2.xml b/crm/pengine/testcases/interleave-2.xml
index 042f69a740..a2ed1317fa 100644
--- a/crm/pengine/testcases/interleave-2.xml
+++ b/crm/pengine/testcases/interleave-2.xml
@@ -1,552 +1,618 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/interleave-3.xml b/crm/pengine/testcases/interleave-3.xml
index e90e4d6af7..231fbe09b4 100644
--- a/crm/pengine/testcases/interleave-3.xml
+++ b/crm/pengine/testcases/interleave-3.xml
@@ -1,552 +1,618 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/managed-0.xml b/crm/pengine/testcases/managed-0.xml
index 293500f50e..0d1fd238e0 100644
--- a/crm/pengine/testcases/managed-0.xml
+++ b/crm/pengine/testcases/managed-0.xml
@@ -1,545 +1,613 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/managed-1.xml b/crm/pengine/testcases/managed-1.xml
index 2f55c6224d..e0df5b4692 100644
--- a/crm/pengine/testcases/managed-1.xml
+++ b/crm/pengine/testcases/managed-1.xml
@@ -1,545 +1,613 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/managed-2.xml b/crm/pengine/testcases/managed-2.xml
index d8bca2a49f..c283bf8917 100644
--- a/crm/pengine/testcases/managed-2.xml
+++ b/crm/pengine/testcases/managed-2.xml
@@ -1,387 +1,411 @@
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/crm/pengine/testcases/notify-4.xml b/crm/pengine/testcases/notify-4.xml
index fb8dd4e116..33fba6ddda 100644
--- a/crm/pengine/testcases/notify-4.xml
+++ b/crm/pengine/testcases/notify-4.xml
@@ -1,84 +1,86 @@
-
+
+
+
diff --git a/crm/pengine/testcases/orphan-0.dot b/crm/pengine/testcases/orphan-0.dot
index c818e99c6f..588f2a52cd 100644
--- a/crm/pengine/testcases/orphan-0.dot
+++ b/crm/pengine/testcases/orphan-0.dot
@@ -1,68 +1,64 @@
digraph "g" {
size = "30,30"
-"rsc_c001n08_start_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
+"rsc_c001n08_monitor_5000 c001n08" [ font_color=black style=filled fillcolor=purple ]
"DcIPaddr_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc_c001n02_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc_c001n03_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n01_monitor_5000 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
"probe_complete" [ style=bold color="green" fontcolor="orange" ]
"probe_complete c001n08" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"probe_complete c001n02" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
-"rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
"probe_complete c001n03" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
-"rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"probe_complete c001n01" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
-"rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
"DcIPaddr_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n02_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n02_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n03_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n03_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n03_monitor_6000 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n01_stop_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n01_start_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n08_stop_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
-"probe_complete" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
-"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
+"rsc_c001n08_start_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
"DcIPaddr_start_0 c001n02" -> "DcIPaddr_monitor_5000 c001n02" [ style = dashed]
"rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = dashed]
"probe_complete c001n08" -> "probe_complete" [ style = bold]
"probe_complete c001n02" -> "probe_complete" [ style = bold]
"probe_complete c001n03" -> "probe_complete" [ style = bold]
"probe_complete c001n01" -> "probe_complete" [ style = bold]
"DcIPaddr_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n02_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n03_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n01_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n03_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
"rsc_c001n01_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
-"rsc_c001n08_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
"DcIPaddr_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"rsc_c001n02_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"rsc_c001n01_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
-"rsc_c001n08_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"DcIPaddr_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"rsc_c001n02_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"rsc_c001n03_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
-"rsc_c001n08_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"probe_complete" -> "DcIPaddr_start_0 c001n02" [ style = dashed]
"DcIPaddr_stop_0 c001n02" -> "DcIPaddr_start_0 c001n02" [ style = dashed]
"probe_complete" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
"probe_complete" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
"rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_6000 c001n03" [ style = dashed]
"probe_complete" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
"rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
}
diff --git a/crm/pengine/testcases/orphan-0.exp b/crm/pengine/testcases/orphan-0.exp
index 2dc57de48b..c1048252e9 100644
--- a/crm/pengine/testcases/orphan-0.exp
+++ b/crm/pengine/testcases/orphan-0.exp
@@ -1,249 +1,213 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
-
+
-
+
-
+
-
-
-
-
+
-
+
-
+
-
+
-
-
-
diff --git a/crm/pengine/testcases/orphan-1.dot b/crm/pengine/testcases/orphan-1.dot
index b6537170e3..3d6af118e2 100644
--- a/crm/pengine/testcases/orphan-1.dot
+++ b/crm/pengine/testcases/orphan-1.dot
@@ -1,70 +1,64 @@
digraph "g" {
size = "30,30"
"rsc_c001n08_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
"DcIPaddr_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n02_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n01_monitor_5000 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
"probe_complete" [ style=bold color="green" fontcolor="orange" ]
"probe_complete c001n08" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"probe_complete c001n02" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
-"rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
"probe_complete c001n03" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
-"rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"probe_complete c001n01" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
-"rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
"DcIPaddr_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n02_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n02_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n03_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n03_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n03_monitor_6000 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n01_stop_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n01_start_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
"rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_start_0 c001n02" -> "DcIPaddr_monitor_5000 c001n02" [ style = dashed]
"rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = dashed]
"probe_complete c001n08" -> "probe_complete" [ style = bold]
"probe_complete c001n02" -> "probe_complete" [ style = bold]
"probe_complete c001n03" -> "probe_complete" [ style = bold]
"probe_complete c001n01" -> "probe_complete" [ style = bold]
"DcIPaddr_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n02_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n03_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n01_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n03_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
"rsc_c001n01_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
-"rsc_c001n08_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
"DcIPaddr_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"rsc_c001n02_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"rsc_c001n01_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
-"rsc_c001n08_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"DcIPaddr_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"rsc_c001n02_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"rsc_c001n03_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
-"rsc_c001n08_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"probe_complete" -> "DcIPaddr_start_0 c001n02" [ style = dashed]
"DcIPaddr_stop_0 c001n02" -> "DcIPaddr_start_0 c001n02" [ style = dashed]
"rsc_c001n02_monitor_5000 c001n02" -> "rsc_c001n02_stop_0 c001n02" [ style = dashed]
"probe_complete" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
"rsc_c001n03_monitor_5000 c001n03" -> "rsc_c001n03_stop_0 c001n03" [ style = dashed]
"probe_complete" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
"rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_6000 c001n03" [ style = dashed]
"probe_complete" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
"rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
}
diff --git a/crm/pengine/testcases/orphan-1.exp b/crm/pengine/testcases/orphan-1.exp
index 920912cadc..a1939b0b13 100644
--- a/crm/pengine/testcases/orphan-1.exp
+++ b/crm/pengine/testcases/orphan-1.exp
@@ -1,276 +1,240 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
-
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/params-1.exp b/crm/pengine/testcases/params-1.exp
index c5555dceba..9d36875e24 100644
--- a/crm/pengine/testcases/params-1.exp
+++ b/crm/pengine/testcases/params-1.exp
@@ -1,305 +1,305 @@
-
+
diff --git a/crm/pengine/testcases/rec-rsc-2.xml b/crm/pengine/testcases/rec-rsc-2.xml
index 0d2d3490ae..7e63a2026f 100644
--- a/crm/pengine/testcases/rec-rsc-2.xml
+++ b/crm/pengine/testcases/rec-rsc-2.xml
@@ -1,30 +1,30 @@
-
+