diff --git a/crm/pengine/testcases/quorum-5.exp b/crm/pengine/testcases/quorum-5.exp
index 66a0665c6e..9763b65f3f 100644
--- a/crm/pengine/testcases/quorum-5.exp
+++ b/crm/pengine/testcases/quorum-5.exp
@@ -1,127 +1,127 @@
  <transition_graph global_timeout="120s" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="9" operation="start" operation_key="group1_start_0">
          <attributes crm_feature_set="1.0.6"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="10" operation="running" operation_key="group1_running_0">
          <attributes crm_feature_set="1.0.6"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="7" operation="start" operation_key="child_DoFencing_2_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
        <trigger>
          <pseudo_event id="9" operation="start" operation_key="group1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="monitor" operation_key="child_DoFencing_1_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="child_DoFencing_1" long-id="group1:child_DoFencing_1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.6" hostlist="hadev1 hadev2 hadev3 " CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="5" operation="start" operation_key="child_DoFencing_1_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="child_DoFencing_1" long-id="group1:child_DoFencing_1" class="stonith" type="ssh"/>
-         <attributes crm_feature_set="1.0.6" hostlist="hadev1 hadev2 hadev3 "/>
+         <attributes crm_feature_set="1.0.6" hostlist="hadev1 hadev2 hadev3 " CRM_meta_id="0" CRM_meta_timeout="120000" CRM_meta_name="start" CRM_meta_prereq="nothing"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="9" operation="start" operation_key="group1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="6" operation="monitor" operation_key="child_DoFencing_1_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="child_DoFencing_1" long-id="group1:child_DoFencing_1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.6" hostlist="hadev1 hadev2 hadev3 " CRM_meta_id="1" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="5" operation="start" operation_key="child_DoFencing_1_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="child_DoFencing_2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="child_DoFencing_2" long-id="group1:child_DoFencing_2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.6" hostlist="hadev1 hadev2 hadev3 " CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="7" operation="start" operation_key="child_DoFencing_2_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="child_DoFencing_2" long-id="group1:child_DoFencing_2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.6" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="5" operation="start" operation_key="child_DoFencing_1_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="child_DoFencing_2_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="child_DoFencing_2" long-id="group1:child_DoFencing_2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.6" hostlist="hadev1 hadev2 hadev3 " CRM_meta_id="2" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="7" operation="start" operation_key="child_DoFencing_2_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.6"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <attributes crm_feature_set="1.0.6" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="monitor" operation_key="child_DoFencing_1_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_DoFencing_2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/quorum-5.xml b/crm/pengine/testcases/quorum-5.xml
index 573cb89c7e..1ef3111945 100644
--- a/crm/pengine/testcases/quorum-5.xml
+++ b/crm/pengine/testcases/quorum-5.xml
@@ -1,46 +1,47 @@
 <cib cib_feature_revision="1" have_quorum="false" epoch="262" generated="true" admin_epoch="0" num_peers="3"  cib-last-written="Thu Jul  7 04:56:20 2005" dc_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"  num_updates="8358" ccm_transition="3">
   <configuration>
       <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
         <nvpair id="transition_idle_timeout" name="transition_idle_timeout" value="120s"/>
         <nvpair id="symmetric_cluster" name="symetric_cluster" value="true"/>
         <nvpair id="suppress_cib_writes" name="suppress_cib_writes" value="false"/>
         <nvpair id="no_quorum_policy" name="no_quorum_policy" value="stop"/>
         <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       </attributes></cluster_property_set></crm_config>
       <nodes>
         <node id="6125a0df-456a-4395-829a-418e9a380d36" uname="hadev1" type="member"/>
         <node id="190b75b6-5585-42d9-8cde-eb6041843ae3" uname="hadev2" type="member"/>
         <node id="879e65f8-4b38-4c56-9552-4752ad436669" uname="hadev3" type="member"/>
       </nodes>
       <resources>
-	<group id="group1" start_prereq="nothing">
+	<group id="group1">
           <primitive id="child_DoFencing_1" class="stonith" type="ssh">
             <operations>
+	      <op id="0" name="start" prereq="nothing"/>
               <op id="1" name="monitor" interval="5s" timeout="20s"/>
             </operations>
             <instance_attributes>
               <attributes>
                 <nvpair id="1" name="hostlist" value="hadev1 hadev2 hadev3 "/>
               </attributes>
             </instance_attributes>
           </primitive>
           <primitive id="child_DoFencing_2" class="stonith" type="ssh">
             <operations>
               <op id="2" name="monitor" interval="5s" timeout="20s"/>
             </operations>
             <instance_attributes>
               <attributes>
                 <nvpair id="2" name="hostlist" value="hadev1 hadev2 hadev3 "/>
               </attributes>
             </instance_attributes>
           </primitive>
 	</group>
       </resources>
       <constraints>
       </constraints>
     </configuration>
   <status>
     <node_state id="190b75b6-5585-42d9-8cde-eb6041843ae3" uname="hadev2" in_ccm="true" join="member"  crmd="online" ha="active" expected="member">
     </node_state>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-node-2.dot b/crm/pengine/testcases/rec-node-2.dot
index 5b860f48e0..36788e8c4d 100644
--- a/crm/pengine/testcases/rec-node-2.dot
+++ b/crm/pengine/testcases/rec-node-2.dot
@@ -1,53 +1,53 @@
 digraph "g" {
 	size = "30,30"
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "group1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "group1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "group1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "group2_start_0" [ style=bold color="green" fontcolor="orange" ]
 "group2_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group2_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "group2_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "stonith node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "probe_complete" -> "rsc1_start_0 node2" [ style = bold]
 "probe_complete" -> "rsc2_start_0 node2" [ style = bold]
 "stonith node1" -> "rsc2_start_0 node2" [ style = bold]
 "group1_start_0" -> "rsc3_start_0 node2" [ style = bold]
 "rsc3_start_0 node2" -> "rsc4_start_0 node2" [ style = bold]
 "probe_complete" -> "group1_start_0" [ style = bold]
 "group1_stop_0" -> "group1_start_0" [ style = dashed]
 "group1_stopped_0" -> "group1_start_0" [ style = dashed]
 "rsc4_start_0 node2" -> "group1_running_0" [ style = bold]
 "group1_start_0" -> "group1_running_0" [ style = bold]
 "group1_stop_0" -> "group1_stopped_0" [ style = dashed]
 "group2_start_0" -> "rsc5_start_0 node2" [ style = bold]
+"stonith node1" -> "rsc5_start_0 node2" [ style = bold]
 "rsc5_start_0 node2" -> "rsc6_start_0 node2" [ style = bold]
 "probe_complete" -> "group2_start_0" [ style = bold]
 "group2_stop_0" -> "group2_start_0" [ style = dashed]
 "group2_stopped_0" -> "group2_start_0" [ style = dashed]
-"stonith node1" -> "group2_start_0" [ style = bold]
 "rsc6_start_0 node2" -> "group2_running_0" [ style = bold]
 "group2_start_0" -> "group2_running_0" [ style = bold]
 "group2_stop_0" -> "group2_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/rec-node-2.exp b/crm/pengine/testcases/rec-node-2.exp
index d1d6360a22..2f0b03571f 100644
--- a/crm/pengine/testcases/rec-node-2.exp
+++ b/crm/pengine/testcases/rec-node-2.exp
@@ -1,242 +1,242 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.6" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="9" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.6" CRM_meta_id="start-1" CRM_meta_timeout="60000" CRM_meta_name="start" CRM_meta_prereq="quorum"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc2" long-id="rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.6" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="10" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc2" long-id="rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.6" CRM_meta_id="start-2" CRM_meta_timeout="60000" CRM_meta_name="start" CRM_meta_prereq="fencing"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <crm_event id="23" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="13" operation="start" operation_key="group1_start_0">
-         <attributes crm_feature_set="1.0.6" CRM_meta_id="1" CRM_meta_timeout="60000" CRM_meta_name="start" CRM_meta_prereq="quorum"/>
+         <attributes crm_feature_set="1.0.6"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <pseudo_event id="14" operation="running" operation_key="group1_running_0">
          <attributes crm_feature_set="1.0.6"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="12" operation="start" operation_key="rsc4_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="13" operation="start" operation_key="group1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6" priority="1000000">
      <action_set>
        <rsc_op id="5" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc3" long-id="group1:rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.6" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="11" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc3" long-id="group1:rsc3" class="heartbeat" type="apache"/>
-         <attributes crm_feature_set="1.0.6"/>
+         <attributes crm_feature_set="1.0.6" CRM_meta_id="1" CRM_meta_timeout="60000" CRM_meta_name="start" CRM_meta_prereq="quorum"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="13" operation="start" operation_key="group1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8" priority="1000000">
      <action_set>
        <rsc_op id="6" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc4" long-id="group1:rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.6" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="12" operation="start" operation_key="rsc4_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc4" long-id="group1:rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.6"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="11" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <pseudo_event id="19" operation="start" operation_key="group2_start_0">
-         <attributes crm_feature_set="1.0.6" CRM_meta_id="2" CRM_meta_timeout="60000" CRM_meta_name="start" CRM_meta_prereq="fencing"/>
+         <attributes crm_feature_set="1.0.6"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
-       <trigger>
-         <crm_event id="23" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <pseudo_event id="20" operation="running" operation_key="group2_running_0">
          <attributes crm_feature_set="1.0.6"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="18" operation="start" operation_key="rsc6_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="19" operation="start" operation_key="group2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12" priority="1000000">
      <action_set>
        <rsc_op id="7" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc5" long-id="group2:rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.6" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="17" operation="start" operation_key="rsc5_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc5" long-id="group2:rsc5" class="heartbeat" type="apache"/>
-         <attributes crm_feature_set="1.0.6"/>
+         <attributes crm_feature_set="1.0.6" CRM_meta_id="2" CRM_meta_timeout="60000" CRM_meta_name="start" CRM_meta_prereq="fencing"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="19" operation="start" operation_key="group2_start_0"/>
        </trigger>
+       <trigger>
+         <crm_event id="23" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
      </inputs>
    </synapse>
    <synapse id="14" priority="1000000">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc6" long-id="group2:rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.6" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="18" operation="start" operation_key="rsc6_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc6" long-id="group2:rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.6"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="17" operation="start" operation_key="rsc5_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.6"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.6" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
        <crm_event id="23" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.6" CRM_meta_on_node="node1" CRM_meta_stonith_action="reboot" CRM_meta_on_node_uuid="uuid1"/>
        </crm_event>
      </action_set>
      <inputs/>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/rec-node-2.xml b/crm/pengine/testcases/rec-node-2.xml
index 252fe3d306..eb16055dc7 100644
--- a/crm/pengine/testcases/rec-node-2.xml
+++ b/crm/pengine/testcases/rec-node-2.xml
@@ -1,46 +1,48 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0" have_quorum="true">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="stop"/>
     </attributes></cluster_property_set></crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache">
 	<operations>
 	  <op id="stop-1" name="stop" on_fail="block"/>
 	  <op id="start-1" name="start" prereq="quorum"/>
 	</operations>
       </primitive>
       <primitive id="rsc2" class="heartbeat" type="apache">
 	<operations>
 	  <op id="stop-2" name="stop" on_fail="block"/>
 	  <op id="start-2" name="start" prereq="fencing"/>
 	</operations>
       </primitive>
       <group id="group1">
-	<operations>
-	  <op id="1" name="start" prereq="quorum"/>
-	</operations>
-	<primitive id="rsc3" class="heartbeat" type="apache"/>
+	<primitive id="rsc3" class="heartbeat" type="apache">
+	  <operations>
+	    <op id="1" name="start" prereq="quorum"/>
+	  </operations>
+	</primitive>
 	<primitive id="rsc4" class="heartbeat" type="apache"/>
       </group>
       <group id="group2">
-	<operations>
-	  <op id="2" name="start" prereq="fencing"/>
-	</operations>
-	<primitive id="rsc5" class="heartbeat" type="apache"/>
+	<primitive id="rsc5" class="heartbeat" type="apache">
+	  <operations>
+	    <op id="2" name="start" prereq="fencing"/>
+	  </operations>
+	</primitive>
 	<primitive id="rsc6" class="heartbeat" type="apache"/>
       </group>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" in_ccm="true"/>
   </status>
 </cib>