Fixed a failed unit test and added more to the setup scenario.

Change-Id: I28ee6627834f8964d5d06756afb44e6213c8afaa
diff --git a/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java b/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java
index 7346b0a..de6fa0e 100644
--- a/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java
+++ b/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java
@@ -48,9 +48,9 @@
 
         System.setProperty("prop.foo", "Foobar");
         System.setProperty("prop.bar", "Barfoo");
-        System.setProperty("OC1", "1.2.3.1");
-        System.setProperty("OC2", "1.2.3.2");
-        System.setProperty("OC3", "1.2.3.3");
+        System.setProperty("TOC1", "1.2.3.1");
+        System.setProperty("TOC2", "1.2.3.2");
+        System.setProperty("TOC3", "1.2.3.3");
     }
 
     public static FileInputStream getStream(String name) throws FileNotFoundException {
diff --git a/utils/stc/src/test/resources/org/onlab/stc/scenario.xml b/utils/stc/src/test/resources/org/onlab/stc/scenario.xml
index 3a566fd..3fd35c2 100644
--- a/utils/stc/src/test/resources/org/onlab/stc/scenario.xml
+++ b/utils/stc/src/test/resources/org/onlab/stc/scenario.xml
@@ -38,8 +38,8 @@
 
     <dependency name="maybe" requires="yo"/>
 
-    <parallel var="${OC#}" requires="alpha">
-        <step name="ping-${#}" exec="asdads ${OC#}"/>
+    <parallel var="${TOC#}" requires="alpha">
+        <step name="ping-${#}" exec="asdads ${TOC#}"/>
         <step name="pong-${#}" exec="asdads"/>
         <step name="ding-${#}" exec="asdads" requires="ping-${#},pong-${#}"/>
         <dependency name="maybe" requires="ding-${#}"/>