[POLICY-73] replace openecomp for policy-engine

Change-Id: I54072f6bcd388c0e05562614ee89b4ae7ad67004
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

17 files changed, 0 insertions, 6399 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
deleted file mode 100644
index 86f15992a..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientEndTest.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*-
- * ============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.assertNotNull;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.std.AutoClientEnd;
-import org.openecomp.policy.std.StdPolicyEngine;
-
-/**
- * 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 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", (String) null);
-		
-		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
deleted file mode 100644
index 28889677b..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientUEBTest.java
+++ /dev/null
@@ -1,567 +0,0 @@
-/*-
- * ============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.AutoClientUEB;
-
-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 = "";
-		String apiKey = "";
-		String apiSecret = "";
-		List<String> uebURLList = new LinkedList<String>();
-
-		AutoClientUEB result = new AutoClientUEB(url, uebURLList, apiKey, apiSecret);
-
-		// 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<String>(), "", "");
-		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<String>(), "", "");
-		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<String>(), "", "");
-		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<String>(), "", "");
-		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<String>(), "", "");
-		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<String>(),"","");
-		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<String>(),"","");
-		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<String>(),"","");
-		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<String>(),"","");
-		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<String>(),"","");
-		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<String>(),"","");
-		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<String>(),"","");
-		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<String>(),"","");
-		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<String>(),"","");
-		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<String>(),"","");
-		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<String>(),"","");
-		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<String>(),"","");
-		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<String>(),"","");
-		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<String>(),"","");
-		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
-		List<String> urlList = new LinkedList<String>();
-		urlList.add("test2.com");
-		AutoClientUEB client = new AutoClientUEB("test.com", urlList, "testKey", "testSecret");
-		NotificationHandler handler = null;
-		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
deleted file mode 100644
index 9879174cb..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/Handler.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * ============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;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-
-public class Handler implements NotificationHandler{
-	
-	private static final Logger LOGGER	= FlexLogger.getLogger(Handler.class);
-	
-	@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");
-						@SuppressWarnings("deprecation")
-						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) {
-						LOGGER.error("Exception Occured"+e);
-					} catch (PolicyConfigException e) {
-						LOGGER.error("Exception Occured"+e);
-					}
-				}
-			}
-		}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");
-					@SuppressWarnings("deprecation")
-					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) {
-					LOGGER.error("Exception Occured"+e);
-				} catch (PolicyConfigException e) {
-					LOGGER.error("Exception Occured"+e);
-				}
-			}
-		}
-	}
-
-
-}
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
deleted file mode 100644
index c44dac606..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * ============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.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.std.ManualClientEnd;
-
-/**
- * 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 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
deleted file mode 100644
index f19697597..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndUEBTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * ============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.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.std.ManualClientEndUEB;
-import org.openecomp.policy.std.StdPDPNotification;
-
-/**
- * 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";
-		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 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);
-	}
-
-	/**
-	 * 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
deleted file mode 100644
index ab8946c60..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchStoreTest.java
+++ /dev/null
@@ -1,776 +0,0 @@
-/*-
- * ============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.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.HashSet;
-import java.util.Hashtable;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.std.MatchStore;
-import org.openecomp.policy.std.Matches;
-import org.openecomp.policy.std.StdPDPNotification;
-
-/**
- * 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<String, String>());
-		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<String, String>());
-		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<String, String>());
-		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<String, String>());
-		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<String, String>());
-		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<String, String>());
-		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<String, String>());
-		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<String, String>());
-		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<String, String>());
-		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
deleted file mode 100644
index cdc9b5595..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchesTest.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*-
- * ============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<String, String>());
-		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<String, String>());
-		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<String, String>());
-		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<String, String>());
-		fixture.setConfigName("");
-		Map<String, String> configAttributes = new Hashtable<String, String>();
-
-		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<String, String>());
-		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<String, String>());
-		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
deleted file mode 100644
index d54c4f4cb..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationStoreTest.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*-
- * ============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
deleted file mode 100644
index 674c58a00..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationUnMarshalTest.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*-
- * ============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.assertNotNull;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.policy.std.NotificationUnMarshal;
-import org.openecomp.policy.std.StdPDPNotification;
-
-/**
- * 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
deleted file mode 100644
index de8a6a7ad..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdLoadedPolicyTest.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*-
- * ============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<String, String>());
-
-		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, String>());
-
-		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, String>());
-
-		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, String>());
-
-		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<String, String>());
-
-		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, String>());
-
-		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<String, String>());
-		Map<String, String> matches = new Hashtable<String, String>();
-
-		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, String>());
-		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<String, String>());
-		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, String>());
-		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
deleted file mode 100644
index 1bda0e59f..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPDPNotificationTest.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*-
- * ============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<StdRemovedPolicy>());
-		fixture.setNotificationType(NotificationType.BOTH);
-		fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>());
-
-		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<StdRemovedPolicy>());
-		fixture.setNotificationType(NotificationType.BOTH);
-		fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>());
-
-		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<StdRemovedPolicy>());
-		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<StdRemovedPolicy>());
-		fixture.setNotificationType(NotificationType.BOTH);
-		fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>());
-
-		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<StdRemovedPolicy>());
-		fixture.setNotificationType(NotificationType.BOTH);
-		fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>());
-
-		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<StdRemovedPolicy>());
-		fixture.setNotificationType(NotificationType.BOTH);
-		fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>());
-
-		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<StdLoadedPolicy>());
-
-		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<StdRemovedPolicy>());
-		fixture.setNotificationType(NotificationType.BOTH);
-		fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>());
-		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<StdRemovedPolicy>());
-		fixture.setNotificationType(NotificationType.BOTH);
-		fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>());
-		Collection<StdRemovedPolicy> removedPolicies = new LinkedList<StdRemovedPolicy>();
-
-		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<StdRemovedPolicy>());
-		fixture.setNotificationType(NotificationType.BOTH);
-		fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>());
-		Collection<StdLoadedPolicy> updatedPolicies = new LinkedList<StdLoadedPolicy>();
-
-		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
deleted file mode 100644
index 45c70187d..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyChangeResponseTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*-
- * ============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
deleted file mode 100644
index a34737477..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyConfigTest.java
+++ /dev/null
@@ -1,821 +0,0 @@
-/*-
- * ============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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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<String, String>());
-		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, String>());
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		Map<String, String> matchingConditions = new Hashtable<String, String>();
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		Map<String, String> responseAttributes = new Hashtable<String, String>();
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("test");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setOther("");
-		fixture.setPolicyType(PolicyType.JSON);
-		fixture.setPolicyName("");
-		fixture.setProperties(new Properties());
-		fixture.setJsonObject((JsonObject) null);
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-
-		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/StdPolicyResponseTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyResponseTest.java
deleted file mode 100644
index a593c460b..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyResponseTest.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*-
- * ============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<String, String>());
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setActionTaken(new Hashtable<String, String>());
-		Map<String, String> actionAdvised = new Hashtable<String, String>();
-
-		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<String, String>());
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setActionTaken(new Hashtable<String, String>());
-		Map<String, String> actionTaken = new Hashtable<String, String>();
-
-		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<String, String>());
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setActionTaken(new Hashtable<String, String>());
-		Map<String, String> requestAttributes = new Hashtable<String, String>();
-
-		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<String, String>());
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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
deleted file mode 100644
index 0a0865c82..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdRemovedPolicyTest.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*-
- * ============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
deleted file mode 100644
index 34918c2ea..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdStatusTest.java
+++ /dev/null
@@ -1,1433 +0,0 @@
-/*-
- * ============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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		Map<String, String> actionAdvised = new Hashtable<String, String>();
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		Map<String, String> actionTaken = new Hashtable<String, String>();
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		Map<String, String> matchingConditions = new Hashtable<String, String>();
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		Map<String, String> requestAttributes = new Hashtable<String, String>();
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		Map<String, String> responseAttributes = new Hashtable<String, String>();
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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<String, String>());
-		fixture.setMatchingConditions(new Hashtable<String, String>());
-		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<String, String>());
-		fixture.setPolicyVersion("");
-		fixture.setActionAdvised(new Hashtable<String, String>());
-		fixture.setOther("");
-		fixture.setDecision(PolicyDecision.DENY);
-		fixture.setDetails("");
-		fixture.setActionTaken(new Hashtable<String, String>());
-
-		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
deleted file mode 100644
index 75bfc39ad..000000000
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============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;