Fixing STC scenarios.

Change-Id: Ic17f7a19c35503ab77219f0ffc539b546cb90fba
diff --git a/tools/test/scenarios/setup.xml b/tools/test/scenarios/setup.xml
index 585bf43..1a8d754 100644
--- a/tools/test/scenarios/setup.xml
+++ b/tools/test/scenarios/setup.xml
@@ -20,6 +20,7 @@
         <parallel var="${OC#}">
             <step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/>
             <step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/>
+            <step name="Kill-${#}" env="~" exec="onos-kill ${OC#}"/>
 
             <step name="Install-${#}" exec="onos-install ${OC#}"
                   requires="Uninstall-${#},Push-Bits-${#},Push-Bits"/>
@@ -30,9 +31,9 @@
             <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
                   requires="~Wait-for-Start-${#}"/>
             <step name="Check-Components-${#}" exec="onos-check-components ${OC#}"
-                  requires="~Wait-for-Start-${#},Check-Logs-${#}"/>
+                  requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
             <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#}"
-                  requires="~Wait-for-Start-${#},Check-Logs-${#}"/>
+                  requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
         </parallel>
     </group>
 </scenario>