Enhancing STC and scenarios.

Change-Id: I1227e68f8a44707f671b09dcd2967b580e14ca79
diff --git a/tools/test/scenarios/smoke.xml b/tools/test/scenarios/smoke.xml
index 423f348..3161c21 100644
--- a/tools/test/scenarios/smoke.xml
+++ b/tools/test/scenarios/smoke.xml
@@ -15,6 +15,13 @@
   -->
 <scenario name="smoke-test" description="ONOS smoke test">
     <import file="${ONOS_ROOT}/tools/test/scenarios/prerequisites.xml"/>
+
     <import file="${ONOS_ROOT}/tools/test/scenarios/setup.xml"/>
     <dependency name="Setup" requires="Prerequisites"/>
+
+    <import file="${ONOS_ROOT}/tools/test/scenarios/archetypes.xml"/>
+    <dependency name="Archetypes" requires="Setup"/>
+
+    <import file="${ONOS_ROOT}/tools/test/scenarios/wrapup.xml"/>
+    <dependency name="Wrapup" requires="~Archetypes,Setup"/>
 </scenario>