diff --git a/pengine/test10/failcount.dot b/pengine/test10/failcount.dot
index 475c92d97a..41966ad3fc 100644
--- a/pengine/test10/failcount.dot
+++ b/pengine/test10/failcount.dot
@@ -1,24 +1,6 @@
digraph "g" {
-"re-dummy1_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
-"re-dummy1_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
-"re-dummy2_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
-"re-dummy2_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
-"re-dummy3_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
-"re-dummy3_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
-"re-dummy4_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
-"re-dummy4_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
-"re-dummy_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
-"re-dummy_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
-"re-monitoring-lv:0_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
-"re-monitoring-lv:0_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
-"re-monitoring-lv_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
-"re-monitoring-lv_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
-"re-named-103ns1-ip_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
-"re-named-103ns1-ip_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
-"re-named-103ns2-ip_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
-"re-named-103ns2-ip_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
"re-named-lsb:0_monitor_10000 dresproddns02" [ style=bold color="green" fontcolor="black"]
"re-named-lsb:1_monitor_10000 dresproddns01" [ style=bold color="green" fontcolor="black"]
"re-openfire-lsb:0_clear_failcount dresproddns01" [ style=bold color="green" fontcolor="black"]
"re-openfire-lsb:1_clear_failcount dresproddns02" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/failcount.exp b/pengine/test10/failcount.exp
index a93278603d..9b7234b647 100644
--- a/pengine/test10/failcount.exp
+++ b/pengine/test10/failcount.exp
@@ -1,201 +1,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pengine/test10/failcount.summary b/pengine/test10/failcount.summary
index cacba26ced..2a8f6a499c 100644
--- a/pengine/test10/failcount.summary
+++ b/pengine/test10/failcount.summary
@@ -1,79 +1,61 @@
Current cluster status:
Online: [ dresproddns01 dresproddns02 ]
Clone Set: cl-openfire [gr-openfire]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-named [gr-named]
Started: [ dresproddns01 dresproddns02 ]
re-monitor (ocf::pacemaker:ClusterMon): Started dresproddns02
Clone Set: cl-ping-sjim [re-ping-sjim]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-wesbprod [gr-wesbprod]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-svn [gr-svn]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-ldirectord [re-ldirectord-gluster]
Started: [ dresproddns01 dresproddns02 ]
re-drdns-ip (ocf::heartbeat:IPaddr): Started dresproddns01
Clone Set: cl-cdeprod [gr-cdeprod]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-sysinfo [re-sysinfo]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-haproxy [gr-haproxy]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-ping-sjho [re-ping-sjho]
Started: [ dresproddns01 dresproddns02 ]
Transition Summary:
Executing cluster transition:
* Cluster action: clear_failcount for re-openfire-lsb on dresproddns01
* Cluster action: clear_failcount for re-openfire-lsb on dresproddns02
* Resource action: re-named-lsb:1 monitor=10000 on dresproddns01
* Resource action: re-named-lsb:0 monitor=10000 on dresproddns02
- * Resource action: re-named-103ns2-ip delete on dresproddns02
- * Resource action: re-named-103ns2-ip delete on dresproddns01
- * Resource action: re-monitoring-lv:0 delete on dresproddns02
- * Resource action: re-monitoring-lv:0 delete on dresproddns01
- * Resource action: re-dummy delete on dresproddns02
- * Resource action: re-dummy delete on dresproddns01
- * Resource action: re-dummy3 delete on dresproddns02
- * Resource action: re-dummy3 delete on dresproddns01
- * Resource action: re-dummy4 delete on dresproddns02
- * Resource action: re-dummy4 delete on dresproddns01
- * Resource action: re-dummy1 delete on dresproddns02
- * Resource action: re-dummy1 delete on dresproddns01
- * Resource action: re-monitoring-lv delete on dresproddns02
- * Resource action: re-monitoring-lv delete on dresproddns01
- * Resource action: re-dummy2 delete on dresproddns02
- * Resource action: re-dummy2 delete on dresproddns01
- * Resource action: re-named-103ns1-ip delete on dresproddns02
- * Resource action: re-named-103ns1-ip delete on dresproddns01
Revised cluster status:
Online: [ dresproddns01 dresproddns02 ]
Clone Set: cl-openfire [gr-openfire]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-named [gr-named]
Started: [ dresproddns01 dresproddns02 ]
re-monitor (ocf::pacemaker:ClusterMon): Started dresproddns02
Clone Set: cl-ping-sjim [re-ping-sjim]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-wesbprod [gr-wesbprod]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-svn [gr-svn]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-ldirectord [re-ldirectord-gluster]
Started: [ dresproddns01 dresproddns02 ]
re-drdns-ip (ocf::heartbeat:IPaddr): Started dresproddns01
Clone Set: cl-cdeprod [gr-cdeprod]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-sysinfo [re-sysinfo]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-haproxy [gr-haproxy]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-ping-sjho [re-ping-sjho]
Started: [ dresproddns01 dresproddns02 ]
diff --git a/pengine/test10/failcount.xml b/pengine/test10/failcount.xml
index 16c07f209f..5ac8a2c5a7 100644
--- a/pengine/test10/failcount.xml
+++ b/pengine/test10/failcount.xml
@@ -1,827 +1,772 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-