diff --git a/crm/pengine/regression.core.sh b/crm/pengine/regression.core.sh
index 16a1e81259..46ba295141 100755
--- a/crm/pengine/regression.core.sh
+++ b/crm/pengine/regression.core.sh
@@ -1,103 +1,111 @@
 #!/bin/bash
 
  # Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
  # 
  # This program is free software; you can redistribute it and/or
  # modify it under the terms of the GNU General Public
  # License as published by the Free Software Foundation; either
  # version 2.1 of the License, or (at your option) any later version.
  # 
  # This software is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  # General Public License for more details.
  # 
  # You should have received a copy of the GNU General Public
  # License along with this library; if not, write to the Free Software
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  #
 
 verbose=$1
 io_dir=testcases
 diff_opts="--ignore-all-space -U 1 -u"
 failed=.regression.failed
 # zero out the error log
 > $failed
 
 function do_test {
 
     base=$1;
     name=$2;
     input=$io_dir/${base}.xml
     output=$io_dir/${base}.out
     expected=$io_dir/${base}.exp
 
     if [ ! -f $input ]; then
 	echo "Test $name	($base)...	Error ($input)";
 	return;
     fi
 
     if [ "$create_mode" != "true" -a ! -f $expected ]; then
 	echo "Test $name	($base)...	Error ($expected)";
 #	return;
     fi
 
     ./ptest < $input 2>/dev/null 2>/dev/null > $output
 
+    if [ -s core ]; then
+	echo "Test $name	($base)...	Moved core to core.${base}";
+	rm -f core.$base
+	mv core core.$base
+	return;
+    fi
+
     if [ ! -s $output ]; then
 	echo "Test $name	($base)...	Error ($output)";
 	rm $output
 	return;
     fi
 
     ./fix_xml.pl $output
 
     if [ ! -s $output ]; then
 	echo "Test $name	($base)...	Error (fixed $output)";
 	rm $output
 	return;
     fi
 
-    if [ "$create_mode" = "true" -a ! -f $expected ]; then
+    if [ "$create_mode" = "true" ]; then
+#    if [ "$create_mode" = "true" -a ! -f $expected ]; then
 	cp "$output" "$expected"
     fi
 
     if [ -f $expected ]; then
 	diff $diff_opts -q $expected $output >/dev/null
 	rc=$?
     fi
 
     if [ "$create_mode" = "true" ]; then
 	echo "Test $name	($base)...	Created expected output" 
     elif [ ! -f $expected ]; then
 	echo "==== Raw results for test ($base) ====" >> $failed
 	cat $output 2>/dev/null >> $failed
     elif [ "$rc" = 0 ]; then
 	echo "Test $name	($base)...	Passed";
     elif [ "$rc" = 1 ]; then
 	echo "Test $name	($base)...	* Failed";
 	diff $diff_opts $expected $output 2>/dev/null >> $failed
     else 
 	echo "Test $name	($base)...	Error (diff: $rc)";
 	echo "==== Raw results for test ($base) ====" >> $failed
 	cat $output 2>/dev/null >> $failed
     fi
     
     rm $output
 }
 
 function test_results {
 
     if [ -s $failed ]; then
 	if [ "$verbose" = "-v" ]; then
 	    echo "Results of failed tests...."
 	    less $failed
 	else
 	    echo "Results of failed tests are in $failed...."
 	    echo "Use $0 -v to display them automatically."
 	fi
     else
 	rm $failed
     fi
 }
 
diff --git a/crm/pengine/regression.sh b/crm/pengine/regression.sh
index 8a316b0a0a..849dbbd386 100755
--- a/crm/pengine/regression.sh
+++ b/crm/pengine/regression.sh
@@ -1,99 +1,105 @@
 #!/bin/bash
 
  # Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
  # 
  # This program is free software; you can redistribute it and/or
  # modify it under the terms of the GNU General Public
  # License as published by the Free Software Foundation; either
  # version 2.1 of the License, or (at your option) any later version.
  # 
  # This software is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  # General Public License for more details.
  # 
  # You should have received a copy of the GNU General Public
  # License along with this library; if not, write to the Free Software
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  #
 
 . regression.core.sh
 
+create_mode="true"
+echo Generating test outputs for these tests...
+#do_test bad7 "Bad data"
+echo ""
+
+echo Done.
+echo ""
+echo Performing the following tests...
 create_mode="false"
 do_test simple1 "Offline	"
 do_test simple2 "Start	"
 do_test simple3 "Start 2	"
 do_test simple4 "Start Failed"
 do_test simple6 "Stop Start	"
 do_test simple7 "Shutdown	"
 #do_test simple8 "Stonith	"
 do_test simple9 "Lower version"
 do_test simple10 "Higher version"
 do_test simple11 "Priority (ne)"
 do_test simple12 "Priority (eq)"
 
 echo ""
 do_test rsc_dep1 "Must not	"
 #do_test rsc_dep2 "Should not	"
 do_test rsc_dep3 "Must	"
 #do_test rsc_dep4 "Should	"
 do_test rsc_dep5 "Must not 3	"
 #do_test rsc_dep6 "Should not 3"
 do_test rsc_dep7 "Must 3	"
 #do_test rsc_dep8 "Should 3	"
 do_test rsc_dep10 "Must (cant)"
 #do_test rsc_dep9 "2*MustNot 1*ShouldNot"
 
 echo ""
 do_test agent1 "version: lt (empty)"
 do_test agent2 "version: eq	"
 do_test agent3 "version: gt	"
 
 echo ""
 do_test attrs1 "string: eq (and)	"
 do_test attrs2 "string: lt / gt (and)"
 do_test attrs3 "string: ne (or)	"
 do_test attrs4 "string: exists	"
 do_test attrs5 "string: notexists	"
 
 echo ""
-do_test nodefail1 "Node Failed - Fence	"
-do_test nodefail2 "Node Failed - Block	"
-do_test nodefail3 "Node Failed - Ignore	"
+do_test nodefail1 "Node Fail - Fence	"
+do_test nodefail5 "Node Fail - Fence2Block"
+do_test nodefail4 "Node Fail - Block&Fence"
+do_test nodefail2 "Node Fail - Block	"
+do_test nodefail3 "Node Fail - Ignore	"
 
 echo ""
-do_test stopfail2 "Stop Failed - Block	"
-do_test stopfail3 "Stop Failed - Ignore (1 node)"
-do_test stopfail4 "Stop Failed - Ignore (2 node)"
-do_test stopfail1 "Stop Failed - STONITH (block)"
-do_test stopfail5 "Stop Failed - STONITH (pass)"
-do_test stopfail6 "Stop Failed - STONITH (pass2)"
-do_test stopfail7 "Stop Failed - STONITH (should fail)"
+do_test stopfail1 "Stop Fail - Disabled       "
+do_test stopfail9 "Stop Fail - Enabled, 1 node"
+do_test stopfail2 "Stop Fail - Enabled, 2 node"
+do_test stopfail3 "Stop Fail - Ignore (1 node)"
+do_test stopfail4 "Stop Fail - Ignore (2 node)"
+#do_test stopfail5 "Stop Fail - STONITH (pass2) "
+#do_test stopfail6 "Stop Fail - STONITH (pass3) "
+#do_test stopfail7 "Stop Fail - STONITH (should fail)"
 
 echo ""
 do_test rsc_location1 "Score (not running)	"
 do_test rsc_location2 "Score (running)		"
 do_test rsc_location3 "Score (not running/no swap)"
 do_test rsc_location4 "Score (running/swap)	"
 do_test rsc_location5 "Score (running/swap 2)	"
 
 echo ""
 do_test complex1 "Complex	"
 
 echo ""
-do_test bad1 "Bad node	"
-do_test bad2 "Bad rsc	"
-do_test bad3 "No rsc class"
-do_test bad4 "Bad data	"
-do_test bad5 "Bad data	"
-do_test bad6 "Bad lrm_rsc"
-do_test bad7 "No lrm	"
+do_test bad1 "Bad node		"
+do_test bad2 "Bad rsc		"
+do_test bad3 "No rsc class	"
+do_test bad4 "Bad data		"
+do_test bad5 "Bad data		"
+do_test bad6 "Bad lrm_rsc	"
+do_test bad7 "No lrm		"
 
-echo ""
-create_mode="true"
-echo Generating test outputs for these tests...
-#do_test bad7 "Bad data"
 echo ""
 
 test_results
-
diff --git a/crm/pengine/testcases/agent1.exp b/crm/pengine/testcases/agent1.exp
index 85cb39055f..1428dd50f4 100644
--- a/crm/pengine/testcases/agent1.exp
+++ b/crm/pengine/testcases/agent1.exp
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph/>
diff --git a/crm/pengine/testcases/agent2.exp b/crm/pengine/testcases/agent2.exp
index f1a66e0707..aaef3a731c 100644
--- a/crm/pengine/testcases/agent2.exp
+++ b/crm/pengine/testcases/agent2.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" version="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" version="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/agent3.exp b/crm/pengine/testcases/agent3.exp
index f1a66e0707..aaef3a731c 100644
--- a/crm/pengine/testcases/agent3.exp
+++ b/crm/pengine/testcases/agent3.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" version="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" version="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/attrs1.exp b/crm/pengine/testcases/attrs1.exp
index 5e8898081c..4a56c5a15f 100644
--- a/crm/pengine/testcases/attrs1.exp
+++ b/crm/pengine/testcases/attrs1.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="uuid2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="uuid2" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/attrs2.exp b/crm/pengine/testcases/attrs2.exp
index 5e8898081c..4a56c5a15f 100644
--- a/crm/pengine/testcases/attrs2.exp
+++ b/crm/pengine/testcases/attrs2.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="uuid2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="uuid2" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/attrs3.exp b/crm/pengine/testcases/attrs3.exp
index 3660365d35..839cd99fd3 100644
--- a/crm/pengine/testcases/attrs3.exp
+++ b/crm/pengine/testcases/attrs3.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="uuid1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="uuid1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/attrs4.exp b/crm/pengine/testcases/attrs4.exp
index 3660365d35..839cd99fd3 100644
--- a/crm/pengine/testcases/attrs4.exp
+++ b/crm/pengine/testcases/attrs4.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="uuid1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="uuid1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/attrs5.exp b/crm/pengine/testcases/attrs5.exp
index 85cb39055f..1428dd50f4 100644
--- a/crm/pengine/testcases/attrs5.exp
+++ b/crm/pengine/testcases/attrs5.exp
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph/>
diff --git a/crm/pengine/testcases/bad1.exp b/crm/pengine/testcases/bad1.exp
index bc39917bcb..c7c8e6e15b 100644
--- a/crm/pengine/testcases/bad1.exp
+++ b/crm/pengine/testcases/bad1.exp
@@ -1,16 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
-  <actions id="1">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/bad2.exp b/crm/pengine/testcases/bad2.exp
index 24e679bf59..e320c99e7d 100644
--- a/crm/pengine/testcases/bad2.exp
+++ b/crm/pengine/testcases/bad2.exp
@@ -1,16 +1,23 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
-  <actions id="1">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/bad3.exp b/crm/pengine/testcases/bad3.exp
index 372bb67887..91093abd10 100644
--- a/crm/pengine/testcases/bad3.exp
+++ b/crm/pengine/testcases/bad3.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/bad4.exp b/crm/pengine/testcases/bad4.exp
index 85cb39055f..1428dd50f4 100644
--- a/crm/pengine/testcases/bad4.exp
+++ b/crm/pengine/testcases/bad4.exp
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph/>
diff --git a/crm/pengine/testcases/bad5.exp b/crm/pengine/testcases/bad5.exp
index dc7a46fb49..f168f30a57 100644
--- a/crm/pengine/testcases/bad5.exp
+++ b/crm/pengine/testcases/bad5.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/bad6.exp b/crm/pengine/testcases/bad6.exp
index dc7a46fb49..f168f30a57 100644
--- a/crm/pengine/testcases/bad6.exp
+++ b/crm/pengine/testcases/bad6.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/bad7.exp b/crm/pengine/testcases/bad7.exp
index 85cb39055f..1428dd50f4 100644
--- a/crm/pengine/testcases/bad7.exp
+++ b/crm/pengine/testcases/bad7.exp
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph/>
diff --git a/crm/pengine/testcases/nodefail1.exp b/crm/pengine/testcases/nodefail1.exp
index cfcb21555d..69aa4f93d6 100644
--- a/crm/pengine/testcases/nodefail1.exp
+++ b/crm/pengine/testcases/nodefail1.exp
@@ -1,35 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <?xml version="1.0"?>
 <transition_graph>
   <synapse>
     <action_set>
-      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" runnable="true" optional="false" discard="false" allow_fail="true">
+      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" allow_fail="true" optional="false" runnable="true" discard="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse>
     <action_set>
-      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D79" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D79" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" rsc_id="__no_rsc__" on_node="__no_node__" on_node_uuid="__no_node_uuid__" operation="stonith" runnable="false" optional="false" discard="false" allow_fail="false">
-          <args target="node1"/>
-        </rsc_op>
+        <crm_event id="3" operation="stonith" allow_fail="false" optional="false" runnable="true"/>
       </trigger>
       <trigger>
-        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" runnable="true" optional="false" discard="false" allow_fail="true">
-          <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
-          <args/>
-        </rsc_op>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" allow_fail="true" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse>
+    <action_set>
+      <crm_event id="3" operation="stonith" allow_fail="false" optional="false" runnable="true" discard="false">
+        <args target="node1"/>
+      </crm_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" allow_fail="true" optional="false" runnable="true"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/nodefail2.exp b/crm/pengine/testcases/nodefail2.exp
index a82e706abd..b32af26038 100644
--- a/crm/pengine/testcases/nodefail2.exp
+++ b/crm/pengine/testcases/nodefail2.exp
@@ -1,14 +1,27 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <?xml version="1.0"?>
 <transition_graph>
   <synapse>
     <action_set>
-      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" runnable="true" optional="false" discard="false" allow_fail="true">
+      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" allow_fail="false" optional="false" runnable="true" discard="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="block"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D79" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="block"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" allow_fail="false" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/nodefail2.xml b/crm/pengine/testcases/nodefail2.xml
index 728e253c0b..28e612fd2e 100644
--- a/crm/pengine/testcases/nodefail2.xml
+++ b/crm/pengine/testcases/nodefail2.xml
@@ -1,43 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="8661583D-08B0-11D9-B627-000A95B71D78" uname="node1" type="member"/>
     <node id="8661583D-08B0-11D9-B627-000A95B71D79" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="block"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
   <crm_config>
-    <nv_pair id="failed_nodes" name="failed_nodes" value="stonith"/>
   </crm_config>
  </configuration>
  <status>
     <node_state id="8661583D-08B0-11D9-B627-000A95B71D78" uname="node1" crmd="offline" join="down" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
           <lrm_resource id="rsc1" last_op="stop" rsc_state="running" op_status="0" on_node="node1"/>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="8661583D-08B0-11D9-B627-000A95B71D79" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/nodefail3.exp b/crm/pengine/testcases/nodefail3.exp
index da4e92c5ff..4a5efec129 100644
--- a/crm/pengine/testcases/nodefail3.exp
+++ b/crm/pengine/testcases/nodefail3.exp
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <?xml version="1.0"?>
 <transition_graph>
   <synapse>
     <action_set>
-      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D79" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D79" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="ignore"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/nodefail3.xml b/crm/pengine/testcases/nodefail3.xml
index 004303602b..c19d7efffa 100644
--- a/crm/pengine/testcases/nodefail3.xml
+++ b/crm/pengine/testcases/nodefail3.xml
@@ -1,43 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="8661583D-08B0-11D9-B627-000A95B71D78" uname="node1" type="member"/>
     <node id="8661583D-08B0-11D9-B627-000A95B71D79" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="ignore"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
   <crm_config>
-    <nv_pair id="failed_nodes" name="failed_nodes" value="stonith"/>
   </crm_config>
  </configuration>
  <status>
     <node_state id="8661583D-08B0-11D9-B627-000A95B71D78" uname="node1" crmd="offline" join="down" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
           <lrm_resource id="rsc1" last_op="stop" rsc_state="running" op_status="0" on_node="node1"/>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="8661583D-08B0-11D9-B627-000A95B71D79" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/nodefail4.exp b/crm/pengine/testcases/nodefail4.exp
new file mode 100644
index 0000000000..9b1c4ade80
--- /dev/null
+++ b/crm/pengine/testcases/nodefail4.exp
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
+<transition_graph>
+  <synapse>
+    <action_set>
+      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" allow_fail="true" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="block"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D79" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="block"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" allow_fail="true" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse>
+    <action_set>
+      <crm_event id="3" operation="stonith" allow_fail="false" optional="false" runnable="true" discard="false">
+        <args target="node1"/>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
+</transition_graph>
diff --git a/crm/pengine/testcases/nodefail2.xml b/crm/pengine/testcases/nodefail4.xml
similarity index 100%
copy from crm/pengine/testcases/nodefail2.xml
copy to crm/pengine/testcases/nodefail4.xml
diff --git a/crm/pengine/testcases/nodefail5.exp b/crm/pengine/testcases/nodefail5.exp
new file mode 100644
index 0000000000..558691e0ca
--- /dev/null
+++ b/crm/pengine/testcases/nodefail5.exp
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
+<transition_graph>
+  <synapse>
+    <action_set>
+      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D79" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" allow_fail="false" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
+</transition_graph>
diff --git a/crm/pengine/testcases/nodefail2.xml b/crm/pengine/testcases/nodefail5.xml
similarity index 91%
copy from crm/pengine/testcases/nodefail2.xml
copy to crm/pengine/testcases/nodefail5.xml
index 728e253c0b..c0aeae0596 100644
--- a/crm/pengine/testcases/nodefail2.xml
+++ b/crm/pengine/testcases/nodefail5.xml
@@ -1,43 +1,41 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="8661583D-08B0-11D9-B627-000A95B71D78" uname="node1" type="member"/>
     <node id="8661583D-08B0-11D9-B627-000A95B71D79" uname="node2" type="member"/>
   </nodes>
   <resources>
-     <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="block"/>
+     <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
-  <crm_config>
-    <nv_pair id="failed_nodes" name="failed_nodes" value="stonith"/>
-  </crm_config>
+  <crm_config/>
  </configuration>
  <status>
     <node_state id="8661583D-08B0-11D9-B627-000A95B71D78" uname="node1" crmd="offline" join="down" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
           <lrm_resource id="rsc1" last_op="stop" rsc_state="running" op_status="0" on_node="node1"/>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="8661583D-08B0-11D9-B627-000A95B71D79" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_dep1.exp b/crm/pengine/testcases/rsc_dep1.exp
new file mode 100644
index 0000000000..508dbb0a83
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep1.exp
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
+<transition_graph>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+</transition_graph>
diff --git a/crm/pengine/testcases/rsc_location2.xml b/crm/pengine/testcases/rsc_dep1.xml
similarity index 81%
copy from crm/pengine/testcases/rsc_location2.xml
copy to crm/pengine/testcases/rsc_dep1.xml
index 64274d1de3..ea2a6f205e 100644
--- a/crm/pengine/testcases/rsc_location2.xml
+++ b/crm/pengine/testcases/rsc_dep1.xml
@@ -1,46 +1,45 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- must not -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
   </resources>
   <constraints>
+      <rsc_dependancy id="not_same_1" from="rsc1" to="rsc2" type="must_not"/>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
-	<rule id="score1" score="10">
-	  <expression id="exp1" attribute="rsc1" operation="running"/>
-	</rule>
+	<!--rule id="cannot1" result="cannot">
+	  <expression id="exp1" attribute="rsc2" operation="running"/>
+	</rule-->
       </rsc_location>
       <rsc_location id="run_rsc2" rsc="rsc2">
 	<rule id="can2" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
-        <lrm_resources>
-          <lrm_resource id="rsc2" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node2"/>
-        </lrm_resources>
+        <lrm_resources/>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/attrs5.exp b/crm/pengine/testcases/rsc_dep10.exp
similarity index 80%
copy from crm/pengine/testcases/attrs5.exp
copy to crm/pengine/testcases/rsc_dep10.exp
index 85cb39055f..1428dd50f4 100644
--- a/crm/pengine/testcases/attrs5.exp
+++ b/crm/pengine/testcases/rsc_dep10.exp
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph/>
diff --git a/crm/pengine/testcases/rsc_location2.xml b/crm/pengine/testcases/rsc_dep10.xml
similarity index 66%
copy from crm/pengine/testcases/rsc_location2.xml
copy to crm/pengine/testcases/rsc_dep10.xml
index 64274d1de3..d3880d65b9 100644
--- a/crm/pengine/testcases/rsc_location2.xml
+++ b/crm/pengine/testcases/rsc_dep10.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
-<!-- must not -->
+<!-- must but cant -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
-     <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-     <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+     <resource id="rsc1" class="heartbeat" type="apache"/>
+     <resource id="rsc2" class="heartbeat" type="apache"/>
   </resources>
   <constraints>
+      <rsc_dependancy id="same_1" from="rsc1" to="rsc2" type="must"/>
       <rsc_location id="run_rsc1" rsc="rsc1">
-	<rule id="can1" result="can"/>
-	<rule id="score1" score="10">
-	  <expression id="exp1" attribute="rsc1" operation="running"/>
+	<rule id="can2" result="can">
+	  <expression attribute="uname" operation="eq" value="node2"/>
 	</rule>
       </rsc_location>
       <rsc_location id="run_rsc2" rsc="rsc2">
-	<rule id="can2" result="can"/>
+	<rule id="can3" result="can">
+	  <expression attribute="uname" operation="eq" value="node1"/>
+	</rule>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
-        <lrm_resources>
-          <lrm_resource id="rsc2" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node2"/>
-        </lrm_resources>
+        <lrm_resources/>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_dep3.exp b/crm/pengine/testcases/rsc_dep3.exp
new file mode 100644
index 0000000000..e320c99e7d
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep3.exp
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
+<transition_graph>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+</transition_graph>
diff --git a/crm/pengine/testcases/rsc_location2.xml b/crm/pengine/testcases/rsc_dep3.xml
similarity index 80%
copy from crm/pengine/testcases/rsc_location2.xml
copy to crm/pengine/testcases/rsc_dep3.xml
index 64274d1de3..b4d6aeb0a3 100644
--- a/crm/pengine/testcases/rsc_location2.xml
+++ b/crm/pengine/testcases/rsc_dep3.xml
@@ -1,46 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
-<!-- must not -->
+<!-- must -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
   </resources>
   <constraints>
+      <rsc_dependancy id="same_1" from="rsc1" to="rsc2" type="must"/>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
-	<rule id="score1" score="10">
-	  <expression id="exp1" attribute="rsc1" operation="running"/>
-	</rule>
       </rsc_location>
       <rsc_location id="run_rsc2" rsc="rsc2">
 	<rule id="can2" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
-        <lrm_resources>
-          <lrm_resource id="rsc2" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node2"/>
-        </lrm_resources>
+        <lrm_resources/>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_dep5.exp b/crm/pengine/testcases/rsc_dep5.exp
new file mode 100644
index 0000000000..089659dff3
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep5.exp
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
+<transition_graph>
+  <synapse>
+    <action_set>
+      <rsc_op id="4" rsc_id="rsc2" on_node="node2" on_node_uuid="node2" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="6" rsc_id="rsc3" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc3" class="heartbeat" type="apache" priority="3.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+</transition_graph>
diff --git a/crm/pengine/testcases/rsc_location2.xml b/crm/pengine/testcases/rsc_dep5.xml
similarity index 73%
copy from crm/pengine/testcases/rsc_location2.xml
copy to crm/pengine/testcases/rsc_dep5.xml
index 64274d1de3..1c406aa7c3 100644
--- a/crm/pengine/testcases/rsc_location2.xml
+++ b/crm/pengine/testcases/rsc_dep5.xml
@@ -1,46 +1,48 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- must not -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+     <resource id="rsc3" class="heartbeat" type="apache" priority="3.0"/>
   </resources>
   <constraints>
+      <rsc_dependancy id="not_same_1" from="rsc1" to="rsc2" type="must_not"/>
+      <rsc_dependancy id="not_same_2" from="rsc1" to="rsc3" type="must_not"/>
+      <rsc_dependancy id="not_same_3" from="rsc3" to="rsc2" type="must_not"/>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
-	<rule id="score1" score="10">
-	  <expression id="exp1" attribute="rsc1" operation="running"/>
-	</rule>
       </rsc_location>
       <rsc_location id="run_rsc2" rsc="rsc2">
 	<rule id="can2" result="can"/>
       </rsc_location>
+      <rsc_location id="run_rsc3" rsc="rsc3">
+	<rule id="can3" result="can"/>
+      </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
-        <lrm_resources>
-          <lrm_resource id="rsc2" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node2"/>
-        </lrm_resources>
+        <lrm_resources/>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_dep7.exp b/crm/pengine/testcases/rsc_dep7.exp
new file mode 100644
index 0000000000..f71467cc6c
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep7.exp
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
+<transition_graph>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="6" rsc_id="rsc3" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc3" class="heartbeat" type="apache" priority="3.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+</transition_graph>
diff --git a/crm/pengine/testcases/rsc_location2.xml b/crm/pengine/testcases/rsc_dep7.xml
similarity index 72%
copy from crm/pengine/testcases/rsc_location2.xml
copy to crm/pengine/testcases/rsc_dep7.xml
index 64274d1de3..2b4c070a2b 100644
--- a/crm/pengine/testcases/rsc_location2.xml
+++ b/crm/pengine/testcases/rsc_dep7.xml
@@ -1,46 +1,48 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
-<!-- must not -->
+<!-- must -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+     <resource id="rsc3" class="heartbeat" type="apache" priority="3.0"/>
   </resources>
   <constraints>
+      <rsc_dependancy id="not_same_1" from="rsc1" to="rsc2" type="must"/>
+      <rsc_dependancy id="not_same_2" from="rsc1" to="rsc3" type="must"/>
+      <rsc_dependancy id="not_same_3" from="rsc3" to="rsc2" type="must"/>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
-	<rule id="score1" score="10">
-	  <expression id="exp1" attribute="rsc1" operation="running"/>
-	</rule>
       </rsc_location>
       <rsc_location id="run_rsc2" rsc="rsc2">
 	<rule id="can2" result="can"/>
       </rsc_location>
+      <rsc_location id="run_rsc3" rsc="rsc3">
+	<rule id="can3" result="can"/>
+      </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
-        <lrm_resources>
-          <lrm_resource id="rsc2" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node2"/>
-        </lrm_resources>
+        <lrm_resources/>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_location1.exp b/crm/pengine/testcases/rsc_location1.exp
index 24e679bf59..e320c99e7d 100644
--- a/crm/pengine/testcases/rsc_location1.exp
+++ b/crm/pengine/testcases/rsc_location1.exp
@@ -1,16 +1,23 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
-  <actions id="1">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_location2.exp b/crm/pengine/testcases/rsc_location2.exp
index b4d2c252b7..a5263bb24f 100644
--- a/crm/pengine/testcases/rsc_location2.exp
+++ b/crm/pengine/testcases/rsc_location2.exp
@@ -1,20 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
-  <actions id="1">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="stop" runnable="true" optional="true" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_location2.xml b/crm/pengine/testcases/rsc_location2.xml
index 64274d1de3..bafde5be1d 100644
--- a/crm/pengine/testcases/rsc_location2.xml
+++ b/crm/pengine/testcases/rsc_location2.xml
@@ -1,46 +1,49 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- must not -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
 	<rule id="score1" score="10">
-	  <expression id="exp1" attribute="rsc1" operation="running"/>
+	  <expression id="exp1" attribute="rsc2" operation="running"/>
 	</rule>
       </rsc_location>
       <rsc_location id="run_rsc2" rsc="rsc2">
 	<rule id="can2" result="can"/>
+	<rule id="score1" score="10">
+	  <expression id="exp1" attribute="rsc2" operation="running"/>
+	</rule>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
           <lrm_resource id="rsc2" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node2"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_location3.exp b/crm/pengine/testcases/rsc_location3.exp
index aa75f410d1..c7c8e6e15b 100644
--- a/crm/pengine/testcases/rsc_location3.exp
+++ b/crm/pengine/testcases/rsc_location3.exp
@@ -1,18 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="stop" runnable="true" optional="true" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
-      <args/>
-    </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_location4.exp b/crm/pengine/testcases/rsc_location4.exp
index 0dffe0b7ab..14109d9fb3 100644
--- a/crm/pengine/testcases/rsc_location4.exp
+++ b/crm/pengine/testcases/rsc_location4.exp
@@ -1,18 +1,36 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-    <rsc_op id="4" rsc_id="rsc2" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
-      <args/>
-    </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="1" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="stop" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="stop" allow_fail="false" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="4" rsc_id="rsc2" on_node="node2" on_node_uuid="node2" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_location5.exp b/crm/pengine/testcases/rsc_location5.exp
index 3f4fc1194e..94e8c01543 100644
--- a/crm/pengine/testcases/rsc_location5.exp
+++ b/crm/pengine/testcases/rsc_location5.exp
@@ -1,14 +1,27 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="false" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple1.exp b/crm/pengine/testcases/simple1.exp
index 85cb39055f..1428dd50f4 100644
--- a/crm/pengine/testcases/simple1.exp
+++ b/crm/pengine/testcases/simple1.exp
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph/>
diff --git a/crm/pengine/testcases/simple10.exp b/crm/pengine/testcases/simple10.exp
index 85cb39055f..1428dd50f4 100644
--- a/crm/pengine/testcases/simple10.exp
+++ b/crm/pengine/testcases/simple10.exp
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph/>
diff --git a/crm/pengine/testcases/simple11.exp b/crm/pengine/testcases/simple11.exp
index 1c4376ffd3..dfe120a457 100644
--- a/crm/pengine/testcases/simple11.exp
+++ b/crm/pengine/testcases/simple11.exp
@@ -1,16 +1,23 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="3.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
-  <actions id="1">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="3.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple12.exp b/crm/pengine/testcases/simple12.exp
index a861993314..e4e2f17f54 100644
--- a/crm/pengine/testcases/simple12.exp
+++ b/crm/pengine/testcases/simple12.exp
@@ -1,16 +1,23 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
-  <actions id="1">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="2.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple2.exp b/crm/pengine/testcases/simple2.exp
index 3660365d35..839cd99fd3 100644
--- a/crm/pengine/testcases/simple2.exp
+++ b/crm/pengine/testcases/simple2.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="uuid1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="uuid1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple3.exp b/crm/pengine/testcases/simple3.exp
index dc7a46fb49..f168f30a57 100644
--- a/crm/pengine/testcases/simple3.exp
+++ b/crm/pengine/testcases/simple3.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple4.exp b/crm/pengine/testcases/simple4.exp
index 85cb39055f..1428dd50f4 100644
--- a/crm/pengine/testcases/simple4.exp
+++ b/crm/pengine/testcases/simple4.exp
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph/>
diff --git a/crm/pengine/testcases/simple6.exp b/crm/pengine/testcases/simple6.exp
index 13114ecfa4..7789945ae8 100644
--- a/crm/pengine/testcases/simple6.exp
+++ b/crm/pengine/testcases/simple6.exp
@@ -1,14 +1,23 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple7.exp b/crm/pengine/testcases/simple7.exp
index 5cba597bdb..3e2288d221 100644
--- a/crm/pengine/testcases/simple7.exp
+++ b/crm/pengine/testcases/simple7.exp
@@ -1,13 +1,26 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-      <args/>
-    </rsc_op>
-    <crm_event id="3" on_node="node1" on_node_uuid="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="false">
-      <args/>
-    </crm_event>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <crm_event id="3" on_node="node1" on_node_uuid="node1" operation="shutdown_crm" allow_fail="false" optional="false" runnable="true" discard="false">
+        <args/>
+      </crm_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="false" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple9.exp b/crm/pengine/testcases/simple9.exp
index 89fd3580c0..d74a24fa36 100644
--- a/crm/pengine/testcases/simple9.exp
+++ b/crm/pengine/testcases/simple9.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" version="2.0"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" version="2.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/stopfail1.exp b/crm/pengine/testcases/stopfail1.exp
index 13e11d9295..f244e1425b 100644
--- a/crm/pengine/testcases/stopfail1.exp
+++ b/crm/pengine/testcases/stopfail1.exp
@@ -1,20 +1,39 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" runnable="true" optional="true" discard="false" allow_fail="true">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
-      <args/>
-    </rsc_op>
-    <crm_event id="3" on_node="node1" on_node_uuid="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="true">
-      <args/>
-    </crm_event>
-    <rsc_op id="4" rsc_id="__no_rsc__" on_node="__no_node__" on_node_uuid="__no_node_uuid__" operation="stonith" runnable="true" optional="false" discard="false" allow_fail="false">
-      <args target="node1"/>
-    </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="false" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse>
+    <action_set>
+      <crm_event id="3" on_node="node1" on_node_uuid="node1" operation="shutdown_crm" allow_fail="false" optional="false" runnable="true" discard="false">
+        <args/>
+      </crm_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="false" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/stopfail1.xml b/crm/pengine/testcases/stopfail1.xml
index 8db86459f8..1b7dc4e883 100644
--- a/crm/pengine/testcases/stopfail1.xml
+++ b/crm/pengine/testcases/stopfail1.xml
@@ -1,34 +1,43 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
+    <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" 
 	       on_stopfail="stonith"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
   <crm_config>
-    <nv_pair id="failed_nodes" name="failed_nodes" value="stonith"/>
   </crm_config>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
           <lrm_resource id="rsc1" last_op="stop" rsc_state="failed" op_status="4" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
+    <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
+      <lrm>
+	<lrm_agents>
+	  <lrm_agent class="heartbeat" type="apache"/>
+	</lrm_agents>
+        <lrm_resources>
+        </lrm_resources>
+      </lrm>
+    </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/stopfail2.exp b/crm/pengine/testcases/stopfail2.exp
index 85cb39055f..46c4a0a0f5 100644
--- a/crm/pengine/testcases/stopfail2.exp
+++ b/crm/pengine/testcases/stopfail2.exp
@@ -1,3 +1,27 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<transition_graph/>
+<?xml version="1.0"?>
+<transition_graph>
+  <synapse>
+    <action_set>
+      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="block"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="block"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="false" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
+</transition_graph>
diff --git a/crm/pengine/testcases/stopfail2.xml b/crm/pengine/testcases/stopfail2.xml
index eae0aa23dd..3f25f99742 100644
--- a/crm/pengine/testcases/stopfail2.xml
+++ b/crm/pengine/testcases/stopfail2.xml
@@ -1,31 +1,41 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
+    <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" 
 	       on_stopfail="block"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
           <lrm_resource id="rsc1" last_op="stop" rsc_state="failed" op_status="4" on_node="node1"/>
         </lrm_resources>
       </lrm>
     </node_state>
+   <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
+      <lrm>
+	<lrm_agents>
+	  <lrm_agent class="heartbeat" type="apache"/>
+	</lrm_agents>
+        <lrm_resources>
+        </lrm_resources>
+      </lrm>
+    </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/stopfail3.exp b/crm/pengine/testcases/stopfail3.exp
index 85cb39055f..8b627b1ab8 100644
--- a/crm/pengine/testcases/stopfail3.exp
+++ b/crm/pengine/testcases/stopfail3.exp
@@ -1,3 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<transition_graph/>
+<?xml version="1.0"?>
+<transition_graph>
+  <synapse>
+    <action_set>
+      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+</transition_graph>
diff --git a/crm/pengine/testcases/stopfail4.exp b/crm/pengine/testcases/stopfail4.exp
index 2e09ecd310..a8b9924b9a 100644
--- a/crm/pengine/testcases/stopfail4.exp
+++ b/crm/pengine/testcases/stopfail4.exp
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
 <transition_graph>
-  <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="ignore"/>
-      <args/>
-    </rsc_op>
-  </actions>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="ignore"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/stopfail8.exp b/crm/pengine/testcases/stopfail8.exp
new file mode 100644
index 0000000000..5c0098d054
--- /dev/null
+++ b/crm/pengine/testcases/stopfail8.exp
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
+<?xml version="1.0"?>
+<transition_graph>
+  <synapse>
+    <action_set>
+      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="true" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse>
+    <action_set>
+      <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" allow_fail="false" optional="false" runnable="true" discard="false">
+        <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
+        <args/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="4" operation="stonith" allow_fail="false" optional="false" runnable="true"/>
+      </trigger>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="true" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse>
+    <action_set>
+      <crm_event id="3" on_node="node1" on_node_uuid="node1" operation="shutdown_crm" allow_fail="true" optional="false" runnable="true" discard="false">
+        <args/>
+      </crm_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="true" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse>
+    <action_set>
+      <crm_event id="4" operation="stonith" allow_fail="false" optional="false" runnable="true" discard="false">
+        <args target="node1"/>
+      </crm_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="3" on_node="node1" on_node_uuid="node1" operation="shutdown_crm" allow_fail="true" optional="false" runnable="true"/>
+      </trigger>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="true" optional="false" runnable="true"/>
+      </trigger>
+    </inputs>
+  </synapse>
+</transition_graph>
diff --git a/crm/pengine/testcases/stopfail1.xml b/crm/pengine/testcases/stopfail8.xml
similarity index 74%
copy from crm/pengine/testcases/stopfail1.xml
copy to crm/pengine/testcases/stopfail8.xml
index 8db86459f8..f9f2c64b1f 100644
--- a/crm/pengine/testcases/stopfail1.xml
+++ b/crm/pengine/testcases/stopfail8.xml
@@ -1,34 +1,44 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
+    <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" 
 	       on_stopfail="stonith"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
   <crm_config>
     <nv_pair id="failed_nodes" name="failed_nodes" value="stonith"/>
   </crm_config>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
           <lrm_resource id="rsc1" last_op="stop" rsc_state="failed" op_status="4" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
+    <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
+      <lrm>
+	<lrm_agents>
+	  <lrm_agent class="heartbeat" type="apache"/>
+	</lrm_agents>
+        <lrm_resources>
+        </lrm_resources>
+      </lrm>
+    </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/nodefail2.exp b/crm/pengine/testcases/stopfail9.exp
similarity index 76%
copy from crm/pengine/testcases/nodefail2.exp
copy to crm/pengine/testcases/stopfail9.exp
index a82e706abd..8caa007934 100644
--- a/crm/pengine/testcases/nodefail2.exp
+++ b/crm/pengine/testcases/stopfail9.exp
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <?xml version="1.0"?>
 <transition_graph>
   <synapse>
     <action_set>
-      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" operation="stop" runnable="true" optional="false" discard="false" allow_fail="true">
+      <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" allow_fail="false" optional="false" runnable="true" discard="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="block"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/stopfail2.xml b/crm/pengine/testcases/stopfail9.xml
similarity index 100%
copy from crm/pengine/testcases/stopfail2.xml
copy to crm/pengine/testcases/stopfail9.xml