1 files changed, 7 insertions, 7 deletions

diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/CcvpnControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/CcvpnControlLoopTest.java
index 7469fdc75..b64ec589a 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/CcvpnControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/CcvpnControlLoopTest.java
@@ -65,12 +65,12 @@ public class CcvpnControlLoopTest implements TopicListener {
     private static List<? extends TopicSink> noopTopics;
 
     private static KieSession kieSession;
-    private static Util.Pair<ControlLoopPolicy, String> pair;
+    private static SupportUtil.Pair<ControlLoopPolicy, String> pair;
 
     static {
         /* Set environment properties */
-        Util.setAaiProps();
-        Util.setSdncProps();
+        SupportUtil.setAaiProps();
+        SupportUtil.setSdncProps();
         LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, "INFO");
     }
 
@@ -100,8 +100,8 @@ public class CcvpnControlLoopTest implements TopicListener {
                 .modelClassLoaderHash(1111));
 
         try {
-            Util.buildAaiSim();
-            Util.buildSdncSim();
+            SupportUtil.buildAaiSim();
+            SupportUtil.buildSdncSim();
         } catch (Exception e) {
             fail(e.getMessage());
         }
@@ -237,7 +237,7 @@ public class CcvpnControlLoopTest implements TopicListener {
         /*
          * Load policies from yaml
          */
-        pair = Util.loadYaml(yamlFile);
+        pair = SupportUtil.loadYaml(yamlFile);
         assertNotNull(pair);
         assertNotNull(pair.first);
         assertNotNull(pair.first.getControlLoop());
@@ -247,7 +247,7 @@ public class CcvpnControlLoopTest implements TopicListener {
         /*
          * Construct a kie session
          */
-        final KieSession kieSession = Util.buildContainer(droolsTemplate,
+        final KieSession kieSession = SupportUtil.buildContainer(droolsTemplate,
                 pair.first.getControlLoop().getControlLoopName(),
                 policyScope, policyName, policyVersion, URLEncoder.encode(pair.second, "UTF-8"));