diff --git a/crm/pengine/regression.core.sh b/crm/pengine/regression.core.sh
index 46ba295141..cc9c1a65b4 100755
--- a/crm/pengine/regression.core.sh
+++ b/crm/pengine/regression.core.sh
@@ -1,111 +1,140 @@
 #!/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
+    output=$io_dir/${base}.pe.out
+    te_output=$io_dir/${base}.te.out
     expected=$io_dir/${base}.exp
+    te_expected=$io_dir/${base}.te.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" ]; then
-#    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" 
+	echo "Test $name	($base)...	Created expected output (PE)" 
     elif [ ! -f $expected ]; then
-	echo "==== Raw results for test ($base) ====" >> $failed
+	echo "==== Raw results for PE test ($base) ====" >> $failed
 	cat $output 2>/dev/null >> $failed
     elif [ "$rc" = 0 ]; then
-	echo "Test $name	($base)...	Passed";
+	echo "Test $name	($base)...	Passed (PE)";
     elif [ "$rc" = 1 ]; then
-	echo "Test $name	($base)...	* Failed";
+	echo "Test $name	($base)...	* Failed (PE)";
 	diff $diff_opts $expected $output 2>/dev/null >> $failed
     else 
-	echo "Test $name	($base)...	Error (diff: $rc)";
+	echo "Test $name	($base)...	Error PE (diff: $rc)";
 	echo "==== Raw results for test ($base) ====" >> $failed
 	cat $output 2>/dev/null >> $failed
     fi
+
+    ../tengine/ttest -X $expected 2> $te_output
+
+#    if [ "$create_mode" = "true" ]; then
+    if [ "$create_mode" = "true" -a ! -f $te_expected ]; then
+	cp "$te_output" "$te_expected"
+    fi
+	cp "$te_output" "$te_expected"
+
+    if [ -f $te_expected ]; then
+	diff $diff_opts -q $te_expected $te_output >/dev/null
+	rc=$?
+    fi
+
+    if [ "$create_mode" = "true" ]; then
+	echo "Test $name	($base)...	Created expected output (PE)" 
+    elif [ ! -f $te_expected ]; then
+	echo "==== Raw results for TE test ($base) ====" >> $failed
+	cat $te_output 2>/dev/null >> $failed
+    elif [ "$rc" = 0 ]; then
+	echo "Test $name	($base)...	Passed (TE)";
+    elif [ "$rc" = 1 ]; then
+	echo "Test $name	($base)...	* Failed (TE)";
+	diff $diff_opts $te_expected $te_output 2>/dev/null >> $failed
+    else 
+	echo "Test $name	($base)...	Error TE (diff: $rc)";
+	echo "==== Raw results for test ($base) TE ====" >> $failed
+	cat $te_output 2>/dev/null >> $failed
+    fi
     
-    rm $output
+    rm $output $te_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 9b0c5835b8..179d3cd087 100755
--- a/crm/pengine/regression.sh
+++ b/crm/pengine/regression.sh
@@ -1,129 +1,128 @@
 #!/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
-do_test inc3
 
 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 order1 "Order start 1"
 do_test order2 "Order start 2"
 do_test order3 "Order stop	"
 do_test order4 "Order (multiple)"
 
 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 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 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 multi1 "Multiple Active (stop/start)"
 
 #echo ""
 #do_test complex1 "Complex	"
 
 echo ""
 do_test group1 "Group		"
 do_test group2 "Group + Native	"
 do_test group3 "Group + Group	"
 do_test group4 "Group + Native (nothing)"
 do_test group5 "Group + Native (move)"
 do_test group6 "Group + Group (move)"
 
 echo ""
 do_test inc1 "Incarnation start					" 
 do_test inc2 "Incarnation silent restart, stop, move		"
 do_test inc3 "Inter-incarnation ordering, silent restart, stop, move"
 
 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		"
 
 echo ""
 
 test_results
diff --git a/crm/pengine/testcases/agent1.exp b/crm/pengine/testcases/agent1.exp
index f856017a7f..c230eb6374 100644
--- a/crm/pengine/testcases/agent1.exp
+++ b/crm/pengine/testcases/agent1.exp
@@ -1,4 +1,3 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000"/>
+
diff --git a/crm/pengine/testcases/agent1.te.exp b/crm/pengine/testcases/agent1.te.exp
new file mode 100644
index 0000000000..74d64dc013
--- /dev/null
+++ b/crm/pengine/testcases/agent1.te.exp
@@ -0,0 +1,6 @@
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
diff --git a/crm/pengine/testcases/agent2.exp b/crm/pengine/testcases/agent2.exp
index 235debca7d..048c9fe9be 100644
--- a/crm/pengine/testcases/agent2.exp
+++ b/crm/pengine/testcases/agent2.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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/agent2.te.exp b/crm/pengine/testcases/agent2.te.exp
new file mode 100644
index 0000000000..367f087ab5
--- /dev/null
+++ b/crm/pengine/testcases/agent2.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/agent3.exp b/crm/pengine/testcases/agent3.exp
index 235debca7d..048c9fe9be 100644
--- a/crm/pengine/testcases/agent3.exp
+++ b/crm/pengine/testcases/agent3.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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.te.exp b/crm/pengine/testcases/agent3.te.exp
new file mode 100644
index 0000000000..367f087ab5
--- /dev/null
+++ b/crm/pengine/testcases/agent3.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/attrs1.exp b/crm/pengine/testcases/attrs1.exp
index 6a5b112651..65153986dd 100644
--- a/crm/pengine/testcases/attrs1.exp
+++ b/crm/pengine/testcases/attrs1.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="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/attrs1.te.exp b/crm/pengine/testcases/attrs1.te.exp
new file mode 100644
index 0000000000..bcbcefa934
--- /dev/null
+++ b/crm/pengine/testcases/attrs1.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/attrs2.exp b/crm/pengine/testcases/attrs2.exp
index 6a5b112651..65153986dd 100644
--- a/crm/pengine/testcases/attrs2.exp
+++ b/crm/pengine/testcases/attrs2.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="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.te.exp b/crm/pengine/testcases/attrs2.te.exp
new file mode 100644
index 0000000000..bcbcefa934
--- /dev/null
+++ b/crm/pengine/testcases/attrs2.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/attrs3.exp b/crm/pengine/testcases/attrs3.exp
index 6a5b112651..65153986dd 100644
--- a/crm/pengine/testcases/attrs3.exp
+++ b/crm/pengine/testcases/attrs3.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="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.te.exp b/crm/pengine/testcases/attrs3.te.exp
new file mode 100644
index 0000000000..bcbcefa934
--- /dev/null
+++ b/crm/pengine/testcases/attrs3.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/attrs4.exp b/crm/pengine/testcases/attrs4.exp
index c0a68199c7..c7115b4b58 100644
--- a/crm/pengine/testcases/attrs4.exp
+++ b/crm/pengine/testcases/attrs4.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/attrs4.te.exp b/crm/pengine/testcases/attrs4.te.exp
new file mode 100644
index 0000000000..367f087ab5
--- /dev/null
+++ b/crm/pengine/testcases/attrs4.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/attrs5.exp b/crm/pengine/testcases/attrs5.exp
index f856017a7f..c230eb6374 100644
--- a/crm/pengine/testcases/attrs5.exp
+++ b/crm/pengine/testcases/attrs5.exp
@@ -1,4 +1,3 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000"/>
+
diff --git a/crm/pengine/testcases/attrs5.te.exp b/crm/pengine/testcases/attrs5.te.exp
new file mode 100644
index 0000000000..74d64dc013
--- /dev/null
+++ b/crm/pengine/testcases/attrs5.te.exp
@@ -0,0 +1,6 @@
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
diff --git a/crm/pengine/testcases/bad1.exp b/crm/pengine/testcases/bad1.exp
index 30a2c9d3bb..9fd5c4ea08 100644
--- a/crm/pengine/testcases/bad1.exp
+++ b/crm/pengine/testcases/bad1.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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/bad1.te.exp b/crm/pengine/testcases/bad1.te.exp
new file mode 100644
index 0000000000..1ca7fdb506
--- /dev/null
+++ b/crm/pengine/testcases/bad1.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc2 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/bad2.exp b/crm/pengine/testcases/bad2.exp
index 9c99991cc6..334fc5d3ca 100644
--- a/crm/pengine/testcases/bad2.exp
+++ b/crm/pengine/testcases/bad2.exp
@@ -1,23 +1,22 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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/bad2.te.exp b/crm/pengine/testcases/bad2.te.exp
new file mode 100644
index 0000000000..331467e580
--- /dev/null
+++ b/crm/pengine/testcases/bad2.te.exp
@@ -0,0 +1,24 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/bad3.exp b/crm/pengine/testcases/bad3.exp
index dc6707779d..74bd33175a 100644
--- a/crm/pengine/testcases/bad3.exp
+++ b/crm/pengine/testcases/bad3.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc1" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/bad3.te.exp b/crm/pengine/testcases/bad3.te.exp
new file mode 100644
index 0000000000..367f087ab5
--- /dev/null
+++ b/crm/pengine/testcases/bad3.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/bad4.exp b/crm/pengine/testcases/bad4.exp
index f856017a7f..c230eb6374 100644
--- a/crm/pengine/testcases/bad4.exp
+++ b/crm/pengine/testcases/bad4.exp
@@ -1,4 +1,3 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000"/>
+
diff --git a/crm/pengine/testcases/bad4.te.exp b/crm/pengine/testcases/bad4.te.exp
new file mode 100644
index 0000000000..74d64dc013
--- /dev/null
+++ b/crm/pengine/testcases/bad4.te.exp
@@ -0,0 +1,6 @@
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
diff --git a/crm/pengine/testcases/bad5.exp b/crm/pengine/testcases/bad5.exp
index a472d69263..16e211672d 100644
--- a/crm/pengine/testcases/bad5.exp
+++ b/crm/pengine/testcases/bad5.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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/bad5.te.exp b/crm/pengine/testcases/bad5.te.exp
new file mode 100644
index 0000000000..367f087ab5
--- /dev/null
+++ b/crm/pengine/testcases/bad5.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/bad6.exp b/crm/pengine/testcases/bad6.exp
index a472d69263..16e211672d 100644
--- a/crm/pengine/testcases/bad6.exp
+++ b/crm/pengine/testcases/bad6.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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.te.exp b/crm/pengine/testcases/bad6.te.exp
new file mode 100644
index 0000000000..367f087ab5
--- /dev/null
+++ b/crm/pengine/testcases/bad6.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/bad7.exp b/crm/pengine/testcases/bad7.exp
index f856017a7f..c230eb6374 100644
--- a/crm/pengine/testcases/bad7.exp
+++ b/crm/pengine/testcases/bad7.exp
@@ -1,4 +1,3 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000"/>
+
diff --git a/crm/pengine/testcases/bad7.te.exp b/crm/pengine/testcases/bad7.te.exp
new file mode 100644
index 0000000000..74d64dc013
--- /dev/null
+++ b/crm/pengine/testcases/bad7.te.exp
@@ -0,0 +1,6 @@
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
diff --git a/crm/pengine/testcases/group1.exp b/crm/pengine/testcases/group1.exp
index cb776fd444..854f8c65e1 100644
--- a/crm/pengine/testcases/group1.exp
+++ b/crm/pengine/testcases/group1.exp
@@ -1,66 +1,65 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
-      <pseduo_op id="4" rsc_id="rsc1" operation="start" allow_fail="false">
+      <pseudo_event id="4" rsc_id="rsc1" operation="start" allow_fail="false">
         <resource id="rsc1" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
-      <pseduo_op id="5" rsc_id="rsc1" operation="started" allow_fail="false">
+      <pseudo_event id="5" rsc_id="rsc1" operation="started" allow_fail="false">
         <resource id="rsc1" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc1:child_rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="4" rsc_id="rsc1" operation="start" allow_fail="false"/>
+        <pseudo_event id="4" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="3">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1:child_rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc2"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="4">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1:child_rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc3"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1:child_rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/group1.te.exp b/crm/pengine/testcases/group1.te.exp
new file mode 100644
index 0000000000..5c94aeeb39
--- /dev/null
+++ b/crm/pengine/testcases/group1.te.exp
@@ -0,0 +1,66 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 3] Pending
+	[Action 5] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] In-flight (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc1:child_rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 3] Pending
+	[Action 5] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 has completed
+	[Action 2] In-flight (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc1:child_rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 3] Pending
+	[Action 5] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 has completed
+	[Action 3] In-flight (rsc: start rsc1:child_rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc1:child_rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc1:child_rsc3 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/group2.exp b/crm/pengine/testcases/group2.exp
index 6f333b62e0..8cb1a6b04e 100644
--- a/crm/pengine/testcases/group2.exp
+++ b/crm/pengine/testcases/group2.exp
@@ -1,92 +1,91 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
-      <pseduo_op id="5" rsc_id="rsc2" operation="start" allow_fail="false">
+      <pseudo_event id="5" rsc_id="rsc2" operation="start" allow_fail="false">
         <resource id="rsc2" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
-      <pseduo_op id="6" rsc_id="rsc2" operation="started" allow_fail="false">
+      <pseudo_event id="6" rsc_id="rsc2" operation="started" allow_fail="false">
         <resource id="rsc2" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="4" rsc_id="rsc2:child_rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="3">
     <action_set>
       <rsc_op id="2" rsc_id="rsc2:child_rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc1"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="5" rsc_id="rsc2" operation="start" allow_fail="false"/>
+        <pseudo_event id="5" rsc_id="rsc2" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="4">
     <action_set>
       <rsc_op id="3" rsc_id="rsc2:child_rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc2"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc2:child_rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="5">
     <action_set>
       <rsc_op id="4" rsc_id="rsc2:child_rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc3"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc2:child_rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="6">
     <action_set>
       <rsc_op id="7" rsc_id="rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="6" rsc_id="rsc2" operation="started" allow_fail="false"/>
+        <pseudo_event id="6" rsc_id="rsc2" operation="started" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/group2.te.exp b/crm/pengine/testcases/group2.te.exp
new file mode 100644
index 0000000000..de8e3d323d
--- /dev/null
+++ b/crm/pengine/testcases/group2.te.exp
@@ -0,0 +1,127 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 5] Pending (pseduo: start rsc2 on (null))
+Synapse 2 is pending
+	[Input 4] Pending
+	[Action 6] Pending (pseduo: started rsc2 on (null))
+Synapse 3 is pending
+	[Input 5] Pending
+	[Action 2] Pending (rsc: start rsc2:child_rsc1 on node1)
+Synapse 4 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc2:child_rsc2 on node1)
+Synapse 5 is pending
+	[Input 3] Pending
+	[Action 4] Pending (rsc: start rsc2:child_rsc3 on node1)
+Synapse 6 is pending
+	[Input 6] Pending
+	[Action 7] Pending (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: start rsc2 on (null))
+Synapse 2 is pending
+	[Input 4] Pending
+	[Action 6] Pending (pseduo: started rsc2 on (null))
+Synapse 3 has completed
+	[Action 2] In-flight (rsc: start rsc2:child_rsc1 on node1)
+Synapse 4 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc2:child_rsc2 on node1)
+Synapse 5 is pending
+	[Input 3] Pending
+	[Action 4] Pending (rsc: start rsc2:child_rsc3 on node1)
+Synapse 6 is pending
+	[Input 6] Pending
+	[Action 7] Pending (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: start rsc2 on (null))
+Synapse 2 is pending
+	[Input 4] Pending
+	[Action 6] Pending (pseduo: started rsc2 on (null))
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc2:child_rsc1 on node1)
+Synapse 4 has completed
+	[Action 3] In-flight (rsc: start rsc2:child_rsc2 on node1)
+Synapse 5 is pending
+	[Input 3] Pending
+	[Action 4] Pending (rsc: start rsc2:child_rsc3 on node1)
+Synapse 6 is pending
+	[Input 6] Pending
+	[Action 7] Pending (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: start rsc2 on (null))
+Synapse 2 is pending
+	[Input 4] Pending
+	[Action 6] Pending (pseduo: started rsc2 on (null))
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc2:child_rsc1 on node1)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc2:child_rsc2 on node1)
+Synapse 5 has completed
+	[Action 4] In-flight (rsc: start rsc2:child_rsc3 on node1)
+Synapse 6 is pending
+	[Input 6] Pending
+	[Action 7] Pending (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: start rsc2 on (null))
+Synapse 2 has completed
+	[Action 6] Completed (pseduo: started rsc2 on (null))
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc2:child_rsc1 on node1)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc2:child_rsc2 on node1)
+Synapse 5 has completed
+	[Action 4] Completed (rsc: start rsc2:child_rsc3 on node1)
+Synapse 6 has completed
+	[Action 7] In-flight (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: start rsc2 on (null))
+Synapse 2 has completed
+	[Action 6] Completed (pseduo: started rsc2 on (null))
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc2:child_rsc1 on node1)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc2:child_rsc2 on node1)
+Synapse 5 has completed
+	[Action 4] Completed (rsc: start rsc2:child_rsc3 on node1)
+Synapse 6 has completed
+	[Action 7] Completed (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: start rsc2 on (null))
+Synapse 2 has completed
+	[Action 6] Completed (pseduo: started rsc2 on (null))
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc2:child_rsc1 on node1)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc2:child_rsc2 on node1)
+Synapse 5 has completed
+	[Action 4] Completed (rsc: start rsc2:child_rsc3 on node1)
+Synapse 6 has completed
+	[Action 7] Completed (rsc: start rsc3 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/group3.exp b/crm/pengine/testcases/group3.exp
index 499157c11b..af1149f94c 100644
--- a/crm/pengine/testcases/group3.exp
+++ b/crm/pengine/testcases/group3.exp
@@ -1,131 +1,130 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
-      <pseduo_op id="4" rsc_id="rsc1" operation="start" allow_fail="false">
+      <pseudo_event id="4" rsc_id="rsc1" operation="start" allow_fail="false">
         <resource id="rsc1" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
-      <pseduo_op id="5" rsc_id="rsc1" operation="started" allow_fail="false">
+      <pseudo_event id="5" rsc_id="rsc1" operation="started" allow_fail="false">
         <resource id="rsc1" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc1:child_rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="4" rsc_id="rsc1" operation="start" allow_fail="false"/>
+        <pseudo_event id="4" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="3">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1:child_rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc2"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="4">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1:child_rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc3"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1:child_rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="5">
     <action_set>
-      <pseduo_op id="9" rsc_id="rsc2" operation="start" allow_fail="false">
+      <pseudo_event id="9" rsc_id="rsc2" operation="start" allow_fail="false">
         <resource id="rsc2" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="5" rsc_id="rsc1" operation="started" allow_fail="false"/>
+        <pseudo_event id="5" rsc_id="rsc1" operation="started" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="6">
     <action_set>
-      <pseduo_op id="10" rsc_id="rsc2" operation="started" allow_fail="false">
+      <pseudo_event id="10" rsc_id="rsc2" operation="started" allow_fail="false">
         <resource id="rsc2" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="8" rsc_id="rsc2:child_rsc6" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="7">
     <action_set>
       <rsc_op id="6" rsc_id="rsc2:child_rsc4" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc4"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="9" rsc_id="rsc2" operation="start" allow_fail="false"/>
+        <pseudo_event id="9" rsc_id="rsc2" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="8">
     <action_set>
       <rsc_op id="7" rsc_id="rsc2:child_rsc5" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc5"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="6" rsc_id="rsc2:child_rsc4" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="9">
     <action_set>
       <rsc_op id="8" rsc_id="rsc2:child_rsc6" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc6"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="7" rsc_id="rsc2:child_rsc5" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/group3.te.exp b/crm/pengine/testcases/group3.te.exp
new file mode 100644
index 0000000000..12c34b0a71
--- /dev/null
+++ b/crm/pengine/testcases/group3.te.exp
@@ -0,0 +1,203 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 3] Pending
+	[Action 5] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] In-flight (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc1:child_rsc3 on node1)
+Synapse 5 is pending
+	[Input 5] Pending
+	[Action 9] Pending (pseduo: start rsc2 on (null))
+Synapse 6 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 7 is pending
+	[Input 9] Pending
+	[Action 6] Pending (rsc: start rsc2:child_rsc4 on node1)
+Synapse 8 is pending
+	[Input 6] Pending
+	[Action 7] Pending (rsc: start rsc2:child_rsc5 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc6 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 3] Pending
+	[Action 5] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 has completed
+	[Action 2] In-flight (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc1:child_rsc3 on node1)
+Synapse 5 is pending
+	[Input 5] Pending
+	[Action 9] Pending (pseduo: start rsc2 on (null))
+Synapse 6 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 7 is pending
+	[Input 9] Pending
+	[Action 6] Pending (rsc: start rsc2:child_rsc4 on node1)
+Synapse 8 is pending
+	[Input 6] Pending
+	[Action 7] Pending (rsc: start rsc2:child_rsc5 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc6 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 3] Pending
+	[Action 5] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 has completed
+	[Action 3] In-flight (rsc: start rsc1:child_rsc3 on node1)
+Synapse 5 is pending
+	[Input 5] Pending
+	[Action 9] Pending (pseduo: start rsc2 on (null))
+Synapse 6 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 7 is pending
+	[Input 9] Pending
+	[Action 6] Pending (rsc: start rsc2:child_rsc4 on node1)
+Synapse 8 is pending
+	[Input 6] Pending
+	[Action 7] Pending (rsc: start rsc2:child_rsc5 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc6 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc1:child_rsc3 on node1)
+Synapse 5 has completed
+	[Action 9] Completed (pseduo: start rsc2 on (null))
+Synapse 6 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 7 has completed
+	[Action 6] In-flight (rsc: start rsc2:child_rsc4 on node1)
+Synapse 8 is pending
+	[Input 6] Pending
+	[Action 7] Pending (rsc: start rsc2:child_rsc5 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc6 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc1:child_rsc3 on node1)
+Synapse 5 has completed
+	[Action 9] Completed (pseduo: start rsc2 on (null))
+Synapse 6 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 7 has completed
+	[Action 6] Completed (rsc: start rsc2:child_rsc4 on node1)
+Synapse 8 has completed
+	[Action 7] In-flight (rsc: start rsc2:child_rsc5 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc6 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc1:child_rsc3 on node1)
+Synapse 5 has completed
+	[Action 9] Completed (pseduo: start rsc2 on (null))
+Synapse 6 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 7 has completed
+	[Action 6] Completed (rsc: start rsc2:child_rsc4 on node1)
+Synapse 8 has completed
+	[Action 7] Completed (rsc: start rsc2:child_rsc5 on node1)
+Synapse 9 has completed
+	[Action 8] In-flight (rsc: start rsc2:child_rsc6 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc1:child_rsc3 on node1)
+Synapse 5 has completed
+	[Action 9] Completed (pseduo: start rsc2 on (null))
+Synapse 6 has completed
+	[Action 10] Completed (pseduo: started rsc2 on (null))
+Synapse 7 has completed
+	[Action 6] Completed (rsc: start rsc2:child_rsc4 on node1)
+Synapse 8 has completed
+	[Action 7] Completed (rsc: start rsc2:child_rsc5 on node1)
+Synapse 9 has completed
+	[Action 8] Completed (rsc: start rsc2:child_rsc6 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 4] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 5] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc2 on node1)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc1:child_rsc3 on node1)
+Synapse 5 has completed
+	[Action 9] Completed (pseduo: start rsc2 on (null))
+Synapse 6 has completed
+	[Action 10] Completed (pseduo: started rsc2 on (null))
+Synapse 7 has completed
+	[Action 6] Completed (rsc: start rsc2:child_rsc4 on node1)
+Synapse 8 has completed
+	[Action 7] Completed (rsc: start rsc2:child_rsc5 on node1)
+Synapse 9 has completed
+	[Action 8] Completed (rsc: start rsc2:child_rsc6 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/group4.exp b/crm/pengine/testcases/group4.exp
index f856017a7f..c230eb6374 100644
--- a/crm/pengine/testcases/group4.exp
+++ b/crm/pengine/testcases/group4.exp
@@ -1,4 +1,3 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000"/>
+
diff --git a/crm/pengine/testcases/group4.te.exp b/crm/pengine/testcases/group4.te.exp
new file mode 100644
index 0000000000..74d64dc013
--- /dev/null
+++ b/crm/pengine/testcases/group4.te.exp
@@ -0,0 +1,6 @@
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
diff --git a/crm/pengine/testcases/group5.exp b/crm/pengine/testcases/group5.exp
index 5586beb1b5..52331ff0b3 100644
--- a/crm/pengine/testcases/group5.exp
+++ b/crm/pengine/testcases/group5.exp
@@ -1,198 +1,197 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="12" rsc_id="rsc2" operation="stopped" allow_fail="false"/>
+        <pseudo_event id="12" rsc_id="rsc2" operation="stopped" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
-      <pseduo_op id="9" rsc_id="rsc2" operation="start" allow_fail="false">
+      <pseudo_event id="9" rsc_id="rsc2" operation="start" allow_fail="false">
         <resource id="rsc2" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
-        <pseduo_op id="11" rsc_id="rsc2" operation="stop" allow_fail="false"/>
+        <pseudo_event id="11" rsc_id="rsc2" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="3">
     <action_set>
-      <pseduo_op id="10" rsc_id="rsc2" operation="started" allow_fail="false">
+      <pseudo_event id="10" rsc_id="rsc2" operation="started" allow_fail="false">
         <resource id="rsc2" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="8" rsc_id="rsc2:child_rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="4">
     <action_set>
-      <pseduo_op id="11" rsc_id="rsc2" operation="stop" allow_fail="false">
+      <pseudo_event id="11" rsc_id="rsc2" operation="stop" allow_fail="false">
         <resource id="rsc2" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="13" rsc_id="rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="5">
     <action_set>
-      <pseduo_op id="12" rsc_id="rsc2" operation="stopped" allow_fail="false">
+      <pseudo_event id="12" rsc_id="rsc2" operation="stopped" allow_fail="false">
         <resource id="rsc2" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc2:child_rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="6">
     <action_set>
       <rsc_op id="3" rsc_id="rsc2:child_rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc1"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" rsc_id="rsc2:child_rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="7">
     <action_set>
       <rsc_op id="4" rsc_id="rsc2:child_rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc1"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc2:child_rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
-        <pseduo_op id="9" rsc_id="rsc2" operation="start" allow_fail="false"/>
+        <pseudo_event id="9" rsc_id="rsc2" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="8">
     <action_set>
       <rsc_op id="5" rsc_id="rsc2:child_rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc2"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="7" rsc_id="rsc2:child_rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="9">
     <action_set>
       <rsc_op id="6" rsc_id="rsc2:child_rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc2"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" rsc_id="rsc2:child_rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="4" rsc_id="rsc2:child_rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="10">
     <action_set>
       <rsc_op id="7" rsc_id="rsc2:child_rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc3"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="11" rsc_id="rsc2" operation="stop" allow_fail="false"/>
+        <pseudo_event id="11" rsc_id="rsc2" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="11">
     <action_set>
       <rsc_op id="8" rsc_id="rsc2:child_rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc3"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="7" rsc_id="rsc2:child_rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="6" rsc_id="rsc2:child_rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="12">
     <action_set>
       <rsc_op id="13" rsc_id="rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="13">
     <action_set>
       <rsc_op id="14" rsc_id="rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="10" rsc_id="rsc2" operation="started" allow_fail="false"/>
+        <pseudo_event id="10" rsc_id="rsc2" operation="started" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="13" rsc_id="rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/group5.te.exp b/crm/pengine/testcases/group5.te.exp
new file mode 100644
index 0000000000..fa1486c5ba
--- /dev/null
+++ b/crm/pengine/testcases/group5.te.exp
@@ -0,0 +1,461 @@
+Start Transitioner state
+Synapse 0 is pending
+	[Input 12] Pending
+	[Action 1] Pending (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Input 11] Pending
+	[Action 9] Pending (pseduo: start rsc2 on (null))
+Synapse 3 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 4 is pending
+	[Input 13] Pending
+	[Action 11] Pending (pseduo: stop rsc2 on (null))
+Synapse 5 is pending
+	[Input 3] Pending
+	[Action 12] Pending (pseduo: stopped rsc2 on (null))
+Synapse 6 is pending
+	[Input 5] Pending
+	[Action 3] Pending (rsc: stop rsc2:child_rsc1 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 9] Pending
+	[Action 4] Pending (rsc: start rsc2:child_rsc1 on node2)
+Synapse 8 is pending
+	[Input 7] Pending
+	[Action 5] Pending (rsc: stop rsc2:child_rsc2 on node1)
+Synapse 9 is pending
+	[Input 5] Pending
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc2:child_rsc2 on node2)
+Synapse 10 is pending
+	[Input 11] Pending
+	[Action 7] Pending (rsc: stop rsc2:child_rsc3 on node1)
+Synapse 11 is pending
+	[Input 7] Pending
+	[Input 6] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc3 on node2)
+Synapse 12 has completed
+	[Action 13] In-flight (rsc: stop rsc3 on node1)
+Synapse 13 is pending
+	[Input 10] Pending
+	[Input 13] Pending
+	[Action 14] Pending (rsc: start rsc3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 is pending
+	[Input 12] Pending
+	[Action 1] Pending (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Input 11] Satisfied
+	[Action 9] Pending (pseduo: start rsc2 on (null))
+Synapse 3 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 4 has completed
+	[Action 11] Completed (pseduo: stop rsc2 on (null))
+Synapse 5 is pending
+	[Input 3] Pending
+	[Action 12] Pending (pseduo: stopped rsc2 on (null))
+Synapse 6 is pending
+	[Input 5] Pending
+	[Action 3] Pending (rsc: stop rsc2:child_rsc1 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 9] Pending
+	[Action 4] Pending (rsc: start rsc2:child_rsc1 on node2)
+Synapse 8 is pending
+	[Input 7] Pending
+	[Action 5] Pending (rsc: stop rsc2:child_rsc2 on node1)
+Synapse 9 is pending
+	[Input 5] Pending
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc2:child_rsc2 on node2)
+Synapse 10 has completed
+	[Action 7] In-flight (rsc: stop rsc2:child_rsc3 on node1)
+Synapse 11 is pending
+	[Input 7] Pending
+	[Input 6] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc3 on node2)
+Synapse 12 has completed
+	[Action 13] Completed (rsc: stop rsc3 on node1)
+Synapse 13 is pending
+	[Input 10] Pending
+	[Input 13] Satisfied
+	[Action 14] Pending (rsc: start rsc3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 is pending
+	[Input 12] Pending
+	[Action 1] Pending (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Input 11] Satisfied
+	[Action 9] Pending (pseduo: start rsc2 on (null))
+Synapse 3 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 4 has completed
+	[Action 11] Completed (pseduo: stop rsc2 on (null))
+Synapse 5 is pending
+	[Input 3] Pending
+	[Action 12] Pending (pseduo: stopped rsc2 on (null))
+Synapse 6 is pending
+	[Input 5] Pending
+	[Action 3] Pending (rsc: stop rsc2:child_rsc1 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 9] Pending
+	[Action 4] Pending (rsc: start rsc2:child_rsc1 on node2)
+Synapse 8 has completed
+	[Action 5] In-flight (rsc: stop rsc2:child_rsc2 on node1)
+Synapse 9 is pending
+	[Input 5] Pending
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc2:child_rsc2 on node2)
+Synapse 10 has completed
+	[Action 7] Completed (rsc: stop rsc2:child_rsc3 on node1)
+Synapse 11 is pending
+	[Input 7] Satisfied
+	[Input 6] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc3 on node2)
+Synapse 12 has completed
+	[Action 13] Completed (rsc: stop rsc3 on node1)
+Synapse 13 is pending
+	[Input 10] Pending
+	[Input 13] Satisfied
+	[Action 14] Pending (rsc: start rsc3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 is pending
+	[Input 12] Pending
+	[Action 1] Pending (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Input 11] Satisfied
+	[Action 9] Pending (pseduo: start rsc2 on (null))
+Synapse 3 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 4 has completed
+	[Action 11] Completed (pseduo: stop rsc2 on (null))
+Synapse 5 is pending
+	[Input 3] Pending
+	[Action 12] Pending (pseduo: stopped rsc2 on (null))
+Synapse 6 has completed
+	[Action 3] In-flight (rsc: stop rsc2:child_rsc1 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 9] Pending
+	[Action 4] Pending (rsc: start rsc2:child_rsc1 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc2:child_rsc2 on node1)
+Synapse 9 is pending
+	[Input 5] Satisfied
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc2:child_rsc2 on node2)
+Synapse 10 has completed
+	[Action 7] Completed (rsc: stop rsc2:child_rsc3 on node1)
+Synapse 11 is pending
+	[Input 7] Satisfied
+	[Input 6] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc3 on node2)
+Synapse 12 has completed
+	[Action 13] Completed (rsc: stop rsc3 on node1)
+Synapse 13 is pending
+	[Input 10] Pending
+	[Input 13] Satisfied
+	[Action 14] Pending (rsc: start rsc3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Input 11] Satisfied
+	[Action 9] Pending (pseduo: start rsc2 on (null))
+Synapse 3 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 4 has completed
+	[Action 11] Completed (pseduo: stop rsc2 on (null))
+Synapse 5 has completed
+	[Action 12] Completed (pseduo: stopped rsc2 on (null))
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc2:child_rsc1 on node1)
+Synapse 7 is pending
+	[Input 3] Satisfied
+	[Input 9] Pending
+	[Action 4] Pending (rsc: start rsc2:child_rsc1 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc2:child_rsc2 on node1)
+Synapse 9 is pending
+	[Input 5] Satisfied
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc2:child_rsc2 on node2)
+Synapse 10 has completed
+	[Action 7] Completed (rsc: stop rsc2:child_rsc3 on node1)
+Synapse 11 is pending
+	[Input 7] Satisfied
+	[Input 6] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc3 on node2)
+Synapse 12 has completed
+	[Action 13] Completed (rsc: stop rsc3 on node1)
+Synapse 13 is pending
+	[Input 10] Pending
+	[Input 13] Satisfied
+	[Action 14] Pending (rsc: start rsc3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node2)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Input 11] Satisfied
+	[Action 9] Pending (pseduo: start rsc2 on (null))
+Synapse 3 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 4 has completed
+	[Action 11] Completed (pseduo: stop rsc2 on (null))
+Synapse 5 has completed
+	[Action 12] Completed (pseduo: stopped rsc2 on (null))
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc2:child_rsc1 on node1)
+Synapse 7 is pending
+	[Input 3] Satisfied
+	[Input 9] Pending
+	[Action 4] Pending (rsc: start rsc2:child_rsc1 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc2:child_rsc2 on node1)
+Synapse 9 is pending
+	[Input 5] Satisfied
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc2:child_rsc2 on node2)
+Synapse 10 has completed
+	[Action 7] Completed (rsc: stop rsc2:child_rsc3 on node1)
+Synapse 11 is pending
+	[Input 7] Satisfied
+	[Input 6] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc3 on node2)
+Synapse 12 has completed
+	[Action 13] Completed (rsc: stop rsc3 on node1)
+Synapse 13 is pending
+	[Input 10] Pending
+	[Input 13] Satisfied
+	[Action 14] Pending (rsc: start rsc3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: start rsc2 on (null))
+Synapse 3 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 4 has completed
+	[Action 11] Completed (pseduo: stop rsc2 on (null))
+Synapse 5 has completed
+	[Action 12] Completed (pseduo: stopped rsc2 on (null))
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc2:child_rsc1 on node1)
+Synapse 7 has completed
+	[Action 4] In-flight (rsc: start rsc2:child_rsc1 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc2:child_rsc2 on node1)
+Synapse 9 is pending
+	[Input 5] Satisfied
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc2:child_rsc2 on node2)
+Synapse 10 has completed
+	[Action 7] Completed (rsc: stop rsc2:child_rsc3 on node1)
+Synapse 11 is pending
+	[Input 7] Satisfied
+	[Input 6] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc3 on node2)
+Synapse 12 has completed
+	[Action 13] Completed (rsc: stop rsc3 on node1)
+Synapse 13 is pending
+	[Input 10] Pending
+	[Input 13] Satisfied
+	[Action 14] Pending (rsc: start rsc3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: start rsc2 on (null))
+Synapse 3 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 4 has completed
+	[Action 11] Completed (pseduo: stop rsc2 on (null))
+Synapse 5 has completed
+	[Action 12] Completed (pseduo: stopped rsc2 on (null))
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc2:child_rsc1 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc2:child_rsc1 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc2:child_rsc2 on node1)
+Synapse 9 has completed
+	[Action 6] In-flight (rsc: start rsc2:child_rsc2 on node2)
+Synapse 10 has completed
+	[Action 7] Completed (rsc: stop rsc2:child_rsc3 on node1)
+Synapse 11 is pending
+	[Input 7] Satisfied
+	[Input 6] Pending
+	[Action 8] Pending (rsc: start rsc2:child_rsc3 on node2)
+Synapse 12 has completed
+	[Action 13] Completed (rsc: stop rsc3 on node1)
+Synapse 13 is pending
+	[Input 10] Pending
+	[Input 13] Satisfied
+	[Action 14] Pending (rsc: start rsc3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: start rsc2 on (null))
+Synapse 3 is pending
+	[Input 8] Pending
+	[Action 10] Pending (pseduo: started rsc2 on (null))
+Synapse 4 has completed
+	[Action 11] Completed (pseduo: stop rsc2 on (null))
+Synapse 5 has completed
+	[Action 12] Completed (pseduo: stopped rsc2 on (null))
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc2:child_rsc1 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc2:child_rsc1 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc2:child_rsc2 on node1)
+Synapse 9 has completed
+	[Action 6] Completed (rsc: start rsc2:child_rsc2 on node2)
+Synapse 10 has completed
+	[Action 7] Completed (rsc: stop rsc2:child_rsc3 on node1)
+Synapse 11 has completed
+	[Action 8] In-flight (rsc: start rsc2:child_rsc3 on node2)
+Synapse 12 has completed
+	[Action 13] Completed (rsc: stop rsc3 on node1)
+Synapse 13 is pending
+	[Input 10] Pending
+	[Input 13] Satisfied
+	[Action 14] Pending (rsc: start rsc3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: start rsc2 on (null))
+Synapse 3 has completed
+	[Action 10] Completed (pseduo: started rsc2 on (null))
+Synapse 4 has completed
+	[Action 11] Completed (pseduo: stop rsc2 on (null))
+Synapse 5 has completed
+	[Action 12] Completed (pseduo: stopped rsc2 on (null))
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc2:child_rsc1 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc2:child_rsc1 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc2:child_rsc2 on node1)
+Synapse 9 has completed
+	[Action 6] Completed (rsc: start rsc2:child_rsc2 on node2)
+Synapse 10 has completed
+	[Action 7] Completed (rsc: stop rsc2:child_rsc3 on node1)
+Synapse 11 has completed
+	[Action 8] Completed (rsc: start rsc2:child_rsc3 on node2)
+Synapse 12 has completed
+	[Action 13] Completed (rsc: stop rsc3 on node1)
+Synapse 13 has completed
+	[Action 14] In-flight (rsc: start rsc3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: start rsc2 on (null))
+Synapse 3 has completed
+	[Action 10] Completed (pseduo: started rsc2 on (null))
+Synapse 4 has completed
+	[Action 11] Completed (pseduo: stop rsc2 on (null))
+Synapse 5 has completed
+	[Action 12] Completed (pseduo: stopped rsc2 on (null))
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc2:child_rsc1 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc2:child_rsc1 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc2:child_rsc2 on node1)
+Synapse 9 has completed
+	[Action 6] Completed (rsc: start rsc2:child_rsc2 on node2)
+Synapse 10 has completed
+	[Action 7] Completed (rsc: stop rsc2:child_rsc3 on node1)
+Synapse 11 has completed
+	[Action 8] Completed (rsc: start rsc2:child_rsc3 on node2)
+Synapse 12 has completed
+	[Action 13] Completed (rsc: stop rsc3 on node1)
+Synapse 13 has completed
+	[Action 14] Completed (rsc: start rsc3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: start rsc2 on (null))
+Synapse 3 has completed
+	[Action 10] Completed (pseduo: started rsc2 on (null))
+Synapse 4 has completed
+	[Action 11] Completed (pseduo: stop rsc2 on (null))
+Synapse 5 has completed
+	[Action 12] Completed (pseduo: stopped rsc2 on (null))
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc2:child_rsc1 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc2:child_rsc1 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc2:child_rsc2 on node1)
+Synapse 9 has completed
+	[Action 6] Completed (rsc: start rsc2:child_rsc2 on node2)
+Synapse 10 has completed
+	[Action 7] Completed (rsc: stop rsc2:child_rsc3 on node1)
+Synapse 11 has completed
+	[Action 8] Completed (rsc: start rsc2:child_rsc3 on node2)
+Synapse 12 has completed
+	[Action 13] Completed (rsc: stop rsc3 on node1)
+Synapse 13 has completed
+	[Action 14] Completed (rsc: start rsc3 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/group6.exp b/crm/pengine/testcases/group6.exp
index 899bb8eeb9..88ced31f11 100644
--- a/crm/pengine/testcases/group6.exp
+++ b/crm/pengine/testcases/group6.exp
@@ -1,282 +1,281 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
-      <pseduo_op id="7" rsc_id="rsc1" operation="start" allow_fail="false">
+      <pseudo_event id="7" rsc_id="rsc1" operation="start" allow_fail="false">
         <resource id="rsc1" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="9" rsc_id="rsc1" operation="stop" allow_fail="false"/>
+        <pseudo_event id="9" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
-      <pseduo_op id="8" rsc_id="rsc1" operation="started" allow_fail="false">
+      <pseudo_event id="8" rsc_id="rsc1" operation="started" allow_fail="false">
         <resource id="rsc1" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="6" rsc_id="rsc1:child_rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
-      <pseduo_op id="9" rsc_id="rsc1" operation="stop" allow_fail="false">
+      <pseudo_event id="9" rsc_id="rsc1" operation="stop" allow_fail="false">
         <resource id="rsc1" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="20" rsc_id="rsc2" operation="stopped" allow_fail="false"/>
+        <pseudo_event id="20" rsc_id="rsc2" operation="stopped" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="3">
     <action_set>
-      <pseduo_op id="10" rsc_id="rsc1" operation="stopped" allow_fail="false">
+      <pseudo_event id="10" rsc_id="rsc1" operation="stopped" allow_fail="false">
         <resource id="rsc1" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="4">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc1:child_rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="5">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1:child_rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1:child_rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
-        <pseduo_op id="7" rsc_id="rsc1" operation="start" allow_fail="false"/>
+        <pseudo_event id="7" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="6">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1:child_rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc2"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" rsc_id="rsc1:child_rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="7">
     <action_set>
       <rsc_op id="4" rsc_id="rsc1:child_rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc2"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc1:child_rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1:child_rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="8">
     <action_set>
       <rsc_op id="5" rsc_id="rsc1:child_rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc3"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="9" rsc_id="rsc1" operation="stop" allow_fail="false"/>
+        <pseudo_event id="9" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="9">
     <action_set>
       <rsc_op id="6" rsc_id="rsc1:child_rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc3"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" rsc_id="rsc1:child_rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="4" rsc_id="rsc1:child_rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="10">
     <action_set>
-      <pseduo_op id="17" rsc_id="rsc2" operation="start" allow_fail="false">
+      <pseudo_event id="17" rsc_id="rsc2" operation="start" allow_fail="false">
         <resource id="rsc2" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="8" rsc_id="rsc1" operation="started" allow_fail="false"/>
+        <pseudo_event id="8" rsc_id="rsc1" operation="started" allow_fail="false"/>
       </trigger>
       <trigger>
-        <pseduo_op id="19" rsc_id="rsc2" operation="stop" allow_fail="false"/>
+        <pseudo_event id="19" rsc_id="rsc2" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="11">
     <action_set>
-      <pseduo_op id="18" rsc_id="rsc2" operation="started" allow_fail="false">
+      <pseudo_event id="18" rsc_id="rsc2" operation="started" allow_fail="false">
         <resource id="rsc2" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="16" rsc_id="rsc2:child_rsc6" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="12">
     <action_set>
-      <pseduo_op id="19" rsc_id="rsc2" operation="stop" allow_fail="false">
+      <pseudo_event id="19" rsc_id="rsc2" operation="stop" allow_fail="false">
         <resource id="rsc2" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="13">
     <action_set>
-      <pseduo_op id="20" rsc_id="rsc2" operation="stopped" allow_fail="false">
+      <pseudo_event id="20" rsc_id="rsc2" operation="stopped" allow_fail="false">
         <resource id="rsc2" priority="1.0"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="11" rsc_id="rsc2:child_rsc4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="14">
     <action_set>
       <rsc_op id="11" rsc_id="rsc2:child_rsc4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc4"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="13" rsc_id="rsc2:child_rsc5" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="15">
     <action_set>
       <rsc_op id="12" rsc_id="rsc2:child_rsc4" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc4"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="11" rsc_id="rsc2:child_rsc4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
-        <pseduo_op id="17" rsc_id="rsc2" operation="start" allow_fail="false"/>
+        <pseudo_event id="17" rsc_id="rsc2" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="16">
     <action_set>
       <rsc_op id="13" rsc_id="rsc2:child_rsc5" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc5"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="15" rsc_id="rsc2:child_rsc6" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="17">
     <action_set>
       <rsc_op id="14" rsc_id="rsc2:child_rsc5" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc5"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="13" rsc_id="rsc2:child_rsc5" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="12" rsc_id="rsc2:child_rsc4" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="18">
     <action_set>
       <rsc_op id="15" rsc_id="rsc2:child_rsc6" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc6"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="19" rsc_id="rsc2" operation="stop" allow_fail="false"/>
+        <pseudo_event id="19" rsc_id="rsc2" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="19">
     <action_set>
       <rsc_op id="16" rsc_id="rsc2:child_rsc6" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc6"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="15" rsc_id="rsc2:child_rsc6" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="14" rsc_id="rsc2:child_rsc5" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/group6.te.exp b/crm/pengine/testcases/group6.te.exp
new file mode 100644
index 0000000000..9a7e7e3b46
--- /dev/null
+++ b/crm/pengine/testcases/group6.te.exp
@@ -0,0 +1,759 @@
+Start Transitioner state
+Synapse 0 is pending
+	[Input 9] Pending
+	[Action 7] Pending (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 6] Pending
+	[Action 8] Pending (pseduo: started rsc1 on (null))
+Synapse 2 is pending
+	[Input 20] Pending
+	[Action 9] Pending (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Pending
+	[Action 10] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 is pending
+	[Input 3] Pending
+	[Action 1] Pending (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 is pending
+	[Input 1] Pending
+	[Input 7] Pending
+	[Action 2] Pending (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 is pending
+	[Input 5] Pending
+	[Action 3] Pending (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 2] Pending
+	[Action 4] Pending (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 is pending
+	[Input 9] Pending
+	[Action 5] Pending (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 is pending
+	[Input 5] Pending
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 is pending
+	[Input 8] Pending
+	[Input 19] Satisfied
+	[Action 17] Pending (pseduo: start rsc2 on (null))
+Synapse 11 is pending
+	[Input 16] Pending
+	[Action 18] Pending (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 is pending
+	[Input 11] Pending
+	[Action 20] Pending (pseduo: stopped rsc2 on (null))
+Synapse 14 is pending
+	[Input 13] Pending
+	[Action 11] Pending (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 is pending
+	[Input 11] Pending
+	[Input 17] Pending
+	[Action 12] Pending (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 is pending
+	[Input 15] Pending
+	[Action 13] Pending (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 is pending
+	[Input 13] Pending
+	[Input 12] Pending
+	[Action 14] Pending (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] In-flight (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 is pending
+	[Input 15] Pending
+	[Input 14] Pending
+	[Action 16] Pending (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 is pending
+	[Input 9] Pending
+	[Action 7] Pending (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 6] Pending
+	[Action 8] Pending (pseduo: started rsc1 on (null))
+Synapse 2 is pending
+	[Input 20] Pending
+	[Action 9] Pending (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Pending
+	[Action 10] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 is pending
+	[Input 3] Pending
+	[Action 1] Pending (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 is pending
+	[Input 1] Pending
+	[Input 7] Pending
+	[Action 2] Pending (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 is pending
+	[Input 5] Pending
+	[Action 3] Pending (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 2] Pending
+	[Action 4] Pending (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 is pending
+	[Input 9] Pending
+	[Action 5] Pending (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 is pending
+	[Input 5] Pending
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 is pending
+	[Input 8] Pending
+	[Input 19] Satisfied
+	[Action 17] Pending (pseduo: start rsc2 on (null))
+Synapse 11 is pending
+	[Input 16] Pending
+	[Action 18] Pending (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 is pending
+	[Input 11] Pending
+	[Action 20] Pending (pseduo: stopped rsc2 on (null))
+Synapse 14 is pending
+	[Input 13] Pending
+	[Action 11] Pending (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 is pending
+	[Input 11] Pending
+	[Input 17] Pending
+	[Action 12] Pending (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] In-flight (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 is pending
+	[Input 13] Pending
+	[Input 12] Pending
+	[Action 14] Pending (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 is pending
+	[Input 15] Satisfied
+	[Input 14] Pending
+	[Action 16] Pending (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 is pending
+	[Input 9] Pending
+	[Action 7] Pending (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 6] Pending
+	[Action 8] Pending (pseduo: started rsc1 on (null))
+Synapse 2 is pending
+	[Input 20] Pending
+	[Action 9] Pending (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Pending
+	[Action 10] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 is pending
+	[Input 3] Pending
+	[Action 1] Pending (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 is pending
+	[Input 1] Pending
+	[Input 7] Pending
+	[Action 2] Pending (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 is pending
+	[Input 5] Pending
+	[Action 3] Pending (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 2] Pending
+	[Action 4] Pending (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 is pending
+	[Input 9] Pending
+	[Action 5] Pending (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 is pending
+	[Input 5] Pending
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 is pending
+	[Input 8] Pending
+	[Input 19] Satisfied
+	[Action 17] Pending (pseduo: start rsc2 on (null))
+Synapse 11 is pending
+	[Input 16] Pending
+	[Action 18] Pending (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 is pending
+	[Input 11] Pending
+	[Action 20] Pending (pseduo: stopped rsc2 on (null))
+Synapse 14 has completed
+	[Action 11] In-flight (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 is pending
+	[Input 11] Pending
+	[Input 17] Pending
+	[Action 12] Pending (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 is pending
+	[Input 13] Satisfied
+	[Input 12] Pending
+	[Action 14] Pending (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 is pending
+	[Input 15] Satisfied
+	[Input 14] Pending
+	[Action 16] Pending (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 7] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 6] Pending
+	[Action 8] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Pending
+	[Action 10] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 is pending
+	[Input 3] Pending
+	[Action 1] Pending (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 is pending
+	[Input 1] Pending
+	[Input 7] Satisfied
+	[Action 2] Pending (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 is pending
+	[Input 5] Pending
+	[Action 3] Pending (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 2] Pending
+	[Action 4] Pending (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 has completed
+	[Action 5] In-flight (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 is pending
+	[Input 5] Pending
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 is pending
+	[Input 8] Pending
+	[Input 19] Satisfied
+	[Action 17] Pending (pseduo: start rsc2 on (null))
+Synapse 11 is pending
+	[Input 16] Pending
+	[Action 18] Pending (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 has completed
+	[Action 20] Completed (pseduo: stopped rsc2 on (null))
+Synapse 14 has completed
+	[Action 11] Completed (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 is pending
+	[Input 11] Satisfied
+	[Input 17] Pending
+	[Action 12] Pending (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 is pending
+	[Input 13] Satisfied
+	[Input 12] Pending
+	[Action 14] Pending (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 is pending
+	[Input 15] Satisfied
+	[Input 14] Pending
+	[Action 16] Pending (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 7] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 6] Pending
+	[Action 8] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Pending
+	[Action 10] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 is pending
+	[Input 3] Pending
+	[Action 1] Pending (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 is pending
+	[Input 1] Pending
+	[Input 7] Satisfied
+	[Action 2] Pending (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 has completed
+	[Action 3] In-flight (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 2] Pending
+	[Action 4] Pending (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 is pending
+	[Input 5] Satisfied
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 is pending
+	[Input 8] Pending
+	[Input 19] Satisfied
+	[Action 17] Pending (pseduo: start rsc2 on (null))
+Synapse 11 is pending
+	[Input 16] Pending
+	[Action 18] Pending (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 has completed
+	[Action 20] Completed (pseduo: stopped rsc2 on (null))
+Synapse 14 has completed
+	[Action 11] Completed (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 is pending
+	[Input 11] Satisfied
+	[Input 17] Pending
+	[Action 12] Pending (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 is pending
+	[Input 13] Satisfied
+	[Input 12] Pending
+	[Action 14] Pending (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 is pending
+	[Input 15] Satisfied
+	[Input 14] Pending
+	[Action 16] Pending (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 7] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 6] Pending
+	[Action 8] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Pending
+	[Action 10] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] In-flight (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 is pending
+	[Input 1] Pending
+	[Input 7] Satisfied
+	[Action 2] Pending (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 is pending
+	[Input 3] Satisfied
+	[Input 2] Pending
+	[Action 4] Pending (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 is pending
+	[Input 5] Satisfied
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 is pending
+	[Input 8] Pending
+	[Input 19] Satisfied
+	[Action 17] Pending (pseduo: start rsc2 on (null))
+Synapse 11 is pending
+	[Input 16] Pending
+	[Action 18] Pending (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 has completed
+	[Action 20] Completed (pseduo: stopped rsc2 on (null))
+Synapse 14 has completed
+	[Action 11] Completed (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 is pending
+	[Input 11] Satisfied
+	[Input 17] Pending
+	[Action 12] Pending (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 is pending
+	[Input 13] Satisfied
+	[Input 12] Pending
+	[Action 14] Pending (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 is pending
+	[Input 15] Satisfied
+	[Input 14] Pending
+	[Action 16] Pending (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 7] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 6] Pending
+	[Action 8] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 10] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 has completed
+	[Action 2] In-flight (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 is pending
+	[Input 3] Satisfied
+	[Input 2] Pending
+	[Action 4] Pending (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 is pending
+	[Input 5] Satisfied
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 is pending
+	[Input 8] Pending
+	[Input 19] Satisfied
+	[Action 17] Pending (pseduo: start rsc2 on (null))
+Synapse 11 is pending
+	[Input 16] Pending
+	[Action 18] Pending (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 has completed
+	[Action 20] Completed (pseduo: stopped rsc2 on (null))
+Synapse 14 has completed
+	[Action 11] Completed (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 is pending
+	[Input 11] Satisfied
+	[Input 17] Pending
+	[Action 12] Pending (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 is pending
+	[Input 13] Satisfied
+	[Input 12] Pending
+	[Action 14] Pending (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 is pending
+	[Input 15] Satisfied
+	[Input 14] Pending
+	[Action 16] Pending (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 7] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 6] Pending
+	[Action 8] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 10] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 has completed
+	[Action 4] In-flight (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 is pending
+	[Input 5] Satisfied
+	[Input 4] Pending
+	[Action 6] Pending (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 is pending
+	[Input 8] Pending
+	[Input 19] Satisfied
+	[Action 17] Pending (pseduo: start rsc2 on (null))
+Synapse 11 is pending
+	[Input 16] Pending
+	[Action 18] Pending (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 has completed
+	[Action 20] Completed (pseduo: stopped rsc2 on (null))
+Synapse 14 has completed
+	[Action 11] Completed (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 is pending
+	[Input 11] Satisfied
+	[Input 17] Pending
+	[Action 12] Pending (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 is pending
+	[Input 13] Satisfied
+	[Input 12] Pending
+	[Action 14] Pending (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 is pending
+	[Input 15] Satisfied
+	[Input 14] Pending
+	[Action 16] Pending (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 7] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 6] Pending
+	[Action 8] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 10] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 has completed
+	[Action 6] In-flight (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 is pending
+	[Input 8] Pending
+	[Input 19] Satisfied
+	[Action 17] Pending (pseduo: start rsc2 on (null))
+Synapse 11 is pending
+	[Input 16] Pending
+	[Action 18] Pending (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 has completed
+	[Action 20] Completed (pseduo: stopped rsc2 on (null))
+Synapse 14 has completed
+	[Action 11] Completed (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 is pending
+	[Input 11] Satisfied
+	[Input 17] Pending
+	[Action 12] Pending (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 is pending
+	[Input 13] Satisfied
+	[Input 12] Pending
+	[Action 14] Pending (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 is pending
+	[Input 15] Satisfied
+	[Input 14] Pending
+	[Action 16] Pending (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 7] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 8] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 10] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 has completed
+	[Action 6] Completed (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 has completed
+	[Action 17] Completed (pseduo: start rsc2 on (null))
+Synapse 11 is pending
+	[Input 16] Pending
+	[Action 18] Pending (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 has completed
+	[Action 20] Completed (pseduo: stopped rsc2 on (null))
+Synapse 14 has completed
+	[Action 11] Completed (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 has completed
+	[Action 12] In-flight (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 is pending
+	[Input 13] Satisfied
+	[Input 12] Pending
+	[Action 14] Pending (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 is pending
+	[Input 15] Satisfied
+	[Input 14] Pending
+	[Action 16] Pending (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 7] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 8] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 10] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 has completed
+	[Action 6] Completed (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 has completed
+	[Action 17] Completed (pseduo: start rsc2 on (null))
+Synapse 11 is pending
+	[Input 16] Pending
+	[Action 18] Pending (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 has completed
+	[Action 20] Completed (pseduo: stopped rsc2 on (null))
+Synapse 14 has completed
+	[Action 11] Completed (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 has completed
+	[Action 14] In-flight (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 is pending
+	[Input 15] Satisfied
+	[Input 14] Pending
+	[Action 16] Pending (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 7] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 8] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 10] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 has completed
+	[Action 6] Completed (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 has completed
+	[Action 17] Completed (pseduo: start rsc2 on (null))
+Synapse 11 is pending
+	[Input 16] Pending
+	[Action 18] Pending (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 has completed
+	[Action 20] Completed (pseduo: stopped rsc2 on (null))
+Synapse 14 has completed
+	[Action 11] Completed (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 has completed
+	[Action 16] In-flight (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 7] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 8] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 10] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 has completed
+	[Action 6] Completed (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 has completed
+	[Action 17] Completed (pseduo: start rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 has completed
+	[Action 20] Completed (pseduo: stopped rsc2 on (null))
+Synapse 14 has completed
+	[Action 11] Completed (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 has completed
+	[Action 16] Completed (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 7] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 8] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 9] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 10] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc2 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc2 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc3 on node1)
+Synapse 9 has completed
+	[Action 6] Completed (rsc: start rsc1:child_rsc3 on node2)
+Synapse 10 has completed
+	[Action 17] Completed (pseduo: start rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: started rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stop rsc2 on (null))
+Synapse 13 has completed
+	[Action 20] Completed (pseduo: stopped rsc2 on (null))
+Synapse 14 has completed
+	[Action 11] Completed (rsc: stop rsc2:child_rsc4 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: start rsc2:child_rsc4 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: stop rsc2:child_rsc5 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: start rsc2:child_rsc5 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: stop rsc2:child_rsc6 on node1)
+Synapse 19 has completed
+	[Action 16] Completed (rsc: start rsc2:child_rsc6 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/inc1.exp b/crm/pengine/testcases/inc1.exp
index b534e63ff7..d744da2a34 100644
--- a/crm/pengine/testcases/inc1.exp
+++ b/crm/pengine/testcases/inc1.exp
@@ -1,88 +1,87 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
-      <pseduo_op id="5" rsc_id="rsc1" operation="start" allow_fail="false">
+      <pseudo_event id="5" rsc_id="rsc1" operation="start" allow_fail="false">
         <resource id="rsc1" priority="1.0" max_incarnations="5" max_per_node="2"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
-      <pseduo_op id="6" rsc_id="rsc1" operation="started" allow_fail="false">
+      <pseudo_event id="6" rsc_id="rsc1" operation="started" allow_fail="false">
         <resource id="rsc1" priority="1.0" max_incarnations="5" max_per_node="2"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1:child_rsc1:0" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1:child_rsc1:1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="3" rsc_id="rsc1:child_rsc1:2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1:child_rsc1:0" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="5" rsc_id="rsc1" operation="start" allow_fail="false"/>
+        <pseudo_event id="5" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="3">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1:child_rsc1:1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:1"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="5" rsc_id="rsc1" operation="start" allow_fail="false"/>
+        <pseudo_event id="5" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="4">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1:child_rsc1:2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:2"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="5" rsc_id="rsc1" operation="start" allow_fail="false"/>
+        <pseudo_event id="5" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="5">
     <action_set>
       <rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:3"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="5" rsc_id="rsc1" operation="start" allow_fail="false"/>
+        <pseudo_event id="5" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/inc1.te.exp b/crm/pengine/testcases/inc1.te.exp
new file mode 100644
index 0000000000..30ecdf533e
--- /dev/null
+++ b/crm/pengine/testcases/inc1.te.exp
@@ -0,0 +1,100 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 5] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 1] Pending
+	[Input 2] Pending
+	[Input 3] Pending
+	[Input 4] Pending
+	[Action 6] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] In-flight (rsc: start rsc1:child_rsc1:0 on node1)
+Synapse 3 has completed
+	[Action 2] In-flight (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 4 has completed
+	[Action 3] In-flight (rsc: start rsc1:child_rsc1:2 on node1)
+Synapse 5 has completed
+	[Action 4] In-flight (rsc: start rsc1:child_rsc1:3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 5] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 1] Satisfied
+	[Input 2] Pending
+	[Input 3] Pending
+	[Input 4] Pending
+	[Action 6] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1:0 on node1)
+Synapse 3 has completed
+	[Action 2] In-flight (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 4 has completed
+	[Action 3] In-flight (rsc: start rsc1:child_rsc1:2 on node1)
+Synapse 5 has completed
+	[Action 4] In-flight (rsc: start rsc1:child_rsc1:3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 5] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 1] Satisfied
+	[Input 2] Satisfied
+	[Input 3] Pending
+	[Input 4] Pending
+	[Action 6] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1:0 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 4 has completed
+	[Action 3] In-flight (rsc: start rsc1:child_rsc1:2 on node1)
+Synapse 5 has completed
+	[Action 4] In-flight (rsc: start rsc1:child_rsc1:3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 5] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 1] Satisfied
+	[Input 2] Satisfied
+	[Input 3] Satisfied
+	[Input 4] Pending
+	[Action 6] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1:0 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc1:child_rsc1:2 on node1)
+Synapse 5 has completed
+	[Action 4] In-flight (rsc: start rsc1:child_rsc1:3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 5] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 6] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1:0 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc1:child_rsc1:2 on node1)
+Synapse 5 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc1:3 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 5] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 6] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 1] Completed (rsc: start rsc1:child_rsc1:0 on node1)
+Synapse 3 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 4 has completed
+	[Action 3] Completed (rsc: start rsc1:child_rsc1:2 on node1)
+Synapse 5 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc1:3 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/inc2.exp b/crm/pengine/testcases/inc2.exp
index 7d9bc41bf0..3c408662d7 100644
--- a/crm/pengine/testcases/inc2.exp
+++ b/crm/pengine/testcases/inc2.exp
@@ -1,133 +1,132 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
-      <pseduo_op id="6" rsc_id="rsc1" operation="start" allow_fail="false">
+      <pseudo_event id="6" rsc_id="rsc1" operation="start" allow_fail="false">
         <resource id="rsc1" priority="1.0" max_incarnations="5" max_per_node="2"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
+        <pseudo_event id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
-      <pseduo_op id="7" rsc_id="rsc1" operation="started" allow_fail="false">
+      <pseudo_event id="7" rsc_id="rsc1" operation="started" allow_fail="false">
         <resource id="rsc1" priority="1.0" max_incarnations="5" max_per_node="2"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1:child_rsc1:1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
-      <pseduo_op id="8" rsc_id="rsc1" operation="stop" allow_fail="false">
+      <pseudo_event id="8" rsc_id="rsc1" operation="stop" allow_fail="false">
         <resource id="rsc1" priority="1.0" max_incarnations="5" max_per_node="2"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="3">
     <action_set>
-      <pseduo_op id="9" rsc_id="rsc1" operation="stopped" allow_fail="false">
+      <pseudo_event id="9" rsc_id="rsc1" operation="stopped" allow_fail="false">
         <resource id="rsc1" priority="1.0" max_incarnations="5" max_per_node="2"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1:child_rsc1:1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="3" rsc_id="rsc1:child_rsc1:3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="5" rsc_id="rsc1:child_rsc1:4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="4">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1:child_rsc1:1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:1"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
+        <pseudo_event id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="5">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1:child_rsc1:1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:1"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1:child_rsc1:1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
-        <pseduo_op id="6" rsc_id="rsc1" operation="start" allow_fail="false"/>
+        <pseudo_event id="6" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="6">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1:child_rsc1:3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:3"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
+        <pseudo_event id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="7">
     <action_set>
       <rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:3"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc1:child_rsc1:3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
-        <pseduo_op id="6" rsc_id="rsc1" operation="start" allow_fail="false"/>
+        <pseudo_event id="6" rsc_id="rsc1" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="8">
     <action_set>
       <rsc_op id="5" rsc_id="rsc1:child_rsc1:4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:4"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
+        <pseudo_event id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/inc2.te.exp b/crm/pengine/testcases/inc2.te.exp
new file mode 100644
index 0000000000..23371cfa62
--- /dev/null
+++ b/crm/pengine/testcases/inc2.te.exp
@@ -0,0 +1,165 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Pending
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Pending
+	[Input 3] Pending
+	[Input 5] Pending
+	[Action 9] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] In-flight (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 is pending
+	[Input 1] Pending
+	[Input 6] Satisfied
+	[Action 2] Pending (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] In-flight (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 6] Satisfied
+	[Action 4] Pending (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] In-flight (rsc: stop rsc1:child_rsc1:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Pending
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Satisfied
+	[Input 3] Pending
+	[Input 5] Pending
+	[Action 9] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] In-flight (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] In-flight (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 6] Satisfied
+	[Action 4] Pending (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] In-flight (rsc: stop rsc1:child_rsc1:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Pending
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Satisfied
+	[Input 3] Satisfied
+	[Input 5] Pending
+	[Action 9] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] In-flight (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] In-flight (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] In-flight (rsc: stop rsc1:child_rsc1:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Pending
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 9] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] In-flight (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] In-flight (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc1:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Satisfied
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 9] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] In-flight (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc1:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 7] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 9] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc1:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 7] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 9] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc1:4 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/inc3.exp b/crm/pengine/testcases/inc3.exp
index 3404e024e9..23e9251e58 100644
--- a/crm/pengine/testcases/inc3.exp
+++ b/crm/pengine/testcases/inc3.exp
@@ -1,240 +1,286 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
-      <pseduo_op id="6" rsc_id="rsc1" operation="start" allow_fail="false">
+      <pseudo_event id="6" rsc_id="rsc1" operation="start" allow_fail="false">
         <resource id="rsc1" priority="1.0" max_incarnations="5" max_per_node="2"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
+        <pseudo_event id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
-      <pseduo_op id="7" rsc_id="rsc1" operation="started" allow_fail="false">
+      <pseudo_event id="7" rsc_id="rsc1" operation="started" allow_fail="false">
         <resource id="rsc1" priority="1.0" max_incarnations="5" max_per_node="2"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
+      <trigger>
+        <rsc_op id="2" rsc_id="rsc1:child_rsc1:1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
+      </trigger>
       <trigger>
         <rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
-      <pseduo_op id="8" rsc_id="rsc1" operation="stop" allow_fail="false">
+      <pseudo_event id="8" rsc_id="rsc1" operation="stop" allow_fail="false">
         <resource id="rsc1" priority="1.0" max_incarnations="5" max_per_node="2"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="19" rsc_id="rsc2" operation="stopped" allow_fail="false"/>
+        <pseudo_event id="19" rsc_id="rsc2" operation="stopped" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="3">
     <action_set>
-      <pseduo_op id="9" rsc_id="rsc1" operation="stopped" allow_fail="false">
+      <pseudo_event id="9" rsc_id="rsc1" operation="stopped" allow_fail="false">
         <resource id="rsc1" priority="1.0" max_incarnations="5" max_per_node="2"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" rsc_id="rsc1:child_rsc1:1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
+      </trigger>
+      <trigger>
+        <rsc_op id="3" rsc_id="rsc1:child_rsc1:3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
+      </trigger>
+      <trigger>
+        <rsc_op id="5" rsc_id="rsc1:child_rsc1:4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
+      </trigger>
+    </inputs>
   </synapse>
-  <synapse>
+  <synapse id="4">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1:child_rsc1:1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:1"/>
         <args/>
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <pseudo_event id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
+      </trigger>
+    </inputs>
   </synapse>
-  <synapse>
+  <synapse id="5">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1:child_rsc1:1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:1"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1:child_rsc1:1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
+      <trigger>
+        <pseudo_event id="6" rsc_id="rsc1" operation="start" allow_fail="false"/>
+      </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="6">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1:child_rsc1:3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:3"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="5" rsc_id="rsc1:child_rsc1:4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
-      </trigger>
-      <trigger>
-        <pseduo_op id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
+        <pseudo_event id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="7">
     <action_set>
       <rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:3"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc1:child_rsc1:3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
+      <trigger>
+        <pseudo_event id="6" rsc_id="rsc1" operation="start" allow_fail="false"/>
+      </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="8">
     <action_set>
       <rsc_op id="5" rsc_id="rsc1:child_rsc1:4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc1:child_rsc1:4"/>
         <args/>
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <pseudo_event id="8" rsc_id="rsc1" operation="stop" allow_fail="false"/>
+      </trigger>
+    </inputs>
   </synapse>
-  <synapse>
+  <synapse id="9">
     <action_set>
-      <pseduo_op id="16" rsc_id="rsc2" operation="start" allow_fail="false">
+      <pseudo_event id="16" rsc_id="rsc2" operation="start" allow_fail="false">
         <resource id="rsc2" priority="1.0" max_incarnations="5" max_per_node="3"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="7" rsc_id="rsc1" operation="started" allow_fail="false"/>
+        <pseudo_event id="7" rsc_id="rsc1" operation="started" allow_fail="false"/>
       </trigger>
       <trigger>
-        <pseduo_op id="18" rsc_id="rsc2" operation="stop" allow_fail="false"/>
+        <pseudo_event id="18" rsc_id="rsc2" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="10">
     <action_set>
-      <pseduo_op id="17" rsc_id="rsc2" operation="started" allow_fail="false">
+      <pseudo_event id="17" rsc_id="rsc2" operation="started" allow_fail="false">
         <resource id="rsc2" priority="1.0" max_incarnations="5" max_per_node="3"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="11" rsc_id="rsc2:child_rsc2:0" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
+      <trigger>
+        <rsc_op id="13" rsc_id="rsc2:child_rsc2:2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
+      </trigger>
       <trigger>
         <rsc_op id="15" rsc_id="rsc2:child_rsc2:4" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="11">
     <action_set>
-      <pseduo_op id="18" rsc_id="rsc2" operation="stop" allow_fail="false">
+      <pseudo_event id="18" rsc_id="rsc2" operation="stop" allow_fail="false">
         <resource id="rsc2" priority="1.0" max_incarnations="5" max_per_node="3"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="12">
     <action_set>
-      <pseduo_op id="19" rsc_id="rsc2" operation="stopped" allow_fail="false">
+      <pseudo_event id="19" rsc_id="rsc2" operation="stopped" allow_fail="false">
         <resource id="rsc2" priority="1.0" max_incarnations="5" max_per_node="3"/>
         <args/>
-      </pseduo_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="10" rsc_id="rsc2:child_rsc2:0" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
+      <trigger>
+        <rsc_op id="12" rsc_id="rsc2:child_rsc2:2" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
+      </trigger>
+      <trigger>
+        <rsc_op id="14" rsc_id="rsc2:child_rsc2:4" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
+      </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="13">
     <action_set>
       <rsc_op id="10" rsc_id="rsc2:child_rsc2:0" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc2:0"/>
         <args/>
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <pseudo_event id="18" rsc_id="rsc2" operation="stop" allow_fail="false"/>
+      </trigger>
+    </inputs>
   </synapse>
-  <synapse>
+  <synapse id="14">
     <action_set>
       <rsc_op id="11" rsc_id="rsc2:child_rsc2:0" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc2:0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="10" rsc_id="rsc2:child_rsc2:0" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
-        <pseduo_op id="16" rsc_id="rsc2" operation="start" allow_fail="false"/>
+        <pseudo_event id="16" rsc_id="rsc2" operation="start" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="15">
     <action_set>
       <rsc_op id="12" rsc_id="rsc2:child_rsc2:2" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc2:2"/>
         <args/>
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <pseudo_event id="18" rsc_id="rsc2" operation="stop" allow_fail="false"/>
+      </trigger>
+    </inputs>
   </synapse>
-  <synapse>
+  <synapse id="16">
     <action_set>
       <rsc_op id="13" rsc_id="rsc2:child_rsc2:2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc2:2"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="12" rsc_id="rsc2:child_rsc2:2" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
+      <trigger>
+        <pseudo_event id="16" rsc_id="rsc2" operation="start" allow_fail="false"/>
+      </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="17">
     <action_set>
       <rsc_op id="14" rsc_id="rsc2:child_rsc2:4" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc2:4"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseduo_op id="18" rsc_id="rsc2" operation="stop" allow_fail="false"/>
+        <pseudo_event id="18" rsc_id="rsc2" operation="stop" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="18">
     <action_set>
       <rsc_op id="15" rsc_id="rsc2:child_rsc2:4" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource class="heartbeat" type="apache" priority="1.0" id="rsc2:child_rsc2:4"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="14" rsc_id="rsc2:child_rsc2:4" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
+      <trigger>
+        <pseudo_event id="16" rsc_id="rsc2" operation="start" allow_fail="false"/>
+      </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/inc3.te.exp b/crm/pengine/testcases/inc3.te.exp
new file mode 100644
index 0000000000..dd9ece81f0
--- /dev/null
+++ b/crm/pengine/testcases/inc3.te.exp
@@ -0,0 +1,693 @@
+Start Transitioner state
+Synapse 0 is pending
+	[Input 8] Pending
+	[Action 6] Pending (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Pending
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 is pending
+	[Input 19] Pending
+	[Action 8] Pending (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Pending
+	[Input 3] Pending
+	[Input 5] Pending
+	[Action 9] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 is pending
+	[Input 8] Pending
+	[Action 1] Pending (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 is pending
+	[Input 1] Pending
+	[Input 6] Pending
+	[Action 2] Pending (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 is pending
+	[Input 8] Pending
+	[Action 3] Pending (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 6] Pending
+	[Action 4] Pending (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 is pending
+	[Input 8] Pending
+	[Action 5] Pending (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Input 18] Satisfied
+	[Action 16] Pending (pseduo: start rsc2 on (null))
+Synapse 10 is pending
+	[Input 11] Pending
+	[Input 13] Pending
+	[Input 15] Pending
+	[Action 17] Pending (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 is pending
+	[Input 10] Pending
+	[Input 12] Pending
+	[Input 14] Pending
+	[Action 19] Pending (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] In-flight (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 is pending
+	[Input 10] Pending
+	[Input 16] Pending
+	[Action 11] Pending (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] In-flight (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 is pending
+	[Input 12] Pending
+	[Input 16] Pending
+	[Action 13] Pending (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] In-flight (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 is pending
+	[Input 14] Pending
+	[Input 16] Pending
+	[Action 15] Pending (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 is pending
+	[Input 8] Pending
+	[Action 6] Pending (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Pending
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 is pending
+	[Input 19] Pending
+	[Action 8] Pending (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Pending
+	[Input 3] Pending
+	[Input 5] Pending
+	[Action 9] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 is pending
+	[Input 8] Pending
+	[Action 1] Pending (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 is pending
+	[Input 1] Pending
+	[Input 6] Pending
+	[Action 2] Pending (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 is pending
+	[Input 8] Pending
+	[Action 3] Pending (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 6] Pending
+	[Action 4] Pending (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 is pending
+	[Input 8] Pending
+	[Action 5] Pending (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Input 18] Satisfied
+	[Action 16] Pending (pseduo: start rsc2 on (null))
+Synapse 10 is pending
+	[Input 11] Pending
+	[Input 13] Pending
+	[Input 15] Pending
+	[Action 17] Pending (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 is pending
+	[Input 10] Satisfied
+	[Input 12] Pending
+	[Input 14] Pending
+	[Action 19] Pending (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] Completed (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 is pending
+	[Input 10] Satisfied
+	[Input 16] Pending
+	[Action 11] Pending (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] In-flight (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 is pending
+	[Input 12] Pending
+	[Input 16] Pending
+	[Action 13] Pending (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] In-flight (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 is pending
+	[Input 14] Pending
+	[Input 16] Pending
+	[Action 15] Pending (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 is pending
+	[Input 8] Pending
+	[Action 6] Pending (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Pending
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 is pending
+	[Input 19] Pending
+	[Action 8] Pending (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Pending
+	[Input 3] Pending
+	[Input 5] Pending
+	[Action 9] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 is pending
+	[Input 8] Pending
+	[Action 1] Pending (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 is pending
+	[Input 1] Pending
+	[Input 6] Pending
+	[Action 2] Pending (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 is pending
+	[Input 8] Pending
+	[Action 3] Pending (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 6] Pending
+	[Action 4] Pending (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 is pending
+	[Input 8] Pending
+	[Action 5] Pending (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Input 18] Satisfied
+	[Action 16] Pending (pseduo: start rsc2 on (null))
+Synapse 10 is pending
+	[Input 11] Pending
+	[Input 13] Pending
+	[Input 15] Pending
+	[Action 17] Pending (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 is pending
+	[Input 10] Satisfied
+	[Input 12] Satisfied
+	[Input 14] Pending
+	[Action 19] Pending (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] Completed (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 is pending
+	[Input 10] Satisfied
+	[Input 16] Pending
+	[Action 11] Pending (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 is pending
+	[Input 12] Satisfied
+	[Input 16] Pending
+	[Action 13] Pending (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] In-flight (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 is pending
+	[Input 14] Pending
+	[Input 16] Pending
+	[Action 15] Pending (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Pending
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Pending
+	[Input 3] Pending
+	[Input 5] Pending
+	[Action 9] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] In-flight (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 is pending
+	[Input 1] Pending
+	[Input 6] Satisfied
+	[Action 2] Pending (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] In-flight (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 6] Satisfied
+	[Action 4] Pending (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] In-flight (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Input 18] Satisfied
+	[Action 16] Pending (pseduo: start rsc2 on (null))
+Synapse 10 is pending
+	[Input 11] Pending
+	[Input 13] Pending
+	[Input 15] Pending
+	[Action 17] Pending (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] Completed (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 is pending
+	[Input 10] Satisfied
+	[Input 16] Pending
+	[Action 11] Pending (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 is pending
+	[Input 12] Satisfied
+	[Input 16] Pending
+	[Action 13] Pending (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 is pending
+	[Input 14] Satisfied
+	[Input 16] Pending
+	[Action 15] Pending (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Pending
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Satisfied
+	[Input 3] Pending
+	[Input 5] Pending
+	[Action 9] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] In-flight (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] In-flight (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 is pending
+	[Input 3] Pending
+	[Input 6] Satisfied
+	[Action 4] Pending (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] In-flight (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Input 18] Satisfied
+	[Action 16] Pending (pseduo: start rsc2 on (null))
+Synapse 10 is pending
+	[Input 11] Pending
+	[Input 13] Pending
+	[Input 15] Pending
+	[Action 17] Pending (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] Completed (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 is pending
+	[Input 10] Satisfied
+	[Input 16] Pending
+	[Action 11] Pending (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 is pending
+	[Input 12] Satisfied
+	[Input 16] Pending
+	[Action 13] Pending (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 is pending
+	[Input 14] Satisfied
+	[Input 16] Pending
+	[Action 15] Pending (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Pending
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 is pending
+	[Input 1] Satisfied
+	[Input 3] Satisfied
+	[Input 5] Pending
+	[Action 9] Pending (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] In-flight (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] In-flight (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] In-flight (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Input 18] Satisfied
+	[Action 16] Pending (pseduo: start rsc2 on (null))
+Synapse 10 is pending
+	[Input 11] Pending
+	[Input 13] Pending
+	[Input 15] Pending
+	[Action 17] Pending (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] Completed (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 is pending
+	[Input 10] Satisfied
+	[Input 16] Pending
+	[Action 11] Pending (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 is pending
+	[Input 12] Satisfied
+	[Input 16] Pending
+	[Action 13] Pending (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 is pending
+	[Input 14] Satisfied
+	[Input 16] Pending
+	[Action 15] Pending (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Pending
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 9] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] In-flight (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] In-flight (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Input 18] Satisfied
+	[Action 16] Pending (pseduo: start rsc2 on (null))
+Synapse 10 is pending
+	[Input 11] Pending
+	[Input 13] Pending
+	[Input 15] Pending
+	[Action 17] Pending (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] Completed (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 is pending
+	[Input 10] Satisfied
+	[Input 16] Pending
+	[Action 11] Pending (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 is pending
+	[Input 12] Satisfied
+	[Input 16] Pending
+	[Action 13] Pending (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 is pending
+	[Input 14] Satisfied
+	[Input 16] Pending
+	[Action 15] Pending (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 is pending
+	[Input 2] Satisfied
+	[Input 4] Pending
+	[Action 7] Pending (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 9] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] In-flight (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 is pending
+	[Input 7] Pending
+	[Input 18] Satisfied
+	[Action 16] Pending (pseduo: start rsc2 on (null))
+Synapse 10 is pending
+	[Input 11] Pending
+	[Input 13] Pending
+	[Input 15] Pending
+	[Action 17] Pending (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] Completed (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 is pending
+	[Input 10] Satisfied
+	[Input 16] Pending
+	[Action 11] Pending (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 is pending
+	[Input 12] Satisfied
+	[Input 16] Pending
+	[Action 13] Pending (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 is pending
+	[Input 14] Satisfied
+	[Input 16] Pending
+	[Action 15] Pending (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 7] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 9] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 has completed
+	[Action 16] Completed (pseduo: start rsc2 on (null))
+Synapse 10 is pending
+	[Input 11] Pending
+	[Input 13] Pending
+	[Input 15] Pending
+	[Action 17] Pending (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] Completed (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 has completed
+	[Action 11] In-flight (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 has completed
+	[Action 13] In-flight (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 has completed
+	[Action 15] In-flight (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 7] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 9] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 has completed
+	[Action 16] Completed (pseduo: start rsc2 on (null))
+Synapse 10 is pending
+	[Input 11] Satisfied
+	[Input 13] Pending
+	[Input 15] Pending
+	[Action 17] Pending (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] Completed (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 has completed
+	[Action 11] Completed (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 has completed
+	[Action 13] In-flight (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 has completed
+	[Action 15] In-flight (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 7] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 9] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 has completed
+	[Action 16] Completed (pseduo: start rsc2 on (null))
+Synapse 10 is pending
+	[Input 11] Satisfied
+	[Input 13] Satisfied
+	[Input 15] Pending
+	[Action 17] Pending (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] Completed (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 has completed
+	[Action 11] Completed (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 has completed
+	[Action 15] In-flight (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 7] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 9] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 has completed
+	[Action 16] Completed (pseduo: start rsc2 on (null))
+Synapse 10 has completed
+	[Action 17] Completed (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] Completed (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 has completed
+	[Action 11] Completed (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 6] Completed (pseduo: start rsc1 on (null))
+Synapse 1 has completed
+	[Action 7] Completed (pseduo: started rsc1 on (null))
+Synapse 2 has completed
+	[Action 8] Completed (pseduo: stop rsc1 on (null))
+Synapse 3 has completed
+	[Action 9] Completed (pseduo: stopped rsc1 on (null))
+Synapse 4 has completed
+	[Action 1] Completed (rsc: stop rsc1:child_rsc1:1 on node1)
+Synapse 5 has completed
+	[Action 2] Completed (rsc: start rsc1:child_rsc1:1 on node2)
+Synapse 6 has completed
+	[Action 3] Completed (rsc: stop rsc1:child_rsc1:3 on node1)
+Synapse 7 has completed
+	[Action 4] Completed (rsc: start rsc1:child_rsc1:3 on node2)
+Synapse 8 has completed
+	[Action 5] Completed (rsc: stop rsc1:child_rsc1:4 on node1)
+Synapse 9 has completed
+	[Action 16] Completed (pseduo: start rsc2 on (null))
+Synapse 10 has completed
+	[Action 17] Completed (pseduo: started rsc2 on (null))
+Synapse 11 has completed
+	[Action 18] Completed (pseduo: stop rsc2 on (null))
+Synapse 12 has completed
+	[Action 19] Completed (pseduo: stopped rsc2 on (null))
+Synapse 13 has completed
+	[Action 10] Completed (rsc: stop rsc2:child_rsc2:0 on node2)
+Synapse 14 has completed
+	[Action 11] Completed (rsc: start rsc2:child_rsc2:0 on node1)
+Synapse 15 has completed
+	[Action 12] Completed (rsc: stop rsc2:child_rsc2:2 on node2)
+Synapse 16 has completed
+	[Action 13] Completed (rsc: start rsc2:child_rsc2:2 on node1)
+Synapse 17 has completed
+	[Action 14] Completed (rsc: stop rsc2:child_rsc2:4 on node2)
+Synapse 18 has completed
+	[Action 15] Completed (rsc: start rsc2:child_rsc2:4 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/inc3.xml b/crm/pengine/testcases/inc3.xml
index 60f9a5cd13..7228bbaa63 100644
--- a/crm/pengine/testcases/inc3.xml
+++ b/crm/pengine/testcases/inc3.xml
@@ -1,57 +1,57 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
  <configuration>
   <nodes>
     <node id="uuid1" uname="node1" type="member"/>
     <node id="uuid2" uname="node2" type="member"/>
   </nodes>
   <resources>
     <incarnation id="rsc1" priority="1.0" max_incarnations="5" max_per_node="2">
       <resource id="child_rsc1" class="heartbeat" type="apache" priority="1.0"/>
     </incarnation>
     <incarnation id="rsc2" priority="1.0" max_incarnations="5" max_per_node="3">
       <resource id="child_rsc2" class="heartbeat" type="apache" priority="1.0"/>
     </incarnation>
   </resources>
   <constraints>
     <rsc_order id="order1" from="rsc1" type="before" to="rsc2"/>
-      <rsc_location id="run_rsc1" rsc="rsc1">
-	<rule id="can1" result="can"/>
-      </rsc_location>
-      <rsc_location id="run_rsc2" rsc="rsc2">
-	<rule id="can2" result="can"/>
-      </rsc_location>
+    <rsc_location id="run_rsc1" rsc="rsc1">
+      <rule id="can1" result="can"/>
+    </rsc_location>
+    <rsc_location id="run_rsc2" rsc="rsc2">
+      <rule id="can2" result="can"/>
+    </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="uuid1" 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:child_rsc1:0" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node1"/>
           <lrm_resource id="rsc1:child_rsc1:1" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node1"/>
           <lrm_resource id="rsc1:child_rsc1:2" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node1"/>
           <lrm_resource id="rsc1:child_rsc1:3" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node1"/>
           <lrm_resource id="rsc1:child_rsc1:4" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node1"/>
         </lrm_resources>
       </lrm>
     </node_state>
      <node_state id="uuid2" 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:child_rsc2:0" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node2"/>
           <lrm_resource id="rsc2:child_rsc2:1" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node2"/>
           <lrm_resource id="rsc2:child_rsc2:2" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node2"/>
           <lrm_resource id="rsc2:child_rsc2:3" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node2"/>
           <lrm_resource id="rsc2:child_rsc2:4" 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/multi1.exp b/crm/pengine/testcases/multi1.exp
index dce0e40651..bdb94d7762 100644
--- a/crm/pengine/testcases/multi1.exp
+++ b/crm/pengine/testcases/multi1.exp
@@ -1,39 +1,38 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="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" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1" operation="stop" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/multi1.te.exp b/crm/pengine/testcases/multi1.te.exp
new file mode 100644
index 0000000000..0f31cda64a
--- /dev/null
+++ b/crm/pengine/testcases/multi1.te.exp
@@ -0,0 +1,44 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: stop rsc1 on node2)
+Synapse 2 is pending
+	[Input 1] Pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: stop rsc1 on node2)
+Synapse 2 is pending
+	[Input 1] Satisfied
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: stop rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: stop rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: stop rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/nodefail1.exp b/crm/pengine/testcases/nodefail1.exp
index 27930a048f..7bab6aa60c 100644
--- a/crm/pengine/testcases/nodefail1.exp
+++ b/crm/pengine/testcases/nodefail1.exp
@@ -1,26 +1,25 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D79" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="3" operation="stonith" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <crm_event id="3" operation="stonith" allow_fail="false">
         <args target="node1"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/nodefail1.te.exp b/crm/pengine/testcases/nodefail1.te.exp
new file mode 100644
index 0000000000..b8ffd444aa
--- /dev/null
+++ b/crm/pengine/testcases/nodefail1.te.exp
@@ -0,0 +1,10 @@
+Start Transitioner state
+Synapse 0 is pending
+	[Input 3] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+Synapse 1 has completed
+	[Action 3] In-flight (crm: stonith (null) on (null))
+End Transitioner state
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
diff --git a/crm/pengine/testcases/nodefail2.exp b/crm/pengine/testcases/nodefail2.exp
index f1d8333902..ed28c322e6 100644
--- a/crm/pengine/testcases/nodefail2.exp
+++ b/crm/pengine/testcases/nodefail2.exp
@@ -1,27 +1,26 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="block"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D79" allow_fail="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" operation="stop" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/nodefail2.te.exp b/crm/pengine/testcases/nodefail2.te.exp
new file mode 100644
index 0000000000..002fec5707
--- /dev/null
+++ b/crm/pengine/testcases/nodefail2.te.exp
@@ -0,0 +1,25 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/nodefail3.exp b/crm/pengine/testcases/nodefail3.exp
index 024d070e3d..610e64139c 100644
--- a/crm/pengine/testcases/nodefail3.exp
+++ b/crm/pengine/testcases/nodefail3.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D79" allow_fail="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.te.exp b/crm/pengine/testcases/nodefail3.te.exp
new file mode 100644
index 0000000000..bcbcefa934
--- /dev/null
+++ b/crm/pengine/testcases/nodefail3.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/nodefail4.exp b/crm/pengine/testcases/nodefail4.exp
index e3bd69d14c..27477e6a85 100644
--- a/crm/pengine/testcases/nodefail4.exp
+++ b/crm/pengine/testcases/nodefail4.exp
@@ -1,22 +1,21 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D79" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="block"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <crm_event id="3" operation="stonith" allow_fail="false">
         <args target="node1"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/nodefail4.te.exp b/crm/pengine/testcases/nodefail4.te.exp
new file mode 100644
index 0000000000..d35a8cb20f
--- /dev/null
+++ b/crm/pengine/testcases/nodefail4.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node2)
+Synapse 1 has completed
+	[Action 3] In-flight (crm: stonith (null) on (null))
+End Transitioner state
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
diff --git a/crm/pengine/testcases/nodefail5.exp b/crm/pengine/testcases/nodefail5.exp
index f33261e736..8cc644d48d 100644
--- a/crm/pengine/testcases/nodefail5.exp
+++ b/crm/pengine/testcases/nodefail5.exp
@@ -1,27 +1,26 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D79" allow_fail="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" operation="stop" on_node="node1" on_node_uuid="8661583D-08B0-11D9-B627-000A95B71D78" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/nodefail5.te.exp b/crm/pengine/testcases/nodefail5.te.exp
new file mode 100644
index 0000000000..002fec5707
--- /dev/null
+++ b/crm/pengine/testcases/nodefail5.te.exp
@@ -0,0 +1,25 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/order1.exp b/crm/pengine/testcases/order1.exp
index cd6d30204d..34a8fcc623 100644
--- a/crm/pengine/testcases/order1.exp
+++ b/crm/pengine/testcases/order1.exp
@@ -1,40 +1,39 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc2" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
       <rsc_op id="3" rsc_id="rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/order1.te.exp b/crm/pengine/testcases/order1.te.exp
new file mode 100644
index 0000000000..3eea33bee3
--- /dev/null
+++ b/crm/pengine/testcases/order1.te.exp
@@ -0,0 +1,43 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc2 on node1)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc2 on node1)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] In-flight (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: start rsc3 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/order2.exp b/crm/pengine/testcases/order2.exp
index 70419fb6a4..393dd0c962 100644
--- a/crm/pengine/testcases/order2.exp
+++ b/crm/pengine/testcases/order2.exp
@@ -1,52 +1,51 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc2" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="4" rsc_id="rsc4" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
       <rsc_op id="3" rsc_id="rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="3">
     <action_set>
       <rsc_op id="4" rsc_id="rsc4" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc4" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/order2.te.exp b/crm/pengine/testcases/order2.te.exp
new file mode 100644
index 0000000000..cf311f5fc4
--- /dev/null
+++ b/crm/pengine/testcases/order2.te.exp
@@ -0,0 +1,67 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Input 4] Pending
+	[Action 2] Pending (rsc: start rsc2 on node1)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc3 on node1)
+Synapse 3 has completed
+	[Action 4] In-flight (rsc: start rsc4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Satisfied
+	[Input 4] Pending
+	[Action 2] Pending (rsc: start rsc2 on node1)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc3 on node1)
+Synapse 3 has completed
+	[Action 4] In-flight (rsc: start rsc4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc2 on node1)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc3 on node1)
+Synapse 3 has completed
+	[Action 4] Completed (rsc: start rsc4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] In-flight (rsc: start rsc3 on node1)
+Synapse 3 has completed
+	[Action 4] Completed (rsc: start rsc4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: start rsc3 on node1)
+Synapse 3 has completed
+	[Action 4] Completed (rsc: start rsc4 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: start rsc3 on node1)
+Synapse 3 has completed
+	[Action 4] Completed (rsc: start rsc4 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/order3.exp b/crm/pengine/testcases/order3.exp
index aef1a49d6b..089971a21c 100644
--- a/crm/pengine/testcases/order3.exp
+++ b/crm/pengine/testcases/order3.exp
@@ -1,114 +1,113 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
       <rsc_op id="3" rsc_id="rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc2" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" rsc_id="rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="3">
     <action_set>
       <rsc_op id="4" rsc_id="rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource id="rsc2" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="8" rsc_id="rsc4" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="3" rsc_id="rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="4">
     <action_set>
       <rsc_op id="5" rsc_id="rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="5">
     <action_set>
       <rsc_op id="6" rsc_id="rsc3" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="4" rsc_id="rsc2" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
       </trigger>
       <trigger>
         <rsc_op id="5" rsc_id="rsc3" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="6">
     <action_set>
       <rsc_op id="7" rsc_id="rsc4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc4" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" rsc_id="rsc2" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="7">
     <action_set>
       <rsc_op id="8" rsc_id="rsc4" operation="start" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
         <resource id="rsc4" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="7" rsc_id="rsc4" operation="stop" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/order3.te.exp b/crm/pengine/testcases/order3.te.exp
new file mode 100644
index 0000000000..2b602d56e0
--- /dev/null
+++ b/crm/pengine/testcases/order3.te.exp
@@ -0,0 +1,224 @@
+Start Transitioner state
+Synapse 0 is pending
+	[Input 3] Pending
+	[Action 1] Pending (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+Synapse 2 is pending
+	[Input 5] Pending
+	[Action 3] Pending (rsc: stop rsc2 on node1)
+Synapse 3 is pending
+	[Input 2] Pending
+	[Input 8] Pending
+	[Input 3] Pending
+	[Action 4] Pending (rsc: start rsc2 on node2)
+Synapse 4 has completed
+	[Action 5] In-flight (rsc: stop rsc3 on node1)
+Synapse 5 is pending
+	[Input 4] Pending
+	[Input 5] Pending
+	[Action 6] Pending (rsc: start rsc3 on node2)
+Synapse 6 is pending
+	[Input 3] Pending
+	[Action 7] Pending (rsc: stop rsc4 on node1)
+Synapse 7 is pending
+	[Input 7] Pending
+	[Action 8] Pending (rsc: start rsc4 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 is pending
+	[Input 3] Pending
+	[Action 1] Pending (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] In-flight (rsc: stop rsc2 on node1)
+Synapse 3 is pending
+	[Input 2] Pending
+	[Input 8] Pending
+	[Input 3] Pending
+	[Action 4] Pending (rsc: start rsc2 on node2)
+Synapse 4 has completed
+	[Action 5] Completed (rsc: stop rsc3 on node1)
+Synapse 5 is pending
+	[Input 4] Pending
+	[Input 5] Satisfied
+	[Action 6] Pending (rsc: start rsc3 on node2)
+Synapse 6 is pending
+	[Input 3] Pending
+	[Action 7] Pending (rsc: stop rsc4 on node1)
+Synapse 7 is pending
+	[Input 7] Pending
+	[Action 8] Pending (rsc: start rsc4 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: stop rsc2 on node1)
+Synapse 3 is pending
+	[Input 2] Pending
+	[Input 8] Pending
+	[Input 3] Satisfied
+	[Action 4] Pending (rsc: start rsc2 on node2)
+Synapse 4 has completed
+	[Action 5] Completed (rsc: stop rsc3 on node1)
+Synapse 5 is pending
+	[Input 4] Pending
+	[Input 5] Satisfied
+	[Action 6] Pending (rsc: start rsc3 on node2)
+Synapse 6 has completed
+	[Action 7] In-flight (rsc: stop rsc4 on node1)
+Synapse 7 is pending
+	[Input 7] Pending
+	[Action 8] Pending (rsc: start rsc4 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: stop rsc2 on node1)
+Synapse 3 is pending
+	[Input 2] Pending
+	[Input 8] Pending
+	[Input 3] Satisfied
+	[Action 4] Pending (rsc: start rsc2 on node2)
+Synapse 4 has completed
+	[Action 5] Completed (rsc: stop rsc3 on node1)
+Synapse 5 is pending
+	[Input 4] Pending
+	[Input 5] Satisfied
+	[Action 6] Pending (rsc: start rsc3 on node2)
+Synapse 6 has completed
+	[Action 7] In-flight (rsc: stop rsc4 on node1)
+Synapse 7 is pending
+	[Input 7] Pending
+	[Action 8] Pending (rsc: start rsc4 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: stop rsc2 on node1)
+Synapse 3 is pending
+	[Input 2] Pending
+	[Input 8] Pending
+	[Input 3] Satisfied
+	[Action 4] Pending (rsc: start rsc2 on node2)
+Synapse 4 has completed
+	[Action 5] Completed (rsc: stop rsc3 on node1)
+Synapse 5 is pending
+	[Input 4] Pending
+	[Input 5] Satisfied
+	[Action 6] Pending (rsc: start rsc3 on node2)
+Synapse 6 has completed
+	[Action 7] Completed (rsc: stop rsc4 on node1)
+Synapse 7 has completed
+	[Action 8] In-flight (rsc: start rsc4 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: stop rsc2 on node1)
+Synapse 3 is pending
+	[Input 2] Satisfied
+	[Input 8] Pending
+	[Input 3] Satisfied
+	[Action 4] Pending (rsc: start rsc2 on node2)
+Synapse 4 has completed
+	[Action 5] Completed (rsc: stop rsc3 on node1)
+Synapse 5 is pending
+	[Input 4] Pending
+	[Input 5] Satisfied
+	[Action 6] Pending (rsc: start rsc3 on node2)
+Synapse 6 has completed
+	[Action 7] Completed (rsc: stop rsc4 on node1)
+Synapse 7 has completed
+	[Action 8] In-flight (rsc: start rsc4 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: stop rsc2 on node1)
+Synapse 3 has completed
+	[Action 4] In-flight (rsc: start rsc2 on node2)
+Synapse 4 has completed
+	[Action 5] Completed (rsc: stop rsc3 on node1)
+Synapse 5 is pending
+	[Input 4] Pending
+	[Input 5] Satisfied
+	[Action 6] Pending (rsc: start rsc3 on node2)
+Synapse 6 has completed
+	[Action 7] Completed (rsc: stop rsc4 on node1)
+Synapse 7 has completed
+	[Action 8] Completed (rsc: start rsc4 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: stop rsc2 on node1)
+Synapse 3 has completed
+	[Action 4] Completed (rsc: start rsc2 on node2)
+Synapse 4 has completed
+	[Action 5] Completed (rsc: stop rsc3 on node1)
+Synapse 5 has completed
+	[Action 6] In-flight (rsc: start rsc3 on node2)
+Synapse 6 has completed
+	[Action 7] Completed (rsc: stop rsc4 on node1)
+Synapse 7 has completed
+	[Action 8] Completed (rsc: start rsc4 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: stop rsc2 on node1)
+Synapse 3 has completed
+	[Action 4] Completed (rsc: start rsc2 on node2)
+Synapse 4 has completed
+	[Action 5] Completed (rsc: stop rsc3 on node1)
+Synapse 5 has completed
+	[Action 6] Completed (rsc: start rsc3 on node2)
+Synapse 6 has completed
+	[Action 7] Completed (rsc: stop rsc4 on node1)
+Synapse 7 has completed
+	[Action 8] Completed (rsc: start rsc4 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: stop rsc2 on node1)
+Synapse 3 has completed
+	[Action 4] Completed (rsc: start rsc2 on node2)
+Synapse 4 has completed
+	[Action 5] Completed (rsc: stop rsc3 on node1)
+Synapse 5 has completed
+	[Action 6] Completed (rsc: start rsc3 on node2)
+Synapse 6 has completed
+	[Action 7] Completed (rsc: stop rsc4 on node1)
+Synapse 7 has completed
+	[Action 8] Completed (rsc: start rsc4 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/order4.exp b/crm/pengine/testcases/order4.exp
index cd6d30204d..c27af84531 100644
--- a/crm/pengine/testcases/order4.exp
+++ b/crm/pengine/testcases/order4.exp
@@ -1,40 +1,38 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc2" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse>
     <action_set>
       <rsc_op id="3" rsc_id="rsc3" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/crm/pengine/testcases/order4.te.exp b/crm/pengine/testcases/order4.te.exp
new file mode 100644
index 0000000000..3eea33bee3
--- /dev/null
+++ b/crm/pengine/testcases/order4.te.exp
@@ -0,0 +1,43 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc2 on node1)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc2 on node1)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] In-flight (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: start rsc3 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: start rsc3 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/rsc_dep1.exp b/crm/pengine/testcases/rsc_dep1.exp
index 78a890d089..770f828218 100644
--- a/crm/pengine/testcases/rsc_dep1.exp
+++ b/crm/pengine/testcases/rsc_dep1.exp
@@ -1,23 +1,22 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="node2" allow_fail="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_dep1.te.exp b/crm/pengine/testcases/rsc_dep1.te.exp
new file mode 100644
index 0000000000..838a5c175d
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep1.te.exp
@@ -0,0 +1,24 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/rsc_dep10.exp b/crm/pengine/testcases/rsc_dep10.exp
index f856017a7f..c230eb6374 100644
--- a/crm/pengine/testcases/rsc_dep10.exp
+++ b/crm/pengine/testcases/rsc_dep10.exp
@@ -1,4 +1,3 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000"/>
+
diff --git a/crm/pengine/testcases/rsc_dep10.te.exp b/crm/pengine/testcases/rsc_dep10.te.exp
new file mode 100644
index 0000000000..74d64dc013
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep10.te.exp
@@ -0,0 +1,6 @@
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
diff --git a/crm/pengine/testcases/rsc_dep3.exp b/crm/pengine/testcases/rsc_dep3.exp
index 9c99991cc6..334fc5d3ca 100644
--- a/crm/pengine/testcases/rsc_dep3.exp
+++ b/crm/pengine/testcases/rsc_dep3.exp
@@ -1,23 +1,22 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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_dep3.te.exp b/crm/pengine/testcases/rsc_dep3.te.exp
new file mode 100644
index 0000000000..331467e580
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep3.te.exp
@@ -0,0 +1,24 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/rsc_dep5.exp b/crm/pengine/testcases/rsc_dep5.exp
index ee3f6dbb63..dbe6864e82 100644
--- a/crm/pengine/testcases/rsc_dep5.exp
+++ b/crm/pengine/testcases/rsc_dep5.exp
@@ -1,23 +1,22 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc3" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc3" class="heartbeat" type="apache" priority="3.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc2" operation="start" on_node="node2" on_node_uuid="node2" allow_fail="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_dep5.te.exp b/crm/pengine/testcases/rsc_dep5.te.exp
new file mode 100644
index 0000000000..540b34a631
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep5.te.exp
@@ -0,0 +1,24 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc3 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc2 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc3 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc2 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc3 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc3 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/rsc_dep7.exp b/crm/pengine/testcases/rsc_dep7.exp
index bdd24eb650..4b4cd08fbf 100644
--- a/crm/pengine/testcases/rsc_dep7.exp
+++ b/crm/pengine/testcases/rsc_dep7.exp
@@ -1,32 +1,31 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc3" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc3" class="heartbeat" type="apache" priority="3.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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_dep7.te.exp b/crm/pengine/testcases/rsc_dep7.te.exp
new file mode 100644
index 0000000000..7d5d6dde3a
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep7.te.exp
@@ -0,0 +1,40 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc3 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc3 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc3 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc3 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc3 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/rsc_location1.exp b/crm/pengine/testcases/rsc_location1.exp
index 9c99991cc6..334fc5d3ca 100644
--- a/crm/pengine/testcases/rsc_location1.exp
+++ b/crm/pengine/testcases/rsc_location1.exp
@@ -1,23 +1,22 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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_location1.te.exp b/crm/pengine/testcases/rsc_location1.te.exp
new file mode 100644
index 0000000000..331467e580
--- /dev/null
+++ b/crm/pengine/testcases/rsc_location1.te.exp
@@ -0,0 +1,24 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/rsc_location2.exp b/crm/pengine/testcases/rsc_location2.exp
index c2b319465f..24ea41e775 100644
--- a/crm/pengine/testcases/rsc_location2.exp
+++ b/crm/pengine/testcases/rsc_location2.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="node2" allow_fail="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.te.exp b/crm/pengine/testcases/rsc_location2.te.exp
new file mode 100644
index 0000000000..bcbcefa934
--- /dev/null
+++ b/crm/pengine/testcases/rsc_location2.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/rsc_location3.exp b/crm/pengine/testcases/rsc_location3.exp
index 30a2c9d3bb..9fd5c4ea08 100644
--- a/crm/pengine/testcases/rsc_location3.exp
+++ b/crm/pengine/testcases/rsc_location3.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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_location3.te.exp b/crm/pengine/testcases/rsc_location3.te.exp
new file mode 100644
index 0000000000..1ca7fdb506
--- /dev/null
+++ b/crm/pengine/testcases/rsc_location3.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc2 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/rsc_location4.exp b/crm/pengine/testcases/rsc_location4.exp
index ab59c723a0..ef5fba2106 100644
--- a/crm/pengine/testcases/rsc_location4.exp
+++ b/crm/pengine/testcases/rsc_location4.exp
@@ -1,36 +1,35 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc2" operation="start" on_node="node2" on_node_uuid="node2" allow_fail="false">
         <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="stop" on_node="node2" on_node_uuid="node2" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
       <rsc_op id="3" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" rsc_id="rsc1" operation="stop" on_node="node2" on_node_uuid="node2" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/rsc_location4.te.exp b/crm/pengine/testcases/rsc_location4.te.exp
new file mode 100644
index 0000000000..2bb04cccc1
--- /dev/null
+++ b/crm/pengine/testcases/rsc_location4.te.exp
@@ -0,0 +1,42 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc2 on node2)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: stop rsc1 on node2)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node2)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: stop rsc1 on node2)
+Synapse 2 is pending
+	[Input 2] Pending
+	[Action 3] Pending (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node2)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: stop rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node2)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: stop rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node2)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: stop rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/rsc_location5.exp b/crm/pengine/testcases/rsc_location5.exp
index 1bc928b284..4ae53043ba 100644
--- a/crm/pengine/testcases/rsc_location5.exp
+++ b/crm/pengine/testcases/rsc_location5.exp
@@ -1,27 +1,26 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="node2" allow_fail="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" operation="stop" on_node="node1" on_node_uuid="node1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/rsc_location5.te.exp b/crm/pengine/testcases/rsc_location5.te.exp
new file mode 100644
index 0000000000..002fec5707
--- /dev/null
+++ b/crm/pengine/testcases/rsc_location5.te.exp
@@ -0,0 +1,25 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/simple1.exp b/crm/pengine/testcases/simple1.exp
index f856017a7f..c230eb6374 100644
--- a/crm/pengine/testcases/simple1.exp
+++ b/crm/pengine/testcases/simple1.exp
@@ -1,4 +1,3 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000"/>
+
diff --git a/crm/pengine/testcases/simple1.te.exp b/crm/pengine/testcases/simple1.te.exp
new file mode 100644
index 0000000000..74d64dc013
--- /dev/null
+++ b/crm/pengine/testcases/simple1.te.exp
@@ -0,0 +1,6 @@
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
diff --git a/crm/pengine/testcases/simple10.exp b/crm/pengine/testcases/simple10.exp
index f856017a7f..c230eb6374 100644
--- a/crm/pengine/testcases/simple10.exp
+++ b/crm/pengine/testcases/simple10.exp
@@ -1,4 +1,3 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000"/>
+
diff --git a/crm/pengine/testcases/simple10.te.exp b/crm/pengine/testcases/simple10.te.exp
new file mode 100644
index 0000000000..74d64dc013
--- /dev/null
+++ b/crm/pengine/testcases/simple10.te.exp
@@ -0,0 +1,6 @@
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
diff --git a/crm/pengine/testcases/simple11.exp b/crm/pengine/testcases/simple11.exp
index 083b4cfeda..3127d2259d 100644
--- a/crm/pengine/testcases/simple11.exp
+++ b/crm/pengine/testcases/simple11.exp
@@ -1,23 +1,22 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="3.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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/simple11.te.exp b/crm/pengine/testcases/simple11.te.exp
new file mode 100644
index 0000000000..98103fb415
--- /dev/null
+++ b/crm/pengine/testcases/simple11.te.exp
@@ -0,0 +1,24 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc2 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc2 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/simple12.exp b/crm/pengine/testcases/simple12.exp
index 77d3a2ec98..89bb41d4f5 100644
--- a/crm/pengine/testcases/simple12.exp
+++ b/crm/pengine/testcases/simple12.exp
@@ -1,23 +1,22 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="2.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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.te.exp b/crm/pengine/testcases/simple12.te.exp
new file mode 100644
index 0000000000..98103fb415
--- /dev/null
+++ b/crm/pengine/testcases/simple12.te.exp
@@ -0,0 +1,24 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc2 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc2 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc2 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/simple2.exp b/crm/pengine/testcases/simple2.exp
index c0a68199c7..c7115b4b58 100644
--- a/crm/pengine/testcases/simple2.exp
+++ b/crm/pengine/testcases/simple2.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/simple2.te.exp b/crm/pengine/testcases/simple2.te.exp
new file mode 100644
index 0000000000..367f087ab5
--- /dev/null
+++ b/crm/pengine/testcases/simple2.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/simple3.exp b/crm/pengine/testcases/simple3.exp
index a472d69263..16e211672d 100644
--- a/crm/pengine/testcases/simple3.exp
+++ b/crm/pengine/testcases/simple3.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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.te.exp b/crm/pengine/testcases/simple3.te.exp
new file mode 100644
index 0000000000..367f087ab5
--- /dev/null
+++ b/crm/pengine/testcases/simple3.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/simple4.exp b/crm/pengine/testcases/simple4.exp
index f856017a7f..c230eb6374 100644
--- a/crm/pengine/testcases/simple4.exp
+++ b/crm/pengine/testcases/simple4.exp
@@ -1,4 +1,3 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000"/>
+
diff --git a/crm/pengine/testcases/simple4.te.exp b/crm/pengine/testcases/simple4.te.exp
new file mode 100644
index 0000000000..74d64dc013
--- /dev/null
+++ b/crm/pengine/testcases/simple4.te.exp
@@ -0,0 +1,6 @@
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
+Start Transitioner state
+	Empty transition graph
+End Transitioner state
diff --git a/crm/pengine/testcases/simple5.exp b/crm/pengine/testcases/simple5.exp
index e6441f9d75..e53959db35 100644
--- a/crm/pengine/testcases/simple5.exp
+++ b/crm/pengine/testcases/simple5.exp
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
     <rsc_op id="1" rsc_id="rsc1" on_node="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"/>
     </rsc_op>
     <crm_event id="3" on_node="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="true"/>
-    <pseduo_event id="4" on_node="node1" operation="stonith" runnable="true" optional="false" discard="false" allow_fail="false"/>
+    <pseudo_event id="4" on_node="node1" operation="stonith" runnable="true" optional="false" discard="false" allow_fail="false"/>
     <rsc_op id="2" rsc_id="rsc1" on_node="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"/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple6.exp b/crm/pengine/testcases/simple6.exp
index 312284a68f..8f47a55bc2 100644
--- a/crm/pengine/testcases/simple6.exp
+++ b/crm/pengine/testcases/simple6.exp
@@ -1,23 +1,22 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc2" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="node1" allow_fail="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/simple6.te.exp b/crm/pengine/testcases/simple6.te.exp
new file mode 100644
index 0000000000..c409aeb544
--- /dev/null
+++ b/crm/pengine/testcases/simple6.te.exp
@@ -0,0 +1,24 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: stop rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: stop rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: stop rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc2 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: stop rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/simple7.exp b/crm/pengine/testcases/simple7.exp
index e95fe13d54..f9f07ed391 100644
--- a/crm/pengine/testcases/simple7.exp
+++ b/crm/pengine/testcases/simple7.exp
@@ -1,26 +1,25 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <crm_event id="2" operation="shutdown_crm" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <args/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="node1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/simple7.te.exp b/crm/pengine/testcases/simple7.te.exp
new file mode 100644
index 0000000000..c9de5fa966
--- /dev/null
+++ b/crm/pengine/testcases/simple7.te.exp
@@ -0,0 +1,19 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (crm: shutdown_crm (null) on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (crm: shutdown_crm (null) on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (crm: shutdown_crm (null) on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/simple9.exp b/crm/pengine/testcases/simple9.exp
index 88d8027150..a300e11b3a 100644
--- a/crm/pengine/testcases/simple9.exp
+++ b/crm/pengine/testcases/simple9.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node1" on_node_uuid="node1" allow_fail="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/simple9.te.exp b/crm/pengine/testcases/simple9.te.exp
new file mode 100644
index 0000000000..367f087ab5
--- /dev/null
+++ b/crm/pengine/testcases/simple9.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/stopfail1.exp b/crm/pengine/testcases/stopfail1.exp
index 183d9ae2f5..60aec1e15f 100644
--- a/crm/pengine/testcases/stopfail1.exp
+++ b/crm/pengine/testcases/stopfail1.exp
@@ -1,39 +1,38 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="node2" allow_fail="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" operation="stop" on_node="node1" on_node_uuid="node1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse>
+  <synapse id="2">
     <action_set>
       <crm_event id="3" operation="shutdown_crm" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <args/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="node1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/stopfail1.te.exp b/crm/pengine/testcases/stopfail1.te.exp
new file mode 100644
index 0000000000..297dd431b2
--- /dev/null
+++ b/crm/pengine/testcases/stopfail1.te.exp
@@ -0,0 +1,34 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+Synapse 2 is pending
+	[Input 1] Pending
+	[Action 3] Pending (crm: shutdown_crm (null) on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] In-flight (crm: shutdown_crm (null) on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] In-flight (crm: shutdown_crm (null) on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+Synapse 2 has completed
+	[Action 3] In-flight (crm: shutdown_crm (null) on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/stopfail2.exp b/crm/pengine/testcases/stopfail2.exp
index 0cb4175981..b53af49bd7 100644
--- a/crm/pengine/testcases/stopfail2.exp
+++ b/crm/pengine/testcases/stopfail2.exp
@@ -1,27 +1,26 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="node1" allow_fail="false">
         <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="block"/>
         <args/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse>
+  <synapse id="1">
     <action_set>
       <rsc_op id="2" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="node2" allow_fail="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" operation="stop" on_node="node1" on_node_uuid="node1" allow_fail="false"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
+
diff --git a/crm/pengine/testcases/stopfail2.te.exp b/crm/pengine/testcases/stopfail2.te.exp
new file mode 100644
index 0000000000..002fec5707
--- /dev/null
+++ b/crm/pengine/testcases/stopfail2.te.exp
@@ -0,0 +1,25 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: stop rsc1 on node1)
+Synapse 1 is pending
+	[Input 1] Pending
+	[Action 2] Pending (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] In-flight (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+Synapse 1 has completed
+	[Action 2] Completed (rsc: start rsc1 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/stopfail3.exp b/crm/pengine/testcases/stopfail3.exp
index ea15bf1ec4..47a6e77710 100644
--- a/crm/pengine/testcases/stopfail3.exp
+++ b/crm/pengine/testcases/stopfail3.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="node1" allow_fail="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/stopfail3.te.exp b/crm/pengine/testcases/stopfail3.te.exp
new file mode 100644
index 0000000000..6baa9690b7
--- /dev/null
+++ b/crm/pengine/testcases/stopfail3.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: stop rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+End Transitioner state
diff --git a/crm/pengine/testcases/stopfail4.exp b/crm/pengine/testcases/stopfail4.exp
index 01f8ff8cb9..9d3ffb89e4 100644
--- a/crm/pengine/testcases/stopfail4.exp
+++ b/crm/pengine/testcases/stopfail4.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="start" on_node="node2" on_node_uuid="node2" allow_fail="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/stopfail4.te.exp b/crm/pengine/testcases/stopfail4.te.exp
new file mode 100644
index 0000000000..bcbcefa934
--- /dev/null
+++ b/crm/pengine/testcases/stopfail4.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node2)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: start rsc1 on node2)
+End Transitioner state
diff --git a/crm/pengine/testcases/stopfail9.exp b/crm/pengine/testcases/stopfail9.exp
index 43d3219ddd..97ab1efc4a 100644
--- a/crm/pengine/testcases/stopfail9.exp
+++ b/crm/pengine/testcases/stopfail9.exp
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
-<?xml version="1.0"?>
 <transition_graph global_timeout="60000">
-  <synapse>
+  <synapse id="0">
     <action_set>
       <rsc_op id="1" rsc_id="rsc1" operation="stop" on_node="node1" on_node_uuid="node1" allow_fail="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/stopfail9.te.exp b/crm/pengine/testcases/stopfail9.te.exp
new file mode 100644
index 0000000000..6baa9690b7
--- /dev/null
+++ b/crm/pengine/testcases/stopfail9.te.exp
@@ -0,0 +1,12 @@
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] In-flight (rsc: stop rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+End Transitioner state
+Start Transitioner state
+Synapse 0 has completed
+	[Action 1] Completed (rsc: stop rsc1 on node1)
+End Transitioner state