diff --git a/cts/scheduler/6-migrate-group.dot b/cts/scheduler/6-migrate-group.dot
index c4b6ad7b43..22f79bbb48 100644
--- a/cts/scheduler/6-migrate-group.dot
+++ b/cts/scheduler/6-migrate-group.dot
@@ -1,62 +1,61 @@
  digraph "g" {
 "A_migrate_from_0 18node2" -> "A_start_0 18node2" [ style = bold]
 "A_migrate_from_0 18node2" -> "A_stop_0 18node1" [ style = bold]
 "A_migrate_from_0 18node2" -> "B_migrate_to_0 18node1" [ style = bold]
 "A_migrate_from_0 18node2" [ style=bold color="green" fontcolor="black"]
 "A_migrate_to_0 18node1" -> "A_migrate_from_0 18node2" [ style = bold]
 "A_migrate_to_0 18node1" [ style=bold color="green" fontcolor="black"]
 "A_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"]
 "A_start_0 18node2" -> "A_monitor_60000 18node2" [ style = bold]
 "A_start_0 18node2" -> "B_migrate_to_0 18node1" [ style = dashed]
 "A_start_0 18node2" -> "B_start_0 18node2" [ style = bold]
 "A_start_0 18node2" -> "thegroup_running_0" [ style = bold]
 "A_start_0 18node2" [ style=bold color="green" fontcolor="orange"]
 "A_stop_0 18node1" -> "A_start_0 18node2" [ style = bold]
 "A_stop_0 18node1" -> "thegroup_stopped_0" [ style = bold]
 "A_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
 "B_migrate_from_0 18node2" -> "B_start_0 18node2" [ style = bold]
 "B_migrate_from_0 18node2" -> "B_stop_0 18node1" [ style = bold]
 "B_migrate_from_0 18node2" -> "C_migrate_to_0 18node1" [ style = bold]
 "B_migrate_from_0 18node2" [ style=bold color="green" fontcolor="black"]
 "B_migrate_to_0 18node1" -> "B_migrate_from_0 18node2" [ style = bold]
 "B_migrate_to_0 18node1" [ style=bold color="green" fontcolor="black"]
 "B_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"]
 "B_start_0 18node2" -> "B_monitor_60000 18node2" [ style = bold]
 "B_start_0 18node2" -> "C_migrate_to_0 18node1" [ style = dashed]
 "B_start_0 18node2" -> "C_start_0 18node2" [ style = bold]
 "B_start_0 18node2" -> "thegroup_running_0" [ style = bold]
 "B_start_0 18node2" [ style=bold color="green" fontcolor="orange"]
 "B_stop_0 18node1" -> "A_migrate_to_0 18node1" [ style = dashed]
 "B_stop_0 18node1" -> "A_stop_0 18node1" [ style = bold]
 "B_stop_0 18node1" -> "B_start_0 18node2" [ style = bold]
 "B_stop_0 18node1" -> "thegroup_stopped_0" [ style = bold]
 "B_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
 "C_migrate_from_0 18node2" -> "C_start_0 18node2" [ style = bold]
 "C_migrate_from_0 18node2" -> "C_stop_0 18node1" [ style = bold]
 "C_migrate_from_0 18node2" [ style=bold color="green" fontcolor="black"]
 "C_migrate_to_0 18node1" -> "C_migrate_from_0 18node2" [ style = bold]
 "C_migrate_to_0 18node1" [ style=bold color="green" fontcolor="black"]
 "C_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"]
 "C_start_0 18node2" -> "C_monitor_60000 18node2" [ style = bold]
 "C_start_0 18node2" -> "thegroup_running_0" [ style = bold]
 "C_start_0 18node2" [ style=bold color="green" fontcolor="orange"]
 "C_stop_0 18node1" -> "B_migrate_to_0 18node1" [ style = dashed]
 "C_stop_0 18node1" -> "B_stop_0 18node1" [ style = bold]
 "C_stop_0 18node1" -> "C_start_0 18node2" [ style = bold]
 "C_stop_0 18node1" -> "thegroup_stopped_0" [ style = bold]
-"C_stop_0 18node1" -> "thegroup_stopped_0" [ style = dashed]
 "C_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
 "thegroup_running_0" [ style=bold color="green" fontcolor="orange"]
 "thegroup_start_0" -> "A_start_0 18node2" [ style = bold]
 "thegroup_start_0" -> "B_start_0 18node2" [ style = bold]
 "thegroup_start_0" -> "C_start_0 18node2" [ style = bold]
 "thegroup_start_0" -> "thegroup_running_0" [ style = bold]
 "thegroup_start_0" [ style=bold color="green" fontcolor="orange"]
 "thegroup_stop_0" -> "A_stop_0 18node1" [ style = bold]
 "thegroup_stop_0" -> "B_stop_0 18node1" [ style = bold]
 "thegroup_stop_0" -> "C_stop_0 18node1" [ style = bold]
 "thegroup_stop_0" -> "thegroup_stopped_0" [ style = bold]
 "thegroup_stop_0" [ style=bold color="green" fontcolor="orange"]
 "thegroup_stopped_0" -> "thegroup_start_0" [ style = bold]
 "thegroup_stopped_0" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/cts/scheduler/bug-1820-1.dot b/cts/scheduler/bug-1820-1.dot
index 9150c67ed3..f38428a2ef 100644
--- a/cts/scheduler/bug-1820-1.dot
+++ b/cts/scheduler/bug-1820-1.dot
@@ -1,51 +1,50 @@
 digraph "g" {
 "do_shutdown star" [ style=bold color="green" fontcolor="black" ]
 "gr1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "gr1_start_0" -> "gr1_running_0" [ style = bold]
 "gr1_start_0" -> "test1_start_0 world" [ style = bold]
 "gr1_start_0" -> "test2_start_0 world" [ style = bold]
 "gr1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "gr1_stop_0" -> "gr1_stopped_0" [ style = bold]
 "gr1_stop_0" -> "test1_stop_0 star" [ style = bold]
 "gr1_stop_0" -> "test2_stop_0 star" [ style = bold]
 "gr1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "gr1_stopped_0" -> "gr1_start_0" [ style = bold]
 "gr1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "p1_monitor_0 star" -> "p1_start_0 world" [ style = bold]
 "p1_monitor_0 star" [ style=bold color="green" fontcolor="black" ]
 "p1_monitor_0 world" -> "p1_start_0 world" [ style = bold]
 "p1_monitor_0 world" [ style=bold color="green" fontcolor="black" ]
 "p1_start_0 world" [ style=bold color="green" fontcolor="black" ]
 "test1_migrate_from_0 world" -> "test1_start_0 world" [ style = bold]
 "test1_migrate_from_0 world" -> "test1_stop_0 star" [ style = bold]
 "test1_migrate_from_0 world" -> "test2_migrate_to_0 star" [ style = bold]
 "test1_migrate_from_0 world" [ style=bold color="green" fontcolor="black"]
 "test1_migrate_to_0 star" -> "test1_migrate_from_0 world" [ style = bold]
 "test1_migrate_to_0 star" [ style=bold color="green" fontcolor="black"]
 "test1_monitor_10000 world" [ style=bold color="green" fontcolor="black" ]
 "test1_start_0 world" -> "gr1_running_0" [ style = bold]
 "test1_start_0 world" -> "test1_monitor_10000 world" [ style = bold]
 "test1_start_0 world" -> "test2_migrate_to_0 star" [ style = dashed]
 "test1_start_0 world" -> "test2_start_0 world" [ style = bold]
 "test1_start_0 world" [ style=bold color="green" fontcolor="orange"]
 "test1_stop_0 star" -> "do_shutdown star" [ style = bold]
 "test1_stop_0 star" -> "gr1_stopped_0" [ style = bold]
 "test1_stop_0 star" -> "test1_start_0 world" [ style = bold]
 "test1_stop_0 star" [ style=bold color="green" fontcolor="black" ]
 "test2_migrate_from_0 world" -> "test2_start_0 world" [ style = bold]
 "test2_migrate_from_0 world" -> "test2_stop_0 star" [ style = bold]
 "test2_migrate_from_0 world" [ style=bold color="green" fontcolor="black"]
 "test2_migrate_to_0 star" -> "test2_migrate_from_0 world" [ style = bold]
 "test2_migrate_to_0 star" [ style=bold color="green" fontcolor="black"]
 "test2_monitor_10000 world" [ style=bold color="green" fontcolor="black" ]
 "test2_start_0 world" -> "gr1_running_0" [ style = bold]
 "test2_start_0 world" -> "test2_monitor_10000 world" [ style = bold]
 "test2_start_0 world" [ style=bold color="green" fontcolor="orange"]
 "test2_stop_0 star" -> "do_shutdown star" [ style = bold]
 "test2_stop_0 star" -> "gr1_stopped_0" [ style = bold]
-"test2_stop_0 star" -> "gr1_stopped_0" [ style = dashed]
 "test2_stop_0 star" -> "test1_migrate_to_0 star" [ style = dashed]
 "test2_stop_0 star" -> "test1_stop_0 star" [ style = bold]
 "test2_stop_0 star" -> "test2_start_0 world" [ style = bold]
 "test2_stop_0 star" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/cts/scheduler/bug-1820.dot b/cts/scheduler/bug-1820.dot
index 1b8653e0c4..b836a96850 100644
--- a/cts/scheduler/bug-1820.dot
+++ b/cts/scheduler/bug-1820.dot
@@ -1,46 +1,45 @@
 digraph "g" {
 "do_shutdown star" [ style=bold color="green" fontcolor="black" ]
 "gr1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "gr1_start_0" -> "gr1_running_0" [ style = bold]
 "gr1_start_0" -> "test1_start_0 world" [ style = bold]
 "gr1_start_0" -> "test2_start_0 world" [ style = bold]
 "gr1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "gr1_stop_0" -> "gr1_stopped_0" [ style = bold]
 "gr1_stop_0" -> "test1_stop_0 star" [ style = bold]
 "gr1_stop_0" -> "test2_stop_0 star" [ style = bold]
 "gr1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "gr1_stopped_0" -> "gr1_start_0" [ style = bold]
 "gr1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "test1_migrate_from_0 world" -> "test1_start_0 world" [ style = bold]
 "test1_migrate_from_0 world" -> "test1_stop_0 star" [ style = bold]
 "test1_migrate_from_0 world" -> "test2_migrate_to_0 star" [ style = bold]
 "test1_migrate_from_0 world" [ style=bold color="green" fontcolor="black" ]
 "test1_migrate_to_0 star" -> "test1_migrate_from_0 world" [ style = bold]
 "test1_migrate_to_0 star" [ style=bold color="green" fontcolor="black" ]
 "test1_monitor_10000 world" [ style=bold color="green" fontcolor="black" ]
 "test1_start_0 world" -> "gr1_running_0" [ style = bold]
 "test1_start_0 world" -> "test1_monitor_10000 world" [ style = bold]
 "test1_start_0 world" -> "test2_migrate_to_0 star" [ style = dashed]
 "test1_start_0 world" -> "test2_start_0 world" [ style = bold]
 "test1_start_0 world" [ style=bold color="green" fontcolor="orange" ]
 "test1_stop_0 star" -> "do_shutdown star" [ style = bold]
 "test1_stop_0 star" -> "gr1_stopped_0" [ style = bold]
 "test1_stop_0 star" -> "test1_start_0 world" [ style = bold]
 "test1_stop_0 star" [ style=bold color="green" fontcolor="black" ]
 "test2_migrate_from_0 world" -> "test2_start_0 world" [ style = bold]
 "test2_migrate_from_0 world" -> "test2_stop_0 star" [ style = bold]
 "test2_migrate_from_0 world" [ style=bold color="green" fontcolor="black"]
 "test2_migrate_to_0 star" -> "test2_migrate_from_0 world" [ style = bold]
 "test2_migrate_to_0 star" [ style=bold color="green" fontcolor="black"]
 "test2_monitor_10000 world" [ style=bold color="green" fontcolor="black" ]
 "test2_start_0 world" -> "gr1_running_0" [ style = bold]
 "test2_start_0 world" -> "test2_monitor_10000 world" [ style = bold]
 "test2_start_0 world" [ style=bold color="green" fontcolor="orange"]
 "test2_stop_0 star" -> "do_shutdown star" [ style = bold]
 "test2_stop_0 star" -> "gr1_stopped_0" [ style = bold]
-"test2_stop_0 star" -> "gr1_stopped_0" [ style = dashed]
 "test2_stop_0 star" -> "test1_migrate_to_0 star" [ style = dashed]
 "test2_stop_0 star" -> "test1_stop_0 star" [ style = bold]
 "test2_stop_0 star" -> "test2_start_0 world" [ style = bold]
 "test2_stop_0 star" [ style=bold color="green" fontcolor="black" ]
 }