Initial OpenECOMP policy/engine commit

Change-Id: I7dbff37733b661643dd4d1caefa3d7dccc361b6e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

60 files changed, 15994 insertions, 0 deletions

diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientEndTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientEndTest.java
new file mode 100644
index 000000000..af36d6d71
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientEndTest.java
@@ -0,0 +1,312 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import javax.websocket.Session;
+
+import org.junit.*;
+import org.mockito.Mockito;
+import org.openecomp.policy.api.NotificationHandler;
+import org.openecomp.policy.api.NotificationScheme;
+import org.openecomp.policy.std.AutoClientEnd;
+import org.openecomp.policy.std.StdPolicyEngine;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>AutoClientEndTest</code> contains tests for the class <code>{@link AutoClientEnd}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class AutoClientEndTest {
+	/**
+	 * Run the AutoClientEnd() constructor test.
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testAutoClientEnd_1()
+		throws Exception {
+		AutoClientEnd result = new AutoClientEnd();
+		assertNotNull(result);
+		// add additional test code here
+	}
+
+	/**
+	 * Run the boolean getStatus() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetStatus_1()
+		throws Exception {
+
+		boolean result = AutoClientEnd.getStatus();
+
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the String getURL() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetURL_1()
+		throws Exception {
+
+		String result = AutoClientEnd.getURL();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientEnd
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the void onClose(Session) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testOnClose()
+		throws Exception {
+		AutoClientEnd fixture = new AutoClientEnd();
+		Session mockSession = Mockito.mock(Session.class);
+		fixture.onClose(mockSession);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientEnd
+	}
+
+
+	/**
+	 * Run the void onError(Session,Throwable) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testOnError()
+		throws Exception {
+		AutoClientEnd fixture = new AutoClientEnd();
+		Session mockSession = Mockito.mock(Session.class);
+		Throwable e = new Throwable();
+
+		fixture.onError(mockSession, e);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientEnd
+	}
+
+	/**
+	 * Run the void onMessage(String,Session) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testOnMessage()
+		throws Exception {
+		AutoClientEnd fixture = new AutoClientEnd();
+		Session mockSession = Mockito.mock(Session.class);
+		String message = "";
+		//Session session = null;
+
+		fixture.onMessage(message, mockSession);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientEnd
+	}
+
+
+	/**
+	 * Run the void onOpen(Session) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testOnOpen()
+		throws Exception {
+		AutoClientEnd fixture = new AutoClientEnd();
+		Session mockSession = Mockito.mock(Session.class);
+
+		fixture.onOpen(mockSession);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientEnd
+	}
+
+	/**
+	 * Run the void setAuto(NotificationScheme,NotificationHandler) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetAuto()
+		throws Exception {
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+		NotificationHandler handler = null;
+
+		AutoClientEnd.setAuto(scheme, handler);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.ExceptionInInitializerError
+		//       at org.apache.log4j.Logger.getLogger(Logger.java:104)
+		//       at org.openecomp.policy.std.AutoClientEnd.<clinit>(AutoClientEnd.java:39)
+	}
+
+	/**
+	 * Run the void setScheme(NotificationScheme) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetScheme()
+		throws Exception {
+		
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+		AutoClientEnd.setScheme(scheme);
+
+	}
+
+	/**
+	 * Run the void start(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testStart()
+		throws Exception {
+		String url = "http://test.com";
+
+		AutoClientEnd.start(url);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientEnd
+	}
+
+
+	/**
+	 * Run the void start(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testStart_2()
+		throws Exception {
+		String url = null;
+
+		AutoClientEnd.start(url);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientEnd
+	}
+
+	/**
+	 * Run the void stop() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testStop_1()
+		throws Exception {
+
+		AutoClientEnd.stop();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientEnd
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add set up code here
+		StdPolicyEngine policyEngine = new StdPolicyEngine("Test/config_pass.properties");
+		
+		NotificationHandler handler = policyEngine.getNotificationHandler();
+		AutoClientEnd.setAuto(NotificationScheme.AUTO_ALL_NOTIFICATIONS, handler);
+		AutoClientEnd.start("http://testurl.com");
+		
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(AutoClientEndTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientUEBTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientUEBTest.java
new file mode 100644
index 000000000..f6760056f
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientUEBTest.java
@@ -0,0 +1,569 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.junit.*;
+import org.openecomp.policy.api.NotificationHandler;
+import org.openecomp.policy.api.NotificationScheme;
+import org.openecomp.policy.std.AutoClientEnd;
+import org.openecomp.policy.std.AutoClientUEB;
+import org.openecomp.policy.std.StdPolicyEngine;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>AutoClientUEBTest</code> contains tests for the class <code>{@link AutoClientUEB}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class AutoClientUEBTest {
+	/**
+	 * Run the AutoClientUEB(String,List<String>) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testAutoClientUEB_1()
+		throws Exception {
+		String url = "";
+		List<String> uebURLList = new LinkedList();
+
+		AutoClientUEB result = new AutoClientUEB(url, uebURLList);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.ExceptionInInitializerError
+		//       at org.apache.log4j.Logger.getLogger(Logger.java:104)
+		//       at org.openecomp.policy.std.AutoClientUEB.<clinit>(AutoClientUEB.java:39)
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the String getNotficationType() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetNotficationType_1()
+		throws Exception {
+
+		String result = AutoClientUEB.getNotficationType();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		assertNull(result);
+	}
+
+	/**
+	 * Run the boolean getStatus() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetStatus_1()
+		throws Exception {
+
+		boolean result = AutoClientUEB.getStatus();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		assertFalse(result);
+	}
+
+	/**
+	 * Run the String getURL() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetURL_1()
+		throws Exception {
+
+		String result = AutoClientUEB.getURL();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the boolean isRunning() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testIsRunning_1()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		boolean result = fixture.isRunning();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		assertTrue(result);
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_1()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_2()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_3()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_4()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_5()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_6()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_7()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_8()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_9()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_10()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_11()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_12()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_13()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_14()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_15()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void run() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRun_16()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.run();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void setAuto(NotificationScheme,NotificationHandler) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetAuto_1()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+		NotificationHandler handler = null;
+
+		fixture.setAuto(scheme, handler);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void setScheme(NotificationScheme) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetScheme_1()
+		throws Exception {
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+
+		AutoClientUEB.setScheme(scheme);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Run the void terminate() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testTerminate_1()
+		throws Exception {
+		AutoClientUEB fixture = new AutoClientUEB("", new LinkedList());
+		fixture.isRunning = true;
+
+		fixture.terminate();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add set up code here
+		StdPolicyEngine policyEngine = new StdPolicyEngine("Test/config_pass.properties");
+		List<String> urlList = new LinkedList<String>();
+		urlList.add("test2.com");
+		AutoClientUEB client = new AutoClientUEB("test.com", urlList);
+		NotificationHandler handler = null;
+		//AutoClientEnd.setAuto(NotificationScheme.AUTO_ALL_NOTIFICATIONS, handler);
+		client.setAuto(NotificationScheme.AUTO_ALL_NOTIFICATIONS, handler);
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(AutoClientUEBTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/Handler.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/Handler.java
new file mode 100644
index 000000000..e1e398e1a
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/Handler.java
@@ -0,0 +1,120 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import java.util.Collection;
+
+import org.openecomp.policy.api.LoadedPolicy;
+import org.openecomp.policy.api.NotificationHandler;
+import org.openecomp.policy.api.NotificationType;
+import org.openecomp.policy.api.PDPNotification;
+import org.openecomp.policy.api.PolicyConfig;
+import org.openecomp.policy.api.PolicyConfigException;
+import org.openecomp.policy.api.PolicyConfigStatus;
+import org.openecomp.policy.api.PolicyEngine;
+import org.openecomp.policy.api.PolicyEngineException;
+import org.openecomp.policy.api.RemovedPolicy;
+
+public class Handler implements NotificationHandler{
+	
+	@Override
+	public void notificationReceived(PDPNotification notification) {
+		System.out.println("Notification Received...");
+		System.out.println(notification.getNotificationType());
+		if(notification.getNotificationType().equals(NotificationType.REMOVE)){                                                                                             
+			System.out.println("Removed Policies: \n");
+			for(RemovedPolicy removedPolicy: notification.getRemovedPolicies()){
+				System.out.println(removedPolicy.getPolicyName());
+				System.out.println(removedPolicy.getVersionNo());
+			}
+		}else if(notification.getNotificationType().equals(NotificationType.UPDATE)){
+			System.out.println("Updated Policies: \n");
+			for(LoadedPolicy updatedPolicy: notification.getLoadedPolicies()){
+				System.out.println("policyName : " + updatedPolicy.getPolicyName());
+				System.out.println("policyVersion :" + updatedPolicy.getVersionNo());
+				if(updatedPolicy.getPolicyName().contains(".Config_")){
+					System.out.println("Matches: " + updatedPolicy.getMatches());
+					System.out.println("UpdateType: "+ updatedPolicy.getUpdateType());
+					// Checking the Name is correct or not. 
+					try {
+						PolicyEngine policyEngine = new PolicyEngine("config.properties");
+						Collection<PolicyConfig> policyConfigs = policyEngine.getConfigByPolicyName(updatedPolicy.getPolicyName());
+						for(PolicyConfig policyConfig: policyConfigs){
+							if(policyConfig.getPolicyConfigStatus().equals(PolicyConfigStatus.CONFIG_RETRIEVED)){
+								System.out.println("Policy Retrieved with this Name notified. ");
+							}else{
+								System.err.println("\n\n Fail to retrieve policy !!!!\n\n");
+							}
+							// Also Test this case. 
+							if(policyConfig.getPolicyName().equals(updatedPolicy.getPolicyName())){
+								System.out.println("Policy Name is good. ");
+							}else{
+								System.err.println("\n\n Fail to check Name \n\n");
+							}
+						}
+					} catch (PolicyEngineException e) {
+						e.printStackTrace();
+					} catch (PolicyConfigException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+		}else if(notification.getNotificationType().equals(NotificationType.BOTH)){
+			System.out.println("Both updated and Removed Notification: \n");
+			System.out.println("Removed Policies: \n");
+			for(RemovedPolicy removedPolicy: notification.getRemovedPolicies()){
+				System.out.println(removedPolicy.getPolicyName());
+				System.out.println(removedPolicy.getVersionNo());
+			}
+			System.out.println("Updated Policies: \n");
+			for(LoadedPolicy updatedPolicy: notification.getLoadedPolicies()){
+				System.out.println("policyName : " + updatedPolicy.getPolicyName());
+				System.out.println("policyVersion :" + updatedPolicy.getVersionNo());
+				System.out.println("Matches: " + updatedPolicy.getMatches());
+				System.out.println("UpdateType: "+ updatedPolicy.getUpdateType());
+				// Checking the Name is correct or not. 
+				try {
+					PolicyEngine policyEngine = new PolicyEngine("config.properties");
+					Collection<PolicyConfig> policyConfigs = policyEngine.getConfigByPolicyName(updatedPolicy.getPolicyName());
+					for(PolicyConfig policyConfig: policyConfigs){
+						if(policyConfig.getPolicyConfigStatus().equals(PolicyConfigStatus.CONFIG_RETRIEVED)){
+							System.out.println("Policy Retrieved with this Name notified. ");
+						}else{
+							System.err.println("\n\n Fail to retrieve policy !!!!\n\n");
+						}
+						// Also Test this case. 
+						if(policyConfig.getPolicyName().equals(updatedPolicy.getPolicyName())){
+							System.out.println("Policy Name is good. ");
+						}else{
+							System.err.println("\n\n Fail to check Name \n\n");
+						}
+					}
+				} catch (PolicyEngineException e) {
+					e.printStackTrace();
+				} catch (PolicyConfigException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndTest.java
new file mode 100644
index 000000000..21cb14f6a
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndTest.java
@@ -0,0 +1,195 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import javax.websocket.Session;
+
+import org.junit.*;
+import org.mockito.Mockito;
+import org.openecomp.policy.api.NotificationScheme;
+import org.openecomp.policy.api.PDPNotification;
+import org.openecomp.policy.std.ManualClientEnd;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>ManualClientEndTest</code> contains tests for the class <code>{@link ManualClientEnd}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class ManualClientEndTest {
+	/**
+	 * Run the ManualClientEnd() constructor test.
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testManualClientEnd_1()
+		throws Exception {
+		ManualClientEnd result = new ManualClientEnd();
+		assertNotNull(result);
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void onClose(Session) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testOnClose()
+		throws Exception {
+		ManualClientEnd fixture = Mockito.mock(ManualClientEnd.class);
+		Session mockSession = Mockito.mock(Session.class);
+
+		fixture.onClose(mockSession);
+
+	}
+
+	/**
+	 * Run the void onError(Session,Throwable) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testOnError()
+		throws Exception {
+		ManualClientEnd fixture = Mockito.mock(ManualClientEnd.class);
+		Session mockSession = Mockito.mock(Session.class);
+		Throwable e = new Throwable();
+
+		fixture.onError(mockSession, e);
+	}
+
+	/**
+	 * Run the void onMessage(String,Session) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testOnMessage()
+		throws Exception {
+		ManualClientEnd fixture = new ManualClientEnd();
+		ManualClientEnd mockclient = Mockito.mock(ManualClientEnd.class);
+		String message = "";
+		Session mockSession = Mockito.mock(Session.class);
+		
+		Mockito.doNothing().when(mockclient).onMessage(message,mockSession);
+		mockclient.onMessage(message,mockSession);
+	}
+
+	/**
+	 * Run the void onOpen(Session) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testOnOpen()
+		throws Exception {
+		ManualClientEnd fixture = Mockito.mock(ManualClientEnd.class);
+		Session mockSession = Mockito.mock(Session.class);
+
+		fixture.onOpen(mockSession);
+
+	}
+
+	/**
+	 * Run the PDPNotification result(NotificationScheme) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testResult_1()
+		throws Exception {
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+
+		PDPNotification result = ManualClientEnd.result(scheme);
+
+		assertNull(result);
+	}
+
+
+	/**
+	 * Run the void start(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStart_1()
+		throws Exception {
+		String url = "";
+
+		ManualClientEnd.start(url);
+
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(ManualClientEndTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndUEBTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndUEBTest.java
new file mode 100644
index 000000000..fedcc9992
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndUEBTest.java
@@ -0,0 +1,164 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.junit.*;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.openecomp.policy.api.NotificationScheme;
+import org.openecomp.policy.api.PDPNotification;
+import org.openecomp.policy.std.ManualClientEndUEB;
+import org.openecomp.policy.std.NotificationUnMarshal;
+import org.openecomp.policy.std.StdPDPNotification;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>ManualClientEndUEBTest</code> contains tests for the class <code>{@link ManualClientEndUEB}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class ManualClientEndUEBTest {
+	
+	String resultJson = "{'test':'testing'}";
+	String json = "{\"test\":\"testing\"}";
+	StdPDPNotification notification = new StdPDPNotification();
+	ManualClientEndUEB mockManualClient = null;
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		String url = "http://test.com";
+		String uniqueID = "test";
+		List<String> uebURLList = new LinkedList<String>();
+		uebURLList.add(url);
+				
+	}
+	/**
+	 * Run the ManualClientEndUEB() constructor test.
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testManualClientEndUEB_1()
+		throws Exception {
+		ManualClientEndUEB result = new ManualClientEndUEB();
+		assertNotNull(result);
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void createTopic(String,String,List<String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testCreateTopic_1()
+		throws Exception {
+		String url = "http://test.com";
+		String uniqueID = "test";
+		List<String> uebURLList = new LinkedList<String>();
+		uebURLList.add(url);
+
+		ManualClientEndUEB.createTopic(url, uniqueID, uebURLList);
+
+	}
+
+	/**
+	 * Run the PDPNotification result(NotificationScheme) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testResult_1()
+		throws Exception {
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+
+		PDPNotification result = ManualClientEndUEB.result(scheme);
+
+		assertNull(result);
+	}
+
+
+	/**
+	 * Run the void start(String,List<String>,String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testStart_1()
+		throws Exception {
+		String url = "http://test.com";
+		List<String> uebURLList = new LinkedList<String>();
+		String uniqueID = "test";
+		uebURLList.add(url);
+
+		ManualClientEndUEB.start(url, uebURLList, uniqueID);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.ManualClientEndUEB
+	}
+
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(ManualClientEndUEBTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchStoreTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchStoreTest.java
new file mode 100644
index 000000000..917e9d5e6
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchStoreTest.java
@@ -0,0 +1,774 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Map;
+
+import org.junit.*;
+import org.openecomp.policy.api.PDPNotification;
+import org.openecomp.policy.std.MatchStore;
+import org.openecomp.policy.std.Matches;
+import org.openecomp.policy.std.StdPDPNotification;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>MatchStoreTest</code> contains tests for the class <code>{@link MatchStore}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class MatchStoreTest {
+	/**
+	 * Run the MatchStore() constructor test.
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testMatchStore_1()
+		throws Exception {
+		MatchStore result = new MatchStore();
+		assertNotNull(result);
+		// add additional test code here
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_1()
+		throws Exception {
+		PDPNotification oldNotification = null;
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_2()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_3()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_4()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_5()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_6()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_7()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_8()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_9()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_10()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_11()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_12()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_13()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_14()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_15()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PDPNotification checkMatch(PDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testCheckMatch_16()
+		throws Exception {
+		PDPNotification oldNotification = new StdPDPNotification();
+
+		PDPNotification result = MatchStore.checkMatch(oldNotification);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the HashSet<Matches> getMatchStore() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetMatchStore_1()
+		throws Exception {
+
+		HashSet<Matches> result = MatchStore.getMatchStore();
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.ExceptionInInitializerError
+		//       at org.apache.log4j.Logger.getLogger(Logger.java:104)
+		//       at org.openecomp.policy.std.MatchStore.<clinit>(MatchStore.java:15)
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_1()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_2()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_3()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_4()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigAttributes(new Hashtable());
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_5()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigAttributes(new Hashtable());
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_6()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigAttributes(new Hashtable());
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_7()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigAttributes(new Hashtable());
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_8()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_9()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_10()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigAttributes(new Hashtable());
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_11()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigAttributes(new Hashtable());
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_12()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigAttributes(new Hashtable());
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_13()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigAttributes(new Hashtable());
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_14()
+		throws Exception {
+		Matches newMatch = new Matches();
+		newMatch.setConfigAttributes(new Hashtable());
+		newMatch.setConfigName("");
+		newMatch.setEcompName("");
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_15()
+		throws Exception {
+		Matches newMatch = new Matches();
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Run the void storeMatch(Matches) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStoreMatch_16()
+		throws Exception {
+		Matches newMatch = null;
+
+		MatchStore.storeMatch(newMatch);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(MatchStoreTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchesTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchesTest.java
new file mode 100644
index 000000000..735d12561
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchesTest.java
@@ -0,0 +1,216 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+import org.junit.*;
+import org.openecomp.policy.std.Matches;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>MatchesTest</code> contains tests for the class <code>{@link Matches}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class MatchesTest {
+	/**
+	 * Run the Matches() constructor test.
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testMatches_1()
+		throws Exception {
+		Matches result = new Matches();
+		assertNotNull(result);
+		// add additional test code here
+	}
+
+	/**
+	 * Run the Map<String, String> getConfigAttributes() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetConfigAttributes_1()
+		throws Exception {
+		Matches fixture = new Matches();
+		fixture.setEcompName("");
+		fixture.setConfigAttributes(new Hashtable());
+		fixture.setConfigName("");
+
+		Map<String, String> result = fixture.getConfigAttributes();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the String getConfigName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetConfigName_1()
+		throws Exception {
+		Matches fixture = new Matches();
+		fixture.setEcompName("");
+		fixture.setConfigAttributes(new Hashtable());
+		fixture.setConfigName("");
+
+		String result = fixture.getConfigName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getEcompName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetEcompName_1()
+		throws Exception {
+		Matches fixture = new Matches();
+		fixture.setEcompName("");
+		fixture.setConfigAttributes(new Hashtable());
+		fixture.setConfigName("");
+
+		String result = fixture.getEcompName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the void setConfigAttributes(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetConfigAttributes_1()
+		throws Exception {
+		Matches fixture = new Matches();
+		fixture.setEcompName("");
+		fixture.setConfigAttributes(new Hashtable());
+		fixture.setConfigName("");
+		Map<String, String> configAttributes = new Hashtable();
+
+		fixture.setConfigAttributes(configAttributes);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setConfigName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetConfigName_1()
+		throws Exception {
+		Matches fixture = new Matches();
+		fixture.setEcompName("");
+		fixture.setConfigAttributes(new Hashtable());
+		fixture.setConfigName("");
+		String configName = "";
+
+		fixture.setConfigName(configName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setEcompName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetEcompName_1()
+		throws Exception {
+		Matches fixture = new Matches();
+		fixture.setEcompName("");
+		fixture.setConfigAttributes(new Hashtable());
+		fixture.setConfigName("");
+		String ecompName = "";
+
+		fixture.setEcompName(ecompName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(MatchesTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationStoreTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationStoreTest.java
new file mode 100644
index 000000000..d54c4f4cb
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationStoreTest.java
@@ -0,0 +1,359 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import org.junit.*;
+import org.openecomp.policy.std.NotificationStore;
+import org.openecomp.policy.std.StdPDPNotification;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>NotificationStoreTest</code> contains tests for the class <code>{@link NotificationStore}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class NotificationStoreTest {
+	/**
+	 * Run the NotificationStore() constructor test.
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testNotificationStore_1()
+		throws Exception {
+		NotificationStore result = new NotificationStore();
+		assertNotNull(result);
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_1()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_2()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_3()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_4()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_5()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_6()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_7()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_8()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_9()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_10()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_11()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_12()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_13()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_14()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_15()
+		throws Exception {
+		StdPDPNotification notification = new StdPDPNotification();
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void recordNotification(StdPDPNotification) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testRecordNotification_16()
+		throws Exception {
+		StdPDPNotification notification = null;
+
+		NotificationStore.recordNotification(notification);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(NotificationStoreTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationUnMarshalTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationUnMarshalTest.java
new file mode 100644
index 000000000..7a93a7b49
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationUnMarshalTest.java
@@ -0,0 +1,256 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import org.junit.*;
+import org.openecomp.policy.std.NotificationUnMarshal;
+import org.openecomp.policy.std.StdPDPNotification;
+
+import static org.junit.Assert.*;
+
+import com.fasterxml.jackson.databind.JsonMappingException;
+
+/**
+ * The class <code>NotificationUnMarshalTest</code> contains tests for the class <code>{@link NotificationUnMarshal}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class NotificationUnMarshalTest {
+	/**
+	 * Run the StdPDPNotification notificationJSON(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test(expected = com.fasterxml.jackson.databind.JsonMappingException.class)
+	public void testNotificationJSON_1()
+		throws Exception {
+		String json = "";
+
+		StdPDPNotification result = NotificationUnMarshal.notificationJSON(json);
+
+		// add additional test code here
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the StdPDPNotification notificationJSON(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test(expected = com.fasterxml.jackson.databind.JsonMappingException.class)
+	public void testNotificationJSON_2()
+		throws Exception {
+		String json = "";
+
+		StdPDPNotification result = NotificationUnMarshal.notificationJSON(json);
+
+		// add additional test code here
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the StdPDPNotification notificationJSON(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test(expected = com.fasterxml.jackson.databind.JsonMappingException.class)
+	public void testNotificationJSON_3()
+		throws Exception {
+		String json = "";
+
+		StdPDPNotification result = NotificationUnMarshal.notificationJSON(json);
+
+		// add additional test code here
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the StdPDPNotification notificationJSON(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test(expected = com.fasterxml.jackson.databind.JsonMappingException.class)
+	public void testNotificationJSON_4()
+		throws Exception {
+		String json = "";
+
+		StdPDPNotification result = NotificationUnMarshal.notificationJSON(json);
+
+		// add additional test code here
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the StdPDPNotification notificationJSON(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test(expected = com.fasterxml.jackson.databind.JsonMappingException.class)
+	public void testNotificationJSON_5()
+		throws Exception {
+		String json = "";
+
+		StdPDPNotification result = NotificationUnMarshal.notificationJSON(json);
+
+		// add additional test code here
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the StdPDPNotification notificationJSON(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test(expected = com.fasterxml.jackson.databind.JsonMappingException.class)
+	public void testNotificationJSON_6()
+		throws Exception {
+		String json = "";
+
+		StdPDPNotification result = NotificationUnMarshal.notificationJSON(json);
+
+		// add additional test code here
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the StdPDPNotification notificationJSON(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test(expected = com.fasterxml.jackson.databind.JsonMappingException.class)
+	public void testNotificationJSON_7()
+		throws Exception {
+		String json = "";
+
+		StdPDPNotification result = NotificationUnMarshal.notificationJSON(json);
+
+		// add additional test code here
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the StdPDPNotification notificationJSON(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test(expected = com.fasterxml.jackson.databind.JsonMappingException.class)
+	public void testNotificationJSON_8()
+		throws Exception {
+		String json = "";
+
+		StdPDPNotification result = NotificationUnMarshal.notificationJSON(json);
+
+		// add additional test code here
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the StdPDPNotification notificationJSON(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test(expected = com.fasterxml.jackson.databind.JsonMappingException.class)
+	public void testNotificationJSON_9()
+		throws Exception {
+		String json = "";
+
+		StdPDPNotification result = NotificationUnMarshal.notificationJSON(json);
+
+		// add additional test code here
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the StdPDPNotification notificationJSON(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test(expected = com.fasterxml.jackson.databind.JsonMappingException.class)
+	public void testNotificationJSON_10()
+		throws Exception {
+		String json = "";
+
+		StdPDPNotification result = NotificationUnMarshal.notificationJSON(json);
+
+		// add additional test code here
+		assertNotNull(result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(NotificationUnMarshalTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdLoadedPolicyTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdLoadedPolicyTest.java
new file mode 100644
index 000000000..ce6d361df
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdLoadedPolicyTest.java
@@ -0,0 +1,314 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+import org.junit.*;
+import org.openecomp.policy.api.UpdateType;
+import org.openecomp.policy.std.StdLoadedPolicy;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>StdLoadedPolicyTest</code> contains tests for the class <code>{@link StdLoadedPolicy}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class StdLoadedPolicyTest {
+	/**
+	 * Run the StdLoadedPolicy() constructor test.
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testStdLoadedPolicy_1()
+		throws Exception {
+		StdLoadedPolicy result = new StdLoadedPolicy();
+		assertNotNull(result);
+		// add additional test code here
+	}
+
+	/**
+	 * Run the Map<String, String> getMatches() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetMatches_1()
+		throws Exception {
+		StdLoadedPolicy fixture = new StdLoadedPolicy();
+		fixture.setPolicyName("");
+		fixture.setVersionNo("");
+		fixture.setUpdateType(UpdateType.NEW);
+		fixture.setMatches(new Hashtable());
+
+		Map<String, String> result = fixture.getMatches();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyName_1()
+		throws Exception {
+		StdLoadedPolicy fixture = new StdLoadedPolicy();
+		fixture.setPolicyName("");
+		fixture.setVersionNo("");
+		fixture.setUpdateType(UpdateType.NEW);
+		fixture.setMatches(new Hashtable());
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyName_2()
+		throws Exception {
+		StdLoadedPolicy fixture = new StdLoadedPolicy();
+		fixture.setPolicyName((String) null);
+		fixture.setVersionNo("");
+		fixture.setUpdateType(UpdateType.NEW);
+		fixture.setMatches(new Hashtable());
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals(null, result);
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyName_3()
+		throws Exception {
+		StdLoadedPolicy fixture = new StdLoadedPolicy();
+		fixture.setPolicyName("");
+		fixture.setVersionNo("");
+		fixture.setUpdateType(UpdateType.NEW);
+		fixture.setMatches(new Hashtable());
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the UpdateType getUpdateType() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetUpdateType_1()
+		throws Exception {
+		StdLoadedPolicy fixture = new StdLoadedPolicy();
+		fixture.setPolicyName("");
+		fixture.setVersionNo("");
+		fixture.setUpdateType(UpdateType.NEW);
+		fixture.setMatches(new Hashtable());
+
+		UpdateType result = fixture.getUpdateType();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("new", result.toString());
+		assertEquals("NEW", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the String getVersionNo() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetVersionNo_1()
+		throws Exception {
+		StdLoadedPolicy fixture = new StdLoadedPolicy();
+		fixture.setPolicyName("");
+		fixture.setVersionNo("");
+		fixture.setUpdateType(UpdateType.NEW);
+		fixture.setMatches(new Hashtable());
+
+		String result = fixture.getVersionNo();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the void setMatches(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetMatches_1()
+		throws Exception {
+		StdLoadedPolicy fixture = new StdLoadedPolicy();
+		fixture.setPolicyName("");
+		fixture.setVersionNo("");
+		fixture.setUpdateType(UpdateType.NEW);
+		fixture.setMatches(new Hashtable());
+		Map<String, String> matches = new Hashtable();
+
+		fixture.setMatches(matches);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyName_1()
+		throws Exception {
+		StdLoadedPolicy fixture = new StdLoadedPolicy();
+		fixture.setPolicyName("");
+		fixture.setVersionNo("");
+		fixture.setUpdateType(UpdateType.NEW);
+		fixture.setMatches(new Hashtable());
+		String policyName = "";
+
+		fixture.setPolicyName(policyName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setUpdateType(UpdateType) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetUpdateType_1()
+		throws Exception {
+		StdLoadedPolicy fixture = new StdLoadedPolicy();
+		fixture.setPolicyName("");
+		fixture.setVersionNo("");
+		fixture.setUpdateType(UpdateType.NEW);
+		fixture.setMatches(new Hashtable());
+		UpdateType updateType = UpdateType.NEW;
+
+		fixture.setUpdateType(updateType);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setVersionNo(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetVersionNo_1()
+		throws Exception {
+		StdLoadedPolicy fixture = new StdLoadedPolicy();
+		fixture.setPolicyName("");
+		fixture.setVersionNo("");
+		fixture.setUpdateType(UpdateType.NEW);
+		fixture.setMatches(new Hashtable());
+		String versionNo = "";
+
+		fixture.setVersionNo(versionNo);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(StdLoadedPolicyTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPDPNotificationTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPDPNotificationTest.java
new file mode 100644
index 000000000..490120fb9
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPDPNotificationTest.java
@@ -0,0 +1,311 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import org.junit.*;
+import org.openecomp.policy.api.LoadedPolicy;
+import org.openecomp.policy.api.NotificationType;
+import org.openecomp.policy.api.RemovedPolicy;
+import org.openecomp.policy.std.StdLoadedPolicy;
+import org.openecomp.policy.std.StdPDPNotification;
+import org.openecomp.policy.std.StdRemovedPolicy;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>StdPDPNotificationTest</code> contains tests for the class <code>{@link StdPDPNotification}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class StdPDPNotificationTest {
+	/**
+	 * Run the StdPDPNotification() constructor test.
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testStdPDPNotification_1()
+		throws Exception {
+		StdPDPNotification result = new StdPDPNotification();
+		assertNotNull(result);
+		// add additional test code here
+	}
+
+	/**
+	 * Run the Collection<LoadedPolicy> getLoadedPolicies() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetLoadedPolicies_1()
+		throws Exception {
+		StdPDPNotification fixture = new StdPDPNotification();
+		fixture.setRemovedPolicies(new LinkedList());
+		fixture.setNotificationType(NotificationType.BOTH);
+		fixture.setLoadedPolicies(new LinkedList());
+
+		Collection<LoadedPolicy> result = fixture.getLoadedPolicies();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the Collection<LoadedPolicy> getLoadedPolicies() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetLoadedPolicies_2()
+		throws Exception {
+		StdPDPNotification fixture = new StdPDPNotification();
+		fixture.setRemovedPolicies(new LinkedList());
+		fixture.setNotificationType(NotificationType.BOTH);
+		fixture.setLoadedPolicies(new LinkedList());
+
+		Collection<LoadedPolicy> result = fixture.getLoadedPolicies();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the Collection<LoadedPolicy> getLoadedPolicies() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetLoadedPolicies_3()
+		throws Exception {
+		StdPDPNotification fixture = new StdPDPNotification();
+		fixture.setRemovedPolicies(new LinkedList());
+		fixture.setNotificationType(NotificationType.BOTH);
+		fixture.setLoadedPolicies(null);
+
+		Collection<LoadedPolicy> result = fixture.getLoadedPolicies();
+
+		// add additional test code here
+		assertEquals(null, result);
+	}
+
+	/**
+	 * Run the NotificationType getNotificationType() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetNotificationType_1()
+		throws Exception {
+		StdPDPNotification fixture = new StdPDPNotification();
+		fixture.setRemovedPolicies(new LinkedList());
+		fixture.setNotificationType(NotificationType.BOTH);
+		fixture.setLoadedPolicies(new LinkedList());
+
+		NotificationType result = fixture.getNotificationType();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("both", result.toString());
+		assertEquals("BOTH", result.name());
+		assertEquals(2, result.ordinal());
+	}
+
+	/**
+	 * Run the Collection<RemovedPolicy> getRemovedPolicies() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetRemovedPolicies_1()
+		throws Exception {
+		StdPDPNotification fixture = new StdPDPNotification();
+		fixture.setRemovedPolicies(new LinkedList());
+		fixture.setNotificationType(NotificationType.BOTH);
+		fixture.setLoadedPolicies(new LinkedList());
+
+		Collection<RemovedPolicy> result = fixture.getRemovedPolicies();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the Collection<RemovedPolicy> getRemovedPolicies() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetRemovedPolicies_2()
+		throws Exception {
+		StdPDPNotification fixture = new StdPDPNotification();
+		fixture.setRemovedPolicies(new LinkedList());
+		fixture.setNotificationType(NotificationType.BOTH);
+		fixture.setLoadedPolicies(new LinkedList());
+
+		Collection<RemovedPolicy> result = fixture.getRemovedPolicies();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the Collection<RemovedPolicy> getRemovedPolicies() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetRemovedPolicies_3()
+		throws Exception {
+		StdPDPNotification fixture = new StdPDPNotification();
+		fixture.setRemovedPolicies(null);
+		fixture.setNotificationType(NotificationType.BOTH);
+		fixture.setLoadedPolicies(new LinkedList());
+
+		Collection<RemovedPolicy> result = fixture.getRemovedPolicies();
+
+		// add additional test code here
+		assertEquals(null, result);
+	}
+
+	/**
+	 * Run the void setNotificationType(NotificationType) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetNotificationType_1()
+		throws Exception {
+		StdPDPNotification fixture = new StdPDPNotification();
+		fixture.setRemovedPolicies(new LinkedList());
+		fixture.setNotificationType(NotificationType.BOTH);
+		fixture.setLoadedPolicies(new LinkedList());
+		NotificationType notificationType = NotificationType.BOTH;
+
+		fixture.setNotificationType(notificationType);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setRemovedPolicies(Collection<StdRemovedPolicy>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetRemovedPolicies_1()
+		throws Exception {
+		StdPDPNotification fixture = new StdPDPNotification();
+		fixture.setRemovedPolicies(new LinkedList());
+		fixture.setNotificationType(NotificationType.BOTH);
+		fixture.setLoadedPolicies(new LinkedList());
+		Collection<StdRemovedPolicy> removedPolicies = new LinkedList();
+
+		fixture.setRemovedPolicies(removedPolicies);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setUpdatedPolicies(Collection<StdLoadedPolicy>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetUpdatedPolicies_1()
+		throws Exception {
+		StdPDPNotification fixture = new StdPDPNotification();
+		fixture.setRemovedPolicies(new LinkedList());
+		fixture.setNotificationType(NotificationType.BOTH);
+		fixture.setLoadedPolicies(new LinkedList());
+		Collection<StdLoadedPolicy> updatedPolicies = new LinkedList();
+
+		fixture.setLoadedPolicies(updatedPolicies);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(StdPDPNotificationTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyChangeResponseTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyChangeResponseTest.java
new file mode 100644
index 000000000..45c70187d
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyChangeResponseTest.java
@@ -0,0 +1,166 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import org.junit.*;
+import org.openecomp.policy.std.StdPolicyChangeResponse;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>StdPolicyChangeResponseTest</code> contains tests for the class <code>{@link StdPolicyChangeResponse}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class StdPolicyChangeResponseTest {
+	/**
+	 * Run the StdPolicyChangeResponse() constructor test.
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testStdPolicyChangeResponse_1()
+		throws Exception {
+		StdPolicyChangeResponse result = new StdPolicyChangeResponse();
+		assertNotNull(result);
+		// add additional test code here
+	}
+
+	/**
+	 * Run the int getResponseCode() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetResponseCode_1()
+		throws Exception {
+		StdPolicyChangeResponse fixture = new StdPolicyChangeResponse();
+		fixture.setResponseMessage("");
+		fixture.setResponseCode(1);
+
+		int result = fixture.getResponseCode();
+
+		// add additional test code here
+		assertEquals(1, result);
+	}
+
+	/**
+	 * Run the String getResponseMessage() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetResponseMessage_1()
+		throws Exception {
+		StdPolicyChangeResponse fixture = new StdPolicyChangeResponse();
+		fixture.setResponseMessage("");
+		fixture.setResponseCode(1);
+
+		String result = fixture.getResponseMessage();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the void setResponseCode(int) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetResponseCode_1()
+		throws Exception {
+		StdPolicyChangeResponse fixture = new StdPolicyChangeResponse();
+		fixture.setResponseMessage("");
+		fixture.setResponseCode(1);
+		int responseCode = 1;
+
+		fixture.setResponseCode(responseCode);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setResponseMessage(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetResponseMessage_1()
+		throws Exception {
+		StdPolicyChangeResponse fixture = new StdPolicyChangeResponse();
+		fixture.setResponseMessage("");
+		fixture.setResponseCode(1);
+		String responseMessage = "";
+
+		fixture.setResponseMessage(responseMessage);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(StdPolicyChangeResponseTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyConfigTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyConfigTest.java
new file mode 100644
index 000000000..88a22c300
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyConfigTest.java
@@ -0,0 +1,821 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.json.JsonObject;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyConfigStatus;
+import org.openecomp.policy.api.PolicyType;
+import org.openecomp.policy.std.StdPolicyConfig;
+
+import static org.junit.Assert.*;
+
+import org.w3c.dom.Document;
+
+/**
+ * The class <code>StdPolicyConfigTest</code> contains tests for the class <code>{@link StdPolicyConfig}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class StdPolicyConfigTest {
+	/**
+	 * Run the Map<String, String> getMatchingConditions() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetMatchingConditions_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		Map<String, String> result = fixture.getMatchingConditions();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the String getPolicyConfigMessage() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetPolicyConfigMessage_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		String result = fixture.getPolicyConfigMessage();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the PolicyConfigStatus getPolicyConfigStatus() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetPolicyConfigStatus_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		PolicyConfigStatus result = fixture.getPolicyConfigStatus();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("not_found", result.toString());
+		assertEquals("CONFIG_NOT_FOUND", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetPolicyName_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetPolicyName_2()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName((String) null);
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals(null, result);
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetPolicyName_3()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPolicyVersion() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetPolicyVersion_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		String result = fixture.getPolicyVersion();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the Map<String, String> getResponseAttributes() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetResponseAttributes_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		Map<String, String> result = fixture.getResponseAttributes();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the PolicyType getType() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetType_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		PolicyType result = fixture.getType();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("json", result.toString());
+		assertEquals("JSON", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the void setConfigStatus(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetConfigStatus_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+		String configStatus = "";
+
+		fixture.setConfigStatus(configStatus);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setConfigStatus(String,PolicyConfigStatus) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetConfigStatus_2()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+		String configStatus = "";
+		PolicyConfigStatus policyConfigStatus = PolicyConfigStatus.CONFIG_NOT_FOUND;
+
+		fixture.setConfigStatus(configStatus, policyConfigStatus);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setDocument(Document) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetDocument_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+		Document document = null;
+
+		fixture.setDocument(document);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setJsonObject(JsonObject) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetJsonObject_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+		JsonObject jsonObject = null;
+
+		fixture.setJsonObject(jsonObject);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setMatchingConditions(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetMatchingConditions_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+		Map<String, String> matchingConditions = new Hashtable();
+
+		fixture.setMatchingConditions(matchingConditions);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setOther(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetOther_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+		String other = "";
+
+		fixture.setOther(other);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyConfigStatus(PolicyConfigStatus) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetPolicyConfigStatus_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+		PolicyConfigStatus policyConfigStatus = PolicyConfigStatus.CONFIG_NOT_FOUND;
+
+		fixture.setPolicyConfigStatus(policyConfigStatus);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetPolicyName_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+		String policyName = "";
+
+		fixture.setPolicyName(policyName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyType(PolicyType) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetPolicyType_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+		PolicyType policyType = PolicyType.JSON;
+
+		fixture.setPolicyType(policyType);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyVersion(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetPolicyVersion_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+		String policyVersion = "";
+
+		fixture.setPolicyVersion(policyVersion);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setProperties(Properties) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetProperties_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+		Properties properties = new Properties();
+
+		fixture.setProperties(properties);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setResponseAttributes(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetResponseAttributes_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+		Map<String, String> responseAttributes = new Hashtable();
+
+		fixture.setResponseAttributes(responseAttributes);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the JsonObject toJSON() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testToJSON_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		JsonObject result = fixture.toJSON();
+
+		// add additional test code here
+		assertEquals(null, result);
+	}
+
+	/**
+	 * Run the String toOther() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testToOther_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		String result = fixture.toOther();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the Properties toProperties() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testToProperties_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		Properties result = fixture.toProperties();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("test");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("PolicyConfig [ policyConfigStatus=not_found, policyConfigMessage=, policyName=test]", result);
+	}
+
+	/**
+	 * Run the Document toXML() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testToXML_1()
+		throws Exception {
+		StdPolicyConfig fixture = new StdPolicyConfig();
+		fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setDocument((Document) null);
+		fixture.setResponseAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setOther("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setPolicyName("");
+		fixture.setProperties(new Properties());
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setMatchingConditions(new Hashtable());
+
+		Document result = fixture.toXML();
+
+		// add additional test code here
+		assertEquals(null, result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(StdPolicyConfigTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyEngineTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyEngineTest.java
new file mode 100644
index 000000000..c2fee2f0e
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyEngineTest.java
@@ -0,0 +1,1002 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.policy.api.AttributeType;
+import org.openecomp.policy.api.ConfigRequestParameters;
+import org.openecomp.policy.api.DecisionRequestParameters;
+import org.openecomp.policy.api.DecisionResponse;
+import org.openecomp.policy.api.DeletePolicyCondition;
+import org.openecomp.policy.api.DeletePolicyParameters;
+import org.openecomp.policy.api.DictionaryParameters;
+import org.openecomp.policy.api.DictionaryType;
+import org.openecomp.policy.api.EventRequestParameters;
+import org.openecomp.policy.api.ImportParameters;
+import org.openecomp.policy.api.NotificationHandler;
+import org.openecomp.policy.api.NotificationScheme;
+import org.openecomp.policy.api.PolicyChangeResponse;
+import org.openecomp.policy.api.PolicyClass;
+import org.openecomp.policy.api.PolicyConfig;
+import org.openecomp.policy.api.PolicyConfigStatus;
+import org.openecomp.policy.api.PolicyConfigType;
+import org.openecomp.policy.api.PolicyDecision;
+import org.openecomp.policy.api.PolicyParameters;
+import org.openecomp.policy.api.PolicyResponse;
+import org.openecomp.policy.api.PolicyType;
+import org.openecomp.policy.api.PushPolicyParameters;
+import org.openecomp.policy.api.ImportParameters.IMPORT_TYPE;
+import org.openecomp.policy.std.StdDecisionResponse;
+import org.openecomp.policy.std.StdPolicyChangeResponse;
+import org.openecomp.policy.std.StdPolicyConfig;
+import org.openecomp.policy.std.StdPolicyEngine;
+import org.openecomp.policy.std.StdPolicyResponse;
+
+import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
+import org.openecomp.policy.common.logging.flexlogger.Logger;
+
+/**
+ * The class <code>StdPolicyEngineTest</code> contains tests for the class <code>{@link StdPolicyEngine}</code>.
+ *
+ * @generatedBy CodePro at 6/3/16 2:03 PM
+ * @version $Revision: 1.0 $
+ */
+public class StdPolicyEngineTest {
+	
+	private static final Logger logger = FlexLogger.getLogger(StdPolicyEngine.class);
+
+	private StdPolicyEngine fixture = null;
+	private StdPolicyEngine mockEngine = null;
+	
+	PolicyChangeResponse result = null;
+	StdPolicyChangeResponse response = new StdPolicyChangeResponse();
+	PolicyParameters policyParameters = new PolicyParameters();
+	String json = null;
+	
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		fixture = new StdPolicyEngine("Test/config_pass.properties");
+		
+		//Mocks
+		mockEngine = Mockito.mock(StdPolicyEngine.class);
+	}
+	
+    private static JsonObject buildJSON(String jsonString) {
+        JsonObject json = null;;
+        if (jsonString != null) {
+            StringReader in = null;
+             
+            in = new StringReader(jsonString);
+             
+            JsonReader jsonReader = Json.createReader(in);
+            json = jsonReader.readObject();        
+        } 
+        
+        return json;
+    }
+    
+	//Reads a File and converts into a String. 
+	private static String readFile( String file ) throws IOException {
+	    BufferedReader reader = new BufferedReader( new FileReader (file));
+	    String         line = null;
+	    StringBuilder  stringBuilder = new StringBuilder();
+	    String         ls = System.getProperty("line.separator");
+
+	    try {
+	        while( ( line = reader.readLine() ) != null ) {
+	            stringBuilder.append( line );
+	            stringBuilder.append( ls );
+	        }
+
+	        return stringBuilder.toString();
+	    } finally {
+	        reader.close();
+	    }
+	}
+
+	/**
+	 * Run the StdPolicyEngine(String) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testStdPolicyEngine()
+		throws Exception {
+		String propertyFilePath = "Test/config_pass.properties";
+
+		StdPolicyEngine result = new StdPolicyEngine(propertyFilePath);
+
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the StdPolicyEngine(String) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+/*	@Test
+	public void testStdPolicyEngine_2()
+		throws Exception {
+		String propertyFilePath = "http";
+
+		StdPolicyEngine result = new StdPolicyEngine(propertyFilePath);
+
+		assertNull(result);
+	}
+*/
+	/**
+	 * Run the StdPolicyEngine(String,NotificationScheme) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testStdPolicyEngine_3()
+		throws Exception {
+		String propertyFilePath = "Test/config_pass.properties";
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+
+		StdPolicyEngine result = new StdPolicyEngine(propertyFilePath, scheme);
+
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the StdPolicyEngine(String,NotificationScheme) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+/*	@Test
+	public void testStdPolicyEngine_4()
+		throws Exception {
+		String propertyFilePath = "http";
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+
+		StdPolicyEngine result = new StdPolicyEngine(propertyFilePath, scheme);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.StdPolicyEngine
+		assertNull(result);
+	}*/
+
+	/**
+	 * Run the StdPolicyEngine(String,NotificationScheme,NotificationHandler) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+/*	@Test
+	public void testStdPolicyEngine_5()
+		throws Exception {
+		String propertyFilePath = "Test/config_pass.properties";
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+		NotificationHandler handler = new Handler();
+
+		StdPolicyEngine result = new StdPolicyEngine(propertyFilePath, scheme, handler);
+
+		assertNull(result);
+	}*/
+
+	/**
+	 * Run the StdPolicyEngine(String,NotificationScheme,NotificationHandler) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+/*	@Test
+	public void testStdPolicyEngine_6()
+		throws Exception {
+		String propertyFilePath = "http";
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+		NotificationHandler handler = new Handler();
+
+		StdPolicyEngine result = new StdPolicyEngine(propertyFilePath, scheme, handler);
+
+		assertNull(result);
+	}
+*/
+	/**
+	 * Run the StdPolicyEngine(List<String>,List<String>,List<String>,List<String>,NotificationScheme,NotificationHandler,String) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+/*	@Test
+	public void testStdPolicyEngine_8()
+		throws Exception {
+		List<String> configURL = new LinkedList();
+		List<String> configPapURL = new LinkedList();
+		List<String> encodingPAP = new LinkedList();
+		List<String> encoding = new LinkedList();
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+		NotificationHandler handler = new Handler();
+		String clientAuth = "TEST";
+
+		StdPolicyEngine result = new StdPolicyEngine(configURL, configPapURL, encodingPAP, encoding, scheme, handler, clientAuth);
+
+		// add additional test code here
+		// An unexpected exception was thrown in user code while executing this test:
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.StdPolicyEngine
+		assertNull(result);
+	}
+*/
+	/**
+	 * Run the Collection<PolicyConfig> config(ConfigRequestParameters) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testConfig()
+		throws Exception {
+		String configMessage = "Error in Calling the Configuration URL java.lang.Exception: PE500 - Process Flow Issue: Cannot open a connection to the configURL";
+		PolicyConfigStatus configStatus = PolicyConfigStatus.CONFIG_NOT_FOUND;
+		String policyName = "JunitTest.Config_testing";
+		String policyVersion = "1";
+				
+		ConfigRequestParameters configRequestParameters = new ConfigRequestParameters();
+		configRequestParameters.setPolicyName(".*");
+		Collection<PolicyConfig> result = fixture.config(configRequestParameters);		
+		
+		//assertEquals(response, result);
+		for(PolicyConfig policyConfig: result){
+			assertEquals(policyName, policyConfig.getPolicyName());
+			assertEquals(policyVersion, policyConfig.getPolicyVersion());
+			assertEquals(configStatus, policyConfig.getPolicyConfigStatus());
+			assertEquals(configMessage, policyConfig.getPolicyConfigMessage());
+		}
+	}
+	
+	
+	/**
+	 * Run the Collection<String> listConfig(ConfigRequestParameters) method test.
+	 *
+	 * @throws Exception
+	 *
+	 */
+	@Test
+	public void testListConfig()
+		throws Exception {
+		
+		Collection<String> response = new ArrayList<String>();
+		response.add("Policy Name: listConfigTest");
+
+		ConfigRequestParameters configRequestParameters = new ConfigRequestParameters();
+		configRequestParameters.setPolicyName(".*");
+		Collection<String> result = fixture.listConfig(configRequestParameters);
+
+		assertEquals(result, response);
+	}
+
+	/**
+	 * Run the String copyFile(String,String,StdPAPPolicy,String,UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+/*	@Test
+	public void testCopyFile()
+		throws Exception {
+		String policyId = "test.testing";
+		String group = "default";
+		URI selectedURI = null;
+		StdPDPPolicy policy = new StdPDPPolicy("testing", true, "test", selectedURI, true, "test", "testing", "1");	
+		StdPAPPolicy location = new StdPAPPolicy(policy.getLocation());
+		String clientScope = "Config";
+		UUID requestID = UUID.randomUUID();
+
+		String result = fixture.copyFile(policyId, group, location, clientScope, requestID);
+
+		assertNotNull(result);
+	}*/
+
+	/**
+	 * Run the String copyPolicy(PDPPolicy,String,String,UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+/*	@Test
+	public void testCopyPolicy()
+		throws Exception {
+		//StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null);
+		URI selectedURI = null;
+		
+		StdPDPPolicy policy = new StdPDPPolicy("testing", true, "test", selectedURI, true, "test", "testing", "1");
+		String group = "default";
+		String policyType = "Base";
+		UUID requestID = UUID.randomUUID();
+
+		String result = fixture.copyPolicy(policy, group, policyType, requestID);
+		
+		assertNotNull(result);
+	}
+*/
+	/**
+	 * Run the String createConfigFirewallPolicy(String,JsonObject,String,UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testCreateConfigFirewallPolicy()
+		throws Exception {
+		
+		response.setResponseMessage("success");
+		PolicyParameters policyParameters = new PolicyParameters();
+		policyParameters.setPolicyConfigType(PolicyConfigType.Firewall); 
+
+		String json= "{\"serviceTypeId\": \"/v0/firewall/pan\",\"configName\": \"rule1607\",\"deploymentOption\":{\"deployNow\": false},\"securityZoneId\": \"/v0/firewall/pan\",\"serviceGroups\": [{\"name\": \"1607Group\",\"description\": null,\"members\": [{\"type\": \"REFERENCE\",\"name\": \"SList\"},{\"type\": \"REFERENCE\",\"name\": \"Syslog\"}]}, {\"name\": \"Syslog\",\"description\": \"NA\",\"type\": \"SERVICE\",\"transportProtocol\": \"udp\",\"appProtocol\": null,\"ports\": \"514\"}, {\"name\": \"SList\",\"description\": \"Service List\",\"type\": \"SERVICE\",\"transportProtocol\": \"tcp\",\"appProtocol\": null,\"ports\": \"8080\"}],\"addressGroups\": [{\"name\": \"1607Group\",\"description\": null,\"members\": [{\"type\": \"REFERENCE\",\"name\": \"10.11.12.13/14\"},{\"type\": \"REFERENCE\",\"name\": \"10.11.12.13/14\"}]},{\"name\": \"PL_CCE3\",\"description\": \"CCE Routers\",\"members\":[{\"type\": \"REFERENCE\",\"name\": \"10.11.12.13/14\"}]}],\"firewallRuleList\": [{\"position\": \"1\",\"ruleName\": \"1607Rule\",\"fromZones\": [\"Trusted\"],\"toZones\": [\"Untrusted\"],\"negateSource\": false,\"negateDestination\": false,\"sourceList\": [{\"type\": \"REFERENCE\",\"name\": \"PL_CCE3\"}, {\"type\": \"REFERENCE\",\"name\": \"1607Group\"}],\"destinationList\": [{\"type\": \"REFERENCE\",\"name\": \"1607Group\"}],\"sourceServices\": [],\"destServices\": [{\"type\": \"REFERENCE\",\"name\": \"1607Group\"}],\"action\": \"accept\",\"description\": \"Rule for 1607 templates\",\"enabled\": true,\"log\": true}]}";
+		policyParameters.setConfigBody(json);
+		policyParameters.setPolicyName("test.testing");
+
+		PolicyChangeResponse result = fixture.createPolicy(policyParameters);
+
+		assertEquals(response.getResponseMessage(), result.getResponseMessage());
+	}
+
+	/**
+	 * Run the String createConfigPolicy(String,String,String,String,Map<String,String>,String,String,String,UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testCreateConfigPolicy()
+		throws Exception {
+		response.setResponseMessage("success");
+		PolicyParameters policyParameters = new PolicyParameters();
+		policyParameters.setPolicyConfigType(PolicyConfigType.Base);
+		policyParameters.setPolicyName("test.junittest");
+		policyParameters.setPolicyDescription("testing junit");
+		policyParameters.setEcompName("test");
+		policyParameters.setConfigName("testname");
+        Map<String, String> configAttributes = new HashMap<String, String>(); 
+        configAttributes.put("Template", "SampleTemplate");
+        configAttributes.put("controller", "default"); 
+        configAttributes.put("SamPoll", "30");
+        configAttributes.put("value", "abcd"); 
+		Map<AttributeType, Map<String,String>> attributes = new HashMap<AttributeType, Map<String,String>>();
+        attributes.put(AttributeType.MATCHING, configAttributes);
+        policyParameters.setAttributes(attributes);
+		policyParameters.setRequestID(UUID.randomUUID());
+		policyParameters.setConfigBodyType(PolicyType.OTHER);
+		policyParameters.setConfigBody("test");
+		
+		PolicyChangeResponse result = fixture.createPolicy(policyParameters);
+
+		assertEquals(response.getResponseMessage(), result.getResponseMessage());
+	}
+
+
+	/**
+	 * Run the String createUpdateActionPolicy(String,String,Map<String,String>,List<String>,List<String>,List<String>,List<String>,String,String,String,Boolean,UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testCreateUpdateActionPolicy_Create()
+		throws Exception {
+		response.setResponseMessage("success");
+		PolicyParameters policyParameters = new PolicyParameters();
+		policyParameters.setPolicyClass(PolicyClass.Action); 
+		policyParameters.setPolicyName("test.junittest");
+		policyParameters.setPolicyDescription("testing");
+        Map<String, String> configAttributes = new HashMap<String, String>(); 
+        configAttributes.put("Template", "UpdateTemplate");
+        configAttributes.put("controller", "default"); 
+        configAttributes.put("SamPoll", "30");
+        configAttributes.put("value", "abcd"); 
+        Map<AttributeType, Map<String,String>> attributes = new HashMap<AttributeType, Map<String,String>>();
+        attributes.put(AttributeType.MATCHING, configAttributes);
+        policyParameters.setAttributes(attributes);
+        policyParameters.setActionPerformer("PDP");
+        policyParameters.setActionAttribute("test");
+
+		PolicyChangeResponse result = fixture.createPolicy(policyParameters);
+
+		assertEquals(response.getResponseMessage(), result.getResponseMessage());
+	}
+	
+	/**
+	 * Run the String createUpdateActionPolicy(String,String,Map<String,String>,List<String>,List<String>,List<String>,List<String>,String,String,String,Boolean,UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testCreateUpdateActionPolicy_Update()
+		throws Exception {
+		response.setResponseMessage("success");
+		PolicyParameters policyParameters = new PolicyParameters();
+		policyParameters.setPolicyClass(PolicyClass.Action); 
+		policyParameters.setPolicyName("test.junittest");
+		policyParameters.setPolicyDescription("testing");
+        Map<String, String> configAttributes = new HashMap<String, String>(); 
+        configAttributes.put("Template", "UpdateTemplate");
+        configAttributes.put("controller", "default"); 
+        configAttributes.put("SamPoll", "30");
+        configAttributes.put("value", "abcd"); 
+        Map<AttributeType, Map<String,String>> attributes = new HashMap<AttributeType, Map<String,String>>();
+        attributes.put(AttributeType.MATCHING, configAttributes);
+        policyParameters.setAttributes(attributes);
+        policyParameters.setActionPerformer("PDP");
+        policyParameters.setActionAttribute("test");
+
+		PolicyChangeResponse result = fixture.updatePolicy(policyParameters);
+
+		assertEquals(response.getResponseMessage(), result.getResponseMessage());
+	}
+
+
+	/**
+	 * Run the String createUpdateBRMSParamPolicy(String,String,Map<AttributeType,Map<String,String>>,String,String,Boolean,UUID,Map<AttributeType,Map<String,String>>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testCreateUpdateBRMSParamPolicy_Create()
+		throws Exception {
+		response.setResponseMessage("success");
+		PolicyParameters policyParameters = new PolicyParameters();
+		policyParameters.setPolicyConfigType(PolicyConfigType.BRMS_PARAM); 
+		policyParameters.setPolicyName("test.testing");
+		policyParameters.setPolicyDescription("testing");
+        Map<String, String> ruleAttributes = new HashMap<String, String>();
+        ruleAttributes.put("templateName", "Sample"); // This sampleTemplate is the Template name from dictionary. 
+        ruleAttributes.put("controller", "default"); // Set Rule to a PDP Controller, default is the controller name.
+        ruleAttributes.put("SamPoll", "300"); // Template specific key and value set by us. 
+        ruleAttributes.put("value", "abcd"); // Template specific key and value set by us. 
+        Map<AttributeType, Map<String, String>> attributes = new HashMap<AttributeType, Map<String, String>>();
+        attributes.put(AttributeType.RULE, ruleAttributes);
+        policyParameters.setAttributes(attributes);
+        
+		PolicyChangeResponse result = fixture.createPolicy(policyParameters);
+		
+		assertEquals(response.getResponseMessage(), result.getResponseMessage());
+	}
+	
+	/**
+	 * Run the String createUpdateBRMSParamPolicy(String,String,Map<AttributeType,Map<String,String>>,String,String,Boolean,UUID,Map<AttributeType,Map<String,String>>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testCreateUpdateBRMSParamPolicy_Update()
+		throws Exception {
+		response.setResponseMessage("success");
+		PolicyParameters policyParameters = new PolicyParameters();
+		policyParameters.setPolicyConfigType(PolicyConfigType.BRMS_PARAM); 
+		policyParameters.setPolicyName("test.testing");
+		policyParameters.setPolicyDescription("testing");
+        Map<String, String> ruleAttributes = new HashMap<String, String>();
+        ruleAttributes.put("templateName", "Sample"); // This sampleTemplate is the Template name from dictionary. 
+        ruleAttributes.put("controller", "default"); // Set Rule to a PDP Controller, default is the controller name.
+        ruleAttributes.put("SamPoll", "300"); // Template specific key and value set by us. 
+        ruleAttributes.put("value", "abcd"); // Template specific key and value set by us. 
+        Map<AttributeType, Map<String, String>> attributes = new HashMap<AttributeType, Map<String, String>>();
+        attributes.put(AttributeType.RULE, ruleAttributes);
+        policyParameters.setAttributes(attributes);
+        
+		PolicyChangeResponse result = fixture.updatePolicy(policyParameters);
+		
+		assertEquals(response.getResponseMessage(), result.getResponseMessage());
+	}
+
+	/**
+	 * Run the String createUpdateBRMSRawPolicy(String,String,Map<AttributeType,Map<String,String>>,String,String,Boolean,UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testCreateUpdateBRMSRawPolicy_Create()
+		throws Exception {
+		response.setResponseMessage("success");
+		PolicyParameters policyParameters = new PolicyParameters();
+		policyParameters.setPolicyConfigType(PolicyConfigType.BRMS_PARAM); 
+		policyParameters.setPolicyName("test.testing");
+		policyParameters.setPolicyDescription("testing");
+        Map<String, String> attrib= new HashMap<String,String>();
+        attrib.put("cpu","80");
+        attrib.put("memory", "50");
+        Map<AttributeType, Map<String, String>> attributes = new HashMap<AttributeType, Map<String, String>>();
+        attributes.put(AttributeType.RULE, attrib);
+        
+        policyParameters.setAttributes(attributes);
+        
+        File rawBodyFile = null;
+		Path file = Paths.get("Test/test.Config_BRMS_Raw_TestBrmsPolicy.1.txt");
+		rawBodyFile = file.toFile();
+		
+		policyParameters.setConfigBody(readFile(rawBodyFile.toString()));		
+        
+		PolicyChangeResponse result = fixture.updatePolicy(policyParameters);
+		
+		assertEquals(response.getResponseMessage(), result.getResponseMessage());
+	}
+	
+	/** 
+	 * Run the PolicyChangeResponse createDictionaryItem(DictionaryParameters) method test.
+	 * 
+	 * @throws Exception
+	 * 
+	 */
+	@Test
+	public void testCreateDictionaryItem() throws Exception {
+		response.setResponseMessage("success");
+		DictionaryParameters parameters = new DictionaryParameters();
+		
+		parameters.setDictionaryType(DictionaryType.Common);
+		parameters.setDictionary("Attribute");
+		
+		Map<String,String> fields = new HashMap<String,String>();
+		fields.put("ATTRIBUTEID", "A5:");
+		fields.put("DATATYPE", "user");
+		fields.put("DESCRIPTION", "testing something");
+		fields.put("ATTRIBUTEVALUE", "1,2,A,B");
+		fields.put("PRIORITY", "High");
+		Map<AttributeType, Map<String,String>> dictionaryFields = new HashMap<AttributeType, Map<String,String>>();
+		dictionaryFields.put(AttributeType.DICTIONARY, fields);
+		
+		parameters.setDictionaryFields(dictionaryFields);
+
+		PolicyChangeResponse result = fixture.createDictionaryItem(parameters);
+
+		assertEquals(response.getResponseMessage(), result.getResponseMessage());
+	}
+	
+
+	/**
+	 * Run the PolicyDecision decide(DecisionRequestParameters) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testDecide()
+		throws Exception {
+		//StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null);
+		StdDecisionResponse response = new StdDecisionResponse();
+		response.setDecision(PolicyDecision.PERMIT);
+		
+		DecisionRequestParameters decisionRequestParameters = new DecisionRequestParameters();
+		decisionRequestParameters.setECOMPComponentName("testEcompName");
+		Map<String,String> decisionAttributes = new HashMap<String,String>();
+		decisionAttributes.put("key", "value");
+		decisionRequestParameters.setDecisionAttributes(decisionAttributes);
+		decisionRequestParameters.setRequestID(UUID.randomUUID());
+		
+		Mockito.when(mockEngine.decide(decisionRequestParameters)).thenReturn(response);
+		DecisionResponse result = mockEngine.decide(decisionRequestParameters);
+
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the PolicyChangeResponse deletePolicy(DeletePolicyParameters) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testDeletePolicy()
+		throws Exception {
+		response.setResponseMessage("success");
+		DeletePolicyParameters parameters = new DeletePolicyParameters();
+		parameters.setDeleteCondition(DeletePolicyCondition.ALL);
+		parameters.setPolicyComponent("PAP");
+		parameters.setPolicyName("testing.Config_junittest.1.xml");
+
+		PolicyChangeResponse result = fixture.deletePolicy(parameters);
+
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the Collection<PolicyResponse> event(EventRequestParameters) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testEvent()
+		throws Exception {
+		
+		//StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null);
+		StdPolicyResponse response = new StdPolicyResponse();
+		response.setPolicyResponseMessage("tested");
+		Collection<PolicyResponse> mockResult = new HashSet<PolicyResponse>();
+		mockResult.add(response);
+		StdPolicyEngine mockEngine = Mockito.mock(StdPolicyEngine.class);
+		
+		Map<String,String> eventAttributes = new HashMap<String,String>();
+		eventAttributes.put("key", "test");
+		EventRequestParameters eventRequestParameters = new EventRequestParameters(eventAttributes, UUID.randomUUID());
+		Mockito.when(mockEngine.event(eventRequestParameters)).thenReturn(mockResult);
+
+		Collection<PolicyResponse> result = mockEngine.event(eventRequestParameters);
+		
+		assertEquals(result, mockResult);
+	}
+
+	/**
+	 * Run the PDPNotification getNotification() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+/*	@Test
+	public void testGetNotification()
+		throws Exception {
+		//StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null);
+
+		PDPNotification result = fixture.getNotification();
+
+		assertNull(result);
+	}*/
+
+	/**
+	 * Run the NotificationHandler getNotificationHandler() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testGetNotificationHandler()
+		throws Exception {
+		//StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null);
+
+		NotificationHandler result = fixture.getNotificationHandler();
+
+		assertNull(result);
+	}
+
+	/**
+	 * Run the String getPAPURL() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testGetPAPURL()
+		throws Exception {
+
+		String result = StdPolicyEngine.getPAPURL();
+
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the String getPDPURL() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testGetPDPURL()
+		throws Exception {
+
+		String result = StdPolicyEngine.getPDPURL();
+
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the NotificationScheme getScheme() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testGetScheme()
+		throws Exception {
+		//StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null);
+
+		NotificationScheme result = fixture.getScheme();
+
+		assertNull(result);
+	}
+
+	/**
+	 * Run the boolean isJSONValid(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testIsJSONValid()
+		throws Exception {
+		String data = "{\"test\": \"testing\"}";
+
+		boolean result = StdPolicyEngine.isJSONValid(data);
+
+		assertTrue(result);
+	}
+
+	/**
+	 * Run the void notification(NotificationScheme,NotificationHandler) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+/*	@Test
+	public void testNotification()
+		throws Exception {
+		//StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null);
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+		Handler handler = new Handler();
+
+		fixture.notification(scheme, handler);
+
+	}
+*/
+	/**
+	 * Run the PolicyChangeResponse policyEngineImport(ImportParameters) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testPolicyEngineImport()
+		throws Exception {
+		response.setResponseMessage("success");
+		ImportParameters importParameters = new ImportParameters();
+		importParameters.setServiceName("ControllerServiceSampleSdnlServiceInstance");
+		importParameters.setVersion("1607-2");
+		importParameters.setFilePath("C:\\Workspaces\\models\\TestingModel\\ControllerServiceSampleSdnlServiceInstance-v0.1.0-SNAPSHOT.zip");
+		importParameters.setServiceType(IMPORT_TYPE.MICROSERVICE);
+		
+		PolicyChangeResponse result = fixture.policyEngineImport(importParameters);
+
+		assertNotNull(result);
+		
+	}
+
+	/**
+	 * Run the Collection<PolicyConfig> policyName(String,UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testPolicyName()
+		throws Exception {
+		//StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null);
+		StdPolicyConfig config = new StdPolicyConfig();
+		config.setPolicyName("testing");
+		Collection<PolicyConfig> response = new HashSet<PolicyConfig>();
+		response.add(config);
+		String policyName = "test.testing";
+		UUID requestID = UUID.randomUUID();
+		
+		Mockito.when(mockEngine.policyName(policyName, requestID)).thenReturn(response);
+		Collection<PolicyConfig> result = mockEngine.policyName(policyName, requestID);
+
+		assertEquals(result, response);
+	}
+
+	/**
+	 * Run the PolicyChangeResponse pushPolicy(PushPolicyParameters) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testPushPolicy()
+		throws Exception {
+		response.setResponseMessage("success");
+		
+		response.setResponseMessage("success");
+		PolicyChangeResponse result = null;
+		
+		PushPolicyParameters pushPolicyParameters = new PushPolicyParameters();
+		pushPolicyParameters.setPolicyName("test.testPolicy");
+		pushPolicyParameters.setPdpGroup("default");
+		pushPolicyParameters.setPolicyType("Base");
+		
+		try {
+		
+			Mockito.when(mockEngine.pushPolicy(pushPolicyParameters)).thenReturn(response);
+			result = mockEngine.pushPolicy(pushPolicyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+
+	/**
+	 * Run the void rotateList() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testRotateList()
+		throws Exception {
+
+		StdPolicyEngine.rotateList();
+
+	}
+
+	/**
+	 * Run the void setScheme(NotificationScheme) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testSetScheme()
+		throws Exception {
+		//StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null);
+		NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+
+		fixture.setScheme(scheme);
+
+	}
+
+	/**
+	 * Run the void stopNotification() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+/*	@Test
+	public void testStopNotification_1()
+		throws Exception {
+		Handler handler = new Handler();
+	
+		Mockito.doNothing().when(mockStdPolicyEngine).notification(NotificationScheme.AUTO_ALL_NOTIFICATIONS, handler);
+		StdPolicyEngine fixture = new StdPolicyEngine("Test/config_pass.properties", NotificationScheme.AUTO_ALL_NOTIFICATIONS, handler);
+		
+		//verify(mockStdPolicyEngine, times(1)).fixture("Test/config_pass.properties", NotificationScheme.AUTO_ALL_NOTIFICATIONS, handler);
+
+		fixture.stopNotification();
+	}*/
+
+	/**
+	 * Run the String updateConfigFirewallPolicy(String,JsonObject,String,UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@Test
+	public void testUpdateConfigFirewallPolicy()
+		throws Exception {
+		response.setResponseMessage("success");
+		String json= "{\"serviceTypeId\": \"/v0/firewall/pan\",\"configName\": \"rule1607\",\"deploymentOption\":{\"deployNow\": false},\"securityZoneId\": \"/v0/firewall/pan\",\"serviceGroups\": [{\"name\": \"1607Group\",\"description\": null,\"members\": [{\"type\": \"REFERENCE\",\"name\": \"SList\"},{\"type\": \"REFERENCE\",\"name\": \"Syslog\"}]}, {\"name\": \"Syslog\",\"description\": \"NA\",\"type\": \"SERVICE\",\"transportProtocol\": \"udp\",\"appProtocol\": null,\"ports\": \"514\"}, {\"name\": \"SList\",\"description\": \"Service List\",\"type\": \"SERVICE\",\"transportProtocol\": \"tcp\",\"appProtocol\": null,\"ports\": \"8080\"}],\"addressGroups\": [{\"name\": \"1607Group\",\"description\": null,\"members\": [{\"type\": \"REFERENCE\",\"name\": \"10.11.12.13/14\"},{\"type\": \"REFERENCE\",\"name\": \"10.11.12.13/14\"}]},{\"name\": \"PL_CCE3\",\"description\": \"CCE Routers\",\"members\":[{\"type\": \"REFERENCE\",\"name\": \"10.11.12.13/14\"}]}],\"firewallRuleList\": [{\"position\": \"1\",\"ruleName\": \"1607Rule\",\"fromZones\": [\"Trusted\"],\"toZones\": [\"Untrusted\"],\"negateSource\": false,\"negateDestination\": false,\"sourceList\": [{\"type\": \"REFERENCE\",\"name\": \"PL_CCE3\"}, {\"type\": \"REFERENCE\",\"name\": \"1607Group\"}],\"destinationList\": [{\"type\": \"REFERENCE\",\"name\": \"1607Group\"}],\"sourceServices\": [],\"destServices\": [{\"type\": \"REFERENCE\",\"name\": \"1607Group\"}],\"action\": \"accept\",\"description\": \"Rule for 1607 templates\",\"enabled\": true,\"log\": true}]}";
+		String policyName = "testing";
+		JsonObject firewallJson = buildJSON(json);
+		String policyScope = "test";
+		UUID requestID = UUID.randomUUID();
+		String riskLevel  = "";
+		String riskType = "";
+		String guard = "";
+		String date = "";
+
+		String result = fixture.updateConfigFirewallPolicy(policyName, firewallJson, policyScope, requestID,riskLevel,  riskType, guard,  date);
+
+		assertNotNull(result);
+	}
+
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/3/16 2:03 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(StdPolicyEngineTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyResponseTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyResponseTest.java
new file mode 100644
index 000000000..2cb21ef19
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyResponseTest.java
@@ -0,0 +1,348 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyResponseStatus;
+import org.openecomp.policy.std.StdPolicyResponse;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>StdPolicyResponseTest</code> contains tests for the class <code>{@link StdPolicyResponse}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class StdPolicyResponseTest {
+	/**
+	 * Run the Map<String, String> getActionAdvised() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetActionAdvised_1()
+		throws Exception {
+		StdPolicyResponse fixture = new StdPolicyResponse();
+		fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED);
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setActionTaken(new Hashtable());
+
+		Map<String, String> result = fixture.getActionAdvised();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the Map<String, String> getActionTaken() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetActionTaken_1()
+		throws Exception {
+		StdPolicyResponse fixture = new StdPolicyResponse();
+		fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED);
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setActionTaken(new Hashtable());
+
+		Map<String, String> result = fixture.getActionTaken();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the String getPolicyResponseMessage() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyResponseMessage_1()
+		throws Exception {
+		StdPolicyResponse fixture = new StdPolicyResponse();
+		fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED);
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setActionTaken(new Hashtable());
+
+		String result = fixture.getPolicyResponseMessage();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the PolicyResponseStatus getPolicyResponseStatus() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyResponseStatus_1()
+		throws Exception {
+		StdPolicyResponse fixture = new StdPolicyResponse();
+		fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED);
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setActionTaken(new Hashtable());
+
+		PolicyResponseStatus result = fixture.getPolicyResponseStatus();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("action_advised", result.toString());
+		assertEquals("ACTION_ADVISED", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the Map<String, String> getRequestAttributes() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetRequestAttributes_1()
+		throws Exception {
+		StdPolicyResponse fixture = new StdPolicyResponse();
+		fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED);
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setActionTaken(new Hashtable());
+
+		Map<String, String> result = fixture.getRequestAttributes();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the void setActionAdvised(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetActionAdvised_1()
+		throws Exception {
+		StdPolicyResponse fixture = new StdPolicyResponse();
+		fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED);
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setActionTaken(new Hashtable());
+		Map<String, String> actionAdvised = new Hashtable();
+
+		fixture.setActionAdvised(actionAdvised);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setActionTaken(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetActionTaken_1()
+		throws Exception {
+		StdPolicyResponse fixture = new StdPolicyResponse();
+		fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED);
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setActionTaken(new Hashtable());
+		Map<String, String> actionTaken = new Hashtable();
+
+		fixture.setActionTaken(actionTaken);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyResponseMessage(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyResponseMessage_1()
+		throws Exception {
+		StdPolicyResponse fixture = new StdPolicyResponse();
+		fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED);
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setActionTaken(new Hashtable());
+		String policyResponseMessage = "";
+
+		fixture.setPolicyResponseMessage(policyResponseMessage);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyResponseStatus(PolicyResponseStatus) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyResponseStatus_1()
+		throws Exception {
+		StdPolicyResponse fixture = new StdPolicyResponse();
+		fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED);
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setActionTaken(new Hashtable());
+		PolicyResponseStatus policyResponseStatus = PolicyResponseStatus.ACTION_ADVISED;
+
+		fixture.setPolicyResponseStatus(policyResponseStatus);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyResponseStatus(String,PolicyResponseStatus) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyResponseStatus_2()
+		throws Exception {
+		StdPolicyResponse fixture = new StdPolicyResponse();
+		fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED);
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setActionTaken(new Hashtable());
+		String policyResponseMessage = "";
+		PolicyResponseStatus policyResponseStatus = PolicyResponseStatus.ACTION_ADVISED;
+
+		fixture.setPolicyResponseStatus(policyResponseMessage, policyResponseStatus);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setRequestAttributes(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetRequestAttributes_1()
+		throws Exception {
+		StdPolicyResponse fixture = new StdPolicyResponse();
+		fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED);
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setActionTaken(new Hashtable());
+		Map<String, String> requestAttributes = new Hashtable();
+
+		fixture.setRequestAttributes(requestAttributes);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		StdPolicyResponse fixture = new StdPolicyResponse();
+		fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED);
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setActionTaken(new Hashtable());
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("PolicyResponse [ policyResponseStatus=action_advised, policyResponseMessage=, ]", result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(StdPolicyResponseTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdRemovedPolicyTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdRemovedPolicyTest.java
new file mode 100644
index 000000000..0a0865c82
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdRemovedPolicyTest.java
@@ -0,0 +1,206 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import org.junit.*;
+import org.openecomp.policy.std.StdRemovedPolicy;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>StdRemovedPolicyTest</code> contains tests for the class <code>{@link StdRemovedPolicy}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class StdRemovedPolicyTest {
+	/**
+	 * Run the StdRemovedPolicy() constructor test.
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testStdRemovedPolicy_1()
+		throws Exception {
+		StdRemovedPolicy result = new StdRemovedPolicy();
+		assertNotNull(result);
+		// add additional test code here
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyName_1()
+		throws Exception {
+		StdRemovedPolicy fixture = new StdRemovedPolicy();
+		fixture.setVersionNo("");
+		fixture.setPolicyName("");
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyName_2()
+		throws Exception {
+		StdRemovedPolicy fixture = new StdRemovedPolicy();
+		fixture.setVersionNo("");
+		fixture.setPolicyName((String) null);
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals(null, result);
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyName_3()
+		throws Exception {
+		StdRemovedPolicy fixture = new StdRemovedPolicy();
+		fixture.setVersionNo("");
+		fixture.setPolicyName("");
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getVersionNo() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetVersionNo_1()
+		throws Exception {
+		StdRemovedPolicy fixture = new StdRemovedPolicy();
+		fixture.setVersionNo("");
+		fixture.setPolicyName("");
+
+		String result = fixture.getVersionNo();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the void setPolicyName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyName_1()
+		throws Exception {
+		StdRemovedPolicy fixture = new StdRemovedPolicy();
+		fixture.setVersionNo("");
+		fixture.setPolicyName("");
+		String policyName = "";
+
+		fixture.setPolicyName(policyName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setVersionNo(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetVersionNo_1()
+		throws Exception {
+		StdRemovedPolicy fixture = new StdRemovedPolicy();
+		fixture.setVersionNo("");
+		fixture.setPolicyName("");
+		String versionNo = "";
+
+		fixture.setVersionNo(versionNo);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(StdRemovedPolicyTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdStatusTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdStatusTest.java
new file mode 100644
index 000000000..4412dbdb7
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdStatusTest.java
@@ -0,0 +1,1433 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.std.test;
+
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.json.JsonObject;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyConfigStatus;
+import org.openecomp.policy.api.PolicyDecision;
+import org.openecomp.policy.api.PolicyResponseStatus;
+import org.openecomp.policy.api.PolicyType;
+import org.openecomp.policy.std.StdStatus;
+
+import static org.junit.Assert.*;
+
+import org.w3c.dom.Document;
+
+/**
+ * The class <code>StdStatusTest</code> contains tests for the class <code>{@link StdStatus}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class StdStatusTest {
+	/**
+	 * Run the Map<String, String> getActionAdvised() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetActionAdvised_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		Map<String, String> result = fixture.getActionAdvised();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the Map<String, String> getActionTaken() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetActionTaken_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		Map<String, String> result = fixture.getActionTaken();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the Map<String, String> getMatchingConditions() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetMatchingConditions_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		Map<String, String> result = fixture.getMatchingConditions();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the String getPolicyConfigMessage() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyConfigMessage_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		String result = fixture.getPolicyConfigMessage();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the PolicyConfigStatus getPolicyConfigStatus() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyConfigStatus_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		PolicyConfigStatus result = fixture.getPolicyConfigStatus();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("not_found", result.toString());
+		assertEquals("CONFIG_NOT_FOUND", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the PolicyDecision getPolicyDecision() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyDecision_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		PolicyDecision result = fixture.getDecision();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("deny", result.toString());
+		assertEquals("DENY", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyName_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyName_2()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName((String) null);
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals(null, result);
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyName_3()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPolicyResponseMessage() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyResponseMessage_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		String result = fixture.getPolicyResponseMessage();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the PolicyResponseStatus getPolicyResponseStatus() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyResponseStatus_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		PolicyResponseStatus result = fixture.getPolicyResponseStatus();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("action_advised", result.toString());
+		assertEquals("ACTION_ADVISED", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the String getPolicyVersion() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyVersion_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		String result = fixture.getPolicyVersion();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the Map<String, String> getRequestAttributes() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetRequestAttributes_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		Map<String, String> result = fixture.getRequestAttributes();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the Map<String, String> getResponseAttributes() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetResponseAttributes_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		Map<String, String> result = fixture.getResponseAttributes();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the PolicyType getType() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetType_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		PolicyType result = fixture.getType();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("json", result.toString());
+		assertEquals("JSON", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the void setActionAdvised(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetActionAdvised_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		Map<String, String> actionAdvised = new Hashtable();
+
+		fixture.setActionAdvised(actionAdvised);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setActionTaken(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetActionTaken_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		Map<String, String> actionTaken = new Hashtable();
+
+		fixture.setActionTaken(actionTaken);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setConfigStatus(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetConfigStatus_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		String configStatus = "";
+
+		fixture.setConfigStatus(configStatus);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setDocument(Document) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetDocument_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		Document document = null;
+
+		fixture.setDocument(document);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setJsonObject(JsonObject) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetJsonObject_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		JsonObject jsonObject = null;
+
+		fixture.setJsonObject(jsonObject);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setMatchingConditions(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetMatchingConditions_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		Map<String, String> matchingConditions = new Hashtable();
+
+		fixture.setMatchingConditions(matchingConditions);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setOther(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetOther_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		String other = "";
+
+		fixture.setOther(other);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyConfigStatus(PolicyConfigStatus) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyConfigStatus_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		PolicyConfigStatus policyConfigStatus = PolicyConfigStatus.CONFIG_NOT_FOUND;
+
+		fixture.setPolicyConfigStatus(policyConfigStatus);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyConfigStatus(String,PolicyConfigStatus) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyConfigStatus_2()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		String configStatus = "";
+		PolicyConfigStatus policyConfigStatus = PolicyConfigStatus.CONFIG_NOT_FOUND;
+
+		fixture.setPolicyConfigStatus(configStatus, policyConfigStatus);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyDecision(PolicyDecision) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyDecision_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		PolicyDecision policyDecision = PolicyDecision.DENY;
+
+		fixture.setDecision(policyDecision);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyName_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		String policyName = "";
+
+		fixture.setPolicyName(policyName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyResponseMessage(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyResponseMessage_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		String policyResponseMessage = "";
+
+		fixture.setPolicyResponseMessage(policyResponseMessage);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyResponseStatus(PolicyResponseStatus) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyResponseStatus_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		PolicyResponseStatus policyResponseStatus = PolicyResponseStatus.ACTION_ADVISED;
+
+		fixture.setPolicyResponseStatus(policyResponseStatus);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyResponseStatus(String,PolicyResponseStatus) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyResponseStatus_2()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		String policyResponseMessage = "";
+		PolicyResponseStatus policyResponseStatus = PolicyResponseStatus.ACTION_ADVISED;
+
+		fixture.setPolicyResponseStatus(policyResponseMessage, policyResponseStatus);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyType(PolicyType) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyType_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		PolicyType policyType = PolicyType.JSON;
+
+		fixture.setPolicyType(policyType);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyVersion(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyVersion_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		String policyVersion = "";
+
+		fixture.setPolicyVersion(policyVersion);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setProperties(Properties) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetProperties_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		Properties properties = new Properties();
+
+		fixture.setProperties(properties);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setRequestAttributes(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetRequestAttributes_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		Map<String, String> requestAttributes = new Hashtable();
+
+		fixture.setRequestAttributes(requestAttributes);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setResposneAttributes(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetResposneAttributes_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		Map<String, String> responseAttributes = new Hashtable();
+
+		fixture.setResposneAttributes(responseAttributes);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setStatus(String,PolicyResponseStatus,PolicyConfigStatus) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetStatus_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+		String message = "";
+		PolicyResponseStatus policyResponseStatus = PolicyResponseStatus.ACTION_ADVISED;
+		PolicyConfigStatus policyConfigStatus = PolicyConfigStatus.CONFIG_NOT_FOUND;
+
+		fixture.setStatus(message, policyResponseStatus, policyConfigStatus);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the JsonObject toJSON() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testToJSON_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		JsonObject result = fixture.toJSON();
+
+		// add additional test code here
+		assertEquals(null, result);
+	}
+
+	/**
+	 * Run the String toOther() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testToOther_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		String result = fixture.toOther();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the Properties toProperties() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testToProperties_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		Properties result = fixture.toProperties();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the Document toXML() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testToXML_1()
+		throws Exception {
+		StdStatus fixture = new StdStatus();
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setPolicyName("");
+		fixture.setPolicyType(PolicyType.JSON);
+		fixture.setResposneAttributes(new Hashtable());
+		fixture.setMatchingConditions(new Hashtable());
+		fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND);
+		fixture.setJsonObject((JsonObject) null);
+		fixture.setDocument((Document) null);
+		fixture.setProperties(new Properties());
+		fixture.setRequestAttributes(new Hashtable());
+		fixture.setPolicyVersion("");
+		fixture.setActionAdvised(new Hashtable());
+		fixture.setOther("");
+		fixture.setDecision(PolicyDecision.DENY);
+		fixture.setDetails("");
+		fixture.setActionTaken(new Hashtable());
+
+		Document result = fixture.toXML();
+
+		// add additional test code here
+		assertEquals(null, result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(StdStatusTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/package-info.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/package-info.java
new file mode 100644
index 000000000..75bfc39ad
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/package-info.java
@@ -0,0 +1,27 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * 
+ */
+/**
+ *
+ */
+package org.openecomp.policy.std.test;
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ActionPolicyApiTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ActionPolicyApiTest.java
new file mode 100644
index 000000000..d830a1a29
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ActionPolicyApiTest.java
@@ -0,0 +1,240 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.policy.api.AttributeType;
+import org.openecomp.policy.api.PolicyChangeResponse;
+import org.openecomp.policy.api.PolicyClass;
+import org.openecomp.policy.api.PolicyEngine;
+import org.openecomp.policy.api.PolicyEngineException;
+import org.openecomp.policy.api.PolicyParameters;
+import org.openecomp.policy.std.StdPolicyChangeResponse;
+
+import junit.framework.TestCase;
+import org.openecomp.policy.common.logging.flexlogger.*; 
+
+public class ActionPolicyApiTest extends TestCase {
+	
+	private static final Logger logger = FlexLogger.getLogger(ActionPolicyApiTest.class);
+
+	private PolicyEngine policyEngine = null;
+	private PolicyEngine mockPolicyEngine = null;
+	
+	PolicyChangeResponse result = null;
+	StdPolicyChangeResponse response = new StdPolicyChangeResponse();
+	PolicyParameters policyParameters = new PolicyParameters();
+	
+	@Before
+	protected void setUp() throws Exception {
+		try {
+			policyEngine = new PolicyEngine("Test/config_pass.properties");
+		} catch (PolicyEngineException e) {
+			logger.error(e.getMessage());
+			fail("PolicyEngine Instantiation Error" + e);
+		}
+		logger.info("Loaded.. PolicyEngine");
+		
+		mockPolicyEngine = Mockito.mock(PolicyEngine.class);
+
+        policyParameters.setPolicyClass(PolicyClass.Action); //required
+        policyParameters.setPolicyName("test.junitTest"); //required
+        policyParameters.setPolicyDescription("testing");  //optional
+        //policyParameters.setPolicyScope("test"); //Directory will be created where the Policies are saved... this displays a a subscope on the GUI
+        
+        //Set the Component Attributes... These are Optional
+        Map<String, String> configAttributes = new HashMap<String, String>(); 
+        configAttributes.put("test", "testing");
+        
+        Map<AttributeType, Map<String,String>> attributes = new HashMap<AttributeType, Map<String,String>>();
+        attributes.put(AttributeType.MATCHING, configAttributes);
+        policyParameters.setAttributes(attributes);
+		
+        policyParameters.setActionPerformer("PEP");
+        policyParameters.setActionAttribute("testing");
+        policyParameters.setRequestID(UUID.randomUUID());
+	}
+
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+	
+	@Test
+	public final void testCreatePolicy() {
+		response.setResponseMessage("success");
+		PolicyChangeResponse result = null;
+		try {
+		
+			Mockito.when(mockPolicyEngine.createPolicy(policyParameters)).thenReturn(response);
+			result = mockPolicyEngine.createPolicy(policyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+
+	@Test
+	public final void testUpdatePolicy() {
+		response.setResponseMessage("success");
+		PolicyChangeResponse result = null;
+		try {
+
+			Mockito.when(mockPolicyEngine.updatePolicy(policyParameters)).thenReturn(response);
+			result = mockPolicyEngine.updatePolicy(policyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);	
+		
+	}
+	
+	@Test
+	public final void testCreatePolicyNullPolicyName() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Name given.");
+		policyParameters.setPolicyName(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyNullPolicyScope() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Scope given.");
+		policyParameters.setPolicyName("test");
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyNullActionAttributes() {
+		response.setResponseMessage("PE300 - Data Issue: No Action Attribute given.");
+		policyParameters.setActionAttribute(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyNullActionPerformer() {
+		response.setResponseMessage("PE300 - Data Issue: No Action Performer given.");
+		policyParameters.setActionPerformer(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyInvalidActionPerformer() {
+		response.setResponseMessage("PE300 - Data Issue: Invalid Action Performer given.");
+		policyParameters.setActionPerformer("testfail");
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullPolicyName() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Name given.");
+		policyParameters.setPolicyName(null);
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullPolicyScope() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Scope given.");
+		policyParameters.setPolicyName("test");
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullActionAttributes() {
+		response.setResponseMessage("PE300 - Data Issue: No Action Attribute given.");
+		policyParameters.setActionAttribute(null);
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullActionPerformer() {
+		response.setResponseMessage("PE300 - Data Issue: No Action Performer given.");
+		policyParameters.setActionPerformer(null);
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyInvalidActionPerformer() {
+		response.setResponseMessage("PE300 - Data Issue: Invalid Action Performer given.");
+		policyParameters.setActionPerformer("testfail");
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/AttributeTypeTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/AttributeTypeTest.java
new file mode 100644
index 000000000..df8713ab8
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/AttributeTypeTest.java
@@ -0,0 +1,81 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.AttributeType;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>AttributeTypeTest</code> contains tests for the class <code>{@link AttributeType}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class AttributeTypeTest {
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		AttributeType fixture = AttributeType.MATCHING;
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("matching", result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigBasePolicyTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigBasePolicyTest.java
new file mode 100644
index 000000000..c6c624af0
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigBasePolicyTest.java
@@ -0,0 +1,325 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.policy.api.AttributeType;
+import org.openecomp.policy.api.PolicyChangeResponse;
+import org.openecomp.policy.api.PolicyConfigType;
+import org.openecomp.policy.api.PolicyEngine;
+import org.openecomp.policy.api.PolicyEngineException;
+import org.openecomp.policy.api.PolicyParameters;
+import org.openecomp.policy.api.PolicyType;
+import org.openecomp.policy.std.StdPolicyChangeResponse;
+
+import org.openecomp.policy.common.logging.flexlogger.*; 
+
+/**
+ * The class <code>ConfigBasePolicyTest</code> contains tests for the class
+ * {@link <code>PolicyEngine</code>}
+ *
+ * @pattern JUnit Test Case
+ * *
+ */
+public class ConfigBasePolicyTest extends TestCase {
+
+	private static final Logger logger = FlexLogger.getLogger(DecisionPolicyApiTest.class);
+
+	private PolicyEngine policyEngine = null;
+	private PolicyEngine mockPolicyEngine = null;
+	
+	PolicyChangeResponse result = null;
+	StdPolicyChangeResponse response = new StdPolicyChangeResponse();
+	PolicyParameters policyParameters = new PolicyParameters();
+
+	/**
+	 * Perform pre-test initialization
+	 *
+	 * @throws Exception
+	 *
+	 * @see TestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+		try {
+			policyEngine = new PolicyEngine("Test/config_pass.properties");
+		} catch (PolicyEngineException e) {
+			logger.error(e.getMessage());
+			fail("PolicyEngine Instantiation Error" + e);
+		}
+		logger.info("Loaded.. PolicyEngine");
+		
+		mockPolicyEngine = Mockito.mock(PolicyEngine.class);
+
+        policyParameters.setPolicyConfigType(PolicyConfigType.Base); //required
+        policyParameters.setPolicyName("test.junitTest"); //required
+        policyParameters.setEcompName("test");
+        policyParameters.setConfigName("testBase");
+        policyParameters.setConfigBodyType(PolicyType.OTHER);
+        policyParameters.setConfigBody("testing");
+        policyParameters.setPolicyDescription("testing");  //optional
+        //policyParameters.setPolicyScope("test"); //Directory will be created where the Policies are saved... this displays a a subscope on the GUI
+        
+        //Set the Component Attributes... These are Optional
+        Map<String, String> configAttributes = new HashMap<String, String>(); 
+        configAttributes.put("test", "testing");
+        
+        Map<AttributeType, Map<String,String>> attributes = new HashMap<AttributeType, Map<String,String>>();
+        attributes.put(AttributeType.MATCHING, configAttributes);
+        policyParameters.setAttributes(attributes);
+
+        policyParameters.setRequestID(UUID.randomUUID());
+	}
+
+	/**
+	 * Perform post-test clean up
+	 *
+	 * @throws Exception
+	 *
+	 * @see TestCase#tearDown()
+	 */
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Run the PolicyChangeResponse createPolicy(PolicyParameters) method test
+	 */
+	public void testCreatePolicy() {
+		response.setResponseMessage("success");
+		PolicyChangeResponse result = null;
+		try {
+		
+			Mockito.when(mockPolicyEngine.createPolicy(policyParameters)).thenReturn(response);
+			result = mockPolicyEngine.createPolicy(policyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+	
+	/**
+	 * Run the String createConfigPolicy() method test
+	 */
+	@Test
+	public void testCreateConfigPolicy() {
+		String response = "success";
+		String result = null;
+		try {
+		
+			Mockito.when(mockPolicyEngine.createConfigPolicy("testPolicy","test","test","testConfig",null,"OTHER","test","test",null, null, null, null, null)).thenReturn(response);
+			result = mockPolicyEngine.createConfigPolicy("testPolicy","test","test","testConfig",null,"OTHER","test","test",null, null, null, null, null);
+
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+
+	/**
+	 * Run the PolicyChangeResponse updatePolicy(PolicyParameters) method test
+	 */
+	public void testUpdatePolicy() {
+		response.setResponseMessage("success");
+		PolicyChangeResponse result = null;
+		try {
+		
+			Mockito.when(mockPolicyEngine.updatePolicy(policyParameters)).thenReturn(response);
+			result = mockPolicyEngine.updatePolicy(policyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+	
+	/**
+	 * Run the String updateConfigPolicy() method test
+	 */
+	@Test
+	public void testUpdateConfigPolicy() {
+		String response = "success";
+		String result = null;
+		try {
+		
+			Mockito.when(mockPolicyEngine.updateConfigPolicy("testPolicy","test","test","testConfig",null,"OTHER","test","test",null, null, null, null, null)).thenReturn(response);
+			result = mockPolicyEngine.updateConfigPolicy("testPolicy","test","test","testConfig",null,"OTHER","test","test",null, null, null, null, null);
+
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+	
+	@Test
+	public final void testCreatePolicyNullPolicyName() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Name given.");
+		policyParameters.setPolicyName(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyNullPolicyScope() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Scope given.");
+		policyParameters.setPolicyName("test");
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyNullEcompName() {
+		response.setResponseMessage("PE300 - Data Issue: No ECOMP Name given.");
+		policyParameters.setEcompName(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyNullPolicyConfigName() {
+		response.setResponseMessage("PE300 - Data Issue: No Config Name given.");
+		policyParameters.setConfigName(null);;
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyNullPolicyConfigBodyType() {
+		response.setResponseMessage("PE300 - Data Issue: No Config Body Type given.");
+		policyParameters.setConfigBodyType(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyNullPolicyConfigBody() {
+		response.setResponseMessage("PE300 - Data Issue: No Config Body given.");
+		policyParameters.setConfigBody(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullPolicyName() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Name given.");
+		policyParameters.setPolicyName(null);
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullPolicyScope() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Scope given.");
+		policyParameters.setPolicyName("test");
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullEcompName() {
+		response.setResponseMessage("PE300 - Data Issue: No ECOMP Name given.");
+		policyParameters.setEcompName(null);
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullPolicyConfigName() {
+		response.setResponseMessage("PE300 - Data Issue: No Config Name given.");
+		policyParameters.setConfigName(null);;
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullPolicyConfigBodyType() {
+		response.setResponseMessage("PE300 - Data Issue: No Config Body Type given.");
+		policyParameters.setConfigBodyType(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullPolicyConfigBody() {
+		response.setResponseMessage("PE300 - Data Issue: No Config Body given.");
+		policyParameters.setConfigBody(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigFirewallPolicyTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigFirewallPolicyTest.java
new file mode 100644
index 000000000..4725c17e9
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigFirewallPolicyTest.java
@@ -0,0 +1,256 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.policy.api.PolicyChangeResponse;
+import org.openecomp.policy.api.PolicyConfigType;
+import org.openecomp.policy.api.PolicyEngine;
+import org.openecomp.policy.api.PolicyEngineException;
+import org.openecomp.policy.api.PolicyParameters;
+import org.openecomp.policy.std.StdPolicyChangeResponse;
+
+import org.openecomp.policy.common.logging.flexlogger.*; 
+
+public class ConfigFirewallPolicyTest extends TestCase {
+
+	private static final Logger logger = FlexLogger.getLogger(DecisionPolicyApiTest.class);
+
+	private PolicyEngine policyEngine = null;
+	private PolicyEngine mockPolicyEngine = null;
+	
+	PolicyChangeResponse result = null;
+	StdPolicyChangeResponse response = new StdPolicyChangeResponse();
+	PolicyParameters policyParameters = new PolicyParameters();
+	String json = null;
+
+	/**
+	 * Perform pre-test initialization
+	 *
+	 * @throws Exception
+	 *
+	 * @see TestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+		try {
+			policyEngine = new PolicyEngine("Test/config_pass.properties");
+		} catch (PolicyEngineException e) {
+			logger.error(e.getMessage());
+			fail("PolicyEngine Instantiation Error" + e);
+		}
+		logger.info("Loaded.. PolicyEngine");
+		
+		mockPolicyEngine = Mockito.mock(PolicyEngine.class);
+
+        policyParameters.setPolicyConfigType(PolicyConfigType.Firewall); //required
+        policyParameters.setPolicyName("test.junitTest"); //required
+        
+        json = "{\"serviceTypeId\":\"/v0/firewall/pan\",\"configName\":\"rule1607\",\"deploymentOption\":{\"deployNow\":false},\"securityZoneId\":\"/v0/firewall/pan\",\"serviceGroups\":[{\"name\":\"1607Group\",\"description\":null,\"members\":[{\"type\":\"REFERENCE\",\"name\":\"SList\"},{\"type\":\"REFERENCE\",\"name\":\"Syslog\"}]},{\"name\":\"Syslog\",\"description\":\"NA\",\"type\":\"SERVICE\",\"transportProtocol\":\"udp\",\"appProtocol\":null,\"ports\":\"514\"},{\"name\":\"SList\",\"description\":\"Service List\",\"type\":\"SERVICE\",\"transportProtocol\":\"tcp\",\"appProtocol\":null,\"ports\":\"8080\"}],\"addressGroups\":[{\"name\":\"1607Group\",\"description\":null,\"members\":[{\"type\":\"SUBNET\",\"value\":\"10.11.12.13/14\"},{\"type\":\"SUBNET\",\"value\":\"10.11.12.13/14\"}]},{\"name\":\"PL_CCE3\",\"description\":\"CCE Routers\",\"members\":[{\"type\":\"SUBNET\",\"value\":\"10.11.12.13/14\"}]}],\"firewallRuleList\":[{\"position\":\"1\",\"ruleName\":\"1607Rule\",\"fromZones\":[\"Trusted\"],\"toZones\":[\"Untrusted\"],\"negateSource\":false,\"negateDestination\":false,\"sourceList\":[{\"type\":\"REFERENCE\",\"value\":\"PL_CCE3\"},{\"type\":\"REFERENCE\",\"value\":\"1607Group\"}],\"destinationList\":[{\"type\":\"REFERENCE\",\"value\":\"1607Group\"}],\"sourceServices\":[],\"destServices\":[{\"type\":\"REFERENCE\",\"name\":\"1607Group\"}],\"action\":\"accept\",\"description\":\"Rule for 1607 templates\",\"enabled\":true,\"log\":true}]}";
+        
+        policyParameters.setConfigBody(buildJSON(json).toString());
+        
+        //policyParameters.setPolicyScope("test"); //Directory will be created where the Policies are saved... this displays a a subscope on the GUI
+        policyParameters.setRequestID(UUID.randomUUID());
+	}
+
+    private static JsonObject buildJSON(String jsonString) {
+        JsonObject json = null;;
+        if (jsonString != null) {
+            StringReader in = null;
+             
+            in = new StringReader(jsonString);
+             
+            JsonReader jsonReader = Json.createReader(in);
+            json = jsonReader.readObject();        
+        } 
+        
+        return json;
+    }
+	/**
+	 * Perform post-test clean up
+	 *
+	 * @throws Exception
+	 *
+	 * @see TestCase#tearDown()
+	 */
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Run the PolicyChangeResponse createPolicy(PolicyParameters) method test
+	 */
+	public void testCreatePolicy() {
+		response.setResponseMessage("success");
+		PolicyChangeResponse result = null;
+		try {
+		
+			Mockito.when(mockPolicyEngine.createPolicy(policyParameters)).thenReturn(response);
+			result = mockPolicyEngine.createPolicy(policyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+	
+	/**
+	 * Run the String createConfigFirewallPolicy() method test
+	 */
+	@Test
+	public void testCreateConfigFirewallPolicy() {
+		String response = "success";
+		String result = null;
+		JsonObject jsonObj = buildJSON(json);
+		try {
+		
+			Mockito.when(mockPolicyEngine.createConfigFirewallPolicy("testPolicy",jsonObj, "test", null, null, null, null, null)).thenReturn(response);
+			result = mockPolicyEngine.createConfigFirewallPolicy("testPolicy",jsonObj, "test", null, null, null, null, null);
+
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+
+	/**
+	 * Run the PolicyChangeResponse updatePolicy(PolicyParameters) method test
+	 */
+	public void testUpdatePolicy() {
+		response.setResponseMessage("success");
+		PolicyChangeResponse result = null;
+		try {
+		
+			Mockito.when(mockPolicyEngine.updatePolicy(policyParameters)).thenReturn(response);
+			result = mockPolicyEngine.updatePolicy(policyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+	
+	/**
+	 * Run the String updateConfigFirewallPolicy() method test
+	 */
+	@Test
+	public void testUpdateConfigFirewallPolicy() {
+		String response = "success";
+		String result = null;
+		JsonObject jsonObj = buildJSON(json);
+		try {
+		
+			Mockito.when(mockPolicyEngine.updateConfigFirewallPolicy("testPolicy",jsonObj, "test", null, null, null, null, null)).thenReturn(response);
+			result = mockPolicyEngine.updateConfigFirewallPolicy("testPolicy",jsonObj, "test", null, null, null, null, null);
+
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+	
+	@Test
+	public final void testCreatePolicyNullPolicyName() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Name given.");
+		policyParameters.setPolicyName(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyNullPolicyScope() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Scope given.");
+		policyParameters.setPolicyName("test");
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyNullPolicyConfigBody() {
+		response.setResponseMessage("PE300 - Data Issue: No Config Body given.");
+		policyParameters.setConfigBody(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullPolicyName() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Name given.");
+		policyParameters.setPolicyName(null);
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullPolicyScope() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Scope given.");
+		policyParameters.setPolicyName("test");
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+
+	@Test
+	public final void testUpdatePolicyNullPolicyConfigBody() {
+		response.setResponseMessage("PE300 - Data Issue: No Config Body given.");
+		policyParameters.setConfigBody(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigRequestParametersTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigRequestParametersTest.java
new file mode 100644
index 000000000..c632a0035
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigRequestParametersTest.java
@@ -0,0 +1,362 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.UUID;
+
+import org.junit.*;
+import org.openecomp.policy.api.ConfigRequestParameters;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>ConfigRequestParametersTest</code> contains tests for the class <code>{@link ConfigRequestParameters}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class ConfigRequestParametersTest {
+	/**
+	 * Run the ConfigRequestParameters() constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testConfigRequestParameters_1()
+		throws Exception {
+
+		ConfigRequestParameters result = new ConfigRequestParameters();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(null, result.getPolicyName());
+		assertEquals(null, result.getConfigName());
+		assertEquals(null, result.getConfigAttributes());
+		assertEquals(null, result.getRequestID());
+		assertEquals(null, result.getEcompName());
+		assertEquals(Boolean.FALSE, result.getUnique());
+	}
+
+	/**
+	 * Run the ConfigRequestParameters(String,String,String,Map<String,String>,Boolean,UUID) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testConfigRequestParameters_2()
+		throws Exception {
+		String policyName = "";
+		String eCOMPComponentName = "";
+		String configName = "";
+		Map<String, String> configAttributes = new Hashtable();
+		Boolean unique = new Boolean(true);
+		UUID requestID = UUID.randomUUID();
+
+		ConfigRequestParameters result = createConfigRequest(policyName, eCOMPComponentName, configName, configAttributes, unique, requestID);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("", result.getPolicyName());
+		assertEquals("", result.getConfigName());
+		assertEquals("", result.getEcompName());
+		assertEquals(Boolean.TRUE, result.getUnique());
+	}
+
+	/**
+	 * Run the Map<String, String> getConfigAttributes() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetConfigAttributes_1()
+		throws Exception {
+		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable(), new Boolean(true), UUID.randomUUID());
+
+		Map<String, String> result = fixture.getConfigAttributes();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the String getConfigName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetConfigName_1()
+		throws Exception {
+		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable(), new Boolean(true), UUID.randomUUID());
+
+		String result = fixture.getConfigName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getEcompName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetEcompName_1()
+		throws Exception {
+		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable(), new Boolean(true), UUID.randomUUID());
+
+		String result = fixture.getEcompName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyName_1()
+		throws Exception {
+		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable(), new Boolean(true), UUID.randomUUID());
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the UUID getRequestID() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetRequestID_1()
+		throws Exception {
+		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable(), new Boolean(true), UUID.fromString("6b5aa070-90bc-46a6-9a59-e1fe526df7ae"));
+
+		UUID result = fixture.getRequestID();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("6b5aa070-90bc-46a6-9a59-e1fe526df7ae", result.toString());
+		assertEquals(4, result.version());
+		assertEquals(2, result.variant());
+		assertEquals(-7324574836520519762L, result.getLeastSignificantBits());
+		assertEquals(7735671715287287462L, result.getMostSignificantBits());
+	}
+
+	/**
+	 * Run the Boolean getUnique() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetUnique_1()
+		throws Exception {
+		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable(), new Boolean(true), UUID.randomUUID());
+
+		Boolean result = fixture.getUnique();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("true", result.toString());
+		assertEquals(true, result.booleanValue());
+	}
+
+	/**
+	 * Run the void makeUnique(Boolean) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testMakeUnique_1()
+		throws Exception {
+		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable(), new Boolean(true), UUID.randomUUID());
+		Boolean unique = new Boolean(true);
+
+		fixture.makeUnique(unique);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setConfigAttributes(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetConfigAttributes_1()
+		throws Exception {
+		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable(), new Boolean(true), UUID.randomUUID());
+		Map<String, String> configAttributes = new Hashtable();
+
+		fixture.setConfigAttributes(configAttributes);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setConfigName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetConfigName_1()
+		throws Exception {
+		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable(), new Boolean(true), UUID.randomUUID());
+		String configName = "";
+
+		fixture.setConfigName(configName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setEcompName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetEcompName_1()
+		throws Exception {
+		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable(), new Boolean(true), UUID.randomUUID());
+		String eCOMPComponentName = "";
+
+		fixture.setEcompName(eCOMPComponentName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyName_1()
+		throws Exception {
+		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable(), new Boolean(true), UUID.randomUUID());
+		String policyName = "";
+
+		fixture.setPolicyName(policyName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setRequestID(UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetRequestID_1()
+		throws Exception {
+		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable(), new Boolean(true), UUID.randomUUID());
+		UUID requestID = UUID.randomUUID();
+
+		fixture.setRequestID(requestID);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(ConfigRequestParametersTest.class);
+	}
+	
+	private ConfigRequestParameters createConfigRequest(String policyName, String eCOMPComponentName, String configName, Map<String,String> configAttributes, Boolean unique, UUID requestID){
+		ConfigRequestParameters configRequestParameters = new ConfigRequestParameters();
+		configRequestParameters.setRequestID(requestID);
+		configRequestParameters.setPolicyName(policyName);
+		configRequestParameters.setEcompName(eCOMPComponentName);
+		configRequestParameters.setConfigName(configName);
+		configRequestParameters.setConfigAttributes(configAttributes);
+		configRequestParameters.makeUnique(unique);
+		return configRequestParameters;
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DecisionPolicyApiTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DecisionPolicyApiTest.java
new file mode 100644
index 000000000..70adbe032
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DecisionPolicyApiTest.java
@@ -0,0 +1,221 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.policy.api.AttributeType;
+import org.openecomp.policy.api.PolicyChangeResponse;
+import org.openecomp.policy.api.PolicyClass;
+import org.openecomp.policy.api.PolicyEngine;
+import org.openecomp.policy.api.PolicyEngineException;
+import org.openecomp.policy.api.PolicyParameters;
+import org.openecomp.policy.std.StdPolicyChangeResponse;
+
+import org.openecomp.policy.common.logging.flexlogger.*; 
+
+import junit.framework.TestCase;
+
+/**
+ * The class <code>DecisionPolicyApiTest</code> contains tests for the class
+ * {@link <code>PolicyEngine</code>}
+ *
+ * @pattern JUnit Test Case
+ * *
+ */
+public class DecisionPolicyApiTest extends TestCase {
+
+	private static final Logger logger = FlexLogger.getLogger(DecisionPolicyApiTest.class);
+
+	private PolicyEngine policyEngine = null;
+	private PolicyEngine mockPolicyEngine = null;
+	
+	PolicyChangeResponse result = null;
+	StdPolicyChangeResponse response = new StdPolicyChangeResponse();
+	PolicyParameters policyParameters = new PolicyParameters();
+
+	/**
+	 * Perform pre-test initialization
+	 *
+	 * @throws Exception
+	 *
+	 * @see TestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+		try {
+			policyEngine = new PolicyEngine("Test/config_pass.properties");
+		} catch (PolicyEngineException e) {
+			logger.error(e.getMessage());
+			fail("PolicyEngine Instantiation Error" + e);
+		}
+		logger.info("Loaded.. PolicyEngine");
+		
+		mockPolicyEngine = Mockito.mock(PolicyEngine.class);
+
+        policyParameters.setPolicyClass(PolicyClass.Decision); //required
+        policyParameters.setPolicyName("test.junitTest"); //required
+        policyParameters.setEcompName("test");
+        policyParameters.setPolicyDescription("testing");  //optional
+        //policyParameters.setPolicyScope("test"); //Directory will be created where the Policies are saved... this displays a a subscope on the GUI
+        
+        //Set the Component Attributes... These are Optional
+        Map<String, String> configAttributes = new HashMap<String, String>(); 
+        configAttributes.put("test", "testing");
+        
+        Map<AttributeType, Map<String,String>> attributes = new HashMap<AttributeType, Map<String,String>>();
+        attributes.put(AttributeType.MATCHING, configAttributes);
+        policyParameters.setAttributes(attributes);
+
+      //Set the settings... These are Optional
+/*        Map<String, String> settingsMap = new HashMap<String, String>();
+        settingsMap.put("server", "5");
+         
+        Map<AttributeType, Map<String,String>> settings = new HashMap<AttributeType, Map<String, String>>();
+        settings.put(AttributeType.SETTINGS, settingsMap);
+        policyParameters.setSettings(settings);*/
+        
+        policyParameters.setRequestID(UUID.randomUUID());
+	}
+
+	/**
+	 * Perform post-test clean up
+	 *
+	 * @throws Exception
+	 *
+	 * @see TestCase#tearDown()
+	 */
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Run the PolicyChangeResponse createPolicy(PolicyParameters) method test
+	 */
+	public void testCreatePolicy() {
+		response.setResponseMessage("success");
+		PolicyChangeResponse result = null;
+		try {
+		
+			Mockito.when(mockPolicyEngine.createPolicy(policyParameters)).thenReturn(response);
+			result = mockPolicyEngine.createPolicy(policyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+
+	/**
+	 * Run the PolicyChangeResponse updatePolicy(PolicyParameters) method test
+	 */
+	public void testUpdatePolicy() {
+		response.setResponseMessage("success");
+		PolicyChangeResponse result = null;
+		try {
+		
+			Mockito.when(mockPolicyEngine.updatePolicy(policyParameters)).thenReturn(response);
+			result = mockPolicyEngine.updatePolicy(policyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+	
+	@Test
+	public final void testCreatePolicyNullPolicyName() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Name given.");
+		policyParameters.setPolicyName(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyNullPolicyScope() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Scope given.");
+		policyParameters.setPolicyName("test");
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testCreatePolicyNullEcompName() {
+		response.setResponseMessage("PE300 - Data Issue: No ECOMP Name given.");
+		policyParameters.setEcompName(null);
+		try{
+			result = policyEngine.createPolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullPolicyName() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Name given.");
+		policyParameters.setPolicyName(null);
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullPolicyScope() {
+		response.setResponseMessage("PE300 - Data Issue: No Policy Scope given.");
+		policyParameters.setPolicyName("test");
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+	
+	@Test
+	public final void testUpdatePolicyNullEcompName() {
+		response.setResponseMessage("PE300 - Data Issue: No ECOMP Name given.");
+		policyParameters.setEcompName(null);
+		try{
+			result = policyEngine.updatePolicy(policyParameters);
+		} catch (Exception e){
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result.getResponseMessage(), response.getResponseMessage());
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DecisionRequestParametersTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DecisionRequestParametersTest.java
new file mode 100644
index 000000000..5b8782658
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DecisionRequestParametersTest.java
@@ -0,0 +1,232 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.UUID;
+
+import org.junit.*;
+import org.openecomp.policy.api.DecisionRequestParameters;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>DecisionRequestParametersTest</code> contains tests for the class <code>{@link DecisionRequestParameters}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class DecisionRequestParametersTest {
+	/**
+	 * Run the DecisionRequestParameters() constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testDecisionRequestParameters_1()
+		throws Exception {
+
+		DecisionRequestParameters result = new DecisionRequestParameters();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(null, result.getECOMPComponentName());
+		assertEquals(null, result.getDecisionAttributes());
+		assertEquals(null, result.getRequestID());
+	}
+
+	/**
+	 * Run the DecisionRequestParameters(String,Map<String,String>,UUID) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testDecisionRequestParameters_2()
+		throws Exception {
+		String eCOMPComponentName = "";
+		Map<String, String> decisionAttributes = new Hashtable();
+		UUID requestID = UUID.randomUUID();
+
+		DecisionRequestParameters result = new DecisionRequestParameters(eCOMPComponentName, decisionAttributes, requestID);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("", result.getECOMPComponentName());
+	}
+
+	/**
+	 * Run the Map<String, String> getDecisionAttributes() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetDecisionAttributes_1()
+		throws Exception {
+		DecisionRequestParameters fixture = new DecisionRequestParameters("", new Hashtable(), UUID.randomUUID());
+
+		Map<String, String> result = fixture.getDecisionAttributes();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the String getECOMPComponentName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetECOMPComponentName_1()
+		throws Exception {
+		DecisionRequestParameters fixture = new DecisionRequestParameters("", new Hashtable(), UUID.randomUUID());
+
+		String result = fixture.getECOMPComponentName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the UUID getRequestID() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetRequestID_1()
+		throws Exception {
+		DecisionRequestParameters fixture = new DecisionRequestParameters("", new Hashtable(), UUID.fromString("d1db6a6d-7140-4864-8200-6b541261fdd2"));
+
+		UUID result = fixture.getRequestID();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("d1db6a6d-7140-4864-8200-6b541261fdd2", result.toString());
+		assertEquals(4, result.version());
+		assertEquals(2, result.variant());
+		assertEquals(-9079138839949083182L, result.getLeastSignificantBits());
+		assertEquals(-3324946881598961564L, result.getMostSignificantBits());
+	}
+
+	/**
+	 * Run the void setDecisionAttributes(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetDecisionAttributes_1()
+		throws Exception {
+		DecisionRequestParameters fixture = new DecisionRequestParameters("", new Hashtable(), UUID.randomUUID());
+		Map<String, String> decisionAttributes = new Hashtable();
+
+		fixture.setDecisionAttributes(decisionAttributes);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setECOMPComponentName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetECOMPComponentName_1()
+		throws Exception {
+		DecisionRequestParameters fixture = new DecisionRequestParameters("", new Hashtable(), UUID.randomUUID());
+		String eCOMPComponentName = "";
+
+		fixture.setECOMPComponentName(eCOMPComponentName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setRequestID(UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetRequestID_1()
+		throws Exception {
+		DecisionRequestParameters fixture = new DecisionRequestParameters("", new Hashtable(), UUID.randomUUID());
+		UUID requestID = UUID.randomUUID();
+
+		fixture.setRequestID(requestID);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(DecisionRequestParametersTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DeletePolicyConditionTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DeletePolicyConditionTest.java
new file mode 100644
index 000000000..c2941202b
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DeletePolicyConditionTest.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.DeletePolicyCondition;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>DeletePolicyConditionTest</code> contains tests for the class <code>{@link DeletePolicyCondition}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class DeletePolicyConditionTest {
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		DeletePolicyCondition fixture = DeletePolicyCondition.ALL;
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("All Versions", result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(DeletePolicyConditionTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DeletePolicyParametersTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DeletePolicyParametersTest.java
new file mode 100644
index 000000000..7723f9819
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DeletePolicyParametersTest.java
@@ -0,0 +1,314 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.UUID;
+
+import org.junit.*;
+import org.openecomp.policy.api.DeletePolicyCondition;
+import org.openecomp.policy.api.DeletePolicyParameters;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>DeletePolicyParametersTest</code> contains tests for the class <code>{@link DeletePolicyParameters}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class DeletePolicyParametersTest {
+	/**
+	 * Run the DeletePolicyCondition getDeleteCondition() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetDeleteCondition_1()
+		throws Exception {
+		DeletePolicyParameters fixture = new DeletePolicyParameters();
+		fixture.setPolicyComponent("");
+		fixture.setPolicyName("");
+		fixture.setDeleteCondition(DeletePolicyCondition.ALL);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setPdpGroup("");
+
+		DeletePolicyCondition result = fixture.getDeleteCondition();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("All Versions", result.toString());
+		assertEquals("ALL", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the String getPdpGroup() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPdpGroup_1()
+		throws Exception {
+		DeletePolicyParameters fixture = new DeletePolicyParameters();
+		fixture.setPolicyComponent("");
+		fixture.setPolicyName("");
+		fixture.setDeleteCondition(DeletePolicyCondition.ALL);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setPdpGroup("");
+
+		String result = fixture.getPdpGroup();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPolicyComponent() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyComponent_1()
+		throws Exception {
+		DeletePolicyParameters fixture = new DeletePolicyParameters();
+		fixture.setPolicyComponent("");
+		fixture.setPolicyName("");
+		fixture.setDeleteCondition(DeletePolicyCondition.ALL);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setPdpGroup("");
+
+		String result = fixture.getPolicyComponent();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyName_1()
+		throws Exception {
+		DeletePolicyParameters fixture = new DeletePolicyParameters();
+		fixture.setPolicyComponent("");
+		fixture.setPolicyName("");
+		fixture.setDeleteCondition(DeletePolicyCondition.ALL);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setPdpGroup("");
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the UUID getRequestID() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetRequestID_1()
+		throws Exception {
+		DeletePolicyParameters fixture = new DeletePolicyParameters();
+		fixture.setPolicyComponent("");
+		fixture.setPolicyName("");
+		fixture.setDeleteCondition(DeletePolicyCondition.ALL);
+		fixture.setRequestID(UUID.fromString("482e90e2-2ad7-4265-9893-4cfe08ef1e3d"));
+		fixture.setPdpGroup("");
+
+		UUID result = fixture.getRequestID();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("482e90e2-2ad7-4265-9893-4cfe08ef1e3d", result.toString());
+		assertEquals(4, result.version());
+		assertEquals(2, result.variant());
+		assertEquals(-7452528304412746179L, result.getLeastSignificantBits());
+		assertEquals(5201253920715260517L, result.getMostSignificantBits());
+	}
+
+	/**
+	 * Run the void setDeleteCondition(DeletePolicyCondition) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetDeleteCondition_1()
+		throws Exception {
+		DeletePolicyParameters fixture = new DeletePolicyParameters();
+		fixture.setPolicyComponent("");
+		fixture.setPolicyName("");
+		fixture.setDeleteCondition(DeletePolicyCondition.ALL);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setPdpGroup("");
+		DeletePolicyCondition deleteCondition = DeletePolicyCondition.ALL;
+
+		fixture.setDeleteCondition(deleteCondition);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPdpGroup(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPdpGroup_1()
+		throws Exception {
+		DeletePolicyParameters fixture = new DeletePolicyParameters();
+		fixture.setPolicyComponent("");
+		fixture.setPolicyName("");
+		fixture.setDeleteCondition(DeletePolicyCondition.ALL);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setPdpGroup("");
+		String pdpGroup = "";
+
+		fixture.setPdpGroup(pdpGroup);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyComponent(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyComponent_1()
+		throws Exception {
+		DeletePolicyParameters fixture = new DeletePolicyParameters();
+		fixture.setPolicyComponent("");
+		fixture.setPolicyName("");
+		fixture.setDeleteCondition(DeletePolicyCondition.ALL);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setPdpGroup("");
+		String policyComponent = "";
+
+		fixture.setPolicyComponent(policyComponent);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyName_1()
+		throws Exception {
+		DeletePolicyParameters fixture = new DeletePolicyParameters();
+		fixture.setPolicyComponent("");
+		fixture.setPolicyName("");
+		fixture.setDeleteCondition(DeletePolicyCondition.ALL);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setPdpGroup("");
+		String policyName = "";
+
+		fixture.setPolicyName(policyName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setRequestID(UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetRequestID_1()
+		throws Exception {
+		DeletePolicyParameters fixture = new DeletePolicyParameters();
+		fixture.setPolicyComponent("");
+		fixture.setPolicyName("");
+		fixture.setDeleteCondition(DeletePolicyCondition.ALL);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setPdpGroup("");
+		UUID requestID = UUID.randomUUID();
+
+		fixture.setRequestID(requestID);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(DeletePolicyParametersTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/EventRequestParametersTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/EventRequestParametersTest.java
new file mode 100644
index 000000000..c8d9bd492
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/EventRequestParametersTest.java
@@ -0,0 +1,193 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.UUID;
+
+import org.junit.*;
+import org.openecomp.policy.api.EventRequestParameters;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>EventRequestParametersTest</code> contains tests for the class <code>{@link EventRequestParameters}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class EventRequestParametersTest {
+	/**
+	 * Run the EventRequestParameters() constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testEventRequestParameters_1()
+		throws Exception {
+
+		EventRequestParameters result = new EventRequestParameters();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(null, result.getEventAttributes());
+		assertEquals(null, result.getRequestID());
+	}
+
+	/**
+	 * Run the EventRequestParameters(Map<String,String>,UUID) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testEventRequestParameters_2()
+		throws Exception {
+		Map<String, String> eventAttributes = new Hashtable();
+		UUID requestID = UUID.randomUUID();
+
+		EventRequestParameters result = new EventRequestParameters(eventAttributes, requestID);
+
+		// add additional test code here
+		assertNotNull(result);
+	}
+
+	/**
+	 * Run the Map<String, String> getEventAttributes() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetEventAttributes_1()
+		throws Exception {
+		EventRequestParameters fixture = new EventRequestParameters(new Hashtable(), UUID.randomUUID());
+
+		Map<String, String> result = fixture.getEventAttributes();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the UUID getRequestID() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetRequestID_1()
+		throws Exception {
+		EventRequestParameters fixture = new EventRequestParameters(new Hashtable(), UUID.fromString("5b15376d-569b-4772-ac75-9362043f6a6c"));
+
+		UUID result = fixture.getRequestID();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("5b15376d-569b-4772-ac75-9362043f6a6c", result.toString());
+		assertEquals(4, result.version());
+		assertEquals(2, result.variant());
+		assertEquals(-6019743277723456916L, result.getLeastSignificantBits());
+		assertEquals(6563212974706345842L, result.getMostSignificantBits());
+	}
+
+	/**
+	 * Run the void setEventAttributes(Map<String,String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetEventAttributes_1()
+		throws Exception {
+		EventRequestParameters fixture = new EventRequestParameters(new Hashtable(), UUID.randomUUID());
+		Map<String, String> eventAttributes = new Hashtable();
+
+		fixture.setEventAttributes(eventAttributes);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setRequestID(UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetRequestID_1()
+		throws Exception {
+		EventRequestParameters fixture = new EventRequestParameters(new Hashtable(), UUID.randomUUID());
+		UUID requestID = UUID.randomUUID();
+
+		fixture.setRequestID(requestID);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(EventRequestParametersTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigByPolicyNameTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigByPolicyNameTest.java
new file mode 100644
index 000000000..ccab587da
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigByPolicyNameTest.java
@@ -0,0 +1,64 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.Collection;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.policy.api.PolicyConfig;
+import org.openecomp.policy.api.PolicyConfigException;
+import org.openecomp.policy.api.PolicyEngine;
+import org.openecomp.policy.api.PolicyEngineException;
+
+import org.openecomp.policy.common.logging.flexlogger.*; 
+
+public class GetConfigByPolicyNameTest extends TestCase {
+	private PolicyEngine policyEngine = null;
+	private String policyName = null;
+	private Collection<PolicyConfig> policyConfig = null;
+	private static final Logger logger = FlexLogger.getLogger(GetConfigByPolicyNameTest.class);
+	@Before
+	public void setUp() {
+		try {
+			policyEngine = new PolicyEngine("Test/config_pass.properties");
+		} catch (PolicyEngineException e) {
+			logger.error(e.getMessage());
+			fail("PolicyEngine Instantiation Error" + e);
+		}
+		logger.info("Loaded.. PolicyEngine");
+	}
+	
+	@Test
+	public void testGetConfigPolicyNameNotValid(){
+		policyName = null;
+		try{
+			policyConfig = policyEngine.getConfigByPolicyName(policyName);
+		} catch (PolicyConfigException e){
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringStringMapTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringStringMapTest.java
new file mode 100644
index 000000000..23cce3d8f
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringStringMapTest.java
@@ -0,0 +1,251 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.policy.api.PolicyConfig;
+import org.openecomp.policy.api.PolicyConfigException;
+import org.openecomp.policy.api.PolicyConfigStatus;
+import org.openecomp.policy.api.PolicyEngine;
+import org.openecomp.policy.api.PolicyEngineException;
+import org.openecomp.policy.api.PolicyType;
+
+import org.openecomp.policy.common.logging.flexlogger.*; 
+
+public class GetConfigStringStringMapTest {
+
+	private PolicyEngine policyEngine = null;
+	private String eCOMPComponentName = null;
+	private String configName = null;
+	private Map<String,String> configAttributes = new HashMap<String,String>();
+	private Collection<PolicyConfig> policyConfig = null;
+	private static final Logger logger = FlexLogger.getLogger(GetConfigStringStringMapTest.class);
+	@Before
+	public void setUp() {
+		try {
+			policyEngine = new PolicyEngine("Test/config_pass.properties");
+		} catch (PolicyEngineException e) {
+			logger.error(e.getMessage());
+			fail("PolicyEngine Instantiation Error" + e);
+		}
+		logger.info("Loaded.. PolicyEngine");
+	}
+
+	@Test
+	public void testGetConfigStringStringMapFail() {
+		eCOMPComponentName = null;
+		configName = null;
+		configAttributes = null;
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	@Test
+	public void testGetConfigStringStringMapFail1() {
+		eCOMPComponentName = null;
+		configName = "testFail";
+		configAttributes.put("TestValue", "Fail");
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	@Test
+	public void testGetConfigStringStringMapFail2() {
+		eCOMPComponentName = "TestFail";
+		configName = null;
+		configAttributes.put("TestValue", "Fail");
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	@Test
+	public void testGetConfigStringStringMapFail3() {
+		eCOMPComponentName = "TestFail";
+		configName = "configFail";
+		configAttributes= null;
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	@Test
+	public void testGetConfigStringStringMapfail4() {
+		eCOMPComponentName = "TestFail";
+		configName = "configFail";
+		configAttributes.put("", "");
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	//@Test
+	public void testGetConfigStringStringMapNotValid() {
+		eCOMPComponentName = "TestFail";
+		configName = "configFail";
+		configAttributes.put("Action:com.test.fail", "Value");
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_NOT_FOUND,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertNull(policyConfig.getType());
+			assertNull(policyConfig.toJSON());
+			assertNull(policyConfig.toProperties());
+			assertNull(policyConfig.toXML());
+			assertNull(policyConfig.toOther());
+		}
+	}
+	
+	//@Test
+	public void testGetConfigStringStringMapValidJSON() {
+		eCOMPComponentName = "JSON";
+		configName = "JSONconfig";
+		configAttributes.put("Resource.com:test:resource:json", "Test");
+		configAttributes.put("Action.com:test:action:json", "TestJSON");
+		configAttributes.put("Subject.com:test:subject:json", "TestSubject");
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_RETRIEVED,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertEquals(PolicyType.JSON,policyConfig.getType());
+			assertNotNull(policyConfig.toJSON());
+			assertNull(policyConfig.toProperties());
+			assertNull(policyConfig.toXML());
+			assertNull(policyConfig.toOther());
+		}
+	}
+	
+	//@Test
+	public void testGetConfigStringStringMapValidXML() {
+		eCOMPComponentName = "XML";
+		configName = "XMLconfig";
+		configAttributes.put("Resource.com:test:resource:json", "Test");
+		configAttributes.put("Action.com:test:action:json", "TestJSON");
+		configAttributes.put("Subject.com:test:subject:json", "TestSubject");
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_RETRIEVED,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertEquals(PolicyType.XML,policyConfig.getType());
+			assertNull(policyConfig.toJSON());
+			assertNull(policyConfig.toProperties());
+			assertNotNull(policyConfig.toXML());
+			assertNull(policyConfig.toOther());
+		}
+	}
+	
+	//@Test
+	public void testGetConfigStringStringMapValidProperties() {
+		eCOMPComponentName = "Properties";
+		configName = "PropConfig" ;
+		configAttributes.put("Resource.com:test:resource:json", "Test");
+		configAttributes.put("Action.com:test:action:json", "TestJSON");
+		configAttributes.put("Subject.com:test:subject:json", "TestSubject");
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_RETRIEVED,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertEquals(PolicyType.PROPERTIES,policyConfig.getType());
+			assertNull(policyConfig.toJSON());
+			assertNotNull(policyConfig.toProperties());
+			assertNull(policyConfig.toXML());
+			assertNull(policyConfig.toOther());
+		}
+	}
+	
+	//@Test
+	public void testGetConfigStringStringMapValidOther() {
+		eCOMPComponentName = "Other";
+		configName = "OtherConfig" ;
+		configAttributes.put("Resource.com:test:resource:json", "Test");
+		configAttributes.put("Action.com:test:action:json", "TestJSON");
+		configAttributes.put("Subject.com:test:subject:json", "TestSubject");
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_RETRIEVED,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertEquals(PolicyType.OTHER,policyConfig.getType());
+			assertNull(policyConfig.toJSON());
+			assertNull(policyConfig.toProperties());
+			assertNull(policyConfig.toXML());
+			assertNotNull(policyConfig.toOther());
+		}
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringStringTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringStringTest.java
new file mode 100644
index 000000000..fc8302c0b
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringStringTest.java
@@ -0,0 +1,207 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import java.util.Collection;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.policy.api.PolicyConfig;
+import org.openecomp.policy.api.PolicyConfigException;
+import org.openecomp.policy.api.PolicyConfigStatus;
+import org.openecomp.policy.api.PolicyEngine;
+import org.openecomp.policy.api.PolicyEngineException;
+import org.openecomp.policy.api.PolicyType;
+
+import org.openecomp.policy.common.logging.flexlogger.*; 
+
+public class GetConfigStringStringTest {
+	
+	private PolicyEngine policyEngine = null;
+	private String eCOMPComponentName = null;
+	private String configName = null;
+	private Collection<PolicyConfig> policyConfig = null;
+	private static final Logger logger = FlexLogger.getLogger(GetConfigStringStringTest.class);
+	@Before
+	public void setUp() {
+		try {
+			policyEngine = new PolicyEngine("Test/config_pass.properties");
+		} catch (PolicyEngineException e) {
+			logger.error(e.getMessage());
+			fail("PolicyEngine Instantiation Error" + e);
+		}
+		logger.info("Loaded.. PolicyEngine");
+	}
+
+	@Test
+	public void testGetConfigStringStringFail() {
+		eCOMPComponentName = null;
+		configName = null;
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	@Test
+	public void testGetConfigStringStringFail1() {
+		eCOMPComponentName = null;
+		configName = "";
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	@Test
+	public void testGetConfigStringStringFail2() {
+		eCOMPComponentName = "";
+		configName = null;
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	//@Test
+	public void testGetConfigStringStringNotvalid() {
+		eCOMPComponentName = "fail";
+		configName = "fail";
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_NOT_FOUND,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertNull(policyConfig.getType());
+			assertNull(policyConfig.toJSON());
+			assertNull(policyConfig.toProperties());
+			assertNull(policyConfig.toXML());
+			assertNull(policyConfig.toOther());
+		}
+	}
+	
+	//@Test
+	public void testGetConfigStringStringValidJSON() {
+		eCOMPComponentName = "JSON";
+		configName = "JSONconfig";
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_RETRIEVED,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertEquals(PolicyType.JSON,policyConfig.getType());
+			assertNotNull(policyConfig.toJSON());
+			assertNull(policyConfig.toProperties());
+			assertNull(policyConfig.toXML());
+			assertNull(policyConfig.toOther());
+		}
+	}
+	
+	//@Test
+	public void testGetConfigStringStringValidXML() {
+		eCOMPComponentName = "XML";
+		configName = "XMLconfig";
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_RETRIEVED,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertEquals(PolicyType.XML,policyConfig.getType());
+			assertNull(policyConfig.toJSON());
+			assertNull(policyConfig.toProperties());
+			assertNotNull(policyConfig.toXML());
+			assertNull(policyConfig.toOther());
+		}
+	}
+	
+	//@Test
+	public void testGetConfigStringStringValidProperties() {
+		eCOMPComponentName = "Properties";
+		configName = "PropConfig" ; 
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_RETRIEVED,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertEquals(PolicyType.PROPERTIES,policyConfig.getType());
+			assertNull(policyConfig.toJSON());
+			assertNotNull(policyConfig.toProperties());
+			assertNull(policyConfig.toXML());
+			assertNull(policyConfig.toOther());
+		}
+	}
+	
+	//@Test
+	public void testGetConfigStringStringValidOther() {
+		eCOMPComponentName = "Other";
+		configName = "OtherConfig" ; 
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_RETRIEVED,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertEquals(PolicyType.OTHER,policyConfig.getType());
+			assertNull(policyConfig.toJSON());
+			assertNull(policyConfig.toProperties());
+			assertNull(policyConfig.toXML());
+			assertNotNull(policyConfig.toOther());
+		}
+	}
+
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringTest.java
new file mode 100644
index 000000000..42d38539b
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringTest.java
@@ -0,0 +1,175 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.Collection;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.openecomp.policy.api.PolicyConfig;
+import org.openecomp.policy.api.PolicyConfigException;
+import org.openecomp.policy.api.PolicyConfigStatus;
+import org.openecomp.policy.api.PolicyEngine;
+import org.openecomp.policy.api.PolicyEngineException;
+import org.openecomp.policy.api.PolicyType;
+
+import org.openecomp.policy.common.logging.flexlogger.*; 
+
+public class GetConfigStringTest extends TestCase{
+	
+	private PolicyEngine policyEngine = null;
+	private String eCOMPComponentName = null;
+	private Collection<PolicyConfig> policyConfig = null;
+	private static final Logger logger = FlexLogger.getLogger(GetConfigStringTest.class);
+	@Before
+	public void setUp() {
+		try {
+			policyEngine = new PolicyEngine("Test/config_pass.properties");
+		} catch (PolicyEngineException e) {
+			logger.error(e.getMessage());
+			fail("PolicyEngine Instantiation Error" + e);
+		}
+		logger.info("Loaded.. PolicyEngine");
+	}
+	
+	//@Test
+	public void testGetConfigStringFail() {
+		eCOMPComponentName = null;
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	/*@Test
+	public void testGetConfigStringNotvalid() {
+		eCOMPComponentName = "fail";
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_NOT_FOUND,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertNull(policyConfig.getType());
+			assertNull(policyConfig.toJSON());
+			assertNull(policyConfig.toProperties());
+			assertNull(policyConfig.toXML());
+			assertNull(policyConfig.toOther());
+		}
+	}
+	*/
+	
+	/*@Test
+	public void testGetConfigStringValidJSON() {
+		eCOMPComponentName = "JSON";
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_RETRIEVED,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertEquals(PolicyType.JSON,policyConfig.getType());
+			assertNotNull(policyConfig.toJSON());
+			assertNull(policyConfig.toProperties());
+			assertNull(policyConfig.toXML());
+			assertNull(policyConfig.toOther());
+		}
+	}
+	*/
+	/*@Test
+	public void testGetConfigStringValidXML() {
+		eCOMPComponentName = "XML";
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_RETRIEVED,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertEquals(PolicyType.XML,policyConfig.getType());
+			assertNull(policyConfig.toJSON());
+			assertNull(policyConfig.toProperties());
+			assertNotNull(policyConfig.toXML());
+			assertNull(policyConfig.toOther());
+		}
+	}
+	*/
+	/*@Test
+	public void testGetConfigStringValidProperties() {
+		eCOMPComponentName = "Properties";
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_RETRIEVED,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertEquals(PolicyType.PROPERTIES,policyConfig.getType());
+			assertNull(policyConfig.toJSON());
+			assertNotNull(policyConfig.toProperties());
+			assertNull(policyConfig.toXML());
+			assertNull(policyConfig.toOther());
+		}
+	}
+	*/
+	/*@Test
+	public void testGetConfigStringValidOther() {
+		eCOMPComponentName = "Other";
+		try {
+			policyConfig = policyEngine.getConfig(eCOMPComponentName);
+		} catch (PolicyConfigException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyConfig policyConfig : this.policyConfig){
+			logger.info(policyConfig.getPolicyConfigMessage() + " , " +policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig);
+			assertEquals(PolicyConfigStatus.CONFIG_RETRIEVED,policyConfig.getPolicyConfigStatus());
+			assertNotNull(policyConfig.getPolicyConfigMessage());
+			assertEquals(PolicyType.OTHER,policyConfig.getType());
+			assertNull(policyConfig.toJSON());
+			assertNull(policyConfig.toProperties());
+			assertNull(policyConfig.toXML());
+			assertNotNull(policyConfig.toOther());
+		}
+	}
+	*/
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ImportParametersTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ImportParametersTest.java
new file mode 100644
index 000000000..f6ceff682
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ImportParametersTest.java
@@ -0,0 +1,464 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.UUID;
+
+import org.junit.*;
+import org.openecomp.policy.api.ImportParameters;
+import org.openecomp.policy.api.ImportParameters.IMPORT_TYPE;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>ImportParametersTest</code> contains tests for the class <code>{@link ImportParameters}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class ImportParametersTest {
+	/**
+	 * Run the String getDescription() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetDescription_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+
+		String result = fixture.getDescription();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getFilePath() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetFilePath_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+
+		String result = fixture.getFilePath();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getImportBody() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetImportBody_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+
+		String result = fixture.getImportBody();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the UUID getRequestID() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetRequestID_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.fromString("731dca0a-fe99-456c-8ad2-87cff8437b2f"));
+		fixture.setDescription("");
+		fixture.setServiceName("");
+
+		UUID result = fixture.getRequestID();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("731dca0a-fe99-456c-8ad2-87cff8437b2f", result.toString());
+		assertEquals(4, result.version());
+		assertEquals(2, result.variant());
+		assertEquals(-8443537024073106641L, result.getLeastSignificantBits());
+		assertEquals(8295008237256263020L, result.getMostSignificantBits());
+	}
+
+	/**
+	 * Run the String getServiceName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetServiceName_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+
+		String result = fixture.getServiceName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the ImportParameters.IMPORT_TYPE getServiceType() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetServiceType_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+
+		ImportParameters.IMPORT_TYPE result = fixture.getServiceType();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("MICROSERVICE", result.name());
+		assertEquals("MICROSERVICE", result.toString());
+		assertEquals(0, result.ordinal());
+	}
+
+	/**
+	 * Run the String getVersion() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetVersion_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+
+		String result = fixture.getVersion();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the void setDescription(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetDescription_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+		String description = "";
+
+		fixture.setDescription(description);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setFilePath(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetFilePath_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+		String filePath = "";
+
+		fixture.setFilePath(filePath);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setImportBody(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetImportBody_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+		String importBody = "";
+
+		fixture.setImportBody(importBody);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setImportParameters(String,String,UUID,String,IMPORT_TYPE,String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetImportParameters_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+		String serviceName = "";
+		String description = "";
+		UUID requestID = UUID.randomUUID();
+		String filePath = "";
+		ImportParameters.IMPORT_TYPE importType = ImportParameters.IMPORT_TYPE.MICROSERVICE;
+		String version = "";
+
+		fixture.setImportParameters(serviceName, description, requestID, filePath, importType, version);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setRequestID(UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetRequestID_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+		UUID requestID = UUID.randomUUID();
+
+		fixture.setRequestID(requestID);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setServiceName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetServiceName_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+		String serviceName = "";
+
+		fixture.setServiceName(serviceName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setServiceType(IMPORT_TYPE) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetServiceType_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+		ImportParameters.IMPORT_TYPE enumImportType = ImportParameters.IMPORT_TYPE.MICROSERVICE;
+
+		fixture.setServiceType(enumImportType);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setVersion(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetVersion_1()
+		throws Exception {
+		ImportParameters fixture = new ImportParameters();
+		fixture.setFilePath("");
+		fixture.setVersion("");
+		fixture.setImportBody("");
+		fixture.setServiceType(ImportParameters.IMPORT_TYPE.MICROSERVICE);
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setDescription("");
+		fixture.setServiceName("");
+		String version = "";
+
+		fixture.setVersion(version);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(ImportParametersTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/LoadedPolicyTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/LoadedPolicyTest.java
new file mode 100644
index 000000000..f750312b1
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/LoadedPolicyTest.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.Map;
+
+import org.junit.*;
+import org.openecomp.policy.api.LoadedPolicy;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>LoadedPolicyTest</code> contains tests for the class <code>{@link LoadedPolicy}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class LoadedPolicyTest {
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(LoadedPolicyTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationHandlerTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationHandlerTest.java
new file mode 100644
index 000000000..fe6b53c0d
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationHandlerTest.java
@@ -0,0 +1,73 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.NotificationHandler;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>NotificationHandlerTest</code> contains tests for the class <code>{@link NotificationHandler}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class NotificationHandlerTest {
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(NotificationHandlerTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationSchemeTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationSchemeTest.java
new file mode 100644
index 000000000..1cb105c2f
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationSchemeTest.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.NotificationScheme;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>NotificationSchemeTest</code> contains tests for the class <code>{@link NotificationScheme}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class NotificationSchemeTest {
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		NotificationScheme fixture = NotificationScheme.AUTO_ALL_NOTIFICATIONS;
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("auto_all_notifications", result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(NotificationSchemeTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationTypeTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationTypeTest.java
new file mode 100644
index 000000000..95dce6a60
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationTypeTest.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.NotificationType;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>NotificationTypeTest</code> contains tests for the class <code>{@link NotificationType}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class NotificationTypeTest {
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		NotificationType fixture = NotificationType.BOTH;
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("both", result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(NotificationTypeTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PDPNotificationTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PDPNotificationTest.java
new file mode 100644
index 000000000..4a7cdf54c
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PDPNotificationTest.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.Collection;
+
+import org.junit.*;
+import org.openecomp.policy.api.PDPNotification;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PDPNotificationTest</code> contains tests for the class <code>{@link PDPNotification}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class PDPNotificationTest {
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PDPNotificationTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyChangeResponseTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyChangeResponseTest.java
new file mode 100644
index 000000000..2c8dc04fc
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyChangeResponseTest.java
@@ -0,0 +1,73 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyChangeResponse;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyChangeResponseTest</code> contains tests for the class <code>{@link PolicyChangeResponse}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyChangeResponseTest {
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyChangeResponseTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyClassTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyClassTest.java
new file mode 100644
index 000000000..28e5beefd
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyClassTest.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyClass;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyClassTest</code> contains tests for the class <code>{@link PolicyClass}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyClassTest {
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		PolicyClass fixture = PolicyClass.Action;
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("Action", result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyClassTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigExceptionTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigExceptionTest.java
new file mode 100644
index 000000000..4134eacc2
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigExceptionTest.java
@@ -0,0 +1,183 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyConfigException;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyConfigExceptionTest</code> contains tests for the class <code>{@link PolicyConfigException}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyConfigExceptionTest {
+	/**
+	 * Run the PolicyConfigException() constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyConfigException_1()
+		throws Exception {
+
+		PolicyConfigException result = new PolicyConfigException();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(null, result.getCause());
+		assertEquals("org.openecomp.policy.api.PolicyConfigException", result.toString());
+		assertEquals(null, result.getLocalizedMessage());
+		assertEquals(null, result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyConfigException(String) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyConfigException_2()
+		throws Exception {
+		String message = "";
+
+		PolicyConfigException result = new PolicyConfigException(message);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(null, result.getCause());
+		assertEquals("org.openecomp.policy.api.PolicyConfigException: ", result.toString());
+		assertEquals("", result.getLocalizedMessage());
+		assertEquals("", result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyConfigException(Throwable) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyConfigException_3()
+		throws Exception {
+		Throwable cause = new Throwable();
+
+		PolicyConfigException result = new PolicyConfigException(cause);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("org.openecomp.policy.api.PolicyConfigException: java.lang.Throwable", result.toString());
+		assertEquals("java.lang.Throwable", result.getLocalizedMessage());
+		assertEquals("java.lang.Throwable", result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyConfigException(String,Throwable) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyConfigException_4()
+		throws Exception {
+		String message = "";
+		Throwable cause = new Throwable();
+
+		PolicyConfigException result = new PolicyConfigException(message, cause);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("org.openecomp.policy.api.PolicyConfigException: ", result.toString());
+		assertEquals("", result.getLocalizedMessage());
+		assertEquals("", result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyConfigException(String,Throwable,boolean,boolean) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyConfigException_5()
+		throws Exception {
+		String message = "";
+		Throwable cause = new Throwable();
+		boolean enableSuppression = true;
+		boolean writableStackTrace = true;
+
+		PolicyConfigException result = new PolicyConfigException(message, cause, enableSuppression, writableStackTrace);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("org.openecomp.policy.api.PolicyConfigException: ", result.toString());
+		assertEquals("", result.getLocalizedMessage());
+		assertEquals("", result.getMessage());
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyConfigExceptionTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigStatusTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigStatusTest.java
new file mode 100644
index 000000000..c40253890
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigStatusTest.java
@@ -0,0 +1,133 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyConfigStatus;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyConfigStatusTest</code> contains tests for the class <code>{@link PolicyConfigStatus}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyConfigStatusTest {
+	/**
+	 * Run the PolicyConfigStatus getStatus(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetStatus_1()
+		throws Exception {
+		String configStatus = "";
+
+		PolicyConfigStatus result = PolicyConfigStatus.getStatus(configStatus);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("not_found", result.toString());
+		assertEquals("CONFIG_NOT_FOUND", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the PolicyConfigStatus getStatus(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetStatus_2()
+		throws Exception {
+		String configStatus = "";
+
+		PolicyConfigStatus result = PolicyConfigStatus.getStatus(configStatus);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("not_found", result.toString());
+		assertEquals("CONFIG_NOT_FOUND", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		PolicyConfigStatus fixture = PolicyConfigStatus.CONFIG_NOT_FOUND;
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("not_found", result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyConfigStatusTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigTest.java
new file mode 100644
index 000000000..cbe11f460
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigTest.java
@@ -0,0 +1,80 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.Map;
+import java.util.Properties;
+
+import javax.json.JsonObject;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyConfig;
+
+import static org.junit.Assert.*;
+
+import org.w3c.dom.Document;
+
+/**
+ * The class <code>PolicyConfigTest</code> contains tests for the class <code>{@link PolicyConfig}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyConfigTest {
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyConfigTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigTypeTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigTypeTest.java
new file mode 100644
index 000000000..cd6c6a977
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigTypeTest.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyConfigType;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyConfigTypeTest</code> contains tests for the class <code>{@link PolicyConfigType}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyConfigTypeTest {
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		PolicyConfigType fixture = PolicyConfigType.BRMS_PARAM;
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("BRMS_Param", result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyConfigTypeTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyDecisionExceptionTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyDecisionExceptionTest.java
new file mode 100644
index 000000000..95dfd7acd
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyDecisionExceptionTest.java
@@ -0,0 +1,183 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyDecisionException;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyDecisionExceptionTest</code> contains tests for the class <code>{@link PolicyDecisionException}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyDecisionExceptionTest {
+	/**
+	 * Run the PolicyDecisionException() constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyDecisionException_1()
+		throws Exception {
+
+		PolicyDecisionException result = new PolicyDecisionException();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(null, result.getCause());
+		assertEquals("org.openecomp.policy.api.PolicyDecisionException", result.toString());
+		assertEquals(null, result.getLocalizedMessage());
+		assertEquals(null, result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyDecisionException(String) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyDecisionException_2()
+		throws Exception {
+		String message = "";
+
+		PolicyDecisionException result = new PolicyDecisionException(message);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(null, result.getCause());
+		assertEquals("org.openecomp.policy.api.PolicyDecisionException: ", result.toString());
+		assertEquals("", result.getLocalizedMessage());
+		assertEquals("", result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyDecisionException(Throwable) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyDecisionException_3()
+		throws Exception {
+		Throwable cause = new Throwable();
+
+		PolicyDecisionException result = new PolicyDecisionException(cause);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("org.openecomp.policy.api.PolicyDecisionException: java.lang.Throwable", result.toString());
+		assertEquals("java.lang.Throwable", result.getLocalizedMessage());
+		assertEquals("java.lang.Throwable", result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyDecisionException(String,Throwable) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyDecisionException_4()
+		throws Exception {
+		String message = "";
+		Throwable cause = new Throwable();
+
+		PolicyDecisionException result = new PolicyDecisionException(message, cause);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("org.openecomp.policy.api.PolicyDecisionException: ", result.toString());
+		assertEquals("", result.getLocalizedMessage());
+		assertEquals("", result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyDecisionException(String,Throwable,boolean,boolean) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyDecisionException_5()
+		throws Exception {
+		String message = "";
+		Throwable cause = new Throwable();
+		boolean enableSuppression = true;
+		boolean writableStackTrace = true;
+
+		PolicyDecisionException result = new PolicyDecisionException(message, cause, enableSuppression, writableStackTrace);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("org.openecomp.policy.api.PolicyDecisionException: ", result.toString());
+		assertEquals("", result.getLocalizedMessage());
+		assertEquals("", result.getMessage());
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyDecisionExceptionTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyDecisionTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyDecisionTest.java
new file mode 100644
index 000000000..12069abeb
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyDecisionTest.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyDecision;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyDecisionTest</code> contains tests for the class <code>{@link PolicyDecision}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyDecisionTest {
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		PolicyDecision fixture = PolicyDecision.DENY;
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("deny", result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyDecisionTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineExceptionTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineExceptionTest.java
new file mode 100644
index 000000000..d21fb12e2
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineExceptionTest.java
@@ -0,0 +1,183 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyEngineException;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyEngineExceptionTest</code> contains tests for the class <code>{@link PolicyEngineException}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyEngineExceptionTest {
+	/**
+	 * Run the PolicyEngineException() constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testPolicyEngineException_1()
+		throws Exception {
+
+		PolicyEngineException result = new PolicyEngineException();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(null, result.getCause());
+		assertEquals("org.openecomp.policy.api.PolicyEngineException", result.toString());
+		assertEquals(null, result.getLocalizedMessage());
+		assertEquals(null, result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyEngineException(String) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testPolicyEngineException_2()
+		throws Exception {
+		String message = "";
+
+		PolicyEngineException result = new PolicyEngineException(message);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(null, result.getCause());
+		assertEquals("org.openecomp.policy.api.PolicyEngineException: ", result.toString());
+		assertEquals("", result.getLocalizedMessage());
+		assertEquals("", result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyEngineException(Throwable) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testPolicyEngineException_3()
+		throws Exception {
+		Throwable cause = new Throwable();
+
+		PolicyEngineException result = new PolicyEngineException(cause);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("org.openecomp.policy.api.PolicyEngineException: java.lang.Throwable", result.toString());
+		assertEquals("java.lang.Throwable", result.getLocalizedMessage());
+		assertEquals("java.lang.Throwable", result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyEngineException(String,Throwable) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testPolicyEngineException_4()
+		throws Exception {
+		String message = "";
+		Throwable cause = new Throwable();
+
+		PolicyEngineException result = new PolicyEngineException(message, cause);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("org.openecomp.policy.api.PolicyEngineException: ", result.toString());
+		assertEquals("", result.getLocalizedMessage());
+		assertEquals("", result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyEngineException(String,Throwable,boolean,boolean) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testPolicyEngineException_5()
+		throws Exception {
+		String message = "";
+		Throwable cause = new Throwable();
+		boolean enableSuppression = true;
+		boolean writableStackTrace = true;
+
+		PolicyEngineException result = new PolicyEngineException(message, cause, enableSuppression, writableStackTrace);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("org.openecomp.policy.api.PolicyEngineException: ", result.toString());
+		assertEquals("", result.getLocalizedMessage());
+		assertEquals("", result.getMessage());
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyEngineExceptionTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineInterfaceTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineInterfaceTest.java
new file mode 100644
index 000000000..51a3c20f8
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineInterfaceTest.java
@@ -0,0 +1,672 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.io.StringReader;
+import java.net.HttpURLConnection;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
+
+import junit.framework.TestCase;
+
+import org.mockito.Mockito;
+import org.openecomp.policy.api.AttributeType;
+import org.openecomp.policy.api.ConfigRequestParameters;
+import org.openecomp.policy.api.DecisionRequestParameters;
+import org.openecomp.policy.api.DecisionResponse;
+import org.openecomp.policy.api.DeletePolicyCondition;
+import org.openecomp.policy.api.DeletePolicyParameters;
+import org.openecomp.policy.api.EventRequestParameters;
+import org.openecomp.policy.api.ImportParameters;
+import org.openecomp.policy.api.NotificationHandler;
+import org.openecomp.policy.api.NotificationScheme;
+import org.openecomp.policy.api.PDPNotification;
+import org.openecomp.policy.api.PolicyChangeResponse;
+import org.openecomp.policy.api.PolicyClass;
+import org.openecomp.policy.api.PolicyConfig;
+import org.openecomp.policy.api.PolicyConfigException;
+import org.openecomp.policy.api.PolicyDecision;
+import org.openecomp.policy.api.PolicyDecisionException;
+import org.openecomp.policy.api.PolicyEngine;
+import org.openecomp.policy.api.PolicyEngineException;
+import org.openecomp.policy.api.PolicyEventException;
+import org.openecomp.policy.api.PolicyParameters;
+import org.openecomp.policy.api.PolicyResponse;
+import org.openecomp.policy.api.PushPolicyParameters;
+import org.openecomp.policy.api.ImportParameters.IMPORT_TYPE;
+import org.openecomp.policy.std.StdPDPNotification;
+import org.openecomp.policy.std.StdPolicyChangeResponse;
+import org.openecomp.policy.std.StdPolicyEngine;
+import org.openecomp.policy.std.StdPolicyResponse;
+
+import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+
+import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
+import org.openecomp.policy.common.logging.flexlogger.Logger;
+
+/**
+ * The class <code>PolicyEngineInterfaceTest</code> contains tests for the
+ * class {@link <code>PolicyEngine</code>}
+ *
+ * @pattern JUnit Test Case
+ *
+ * @generatedBy CodePro at 5/27/16 10:33 AM
+ *
+ *
+ * @version $Revision$
+ */
+public class PolicyEngineInterfaceTest extends TestCase {
+
+	private static final Logger logger = FlexLogger.getLogger(PolicyEngineInterfaceTest.class);
+
+	private PolicyEngine policyEngine = null;
+	private StdPolicyEngine stdPolicyEngine = null;
+	private PolicyEngine mockPolicyEngine = null;
+	private Collection<PolicyConfig> policyConfig = null;
+	private UUID requestID = UUID.randomUUID();
+
+
+	PolicyChangeResponse result = null;
+	StdPolicyChangeResponse response = new StdPolicyChangeResponse();
+	
+	
+	/**
+	 * Construct new test instance
+	 *
+	 * @param name the test name
+	 */
+	public PolicyEngineInterfaceTest(String name) {
+		super(name);
+	}
+
+	/**
+	 * Perform pre-test initialization
+	 *
+	 * @throws Exception
+	 *
+	 * @see TestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+		try {
+			policyEngine = new PolicyEngine("Test/config_pass.properties");
+		} catch (PolicyEngineException e) {
+			logger.error(e.getMessage());
+			fail("PolicyEngine Instantiation Error" + e);
+		}
+		logger.info("Loaded.. PolicyEngine");
+		
+		mockPolicyEngine = Mockito.mock(PolicyEngine.class);
+		HttpURLConnection conn = Mockito.mock(HttpURLConnection.class);
+		Mockito.when(conn.getResponseCode()).thenReturn(HttpURLConnection.HTTP_OK);
+
+	}
+
+	/**
+	 * Perform post-test clean up
+	 *
+	 * @throws Exception
+	 *
+	 * @see TestCase#tearDown()
+	 */
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Run the Collection<PolicyConfig> getConfigByPolicyName(String) method
+	 * test
+	 */
+	public void testGetConfigByPolicyName() {
+		String policyName = null;
+		try{
+			policyConfig = policyEngine.getConfigByPolicyName(policyName);
+		} catch (PolicyConfigException e){
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	public void testGetConfigByPolicyName2() {
+		String policyName = null;
+		
+		try{
+			policyConfig = policyEngine.getConfigByPolicyName(policyName, requestID);
+		} catch (PolicyConfigException e){
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+
+	/**
+	 * Run the Collection<PolicyConfig> getConfig(String) method test
+	 */
+	public void testGetConfig() {
+		String ecompName = null;
+		
+		try{
+			policyConfig = policyEngine.getConfig(ecompName);
+		} catch (PolicyConfigException e){
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	public void testGetConfig2() {
+		String ecompName = null;
+
+		try{
+			policyConfig = policyEngine.getConfig(ecompName,requestID);
+		} catch (PolicyConfigException e){
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+
+	
+	public void testGetConfig3() {
+		String ecompName = null;
+		String configName = null;
+
+		try{
+			policyConfig = policyEngine.getConfig(ecompName,configName,requestID);
+		} catch (PolicyConfigException e){
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+
+	public void testGetConfig4() {
+		String ecompName = null;
+		String configName = null;
+		Map<String,String> configAttributes = null;
+		
+		try{
+			policyConfig = policyEngine.getConfig(ecompName,configName,configAttributes);
+		} catch (PolicyConfigException e){
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	public void testGetConfig5() {
+		String ecompName = null;
+		String configName = null;
+		Map<String,String> configAttributes = null;
+		
+		try{
+			policyConfig = policyEngine.getConfig(ecompName,configName,configAttributes,requestID);
+		} catch (PolicyConfigException e){
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+	
+	public void testGetConfig6() {
+		ConfigRequestParameters parameters = new ConfigRequestParameters();
+		
+		try{
+			policyConfig = policyEngine.getConfig(parameters);
+		} catch (PolicyConfigException e){
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyConfig);
+	}
+
+
+	/**
+	 * Run the Collection<PolicyResponse> sendEvent(Map<String,String>) method
+	 * test
+	 */
+	public void testSendEvent()
+	{
+		Collection<PolicyResponse> result = null;
+		Collection<StdPolicyResponse> response = null;
+		Map<String,String> eventAttributes = null;
+		
+		try {
+			Mockito.when(mockPolicyEngine.sendEvent(eventAttributes)).thenReturn(result);
+			result = mockPolicyEngine.sendEvent(eventAttributes);
+		} catch (PolicyEventException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		
+		assertEquals(result,response);
+	
+	}
+	
+	public void testSendEvent2()
+	{
+		Collection<PolicyResponse> result = null;
+		Collection<StdPolicyResponse> response = null;
+		Map<String,String> eventAttributes = null;
+		
+		try {
+			Mockito.when(mockPolicyEngine.sendEvent(eventAttributes,requestID)).thenReturn(result);
+			result = mockPolicyEngine.sendEvent(eventAttributes,requestID);
+		} catch (PolicyEventException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		
+		assertEquals(result,response);
+	
+	}
+	
+	public void testSendEvent3()
+	{
+		Collection<PolicyResponse> result = null;
+		Collection<StdPolicyResponse> response = null;
+		EventRequestParameters parameters = new EventRequestParameters();
+		
+		try {
+			Mockito.when(mockPolicyEngine.sendEvent(parameters)).thenReturn(result);
+			result = mockPolicyEngine.sendEvent(parameters);
+		} catch (PolicyEventException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		assertEquals(result,response);
+	
+	}
+	
+	
+	
+	/**
+	 * Run the PolicyDecision getDecision(String, Map<String,String>) method
+	 * test
+	 */
+	public void testGetDecision()
+	{
+		String eCOMPComponentName = null;
+		Map<String,String> decisionAttributes = null;
+		
+		DecisionResponse result = null;
+		
+		try {
+			Mockito.when(mockPolicyEngine.getDecision(eCOMPComponentName,decisionAttributes)).thenReturn(null);
+			result = mockPolicyEngine.getDecision(eCOMPComponentName,decisionAttributes);
+		} catch (PolicyDecisionException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		assertEquals(result,null);
+	}
+	
+	public void testGetDecision2()
+	{
+		String eCOMPComponentName = null;
+		Map<String,String> decisionAttributes = null;
+		
+		DecisionResponse result = null;
+		
+		try {	
+			Mockito.when(mockPolicyEngine.getDecision(eCOMPComponentName,decisionAttributes,requestID)).thenReturn(null);
+			result = mockPolicyEngine.getDecision(eCOMPComponentName,decisionAttributes);
+		} catch (PolicyDecisionException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		assertEquals(result,null);
+	}
+	
+	public void testGetDecision3()
+	{
+		DecisionRequestParameters parameters = new DecisionRequestParameters();
+		DecisionResponse result = null;
+		
+		try {
+			Mockito.when(mockPolicyEngine.getDecision(parameters)).thenReturn(null);
+			result = mockPolicyEngine.getDecision(parameters);
+		} catch (PolicyDecisionException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		assertEquals(result,null);
+	}
+	
+	/**
+	 * Run the void setNotification(NotificationScheme, NotificationHandler)
+	 * method test
+	 */
+	public void testSetNotification() {
+		// add test code here
+		
+		NotificationScheme scheme = null;
+		NotificationHandler handler = null;
+
+		Mockito.doNothing().when(mockPolicyEngine).setNotification(scheme, handler);
+		mockPolicyEngine.setNotification(scheme, handler);
+		//assertTrue(true);
+	}
+
+	/**
+	 * Run the void clearNotification() method test
+	 */
+	public void testClearNotification() {
+		// add test code here
+
+		Mockito.doNothing().when(mockPolicyEngine).clearNotification();
+		mockPolicyEngine.clearNotification();
+		//assertTrue(true);
+	}
+
+	/**
+	 * Run the void setScheme(NotificationScheme) method test
+	 */
+	public void testSetScheme() {
+		NotificationScheme scheme = null;
+		
+		Mockito.doNothing().when(mockPolicyEngine).setScheme(scheme);
+		mockPolicyEngine.setScheme(scheme);
+		//assertTrue(true);
+	}
+
+	/**
+	 * Run the PDPNotification getNotification() method test
+	 */
+	public void testGetNotification() {
+		PDPNotification result = null;
+		StdPDPNotification response = null;
+		Mockito.when(mockPolicyEngine.getNotification()).thenReturn(response);
+		result = mockPolicyEngine.getNotification();
+		
+		assertEquals(result,response);
+	}
+
+	/**
+	 * Run the String createConfigPolicy(String, String, String, String,
+	 * Map<String,String>, String, String, String, UUID) method test
+	 */
+	@SuppressWarnings("deprecation")
+	public void testCreateConfigPolicy()
+	{
+		String response = "success";
+		String result = null;
+		try {
+		
+			Mockito.when(mockPolicyEngine.createConfigPolicy("testPolicy","test","test","testConfig",null,"OTHER","test","test",null, null, null, null, null)).thenReturn(response);
+			result = mockPolicyEngine.createConfigPolicy("testPolicy","test","test","testConfig",null,"OTHER","test","test",null, null, null, null, null);
+
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+	
+	/**
+	 * Run the String updateConfigPolicy(String, String, String, String,
+	 * Map<String,String>, String, String, String, UUID) method test
+	 */
+	@SuppressWarnings("deprecation")
+	public void testUpdateConfigPolicy()
+	{
+		String response = "success";
+		String result = null;
+		try {
+		
+			Mockito.when(mockPolicyEngine.updateConfigPolicy("testPolicy","test","test","testConfig",null,"OTHER","test","test",null, null, null, null, null)).thenReturn(response);
+			result = mockPolicyEngine.updateConfigPolicy("testPolicy","test","test","testConfig",null,"OTHER","test","test",null, null, null, null, null);
+
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+	
+	/**
+	 * Run the String createConfigFirewallPolicy(String, JsonObject, String,
+	 * UUID) method test
+	 */
+	@SuppressWarnings("deprecation")
+	public void testCreateConfigFirewallPolicy() {
+		String response = "success";
+		String result = null;
+        String json = "{\"serviceTypeId\":\"/v0/firewall/pan\",\"configName\":\"rule1607\",\"deploymentOption\":{\"deployNow\":false},\"securityZoneId\":\"/v0/firewall/pan\",\"serviceGroups\":[{\"name\":\"1607Group\",\"description\":null,\"members\":[{\"type\":\"REFERENCE\",\"name\":\"SList\"},{\"type\":\"REFERENCE\",\"name\":\"Syslog\"}]},{\"name\":\"Syslog\",\"description\":\"NA\",\"type\":\"SERVICE\",\"transportProtocol\":\"udp\",\"appProtocol\":null,\"ports\":\"514\"},{\"name\":\"SList\",\"description\":\"Service List\",\"type\":\"SERVICE\",\"transportProtocol\":\"tcp\",\"appProtocol\":null,\"ports\":\"8080\"}],\"addressGroups\":[{\"name\":\"1607Group\",\"description\":null,\"members\":[{\"type\":\"SUBNET\",\"value\":\"10.11.12.13/14\"},{\"type\":\"SUBNET\",\"value\":\"10.11.12.13/14\"}]},{\"name\":\"PL_CCE3\",\"description\":\"CCE Routers\",\"members\":[{\"type\":\"SUBNET\",\"value\":\"10.11.12.13/14\"}]}],\"firewallRuleList\":[{\"position\":\"1\",\"ruleName\":\"1607Rule\",\"fromZones\":[\"Trusted\"],\"toZones\":[\"Untrusted\"],\"negateSource\":false,\"negateDestination\":false,\"sourceList\":[{\"type\":\"REFERENCE\",\"value\":\"PL_CCE3\"},{\"type\":\"REFERENCE\",\"value\":\"1607Group\"}],\"destinationList\":[{\"type\":\"REFERENCE\",\"value\":\"1607Group\"}],\"sourceServices\":[],\"destServices\":[{\"type\":\"REFERENCE\",\"name\":\"1607Group\"}],\"action\":\"accept\",\"description\":\"Rule for 1607 templates\",\"enabled\":true,\"log\":true}]}";
+		JsonObject jsonObj = buildJSON(json);
+		try {
+		
+			Mockito.when(mockPolicyEngine.createConfigFirewallPolicy("testPolicy",jsonObj, "test", null, null, null, null, null)).thenReturn(response);
+			result = mockPolicyEngine.createConfigFirewallPolicy("testPolicy",jsonObj, "test", null, null, null, null, null);
+
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+
+	/**
+	 * Run the String updateConfigFirewallPolicy(String, JsonObject, String,
+	 * UUID) method test
+	 */
+	@SuppressWarnings("deprecation")
+	public void testUpdateConfigFirewallPolicy() {
+		String response = "success";
+		String result = null;
+        String json = "{\"serviceTypeId\":\"/v0/firewall/pan\",\"configName\":\"rule1607\",\"deploymentOption\":{\"deployNow\":false},\"securityZoneId\":\"/v0/firewall/pan\",\"serviceGroups\":[{\"name\":\"1607Group\",\"description\":null,\"members\":[{\"type\":\"REFERENCE\",\"name\":\"SList\"},{\"type\":\"REFERENCE\",\"name\":\"Syslog\"}]},{\"name\":\"Syslog\",\"description\":\"NA\",\"type\":\"SERVICE\",\"transportProtocol\":\"udp\",\"appProtocol\":null,\"ports\":\"514\"},{\"name\":\"SList\",\"description\":\"Service List\",\"type\":\"SERVICE\",\"transportProtocol\":\"tcp\",\"appProtocol\":null,\"ports\":\"8080\"}],\"addressGroups\":[{\"name\":\"1607Group\",\"description\":null,\"members\":[{\"type\":\"SUBNET\",\"value\":\"10.11.12.13/14\"},{\"type\":\"SUBNET\",\"value\":\"10.11.12.13/14\"}]},{\"name\":\"PL_CCE3\",\"description\":\"CCE Routers\",\"members\":[{\"type\":\"SUBNET\",\"value\":\"10.11.12.13/14\"}]}],\"firewallRuleList\":[{\"position\":\"1\",\"ruleName\":\"1607Rule\",\"fromZones\":[\"Trusted\"],\"toZones\":[\"Untrusted\"],\"negateSource\":false,\"negateDestination\":false,\"sourceList\":[{\"type\":\"REFERENCE\",\"value\":\"PL_CCE3\"},{\"type\":\"REFERENCE\",\"value\":\"1607Group\"}],\"destinationList\":[{\"type\":\"REFERENCE\",\"value\":\"1607Group\"}],\"sourceServices\":[],\"destServices\":[{\"type\":\"REFERENCE\",\"name\":\"1607Group\"}],\"action\":\"accept\",\"description\":\"Rule for 1607 templates\",\"enabled\":true,\"log\":true}]}";
+		JsonObject jsonObj = buildJSON(json);
+		try {
+		
+			Mockito.when(mockPolicyEngine.updateConfigFirewallPolicy("testPolicy",jsonObj, "test", null, null, null, null, null)).thenReturn(response);
+			result = mockPolicyEngine.updateConfigFirewallPolicy("testPolicy",jsonObj, "test", null, null, null, null, null);
+
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+
+	/**
+	 * Run the PolicyChangeResponse createPolicy(PolicyParameters) method test
+	 */
+	public void testCreatePolicy() {
+		response.setResponseMessage("success");
+		String callPapResponse = "success";
+		PolicyChangeResponse result = null;
+		PolicyParameters policyParameters = new PolicyParameters();
+		StdPAPPolicy newPAPPolicy = null;
+
+        policyParameters.setPolicyClass(PolicyClass.Action); //required
+        policyParameters.setPolicyName("test.junitTest"); //required
+        policyParameters.setPolicyDescription("testing");  //optional
+        
+        //Set the Component Attributes... These are Optional
+        Map<String, String> configAttributes = new HashMap<String, String>(); 
+        configAttributes.put("test", "testing");
+        
+        Map<AttributeType, Map<String,String>> attributes = new HashMap<AttributeType, Map<String,String>>();
+        attributes.put(AttributeType.MATCHING, configAttributes);
+        policyParameters.setAttributes(attributes);
+		
+        policyParameters.setActionPerformer("PEP");
+        policyParameters.setActionAttribute("testing");
+        policyParameters.setRequestID(UUID.randomUUID());
+		
+		try {
+			
+			//stdPolicyEngine = Mockito.mock(StdPolicyEngine.class);
+			//Mockito.when(stdPolicyEngine.callPAP(newPAPPolicy, new String[] {"operation=create", "apiflag=api", "policyType=Action"}, null, "Action")).thenReturn(callPapResponse);
+			Mockito.when(mockPolicyEngine.createPolicy(policyParameters)).thenReturn(response);
+			result = mockPolicyEngine.createPolicy(policyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+			e.printStackTrace();
+		}
+		assertEquals(result, response);
+	}
+
+	/**
+	 * Run the PolicyChangeResponse updatePolicy(PolicyParameters) method test
+	 */
+	public void testUpdatePolicy() {
+		response.setResponseMessage("success");
+		PolicyChangeResponse result = null;
+		PolicyParameters policyParameters = new PolicyParameters();
+
+        policyParameters.setPolicyClass(PolicyClass.Action); //required
+        policyParameters.setPolicyName("test.junitTest"); //required
+        policyParameters.setPolicyDescription("testing");  //optional
+        
+        //Set the Component Attributes... These are Optional
+        Map<String, String> configAttributes = new HashMap<String, String>(); 
+        configAttributes.put("test", "testing");
+        
+        Map<AttributeType, Map<String,String>> attributes = new HashMap<AttributeType, Map<String,String>>();
+        attributes.put(AttributeType.MATCHING, configAttributes);
+        policyParameters.setAttributes(attributes);
+		
+        policyParameters.setActionPerformer("PEP");
+        policyParameters.setActionAttribute("testing");
+        policyParameters.setRequestID(UUID.randomUUID());
+		
+		try {
+		
+			Mockito.when(mockPolicyEngine.updatePolicy(policyParameters)).thenReturn(response);
+			result = mockPolicyEngine.updatePolicy(policyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		assertEquals(result, response);
+	}
+
+	/**
+	 * Run the String pushPolicy(String, String, String, String, UUID) method
+	 * test
+	 */
+	public void testPushPolicy() {
+		String response = "Success";
+		String result = null;
+		try {
+			
+			Mockito.when(mockPolicyEngine.pushPolicy("testing","test","Base","default",requestID)).thenReturn(response);
+			result = mockPolicyEngine.pushPolicy("testing","test","Base","default",requestID);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		
+		assertEquals(result, response);
+	}
+
+	public void testPushPolicy2() {
+		PushPolicyParameters policyParameters = new PushPolicyParameters();
+		PolicyChangeResponse result = null;
+		
+		//String policyScope = null;
+		policyParameters.setPolicyName("test.junitTest");
+		policyParameters.setPolicyType("Action");
+		policyParameters.setPdpGroup("Default");
+		
+		try {
+			
+			Mockito.when(mockPolicyEngine.pushPolicy(policyParameters)).thenReturn(response);
+			result = mockPolicyEngine.pushPolicy(policyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		
+		assertEquals(result, response);
+	}
+
+	/**
+	 * Run the PolicyChangeResponse deletePolicy(DeletePolicyParameters) method
+	 * test
+	 */
+	public void testDeletePolicy() {
+		DeletePolicyParameters policyParameters = new DeletePolicyParameters();
+		PolicyChangeResponse result = null;
+		
+		//String policyScope = null;
+		policyParameters.setPolicyName("test.junitTest.1.xml");
+		policyParameters.setDeleteCondition(DeletePolicyCondition.ALL);
+		policyParameters.setPolicyComponent("PAP");
+		policyParameters.setPdpGroup("Default");
+		
+		try {
+			
+			Mockito.when(mockPolicyEngine.deletePolicy(policyParameters)).thenReturn(response);
+			result = mockPolicyEngine.deletePolicy(policyParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		
+		assertEquals(result, response);
+	}
+
+	/**
+	 * Run the PolicyChangeResponse policyEngineImport(ImportParameters) method
+	 * test
+	 */
+	public void testPolicyEngineImport() {
+		ImportParameters importParameters = new ImportParameters();
+		PolicyChangeResponse result = null;
+		
+        importParameters.setFilePath("C:\\Workspaces\\models\\TestingModel\\ControllerServiceSampleSdnlServiceInstance-v0.1.0-SNAPSHOT.zip");
+        importParameters.setServiceName("ControllerServiceSampleSdnlServiceInstance");
+  	  	
+        importParameters.setRequestID(UUID.randomUUID());
+        importParameters.setServiceType(IMPORT_TYPE.MICROSERVICE);
+        importParameters.setVersion("1607-2");
+
+		
+		try {
+			
+			Mockito.when(mockPolicyEngine.policyEngineImport(importParameters)).thenReturn(response);
+			result = mockPolicyEngine.policyEngineImport(importParameters);
+			
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		
+		assertEquals(result, response);
+	}
+	
+    private static JsonObject buildJSON(String jsonString) {
+        JsonObject json = null;;
+        if (jsonString != null) {
+            StringReader in = null;
+             
+            in = new StringReader(jsonString);
+             
+            JsonReader jsonReader = Json.createReader(in);
+            json = jsonReader.readObject();        
+        } 
+        
+        return json;
+    }
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineTest.java
new file mode 100644
index 000000000..e2d7c7879
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineTest.java
@@ -0,0 +1,172 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
+import org.openecomp.policy.api.NotificationScheme;
+import org.openecomp.policy.api.PolicyEngine;
+import org.openecomp.policy.api.PolicyEngineException;
+
+import org.openecomp.policy.common.logging.flexlogger.*; 
+
+public class PolicyEngineTest {
+
+	private static final Logger logger = FlexLogger.getLogger(PolicyEngineTest.class);
+	private PolicyEngine policyEngine = null;
+	private String filePath = null;
+	
+	@Test
+	public void testPolicyEngineForFail() {
+		filePath = null;
+		try {
+			policyEngine = new PolicyEngine(filePath);
+		} catch (PolicyEngineException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyEngine);
+		// Test even for this case.
+		filePath = "NotNull";
+		try {
+			policyEngine = new PolicyEngine(filePath);
+		} catch (PolicyEngineException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyEngine);
+	}
+	
+	@Test
+	public void testPolicyEngineforPropertyFileError() {
+		filePath = "Test/config_error.property";
+		isFileAvailable(filePath);
+		try {
+			policyEngine = new PolicyEngine(filePath);
+		} catch (PolicyEngineException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyEngine);
+	}
+	
+	@Test
+	public void testPolicyEngineforPDPURLError() {
+		String filePath = "Test/config_fail.properties";
+		isFileAvailable(filePath);
+		try {
+			policyEngine = new PolicyEngine(filePath);
+		} catch (PolicyEngineException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyEngine);
+	}
+	
+	@Test
+	public void testPolicyEngineForPass() {
+		String filePath = "Test/config_pass.properties";
+		isFileAvailable(filePath);
+		try {
+			policyEngine = new PolicyEngine(filePath);
+		} catch (PolicyEngineException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNotNull(policyEngine);
+	}
+	
+	@Test
+	public void testPolicyEngineForUEBPass() {
+		String filePath = "Test/config_UEB_pass.properties";
+		isFileAvailable(filePath);
+		try {
+			policyEngine = new PolicyEngine(filePath);
+		} catch (PolicyEngineException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNotNull(policyEngine);
+	}
+	
+	
+	@Test
+	public void testPolicyEngineForUEBBadType() {
+		String filePath = "Test/config_UEB_bad_type.properties";
+		isFileAvailable(filePath);
+		try {
+			policyEngine = new PolicyEngine(filePath);
+		} catch (PolicyEngineException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNotNull(policyEngine);
+	}
+	
+	@Test
+	public void testPolicyEngineForUEBBadServerType() {
+		String filePath = "Test/config_UEB_badservers.properties";
+		isFileAvailable(filePath);
+		try {
+			policyEngine = new PolicyEngine(filePath);
+		} catch (PolicyEngineException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNotNull(policyEngine);
+	}
+	
+	@Test
+	public void testPolicyEngineNotficationAutoUEB() {
+		String filePath = "Test/config_UEB_pass.properties";
+		isFileAvailable(filePath);
+		try {
+			policyEngine = new PolicyEngine(filePath);
+			policyEngine.setScheme(NotificationScheme.AUTO_ALL_NOTIFICATIONS);
+		} catch (PolicyEngineException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNotNull(policyEngine);
+	}
+	
+	@Test
+	public void testPolicyEngineNotficationAuto() {
+		String filePath = "Test/config_pass.properties";
+		isFileAvailable(filePath);
+		try {
+			policyEngine = new PolicyEngine(filePath);
+			policyEngine.setScheme(NotificationScheme.AUTO_ALL_NOTIFICATIONS);
+			//policyEngine.getNotification();
+		} catch (PolicyEngineException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNotNull(policyEngine);
+	}
+
+	public void isFileAvailable(String filePath) {
+		Path file = Paths.get(filePath);
+		if (Files.notExists(file)) {
+			logger.error("File Doesn't Exist "+ file.toString());
+			fail("File: " +filePath + " Not found");
+		}
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEventExceptionTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEventExceptionTest.java
new file mode 100644
index 000000000..fa8d5d1d8
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEventExceptionTest.java
@@ -0,0 +1,183 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyEventException;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyEventExceptionTest</code> contains tests for the class <code>{@link PolicyEventException}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyEventExceptionTest {
+	/**
+	 * Run the PolicyEventException() constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyEventException_1()
+		throws Exception {
+
+		PolicyEventException result = new PolicyEventException();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(null, result.getCause());
+		assertEquals("org.openecomp.policy.api.PolicyEventException", result.toString());
+		assertEquals(null, result.getLocalizedMessage());
+		assertEquals(null, result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyEventException(String) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyEventException_2()
+		throws Exception {
+		String message = "";
+
+		PolicyEventException result = new PolicyEventException(message);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(null, result.getCause());
+		assertEquals("org.openecomp.policy.api.PolicyEventException: ", result.toString());
+		assertEquals("", result.getLocalizedMessage());
+		assertEquals("", result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyEventException(Throwable) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyEventException_3()
+		throws Exception {
+		Throwable cause = new Throwable();
+
+		PolicyEventException result = new PolicyEventException(cause);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("org.openecomp.policy.api.PolicyEventException: java.lang.Throwable", result.toString());
+		assertEquals("java.lang.Throwable", result.getLocalizedMessage());
+		assertEquals("java.lang.Throwable", result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyEventException(String,Throwable) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyEventException_4()
+		throws Exception {
+		String message = "";
+		Throwable cause = new Throwable();
+
+		PolicyEventException result = new PolicyEventException(message, cause);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("org.openecomp.policy.api.PolicyEventException: ", result.toString());
+		assertEquals("", result.getLocalizedMessage());
+		assertEquals("", result.getMessage());
+	}
+
+	/**
+	 * Run the PolicyEventException(String,Throwable,boolean,boolean) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPolicyEventException_5()
+		throws Exception {
+		String message = "";
+		Throwable cause = new Throwable();
+		boolean enableSuppression = true;
+		boolean writableStackTrace = true;
+
+		PolicyEventException result = new PolicyEventException(message, cause, enableSuppression, writableStackTrace);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("org.openecomp.policy.api.PolicyEventException: ", result.toString());
+		assertEquals("", result.getLocalizedMessage());
+		assertEquals("", result.getMessage());
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyEventExceptionTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyParametersTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyParametersTest.java
new file mode 100644
index 000000000..ca272c786
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyParametersTest.java
@@ -0,0 +1,1406 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.junit.*;
+import org.openecomp.policy.api.AttributeType;
+import org.openecomp.policy.api.PolicyClass;
+import org.openecomp.policy.api.PolicyConfigType;
+import org.openecomp.policy.api.PolicyParameters;
+import org.openecomp.policy.api.PolicyType;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyParametersTest</code> contains tests for the class <code>{@link PolicyParameters}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyParametersTest {
+	/**
+	 * Run the String getActionAttribute() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetActionAttribute_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		String result = fixture.getActionAttribute();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getActionPerformer() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetActionPerformer_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		String result = fixture.getActionPerformer();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the Map<AttributeType, Map<String, String>> getAttributes() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetAttributes_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		Map<AttributeType, Map<String, String>> result = fixture.getAttributes();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the String getConfigBody() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetConfigBody_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		String result = fixture.getConfigBody();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the PolicyType getConfigBodyType() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetConfigBodyType_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		PolicyType result = fixture.getConfigBodyType();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("json", result.toString());
+		assertEquals("JSON", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the String getConfigName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetConfigName_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		String result = fixture.getConfigName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the List<String> getDynamicRuleAlgorithmField1() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetDynamicRuleAlgorithmField1_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		List<String> result = fixture.getDynamicRuleAlgorithmField1();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the List<String> getDynamicRuleAlgorithmField2() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetDynamicRuleAlgorithmField2_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		List<String> result = fixture.getDynamicRuleAlgorithmField2();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the List<String> getDynamicRuleAlgorithmFunctions() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetDynamicRuleAlgorithmFunctions_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		List<String> result = fixture.getDynamicRuleAlgorithmFunctions();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the List<String> getDynamicRuleAlgorithmLabels() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetDynamicRuleAlgorithmLabels_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		List<String> result = fixture.getDynamicRuleAlgorithmLabels();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(0, result.size());
+	}
+
+	/**
+	 * Run the String getEcompName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetEcompName_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		String result = fixture.getEcompName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the PolicyClass getPolicyClass() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetPolicyClass_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		PolicyClass result = fixture.getPolicyClass();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("Action", result.toString());
+		assertEquals("Action", result.name());
+		assertEquals(1, result.ordinal());
+	}
+
+	/**
+	 * Run the PolicyConfigType getPolicyConfigType() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetPolicyConfigType_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		PolicyConfigType result = fixture.getPolicyConfigType();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("BRMS_Param", result.toString());
+		assertEquals("BRMS_PARAM", result.name());
+		assertEquals(5, result.ordinal());
+	}
+
+	/**
+	 * Run the String getPolicyDescription() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetPolicyDescription_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		String result = fixture.getPolicyDescription();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetPolicyName_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPriority() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetPriority_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		String result = fixture.getPriority();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the UUID getRequestID() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetRequestID_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.fromString("878d319c-2799-4684-b480-99f40e1042b2"));
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+
+		UUID result = fixture.getRequestID();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("878d319c-2799-4684-b480-99f40e1042b2", result.toString());
+		assertEquals(4, result.version());
+		assertEquals(2, result.variant());
+		assertEquals(-5440179076376542542L, result.getLeastSignificantBits());
+		assertEquals(-8679226360124062076L, result.getMostSignificantBits());
+	}
+
+	/**
+	 * Run the void setActionAttribute(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetActionAttribute_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		String actionAttribute = "";
+
+		fixture.setActionAttribute(actionAttribute);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setActionPerformer(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetActionPerformer_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		String actionPerformer = "";
+
+		fixture.setActionPerformer(actionPerformer);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setAttributes(Map<AttributeType,Map<String,String>>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetAttributes_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		Map<AttributeType, Map<String, String>> attributes = new Hashtable();
+
+		fixture.setAttributes(attributes);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setConfigBody(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetConfigBody_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		String configBody = "";
+
+		fixture.setConfigBody(configBody);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setConfigBodyType(PolicyType) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetConfigBodyType_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		PolicyType configBodyType = PolicyType.JSON;
+
+		fixture.setConfigBodyType(configBodyType);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setConfigFirewallPolicyParameters(String,String,UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetConfigFirewallPolicyParameters_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		String policyName = "";
+		String firewallJson = "";
+		UUID requestID = UUID.randomUUID();
+
+		fixture.setConfigFirewallPolicyParameters(policyName, firewallJson, requestID);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setConfigName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetConfigName_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		String configName = "";
+
+		fixture.setConfigName(configName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setConfigPolicyParameters(PolicyConfigType,String,String,String,String,Map<AttributeType,Map<String,String>>,PolicyType,String,UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetConfigPolicyParameters_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		PolicyConfigType policyConfigType = PolicyConfigType.BRMS_PARAM;
+		String policyName = "";
+		String policyDescription = "";
+		String ecompName = "";
+		String configName = "";
+		Map<AttributeType, Map<String, String>> attributes = new Hashtable();
+		PolicyType configBodyType = PolicyType.JSON;
+		String configBody = "";
+		UUID requestID = UUID.randomUUID();
+
+		fixture.setConfigPolicyParameters(policyConfigType, policyName, policyDescription, ecompName, configName, attributes, configBodyType, configBody, requestID);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setDynamicRuleAlgorithmField1(List<String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetDynamicRuleAlgorithmField1_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		List<String> dynamicRuleAlgorithmField1 = new LinkedList();
+
+		fixture.setDynamicRuleAlgorithmField1(dynamicRuleAlgorithmField1);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setDynamicRuleAlgorithmField2(List<String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetDynamicRuleAlgorithmField2_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		List<String> dynamicRuleAlgorithmField2 = new LinkedList();
+
+		fixture.setDynamicRuleAlgorithmField2(dynamicRuleAlgorithmField2);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setDynamicRuleAlgorithmFunctions(List<String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetDynamicRuleAlgorithmFunctions_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		List<String> dynamicRuleAlgorithmFunctions = new LinkedList();
+
+		fixture.setDynamicRuleAlgorithmFunctions(dynamicRuleAlgorithmFunctions);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setDynamicRuleAlgorithmLabels(List<String>) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetDynamicRuleAlgorithmLabels_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		List<String> dynamicRuleAlgorithmLabels = new LinkedList();
+
+		fixture.setDynamicRuleAlgorithmLabels(dynamicRuleAlgorithmLabels);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setEcompName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetEcompName_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		String ecompName = "";
+
+		fixture.setEcompName(ecompName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyClass(PolicyClass) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetPolicyClass_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		PolicyClass policyClass = PolicyClass.Action;
+
+		fixture.setPolicyClass(policyClass);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyConfigType(PolicyConfigType) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetPolicyConfigType_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		PolicyConfigType policyConfigType = PolicyConfigType.BRMS_PARAM;
+
+		fixture.setPolicyConfigType(policyConfigType);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyDescription(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetPolicyDescription_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		String policyDescription = "";
+
+		fixture.setPolicyDescription(policyDescription);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetPolicyName_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		String policyName = "";
+
+		fixture.setPolicyName(policyName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPriority(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetPriority_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		String priority = "";
+
+		fixture.setPriority(priority);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setRequestID(UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testSetRequestID_1()
+		throws Exception {
+		PolicyParameters fixture = new PolicyParameters();
+		fixture.setRequestID(UUID.randomUUID());
+		fixture.setActionAttribute("");
+		fixture.setAttributes(new Hashtable());
+		fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+		fixture.setPolicyDescription("");
+		
+		fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
+		fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+		fixture.setPolicyName("");
+		fixture.setConfigName("");
+		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+		fixture.setPolicyClass(PolicyClass.Action);
+		fixture.setEcompName("");
+		fixture.setConfigBodyType(PolicyType.JSON);
+		fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+		fixture.setPriority("");
+		fixture.setActionPerformer("");
+		fixture.setConfigBody("");
+		UUID requestID = UUID.randomUUID();
+
+		fixture.setRequestID(requestID);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyParametersTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyResponseStatusTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyResponseStatusTest.java
new file mode 100644
index 000000000..5841571bd
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyResponseStatusTest.java
@@ -0,0 +1,154 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyResponseStatus;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyResponseStatusTest</code> contains tests for the class <code>{@link PolicyResponseStatus}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyResponseStatusTest {
+	/**
+	 * Run the PolicyResponseStatus getStatus(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetStatus_1()
+		throws Exception {
+		String responseStatus = "";
+
+		PolicyResponseStatus result = PolicyResponseStatus.getStatus(responseStatus);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("no_action", result.toString());
+		assertEquals("NO_ACTION_REQUIRED", result.name());
+		assertEquals(0, result.ordinal());
+	}
+
+	/**
+	 * Run the PolicyResponseStatus getStatus(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetStatus_2()
+		throws Exception {
+		String responseStatus = "";
+
+		PolicyResponseStatus result = PolicyResponseStatus.getStatus(responseStatus);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("no_action", result.toString());
+		assertEquals("NO_ACTION_REQUIRED", result.name());
+		assertEquals(0, result.ordinal());
+	}
+
+	/**
+	 * Run the PolicyResponseStatus getStatus(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testGetStatus_3()
+		throws Exception {
+		String responseStatus = "";
+
+		PolicyResponseStatus result = PolicyResponseStatus.getStatus(responseStatus);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("no_action", result.toString());
+		assertEquals("NO_ACTION_REQUIRED", result.name());
+		assertEquals(0, result.ordinal());
+	}
+
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		PolicyResponseStatus fixture = PolicyResponseStatus.ACTION_ADVISED;
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("action_advised", result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyResponseStatusTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyResponseTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyResponseTest.java
new file mode 100644
index 000000000..f99a238e5
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyResponseTest.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.Map;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyResponse;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyResponseTest</code> contains tests for the class <code>{@link PolicyResponse}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyResponseTest {
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyResponseTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyTypeTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyTypeTest.java
new file mode 100644
index 000000000..5b31e857b
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyTypeTest.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.PolicyType;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PolicyTypeTest</code> contains tests for the class <code>{@link PolicyType}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:41 PM
+ * @version $Revision: 1.0 $
+ */
+public class PolicyTypeTest {
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		PolicyType fixture = PolicyType.JSON;
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("json", result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:41 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PolicyTypeTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PushPolicyParametersTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PushPolicyParametersTest.java
new file mode 100644
index 000000000..ef005f1f4
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PushPolicyParametersTest.java
@@ -0,0 +1,269 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import java.util.UUID;
+
+import org.junit.*;
+import org.openecomp.policy.api.PushPolicyParameters;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>PushPolicyParametersTest</code> contains tests for the class <code>{@link PushPolicyParameters}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class PushPolicyParametersTest {
+	/**
+	 * Run the PushPolicyParameters() constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPushPolicyParameters_1()
+		throws Exception {
+
+		PushPolicyParameters result = new PushPolicyParameters();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals(null, result.getPolicyName());
+		assertEquals(null, result.getRequestID());
+		assertEquals(null, result.getPolicyType());
+		assertEquals(null, result.getPdpGroup());
+	}
+
+	/**
+	 * Run the PushPolicyParameters(String,String,String,UUID) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testPushPolicyParameters_2()
+		throws Exception {
+		String policyName = "";
+		String policyType = "";
+		String pdpGroup = "";
+		UUID requestID = UUID.randomUUID();
+
+		PushPolicyParameters result = new PushPolicyParameters(policyName, policyType, pdpGroup, requestID);
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("", result.getPolicyName());
+		assertEquals("", result.getPolicyType());
+		assertEquals("", result.getPdpGroup());
+	}
+
+	/**
+	 * Run the String getPdpGroup() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPdpGroup_1()
+		throws Exception {
+		PushPolicyParameters fixture = new PushPolicyParameters("", "", "", UUID.randomUUID());
+
+		String result = fixture.getPdpGroup();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPolicyName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyName_1()
+		throws Exception {
+		PushPolicyParameters fixture = new PushPolicyParameters("", "", "", UUID.randomUUID());
+
+		String result = fixture.getPolicyName();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the String getPolicyType() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetPolicyType_1()
+		throws Exception {
+		PushPolicyParameters fixture = new PushPolicyParameters("", "", "", UUID.randomUUID());
+
+		String result = fixture.getPolicyType();
+
+		// add additional test code here
+		assertEquals("", result);
+	}
+
+	/**
+	 * Run the UUID getRequestID() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testGetRequestID()
+		throws Exception {
+		PushPolicyParameters fixture = new PushPolicyParameters("", "", "", UUID.fromString("d1dbaac1-0944-4f07-9ce7-733c697537ea"));
+
+		UUID result = fixture.getRequestID();
+
+		// add additional test code here
+		assertNotNull(result);
+		assertEquals("d1dbaac1-0944-4f07-9ce7-733c697537ea", result.toString());
+		assertEquals(4, result.version());
+		assertEquals(2, result.variant());
+		assertEquals(-7140611980868110358L, result.getLeastSignificantBits());
+		assertEquals(-3324876153822097657L, result.getMostSignificantBits());
+	}
+
+	/**
+	 * Run the void setPdpGroup(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPdpGroup_1()
+		throws Exception {
+		PushPolicyParameters fixture = new PushPolicyParameters("", "", "", UUID.randomUUID());
+		String pdpGroup = "";
+
+		fixture.setPdpGroup(pdpGroup);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyName(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyName_1()
+		throws Exception {
+		PushPolicyParameters fixture = new PushPolicyParameters("", "", "", UUID.randomUUID());
+		String policyName = "";
+
+		fixture.setPolicyName(policyName);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setPolicyType(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetPolicyType_1()
+		throws Exception {
+		PushPolicyParameters fixture = new PushPolicyParameters("", "", "", UUID.randomUUID());
+		String policyType = "";
+
+		fixture.setPolicyType(policyType);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Run the void setRequestID(UUID) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Test
+	public void testSetRequestID_1()
+		throws Exception {
+		PushPolicyParameters fixture = new PushPolicyParameters("", "", "", UUID.randomUUID());
+		UUID requestID = UUID.randomUUID();
+
+		fixture.setRequestID(requestID);
+
+		// add additional test code here
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(PushPolicyParametersTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/RemovedPolicyTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/RemovedPolicyTest.java
new file mode 100644
index 000000000..6a3bf34df
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/RemovedPolicyTest.java
@@ -0,0 +1,73 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.RemovedPolicy;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>RemovedPolicyTest</code> contains tests for the class <code>{@link RemovedPolicy}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:40 PM
+ * @version $Revision: 1.0 $
+ */
+public class RemovedPolicyTest {
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:40 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(RemovedPolicyTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/SendEventTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/SendEventTest.java
new file mode 100644
index 000000000..6fb5137a4
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/SendEventTest.java
@@ -0,0 +1,153 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.policy.api.PolicyEngine;
+import org.openecomp.policy.api.PolicyEngineException;
+import org.openecomp.policy.api.PolicyEventException;
+import org.openecomp.policy.api.PolicyResponse;
+import org.openecomp.policy.api.PolicyResponseStatus;
+
+import org.openecomp.policy.common.logging.flexlogger.*; 
+
+public class SendEventTest {
+	
+	private PolicyEngine policyEngine = null;
+	private Map<String,String> eventAttributes = new HashMap<String,String>();
+	private Collection<PolicyResponse> policyResponse = null;
+	private static final Logger logger = FlexLogger.getLogger(SendEventTest.class);
+	@Before
+	public void setUp() {
+		try {
+			policyEngine = new PolicyEngine("Test/config_pass.properties");
+		} catch (PolicyEngineException e) {
+			logger.error(e.getMessage());
+			fail("PolicyEngine Instantiation Error" + e);
+		}
+		logger.info("Loaded.. PolicyEngine");
+	}
+
+	//@Test
+	public void testSendEventFail() {
+		eventAttributes = null;
+		try {
+			policyResponse = policyEngine.sendEvent(eventAttributes);
+		} catch (PolicyEventException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyResponse);
+	}
+	
+	//@Test
+	public void testSendEventFailNull() {
+		eventAttributes.put("", "");
+		try {
+			policyResponse = policyEngine.sendEvent(eventAttributes);
+		} catch (PolicyEventException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyResponse);
+	}
+	
+	// deprecated Test. 
+	/*@Test
+	public void testSendEventFailAttribute() {
+		eventAttributes.put("Fail.key", "Value");
+		try {
+			policyResponse = policyEngine.sendEvent(eventAttributes);
+		} catch (PolicyEventException e) {
+			logger.warn(e.getMessage());
+		}
+		assertNull(policyResponse.getPolicyResponseMessage());
+	}*/
+	
+	//@Test
+	public void testSendEventNotValid() {
+		eventAttributes.put("Action.fail", "Value");
+		try {
+			policyResponse = policyEngine.sendEvent(eventAttributes);
+		} catch (PolicyEventException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyResponse policyResponse: this.policyResponse){
+			logger.info(policyResponse.getPolicyResponseMessage() + " , " + policyResponse.getPolicyResponseStatus());
+			assertNotNull(policyResponse);
+			assertEquals(PolicyResponseStatus.NO_ACTION_REQUIRED, policyResponse.getPolicyResponseStatus());
+			assertNotNull(policyResponse.getPolicyResponseMessage());
+			assertNotNull(policyResponse.getRequestAttributes());
+			assertNull(policyResponse.getActionTaken());
+			assertNull(policyResponse.getActionAdvised());
+		}
+	}
+	
+	//@Test
+	public void testSendEventActionAdvised() {
+		eventAttributes.put("Key", "Value");
+		eventAttributes.put("cpu", "80");
+		try {
+			policyResponse = policyEngine.sendEvent(eventAttributes);
+		} catch (PolicyEventException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyResponse policyResponse: this.policyResponse){
+			logger.info(policyResponse.getPolicyResponseMessage() + " , " + policyResponse.getPolicyResponseStatus());
+			assertNotNull(policyResponse);
+			assertEquals(PolicyResponseStatus.ACTION_ADVISED, policyResponse.getPolicyResponseStatus());
+			assertNotNull(policyResponse.getPolicyResponseMessage());
+			assertNotNull(policyResponse.getRequestAttributes());
+			assertNull(policyResponse.getActionTaken());
+			assertNotNull(policyResponse.getActionAdvised());
+		}
+	}
+	
+	//@Test
+	public void testSendEventActionTaken() {
+		eventAttributes.put("Key", "Value");
+		eventAttributes.put("cpu", "91");
+		try {
+			policyResponse = policyEngine.sendEvent(eventAttributes);
+		} catch (PolicyEventException e) {
+			logger.warn(e.getMessage());
+		}
+		for(PolicyResponse policyResponse: this.policyResponse){
+			logger.info(policyResponse.getPolicyResponseMessage() + " , " + policyResponse.getPolicyResponseStatus());
+			assertNotNull(policyResponse);
+			assertEquals(PolicyResponseStatus.ACTION_TAKEN, policyResponse.getPolicyResponseStatus());
+			assertNotNull(policyResponse.getPolicyResponseMessage());
+			assertNotNull(policyResponse.getRequestAttributes());
+			assertNotNull(policyResponse.getActionTaken());
+			assertNull(policyResponse.getActionAdvised());
+		}
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/TestRunner.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/TestRunner.java
new file mode 100644
index 000000000..69cbd834e
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/TestRunner.java
@@ -0,0 +1,49 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+
+public class TestRunner {
+	public static void main(String[] args) {
+		Result result = JUnitCore.runClasses(PolicyEngineTest.class);
+		for(Failure failure: result.getFailures()) {
+			System.out.println("Failed Test: " + failure.toString());
+		}
+		Result results = null;
+		if(result.wasSuccessful()) {
+			System.out.println("API Methods are being Tested.. ");
+			results = JUnitCore.runClasses(GetConfigByPolicyNameTest.class, GetConfigStringTest.class,GetConfigStringStringTest.class,GetConfigStringStringMapTest.class,SendEventTest.class);
+			for(Failure failure: results.getFailures()) {
+				System.out.println("Failed Test: " + failure.toString());
+			}
+			System.out.println("Test Results.. ");
+			System.out.println("Stats:  \nRun Time: " + (results.getRunTime()+result.getRunTime()) + "\nTotal Tests:" + results.getRunCount()+ result.getRunCount()
+					+ "\nFailures: " + results.getFailureCount()+ result.getFailureCount());
+			System.exit(1);
+		}
+		System.out.println("Test Failed..");
+		System.out.println("Stats:  \nRun Time: " + result.getRunTime() + "\nTests:" + result.getRunCount()
+				+ "\nFailures: " + result.getFailureCount());
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/UpdateTypeTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/UpdateTypeTest.java
new file mode 100644
index 000000000..909a05f0e
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/UpdateTypeTest.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.test;
+
+import org.junit.*;
+import org.openecomp.policy.api.UpdateType;
+
+import static org.junit.Assert.*;
+
+/**
+ * The class <code>UpdateTypeTest</code> contains tests for the class <code>{@link UpdateType}</code>.
+ *
+ * @generatedBy CodePro at 6/1/16 1:39 PM
+ * @version $Revision: 1.0 $
+ */
+public class UpdateTypeTest {
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:39 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		UpdateType fixture = UpdateType.NEW;
+
+		String result = fixture.toString();
+
+		// add additional test code here
+		assertEquals("new", result);
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:39 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:39 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 6/1/16 1:39 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(UpdateTypeTest.class);
+	}
+}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/package-info.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/package-info.java
new file mode 100644
index 000000000..e678c4be2
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/package-info.java
@@ -0,0 +1,24 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineAPI
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * API JUNIT TestCases. 
+ */
+package org.openecomp.policy.test;