diff --git a/cts/scheduler/container-is-remote-node.summary b/cts/scheduler/container-is-remote-node.summary
index f5c78ce503..6fc5186695 100644
--- a/cts/scheduler/container-is-remote-node.summary
+++ b/cts/scheduler/container-is-remote-node.summary
@@ -1,56 +1,56 @@
 3 of 19 resources DISABLED and 0 BLOCKED from being started due to failures
 
 Current cluster status:
 Online: [ lama2 lama3 ]
 Containers: [ RNVM1:VM1 ]
 
  restofencelama2	(stonith:fence_ipmilan):	Started lama3 
  restofencelama3	(stonith:fence_ipmilan):	Started lama2 
  Clone Set: dlm-clone [dlm]
      Started: [ lama2 lama3 ]
      Stopped: [ RNVM1 ]
  Clone Set: clvmd-clone [clvmd]
      Started: [ lama2 lama3 ]
      Stopped: [ RNVM1 ]
  Clone Set: gfs2-lv_1_1-clone [gfs2-lv_1_1]
      Started: [ lama2 lama3 ]
      Stopped: [ RNVM1 ]
  Clone Set: gfs2-lv_1_2-clone [gfs2-lv_1_2]
-     Stopped (disabled): [ RNVM1 lama2 lama3 ]
+     Stopped (disabled): [ lama2 lama3 RNVM1 ]
  VM1	(ocf::heartbeat:VirtualDomain):	Started lama2 
  Resource Group: RES1
      FSdata1	(ocf::heartbeat:Filesystem):	Started RNVM1 
      RES1-IP	(ocf::heartbeat:IPaddr2):	Started RNVM1 
      res-rsyslog	(ocf::heartbeat:rsyslog.test):	Started RNVM1 
 
 Transition Summary:
 
 Executing cluster transition:
  * Resource action: dlm             monitor on RNVM1
  * Resource action: clvmd           monitor on RNVM1
  * Resource action: gfs2-lv_1_1     monitor on RNVM1
  * Resource action: gfs2-lv_1_2     monitor on RNVM1
 
 Revised cluster status:
 Online: [ lama2 lama3 ]
 Containers: [ RNVM1:VM1 ]
 
  restofencelama2	(stonith:fence_ipmilan):	Started lama3 
  restofencelama3	(stonith:fence_ipmilan):	Started lama2 
  Clone Set: dlm-clone [dlm]
      Started: [ lama2 lama3 ]
      Stopped: [ RNVM1 ]
  Clone Set: clvmd-clone [clvmd]
      Started: [ lama2 lama3 ]
      Stopped: [ RNVM1 ]
  Clone Set: gfs2-lv_1_1-clone [gfs2-lv_1_1]
      Started: [ lama2 lama3 ]
      Stopped: [ RNVM1 ]
  Clone Set: gfs2-lv_1_2-clone [gfs2-lv_1_2]
-     Stopped (disabled): [ RNVM1 lama2 lama3 ]
+     Stopped (disabled): [ lama2 lama3 RNVM1 ]
  VM1	(ocf::heartbeat:VirtualDomain):	Started lama2 
  Resource Group: RES1
      FSdata1	(ocf::heartbeat:Filesystem):	Started RNVM1 
      RES1-IP	(ocf::heartbeat:IPaddr2):	Started RNVM1 
      res-rsyslog	(ocf::heartbeat:rsyslog.test):	Started RNVM1 
 
diff --git a/cts/scheduler/multiple-monitor-one-failed.summary b/cts/scheduler/multiple-monitor-one-failed.summary
index 0691ebf462..7f74d56498 100644
--- a/cts/scheduler/multiple-monitor-one-failed.summary
+++ b/cts/scheduler/multiple-monitor-one-failed.summary
@@ -1,21 +1,21 @@
 
 Current cluster status:
-Online: [ dhcp180 dhcp69 ]
+Online: [ dhcp69 dhcp180 ]
 
  Dummy-test2	(ocf::test:Dummy):	FAILED dhcp180 
 
 Transition Summary:
  * Recover    Dummy-test2     ( dhcp180 )  
 
 Executing cluster transition:
  * Resource action: Dummy-test2     stop on dhcp180
  * Pseudo action:   all_stopped
  * Resource action: Dummy-test2     start on dhcp180
  * Resource action: Dummy-test2     monitor=30000 on dhcp180
  * Resource action: Dummy-test2     monitor=10000 on dhcp180
 
 Revised cluster status:
-Online: [ dhcp180 dhcp69 ]
+Online: [ dhcp69 dhcp180 ]
 
  Dummy-test2	(ocf::test:Dummy):	Started dhcp180 
 
diff --git a/cts/scheduler/stonith-4.dot b/cts/scheduler/stonith-4.dot
index ee659cbcaf..cdaa286ab9 100644
--- a/cts/scheduler/stonith-4.dot
+++ b/cts/scheduler/stonith-4.dot
@@ -1,21 +1,21 @@
 digraph "g" {
 "Fencing_monitor_0 pcmk-11" -> "Fencing_start_0 pcmk-1" [ style = dashed]
 "Fencing_monitor_0 pcmk-11" [ style=dashed color="red" fontcolor="black"]
 "Fencing_monitor_0 pcmk-2" -> "Fencing_start_0 pcmk-1" [ style = dashed]
 "Fencing_monitor_0 pcmk-2" [ style=dashed color="red" fontcolor="black"]
 "Fencing_monitor_0 pcmk-3" -> "Fencing_start_0 pcmk-1" [ style = dashed]
 "Fencing_monitor_0 pcmk-3" [ style=dashed color="red" fontcolor="black"]
 "Fencing_start_0 pcmk-1" [ style=dashed color="red" fontcolor="black"]
 "all_stopped" -> "Fencing_start_0 pcmk-1" [ style = dashed]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
-"stonith 'reboot' pcmk-10" -> "stonith 'reboot' pcmk-5" [ style = bold]
+"stonith 'reboot' pcmk-10" -> "stonith_complete" [ style = bold]
 "stonith 'reboot' pcmk-10" [ style=bold color="green" fontcolor="black"]
 "stonith 'reboot' pcmk-5" -> "stonith 'reboot' pcmk-7" [ style = bold]
 "stonith 'reboot' pcmk-5" [ style=bold color="green" fontcolor="black"]
 "stonith 'reboot' pcmk-7" -> "stonith 'reboot' pcmk-8" [ style = bold]
 "stonith 'reboot' pcmk-7" [ style=bold color="green" fontcolor="black"]
-"stonith 'reboot' pcmk-8" -> "stonith_complete" [ style = bold]
+"stonith 'reboot' pcmk-8" -> "stonith 'reboot' pcmk-10" [ style = bold]
 "stonith 'reboot' pcmk-8" [ style=bold color="green" fontcolor="black"]
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/cts/scheduler/stonith-4.exp b/cts/scheduler/stonith-4.exp
index d3e9e67cd5..fabf55dab8 100644
--- a/cts/scheduler/stonith-4.exp
+++ b/cts/scheduler/stonith-4.exp
@@ -1,83 +1,82 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
       <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="3" operation="stonith" operation_key="stonith-pcmk-8-reboot" on_node="pcmk-8" on_node_uuid="108"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-pcmk-10-reboot" on_node="pcmk-10" on_node_uuid="110"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <pseudo_event id="5" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <crm_event id="4" operation="stonith" operation_key="stonith-pcmk-10-reboot" on_node="pcmk-10" on_node_uuid="110">
         <attributes CRM_meta_on_node="pcmk-10" CRM_meta_on_node_uuid="110" CRM_meta_stonith_action="reboot" />
         <downed>
           <node id="110"/>
         </downed>
       </crm_event>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <crm_event id="3" operation="stonith" operation_key="stonith-pcmk-8-reboot" on_node="pcmk-8" on_node_uuid="108"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <crm_event id="3" operation="stonith" operation_key="stonith-pcmk-8-reboot" on_node="pcmk-8" on_node_uuid="108">
         <attributes CRM_meta_on_node="pcmk-8" CRM_meta_on_node_uuid="108" CRM_meta_stonith_action="reboot" />
         <downed>
           <node id="108"/>
         </downed>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="2" operation="stonith" operation_key="stonith-pcmk-7-reboot" on_node="pcmk-7" on_node_uuid="107"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <crm_event id="2" operation="stonith" operation_key="stonith-pcmk-7-reboot" on_node="pcmk-7" on_node_uuid="107">
         <attributes CRM_meta_on_node="pcmk-7" CRM_meta_on_node_uuid="107" CRM_meta_stonith_action="reboot" />
         <downed>
           <node id="107"/>
         </downed>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-5-reboot" on_node="pcmk-5" on_node_uuid="105"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-5-reboot" on_node="pcmk-5" on_node_uuid="105">
         <attributes CRM_meta_on_node="pcmk-5" CRM_meta_on_node_uuid="105" CRM_meta_stonith_action="reboot" />
         <downed>
           <node id="105"/>
         </downed>
       </crm_event>
     </action_set>
-    <inputs>
-      <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-pcmk-10-reboot" on_node="pcmk-10" on_node_uuid="110"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
 </transition_graph>
-
diff --git a/cts/scheduler/stonith-4.summary b/cts/scheduler/stonith-4.summary
index 7502dada0a..deaf1b8caf 100644
--- a/cts/scheduler/stonith-4.summary
+++ b/cts/scheduler/stonith-4.summary
@@ -1,40 +1,40 @@
 
 Current cluster status:
-Node pcmk-10 (110): UNCLEAN (online)
-Node pcmk-11 (111): pending
 Node pcmk-2 (102): pending
 Node pcmk-3 (103): pending
 Node pcmk-5 (105): UNCLEAN (offline)
 Node pcmk-7 (107): UNCLEAN (online)
 Node pcmk-8 (108): UNCLEAN (offline)
 Node pcmk-9 (109): pending
+Node pcmk-10 (110): UNCLEAN (online)
+Node pcmk-11 (111): pending
 Online: [ pcmk-1 ]
 OFFLINE: [ pcmk-4 pcmk-6 ]
 
  Fencing	(stonith:fence_xvm):	Stopped 
 
 Transition Summary:
  * Fence (reboot) pcmk-10 'peer process is no longer available'
  * Fence (reboot) pcmk-8 'peer has not been seen by the cluster'
  * Fence (reboot) pcmk-7 'peer failed the pacemaker membership criteria'
  * Fence (reboot) pcmk-5 'peer has not been seen by the cluster'
  * Start      Fencing     ( pcmk-1 )   blocked
 
 Executing cluster transition:
- * Fencing pcmk-10 (reboot)
  * Fencing pcmk-5 (reboot)
  * Fencing pcmk-7 (reboot)
  * Fencing pcmk-8 (reboot)
+ * Fencing pcmk-10 (reboot)
  * Pseudo action:   stonith_complete
  * Pseudo action:   all_stopped
 
 Revised cluster status:
-Node pcmk-11 (111): pending
 Node pcmk-2 (102): pending
 Node pcmk-3 (103): pending
 Node pcmk-9 (109): pending
+Node pcmk-11 (111): pending
 Online: [ pcmk-1 ]
-OFFLINE: [ pcmk-10 pcmk-4 pcmk-5 pcmk-6 pcmk-7 pcmk-8 ]
+OFFLINE: [ pcmk-4 pcmk-5 pcmk-6 pcmk-7 pcmk-8 pcmk-10 ]
 
  Fencing	(stonith:fence_xvm):	Stopped