diff --git a/pengine/test10/order-wrong-kind.summary b/pengine/test10/order-wrong-kind.summary
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/pengine/test10/systemhealthp4.dot b/pengine/test10/systemhealthp4.dot
deleted file mode 100644
index 788051d095..0000000000
--- a/pengine/test10/systemhealthp4.dot
+++ /dev/null
@@ -1,23 +0,0 @@
-digraph "g" {
-"apache_1_monitor_0 hs21c" -> "probe_complete hs21c" [ style = bold]
-"apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ]
-"apache_1_monitor_0 hs21d" -> "probe_complete hs21d" [ style = bold]
-"apache_1_monitor_0 hs21d" [ style=bold color="green" fontcolor="black" ]
-"apache_1_monitor_10000 hs21d" [ style=bold color="green" fontcolor="black" ]
-"apache_1_start_0 hs21d" -> "apache_1_monitor_10000 hs21d" [ style = bold]
-"apache_1_start_0 hs21d" [ style=bold color="green" fontcolor="black" ]
-"nfs_1_monitor_0 hs21c" -> "probe_complete hs21c" [ style = bold]
-"nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ]
-"nfs_1_monitor_0 hs21d" -> "probe_complete hs21d" [ style = bold]
-"nfs_1_monitor_0 hs21d" [ style=bold color="green" fontcolor="black" ]
-"nfs_1_monitor_20000 hs21d" [ style=bold color="green" fontcolor="black" ]
-"nfs_1_start_0 hs21d" -> "nfs_1_monitor_20000 hs21d" [ style = bold]
-"nfs_1_start_0 hs21d" [ style=bold color="green" fontcolor="black" ]
-"probe_complete hs21c" -> "probe_complete" [ style = bold]
-"probe_complete hs21c" [ style=bold color="green" fontcolor="black" ]
-"probe_complete hs21d" -> "probe_complete" [ style = bold]
-"probe_complete hs21d" [ style=bold color="green" fontcolor="black" ]
-"probe_complete" -> "apache_1_start_0 hs21d" [ style = bold]
-"probe_complete" -> "nfs_1_start_0 hs21d" [ style = bold]
-"probe_complete" [ style=bold color="green" fontcolor="orange" ]
-}
diff --git a/pengine/test10/systemhealthp4.exp b/pengine/test10/systemhealthp4.exp
deleted file mode 100644
index 83e714c12c..0000000000
--- a/pengine/test10/systemhealthp4.exp
+++ /dev/null
@@ -1,136 +0,0 @@
-<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
-  <synapse id="0">
-    <action_set>
-      <rsc_op id="4" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
-        <primitive id="apache_1" long-id="apache_1" class="ocf" provider="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="1">
-    <action_set>
-      <rsc_op id="7" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
-        <primitive id="apache_1" long-id="apache_1" class="ocf" provider="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="2">
-    <action_set>
-      <rsc_op id="9" operation="start" operation_key="apache_1_start_0" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
-        <primitive id="apache_1" long-id="apache_1" class="ocf" provider="heartbeat" type="apache"/>
-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.1"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="3">
-    <action_set>
-      <rsc_op id="10" operation="monitor" operation_key="apache_1_monitor_10000" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
-        <primitive id="apache_1" long-id="apache_1" class="ocf" provider="heartbeat" type="apache"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_start_delay="60000" CRM_meta_timeout="80000" crm_feature_set="3.0.1"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="9" operation="start" operation_key="apache_1_start_0" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="4">
-    <action_set>
-      <rsc_op id="5" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
-        <primitive id="nfs_1" long-id="nfs_1" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" device="hs21d:/nfs" directory="/mnt/tmp" fstype="nfs" options="ro"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="5">
-    <action_set>
-      <rsc_op id="8" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
-        <primitive id="nfs_1" long-id="nfs_1" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" device="hs21d:/nfs" directory="/mnt/tmp" fstype="nfs" options="ro"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="6">
-    <action_set>
-      <rsc_op id="11" operation="start" operation_key="nfs_1_start_0" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
-        <primitive id="nfs_1" long-id="nfs_1" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.1" device="hs21d:/nfs" directory="/mnt/tmp" fstype="nfs" options="ro"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="7">
-    <action_set>
-      <rsc_op id="12" operation="monitor" operation_key="nfs_1_monitor_20000" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
-        <primitive id="nfs_1" long-id="nfs_1" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_interval="20000" CRM_meta_name="monitor" CRM_meta_start_delay="10000" CRM_meta_timeout="50000" crm_feature_set="3.0.1" device="hs21d:/nfs" directory="/mnt/tmp" fstype="nfs" options="ro"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="11" operation="start" operation_key="nfs_1_start_0" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="8">
-    <action_set>
-      <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
-        <attributes crm_feature_set="3.0.1"/>
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="9" priority="1000000">
-    <action_set>
-      <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
-        <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.1"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="10" priority="1000000">
-    <action_set>
-      <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
-        <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.1"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="7" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
-      </trigger>
-    </inputs>
-  </synapse>
-</transition_graph>
-
diff --git a/pengine/test10/systemhealthp4.scores b/pengine/test10/systemhealthp4.scores
deleted file mode 100644
index 1bb66ac6b5..0000000000
--- a/pengine/test10/systemhealthp4.scores
+++ /dev/null
@@ -1,5 +0,0 @@
-Allocation scores:
-native_color: apache_1 allocation score on hs21c: -106
-native_color: apache_1 allocation score on hs21d: 816
-native_color: nfs_1 allocation score on hs21c: -106
-native_color: nfs_1 allocation score on hs21d: 816
diff --git a/pengine/test10/systemhealthp4.xml b/pengine/test10/systemhealthp4.xml
deleted file mode 100644
index c0f00c31d1..0000000000
--- a/pengine/test10/systemhealthp4.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<cib validate-with="pacemaker-1.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13941" num_updates="1" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
-  <configuration>
-    <crm_config>
-      <cluster_property_set id="cib-bootstrap-options">
-        <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
-        <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="progressive"/>
-        <nvpair id="cib-bootstrap-options-node-health-red" name="node-health-red" value="-INFINITY"/>
-        <nvpair id="cib-bootstrap-options-node-health-yellow" name="node-health-yellow" value="-100"/>
-        <nvpair id="cib-bootstrap-options-node-health-green" name="node-health-green" value="0"/>
-      </cluster_property_set>
-    </crm_config>
-    <nodes>
-      <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="normal"/>
-      <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="normal"/>
-    </nodes>
-    <resources>
-      <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
-        <meta_attributes id="apache_1-meta_attributes">
-          <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
-        </meta_attributes>
-        <operations id="apache_1-operations">
-          <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
-        </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
-      </primitive>
-      <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
-        <meta_attributes id="nfs_1-meta_attributes">
-          <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
-        </meta_attributes>
-        <operations id="nfs_1-operations">
-          <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
-        </operations>
-        <instance_attributes id="nfs_1-instance_attributes">
-          <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
-          <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
-          <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
-          <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
-        </instance_attributes>
-      </primitive>
-    </resources>
-    <constraints>
-      <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
-      <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
-    </constraints>
-    <op_defaults>
-      <meta_attributes id="op_defaults-options"/>
-    </op_defaults>
-    <rsc_defaults/>
-  </configuration>
-  <status>
-    <node_state id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
-      <transient_attributes id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
-        <instance_attributes id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
-          <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-ipmi" name="#health-ipmi" value="391"/>
-          <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-ibmc" name="#health-ibmc" value="177"/>
-          <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-smart" name="#health-smart" value="-981"/>
-          <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-mcelog" name="#health-mcelog" value="207"/>
-        </instance_attributes>
-      </transient_attributes>
-    </node_state>
-    <node_state id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
-      <transient_attributes id="737318c6-0f92-4592-9754-45967d45aff7">
-        <instance_attributes id="status-737318c6-0f92-4592-9754-45967d45aff7">
-          <nvpair id="status-737318c6-0f92-4592-9754-45967d45aff7-#health-ipmi" name="#health-ipmi" value="555"/>
-          <nvpair id="status-737318c6-0f92-4592-9754-45967d45aff7-#health-ibmc" name="#health-ibmc" value="41"/>
-          <nvpair id="status-737318c6-0f92-4592-9754-45967d45aff7-#health-smart" name="#health-smart" value="-81"/>
-          <nvpair id="status-737318c6-0f92-4592-9754-45967d45aff7-#health-mcelog" name="#health-mcelog" value="301"/>
-        </instance_attributes>
-      </transient_attributes>
-    </node_state>
-  </status>
-</cib>
\ No newline at end of file