Removed checkstyle warnings

Removed checkstyle warnings from:
policy/drools-applications/controlloop/common/model-impl/appc
policy/drools-applications/controlloop/common/model-impl/appclcm
policy/drools-applications/controlloop/common/model-impl/events
including changes to template files due to renamed methods

Issue-ID: POLICY-705
Change-Id: Ieb93baf43268aa608f204eef1a610354f2adec32
Signed-off-by: mmis <michael.morris@ericsson.com>

5 files changed, 697 insertions, 805 deletions

diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopFailureTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopFailureTest.java
index 826488691..686b3805f 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopFailureTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopFailureTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * demo
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,10 @@
 
 package org.onap.policy.template.demo;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -35,10 +38,10 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.kie.api.runtime.KieSession;
 import org.kie.api.runtime.rule.FactHandle;
-import org.onap.policy.appclcm.LCMRequest;
-import org.onap.policy.appclcm.LCMRequestWrapper;
-import org.onap.policy.appclcm.LCMResponse;
-import org.onap.policy.appclcm.LCMResponseWrapper;
+import org.onap.policy.appclcm.LcmRequest;
+import org.onap.policy.appclcm.LcmRequestWrapper;
+import org.onap.policy.appclcm.LcmResponse;
+import org.onap.policy.appclcm.LcmResponseWrapper;
 import org.onap.policy.controlloop.ControlLoopEventStatus;
 import org.onap.policy.controlloop.ControlLoopNotificationType;
 import org.onap.policy.controlloop.VirtualControlLoopEvent;
@@ -60,53 +63,59 @@ import org.slf4j.LoggerFactory;
 public class ControlLoopFailureTest implements TopicListener {
 
     private static final Logger logger = LoggerFactory.getLogger(VCPEControlLoopTest.class);
-    
+
     private static List<? extends TopicSink> noopTopics;
-    
+
     private static KieSession kieSession;
     private static Util.Pair<ControlLoopPolicy, String> pair;
     private UUID requestId;
     private UUID requestId2;
     private UUID requestId3;
     private int eventCount;
-    
+
     static {
         /* Set environment properties */
         Util.setAAIProps();
         Util.setGuardProps();
         Util.setPUProp();
     }
-    
+
     @BeforeClass
     public static void setUpSimulator() {
         PolicyEngine.manager.configure(new Properties());
         assertTrue(PolicyEngine.manager.start());
         Properties noopSinkProperties = new Properties();
         noopSinkProperties.put(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS, "APPC-LCM-READ,POLICY-CL-MGT");
-        noopSinkProperties.put("noop.sink.topics.APPC-LCM-READ.events", "org.onap.policy.appclcm.LCMRequestWrapper");
-        noopSinkProperties.put("noop.sink.topics.APPC-LCM-READ.events.custom.gson", "org.onap.policy.appclcm.util.Serialization,gson");
-        noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events", "org.onap.policy.controlloop.VirtualControlLoopNotification");
-        noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events.custom.gson", "org.onap.policy.controlloop.util.Serialization,gsonPretty");
+        noopSinkProperties.put("noop.sink.topics.APPC-LCM-READ.events", "org.onap.policy.appclcm.LcmRequestWrapper");
+        noopSinkProperties.put("noop.sink.topics.APPC-LCM-READ.events.custom.gson",
+                "org.onap.policy.appclcm.util.Serialization,gson");
+        noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events",
+                "org.onap.policy.controlloop.VirtualControlLoopNotification");
+        noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events.custom.gson",
+                "org.onap.policy.controlloop.util.Serialization,gsonPretty");
         noopTopics = TopicEndpoint.manager.addTopicSinks(noopSinkProperties);
-        
-        EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "POLICY-CL-MGT", "org.onap.policy.controlloop.VirtualControlLoopNotification", new JsonProtocolFilter(), null, null, 1111);
-        EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "APPC-LCM-READ", "org.onap.policy.appclcm.LCMRequestWrapper", new JsonProtocolFilter(), null, null, 1111);
+
+        EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "POLICY-CL-MGT",
+                "org.onap.policy.controlloop.VirtualControlLoopNotification", new JsonProtocolFilter(), null, null,
+                1111);
+        EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "APPC-LCM-READ",
+                "org.onap.policy.appclcm.LcmRequestWrapper", new JsonProtocolFilter(), null, null, 1111);
         try {
             Util.buildAaiSim();
             Util.buildGuardSim();
         } catch (Exception e) {
             fail(e.getMessage());
         }
-        
+
         /*
          * Start the kie session
          */
         try {
-            kieSession = startSession("../archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl", 
-                        "src/test/resources/yaml/policy_ControlLoop_vCPE.yaml",
-                        "service=ServiceDemo;resource=Res1Demo;type=operational", 
-                        "CL_vCPE", 
-                        "org.onap.closed_loop.ServiceDemo:VNFS:1.0.0");
+            kieSession = startSession(
+                    "../archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl",
+                    "src/test/resources/yaml/policy_ControlLoop_vCPE.yaml",
+                    "service=ServiceDemo;resource=Res1Demo;type=operational", "CL_vCPE",
+                    "org.onap.closed_loop.ServiceDemo:VNFS:1.0.0");
         } catch (IOException e) {
             e.printStackTrace();
             logger.debug("Could not create kieSession");
@@ -116,111 +125,96 @@ public class ControlLoopFailureTest implements TopicListener {
 
     @AfterClass
     public static void tearDownSimulator() {
-    	/*
+        /*
          * Gracefully shut down the kie session
          */
         kieSession.dispose();
-        
+
         PolicyEngine.manager.stop();
         HttpServletServer.factory.destroy();
         PolicyController.factory.shutdown();
         TopicEndpoint.manager.shutdown();
     }
-    
+
     /**
-     * This test case tests the scenario where 3 events occur
-     * and 2 of the requests refer to the same target entity
-     * while the 3rd is for another entity. The expected result
-     * is that the event with the duplicate target entity will have
-     * a final success result for one of the events, and a rejected
-     * message for the one that was unable to obtain the lock. The
-     * event that is referring to a different target entity should
-     * be able to obtain a lock since it is a different target. After
-     * processing of all events there should only be the params object
-     * left in memory.
+     * This test case tests the scenario where 3 events occur and 2 of the requests refer to the
+     * same target entity while the 3rd is for another entity. The expected result is that the event
+     * with the duplicate target entity will have a final success result for one of the events, and
+     * a rejected message for the one that was unable to obtain the lock. The event that is
+     * referring to a different target entity should be able to obtain a lock since it is a
+     * different target. After processing of all events there should only be the params object left
+     * in memory.
      */
     @Test
     public void targetLockedTest() {
-        
+
         /*
-         * Allows the PolicyEngine to callback to this object to
-         * notify that there is an event ready to be pulled 
-         * from the queue
+         * Allows the PolicyEngine to callback to this object to notify that there is an event ready
+         * to be pulled from the queue
          */
         for (TopicSink sink : noopTopics) {
             assertTrue(sink.start());
             sink.register(this);
         }
-        
+
         /*
          * Create a unique requestId
          */
         requestId = UUID.randomUUID();
-        
+
         /*
          * This will be a unique request for another target entity
          */
         requestId2 = UUID.randomUUID();
-        
+
         /*
-         * This will be a request duplicating the target entity 
-         * of the first request
+         * This will be a request duplicating the target entity of the first request
          */
         requestId3 = UUID.randomUUID();
-        
-        /* 
-         * Simulate an onset event the policy engine will 
-         * receive from DCAE to kick off processing through
-         * the rules
+
+        /*
+         * Simulate an onset event the policy engine will receive from DCAE to kick off processing
+         * through the rules
          */
         sendEvent(pair.a, requestId, ControlLoopEventStatus.ONSET, "vnf01");
-        
+
         /*
          * Send a second event requesting an action for a different target entity
          */
         sendEvent(pair.a, requestId2, ControlLoopEventStatus.ONSET, "vnf02");
 
         /*
-         * Send a second event for a different target to ensure there
-         * are no problems with obtaining a lock for a different
+         * Send a second event for a different target to ensure there are no problems with obtaining
+         * a lock for a different
          */
         kieSession.fireUntilHalt();
-        
+
         /*
          * The only fact in memory should be Params
          */
         assertEquals(1, kieSession.getFactCount());
-        
+
         /*
          * Print what's left in memory
          */
         dumpFacts(kieSession);
-        
+
     }
 
     /**
-     * This method will start a kie session and instantiate 
-     * the Policy Engine.
+     * This method will start a kie session and instantiate the Policy Engine.
      * 
-     * @param droolsTemplate
-     *          the DRL rules file
-     * @param yamlFile
-     *          the yaml file containing the policies
-     * @param policyScope
-     *          scope for policy
-     * @param policyName
-     *          name of the policy
-     * @param policyVersion
-     *          version of the policy          
-     * @return the kieSession to be used to insert facts 
+     * @param droolsTemplate the DRL rules file
+     * @param yamlFile the yaml file containing the policies
+     * @param policyScope scope for policy
+     * @param policyName name of the policy
+     * @param policyVersion version of the policy
+     * @return the kieSession to be used to insert facts
      * @throws IOException
      */
-    private static KieSession startSession(String droolsTemplate, 
-            String yamlFile, 
-            String policyScope, 
-            String policyName, 
-            String policyVersion) throws IOException {
-        
+    private static KieSession startSession(String droolsTemplate, String yamlFile, String policyScope,
+            String policyName, String policyVersion) throws IOException {
+
         /*
          * Load policies from yaml
          */
@@ -230,43 +224,43 @@ public class ControlLoopFailureTest implements TopicListener {
         assertNotNull(pair.a.getControlLoop());
         assertNotNull(pair.a.getControlLoop().getControlLoopName());
         assertTrue(pair.a.getControlLoop().getControlLoopName().length() > 0);
-        
-        /* 
+
+        /*
          * Construct a kie session
          */
-        final KieSession kieSession = Util.buildContainer(droolsTemplate, 
-                pair.a.getControlLoop().getControlLoopName(), 
-                policyScope, 
-                policyName, 
-                policyVersion, 
-                URLEncoder.encode(pair.b, "UTF-8"));
-        
+        final KieSession kieSession = Util.buildContainer(droolsTemplate, pair.a.getControlLoop().getControlLoopName(),
+                policyScope, policyName, policyVersion, URLEncoder.encode(pair.b, "UTF-8"));
+
         /*
          * Retrieve the Policy Engine
          */
-        
+
         logger.debug("============");
         logger.debug(URLEncoder.encode(pair.b, "UTF-8"));
         logger.debug("============");
-        
+
         return kieSession;
     }
-    
+
     /*
      * (non-Javadoc)
+     * 
      * @see org.onap.policy.drools.PolicyEngineListener#newEventNotification(java.lang.String)
      */
+    @Override
     public void onTopicEvent(CommInfrastructure commType, String topic, String event) {
         /*
-         * Pull the object that was sent out to DMAAP and make
-         * sure it is a ControlLoopNoticiation of type active
+         * Pull the object that was sent out to DMAAP and make sure it is a ControlLoopNoticiation
+         * of type active
          */
         Object obj = null;
         if ("POLICY-CL-MGT".equals(topic)) {
-            obj = org.onap.policy.controlloop.util.Serialization.gsonJunit.fromJson(event, org.onap.policy.controlloop.VirtualControlLoopNotification.class);
+            obj = org.onap.policy.controlloop.util.Serialization.gsonJunit.fromJson(event,
+                    org.onap.policy.controlloop.VirtualControlLoopNotification.class);
+        } else if ("APPC-LCM-READ".equals(topic)) {
+            obj = org.onap.policy.appclcm.util.Serialization.gsonJunit.fromJson(event,
+                    org.onap.policy.appclcm.LcmRequestWrapper.class);
         }
-        else if ("APPC-LCM-READ".equals(topic))
-            obj = org.onap.policy.appclcm.util.Serialization.gsonJunit.fromJson(event, org.onap.policy.appclcm.LCMRequestWrapper.class);
         assertNotNull(obj);
         if (obj instanceof VirtualControlLoopNotification) {
             VirtualControlLoopNotification notification = (VirtualControlLoopNotification) obj;
@@ -274,120 +268,106 @@ public class ControlLoopFailureTest implements TopicListener {
             if (policyName.endsWith("EVENT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.ACTIVE.equals(notification.getNotification()));
-            }
-            else if (policyName.endsWith("GUARD_NOT_YET_QUERIED")) {
+            } else if (policyName.endsWith("GUARD_NOT_YET_QUERIED")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("Sending guard query"));
-            }
-            else if (policyName.endsWith("GUARD.RESPONSE")) {
+            } else if (policyName.endsWith("GUARD.RESPONSE")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().toLowerCase().endsWith("permit"));
-            }
-            else if (policyName.endsWith("GUARD_PERMITTED")) {
+            } else if (policyName.endsWith("GUARD_PERMITTED")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("actor=APPC"));
-            }
-            else if (policyName.endsWith("OPERATION.TIMEOUT")) {
+            } else if (policyName.endsWith("OPERATION.TIMEOUT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 kieSession.halt();
                 logger.debug("The operation timed out");
                 fail("Operation Timed Out");
-            }
-            else if (policyName.endsWith("APPC.LCM.RESPONSE")) {
+            } else if (policyName.endsWith("APPC.LCM.RESPONSE")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION_SUCCESS.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("actor=APPC"));
-                if (requestId.equals(notification.getRequestID())) {
+                if (requestId.equals(notification.getRequestId())) {
                     sendEvent(pair.a, requestId, ControlLoopEventStatus.ABATED, "vnf01");
-                }
-                else if (requestId2.equals(notification.getRequestID())) {
+                } else if (requestId2.equals(notification.getRequestId())) {
                     sendEvent(pair.a, requestId2, ControlLoopEventStatus.ABATED, "vnf02");
                 }
-            }
-            else if (policyName.endsWith("EVENT.MANAGER")) {
+            } else if (policyName.endsWith("EVENT.MANAGER")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
-                if (requestId3.equals(notification.getRequestID())) {
+                if (requestId3.equals(notification.getRequestId())) {
                     /*
                      * The event with the duplicate target should be rejected
                      */
                     assertTrue(ControlLoopNotificationType.REJECTED.equals(notification.getNotification()));
-                }
-                else {
+                } else {
                     assertTrue(ControlLoopNotificationType.FINAL_SUCCESS.equals(notification.getNotification()));
                 }
                 if (++eventCount == 3) {
                     kieSession.halt();
                 }
-            }
-            else if (policyName.endsWith("EVENT.MANAGER.TIMEOUT")) {
+            } else if (policyName.endsWith("EVENT.MANAGER.TIMEOUT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 kieSession.halt();
                 logger.debug("The control loop timed out");
                 fail("Control Loop Timed Out");
             }
-        }
-        else if (obj instanceof LCMRequestWrapper) {
+        } else if (obj instanceof LcmRequestWrapper) {
             /*
-             * The request should be of type LCMRequestWrapper
-             * and the subrequestid should be 1
+             * The request should be of type LCMRequestWrapper and the subrequestid should be 1
              */
-            LCMRequestWrapper dmaapRequest = (LCMRequestWrapper) obj;
-            LCMRequest appcRequest = dmaapRequest.getBody();
+            LcmRequestWrapper dmaapRequest = (LcmRequestWrapper) obj;
+            LcmRequest appcRequest = dmaapRequest.getBody();
             assertTrue(appcRequest.getCommonHeader().getSubRequestId().equals("1"));
-            
+
             logger.debug("\n============ APPC received the request!!! ===========\n");
-            
+
             /*
-             * Simulate a success response from APPC and insert
-             * the response into the working memory
+             * Simulate a success response from APPC and insert the response into the working memory
              */
-            LCMResponseWrapper dmaapResponse = new LCMResponseWrapper();
-            LCMResponse appcResponse = new LCMResponse(appcRequest);
+            LcmResponseWrapper dmaapResponse = new LcmResponseWrapper();
+            LcmResponse appcResponse = new LcmResponse(appcRequest);
             appcResponse.getStatus().setCode(400);
             appcResponse.getStatus().setMessage("AppC success");
             dmaapResponse.setBody(appcResponse);
-            
+
             /*
-             * Interrupting with a different request for the same
-             * target entity to check if lock will be denied
+             * Interrupting with a different request for the same target entity to check if lock
+             * will be denied
              */
             if (requestId.equals(appcResponse.getCommonHeader().getRequestId())) {
                 sendEvent(pair.a, requestId3, ControlLoopEventStatus.ONSET, "vnf01");
             }
             kieSession.insert(dmaapResponse);
-        }        
+        }
     }
-    
+
     /**
-     * This method is used to simulate event messages from DCAE
-     * that start the control loop (onset message) or end the
-     * control loop (abatement message).
+     * This method is used to simulate event messages from DCAE that start the control loop (onset
+     * message) or end the control loop (abatement message).
      * 
-     * @param policy the controlLoopName comes from the policy 
+     * @param policy the controlLoopName comes from the policy
      * @param requestID the requestId for this event
      * @param status could be onset or abated
      * @param target, the target entity to take an action on
      */
-    protected void sendEvent(ControlLoopPolicy policy, UUID requestID, 
-                            ControlLoopEventStatus status, String target) {
+    protected void sendEvent(ControlLoopPolicy policy, UUID requestID, ControlLoopEventStatus status, String target) {
         VirtualControlLoopEvent event = new VirtualControlLoopEvent();
         event.setClosedLoopControlName(policy.getControlLoop().getControlLoopName());
-        event.setRequestID(requestID);
+        event.setRequestId(requestID);
         event.setTarget("generic-vnf.vnf-id");
         event.setClosedLoopAlarmStart(Instant.now());
-        event.setAAI(new HashMap<>());
-        event.getAAI().put("generic-vnf.vnf-id", target);
+        event.setAai(new HashMap<>());
+        event.getAai().put("generic-vnf.vnf-id", target);
         event.setClosedLoopEventStatus(status);
         kieSession.insert(event);
     }
-    
+
     /**
      * This method will dump all the facts in the working memory.
      * 
@@ -399,6 +379,6 @@ public class ControlLoopFailureTest implements TopicListener {
             logger.debug("FACT: {}", handle);
         }
     }
-    
+
 }
 
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java
index 4a755bffa..9c3410fcb 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * demo
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,10 @@
 
 package org.onap.policy.template.demo;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -35,10 +38,10 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.kie.api.runtime.KieSession;
 import org.kie.api.runtime.rule.FactHandle;
-import org.onap.policy.appclcm.LCMRequest;
-import org.onap.policy.appclcm.LCMRequestWrapper;
-import org.onap.policy.appclcm.LCMResponse;
-import org.onap.policy.appclcm.LCMResponseWrapper;
+import org.onap.policy.appclcm.LcmRequest;
+import org.onap.policy.appclcm.LcmRequestWrapper;
+import org.onap.policy.appclcm.LcmResponse;
+import org.onap.policy.appclcm.LcmResponseWrapper;
 import org.onap.policy.controlloop.ControlLoopEventStatus;
 import org.onap.policy.controlloop.ControlLoopNotificationType;
 import org.onap.policy.controlloop.ControlLoopTargetType;
@@ -62,35 +65,41 @@ import org.slf4j.LoggerFactory;
 public class VCPEControlLoopTest implements TopicListener {
 
     private static final Logger logger = LoggerFactory.getLogger(VCPEControlLoopTest.class);
-    
+
     private static List<? extends TopicSink> noopTopics;
-    
+
     private static KieSession kieSession;
     private static Util.Pair<ControlLoopPolicy, String> pair;
     private UUID requestID;
-    
+
     static {
         /* Set environment properties */
         Util.setAAIProps();
         Util.setGuardProps();
         Util.setPUProp();
-        LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, "INFO");       
+        LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, "INFO");
     }
-    
+
     @BeforeClass
     public static void setUpSimulator() {
-    	PolicyEngine.manager.configure(new Properties());
-    	assertTrue(PolicyEngine.manager.start());
-    	Properties noopSinkProperties = new Properties();
-    	noopSinkProperties.put(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS, "APPC-LCM-READ,POLICY-CL-MGT");
-    	noopSinkProperties.put("noop.sink.topics.APPC-LCM-READ.events", "org.onap.policy.appclcm.LCMRequestWrapper");
-    	noopSinkProperties.put("noop.sink.topics.APPC-LCM-READ.events.custom.gson", "org.onap.policy.appclcm.util.Serialization,gson");
-    	noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events", "org.onap.policy.controlloop.VirtualControlLoopNotification");
-    	noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events.custom.gson", "org.onap.policy.controlloop.util.Serialization,gsonPretty");
-    	noopTopics = TopicEndpoint.manager.addTopicSinks(noopSinkProperties);
-    	
-    	EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "POLICY-CL-MGT", "org.onap.policy.controlloop.VirtualControlLoopNotification", new JsonProtocolFilter(), null, null, 1111);
-    	EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "APPC-LCM-READ", "org.onap.policy.appclcm.LCMRequestWrapper", new JsonProtocolFilter(), null, null, 1111);
+        PolicyEngine.manager.configure(new Properties());
+        assertTrue(PolicyEngine.manager.start());
+        Properties noopSinkProperties = new Properties();
+        noopSinkProperties.put(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS, "APPC-LCM-READ,POLICY-CL-MGT");
+        noopSinkProperties.put("noop.sink.topics.APPC-LCM-READ.events", "org.onap.policy.appclcm.LcmRequestWrapper");
+        noopSinkProperties.put("noop.sink.topics.APPC-LCM-READ.events.custom.gson",
+                "org.onap.policy.appclcm.util.Serialization,gson");
+        noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events",
+                "org.onap.policy.controlloop.VirtualControlLoopNotification");
+        noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events.custom.gson",
+                "org.onap.policy.controlloop.util.Serialization,gsonPretty");
+        noopTopics = TopicEndpoint.manager.addTopicSinks(noopSinkProperties);
+
+        EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "POLICY-CL-MGT",
+                "org.onap.policy.controlloop.VirtualControlLoopNotification", new JsonProtocolFilter(), null, null,
+                1111);
+        EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "APPC-LCM-READ",
+                "org.onap.policy.appclcm.LcmRequestWrapper", new JsonProtocolFilter(), null, null, 1111);
         try {
             Util.buildAaiSim();
             Util.buildGuardSim();
@@ -101,11 +110,11 @@ public class VCPEControlLoopTest implements TopicListener {
          * Start the kie session
          */
         try {
-            kieSession = startSession("../archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl", 
-                        "src/test/resources/yaml/policy_ControlLoop_vCPE.yaml",
-                        "service=ServiceDemo;resource=Res1Demo;type=operational", 
-                        "CL_vCPE", 
-                        "org.onap.closed_loop.ServiceDemo:VNFS:1.0.0");
+            kieSession = startSession(
+                    "../archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl",
+                    "src/test/resources/yaml/policy_ControlLoop_vCPE.yaml",
+                    "service=ServiceDemo;resource=Res1Demo;type=operational", "CL_vCPE",
+                    "org.onap.closed_loop.ServiceDemo:VNFS:1.0.0");
         } catch (IOException e) {
             e.printStackTrace();
             logger.debug("Could not create kieSession");
@@ -119,114 +128,101 @@ public class VCPEControlLoopTest implements TopicListener {
          * Gracefully shut down the kie session
          */
         kieSession.dispose();
-        
+
         PolicyEngine.manager.stop();
         HttpServletServer.factory.destroy();
         PolicyController.factory.shutdown();
         TopicEndpoint.manager.shutdown();
     }
-    
+
     @Test
     public void successTest() {
-        
+
         /*
-         * Allows the PolicyEngine to callback to this object to
-         * notify that there is an event ready to be pulled 
-         * from the queue
+         * Allows the PolicyEngine to callback to this object to notify that there is an event ready
+         * to be pulled from the queue
          */
         for (TopicSink sink : noopTopics) {
             assertTrue(sink.start());
             sink.register(this);
         }
-        
+
         /*
          * Create a unique requestId
          */
         requestID = UUID.randomUUID();
-        
-        /* 
-         * Simulate an onset event the policy engine will 
-         * receive from DCAE to kick off processing through
-         * the rules
+
+        /*
+         * Simulate an onset event the policy engine will receive from DCAE to kick off processing
+         * through the rules
          */
         sendEvent(pair.a, requestID, ControlLoopEventStatus.ONSET, "vCPEInfraVNF13", true);
-        
+
         kieSession.fireUntilHalt();
-        
+
         /*
          * The only fact in memory should be Params
          */
         assertEquals(1, kieSession.getFactCount());
-        
+
         /*
          * Print what's left in memory
          */
         dumpFacts(kieSession);
     }
-    
+
     @Test
     public void aaiGetFailTest() {
-        
+
         /*
-         * Allows the PolicyEngine to callback to this object to
-         * notify that there is an event ready to be pulled 
-         * from the queue
+         * Allows the PolicyEngine to callback to this object to notify that there is an event ready
+         * to be pulled from the queue
          */
         for (TopicSink sink : noopTopics) {
             assertTrue(sink.start());
             sink.register(this);
         }
-        
+
         /*
          * Create a unique requestId
          */
         requestID = UUID.randomUUID();
-        
-        /* 
-         * Simulate an onset event the policy engine will 
-         * receive from DCAE to kick off processing through
-         * the rules
+
+        /*
+         * Simulate an onset event the policy engine will receive from DCAE to kick off processing
+         * through the rules
          */
         sendEvent(pair.a, requestID, ControlLoopEventStatus.ONSET, "getFail", false);
 
-        
+
         kieSession.fireUntilHalt();
-        
+
         /*
          * The only fact in memory should be Params
          */
         assertEquals(1, kieSession.getFactCount());
-        
+
         /*
          * Print what's left in memory
          */
         dumpFacts(kieSession);
-        
+
     }
 
     /**
-     * This method will start a kie session and instantiate 
-     * the Policy Engine.
+     * This method will start a kie session and instantiate the Policy Engine.
      * 
-     * @param droolsTemplate
-     *          the DRL rules file
-     * @param yamlFile
-     *          the yaml file containing the policies
-     * @param policyScope
-     *          scope for policy
-     * @param policyName
-     *          name of the policy
-     * @param policyVersion
-     *          version of the policy          
-     * @return the kieSession to be used to insert facts 
+     * @param droolsTemplate the DRL rules file
+     * @param yamlFile the yaml file containing the policies
+     * @param policyScope scope for policy
+     * @param policyName name of the policy
+     * @param policyVersion version of the policy
+     * @return the kieSession to be used to insert facts
      * @throws IOException
      */
-    private static KieSession startSession(String droolsTemplate, 
-            String yamlFile, 
-            String policyScope, 
-            String policyName, 
-            String policyVersion) throws IOException {
-        
+    private static KieSession startSession(String droolsTemplate, String yamlFile, String policyScope,
+            String policyName, String policyVersion) throws IOException {
+
         /*
          * Load policies from yaml
          */
@@ -236,43 +232,43 @@ public class VCPEControlLoopTest implements TopicListener {
         assertNotNull(pair.a.getControlLoop());
         assertNotNull(pair.a.getControlLoop().getControlLoopName());
         assertTrue(pair.a.getControlLoop().getControlLoopName().length() > 0);
-        
-        /* 
+
+        /*
          * Construct a kie session
          */
-        final KieSession kieSession = Util.buildContainer(droolsTemplate, 
-                pair.a.getControlLoop().getControlLoopName(), 
-                policyScope, 
-                policyName, 
-                policyVersion, 
-                URLEncoder.encode(pair.b, "UTF-8"));
-        
+        final KieSession kieSession = Util.buildContainer(droolsTemplate, pair.a.getControlLoop().getControlLoopName(),
+                policyScope, policyName, policyVersion, URLEncoder.encode(pair.b, "UTF-8"));
+
         /*
          * Retrieve the Policy Engine
          */
-        
+
         logger.debug("============");
         logger.debug(URLEncoder.encode(pair.b, "UTF-8"));
         logger.debug("============");
-        
+
         return kieSession;
     }
-    
+
     /*
      * (non-Javadoc)
+     * 
      * @see org.onap.policy.drools.PolicyEngineListener#newEventNotification(java.lang.String)
      */
+    @Override
     public void onTopicEvent(CommInfrastructure commType, String topic, String event) {
         /*
-         * Pull the object that was sent out to DMAAP and make
-         * sure it is a ControlLoopNoticiation of type active
+         * Pull the object that was sent out to DMAAP and make sure it is a ControlLoopNoticiation
+         * of type active
          */
         Object obj = null;
         if ("POLICY-CL-MGT".equals(topic)) {
-    		obj = org.onap.policy.controlloop.util.Serialization.gsonJunit.fromJson(event, org.onap.policy.controlloop.VirtualControlLoopNotification.class);
-    	}
-    	else if ("APPC-LCM-READ".equals(topic))
-    		obj = org.onap.policy.appclcm.util.Serialization.gsonJunit.fromJson(event, org.onap.policy.appclcm.LCMRequestWrapper.class);
+            obj = org.onap.policy.controlloop.util.Serialization.gsonJunit.fromJson(event,
+                    org.onap.policy.controlloop.VirtualControlLoopNotification.class);
+        } else if ("APPC-LCM-READ".equals(topic)) {
+            obj = org.onap.policy.appclcm.util.Serialization.gsonJunit.fromJson(event,
+                    org.onap.policy.appclcm.LcmRequestWrapper.class);
+        }
         assertNotNull(obj);
         if (obj instanceof VirtualControlLoopNotification) {
             VirtualControlLoopNotification notification = (VirtualControlLoopNotification) obj;
@@ -280,126 +276,114 @@ public class VCPEControlLoopTest implements TopicListener {
             if (policyName.endsWith("EVENT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.ACTIVE.equals(notification.getNotification()));
-            }
-            else if (policyName.endsWith("GUARD_NOT_YET_QUERIED")) {
+            } else if (policyName.endsWith("GUARD_NOT_YET_QUERIED")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("Sending guard query"));
-            }
-            else if (policyName.endsWith("GUARD.RESPONSE")) {
+            } else if (policyName.endsWith("GUARD.RESPONSE")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().toLowerCase().endsWith("permit"));
-            }
-            else if (policyName.endsWith("GUARD_PERMITTED")) {
+            } else if (policyName.endsWith("GUARD_PERMITTED")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("actor=APPC"));
-            }
-            else if (policyName.endsWith("OPERATION.TIMEOUT")) {
+            } else if (policyName.endsWith("OPERATION.TIMEOUT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 kieSession.halt();
                 logger.debug("The operation timed out");
                 fail("Operation Timed Out");
-            }
-            else if (policyName.endsWith("APPC.LCM.RESPONSE")) {
+            } else if (policyName.endsWith("APPC.LCM.RESPONSE")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION_SUCCESS.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("actor=APPC"));
                 sendEvent(pair.a, requestID, ControlLoopEventStatus.ABATED);
-            }
-            else if (policyName.endsWith("EVENT.MANAGER")) {
+            } else if (policyName.endsWith("EVENT.MANAGER")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
-                if ("getFail".equals(notification.getAAI().get("generic-vnf.vnf-name"))) {
+                if ("getFail".equals(notification.getAai().get("generic-vnf.vnf-name"))) {
                     assertEquals(ControlLoopNotificationType.FINAL_FAILURE, notification.getNotification());
                     kieSession.halt();
-                }
-                else {
+                } else {
                     assertEquals(ControlLoopNotificationType.FINAL_SUCCESS, notification.getNotification());
                     kieSession.halt();
                 }
-            }
-            else if (policyName.endsWith("EVENT.MANAGER.TIMEOUT")) {
+            } else if (policyName.endsWith("EVENT.MANAGER.TIMEOUT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 kieSession.halt();
                 logger.debug("The control loop timed out");
                 fail("Control Loop Timed Out");
             }
-        }
-        else if (obj instanceof LCMRequestWrapper) {
+        } else if (obj instanceof LcmRequestWrapper) {
             /*
-             * The request should be of type LCMRequestWrapper
-             * and the subrequestid should be 1
+             * The request should be of type LcmRequestWrapper and the subrequestid should be 1
              */
-            LCMRequestWrapper dmaapRequest = (LCMRequestWrapper) obj;
-            LCMRequest appcRequest = dmaapRequest.getBody();
+            LcmRequestWrapper dmaapRequest = (LcmRequestWrapper) obj;
+            LcmRequest appcRequest = dmaapRequest.getBody();
             assertTrue(appcRequest.getCommonHeader().getSubRequestId().equals("1"));
             assertNotNull(appcRequest.getActionIdentifiers().get("vnf-id"));
-            
+
             logger.debug("\n============ APPC received the request!!! ===========\n");
-            
+
             /*
-             * Simulate a success response from APPC and insert
-             * the response into the working memory
+             * Simulate a success response from APPC and insert the response into the working memory
              */
-            LCMResponseWrapper dmaapResponse = new LCMResponseWrapper();
-            LCMResponse appcResponse = new LCMResponse(appcRequest);
+            LcmResponseWrapper dmaapResponse = new LcmResponseWrapper();
+            LcmResponse appcResponse = new LcmResponse(appcRequest);
             appcResponse.getStatus().setCode(400);
             appcResponse.getStatus().setMessage("AppC success");
             dmaapResponse.setBody(appcResponse);
             kieSession.insert(dmaapResponse);
-        }        
+        }
     }
-    
+
     /**
-     * This method is used to simulate event messages from DCAE
-     * that start the control loop (onset message) or end the
-     * control loop (abatement message).
+     * This method is used to simulate event messages from DCAE that start the control loop (onset
+     * message) or end the control loop (abatement message).
      * 
-     * @param policy the controlLoopName comes from the policy 
+     * @param policy the controlLoopName comes from the policy
      * @param requestID the requestId for this event
      * @param status could be onset or abated
      */
     protected void sendEvent(ControlLoopPolicy policy, UUID requestID, ControlLoopEventStatus status) {
         VirtualControlLoopEvent event = new VirtualControlLoopEvent();
         event.setClosedLoopControlName(policy.getControlLoop().getControlLoopName());
-        event.setRequestID(requestID);
+        event.setRequestId(requestID);
         event.setTarget("generic-vnf.vnf-name");
         event.setClosedLoopAlarmStart(Instant.now());
-        event.setAAI(new HashMap<>());
-        event.getAAI().put("generic-vnf.vnf-name", "testGenericVnfName");
+        event.setAai(new HashMap<>());
+        event.getAai().put("generic-vnf.vnf-name", "testGenericVnfName");
         event.setClosedLoopEventStatus(status);
         kieSession.insert(event);
     }
-    
-    protected void sendEvent(ControlLoopPolicy policy, UUID requestID, 
-            ControlLoopEventStatus status, String vnfName, boolean isEnriched) {
+
+    protected void sendEvent(ControlLoopPolicy policy, UUID requestID, ControlLoopEventStatus status, String vnfName,
+            boolean isEnriched) {
         VirtualControlLoopEvent event = new VirtualControlLoopEvent();
         event.setClosedLoopControlName(policy.getControlLoop().getControlLoopName());
-        event.setRequestID(requestID);
+        event.setRequestId(requestID);
         event.setTarget("generic-vnf.vnf-name");
         event.setTargetType(ControlLoopTargetType.VNF);
         event.setClosedLoopAlarmStart(Instant.now());
-        event.setAAI(new HashMap<>());
-        event.getAAI().put("generic-vnf.vnf-name", vnfName);
+        event.setAai(new HashMap<>());
+        event.getAai().put("generic-vnf.vnf-name", vnfName);
         if (isEnriched) {
-            event.getAAI().put("generic-vnf.in-maint", "false");
-            event.getAAI().put("generic-vnf.is-closed-loop-disabled", "false");
-            event.getAAI().put("generic-vnf.orchestration-status", "Created");
-            event.getAAI().put("generic-vnf.prov-status", "PREPROV");
-            event.getAAI().put("generic-vnf.resource-version", "1");
-            event.getAAI().put("generic-vnf.service-id", "e8cb8968-5411-478b-906a-f28747de72cd");
-            event.getAAI().put("generic-vnf.vnf-id", "63b31229-9a3a-444f-9159-04ce2dca3be9");
-            event.getAAI().put("generic-vnf.vnf-type", "vCPEInfraService10/vCPEInfraService10 0");
+            event.getAai().put("generic-vnf.in-maint", "false");
+            event.getAai().put("generic-vnf.is-closed-loop-disabled", "false");
+            event.getAai().put("generic-vnf.orchestration-status", "Created");
+            event.getAai().put("generic-vnf.prov-status", "PREPROV");
+            event.getAai().put("generic-vnf.resource-version", "1");
+            event.getAai().put("generic-vnf.service-id", "e8cb8968-5411-478b-906a-f28747de72cd");
+            event.getAai().put("generic-vnf.vnf-id", "63b31229-9a3a-444f-9159-04ce2dca3be9");
+            event.getAai().put("generic-vnf.vnf-type", "vCPEInfraService10/vCPEInfraService10 0");
         }
         event.setClosedLoopEventStatus(status);
         kieSession.insert(event);
     }
-    
+
     /**
      * This method will dump all the facts in the working memory.
      * 
@@ -411,5 +395,5 @@ public class VCPEControlLoopTest implements TopicListener {
             logger.debug("FACT: {}", handle);
         }
     }
-    
+
 }
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java
index c8a8c700f..493316915 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * demo
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,10 +43,10 @@ import org.onap.policy.controlloop.ControlLoopNotificationType;
 import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.VirtualControlLoopNotification;
 import org.onap.policy.controlloop.policy.ControlLoopPolicy;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.drools.event.comm.TopicEndpoint;
 import org.onap.policy.drools.event.comm.TopicListener;
 import org.onap.policy.drools.event.comm.TopicSink;
-import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.drools.http.server.HttpServletServer;
 import org.onap.policy.drools.properties.PolicyProperties;
 import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
@@ -61,217 +61,203 @@ import org.slf4j.LoggerFactory;
 public class VDNSControlLoopTest implements TopicListener {
 
     private static final Logger logger = LoggerFactory.getLogger(VDNSControlLoopTest.class);
-    
+
     private static List<? extends TopicSink> noopTopics;
-    
+
     private static KieSession kieSession;
     private static Util.Pair<ControlLoopPolicy, String> pair;
     private UUID requestID;
-    
+
     static {
         /* Set environment properties */
         Util.setAAIProps();
         Util.setSOProps();
         Util.setGuardProps();
         Util.setPUProp();
-        LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, "INFO"); 
+        LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, "INFO");
     }
-    
-	@BeforeClass
-	public static void setUpSimulator() {
-		PolicyEngine.manager.configure(new Properties());
-    	assertTrue(PolicyEngine.manager.start());
-    	Properties noopSinkProperties = new Properties();
-    	noopSinkProperties.put(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS, "POLICY-CL-MGT");
-    	noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events", "org.onap.policy.controlloop.VirtualControlLoopNotification");
-    	noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events.custom.gson", "org.onap.policy.controlloop.util.Serialization,gsonPretty");
-    	noopTopics = TopicEndpoint.manager.addTopicSinks(noopSinkProperties);
-    	
-    	EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "POLICY-CL-MGT", "org.onap.policy.controlloop.VirtualControlLoopNotification", new JsonProtocolFilter(), null, null, 1111);
-
-		try {
-			Util.buildAaiSim();
-			Util.buildSoSim();
-			Util.buildGuardSim();
-		} catch (Exception e) {
-			fail(e.getMessage());
-		}
-		
+
+    @BeforeClass
+    public static void setUpSimulator() {
+        PolicyEngine.manager.configure(new Properties());
+        assertTrue(PolicyEngine.manager.start());
+        Properties noopSinkProperties = new Properties();
+        noopSinkProperties.put(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS, "POLICY-CL-MGT");
+        noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events",
+                "org.onap.policy.controlloop.VirtualControlLoopNotification");
+        noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events.custom.gson",
+                "org.onap.policy.controlloop.util.Serialization,gsonPretty");
+        noopTopics = TopicEndpoint.manager.addTopicSinks(noopSinkProperties);
+
+        EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "POLICY-CL-MGT",
+                "org.onap.policy.controlloop.VirtualControlLoopNotification", new JsonProtocolFilter(), null, null,
+                1111);
+
+        try {
+            Util.buildAaiSim();
+            Util.buildSoSim();
+            Util.buildGuardSim();
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
+
         /*
          * Start the kie session
          */
         try {
-            kieSession = startSession("../archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl", 
-                        "src/test/resources/yaml/policy_ControlLoop_SO-test.yaml",
-                        "type=operational", 
-                        "CL_vDNS", 
-                        "v2.0");
+            kieSession = startSession(
+                    "../archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl",
+                    "src/test/resources/yaml/policy_ControlLoop_SO-test.yaml", "type=operational", "CL_vDNS", "v2.0");
         } catch (IOException e) {
             e.printStackTrace();
             logger.debug("Could not create kieSession");
             fail("Could not create kieSession");
         }
-	}
+    }
+
+    @AfterClass
+    public static void tearDownSimulator() {
 
-	@AfterClass
-	public static void tearDownSimulator() {
-        
         /*
          * Gracefully shut down the kie session
          */
         kieSession.dispose();
-        
+
         PolicyEngine.manager.stop();
         HttpServletServer.factory.destroy();
         PolicyController.factory.shutdown();
         TopicEndpoint.manager.shutdown();
-	}
+    }
 
     @Test
     public void successTest() {
-        
+
         /*
-         * Allows the PolicyEngine to callback to this object to
-         * notify that there is an event ready to be pulled 
-         * from the queue
+         * Allows the PolicyEngine to callback to this object to notify that there is an event ready
+         * to be pulled from the queue
          */
         for (TopicSink sink : noopTopics) {
             assertTrue(sink.start());
             sink.register(this);
         }
-        
+
         /*
          * Create a unique requestId
          */
         requestID = UUID.randomUUID();
-        
-        /* 
-         * Simulate an onset event the policy engine will 
-         * receive from DCAE to kick off processing through
-         * the rules
+
+        /*
+         * Simulate an onset event the policy engine will receive from DCAE to kick off processing
+         * through the rules
          */
         sendEvent(pair.a, requestID, ControlLoopEventStatus.ONSET);
-        
+
         kieSession.fireUntilHalt();
-        
+
         /*
          * The only fact in memory should be Params
          */
         assertEquals(1, kieSession.getFactCount());
-        
+
         /*
          * Print what's left in memory
          */
         dumpFacts(kieSession);
     }
-    
+
     @Test
     public void namedQueryFailTest() {
-        
+
         /*
-         * Allows the PolicyEngine to callback to this object to
-         * notify that there is an event ready to be pulled 
-         * from the queue
+         * Allows the PolicyEngine to callback to this object to notify that there is an event ready
+         * to be pulled from the queue
          */
         for (TopicSink sink : noopTopics) {
             assertTrue(sink.start());
             sink.register(this);
         }
-        
+
         /*
          * Create a unique requestId
          */
         requestID = UUID.randomUUID();
-        
-        /* 
-         * Simulate an onset event the policy engine will 
-         * receive from DCAE to kick off processing through
-         * the rules
+
+        /*
+         * Simulate an onset event the policy engine will receive from DCAE to kick off processing
+         * through the rules
          */
         sendEvent(pair.a, requestID, ControlLoopEventStatus.ONSET, "error");
-        
+
         kieSession.fireUntilHalt();
-        
+
         /*
          * The only fact in memory should be Params
          */
         assertEquals(1, kieSession.getFactCount());
-        
+
         /*
          * Print what's left in memory
          */
         dumpFacts(kieSession);
     }
-    
+
     @Test
     public void aaiGetFailTest() {
-        
+
         /*
-         * Allows the PolicyEngine to callback to this object to
-         * notify that there is an event ready to be pulled 
-         * from the queue
+         * Allows the PolicyEngine to callback to this object to notify that there is an event ready
+         * to be pulled from the queue
          */
         for (TopicSink sink : noopTopics) {
             assertTrue(sink.start());
             sink.register(this);
         }
-        
+
         /*
          * Create a unique requestId
          */
         requestID = UUID.randomUUID();
-        
-        /* 
-         * Simulate an onset event the policy engine will 
-         * receive from DCAE to kick off processing through
-         * the rules
+
+        /*
+         * Simulate an onset event the policy engine will receive from DCAE to kick off processing
+         * through the rules
          */
         sendEvent(pair.a, requestID, ControlLoopEventStatus.ONSET, "getFail");
-        
+
         try {
-        	kieSession.fireUntilHalt();
-        }
-        catch (Exception e) {
-        	e.printStackTrace();
-        	logger.warn(e.toString());
-        	fail(e.getMessage());
+            kieSession.fireUntilHalt();
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.warn(e.toString());
+            fail(e.getMessage());
         }
-        
-        
+
+
         /*
          * The only fact in memory should be Params
          */
         assertEquals(1, kieSession.getFactCount());
-        
+
         /*
          * Print what's left in memory
          */
         dumpFacts(kieSession);
     }
-    
+
     /**
-     * This method will start a kie session and instantiate 
-     * the Policy Engine.
+     * This method will start a kie session and instantiate the Policy Engine.
      * 
-     * @param droolsTemplate
-     *          the DRL rules file
-     * @param yamlFile
-     *          the yaml file containing the policies
-     * @param policyScope
-     *          scope for policy
-     * @param policyName
-     *          name of the policy
-     * @param policyVersion
-     *          version of the policy          
-     * @return the kieSession to be used to insert facts 
+     * @param droolsTemplate the DRL rules file
+     * @param yamlFile the yaml file containing the policies
+     * @param policyScope scope for policy
+     * @param policyName name of the policy
+     * @param policyVersion version of the policy
+     * @return the kieSession to be used to insert facts
      * @throws IOException
      */
-    private static KieSession startSession(String droolsTemplate, 
-            String yamlFile, 
-            String policyScope, 
-            String policyName, 
-            String policyVersion) throws IOException {
-        
+    private static KieSession startSession(String droolsTemplate, String yamlFile, String policyScope,
+            String policyName, String policyVersion) throws IOException {
+
         /*
          * Load policies from yaml
          */
@@ -281,41 +267,40 @@ public class VDNSControlLoopTest implements TopicListener {
         assertNotNull(pair.a.getControlLoop());
         assertNotNull(pair.a.getControlLoop().getControlLoopName());
         assertTrue(pair.a.getControlLoop().getControlLoopName().length() > 0);
-        
-        /* 
+
+        /*
          * Construct a kie session
          */
-        final KieSession kieSession = Util.buildContainer(droolsTemplate, 
-                pair.a.getControlLoop().getControlLoopName(), 
-                policyScope, 
-                policyName, 
-                policyVersion, 
-                URLEncoder.encode(pair.b, "UTF-8"));
-        
+        final KieSession kieSession = Util.buildContainer(droolsTemplate, pair.a.getControlLoop().getControlLoopName(),
+                policyScope, policyName, policyVersion, URLEncoder.encode(pair.b, "UTF-8"));
+
         /*
          * Retrieve the Policy Engine
          */
-        
+
         logger.debug("============");
         logger.debug(URLEncoder.encode(pair.b, "UTF-8"));
         logger.debug("============");
-        
+
         return kieSession;
     }
-    
+
     /*
      * (non-Javadoc)
+     * 
      * @see org.onap.policy.drools.PolicyEngineListener#newEventNotification(java.lang.String)
      */
+    @Override
     public void onTopicEvent(CommInfrastructure commType, String topic, String event) {
         /*
-         * Pull the object that was sent out to DMAAP and make
-         * sure it is a ControlLoopNoticiation of type active
+         * Pull the object that was sent out to DMAAP and make sure it is a ControlLoopNoticiation
+         * of type active
          */
-    	Object obj = null;
+        Object obj = null;
         if ("POLICY-CL-MGT".equals(topic)) {
-    		obj = org.onap.policy.controlloop.util.Serialization.gsonJunit.fromJson(event, org.onap.policy.controlloop.VirtualControlLoopNotification.class);
-    	}
+            obj = org.onap.policy.controlloop.util.Serialization.gsonJunit.fromJson(event,
+                    org.onap.policy.controlloop.VirtualControlLoopNotification.class);
+        }
         assertNotNull(obj);
         if (obj instanceof VirtualControlLoopNotification) {
             VirtualControlLoopNotification notification = (VirtualControlLoopNotification) obj;
@@ -323,96 +308,86 @@ public class VDNSControlLoopTest implements TopicListener {
             if (policyName.endsWith("EVENT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.ACTIVE.equals(notification.getNotification()));
-            }
-            else if (policyName.endsWith("GUARD_NOT_YET_QUERIED")) {
+            } else if (policyName.endsWith("GUARD_NOT_YET_QUERIED")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("Sending guard query"));
-            }
-            else if (policyName.endsWith("GUARD.RESPONSE")) {
+            } else if (policyName.endsWith("GUARD.RESPONSE")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().toLowerCase().endsWith("permit"));
-            }
-            else if (policyName.endsWith("GUARD_PERMITTED")) {
+            } else if (policyName.endsWith("GUARD_PERMITTED")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("actor=SO"));
-            }
-            else if (policyName.endsWith("OPERATION.TIMEOUT")) {
+            } else if (policyName.endsWith("OPERATION.TIMEOUT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 kieSession.halt();
                 logger.debug("The operation timed out");
                 fail("Operation Timed Out");
-            }
-            else if (policyName.endsWith("SO.RESPONSE")) {
+            } else if (policyName.endsWith("SO.RESPONSE")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION_SUCCESS.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("actor=SO"));
-            }
-            else if (policyName.endsWith("EVENT.MANAGER")) {
+            } else if (policyName.endsWith("EVENT.MANAGER")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
-                if ("error".equals(notification.getAAI().get("vserver.vserver-name"))) {
-                	assertEquals(ControlLoopNotificationType.FINAL_FAILURE, notification.getNotification());
-                }
-                else if ("getFail".equals(notification.getAAI().get("vserver.vserver-name"))) {
+                if ("error".equals(notification.getAai().get("vserver.vserver-name"))) {
                     assertEquals(ControlLoopNotificationType.FINAL_FAILURE, notification.getNotification());
-                }
-                else {
-                	assertTrue(ControlLoopNotificationType.FINAL_SUCCESS.equals(notification.getNotification()));
+                } else if ("getFail".equals(notification.getAai().get("vserver.vserver-name"))) {
+                    assertEquals(ControlLoopNotificationType.FINAL_FAILURE, notification.getNotification());
+                } else {
+                    assertTrue(ControlLoopNotificationType.FINAL_SUCCESS.equals(notification.getNotification()));
                 }
                 kieSession.halt();
-            }
-            else if (policyName.endsWith("EVENT.MANAGER.TIMEOUT")) {
+            } else if (policyName.endsWith("EVENT.MANAGER.TIMEOUT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 kieSession.halt();
                 logger.debug("The control loop timed out");
                 fail("Control Loop Timed Out");
             }
-        }
-        else if (obj instanceof SORequest) {
+        } else if (obj instanceof SORequest) {
             logger.debug("\n============ SO received the request!!! ===========\n");
-        }        
+        }
     }
-    
+
     /**
-     * This method is used to simulate event messages from DCAE
-     * that start the control loop (onset message) or end the
-     * control loop (abatement message).
+     * This method is used to simulate event messages from DCAE that start the control loop (onset
+     * message) or end the control loop (abatement message).
      * 
-     * @param policy the controlLoopName comes from the policy 
+     * @param policy the controlLoopName comes from the policy
      * @param requestID the requestId for this event
      * @param status could be onset or abated
      */
     protected void sendEvent(ControlLoopPolicy policy, UUID requestID, ControlLoopEventStatus status) {
         VirtualControlLoopEvent event = new VirtualControlLoopEvent();
         event.setClosedLoopControlName(policy.getControlLoop().getControlLoopName());
-        event.setRequestID(requestID);
+        event.setRequestId(requestID);
         event.setTarget("vserver.vserver-name");
         event.setClosedLoopAlarmStart(Instant.now());
-        event.setAAI(new HashMap<>());
-        event.getAAI().put("vserver.vserver-name", "dfw1lb01lb01");
-        event.getAAI().put("vserver.is-closed-loop-disabled", "false");
+        event.setAai(new HashMap<>());
+        event.getAai().put("vserver.vserver-name", "dfw1lb01lb01");
+        event.getAai().put("vserver.is-closed-loop-disabled", "false");
         event.setClosedLoopEventStatus(status);
         kieSession.insert(event);
     }
-    
-    protected void sendEvent(ControlLoopPolicy policy, UUID requestID, ControlLoopEventStatus status, String vserverName) {
+
+    protected void sendEvent(ControlLoopPolicy policy, UUID requestID, ControlLoopEventStatus status,
+            String vserverName) {
         VirtualControlLoopEvent event = new VirtualControlLoopEvent();
         event.setClosedLoopControlName(policy.getControlLoop().getControlLoopName());
-        event.setRequestID(requestID);
+        event.setRequestId(requestID);
         event.setTarget("vserver.vserver-name");
         event.setClosedLoopAlarmStart(Instant.now());
-        event.setAAI(new HashMap<>());
-        event.getAAI().put("vserver.vserver-name", vserverName);
+        event.setAai(new HashMap<>());
+        event.getAai().put("vserver.vserver-name", vserverName);
         event.setClosedLoopEventStatus(status);
         kieSession.insert(event);
     }
-    
+
     /**
      * This method will dump all the facts in the working memory.
      * 
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java
index 0e2a78ada..eedd09ba0 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * demo
  * ================================================================================
- * Copyright (C) 2017 Intel Corp. All rights reserved.
+ * Copyright (C) 2017-2018 Intel Corp. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,10 +44,10 @@ import org.onap.policy.controlloop.ControlLoopTargetType;
 import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.VirtualControlLoopNotification;
 import org.onap.policy.controlloop.policy.ControlLoopPolicy;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.drools.event.comm.TopicEndpoint;
 import org.onap.policy.drools.event.comm.TopicListener;
 import org.onap.policy.drools.event.comm.TopicSink;
-import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.drools.http.server.HttpServletServer;
 import org.onap.policy.drools.properties.PolicyProperties;
 import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
@@ -62,228 +62,216 @@ import org.slf4j.LoggerFactory;
 
 public class VFCControlLoopTest implements TopicListener {
 
-	private static final Logger logger = LoggerFactory.getLogger(VFCControlLoopTest.class);
-	
+    private static final Logger logger = LoggerFactory.getLogger(VFCControlLoopTest.class);
+
     private static List<? extends TopicSink> noopTopics;
-    
-	private static KieSession kieSession;
-	private static Util.Pair<ControlLoopPolicy, String> pair;
-	private UUID requestID;
 
-	static {
-	    /* Set environment properties */
+    private static KieSession kieSession;
+    private static Util.Pair<ControlLoopPolicy, String> pair;
+    private UUID requestID;
+
+    static {
+        /* Set environment properties */
         Util.setAAIProps();
         Util.setVFCProps();
         Util.setGuardProps();
         Util.setPUProp();
         LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, "INFO");
-	}
-	
-	@BeforeClass
-	public static void setUpSimulator() {
-		PolicyEngine.manager.configure(new Properties());
-    	assertTrue(PolicyEngine.manager.start());
-    	Properties noopSinkProperties = new Properties();
-    	noopSinkProperties.put(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS, "POLICY-CL-MGT");
-    	noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events", "org.onap.policy.controlloop.VirtualControlLoopNotification");
-    	noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events.custom.gson", "org.onap.policy.controlloop.util.Serialization,gsonPretty");
-    	noopTopics = TopicEndpoint.manager.addTopicSinks(noopSinkProperties);
-    	
-    	EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "POLICY-CL-MGT", "org.onap.policy.controlloop.VirtualControlLoopNotification", new JsonProtocolFilter(), null, null, 1111);
-
-		try {
-			Util.buildAaiSim();
-			Util.buildVfcSim();
-			Util.buildGuardSim();
-		} catch (Exception e) {
-			fail(e.getMessage());
-		}
+    }
+
+    @BeforeClass
+    public static void setUpSimulator() {
+        PolicyEngine.manager.configure(new Properties());
+        assertTrue(PolicyEngine.manager.start());
+        Properties noopSinkProperties = new Properties();
+        noopSinkProperties.put(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS, "POLICY-CL-MGT");
+        noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events",
+                "org.onap.policy.controlloop.VirtualControlLoopNotification");
+        noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events.custom.gson",
+                "org.onap.policy.controlloop.util.Serialization,gsonPretty");
+        noopTopics = TopicEndpoint.manager.addTopicSinks(noopSinkProperties);
+
+        EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "POLICY-CL-MGT",
+                "org.onap.policy.controlloop.VirtualControlLoopNotification", new JsonProtocolFilter(), null, null,
+                1111);
+
+        try {
+            Util.buildAaiSim();
+            Util.buildVfcSim();
+            Util.buildGuardSim();
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
         /*
          * 
          * Start the kie session
          */
         try {
-            kieSession = startSession("../archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl", 
-                        "src/test/resources/yaml/policy_ControlLoop_VFC.yaml",
-                        "type=operational", 
-                        "CL_VoLTE", 
-                        "v2.0");
+            kieSession = startSession(
+                    "../archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl",
+                    "src/test/resources/yaml/policy_ControlLoop_VFC.yaml", "type=operational", "CL_VoLTE", "v2.0");
         } catch (IOException e) {
             e.printStackTrace();
             logger.debug("Could not create kieSession");
             fail("Could not create kieSession");
         }
-	}
+    }
+
+    @AfterClass
+    public static void tearDownSimulator() {
 
-	@AfterClass
-	public static void tearDownSimulator() {
-        
         /*
          * Gracefully shut down the kie session
          */
         kieSession.dispose();
-        
+
         PolicyEngine.manager.stop();
         HttpServletServer.factory.destroy();
         PolicyController.factory.shutdown();
         TopicEndpoint.manager.shutdown();
-	}
+    }
+
+    @Test
+    public void successTest() throws IOException {
 
-	@Test
-	public void successTest() throws IOException {
-        
         /*
-         * Allows the PolicyEngine to callback to this object to
-         * notify that there is an event ready to be pulled 
-         * from the queue
+         * Allows the PolicyEngine to callback to this object to notify that there is an event ready
+         * to be pulled from the queue
          */
         for (TopicSink sink : noopTopics) {
             assertTrue(sink.start());
             sink.register(this);
         }
-        
+
         /*
          * Create a unique requestId
          */
         requestID = UUID.randomUUID();
-        
-        /* 
-         * Simulate an onset event the policy engine will 
-         * receive from DCAE to kick off processing through
-         * the rules
+
+        /*
+         * Simulate an onset event the policy engine will receive from DCAE to kick off processing
+         * through the rules
          */
         sendEvent(pair.a, requestID, ControlLoopEventStatus.ONSET);
-        
+
         kieSession.fireUntilHalt();
-        
+
         /*
          * The only fact in memory should be Params
          */
         assertEquals(1, kieSession.getFactCount());
-        
+
         /*
          * Print what's left in memory
          */
         dumpFacts(kieSession);
-	}
-	
-	@Test
-	public void nullRequestTest() throws IOException {
-        
+    }
+
+    @Test
+    public void nullRequestTest() throws IOException {
+
         /*
-         * Allows the PolicyEngine to callback to this object to
-         * notify that there is an event ready to be pulled 
-         * from the queue
+         * Allows the PolicyEngine to callback to this object to notify that there is an event ready
+         * to be pulled from the queue
          */
         for (TopicSink sink : noopTopics) {
             assertTrue(sink.start());
             sink.register(this);
         }
-        
+
         /*
          * Create a unique requestId
          */
         requestID = UUID.randomUUID();
-        
-        /* 
-         * Simulate an onset event the policy engine will 
-         * receive from DCAE to kick off processing through
-         * the rules
+
+        /*
+         * Simulate an onset event the policy engine will receive from DCAE to kick off processing
+         * through the rules
          */
-        
+
         VirtualControlLoopEvent event = new VirtualControlLoopEvent();
         event.setClosedLoopControlName(pair.a.getControlLoop().getControlLoopName());
-        event.setRequestID(UUID.randomUUID());
+        event.setRequestId(UUID.randomUUID());
         event.setClosedLoopEventClient("tca.instance00009");
         event.setTargetType(ControlLoopTargetType.VM);
         event.setTarget("vserver.vserver-name");
         event.setFrom("DCAE");
         event.setClosedLoopAlarmStart(Instant.now());
-        event.setAAI(new HashMap<String, String>());
-        event.getAAI().put("vserver.vserver-name", "nullRequest");
+        event.setAai(new HashMap<String, String>());
+        event.getAai().put("vserver.vserver-name", "nullRequest");
         event.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET);
         kieSession.insert(event);
-        
+
         kieSession.fireUntilHalt();
-        
+
         /*
          * The only fact in memory should be Params
          */
         assertEquals(1, kieSession.getFactCount());
-        
+
         /*
          * Print what's left in memory
          */
         dumpFacts(kieSession);
-	}
-
-	/**
-	 * This method will start a kie session and instantiate
-	 * the Policy Engine.
-	 *
-	 * @param droolsTemplate
-	 *          the DRL rules file
-	 * @param yamlFile
-	 *          the yaml file containing the policies
-	 * @param policyScope
-	 *          scope for policy
-	 * @param policyName
-	 *          name of the policy
-	 * @param policyVersion
-	 *          version of the policy
-	 * @return the kieSession to be used to insert facts
-	 * @throws IOException
-	 */
-	private static KieSession startSession(String droolsTemplate,
-					String yamlFile,
-					String policyScope,
-					String policyName,
-					String policyVersion) throws IOException {
+    }
+
+    /**
+     * This method will start a kie session and instantiate the Policy Engine.
+     *
+     * @param droolsTemplate the DRL rules file
+     * @param yamlFile the yaml file containing the policies
+     * @param policyScope scope for policy
+     * @param policyName name of the policy
+     * @param policyVersion version of the policy
+     * @return the kieSession to be used to insert facts
+     * @throws IOException
+     */
+    private static KieSession startSession(String droolsTemplate, String yamlFile, String policyScope,
+            String policyName, String policyVersion) throws IOException {
 
         /*
          * Load policies from yaml
          */
-		pair = Util.loadYaml(yamlFile);
-		assertNotNull(pair);
-		assertNotNull(pair.a);
-		assertNotNull(pair.a.getControlLoop());
-		assertNotNull(pair.a.getControlLoop().getControlLoopName());
-		assertTrue(pair.a.getControlLoop().getControlLoopName().length() > 0);
+        pair = Util.loadYaml(yamlFile);
+        assertNotNull(pair);
+        assertNotNull(pair.a);
+        assertNotNull(pair.a.getControlLoop());
+        assertNotNull(pair.a.getControlLoop().getControlLoopName());
+        assertTrue(pair.a.getControlLoop().getControlLoopName().length() > 0);
 
         /*
          * Construct a kie session
          */
-		final KieSession kieSession = Util.buildContainer(droolsTemplate,
-				pair.a.getControlLoop().getControlLoopName(),
-				policyScope,
-				policyName,
-				policyVersion,
-				URLEncoder.encode(pair.b, "UTF-8"));
+        final KieSession kieSession = Util.buildContainer(droolsTemplate, pair.a.getControlLoop().getControlLoopName(),
+                policyScope, policyName, policyVersion, URLEncoder.encode(pair.b, "UTF-8"));
 
         /*
          * Retrieve the Policy Engine
          */
 
-		logger.debug("============");
-		logger.debug(URLEncoder.encode(pair.b, "UTF-8"));
-		logger.debug("============");
+        logger.debug("============");
+        logger.debug(URLEncoder.encode(pair.b, "UTF-8"));
+        logger.debug("============");
+
+        return kieSession;
+    }
 
-		return kieSession;
-	}
-	
-	/*
+    /*
      * (non-Javadoc)
+     * 
      * @see org.onap.policy.drools.PolicyEngineListener#newEventNotification(java.lang.String)
      */
-	public void onTopicEvent(CommInfrastructure commType, String topic, String event) {
+    @Override
+    public void onTopicEvent(CommInfrastructure commType, String topic, String event) {
         /*
-         * Pull the object that was sent out to DMAAP and make
-         * sure it is a ControlLoopNoticiation of type active
+         * Pull the object that was sent out to DMAAP and make sure it is a ControlLoopNoticiation
+         * of type active
          */
-		Object obj = null;
+        Object obj = null;
         if ("POLICY-CL-MGT".equals(topic)) {
-    		obj = org.onap.policy.controlloop.util.Serialization.gsonJunit.fromJson(event, org.onap.policy.controlloop.VirtualControlLoopNotification.class);
-    	}
+            obj = org.onap.policy.controlloop.util.Serialization.gsonJunit.fromJson(event,
+                    org.onap.policy.controlloop.VirtualControlLoopNotification.class);
+        }
         assertNotNull(obj);
         if (obj instanceof VirtualControlLoopNotification) {
             VirtualControlLoopNotification notification = (VirtualControlLoopNotification) obj;
@@ -291,93 +279,83 @@ public class VFCControlLoopTest implements TopicListener {
             if (policyName.endsWith("EVENT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.ACTIVE.equals(notification.getNotification()));
-            }
-            else if (policyName.endsWith("GUARD_NOT_YET_QUERIED")) {
+            } else if (policyName.endsWith("GUARD_NOT_YET_QUERIED")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("Sending guard query"));
-            }
-            else if (policyName.endsWith("GUARD.RESPONSE")) {
+            } else if (policyName.endsWith("GUARD.RESPONSE")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().toLowerCase().endsWith("permit"));
-            }
-            else if (policyName.endsWith("GUARD_PERMITTED")) {
+            } else if (policyName.endsWith("GUARD_PERMITTED")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("actor=VFC"));
-            }
-            else if (policyName.endsWith("OPERATION.TIMEOUT")) {
+            } else if (policyName.endsWith("OPERATION.TIMEOUT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 kieSession.halt();
                 logger.debug("The operation timed out");
                 fail("Operation Timed Out");
-            }
-            else if (policyName.endsWith("VFC.RESPONSE")) {
+            } else if (policyName.endsWith("VFC.RESPONSE")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION_SUCCESS.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("actor=VFC"));
-            }
-            else if (policyName.endsWith("EVENT.MANAGER")) {
+            } else if (policyName.endsWith("EVENT.MANAGER")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
-                if ("nullRequest".equals(notification.getAAI().get("vserver.vserver-name"))){
-                	assertEquals(ControlLoopNotificationType.FINAL_FAILURE, notification.getNotification());
-                }
-                else {
-                     assertEquals(ControlLoopNotificationType.FINAL_SUCCESS, notification.getNotification());
+                if ("nullRequest".equals(notification.getAai().get("vserver.vserver-name"))) {
+                    assertEquals(ControlLoopNotificationType.FINAL_FAILURE, notification.getNotification());
+                } else {
+                    assertEquals(ControlLoopNotificationType.FINAL_SUCCESS, notification.getNotification());
                 }
                 kieSession.halt();
-            }
-            else if (policyName.endsWith("EVENT.MANAGER.TIMEOUT")) {
+            } else if (policyName.endsWith("EVENT.MANAGER.TIMEOUT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 kieSession.halt();
                 logger.debug("The control loop timed out");
                 fail("Control Loop Timed Out");
             }
-        }
-        else if (obj instanceof VFCRequest) {
+        } else if (obj instanceof VFCRequest) {
             logger.debug("\n============ VFC received the request!!! ===========\n");
-        }        
+        }
+    }
+
+    /**
+     * This method is used to simulate event messages from DCAE that start the control loop (onset
+     * message) or end the control loop (abatement message).
+     * 
+     * @param policy the controlLoopName comes from the policy
+     * @param requestID the requestId for this event
+     * @param status could be onset or abated
+     */
+    protected void sendEvent(ControlLoopPolicy policy, UUID requestID, ControlLoopEventStatus status) {
+        VirtualControlLoopEvent event = new VirtualControlLoopEvent();
+        event.setClosedLoopControlName(policy.getControlLoop().getControlLoopName());
+        event.setRequestId(UUID.randomUUID());
+        event.setClosedLoopEventClient("tca.instance00009");
+        event.setTargetType(ControlLoopTargetType.VM);
+        event.setTarget("vserver.vserver-name");
+        event.setFrom("DCAE");
+        event.setClosedLoopAlarmStart(Instant.now());
+        event.setAai(new HashMap<String, String>());
+        event.getAai().put("vserver.vserver-name", "vserver-name-16102016-aai3255-data-11-1");
+        event.getAai().put("vserver.vserver-id", "vserver-id-16102016-aai3255-data-11-1");
+        event.getAai().put("generic-vnf.vnf-id", "vnf-id-16102016-aai3255-data-11-1");
+        event.getAai().put("service-instance.service-instance-id", "service-instance-id-16102016-aai3255-data-11-1");
+        event.getAai().put("vserver.is-closed-loop-disabled", "false");
+        event.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET);
+        kieSession.insert(event);
+    }
+
+    public static void dumpFacts(KieSession kieSession) {
+        logger.debug("Fact Count: " + kieSession.getFactCount());
+        for (FactHandle handle : kieSession.getFactHandles()) {
+            logger.debug("FACT: " + handle);
+        }
     }
-	
-	/**
-    * This method is used to simulate event messages from DCAE
-    * that start the control loop (onset message) or end the
-    * control loop (abatement message).
-    * 
-    * @param policy the controlLoopName comes from the policy 
-    * @param requestID the requestId for this event
-    * @param status could be onset or abated
-    */
-   protected void sendEvent(ControlLoopPolicy policy, UUID requestID, ControlLoopEventStatus status) {
-       VirtualControlLoopEvent event = new VirtualControlLoopEvent();
-       event.setClosedLoopControlName(policy.getControlLoop().getControlLoopName());
-       event.setRequestID(UUID.randomUUID());
-       event.setClosedLoopEventClient("tca.instance00009");
-       event.setTargetType(ControlLoopTargetType.VM);
-       event.setTarget("vserver.vserver-name");
-       event.setFrom("DCAE");
-       event.setClosedLoopAlarmStart(Instant.now());
-       event.setAAI(new HashMap<String, String>());
-       event.getAAI().put("vserver.vserver-name", "vserver-name-16102016-aai3255-data-11-1");
-       event.getAAI().put("vserver.vserver-id", "vserver-id-16102016-aai3255-data-11-1");
-       event.getAAI().put("generic-vnf.vnf-id", "vnf-id-16102016-aai3255-data-11-1");
-       event.getAAI().put("service-instance.service-instance-id", "service-instance-id-16102016-aai3255-data-11-1");
-       event.getAAI().put("vserver.is-closed-loop-disabled", "false");
-       event.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET);
-       kieSession.insert(event);
-   }
-   
-   public static void dumpFacts(KieSession kieSession) {
-       logger.debug("Fact Count: " + kieSession.getFactCount());
-       for (FactHandle handle : kieSession.getFactHandles()) {
-           logger.debug("FACT: " + handle);
-       }
-   }
 
 }
 
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java
index 8c449cebd..9c0cbd716 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * demo
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,10 +46,10 @@ import org.onap.policy.controlloop.ControlLoopNotificationType;
 import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.VirtualControlLoopNotification;
 import org.onap.policy.controlloop.policy.ControlLoopPolicy;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.drools.event.comm.TopicEndpoint;
 import org.onap.policy.drools.event.comm.TopicListener;
 import org.onap.policy.drools.event.comm.TopicSink;
-import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.drools.http.server.HttpServletServer;
 import org.onap.policy.drools.properties.PolicyProperties;
 import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
@@ -63,13 +63,13 @@ import org.slf4j.LoggerFactory;
 public class VFWControlLoopTest implements TopicListener {
 
     private static final Logger logger = LoggerFactory.getLogger(VFWControlLoopTest.class);
-    
+
     private static List<? extends TopicSink> noopTopics;
-    
+
     private static KieSession kieSession;
     private static Util.Pair<ControlLoopPolicy, String> pair;
     private UUID requestID;
-    
+
     static {
         /* Set environment properties */
         Util.setAAIProps();
@@ -77,21 +77,27 @@ public class VFWControlLoopTest implements TopicListener {
         Util.setPUProp();
         LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, "INFO");
     }
-    
+
     @BeforeClass
     public static void setUpSimulator() {
-    	PolicyEngine.manager.configure(new Properties());
-    	assertTrue(PolicyEngine.manager.start());
-    	Properties noopSinkProperties = new Properties();
-    	noopSinkProperties.put(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS, "APPC-CL,POLICY-CL-MGT");
-    	noopSinkProperties.put("noop.sink.topics.APPC-CL.events", "org.onap.policy.appc.Response");
-    	noopSinkProperties.put("noop.sink.topics.APPC-CL.events.custom.gson", "org.onap.policy.appc.util.Serialization,gsonPretty");
-    	noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events", "org.onap.policy.controlloop.VirtualControlLoopNotification");
-    	noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events.custom.gson", "org.onap.policy.controlloop.util.Serialization,gsonPretty");
-    	noopTopics = TopicEndpoint.manager.addTopicSinks(noopSinkProperties);
-    	
-    	EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "POLICY-CL-MGT", "org.onap.policy.controlloop.VirtualControlLoopNotification", new JsonProtocolFilter(), null, null, 1111);
-    	EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "APPC-CL", "org.onap.policy.appc.Request", new JsonProtocolFilter(), null, null, 1111);
+        PolicyEngine.manager.configure(new Properties());
+        assertTrue(PolicyEngine.manager.start());
+        Properties noopSinkProperties = new Properties();
+        noopSinkProperties.put(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS, "APPC-CL,POLICY-CL-MGT");
+        noopSinkProperties.put("noop.sink.topics.APPC-CL.events", "org.onap.policy.appc.Response");
+        noopSinkProperties.put("noop.sink.topics.APPC-CL.events.custom.gson",
+                "org.onap.policy.appc.util.Serialization,gsonPretty");
+        noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events",
+                "org.onap.policy.controlloop.VirtualControlLoopNotification");
+        noopSinkProperties.put("noop.sink.topics.POLICY-CL-MGT.events.custom.gson",
+                "org.onap.policy.controlloop.util.Serialization,gsonPretty");
+        noopTopics = TopicEndpoint.manager.addTopicSinks(noopSinkProperties);
+
+        EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "POLICY-CL-MGT",
+                "org.onap.policy.controlloop.VirtualControlLoopNotification", new JsonProtocolFilter(), null, null,
+                1111);
+        EventProtocolCoder.manager.addEncoder("junit.groupId", "junit.artifactId", "APPC-CL",
+                "org.onap.policy.appc.Request", new JsonProtocolFilter(), null, null, 1111);
 
         try {
             Util.buildAaiSim();
@@ -99,16 +105,16 @@ public class VFWControlLoopTest implements TopicListener {
         } catch (Exception e) {
             fail(e.getMessage());
         }
-        
+
         /*
          * Start the kie session
          */
         try {
-            kieSession = startSession("../archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl", 
-                        "src/test/resources/yaml/policy_ControlLoop_vFW.yaml",
-                        "service=ServiceDemo;resource=Res1Demo;type=operational", 
-                        "CL_vFW", 
-                        "org.onap.closed_loop.ServiceDemo:VNFS:1.0.0");
+            kieSession = startSession(
+                    "../archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl",
+                    "src/test/resources/yaml/policy_ControlLoop_vFW.yaml",
+                    "service=ServiceDemo;resource=Res1Demo;type=operational", "CL_vFW",
+                    "org.onap.closed_loop.ServiceDemo:VNFS:1.0.0");
         } catch (IOException e) {
             e.printStackTrace();
             logger.debug("Could not create kieSession");
@@ -118,162 +124,145 @@ public class VFWControlLoopTest implements TopicListener {
 
     @AfterClass
     public static void tearDownSimulator() {
-    	/*
+        /*
          * Gracefully shut down the kie session
          */
         kieSession.dispose();
-        
+
         PolicyEngine.manager.stop();
         HttpServletServer.factory.destroy();
         PolicyController.factory.shutdown();
         TopicEndpoint.manager.shutdown();
     }
-    
+
     @Test
     public void successTest() {
-        
-    	/*
-         * Allows the PolicyEngine to callback to this object to
-         * notify that there is an event ready to be pulled 
-         * from the queue
+
+        /*
+         * Allows the PolicyEngine to callback to this object to notify that there is an event ready
+         * to be pulled from the queue
          */
         for (TopicSink sink : noopTopics) {
             assertTrue(sink.start());
             sink.register(this);
         }
-    	
+
         /*
          * Create a unique requestId
          */
         requestID = UUID.randomUUID();
-        
-        /* 
-         * Simulate an onset event the policy engine will 
-         * receive from DCAE to kick off processing through
-         * the rules
+
+        /*
+         * Simulate an onset event the policy engine will receive from DCAE to kick off processing
+         * through the rules
          */
         sendEvent(pair.a, requestID, ControlLoopEventStatus.ONSET);
-        
+
         try {
-        	kieSession.fireUntilHalt();
-        }
-        catch (Exception e) {
-        	e.printStackTrace();
-        	logger.warn(e.toString());
-        	fail("fail");
+            kieSession.fireUntilHalt();
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.warn(e.toString());
+            fail("fail");
         }
-        
-        
+
+
         /*
          * The only fact in memory should be Params
          */
         assertEquals(1, kieSession.getFactCount());
-        
+
         /*
          * Print what's left in memory
          */
         dumpFacts(kieSession);
     }
-    
+
     @Test
     public void aaiFailTests() {
-        
+
         /*
-         * Allows the PolicyEngine to callback to this object to
-         * notify that there is an event ready to be pulled 
-         * from the queue
+         * Allows the PolicyEngine to callback to this object to notify that there is an event ready
+         * to be pulled from the queue
          */
         for (TopicSink sink : noopTopics) {
             assertTrue(sink.start());
             sink.register(this);
         }
-        
+
         /*
          * Create a unique requestId
          */
         requestID = UUID.randomUUID();
-        
-        /* 
-         * Simulate an onset event the policy engine will 
-         * receive from DCAE to kick off processing through
-         * the rules
+
+        /*
+         * Simulate an onset event the policy engine will receive from DCAE to kick off processing
+         * through the rules
          */
         sendEvent(pair.a, requestID, ControlLoopEventStatus.ONSET, "error");
         try {
-        	kieSession.fireUntilHalt();
-        }
-        catch (Exception e) {
-        	e.printStackTrace();
-        	logger.warn(e.toString());
-        	fail(e.getMessage());
+            kieSession.fireUntilHalt();
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.warn(e.toString());
+            fail(e.getMessage());
         }
-        
+
         /*
          * The only fact in memory should be Params
          */
         assertEquals(1, kieSession.getFactCount());
-        
+
         /*
          * Print what's left in memory
          */
         dumpFacts(kieSession);
-        
+
         /*
          * Create a unique requestId
          */
         requestID = UUID.randomUUID();
-        
-        /* 
-         * Simulate an onset event the policy engine will 
-         * receive from DCAE to kick off processing through
-         * the rules
+
+        /*
+         * Simulate an onset event the policy engine will receive from DCAE to kick off processing
+         * through the rules
          */
-        
+
         sendEvent(pair.a, requestID, ControlLoopEventStatus.ONSET, "getFail");
-        
+
         try {
-        	kieSession.fireUntilHalt();
-        }
-        catch (Exception e) {
-        	e.printStackTrace();
-        	logger.warn(e.toString());
-        	fail(e.getMessage());
+            kieSession.fireUntilHalt();
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.warn(e.toString());
+            fail(e.getMessage());
         }
-        
+
         /*
          * The only fact in memory should be Params
          */
         assertEquals(1, kieSession.getFactCount());
-        
+
         /*
          * Print what's left in memory
          */
         dumpFacts(kieSession);
     }
-    
+
     /**
-     * This method will start a kie session and instantiate 
-     * the Policy Engine.
+     * This method will start a kie session and instantiate the Policy Engine.
      * 
-     * @param droolsTemplate
-     *          the DRL rules file
-     * @param yamlFile
-     *          the yaml file containing the policies
-     * @param policyScope
-     *          scope for policy
-     * @param policyName
-     *          name of the policy
-     * @param policyVersion
-     *          version of the policy          
-     * @return the kieSession to be used to insert facts 
+     * @param droolsTemplate the DRL rules file
+     * @param yamlFile the yaml file containing the policies
+     * @param policyScope scope for policy
+     * @param policyName name of the policy
+     * @param policyVersion version of the policy
+     * @return the kieSession to be used to insert facts
      * @throws IOException
      */
-    private static KieSession startSession(String droolsTemplate, 
-            String yamlFile, 
-            String policyScope, 
-            String policyName, 
-            String policyVersion) throws IOException {
-        
+    private static KieSession startSession(String droolsTemplate, String yamlFile, String policyScope,
+            String policyName, String policyVersion) throws IOException {
+
         /*
          * Load policies from yaml
          */
@@ -283,42 +272,41 @@ public class VFWControlLoopTest implements TopicListener {
         assertNotNull(pair.a.getControlLoop());
         assertNotNull(pair.a.getControlLoop().getControlLoopName());
         assertTrue(pair.a.getControlLoop().getControlLoopName().length() > 0);
-        
-        /* 
+
+        /*
          * Construct a kie session
          */
-        final KieSession kieSession = Util.buildContainer(droolsTemplate, 
-                pair.a.getControlLoop().getControlLoopName(), 
-                policyScope, 
-                policyName, 
-                policyVersion, 
-                URLEncoder.encode(pair.b, "UTF-8"));
-        
+        final KieSession kieSession = Util.buildContainer(droolsTemplate, pair.a.getControlLoop().getControlLoopName(),
+                policyScope, policyName, policyVersion, URLEncoder.encode(pair.b, "UTF-8"));
+
         /*
          * Retrieve the Policy Engine
          */
-        
+
         logger.debug("============");
         logger.debug(URLEncoder.encode(pair.b, "UTF-8"));
         logger.debug("============");
-        
+
         return kieSession;
     }
-    
+
     /*
      * @see org.onap.policy.drools.PolicyEngineListener#newEventNotification(java.lang.String)
      */
+    @Override
     public void onTopicEvent(CommInfrastructure commType, String topic, String event) {
         /*
-         * Pull the object that was sent out to DMAAP and make
-         * sure it is a ControlLoopNoticiation of type active
+         * Pull the object that was sent out to DMAAP and make sure it is a ControlLoopNoticiation
+         * of type active
          */
-    	Object obj = null;
+        Object obj = null;
         if ("POLICY-CL-MGT".equals(topic)) {
-    		obj = org.onap.policy.controlloop.util.Serialization.gsonJunit.fromJson(event, org.onap.policy.controlloop.VirtualControlLoopNotification.class);
-    	}
-    	else if ("APPC-CL".equals(topic))
-    		obj = org.onap.policy.appc.util.Serialization.gsonPretty.fromJson(event, org.onap.policy.appc.Request.class);
+            obj = org.onap.policy.controlloop.util.Serialization.gsonJunit.fromJson(event,
+                    org.onap.policy.controlloop.VirtualControlLoopNotification.class);
+        } else if ("APPC-CL".equals(topic)) {
+            obj = org.onap.policy.appc.util.Serialization.gsonPretty.fromJson(event,
+                    org.onap.policy.appc.Request.class);
+        }
         assertNotNull(obj);
         if (obj instanceof VirtualControlLoopNotification) {
             VirtualControlLoopNotification notification = (VirtualControlLoopNotification) obj;
@@ -326,118 +314,105 @@ public class VFWControlLoopTest implements TopicListener {
             if (policyName.endsWith("EVENT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.ACTIVE.equals(notification.getNotification()));
-            }
-            else if (policyName.endsWith("GUARD_NOT_YET_QUERIED")) {
+            } else if (policyName.endsWith("GUARD_NOT_YET_QUERIED")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("Sending guard query"));
-            }
-            else if (policyName.endsWith("GUARD.RESPONSE")) {
+            } else if (policyName.endsWith("GUARD.RESPONSE")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().toLowerCase().endsWith("permit"));
-            }
-            else if (policyName.endsWith("GUARD_PERMITTED")) {
+            } else if (policyName.endsWith("GUARD_PERMITTED")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("actor=APPC"));
-            }
-            else if (policyName.endsWith("OPERATION.TIMEOUT")) {
+            } else if (policyName.endsWith("OPERATION.TIMEOUT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 kieSession.halt();
                 logger.debug("The operation timed out");
                 fail("Operation Timed Out");
-            }
-            else if (policyName.endsWith("APPC.RESPONSE")) {
+            } else if (policyName.endsWith("APPC.RESPONSE")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 assertTrue(ControlLoopNotificationType.OPERATION_SUCCESS.equals(notification.getNotification()));
                 assertNotNull(notification.getMessage());
                 assertTrue(notification.getMessage().startsWith("actor=APPC"));
                 sendEvent(pair.a, requestID, ControlLoopEventStatus.ABATED);
-            }
-            else if (policyName.endsWith("EVENT.MANAGER")) {
+            } else if (policyName.endsWith("EVENT.MANAGER")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
-                if ("error".equals(notification.getAAI().get("generic-vnf.vnf-name"))) {
-                	assertEquals(ControlLoopNotificationType.FINAL_FAILURE, notification.getNotification());
-                	assertEquals("Target vnf-id could not be found", notification.getMessage());
-                }
-                else if ("getFail".equals(notification.getAAI().get("generic-vnf.vnf-name"))) {
+                if ("error".equals(notification.getAai().get("generic-vnf.vnf-name"))) {
                     assertEquals(ControlLoopNotificationType.FINAL_FAILURE, notification.getNotification());
-                }
-                else {
+                    assertEquals("Target vnf-id could not be found", notification.getMessage());
+                } else if ("getFail".equals(notification.getAai().get("generic-vnf.vnf-name"))) {
+                    assertEquals(ControlLoopNotificationType.FINAL_FAILURE, notification.getNotification());
+                } else {
                     assertTrue(ControlLoopNotificationType.FINAL_SUCCESS.equals(notification.getNotification()));
                 }
                 kieSession.halt();
-            }
-            else if (policyName.endsWith("EVENT.MANAGER.TIMEOUT")) {
+            } else if (policyName.endsWith("EVENT.MANAGER.TIMEOUT")) {
                 logger.debug("Rule Fired: " + notification.getPolicyName());
                 kieSession.halt();
                 logger.debug("The control loop timed out");
                 fail("Control Loop Timed Out");
             }
-        }
-        else if (obj instanceof Request) {
-            assertTrue(((Request)obj).getCommonHeader().getSubRequestID().equals("1"));
-            assertNotNull(((Request)obj).getPayload().get("generic-vnf.vnf-id"));
-            
+        } else if (obj instanceof Request) {
+            assertTrue(((Request) obj).getCommonHeader().getSubRequestId().equals("1"));
+            assertNotNull(((Request) obj).getPayload().get("generic-vnf.vnf-id"));
+
             logger.debug("\n============ APPC received the request!!! ===========\n");
-            
+
             /*
-             * Simulate a success response from APPC and insert
-             * the response into the working memory
+             * Simulate a success response from APPC and insert the response into the working memory
              */
-            Response appcResponse = new Response((Request)obj);
+            Response appcResponse = new Response((Request) obj);
             appcResponse.getStatus().setCode(ResponseCode.SUCCESS.getValue());
             appcResponse.getStatus().setValue("SUCCESS");
             kieSession.insert(appcResponse);
-        }        
+        }
     }
-    
+
     /**
-     * This method is used to simulate event messages from DCAE
-     * that start the control loop (onset message) or end the
-     * control loop (abatement message).
+     * This method is used to simulate event messages from DCAE that start the control loop (onset
+     * message) or end the control loop (abatement message).
      * 
-     * @param policy the controlLoopName comes from the policy 
+     * @param policy the controlLoopName comes from the policy
      * @param requestID the requestId for this event
      * @param status could be onset or abated
      */
     protected void sendEvent(ControlLoopPolicy policy, UUID requestID, ControlLoopEventStatus status) {
         VirtualControlLoopEvent event = new VirtualControlLoopEvent();
         event.setClosedLoopControlName(policy.getControlLoop().getControlLoopName());
-        event.setRequestID(requestID);
+        event.setRequestId(requestID);
         event.setTarget("generic-vnf.vnf-name");
         event.setClosedLoopAlarmStart(Instant.now());
-        event.setAAI(new HashMap<>());
-        event.getAAI().put("generic-vnf.vnf-name", "testGenericVnfID");
+        event.setAai(new HashMap<>());
+        event.getAai().put("generic-vnf.vnf-name", "testGenericVnfID");
         event.setClosedLoopEventStatus(status);
         kieSession.insert(event);
     }
-    
+
     /**
-     * This method is used to simulate event messages from DCAE
-     * that start the control loop (onset message) or end the
-     * control loop (abatement message).
+     * This method is used to simulate event messages from DCAE that start the control loop (onset
+     * message) or end the control loop (abatement message).
      * 
-     * @param policy the controlLoopName comes from the policy 
+     * @param policy the controlLoopName comes from the policy
      * @param requestID the requestId for this event
      * @param status could be onset or abated
      */
     protected void sendEvent(ControlLoopPolicy policy, UUID requestID, ControlLoopEventStatus status, String vnfId) {
         VirtualControlLoopEvent event = new VirtualControlLoopEvent();
         event.setClosedLoopControlName(policy.getControlLoop().getControlLoopName());
-        event.setRequestID(requestID);
+        event.setRequestId(requestID);
         event.setTarget("generic-vnf.vnf-name");
         event.setClosedLoopAlarmStart(Instant.now());
-        event.setAAI(new HashMap<>());
-        event.getAAI().put("generic-vnf.vnf-name", vnfId);
+        event.setAai(new HashMap<>());
+        event.getAai().put("generic-vnf.vnf-name", vnfId);
         event.setClosedLoopEventStatus(status);
         kieSession.insert(event);
     }
-    
+
     /**
      * This method will dump all the facts in the working memory.
      *