diff --git a/crm/pengine/testcases/group1.exp b/crm/pengine/testcases/group1.exp
index 1c79567cd0..fa2d4f5421 100644
--- a/crm/pengine/testcases/group1.exp
+++ b/crm/pengine/testcases/group1.exp
@@ -1,64 +1,62 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
       <pseudo_event id="4" rsc_id="rsc1" operation="start" allow_fail="false">
-        <resource id="rsc1" priority="1.0"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="1">
     <action_set>
       <pseudo_event id="5" rsc_id="rsc1" operation="running" allow_fail="false">
-        <resource id="rsc1" priority="1.0"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc1:child_rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="4" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1:child_rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1:child_rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1:child_rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/group2.exp b/crm/pengine/testcases/group2.exp
index 91f6894dcb..ea50e2198b 100644
--- a/crm/pengine/testcases/group2.exp
+++ b/crm/pengine/testcases/group2.exp
@@ -1,90 +1,88 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="1">
     <action_set>
       <pseudo_event id="5" rsc_id="rsc2" operation="start" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <pseudo_event id="6" rsc_id="rsc2" operation="running" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="4" rsc_id="rsc2:child_rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
        <rsc_op id="2" rsc_id="rsc2:child_rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="5" rsc_id="rsc2" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
        <rsc_op id="3" rsc_id="rsc2:child_rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="2" rsc_id="rsc2:child_rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
        <rsc_op id="4" rsc_id="rsc2:child_rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="3" rsc_id="rsc2:child_rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <rsc_op id="7" rsc_id="rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc3" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="6" rsc_id="rsc2" operation="running" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/group3.exp b/crm/pengine/testcases/group3.exp
index a29c93774a..d62318d250 100644
--- a/crm/pengine/testcases/group3.exp
+++ b/crm/pengine/testcases/group3.exp
@@ -1,129 +1,125 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
       <pseudo_event id="4" rsc_id="rsc1" operation="start" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="1">
     <action_set>
       <pseudo_event id="5" rsc_id="rsc1" operation="running" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc1:child_rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="4" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1:child_rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1:child_rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1:child_rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <pseudo_event id="9" rsc_id="rsc2" operation="start" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="5" rsc_id="rsc1" operation="running" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <pseudo_event id="10" rsc_id="rsc2" operation="running" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="8" rsc_id="rsc2:child_rsc6" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
        <rsc_op id="6" rsc_id="rsc2:child_rsc4" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc4" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="9" rsc_id="rsc2" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
        <rsc_op id="7" rsc_id="rsc2:child_rsc5" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc5" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="6" rsc_id="rsc2:child_rsc4" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
        <rsc_op id="8" rsc_id="rsc2:child_rsc6" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc6" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="7" rsc_id="rsc2:child_rsc5" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/group5.exp b/crm/pengine/testcases/group5.exp
index b87172ce6e..81b6c786eb 100644
--- a/crm/pengine/testcases/group5.exp
+++ b/crm/pengine/testcases/group5.exp
@@ -1,196 +1,192 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="12" rsc_id="rsc2" operation="stopped" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <pseudo_event id="9" rsc_id="rsc2" operation="start" allow_fail="false">
-        <resource id="rsc2" priority="1.0"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
         <pseudo_event id="11" rsc_id="rsc2" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <pseudo_event id="10" rsc_id="rsc2" operation="running" allow_fail="false">
-        <resource id="rsc2" priority="1.0"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="8" rsc_id="rsc2:child_rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <pseudo_event id="11" rsc_id="rsc2" operation="stop" allow_fail="false">
-        <resource id="rsc2" priority="1.0"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="13" rsc_id="rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <pseudo_event id="12" rsc_id="rsc2" operation="stopped" allow_fail="false">
-        <resource id="rsc2" priority="1.0"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc2:child_rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <rsc_op id="3" rsc_id="rsc2:child_rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" rsc_id="rsc2:child_rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
       <rsc_op id="4" rsc_id="rsc2:child_rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc2:child_rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <pseudo_event id="9" rsc_id="rsc2" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
       <rsc_op id="5" rsc_id="rsc2:child_rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="7" rsc_id="rsc2:child_rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
       <rsc_op id="6" rsc_id="rsc2:child_rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" rsc_id="rsc2:child_rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="4" rsc_id="rsc2:child_rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
       <rsc_op id="7" rsc_id="rsc2:child_rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="11" rsc_id="rsc2" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
       <rsc_op id="8" rsc_id="rsc2:child_rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="7" rsc_id="rsc2:child_rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="6" rsc_id="rsc2:child_rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
       <rsc_op id="13" rsc_id="rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc3" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="13">
     <action_set>
       <rsc_op id="14" rsc_id="rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc3" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="10" rsc_id="rsc2" operation="running" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="13" rsc_id="rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/group6.exp b/crm/pengine/testcases/group6.exp
index 22a741b665..fe94176841 100644
--- a/crm/pengine/testcases/group6.exp
+++ b/crm/pengine/testcases/group6.exp
@@ -1,280 +1,272 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
       <pseudo_event id="7" rsc_id="rsc1" operation="start" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="9" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <pseudo_event id="8" rsc_id="rsc1" operation="running" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="6" rsc_id="rsc1:child_rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <pseudo_event id="9" rsc_id="rsc1" operation="stop" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="20" rsc_id="rsc2" operation="stopped" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <pseudo_event id="10" rsc_id="rsc1" operation="stopped" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc1:child_rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1:child_rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <pseudo_event id="7" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1:child_rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" rsc_id="rsc1:child_rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
       <rsc_op id="4" rsc_id="rsc1:child_rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc1:child_rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1:child_rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
       <rsc_op id="5" rsc_id="rsc1:child_rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="9" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
       <rsc_op id="6" rsc_id="rsc1:child_rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" rsc_id="rsc1:child_rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="4" rsc_id="rsc1:child_rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
       <pseudo_event id="17" rsc_id="rsc2" operation="start" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="8" rsc_id="rsc1" operation="running" allow_fail="false"/>
       </trigger>
       <trigger>
         <pseudo_event id="19" rsc_id="rsc2" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
       <pseudo_event id="18" rsc_id="rsc2" operation="running" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="16" rsc_id="rsc2:child_rsc6" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
       <pseudo_event id="19" rsc_id="rsc2" operation="stop" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="13">
     <action_set>
       <pseudo_event id="20" rsc_id="rsc2" operation="stopped" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="11" rsc_id="rsc2:child_rsc4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
       <rsc_op id="11" rsc_id="rsc2:child_rsc4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc2:child_rsc4" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="13" rsc_id="rsc2:child_rsc5" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
       <rsc_op id="12" rsc_id="rsc2:child_rsc4" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc4" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="11" rsc_id="rsc2:child_rsc4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <pseudo_event id="17" rsc_id="rsc2" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
       <rsc_op id="13" rsc_id="rsc2:child_rsc5" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc2:child_rsc5" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="15" rsc_id="rsc2:child_rsc6" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
       <rsc_op id="14" rsc_id="rsc2:child_rsc5" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc5" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="13" rsc_id="rsc2:child_rsc5" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="12" rsc_id="rsc2:child_rsc4" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
       <rsc_op id="15" rsc_id="rsc2:child_rsc6" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc2:child_rsc6" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="19" rsc_id="rsc2" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="19">
     <action_set>
       <rsc_op id="16" rsc_id="rsc2:child_rsc6" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc6" class="heartbeat" type="apache"/>
          <attributes/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="15" rsc_id="rsc2:child_rsc6" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="14" rsc_id="rsc2:child_rsc5" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/inc0.exp b/crm/pengine/testcases/inc0.exp
index 843e80a472..af8b3fb8b2 100644
--- a/crm/pengine/testcases/inc0.exp
+++ b/crm/pengine/testcases/inc0.exp
@@ -1,73 +1,72 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
        <pseudo_event id="6" rsc_id="rsc1" operation="running" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" rsc_id="rsc1:child_rsc1:0" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="2" rsc_id="rsc1:child_rsc1:1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="3" rsc_id="rsc1:child_rsc1:2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
       <rsc_op id="1" rsc_id="rsc1:child_rsc1:0" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="0"/>
          </attributes>
       </rsc_op>
     </action_set>
      <inputs/>
   </synapse>
    <synapse id="2">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1:child_rsc1:1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="1"/>
          </attributes>
       </rsc_op>
     </action_set>
      <inputs/>
   </synapse>
    <synapse id="3">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1:child_rsc1:2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="2"/>
          </attributes>
       </rsc_op>
     </action_set>
      <inputs/>
   </synapse>
    <synapse id="4">
     <action_set>
       <rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="3"/>
          </attributes>
       </rsc_op>
     </action_set>
      <inputs/>
   </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/inc1.exp b/crm/pengine/testcases/inc1.exp
index fe8b8f4fb7..6cdeea136d 100644
--- a/crm/pengine/testcases/inc1.exp
+++ b/crm/pengine/testcases/inc1.exp
@@ -1,124 +1,122 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
        <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1" class="heartbeat" type="apache"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="6" rsc_id="rsc2" operation="start" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <pseudo_event id="7" rsc_id="rsc2" operation="running" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" rsc_id="rsc2:child_rsc2:0" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="3" rsc_id="rsc2:child_rsc2:1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="4" rsc_id="rsc2:child_rsc2:2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="5" rsc_id="rsc2:child_rsc2:3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="2" rsc_id="rsc2:child_rsc2:0" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="0"/>
          </attributes>
       </rsc_op>
     </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="6" rsc_id="rsc2" operation="start" allow_fail="false"/>
        </trigger>
      </inputs>
   </synapse>
    <synapse id="4">
     <action_set>
        <rsc_op id="3" rsc_id="rsc2:child_rsc2:1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc2:child_rsc2:1" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="1"/>
          </attributes>
       </rsc_op>
     </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="6" rsc_id="rsc2" operation="start" allow_fail="false"/>
        </trigger>
      </inputs>
   </synapse>
    <synapse id="5">
     <action_set>
        <rsc_op id="4" rsc_id="rsc2:child_rsc2:2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc2:2" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="2"/>
          </attributes>
       </rsc_op>
     </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="6" rsc_id="rsc2" operation="start" allow_fail="false"/>
        </trigger>
      </inputs>
   </synapse>
    <synapse id="6">
     <action_set>
        <rsc_op id="5" rsc_id="rsc2:child_rsc2:3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc2:child_rsc2:3" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="3"/>
          </attributes>
       </rsc_op>
     </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="6" rsc_id="rsc2" operation="start" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="8" rsc_id="rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc3" class="heartbeat" type="apache"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="7" rsc_id="rsc2" operation="running" allow_fail="false"/>
        </trigger>
      </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/inc2.exp b/crm/pengine/testcases/inc2.exp
index d6a55f54da..6380e972da 100644
--- a/crm/pengine/testcases/inc2.exp
+++ b/crm/pengine/testcases/inc2.exp
@@ -1,106 +1,104 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
        <pseudo_event id="11" rsc_id="rsc1" operation="running" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" rsc_id="rsc1:child_rsc1:1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="8" rsc_id="rsc1:child_rsc1:3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="13" rsc_id="rsc1" operation="stopped" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="7" rsc_id="rsc1:child_rsc1:3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="9" rsc_id="rsc1:child_rsc1:4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
 	 <attributes>
 	   <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="1"/>
          </attributes>
       </rsc_op>
     </action_set>
      <inputs/>
   </synapse>
    <synapse id="3">
     <action_set>
        <rsc_op id="4" rsc_id="rsc1:child_rsc1:1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
 	 <attributes>
 	   <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="1"/>
          </attributes>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="4">
     <action_set>
        <rsc_op id="7" rsc_id="rsc1:child_rsc1:3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
 	 <attributes>
 	   <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="3"/>
          </attributes>
       </rsc_op>
     </action_set>
      <inputs/>
   </synapse>
    <synapse id="5">
     <action_set>
        <rsc_op id="8" rsc_id="rsc1:child_rsc1:3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
 	 <attributes>
 	   <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="3"/>
          </attributes>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="7" rsc_id="rsc1:child_rsc1:3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="6">
     <action_set>
        <rsc_op id="9" rsc_id="rsc1:child_rsc1:4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc1:4" class="heartbeat" type="apache"/>
 	 <attributes>
 	   <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="4"/>
          </attributes>
       </rsc_op>
     </action_set>
      <inputs/>
   </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/inc3.exp b/crm/pengine/testcases/inc3.exp
index a9b15f1075..c57024def8 100644
--- a/crm/pengine/testcases/inc3.exp
+++ b/crm/pengine/testcases/inc3.exp
@@ -1,294 +1,287 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
        <pseudo_event id="10" rsc_id="rsc1" operation="start" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
          <pseudo_event id="12" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
        <pseudo_event id="11" rsc_id="rsc1" operation="running" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="4" rsc_id="rsc1:child_rsc1:1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="8" rsc_id="rsc1:child_rsc1:3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
        <pseudo_event id="12" rsc_id="rsc1" operation="stop" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
          <pseudo_event id="27" rsc_id="rsc2" operation="stopped" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
        <pseudo_event id="13" rsc_id="rsc1" operation="stopped" allow_fail="false">
-         <resource id="rsc1"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
        <trigger>
          <rsc_op id="7" rsc_id="rsc1:child_rsc1:3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="9" rsc_id="rsc1:child_rsc1:4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc1:1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="1"/>
          </attributes>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <pseudo_event id="12" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="7">
     <action_set>
        <rsc_op id="4" rsc_id="rsc1:child_rsc1:1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1:child_rsc1:1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="1"/>
          </attributes>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
          <pseudo_event id="10" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="7" rsc_id="rsc1:child_rsc1:3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc1:3" class="heartbeat" type="apache" priority="1.0"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="3"/>
          </attributes>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <pseudo_event id="12" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="11">
     <action_set>
        <rsc_op id="8" rsc_id="rsc1:child_rsc1:3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1:child_rsc1:3" class="heartbeat" type="apache" priority="1.0"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="3"/>
          </attributes>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="7" rsc_id="rsc1:child_rsc1:3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
          <pseudo_event id="10" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="12">
     <action_set>
        <rsc_op id="9" rsc_id="rsc1:child_rsc1:4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1:child_rsc1:4" class="heartbeat" type="apache" priority="1.0"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="4"/>
          </attributes>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <pseudo_event id="12" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="13">
     <action_set>
        <pseudo_event id="24" rsc_id="rsc2" operation="start" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
          <pseudo_event id="11" rsc_id="rsc1" operation="running" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="14">
     <action_set>
        <pseudo_event id="25" rsc_id="rsc2" operation="running" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="15" rsc_id="rsc2:child_rsc2:0" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="19" rsc_id="rsc2:child_rsc2:2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
          <rsc_op id="23" rsc_id="rsc2:child_rsc2:4" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="15">
     <action_set>
        <pseudo_event id="27" rsc_id="rsc2" operation="stopped" allow_fail="false">
-         <resource id="rsc2"/>
          <attributes/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="14" rsc_id="rsc2:child_rsc2:0" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
          <rsc_op id="18" rsc_id="rsc2:child_rsc2:2" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
          <rsc_op id="22" rsc_id="rsc2:child_rsc2:4" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="16">
     <action_set>
        <rsc_op id="14" rsc_id="rsc2:child_rsc2:0" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc2:0" class="heartbeat" type="apache" priority="1.0"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="0"/>
          </attributes>
       </rsc_op>
     </action_set>
      <inputs/>
   </synapse>
    <synapse id="17">
     <action_set>
        <rsc_op id="15" rsc_id="rsc2:child_rsc2:0" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc2:child_rsc2:0" class="heartbeat" type="apache" priority="1.0"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="0"/>
          </attributes>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="14" rsc_id="rsc2:child_rsc2:0" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
          <pseudo_event id="24" rsc_id="rsc2" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="19">
      <action_set>
        <rsc_op id="18" rsc_id="rsc2:child_rsc2:2" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc2:2" class="heartbeat" type="apache" priority="1.0"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="2"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="20">
     <action_set>
        <rsc_op id="19" rsc_id="rsc2:child_rsc2:2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc2:child_rsc2:2" class="heartbeat" type="apache" priority="1.0"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="2"/>
          </attributes>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="18" rsc_id="rsc2:child_rsc2:2" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
          <pseudo_event id="24" rsc_id="rsc2" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
    <synapse id="22">
      <action_set>
        <rsc_op id="22" rsc_id="rsc2:child_rsc2:4" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2:child_rsc2:4" class="heartbeat" type="apache" priority="1.0"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="4"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="23">
     <action_set>
        <rsc_op id="23" rsc_id="rsc2:child_rsc2:4" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc2:child_rsc2:4" class="heartbeat" type="apache" priority="1.0"/>
          <attributes>
            <nvpair name="incarnation_max" value="5"/>
            <nvpair name="incarnation" value="4"/>
          </attributes>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
          <rsc_op id="22" rsc_id="rsc2:child_rsc2:4" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
          <pseudo_event id="24" rsc_id="rsc2" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/rec-node-4.exp b/crm/pengine/testcases/rec-node-4.exp
index 11ce631e4c..df2a791c38 100644
--- a/crm/pengine/testcases/rec-node-4.exp
+++ b/crm/pengine/testcases/rec-node-4.exp
@@ -1,66 +1,64 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
-       <pseudo_event id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
-         <resource id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
+       <pseudo_event id="1" rsc_id="rsc1" operation="stop" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <crm_event id="5" operation="stonith" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <pseudo_event id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
+         <pseudo_event id="1" rsc_id="rsc1" operation="stop" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
-       <pseudo_event id="3" rsc_id="rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
-         <resource id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
+       <pseudo_event id="3" rsc_id="rsc2" operation="stop" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <crm_event id="5" operation="stonith" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="4" rsc_id="rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <pseudo_event id="3" rsc_id="rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
+         <pseudo_event id="3" rsc_id="rsc2" operation="stop" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <crm_event id="5" operation="stonith" allow_fail="false">
          <attributes>
            <nvpair name="on_node" value="node1"/>
            <nvpair name="on_node_uuid" value="uuid1"/>
          </attributes>
        </crm_event>
      </action_set>
      <inputs/>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/rec-node-6.exp b/crm/pengine/testcases/rec-node-6.exp
index 11ce631e4c..df2a791c38 100644
--- a/crm/pengine/testcases/rec-node-6.exp
+++ b/crm/pengine/testcases/rec-node-6.exp
@@ -1,66 +1,64 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
-       <pseudo_event id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
-         <resource id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
+       <pseudo_event id="1" rsc_id="rsc1" operation="stop" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <crm_event id="5" operation="stonith" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <pseudo_event id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
+         <pseudo_event id="1" rsc_id="rsc1" operation="stop" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
-       <pseudo_event id="3" rsc_id="rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
-         <resource id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
+       <pseudo_event id="3" rsc_id="rsc2" operation="stop" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <crm_event id="5" operation="stonith" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="4" rsc_id="rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <pseudo_event id="3" rsc_id="rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
+         <pseudo_event id="3" rsc_id="rsc2" operation="stop" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <crm_event id="5" operation="stonith" allow_fail="false">
          <attributes>
            <nvpair name="on_node" value="node1"/>
            <nvpair name="on_node_uuid" value="uuid1"/>
          </attributes>
        </crm_event>
      </action_set>
      <inputs/>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/rec-node-7.exp b/crm/pengine/testcases/rec-node-7.exp
index 11ce631e4c..df2a791c38 100644
--- a/crm/pengine/testcases/rec-node-7.exp
+++ b/crm/pengine/testcases/rec-node-7.exp
@@ -1,66 +1,64 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
-       <pseudo_event id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
-         <resource id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
+       <pseudo_event id="1" rsc_id="rsc1" operation="stop" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <crm_event id="5" operation="stonith" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <pseudo_event id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
+         <pseudo_event id="1" rsc_id="rsc1" operation="stop" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
-       <pseudo_event id="3" rsc_id="rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
-         <resource id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
+       <pseudo_event id="3" rsc_id="rsc2" operation="stop" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <crm_event id="5" operation="stonith" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="4" rsc_id="rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <pseudo_event id="3" rsc_id="rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
+         <pseudo_event id="3" rsc_id="rsc2" operation="stop" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <crm_event id="5" operation="stonith" allow_fail="false">
          <attributes>
            <nvpair name="on_node" value="node1"/>
            <nvpair name="on_node_uuid" value="uuid1"/>
          </attributes>
        </crm_event>
      </action_set>
      <inputs/>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/rec-rsc-5.exp b/crm/pengine/testcases/rec-rsc-5.exp
index c3f34c636b..37bf7bf661 100644
--- a/crm/pengine/testcases/rec-rsc-5.exp
+++ b/crm/pengine/testcases/rec-rsc-5.exp
@@ -1,66 +1,65 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
-       <pseudo_event id="1" rsc_id="rsc1" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
-         <resource id="rsc1" class="heartbeat" type="apache" on_stopfail="fence"/>
+       <pseudo_event id="1" rsc_id="rsc1" operation="stop" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <crm_event id="5" operation="stonith" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc1" class="heartbeat" type="apache" on_stopfail="fence"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <pseudo_event id="1" rsc_id="rsc1" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
+         <pseudo_event id="1" rsc_id="rsc1" operation="stop" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="3" rsc_id="rsc2" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <resource id="rsc2" class="heartbeat" type="apache" on_stopfail="fence"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="4" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <resource id="rsc2" class="heartbeat" type="apache" on_stopfail="fence"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="rsc2" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <crm_event id="5" operation="stonith" allow_fail="false">
          <attributes>
            <nvpair name="on_node" value="node2"/>
            <nvpair name="on_node_uuid" value="uuid2"/>
          </attributes>
        </crm_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="rsc2" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>