1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

25 files changed, 7 insertions, 3073 deletions

diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/ASDCControllerSingletonESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/ASDCControllerSingletonESTest.java
deleted file mode 100644
index 9ca02e218a..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/ASDCControllerSingletonESTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:38:29 GMT 2016
- */
-
-package org.openecomp.mso.asdc;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.PrivateAccess;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class ASDCControllerSingletonESTest extends ASDCControllerSingletonESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      ASDCControllerSingleton aSDCControllerSingleton0 = new ASDCControllerSingleton();
-      PrivateAccess.callMethod((Class<ASDCControllerSingleton>) ASDCControllerSingleton.class, aSDCControllerSingleton0, "setWorking", (Object) true, (Class<?>) boolean.class);
-      aSDCControllerSingleton0.periodicControllerTask();
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      ASDCControllerSingleton aSDCControllerSingleton0 = new ASDCControllerSingleton();
-      Object object0 = PrivateAccess.callMethod((Class<ASDCControllerSingleton>) ASDCControllerSingleton.class, aSDCControllerSingleton0, "terminate");
-      assertNull(object0);
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      ASDCControllerSingleton aSDCControllerSingleton0 = new ASDCControllerSingleton();
-      aSDCControllerSingleton0.periodicControllerTask();
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/ASDCControllerSingletonESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/ASDCControllerSingletonESTestscaffolding.java
deleted file mode 100644
index e099e9ceaf..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/ASDCControllerSingletonESTestscaffolding.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Fri Nov 25 13:38:29 GMT 2016
- */
-
-package org.openecomp.mso.asdc;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-
-@EvoSuiteClassExclude
-public class ASDCControllerSingletonESTestscaffolding {
-
-  @org.junit.Rule 
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.ASDCControllerSingleton"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
-
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
-
-  @Before 
-  public void initTestCase(){ 
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
-
-  @After 
-  public void doneWithTestCase(){ 
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
-
- private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(ASDCControllerSingletonESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.properties.AbstractMsoProperties",
-      "org.openecomp.mso.properties.MsoPropertiesParameters$MsoPropertiesType",
-      "org.openecomp.mso.properties.MsoPropertiesParameters",
-      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
-      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
-      "com.att.eelf.configuration.EELFLogger",
-      "org.openecomp.mso.properties.MsoJavaProperties",
-      "org.openecomp.mso.asdc.client.exceptions.ASDCParametersException",
-      "com.att.eelf.configuration.SLF4jWrapper",
-      "com.att.eelf.i18n.EELFResourceManager",
-      "org.openecomp.mso.properties.MsoPropertiesException",
-      "org.openecomp.mso.logger.MsoLogger",
-      "org.openecomp.mso.logger.MessageEnum",
-      "com.att.eelf.i18n.EELFResolvableErrorEnum",
-      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
-      "org.openecomp.mso.properties.MsoJsonProperties",
-      "org.openecomp.mso.entity.MsoRequest",
-      "org.openecomp.mso.asdc.ASDCControllerSingleton",
-      "org.openecomp.mso.logger.MsoLogger$StatusCode",
-      "com.att.eelf.configuration.EELFManager",
-      "com.att.eelf.i18n.EELFMsgs",
-      "org.openecomp.mso.properties.MsoPropertiesFactory",
-      "org.openecomp.mso.asdc.client.ASDCGlobalController",
-      "com.att.eelf.configuration.EELFLogger$Level",
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.openecomp.mso.asdc.client.exceptions.ASDCControllerException"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(ASDCControllerSingletonESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.openecomp.mso.logger.MsoLogger",
-      "com.att.eelf.i18n.EELFResourceManager",
-      "com.att.eelf.i18n.EELFMsgs",
-      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
-      "com.att.eelf.configuration.EELFLogger$Level",
-      "com.att.eelf.configuration.EELFManager",
-      "org.openecomp.mso.logger.MessageEnum",
-      "org.openecomp.mso.asdc.ASDCControllerSingleton",
-      "org.openecomp.mso.asdc.client.ASDCGlobalController",
-      "org.openecomp.mso.properties.MsoPropertiesFactory",
-      "org.openecomp.mso.properties.MsoPropertiesParameters$MsoPropertiesType",
-      "org.openecomp.mso.properties.MsoPropertiesException",
-      "org.openecomp.mso.logger.MsoLogger$ErrorCode"
-    );
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/DistributionStatusMessageESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/DistributionStatusMessageESTest.java
deleted file mode 100644
index e2112cee03..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/DistributionStatusMessageESTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:39:00 GMT 2016
- */
-
-package org.openecomp.mso.asdc.client;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.junit.runner.RunWith;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class DistributionStatusMessageESTest extends DistributionStatusMessageESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      DistributionStatusEnum distributionStatusEnum0 = DistributionStatusEnum.ALREADY_DOWNLOADED;
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage((String) null, (String) null, (String) null, distributionStatusEnum0, 1L);
-      long long0 = distributionStatusMessage0.getTimestamp();
-      assertEquals(1L, long0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      DistributionStatusEnum distributionStatusEnum0 = DistributionStatusEnum.ALREADY_DEPLOYED;
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage("n*lho0\"NQ4azb%8]KN", "n*lho0\"NQ4azb%8]KN", "BMWmXl2i-B", distributionStatusEnum0, (-58L));
-      long long0 = distributionStatusMessage0.getTimestamp();
-      assertEquals("BMWmXl2i-B", distributionStatusMessage0.getDistributionID());
-      assertEquals((-58L), long0);
-      assertEquals("n*lho0\"NQ4azb%8]KN", distributionStatusMessage0.getConsumerID());
-      assertEquals("n*lho0\"NQ4azb%8]KN", distributionStatusMessage0.getArtifactURL());
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      DistributionStatusEnum distributionStatusEnum0 = DistributionStatusEnum.ALREADY_DOWNLOADED;
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage((String) null, (String) null, (String) null, distributionStatusEnum0, 1L);
-      DistributionStatusEnum distributionStatusEnum1 = distributionStatusMessage0.getStatus();
-      DistributionStatusMessage distributionStatusMessage1 = new DistributionStatusMessage("", (String) null, "*? q^M(_q^3$ZQ", distributionStatusEnum1, (-833L));
-      String string0 = distributionStatusMessage1.getDistributionID();
-      assertNotNull(string0);
-      assertEquals((-833L), distributionStatusMessage1.getTimestamp());
-      assertEquals("", distributionStatusMessage1.getArtifactURL());
-      assertEquals("*? q^M(_q^3$ZQ", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      DistributionStatusEnum distributionStatusEnum0 = DistributionStatusEnum.ALREADY_DOWNLOADED;
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage("", "", "", distributionStatusEnum0, 1L);
-      distributionStatusMessage0.getDistributionID();
-      assertEquals(1L, distributionStatusMessage0.getTimestamp());
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      DistributionStatusEnum distributionStatusEnum0 = DistributionStatusEnum.ALREADY_DOWNLOADED;
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage("ALREADY_DEPLOYED", "ALREADY_DEPLOYED", "ALREADY_DEPLOYED", distributionStatusEnum0, 0L);
-      String string0 = distributionStatusMessage0.getConsumerID();
-      assertEquals("ALREADY_DEPLOYED", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      DistributionStatusEnum distributionStatusEnum0 = DistributionStatusEnum.ALREADY_DOWNLOADED;
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage((String) null, (String) null, (String) null, distributionStatusEnum0, 1L);
-      DistributionStatusEnum distributionStatusEnum1 = distributionStatusMessage0.getStatus();
-      DistributionStatusMessage distributionStatusMessage1 = new DistributionStatusMessage((String) null, "", "Qcuo3~gd})vsI*", distributionStatusEnum1, 0L);
-      String string0 = distributionStatusMessage1.getConsumerID();
-      assertNotNull(string0);
-      assertEquals(1L, distributionStatusMessage0.getTimestamp());
-      assertEquals("", string0);
-      assertEquals("Qcuo3~gd})vsI*", distributionStatusMessage1.getDistributionID());
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      DistributionStatusEnum distributionStatusEnum0 = DistributionStatusEnum.ALREADY_DOWNLOADED;
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage("ALREADY_DEPLOYED", "ALREADY_DEPLOYED", "ALREADY_DEPLOYED", distributionStatusEnum0, 0L);
-      String string0 = distributionStatusMessage0.getArtifactURL();
-      assertEquals("ALREADY_DEPLOYED", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      DistributionStatusEnum distributionStatusEnum0 = DistributionStatusEnum.ALREADY_DOWNLOADED;
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage((String) null, (String) null, (String) null, distributionStatusEnum0, 1L);
-      DistributionStatusEnum distributionStatusEnum1 = distributionStatusMessage0.getStatus();
-      DistributionStatusMessage distributionStatusMessage1 = new DistributionStatusMessage("", (String) null, "*? q^M(_q^3$ZQ", distributionStatusEnum1, (-833L));
-      String string0 = distributionStatusMessage1.getArtifactURL();
-      assertEquals("", string0);
-      assertEquals("*? q^M(_q^3$ZQ", distributionStatusMessage1.getDistributionID());
-      assertNotNull(string0);
-      assertEquals((-833L), distributionStatusMessage1.getTimestamp());
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage((String) null, (String) null, (String) null, (DistributionStatusEnum) null, 0L);
-      long long0 = distributionStatusMessage0.getTimestamp();
-      assertEquals(0L, long0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage((String) null, (String) null, (String) null, (DistributionStatusEnum) null, 0L);
-      String string0 = distributionStatusMessage0.getDistributionID();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage((String) null, (String) null, (String) null, (DistributionStatusEnum) null, 0L);
-      distributionStatusMessage0.getStatus();
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage((String) null, (String) null, (String) null, (DistributionStatusEnum) null, 0L);
-      String string0 = distributionStatusMessage0.getConsumerID();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      DistributionStatusMessage distributionStatusMessage0 = new DistributionStatusMessage((String) null, (String) null, (String) null, (DistributionStatusEnum) null, 0L);
-      String string0 = distributionStatusMessage0.getArtifactURL();
-      assertNull(string0);
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/DistributionStatusMessageESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/DistributionStatusMessageESTestscaffolding.java
deleted file mode 100644
index f234ca64d5..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/DistributionStatusMessageESTestscaffolding.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Fri Nov 25 13:39:00 GMT 2016
- */
-
-package org.openecomp.mso.asdc.client;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-
-@EvoSuiteClassExclude
-public class DistributionStatusMessageESTestscaffolding {
-
-  @org.junit.Rule 
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.client.DistributionStatusMessage"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
-
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
-
-  @Before 
-  public void initTestCase(){ 
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
-
-  @After 
-  public void doneWithTestCase(){ 
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(DistributionStatusMessageESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.sdc.utils.DistributionStatusEnum",
-      "org.openecomp.mso.asdc.client.DistributionStatusMessage",
-      "org.openecomp.sdc.api.consumer.IDistributionStatusMessage"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCControllerExceptionESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCControllerExceptionESTest.java
deleted file mode 100644
index 37af59c639..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCControllerExceptionESTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:39:27 GMT 2016
- */
-
-package org.openecomp.mso.asdc.client.exceptions;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.mock.java.lang.MockThrowable;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class ASDCControllerExceptionESTest extends ASDCControllerExceptionESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      ASDCControllerException aSDCControllerException0 = new ASDCControllerException("org.openecomp.mso.asdc.client.exceptions.ASDCControllerException");
-      MockThrowable mockThrowable0 = new MockThrowable("B+;:\"w4^M(-Y:e~=", (Throwable) aSDCControllerException0);
-      ASDCControllerException aSDCControllerException1 = new ASDCControllerException("The list of prefixes must not be null", (Throwable) mockThrowable0);
-      assertFalse(aSDCControllerException1.equals((Object)aSDCControllerException0));
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCControllerExceptionESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCControllerExceptionESTestscaffolding.java
deleted file mode 100644
index d6041c2fb2..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCControllerExceptionESTestscaffolding.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Fri Nov 25 13:39:27 GMT 2016
- */
-
-package org.openecomp.mso.asdc.client.exceptions;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-
-@EvoSuiteClassExclude
-public class ASDCControllerExceptionESTestscaffolding {
-
-  @org.junit.Rule 
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.client.exceptions.ASDCControllerException"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
-
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
-
-  @Before 
-  public void initTestCase(){ 
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
-
-  @After 
-  public void doneWithTestCase(){ 
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(ASDCControllerExceptionESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.asdc.client.exceptions.ASDCControllerException"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(ASDCControllerExceptionESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.asdc.client.exceptions.ASDCControllerException"
-    );
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCDownloadExceptionESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCDownloadExceptionESTest.java
deleted file mode 100644
index 75f4b5d27c..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCDownloadExceptionESTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:38:49 GMT 2016
- */
-
-package org.openecomp.mso.asdc.client.exceptions;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class ASDCDownloadExceptionESTest extends ASDCDownloadExceptionESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      ASDCDownloadException aSDCDownloadException0 = new ASDCDownloadException("");
-      ASDCDownloadException aSDCDownloadException1 = new ASDCDownloadException("", (Throwable) aSDCDownloadException0);
-      assertFalse(aSDCDownloadException1.equals((Object)aSDCDownloadException0));
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCDownloadExceptionESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCDownloadExceptionESTestscaffolding.java
deleted file mode 100644
index 5db3c2098f..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCDownloadExceptionESTestscaffolding.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Fri Nov 25 13:38:49 GMT 2016
- */
-
-package org.openecomp.mso.asdc.client.exceptions;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-
-@EvoSuiteClassExclude
-public class ASDCDownloadExceptionESTestscaffolding {
-
-  @org.junit.Rule 
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.client.exceptions.ASDCDownloadException"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
-
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
-
-  @Before 
-  public void initTestCase(){ 
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
-
-  @After 
-  public void doneWithTestCase(){ 
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(ASDCDownloadExceptionESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.asdc.client.exceptions.ASDCDownloadException"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(ASDCDownloadExceptionESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.asdc.client.exceptions.ASDCDownloadException"
-    );
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCParametersExceptionESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCParametersExceptionESTest.java
deleted file mode 100644
index afc28346e3..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCParametersExceptionESTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:39:10 GMT 2016
- */
-
-package org.openecomp.mso.asdc.client.exceptions;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class ASDCParametersExceptionESTest extends ASDCParametersExceptionESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      ASDCParametersException aSDCParametersException0 = new ASDCParametersException("4vI_{2b<h&iIy");
-      ASDCParametersException aSDCParametersException1 = new ASDCParametersException((String) null, (Throwable) aSDCParametersException0);
-      assertFalse(aSDCParametersException1.equals((Object)aSDCParametersException0));
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCParametersExceptionESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCParametersExceptionESTestscaffolding.java
deleted file mode 100644
index ce3afc92cd..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCParametersExceptionESTestscaffolding.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Fri Nov 25 13:39:10 GMT 2016
- */
-
-package org.openecomp.mso.asdc.client.exceptions;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-
-@EvoSuiteClassExclude
-public class ASDCParametersExceptionESTestscaffolding {
-
-  @org.junit.Rule 
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.client.exceptions.ASDCParametersException"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
-
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
-
-  @Before 
-  public void initTestCase(){ 
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
-
-  @After 
-  public void doneWithTestCase(){ 
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(ASDCParametersExceptionESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.asdc.client.exceptions.ASDCParametersException"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(ASDCParametersExceptionESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.asdc.client.exceptions.ASDCParametersException"
-    );
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ArtifactInstallerExceptionESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ArtifactInstallerExceptionESTest.java
deleted file mode 100644
index 2a1c8177de..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ArtifactInstallerExceptionESTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:38:39 GMT 2016
- */
-
-package org.openecomp.mso.asdc.client.exceptions;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class ArtifactInstallerExceptionESTest extends ArtifactInstallerExceptionESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      ArtifactInstallerException artifactInstallerException0 = new ArtifactInstallerException("kD=Ua3[");
-      ArtifactInstallerException artifactInstallerException1 = new ArtifactInstallerException("kD=Ua3[", (Throwable) artifactInstallerException0);
-      assertFalse(artifactInstallerException1.equals((Object)artifactInstallerException0));
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ArtifactInstallerExceptionESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ArtifactInstallerExceptionESTestscaffolding.java
deleted file mode 100644
index 0bd3d65f0e..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ArtifactInstallerExceptionESTestscaffolding.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Fri Nov 25 13:38:39 GMT 2016
- */
-
-package org.openecomp.mso.asdc.client.exceptions;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-
-@EvoSuiteClassExclude
-public class ArtifactInstallerExceptionESTestscaffolding {
-
-  @org.junit.Rule 
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
-
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
-
-  @Before 
-  public void initTestCase(){ 
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
-
-  @After 
-  public void doneWithTestCase(){ 
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(ArtifactInstallerExceptionESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(ArtifactInstallerExceptionESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException"
-    );
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java
index bce9324de9..7351b1b439 100644
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java
@@ -53,7 +53,7 @@ public class YamlTest {
   
 		    	InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTest.yaml"));
 		    	YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input));
-		    	Set <HeatTemplateParam> paramSet = decoder.getParameterList();
+		    	Set <HeatTemplateParam> paramSet = decoder.getParameterList("123456");
 			    
 		    	assertTrue(paramSet.size() == 5);
 
@@ -79,12 +79,12 @@ public class YamlTest {
 		    	Set <HeatTemplateParam> newParamSet = new HashSet <HeatTemplateParam> (); 
 		    	
 		    	HeatTemplateParam heatParam1 = new HeatTemplateParam();
-		    	heatParam1.setId(1);
+		    	heatParam1.setHeatTemplateArtifactUuid("1");
 		    	heatParam1.setParamName("testos1");
 		    	heatParam1.setParamType("string");
 		    	
 		    	HeatTemplateParam heatParam2 = new HeatTemplateParam();
-		    	heatParam2.setId(2);
+		    	heatParam2.setHeatTemplateArtifactUuid("2");
 		    	heatParam2.setParamName("testos2");
 		    	heatParam2.setParamType("number");
 		    	
@@ -93,7 +93,7 @@ public class YamlTest {
 		    	
 		    	decoder.addParameterList(newParamSet);
 			    
-		    	Set <HeatTemplateParam> paramSet = decoder.getParameterList();
+		    	Set <HeatTemplateParam> paramSet = decoder.getParameterList("123456");
 		    	assertTrue(paramSet.size() == 2);
 		    	
 		    	assertTrue(decoder.encode().contains("testos1"));
@@ -111,12 +111,12 @@ public class YamlTest {
 		    	Set <HeatTemplateParam> newParamSet = new HashSet <HeatTemplateParam> (); 
 		    	
 		    	HeatTemplateParam heatParam1 = new HeatTemplateParam();
-		    	heatParam1.setId(1);
+		    	heatParam1.setHeatTemplateArtifactUuid("1");
 		    	heatParam1.setParamName("testos1");
 		    	heatParam1.setParamType("string");
 		    	
 		    	HeatTemplateParam heatParam2 = new HeatTemplateParam();
-		    	heatParam2.setId(2);
+		    	heatParam2.setHeatTemplateArtifactUuid("2");
 		    	heatParam2.setParamName("testos2");
 		    	heatParam2.setParamType("number");
 		    	
@@ -125,7 +125,7 @@ public class YamlTest {
 		    	
 		    	decoder.addParameterList(newParamSet);
 			    
-		    	Set <HeatTemplateParam> paramSet = decoder.getParameterList();
+		    	Set <HeatTemplateParam> paramSet = decoder.getParameterList("123456");
 		    	
 		    	assertTrue(paramSet.size() == 7);
 		    	
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/BigDecimalVersionESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/BigDecimalVersionESTest.java
deleted file mode 100644
index 4675f05477..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/BigDecimalVersionESTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:37:47 GMT 2016
- */
-
-package org.openecomp.mso.asdc.installer;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-
-import java.math.BigDecimal;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class BigDecimalVersionESTest extends BigDecimalVersionESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      String string0 = BigDecimalVersion.castAndCheckNotificationVersionToString("9");
-      assertEquals("9", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      BigDecimal bigDecimal0 = BigDecimalVersion.castAndCheckNotificationVersion("0");
-      assertEquals(0, bigDecimal0.shortValue());
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      BigDecimal bigDecimal0 = BigDecimalVersion.castAndCheckNotificationVersion("9");
-      assertEquals(9, bigDecimal0.byteValue());
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      BigDecimal bigDecimal0 = BigDecimalVersion.castAndCheckNotificationVersion("-1");
-      assertEquals(-1, bigDecimal0.byteValue());
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      // Undeclared exception!
-      try { 
-        BigDecimalVersion.castAndCheckNotificationVersionToString("fgt+&6@pL9`5EE}.!.,");
-        fail("Expecting exception: NumberFormatException");
-      
-      } catch(NumberFormatException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("java.math.BigDecimal", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      // Undeclared exception!
-      try { 
-        BigDecimalVersion.castAndCheckNotificationVersionToString((String) null);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.BigDecimalVersion", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      // Undeclared exception!
-      try { 
-        BigDecimalVersion.castAndCheckNotificationVersion((String) null);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.BigDecimalVersion", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      // Undeclared exception!
-      try { 
-        BigDecimalVersion.castAndCheckNotificationVersion(".");
-        fail("Expecting exception: ArrayIndexOutOfBoundsException");
-      
-      } catch(ArrayIndexOutOfBoundsException e) {
-         //
-         // 0
-         //
-         verifyException("org.openecomp.mso.asdc.installer.BigDecimalVersion", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      // Undeclared exception!
-      try { 
-        BigDecimalVersion.castAndCheckNotificationVersion("Mf**K`5E.~Fu.,q");
-        fail("Expecting exception: NumberFormatException");
-      
-      } catch(NumberFormatException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("java.math.BigDecimal", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      BigDecimalVersion bigDecimalVersion0 = new BigDecimalVersion();
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      // Undeclared exception!
-      try { 
-        BigDecimalVersion.castAndCheckNotificationVersionToString(".");
-        fail("Expecting exception: ArrayIndexOutOfBoundsException");
-      
-      } catch(ArrayIndexOutOfBoundsException e) {
-         //
-         // 0
-         //
-         verifyException("org.openecomp.mso.asdc.installer.BigDecimalVersion", e);
-      }
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/BigDecimalVersionESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/BigDecimalVersionESTestscaffolding.java
deleted file mode 100644
index c04ada8396..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/BigDecimalVersionESTestscaffolding.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Fri Nov 25 13:37:47 GMT 2016
- */
-
-package org.openecomp.mso.asdc.installer;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-
-@EvoSuiteClassExclude
-public class BigDecimalVersionESTestscaffolding {
-
-  @org.junit.Rule 
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.installer.BigDecimalVersion"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
-
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
-
-  @Before 
-  public void initTestCase(){ 
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
-
-  @After 
-  public void doneWithTestCase(){ 
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(BigDecimalVersionESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.asdc.installer.BigDecimalVersion"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleArtifactESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleArtifactESTest.java
deleted file mode 100644
index c9b29ae57f..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleArtifactESTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:20:32 GMT 2016
- */
-
-package org.openecomp.mso.asdc.installer;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.shaded.org.mockito.Mockito.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.PrivateAccess;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.impl.DistributionClientDownloadResultImpl;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class VfModuleArtifactESTest extends VfModuleArtifactESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.CONF_MISSING_ARTIFACT_TYPES;
-      byte[] byteArray0 = new byte[1];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "7pKd8", "7pKd8", byteArray0);
-      VfModuleArtifact vfModuleArtifact0 = new VfModuleArtifact(iArtifactInfo0, (IDistributionClientDownloadResult) distributionClientDownloadResultImpl0);
-      PrivateAccess.setVariable((Class<VfModuleArtifact>) VfModuleArtifact.class, vfModuleArtifact0, "result", (Object) null);
-      vfModuleArtifact0.getResult();
-      assertEquals(0, vfModuleArtifact0.getDeployedInDb());
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.DISTRIBUTION_CLIENT_ALREADY_INITIALIZED;
-      byte[] byteArray0 = new byte[0];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "o<Q", "o<Q", byteArray0);
-      VfModuleArtifact vfModuleArtifact0 = new VfModuleArtifact(iArtifactInfo0, (IDistributionClientDownloadResult) distributionClientDownloadResultImpl0);
-      vfModuleArtifact0.getResult();
-      assertEquals(0, vfModuleArtifact0.getDeployedInDb());
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.DISTRIBUTION_CLIENT_ALREADY_INITIALIZED;
-      byte[] byteArray0 = new byte[0];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "o<Q", "o<Q", byteArray0);
-      VfModuleArtifact vfModuleArtifact0 = new VfModuleArtifact(iArtifactInfo0, (IDistributionClientDownloadResult) distributionClientDownloadResultImpl0);
-      vfModuleArtifact0.incrementDeployedInDB();
-      int int0 = vfModuleArtifact0.getDeployedInDb();
-      assertEquals(1, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.CONF_MISSING_ASDC_FQDN;
-      byte[] byteArray0 = new byte[2];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "qZr'D", "qZr'D", byteArray0);
-      VfModuleArtifact vfModuleArtifact0 = new VfModuleArtifact(iArtifactInfo0, (IDistributionClientDownloadResult) distributionClientDownloadResultImpl0);
-      PrivateAccess.setVariable((Class<VfModuleArtifact>) VfModuleArtifact.class, vfModuleArtifact0, "deployedInDb", (Object) (-40));
-      int int0 = vfModuleArtifact0.getDeployedInDb();
-      assertEquals((-40), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.DISTRIBUTION_CLIENT_ALREADY_INITIALIZED;
-      byte[] byteArray0 = new byte[0];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "o<Q", "o<Q", byteArray0);
-      VfModuleArtifact vfModuleArtifact0 = new VfModuleArtifact(iArtifactInfo0, (IDistributionClientDownloadResult) distributionClientDownloadResultImpl0);
-      vfModuleArtifact0.setCatalogObject(byteArray0);
-      vfModuleArtifact0.getCatalogObject();
-      assertEquals(0, vfModuleArtifact0.getDeployedInDb());
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn("o<Q").when(iArtifactInfo0).toString();
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.DISTRIBUTION_CLIENT_ALREADY_INITIALIZED;
-      byte[] byteArray0 = new byte[0];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "o<Q", "o<Q", byteArray0);
-      VfModuleArtifact vfModuleArtifact0 = new VfModuleArtifact(iArtifactInfo0, (IDistributionClientDownloadResult) distributionClientDownloadResultImpl0);
-      vfModuleArtifact0.getArtifactInfo();
-      assertEquals(0, vfModuleArtifact0.getDeployedInDb());
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      VfModuleArtifact vfModuleArtifact0 = null;
-      try {
-        vfModuleArtifact0 = new VfModuleArtifact((IArtifactInfo) null, (IDistributionClientDownloadResult) null);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleArtifact", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.DISTRIBUTION_CLIENT_ALREADY_INITIALIZED;
-      byte[] byteArray0 = new byte[0];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "o<Q", "o<Q", byteArray0);
-      VfModuleArtifact vfModuleArtifact0 = new VfModuleArtifact(iArtifactInfo0, (IDistributionClientDownloadResult) distributionClientDownloadResultImpl0);
-      vfModuleArtifact0.getCatalogObject();
-      assertEquals(0, vfModuleArtifact0.getDeployedInDb());
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.CONF_MISSING_ARTIFACT_TYPES;
-      byte[] byteArray0 = new byte[1];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "7pKd8", "7pKd8", byteArray0);
-      VfModuleArtifact vfModuleArtifact0 = new VfModuleArtifact(iArtifactInfo0, (IDistributionClientDownloadResult) distributionClientDownloadResultImpl0);
-      vfModuleArtifact0.getResult();
-      assertEquals(0, vfModuleArtifact0.getDeployedInDb());
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.CONF_MISSING_ASDC_FQDN;
-      byte[] byteArray0 = new byte[2];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "qZr'D", "qZr'D", byteArray0);
-      VfModuleArtifact vfModuleArtifact0 = new VfModuleArtifact(iArtifactInfo0, (IDistributionClientDownloadResult) distributionClientDownloadResultImpl0);
-      int int0 = vfModuleArtifact0.getDeployedInDb();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.DISTRIBUTION_CLIENT_IS_TERMINATED;
-      byte[] byteArray0 = new byte[5];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "", "", byteArray0);
-      VfModuleArtifact vfModuleArtifact0 = new VfModuleArtifact((IArtifactInfo) null, (IDistributionClientDownloadResult) distributionClientDownloadResultImpl0);
-      vfModuleArtifact0.getArtifactInfo();
-      assertEquals(0, vfModuleArtifact0.getDeployedInDb());
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleArtifactESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleArtifactESTestscaffolding.java
deleted file mode 100644
index 75c5f1588f..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleArtifactESTestscaffolding.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Fri Nov 25 13:20:32 GMT 2016
- */
-
-package org.openecomp.mso.asdc.installer;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-
-@EvoSuiteClassExclude
-public class VfModuleArtifactESTestscaffolding {
-
-  @org.junit.Rule 
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.installer.VfModuleArtifact"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
-
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
-
-  @Before 
-  public void initTestCase(){ 
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
-
-  @After 
-  public void doneWithTestCase(){ 
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(VfModuleArtifactESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.asdc.installer.VfModuleArtifact",
-      "org.openecomp.sdc.utils.DistributionActionResultEnum",
-      "org.openecomp.sdc.impl.DistributionClientResultImpl",
-      "org.openecomp.sdc.impl.DistributionClientDownloadResultImpl",
-      "org.openecomp.sdc.api.results.IDistributionClientResult",
-      "org.openecomp.sdc.api.results.IDistributionClientDownloadResult",
-      "org.openecomp.sdc.api.notification.IArtifactInfo"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleMetaDataESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleMetaDataESTest.java
deleted file mode 100644
index f87f9068f2..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleMetaDataESTest.java
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Feb 24 16:02:34 GMT 2017
- */
-
-package org.openecomp.mso.asdc.installer;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.shaded.org.mockito.Mockito.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-import java.util.List;
-import java.util.Map;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.PrivateAccess;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class VfModuleMetaDataESTest extends VfModuleMetaDataESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      List<Boolean> list0 = (List<Boolean>) mock(List.class, new ViolatedAssumptionAnswer());
-      Integer integer0 = new Integer((-13));
-      vfModuleMetaData0.setAttribute("", integer0);
-      vfModuleMetaData0.setAttribute("", "");
-      Map<Boolean, Boolean> map0 = (Map<Boolean, Boolean>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn((Object) null).when(map0).put(any() , any());
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map0);
-      List<Boolean> list1 = (List<Boolean>) mock(List.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "artifacts", (Object) list1);
-      vfModuleMetaData0.setAttribute("kup1s\"/L_ ", "kup1s\"/L_ ");
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "artifacts", (Object) list0);
-      Map<Object, Boolean> map1 = (Map<Object, Boolean>) mock(Map.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "properties", (Object) map1);
-      Map<Object, Boolean> map2 = (Map<Object, Boolean>) mock(Map.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map2);
-      Map<String, Integer> map3 = (Map<String, Integer>) mock(Map.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map3);
-      VfModuleMetaData vfModuleMetaData1 = new VfModuleMetaData();
-      List<String> list2 = (List<String>) mock(List.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData1, "artifacts", (Object) list2);
-      vfModuleMetaData1.setAttribute((String) null, "");
-      vfModuleMetaData1.setAttribute("", "");
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData1, "properties", (Object) null);
-      vfModuleMetaData1.getProperties();
-      vfModuleMetaData0.setAttribute("", integer0);
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) null);
-      // Undeclared exception!
-      try {
-        vfModuleMetaData1.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      Map<String, String> map0 = vfModuleMetaData0.getProperties();
-      List<Object> list0 = (List<Object>) mock(List.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "artifacts", (Object) list0);
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map0);
-      vfModuleMetaData0.setAttribute(")aPjhY=.[,~@B5", ")aPjhY=.[,~@B5");
-      vfModuleMetaData0.setAttribute(")aPjhY=.[,~@B5", "");
-      vfModuleMetaData0.setAttribute(")aPjhY=.[,~@B5", "");
-      Integer integer0 = new Integer((-6));
-      vfModuleMetaData0.setAttribute(")aPjhY=.[,~@B5", integer0);
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "properties", (Object) map0);
-      Map<Boolean, String> map1 = (Map<Boolean, String>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn((Object) null).when(map1).put(any() , any());
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map1);
-      vfModuleMetaData0.setAttribute((String) null, integer0);
-      Integer integer1 = new Integer((-1));
-      vfModuleMetaData0.setAttribute("&$*6wB^=VXY/.Gj`T", integer1);
-      Map<String, String> map2 = vfModuleMetaData0.getProperties();
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map2);
-      Map<String, String> map3 = vfModuleMetaData0.getProperties();
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map3);
-      List<Boolean> list1 = (List<Boolean>) mock(List.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(list1).toString();
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "artifacts", (Object) list1);
-      List<String> list2 = vfModuleMetaData0.getArtifacts();
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "properties", (Object) map3);
-      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "artifacts", (Object) list2);
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.getVfModuleModelUUID();
-      vfModuleMetaData0.setAttribute("", "");
-      vfModuleMetaData0.setAttribute("X0s-/&YT>", "X0s-/&YT>");
-      vfModuleMetaData0.getArtifacts();
-      vfModuleMetaData0.setAttribute("vfModuleModelUUID", "");
-      vfModuleMetaData0.setAttribute("RHO{0R!FJsK+:s.q", "");
-      vfModuleMetaData0.setAttribute((String) null, "");
-      vfModuleMetaData0.setAttribute("", "");
-      vfModuleMetaData0.getVfModuleModelUUID();
-      vfModuleMetaData0.getArtifacts();
-      vfModuleMetaData0.getProperties();
-      vfModuleMetaData0.getVfModuleModelUUID();
-      vfModuleMetaData0.getArtifacts();
-      vfModuleMetaData0.setAttribute("", "");
-      vfModuleMetaData0.getVfModuleModelUUID();
-      vfModuleMetaData0.getArtifacts();
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.setAttribute("6NJ#o #-{", "6NJ#o #-{");
-      vfModuleMetaData0.setAttribute("", "");
-      vfModuleMetaData0.setAttribute("", "3o(D\" <bgGVHg");
-      vfModuleMetaData0.setAttribute("vfModuleModelVersion", "");
-      vfModuleMetaData0.setAttribute("y", "");
-      vfModuleMetaData0.setAttribute("", "");
-      vfModuleMetaData0.getVfModuleModelVersion();
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.setAttribute("vfModuleModelDescription", "vfModuleModelDescription");
-      vfModuleMetaData0.setAttribute("vfModuleModelDescription", "vfModuleModelDescription");
-      vfModuleMetaData0.getArtifacts();
-      vfModuleMetaData0.setAttribute("", "");
-      vfModuleMetaData0.setAttribute("vfModuleModelDescription", "");
-      vfModuleMetaData0.setAttribute("", "");
-      vfModuleMetaData0.setAttribute("z9,}N0\"L]xH@", (Object) null);
-      vfModuleMetaData0.getProperties();
-      vfModuleMetaData0.getVfModuleModelDescription();
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.setAttribute("", (Object) null);
-      vfModuleMetaData0.getVfModuleModelDescription();
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.getArtifacts();
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      vfModuleMetaData0.setAttribute((String) null, (Object) null);
-      vfModuleMetaData0.setAttribute("vfModuleModelUUID", "vfModuleModelUUID");
-      vfModuleMetaData0.getProperties();
-      vfModuleMetaData0.getVfModuleModelDescription();
-      vfModuleMetaData0.getVfModuleModelUUID();
-      vfModuleMetaData0.getArtifacts();
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.getVfModuleModelUUID();
-      VfModuleMetaData vfModuleMetaData1 = new VfModuleMetaData();
-      assertNull(vfModuleMetaData1.getVfModuleModelName());
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.setAttribute("a.8XV,jQU\"Su_&pz", (Object) null);
-      vfModuleMetaData0.setAttribute("<A|K", "vfModuleModelInvariantUUID");
-      vfModuleMetaData0.setAttribute("vfModuleModelInvariantUUID", "vfModuleModelInvariantUUID");
-      vfModuleMetaData0.setAttribute("vfModuleModelInvariantUUID", "");
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.setAttribute("vfModuleModelUUID", "vfModuleModelUUID");
-      Map<String, String> map0 = vfModuleMetaData0.getProperties();
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      vfModuleMetaData0.setAttribute("", "");
-      vfModuleMetaData0.setAttribute("", "w(f2d");
-      vfModuleMetaData0.setAttribute("", map0);
-      vfModuleMetaData0.setAttribute("<A|K", "");
-      vfModuleMetaData0.setAttribute("", "");
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      vfModuleMetaData0.getVfModuleModelDescription();
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.setAttribute("vfModuleModelDescription", "vfModuleModelDescription");
-      Map<String, String> map0 = vfModuleMetaData0.getProperties();
-      vfModuleMetaData0.setAttribute("vfModuleModelDescription", "vfModuleModelDescription");
-      vfModuleMetaData0.setAttribute("vfModuleModelDescription", map0);
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      vfModuleMetaData0.getArtifacts();
-      vfModuleMetaData0.getProperties();
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.getVfModuleModelDescription();
-        fail("Expecting exception: ClassCastException");
-
-      } catch(ClassCastException e) {
-         //
-         // java.util.HashMap cannot be cast to java.lang.String
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.setAttribute("vfModuleModelDescription", "vfModuleModelDescription");
-      vfModuleMetaData0.setAttribute("}U?", "");
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.setAttribute("f78C:y", (Object) null);
-      vfModuleMetaData0.getArtifacts();
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.getVfModuleModelUUID();
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.getVfModuleModelDescription();
-      vfModuleMetaData0.setAttribute("", "");
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.getVfModuleModelDescription();
-      vfModuleMetaData0.getVfModuleModelName();
-      vfModuleMetaData0.getProperties();
-      vfModuleMetaData0.getVfModuleModelVersion();
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.setAttribute("Q> 'piXimPhE", "Q> 'piXimPhE");
-      vfModuleMetaData0.setAttribute("Q> 'piXimPhE", "(");
-      vfModuleMetaData0.setAttribute("D0kbC~", "Q> 'piXimPhE");
-      vfModuleMetaData0.setAttribute("", "D0kbC~");
-      vfModuleMetaData0.setAttribute("(", "");
-      vfModuleMetaData0.setAttribute("vfModuleModelVersion", "][,6>~[xc,");
-      vfModuleMetaData0.setAttribute("", "(");
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      vfModuleMetaData0.getVfModuleModelDescription();
-      vfModuleMetaData0.getVfModuleModelDescription();
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.setAttribute("D0kbC~", "vfModuleModelVersion");
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.setAttribute("vfModuleModelUUID", "");
-      vfModuleMetaData0.setAttribute("vfModuleModelCustomizationUUID", "");
-      vfModuleMetaData0.setAttribute("", "");
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.setAttribute("", "");
-      vfModuleMetaData0.setAttribute("isBase", "isBase");
-      vfModuleMetaData0.setAttribute("isBase", "");
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      vfModuleMetaData0.getArtifacts();
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.isBase();
-        fail("Expecting exception: ClassCastException");
-
-      } catch(ClassCastException e) {
-         //
-         // java.lang.String cannot be cast to java.lang.Boolean
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.setAttribute("vfModuleModelName", "vfModuleModelName");
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      vfModuleMetaData0.setAttribute("mp+0S", (Object) null);
-      vfModuleMetaData0.setAttribute("EVNf'G}^Q", "mp+0S");
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      vfModuleMetaData0.getVfModuleModelName();
-      vfModuleMetaData0.getVfModuleModelName();
-      vfModuleMetaData0.getArtifacts();
-      vfModuleMetaData0.getVfModuleModelName();
-      vfModuleMetaData0.setAttribute("Pw5`cyIph)xX&#zj~'", (Object) null);
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.getVfModuleModelName();
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.setAttribute("vfModuleModelName", "vfModuleModelName");
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.setAttribute("", (Object) null);
-      vfModuleMetaData0.setAttribute((String) null, "vfModuleModelName");
-      vfModuleMetaData0.setAttribute("vfModuleModelName", "");
-      vfModuleMetaData0.getVfModuleModelDescription();
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      vfModuleMetaData0.getProperties();
-      vfModuleMetaData0.getProperties();
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      vfModuleMetaData0.getVfModuleModelName();
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.setAttribute("vfModuleModelInvariantUUID", "vfModuleModelInvariantUUID");
-      vfModuleMetaData0.setAttribute("vfModuleModelInvariantUUID", "vfModuleModelInvariantUUID");
-      vfModuleMetaData0.getVfModuleModelUUID();
-      vfModuleMetaData0.getVfModuleModelName();
-      vfModuleMetaData0.getProperties();
-      vfModuleMetaData0.setAttribute("k", "k");
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      vfModuleMetaData0.setAttribute("", (Object) null);
-      VfModuleMetaData vfModuleMetaData1 = new VfModuleMetaData();
-      vfModuleMetaData1.getProperties();
-      // Undeclared exception!
-      try {
-        vfModuleMetaData1.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.setAttribute("y&g B,yQlt!e=p`Q1", "y&g B,yQlt!e=p`Q1");
-      vfModuleMetaData0.setAttribute("vfModuleModelCustomizationUUID", "vfModuleModelCustomizationUUID");
-      vfModuleMetaData0.setAttribute("vfModuleModelCustomizationUUID", "vfModuleModelCustomizationUUID");
-      vfModuleMetaData0.setAttribute("y&g B,yQlt!e=p`Q1", "vfModuleModelCustomizationUUID");
-      vfModuleMetaData0.setAttribute("vfModuleModelCustomizationUUID", (Object) null);
-      vfModuleMetaData0.setAttribute("3m%.ng=pp5", "vfModuleModelCustomizationUUID");
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      vfModuleMetaData0.setAttribute((String) null, (Object) null);
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      vfModuleMetaData0.setAttribute((String) null, "vfModuleModelDescription");
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      vfModuleMetaData0.setAttribute("n8'>kSe2Hv:m| ", "vfModuleModelCustomizationUUID");
-      vfModuleMetaData0.getVfModuleModelUUID();
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      vfModuleMetaData0.getVfModuleModelName();
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      vfModuleMetaData0.getVfModuleModelVersion();
-      String string0 = vfModuleMetaData0.getVfModuleModelVersion();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.getVfModuleModelDescription();
-      vfModuleMetaData0.setAttribute((String) null, (Object) null);
-      vfModuleMetaData0.getVfModuleModelName();
-      vfModuleMetaData0.getVfModuleModelVersion();
-      vfModuleMetaData0.setAttribute(".+7u)hv;7kUOz", (Object) null);
-      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
-      vfModuleMetaData0.getVfModuleModelInvariantUUID();
-      String string0 = vfModuleMetaData0.getVfModuleModelUUID();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      String string0 = "$";
-      vfModuleMetaData0.setAttribute("$", "$");
-      vfModuleMetaData0.setAttribute("$", "");
-      vfModuleMetaData0.setAttribute("", "$");
-      // Undeclared exception!
-      try {
-        vfModuleMetaData0.isBase();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-      vfModuleMetaData0.getArtifacts();
-      Map<String, String> map0 = vfModuleMetaData0.getProperties();
-      assertEquals(0, map0.size());
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleMetaDataESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleMetaDataESTestscaffolding.java
deleted file mode 100644
index 39bb3a7227..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleMetaDataESTestscaffolding.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Fri Feb 24 16:02:34 GMT 2017
- */
-
-package org.openecomp.mso.asdc.installer;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-import org.evosuite.runtime.sandbox.Sandbox.SandboxMode;
-
-@EvoSuiteClassExclude
-public class VfModuleMetaDataESTestscaffolding {
-
-  @org.junit.Rule
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) System.getProperties().clone();
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass
-  public static void initEvoSuiteFramework() {
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.installer.VfModuleMetaData";
-    org.evosuite.runtime.GuiSupport.initialize();
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = SandboxMode.RECOMMENDED;
-    Sandbox.initializeSecurityManagerForSUT();
-    org.evosuite.runtime.classhandling.JDKClassResetter.init();
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
-  }
-
-  @AfterClass
-  public static void clearEvoSuiteFramework(){
-    Sandbox.resetDefaultSecurityManager();
-    System.setProperties((java.util.Properties) defaultProperties.clone());
-  }
-
-  @Before
-  public void initTestCase(){
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
-    Sandbox.goingToExecuteSUTCode();
-    org.evosuite.runtime.GuiSupport.setHeadless();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
-    org.evosuite.runtime.agent.InstrumentingAgent.activate();
-  }
-
-  @After
-  public void doneWithTestCase(){
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
-    resetClasses();
-    Sandbox.doneWithExecutingSUTCode();
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
-  }
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(VfModuleMetaDataESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.asdc.installer.VfModuleMetaData",
-      "org.openecomp.mso.asdc.installer.IVfModuleData"
-    );
-  }
-
-  private static void resetClasses() {
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleStructureESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleStructureESTest.java
deleted file mode 100644
index e63680b4c7..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleStructureESTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Feb 24 13:34:51 GMT 2017
- */
-
-package org.openecomp.mso.asdc.installer;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.shaded.org.mockito.Mockito.*;
-import static org.evosuite.runtime.MockitoExtension.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.asdc.installer.IVfModuleData;
-import org.openecomp.mso.asdc.installer.VfModuleArtifact;
-import org.openecomp.mso.asdc.installer.VfModuleStructure;
-import org.openecomp.mso.asdc.installer.VfResourceStructure;
-import org.openecomp.mso.db.catalog.beans.VfModule;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class VfModuleStructureESTest extends VfModuleStructureESTestscaffolding {
-
-    @Test(timeout = 4000)
-    public void test0()  throws Throwable  {
-        LinkedList<String> linkedList0 = new LinkedList<String>();
-        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
-        doReturn(linkedList0).when(iVfModuleData0).getArtifacts();
-        VfModuleStructure vfModuleStructure0 = new VfModuleStructure((VfResourceStructure) null, iVfModuleData0);
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setIsBase(1);
-        vfModuleStructure0.setCatalogVfModule(vfModule0);
-        VfModule vfModule1 = vfModuleStructure0.getCatalogVfModule();
-        assertNull(vfModule1.getModelInvariantUuid());
-    }
-
-    @Test(timeout = 4000)
-    public void test1()  throws Throwable  {
-        LinkedList<String> linkedList0 = new LinkedList<String>();
-        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
-        doReturn(linkedList0).when(iVfModuleData0).getArtifacts();
-        VfModuleStructure vfModuleStructure0 = new VfModuleStructure((VfResourceStructure) null, iVfModuleData0);
-        VfModule vfModule0 = new VfModule();
-        vfModuleStructure0.setCatalogVfModule(vfModule0);
-        VfModule vfModule1 = vfModuleStructure0.getCatalogVfModule();
-        assertNull(vfModule1.getModelVersion());
-    }
- @Test(timeout = 4000)
-    public void test4()  throws Throwable  {
-        LinkedList<String> linkedList0 = new LinkedList<String>();
-        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
-        doReturn(linkedList0).when(iVfModuleData0).getArtifacts();
-        VfModuleStructure vfModuleStructure0 = new VfModuleStructure((VfResourceStructure) null, iVfModuleData0);
-        Map<String, List<VfModuleArtifact>> map0 = vfModuleStructure0.getArtifactsMap();
-        assertTrue(map0.isEmpty());
-    }
-
-    @Test(timeout = 4000)
-    public void test5()  throws Throwable  {
-        INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-        IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-        VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
-        doReturn((List) null).when(iVfModuleData0).getArtifacts();
-        VfModuleStructure vfModuleStructure0 = null;
-        try {
-            vfModuleStructure0 = new VfModuleStructure(vfResourceStructure0, iVfModuleData0);
-            fail("Expecting exception: NullPointerException");
-
-        } catch(NullPointerException e) {
-            //
-            // no message in exception (getMessage() returned null)
-            //
-            verifyException("org.openecomp.mso.asdc.installer.VfModuleStructure", e);
-        }
-    }
-
-    @Test(timeout = 4000)
-    public void test6()  throws Throwable  {
-        LinkedList<String> linkedList0 = new LinkedList<String>();
-        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
-        doReturn(linkedList0).when(iVfModuleData0).getArtifacts();
-        VfModuleStructure vfModuleStructure0 = new VfModuleStructure((VfResourceStructure) null, iVfModuleData0);
-        VfModule vfModule0 = vfModuleStructure0.getCatalogVfModule();
-        assertNull(vfModule0);
-    }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleStructureESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleStructureESTestscaffolding.java
deleted file mode 100644
index f6aa2ab5f2..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleStructureESTestscaffolding.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Fri Nov 25 13:37:00 GMT 2016
- */
-
-package org.openecomp.mso.asdc.installer;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-
-@EvoSuiteClassExclude
-public class VfModuleStructureESTestscaffolding {
-
-  @org.junit.Rule 
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.installer.VfModuleStructure"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
-
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
-
-  @Before 
-  public void initTestCase(){ 
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
-
-  @After 
-  public void doneWithTestCase(){ 
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(VfModuleStructureESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.sdc.api.IDistributionClient",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.asdc.installer.VfResourceStructure",
-      "org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException",
-      "org.openecomp.mso.db.catalog.beans.VnfResource",
-      "org.openecomp.sdc.api.notification.IVfModuleMetadata",
-      "org.openecomp.mso.db.catalog.beans.VfModule",
-      "org.openecomp.sdc.api.results.IDistributionClientResult",
-      "org.openecomp.sdc.api.notification.IArtifactInfo",
-      "org.openecomp.mso.db.catalog.beans.Service",
-      "org.openecomp.mso.asdc.installer.VfModuleStructure",
-      "org.openecomp.sdc.api.notification.INotificationData",
-      "org.openecomp.mso.asdc.installer.VfModuleArtifact",
-      "org.openecomp.sdc.api.notification.IResourceInstance",
-      "org.openecomp.sdc.api.results.IDistributionClientDownloadResult"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(VfModuleStructureESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException"
-    );
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTest.java
deleted file mode 100644
index 2e73096337..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTest.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Mar 13 16:09:00 GMT 2017
- */
-
-package org.openecomp.mso.asdc.util;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.shaded.org.mockito.Mockito.*;
-import static org.evosuite.runtime.MockitoExtension.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.UnaryOperator;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.PrivateAccess;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.asdc.installer.IVfModuleData;
-import org.openecomp.mso.asdc.installer.VfModuleMetaData;
-import org.openecomp.mso.asdc.util.ASDCNotificationLogging;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class ASDCNotificationLoggingESTest extends ASDCNotificationLoggingESTestscaffolding {
-
-    @Test(timeout = 4000)
-    public void test00()  throws Throwable  {
-        LinkedList<IVfModuleData> linkedList0 = new LinkedList<IVfModuleData>();
-        VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-        vfModuleMetaData0.setAttribute("vfModuleModelInvariantUUID", vfModuleMetaData0);
-        linkedList0.add((IVfModuleData) vfModuleMetaData0);
-        // Undeclared exception!
-        try {
-            ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-            fail("Expecting exception: ClassCastException");
-
-        } catch(ClassCastException e) {
-            //
-            // org.openecomp.mso.asdc.installer.VfModuleMetaData cannot be cast to java.lang.String
-            //
-            verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-        }
-    }
-
-    @Test(timeout = 4000)
-    public void test01()  throws Throwable  {
-        List<IArtifactInfo> list0 = (List<IArtifactInfo>) mock(List.class, new ViolatedAssumptionAnswer());
-        doReturn(false).when(list0).isEmpty();
-        doReturn((Iterator) null).when(list0).iterator();
-        doReturn(0).when(list0).size();
-        INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-        doReturn("rGQA").when(iNotificationData0).getDistributionID();
-        doReturn(list0).when(iNotificationData0).getServiceArtifacts();
-        doReturn("rGQA").when(iNotificationData0).getServiceDescription();
-        doReturn("").when(iNotificationData0).getServiceInvariantUUID();
-        doReturn("").when(iNotificationData0).getServiceName();
-        doReturn("rGQA").when(iNotificationData0).getServiceUUID();
-        doReturn("").when(iNotificationData0).getServiceVersion();
-        // Undeclared exception!
-        try {
-            ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-            fail("Expecting exception: NullPointerException");
-
-        } catch(NullPointerException e) {
-            //
-            // no message in exception (getMessage() returned null)
-            //
-            verifyException("org.openecomp.mso.asdc.util.ASDCNotificationLogging", e);
-        }
-    }
-
-    @Test(timeout = 4000)
-    public void test02()  throws Throwable  {
-        LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
-        LinkedList<IArtifactInfo> linkedList1 = new LinkedList<IArtifactInfo>();
-        linkedList0.offerFirst((IResourceInstance) null);
-        INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-        doReturn("").when(iNotificationData0).getDistributionID();
-        doReturn(linkedList0, linkedList0).when(iNotificationData0).getResources();
-        doReturn(linkedList1).when(iNotificationData0).getServiceArtifacts();
-        doReturn("").when(iNotificationData0).getServiceDescription();
-        doReturn("]U5JAkfdX0Cs").when(iNotificationData0).getServiceInvariantUUID();
-        doReturn("jV13a").when(iNotificationData0).getServiceName();
-        doReturn("").when(iNotificationData0).getServiceUUID();
-        doReturn("jV13a").when(iNotificationData0).getServiceVersion();
-        String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-        assertEquals("ASDC Notification:\nDistributionID:\nServiceName:jV13a\nServiceVersion:jV13a\nServiceUUID:\nServiceInvariantUUID:]U5JAkfdX0Cs\nServiceDescription:\nService Artifacts List:\nNULL\nResource Instances List:\n{\nNULL\n\n}\n\n", string0);
-    }
-
-    @Test(timeout = 4000)
-    public void test03()  throws Throwable  {
-        LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
-        LinkedList<IArtifactInfo> linkedList1 = new LinkedList<IArtifactInfo>();
-        IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-        doReturn((List) null).when(iResourceInstance0).getArtifacts();
-        doReturn((String) null).when(iResourceInstance0).getCategory();
-        doReturn((String) null).when(iResourceInstance0).getResourceCustomizationUUID();
-        doReturn((String) null).when(iResourceInstance0).getResourceInstanceName();
-        doReturn((String) null).when(iResourceInstance0).getResourceInvariantUUID();
-        doReturn((String) null).when(iResourceInstance0).getResourceName();
-        doReturn((String) null).when(iResourceInstance0).getResourceType();
-        doReturn((String) null).when(iResourceInstance0).getResourceUUID();
-        doReturn((String) null).when(iResourceInstance0).getResourceVersion();
-        doReturn((String) null).when(iResourceInstance0).getSubcategory();
-        linkedList0.add(iResourceInstance0);
-        INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-        doReturn("").when(iNotificationData0).getDistributionID();
-        doReturn(linkedList0, linkedList0).when(iNotificationData0).getResources();
-        doReturn(linkedList1).when(iNotificationData0).getServiceArtifacts();
-        doReturn("").when(iNotificationData0).getServiceDescription();
-        doReturn("").when(iNotificationData0).getServiceInvariantUUID();
-        doReturn("36-s.n1@").when(iNotificationData0).getServiceName();
-        doReturn("36-s.n1@").when(iNotificationData0).getServiceUUID();
-        doReturn("").when(iNotificationData0).getServiceVersion();
-        String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-        assertEquals("ASDC Notification:\nDistributionID:\nServiceName:36-s.n1@\nServiceVersion:\nServiceUUID:36-s.n1@\nServiceInvariantUUID:\nServiceDescription:\nService Artifacts List:\nNULL\nResource Instances List:\n{\nResource Instance Info:\nResourceInstanceName:NULL\nResourceCustomizationUUID:NULL\nResourceInvariantUUID:NULL\nResourceName:NULL\nResourceType:NULL\nResourceUUID:NULL\nResourceVersion:NULL\nCategory:NULL\nSubCategory:NULL\nResource Artifacts List:\nNULL\n\n\n}\n\n", string0);
-    }
-
-    @Test(timeout = 4000)
-    public void test04()  throws Throwable  {
-        INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-        doReturn((String) null).when(iNotificationData0).getDistributionID();
-        doReturn((List) null).when(iNotificationData0).getResources();
-        doReturn((List) null).when(iNotificationData0).getServiceArtifacts();
-        doReturn((String) null).when(iNotificationData0).getServiceDescription();
-        doReturn((String) null).when(iNotificationData0).getServiceInvariantUUID();
-        doReturn((String) null).when(iNotificationData0).getServiceName();
-        doReturn((String) null).when(iNotificationData0).getServiceUUID();
-        doReturn((String) null).when(iNotificationData0).getServiceVersion();
-        String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-        assertEquals("ASDC Notification:\nDistributionID:NULL\nServiceName:NULL\nServiceVersion:NULL\nServiceUUID:NULL\nServiceInvariantUUID:NULL\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\nNULL\n", string0);
-    }
-
-    @Test(timeout = 4000)
-    public void test05()  throws Throwable  {
-        LinkedList<IVfModuleData> linkedList0 = new LinkedList<IVfModuleData>();
-        VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-        Map<String, String> map0 = vfModuleMetaData0.getProperties();
-        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
-        doReturn((List<String>) null, (List<String>) null).when(iVfModuleData0).getArtifacts();
-        doReturn(map0, map0, (Map<String, String>) null).when(iVfModuleData0).getProperties();
-        doReturn("vfModuleModelUUID", "isBase:").when(iVfModuleData0).getVfModuleModelDescription();
-        doReturn((String) null, "vfModuleModelName").when(iVfModuleData0).getVfModuleModelInvariantUUID();
-        doReturn("", "").when(iVfModuleData0).getVfModuleModelName();
-        doReturn("vfModuleModelUUID", "isBase:").when(iVfModuleData0).getVfModuleModelUUID();
-        doReturn("|:\\KD91", "vfModuleModelName").when(iVfModuleData0).getVfModuleModelVersion();
-        doReturn(false, false).when(iVfModuleData0).isBase();
-        linkedList0.add(iVfModuleData0);
-        String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-        assertEquals("VfModuleMetaData List:\n{\nVfModuleMetaData:\nVfModuleModelName:\nVfModuleModelVersion:|:\\KD91\nVfModuleModelUUID:vfModuleModelUUID\nVfModuleModelInvariantUUID:NULL\nVfModuleModelDescription:vfModuleModelUUID\nArtifacts UUID List:NULLProperties List:\n}\n\nisBase:false\n\n\n}\n", string0);
-
-        String string1 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-        assertEquals("VfModuleMetaData List:\n{\nVfModuleMetaData:\nVfModuleModelName:\nVfModuleModelVersion:vfModuleModelName\nVfModuleModelUUID:isBase:\nVfModuleModelInvariantUUID:vfModuleModelName\nVfModuleModelDescription:isBase:\nArtifacts UUID List:NULLNULL\nisBase:false\n\n\n}\n", string1);
-    }
-
-    @Test(timeout = 4000)
-    public void test06()  throws Throwable  {
-        LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
-        LinkedList<IVfModuleData> linkedList1 = new LinkedList<IVfModuleData>();
-        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
-        doReturn((List) null, (List) null).when(iVfModuleData0).getArtifacts();
-        doReturn((Map) null, (Map) null).when(iVfModuleData0).getProperties();
-        doReturn((String) null, (String) null).when(iVfModuleData0).getVfModuleModelDescription();
-        doReturn((String) null, (String) null).when(iVfModuleData0).getVfModuleModelInvariantUUID();
-        doReturn((String) null, (String) null).when(iVfModuleData0).getVfModuleModelName();
-        doReturn((String) null, (String) null).when(iVfModuleData0).getVfModuleModelUUID();
-        doReturn((String) null, (String) null).when(iVfModuleData0).getVfModuleModelVersion();
-        doReturn(false, false).when(iVfModuleData0).isBase();
-        linkedList1.add(iVfModuleData0);
-        String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList1);
-        String string1 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList1);
-        assertTrue(string1.equals((Object)string0));
-        assertEquals("VfModuleMetaData List:\n{\nVfModuleMetaData:\nVfModuleModelName:NULL\nVfModuleModelVersion:NULL\nVfModuleModelUUID:NULL\nVfModuleModelInvariantUUID:NULL\nVfModuleModelDescription:NULL\nArtifacts UUID List:NULLNULL\nisBase:false\n\n\n}\n", string1);
-    }
-
-    @Test(timeout = 4000)
-    public void test07()  throws Throwable  {
-        LinkedList<IVfModuleData> linkedList0 = new LinkedList<IVfModuleData>();
-        VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-        linkedList0.add((IVfModuleData) vfModuleMetaData0);
-        UnaryOperator<IVfModuleData> unaryOperator0 = (UnaryOperator<IVfModuleData>) mock(UnaryOperator.class, new ViolatedAssumptionAnswer());
-        doReturn((Object) null).when(unaryOperator0).apply(any());
-        linkedList0.replaceAll(unaryOperator0);
-        String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-        assertEquals("VfModuleMetaData List:\n{\nNULL\n\n}\n", string0);
-    }
-
-    @Test(timeout = 4000)
-    public void test08()  throws Throwable  {
-        LinkedList<IVfModuleData> linkedList0 = new LinkedList<IVfModuleData>();
-        VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
-        linkedList0.add((IVfModuleData) vfModuleMetaData0);
-        // Undeclared exception!
-        try {
-            ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-            fail("Expecting exception: NullPointerException");
-
-        } catch(NullPointerException e) {
-            //
-            // no message in exception (getMessage() returned null)
-            //
-            verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
-        }
-    }
-
-    @Test(timeout = 4000)
-    public void test09()  throws Throwable  {
-        String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleData>) null);
-        assertNull(string0);
-    }
-
-    @Test(timeout = 4000)
-    public void test10()  throws Throwable  {
-        String string0 = ASDCNotificationLogging.dumpASDCNotification((INotificationData) null);
-        assertEquals("NULL", string0);
-    }
-
-    @Test(timeout = 4000)
-    public void test11()  throws Throwable  {
-        LinkedList<IArtifactInfo> linkedList0 = new LinkedList<IArtifactInfo>();
-        INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-        doReturn("io7<{~.v|%").when(iNotificationData0).getDistributionID();
-        doReturn((List<IResourceInstance>) null).when(iNotificationData0).getResources();
-        doReturn(linkedList0).when(iNotificationData0).getServiceArtifacts();
-        doReturn("io7<{~.v|%").when(iNotificationData0).getServiceDescription();
-        doReturn("io7<{~.v|%").when(iNotificationData0).getServiceInvariantUUID();
-        doReturn("io7<{~.v|%").when(iNotificationData0).getServiceName();
-        doReturn((String) null).when(iNotificationData0).getServiceUUID();
-        doReturn("io7<{~.v|%").when(iNotificationData0).getServiceVersion();
-        String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-        assertEquals("ASDC Notification:\nDistributionID:io7<{~.v|%\nServiceName:io7<{~.v|%\nServiceVersion:io7<{~.v|%\nServiceUUID:NULL\nServiceInvariantUUID:io7<{~.v|%\nServiceDescription:io7<{~.v|%\nService Artifacts List:\nNULL\nResource Instances List:\nNULL\n", string0);
-
-        ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleData>) null);
-        IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-        doReturn((String) null).when(iArtifactInfo0).getArtifactChecksum();
-        doReturn((String) null).when(iArtifactInfo0).getArtifactDescription();
-        doReturn((String) null).when(iArtifactInfo0).getArtifactName();
-        doReturn((Integer) null).when(iArtifactInfo0).getArtifactTimeout();
-        doReturn((String) null).when(iArtifactInfo0).getArtifactType();
-        doReturn((String) null).when(iArtifactInfo0).getArtifactURL();
-        doReturn((String) null).when(iArtifactInfo0).getArtifactUUID();
-        doReturn((String) null).when(iArtifactInfo0).getArtifactVersion();
-        doReturn((IArtifactInfo) null).when(iArtifactInfo0).getGeneratedArtifact();
-        doReturn((List) null).when(iArtifactInfo0).getRelatedArtifacts();
-        linkedList0.push(iArtifactInfo0);
-        INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-        doReturn("t2J^4~*i|btm ib&").when(iNotificationData1).getDistributionID();
-        doReturn((List<IResourceInstance>) null).when(iNotificationData1).getResources();
-        doReturn(linkedList0).when(iNotificationData1).getServiceArtifacts();
-        doReturn("N~a W7").when(iNotificationData1).getServiceDescription();
-        doReturn("N~a W7").when(iNotificationData1).getServiceInvariantUUID();
-        doReturn("/&*/=").when(iNotificationData1).getServiceName();
-        doReturn((String) null).when(iNotificationData1).getServiceUUID();
-        doReturn("ASDC Notification:\nDistributionID:io7<{~.v|%\nServiceName:io7<{~.v|%\nServiceVersion:io7<{~.v|%\nServiceUUID:NULL\nServiceInvariantUUID:io7<{~.v|%\nServiceDescription:io7<{~.v|%\nService Artifacts List:\nNULL\nResource Instances List:\nNULL\n").when(iNotificationData1).getServiceVersion();
-        String string1 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
-        assertEquals("ASDC Notification:\nDistributionID:t2J^4~*i|btm ib&\nServiceName:/&*/=\nServiceVersion:ASDC Notification:\nDistributionID:io7<{~.v|%\nServiceName:io7<{~.v|%\nServiceVersion:io7<{~.v|%\nServiceUUID:NULL\nServiceInvariantUUID:io7<{~.v|%\nServiceDescription:io7<{~.v|%\nService Artifacts List:\nNULL\nResource Instances List:\nNULL\n\nServiceUUID:NULL\nServiceInvariantUUID:N~a W7\nServiceDescription:N~a W7\nService Artifacts List:\n{\nService Artifacts Info:\nArtifactName:NULL\nArtifactVersion:NULL\nArtifactType:NULL\nArtifactDescription:NULL\nArtifactTimeout:NULL\nArtifactURL:NULL\nArtifactUUID:NULL\nArtifactChecksum:NULL\nGeneratedArtifact:{NULL\n}\nRelatedArtifacts:NULL\n\n\n}\n\nResource Instances List:\nNULL\n", string1);
-    }
-
-    @Test(timeout = 4000)
-    public void test12()  throws Throwable  {
-        ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
-        Object object0 = PrivateAccess.callMethod((Class<ASDCNotificationLogging>) ASDCNotificationLogging.class, aSDCNotificationLogging0, "dumpASDCResourcesList", (Object) null, (Class<?>) INotificationData.class);
-        assertNull(object0);
-    }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTestscaffolding.java
deleted file mode 100644
index 62663e7397..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTestscaffolding.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Mon Mar 13 15:55:23 GMT 2017
- */
-
-package org.openecomp.mso.asdc.util;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-import org.evosuite.runtime.sandbox.Sandbox.SandboxMode;
-
-@EvoSuiteClassExclude
-public class ASDCNotificationLoggingESTestscaffolding {
-
-  @org.junit.Rule
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) System.getProperties().clone();
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass
-  public static void initEvoSuiteFramework() {
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.util.ASDCNotificationLogging";
-    org.evosuite.runtime.GuiSupport.initialize();
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = SandboxMode.RECOMMENDED;
-    Sandbox.initializeSecurityManagerForSUT();
-    org.evosuite.runtime.classhandling.JDKClassResetter.init();
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
-  }
-
-  @AfterClass
-  public static void clearEvoSuiteFramework(){
-    Sandbox.resetDefaultSecurityManager();
-    System.setProperties((java.util.Properties) defaultProperties.clone());
-  }
-
-  @Before
-  public void initTestCase(){
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
-    Sandbox.goingToExecuteSUTCode();
-    org.evosuite.runtime.GuiSupport.setHeadless();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
-    org.evosuite.runtime.agent.InstrumentingAgent.activate();
-  }
-
-  @After
-  public void doneWithTestCase(){
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
-    resetClasses();
-    Sandbox.doneWithExecutingSUTCode();
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
-  }
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(ASDCNotificationLoggingESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.sdc.api.notification.INotificationData",
-      "org.openecomp.mso.asdc.installer.VfModuleMetaData",
-      "org.openecomp.mso.asdc.installer.IVfModuleData",
-      "org.openecomp.sdc.api.notification.IResourceInstance",
-      "org.openecomp.sdc.api.notification.IArtifactInfo",
-      "org.openecomp.mso.asdc.util.ASDCNotificationLogging"
-    );
-  }
-
-  private static void resetClasses() {
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/YamlEditorESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/YamlEditorESTest.java
deleted file mode 100644
index c050a9cc20..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/YamlEditorESTest.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:17:51 GMT 2016
- */
-
-package org.openecomp.mso.asdc.util;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.shaded.org.mockito.Mockito.*;
-import static org.evosuite.runtime.MockitoExtension.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-
-import org.openecomp.mso.db.catalog.beans.HeatTemplateParam;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.PrivateAccess;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-import org.yaml.snakeyaml.Yaml;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class YamlEditorESTest extends YamlEditorESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      boolean boolean0 = yamlEditor0.isParentTemplate("file:///");
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      HashMap<String, Object> hashMap0 = new HashMap<String, Object>();
-      Yaml yaml0 = mock(Yaml.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null, (String) null).when(yaml0).dump(any());
-      PrivateAccess.setVariable((Class<YamlEditor>) YamlEditor.class, yamlEditor0, "yaml", (Object) yaml0);
-      yamlEditor0.encode((Map<String, Object>) hashMap0);
-      Map<String, Object> map0 = (Map<String, Object>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn((Object) null).when(map0).get(any());
-      PrivateAccess.setVariable((Class<YamlEditor>) YamlEditor.class, yamlEditor0, "yml", (Object) map0);
-      yamlEditor0.toString();
-      // Undeclared exception!
-      try { 
-        yamlEditor0.getYamlResourceTypeList();
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.util.YamlEditor", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      HashMap<Object, String> hashMap0 = new HashMap<Object, String>();
-      Yaml yaml0 = mock(Yaml.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<YamlEditor>) YamlEditor.class, yamlEditor0, "yaml", (Object) yaml0);
-      Object object0 = new Object();
-      Map<Integer, Object> map0 = (Map<Integer, Object>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn(hashMap0, object0).when(map0).get(any());
-      PrivateAccess.setVariable((Class<YamlEditor>) YamlEditor.class, yamlEditor0, "yml", (Object) map0);
-      yamlEditor0.getParameterList();
-      // Undeclared exception!
-      try { 
-        yamlEditor0.getYamlResourceTypeList();
-        fail("Expecting exception: ClassCastException");
-      
-      } catch(ClassCastException e) {
-         //
-         // java.lang.Object cannot be cast to java.util.Map
-         //
-         verifyException("org.openecomp.mso.asdc.util.YamlEditor", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      // Undeclared exception!
-      try { 
-        yamlEditor0.getYamlNestedFileResourceTypeList();
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.util.YamlEditor", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      HashMap<Object, String> hashMap0 = new HashMap<Object, String>();
-      Yaml yaml0 = mock(Yaml.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<YamlEditor>) YamlEditor.class, yamlEditor0, "yaml", (Object) yaml0);
-      Map<Integer, Object> map0 = (Map<Integer, Object>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn(hashMap0, (Object) null).when(map0).get(any());
-      PrivateAccess.setVariable((Class<YamlEditor>) YamlEditor.class, yamlEditor0, "yml", (Object) map0);
-      yamlEditor0.getYamlNestedFileResourceTypeList();
-      // Undeclared exception!
-      try { 
-        yamlEditor0.getParameterList();
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.util.YamlEditor", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      HashMap<String, Object> hashMap0 = new HashMap<String, Object>();
-      Set<Map.Entry<String, Object>> set0 = (Set<Map.Entry<String, Object>>)hashMap0.entrySet();
-      hashMap0.put("null\n", set0);
-      // Undeclared exception!
-      try { 
-        yamlEditor0.encode((Map<String, Object>) hashMap0);
-        fail("Expecting exception: StackOverflowError");
-      
-      } catch(StackOverflowError e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      Set<Map.Entry<String, Object>> set0 = (Set<Map.Entry<String, Object>>) mock(Set.class, new ViolatedAssumptionAnswer());
-      doReturn((Iterator) null).when(set0).iterator();
-      Map<String, Object> map0 = (Map<String, Object>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn(set0).when(map0).entrySet();
-      doReturn(2655).when(map0).size();
-      // Undeclared exception!
-      try { 
-        yamlEditor0.encode(map0);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.yaml.snakeyaml.representer.BaseRepresenter", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      Map<String, Object> map0 = (Map<String, Object>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn((-300)).when(map0).size();
-      // Undeclared exception!
-      try { 
-        yamlEditor0.encode(map0);
-        fail("Expecting exception: IllegalArgumentException");
-      
-      } catch(IllegalArgumentException e) {
-         //
-         // Illegal Capacity: -300
-         //
-         verifyException("java.util.ArrayList", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      byte[] byteArray0 = new byte[0];
-      YamlEditor yamlEditor0 = new YamlEditor(byteArray0);
-      Map<HeatTemplateParam, String> map0 = (Map<HeatTemplateParam, String>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn("").when(map0).get(any());
-      PrivateAccess.setVariable((Class<YamlEditor>) YamlEditor.class, yamlEditor0, "yml", (Object) map0);
-      LinkedHashSet<HeatTemplateParam> linkedHashSet0 = new LinkedHashSet<HeatTemplateParam>();
-      // Undeclared exception!
-      try { 
-        yamlEditor0.addParameterList(linkedHashSet0);
-        fail("Expecting exception: ClassCastException");
-      
-      } catch(ClassCastException e) {
-         //
-         // java.lang.String cannot be cast to java.util.Map
-         //
-         verifyException("org.openecomp.mso.asdc.util.YamlEditor", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      byte[] byteArray0 = new byte[1];
-      YamlEditor yamlEditor0 = null;
-      try {
-        yamlEditor0 = new YamlEditor(byteArray0);
-        fail("Expecting exception: RuntimeException");
-      
-      } catch(RuntimeException e) {
-         //
-         // special characters are not allowed
-         //
-         verifyException("org.yaml.snakeyaml.reader.StreamReader", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      byte[] byteArray0 = new byte[1];
-      byteArray0[0] = (byte)37;
-      YamlEditor yamlEditor0 = null;
-      try {
-        yamlEditor0 = new YamlEditor(byteArray0);
-        fail("Expecting exception: RuntimeException");
-      
-      } catch(RuntimeException e) {
-         //
-         // while scanning a directive
-         //  in 'reader', line 1, column 1:
-         //     %
-         //     ^
-         // expected alphabetic or numeric character, but found \u0000(0)
-         //  in 'reader', line 1, column 2:
-         //     %
-         //      ^
-         //
-         verifyException("org.yaml.snakeyaml.scanner.ScannerImpl", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      byte[] byteArray0 = new byte[2];
-      byteArray0[1] = (byte) (-80);
-      YamlEditor yamlEditor0 = null;
-      try {
-        yamlEditor0 = new YamlEditor(byteArray0);
-        fail("Expecting exception: RuntimeException");
-      
-      } catch(RuntimeException e) {
-         //
-         // java.nio.charset.MalformedInputException: Input length = 1
-         //
-         verifyException("org.yaml.snakeyaml.reader.StreamReader", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      byte[] byteArray0 = new byte[1];
-      byteArray0[0] = (byte)110;
-      YamlEditor yamlEditor0 = null;
-      try {
-        yamlEditor0 = new YamlEditor(byteArray0);
-        fail("Expecting exception: ClassCastException");
-      
-      } catch(ClassCastException e) {
-         //
-         // java.lang.String cannot be cast to java.util.Map
-         //
-         verifyException("org.openecomp.mso.asdc.util.YamlEditor", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      String string0 = yamlEditor0.encode();
-      assertEquals("null\n", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      HashMap<Object, String> hashMap0 = new HashMap<Object, String>();
-      Map<Integer, Object> map0 = (Map<Integer, Object>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn(hashMap0).when(map0).get(any());
-      PrivateAccess.setVariable((Class<YamlEditor>) YamlEditor.class, yamlEditor0, "yml", (Object) map0);
-      Set<HeatTemplateParam> set0 = (Set<HeatTemplateParam>) mock(Set.class, new ViolatedAssumptionAnswer());
-      doReturn((Iterator) null).when(set0).iterator();
-      // Undeclared exception!
-      try { 
-        yamlEditor0.addParameterList(set0);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.util.YamlEditor", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      byte[] byteArray0 = new byte[0];
-      YamlEditor yamlEditor0 = new YamlEditor(byteArray0);
-      HashMap<HeatTemplateParam, String> hashMap0 = new HashMap<HeatTemplateParam, String>();
-      PrivateAccess.setVariable((Class<YamlEditor>) YamlEditor.class, yamlEditor0, "yml", (Object) hashMap0);
-      LinkedHashSet<HeatTemplateParam> linkedHashSet0 = new LinkedHashSet<HeatTemplateParam>();
-      HeatTemplateParam heatTemplateParam0 = mock(HeatTemplateParam.class, new ViolatedAssumptionAnswer());
-      doReturn(">!=_`7`2d(").when(heatTemplateParam0).getParamName();
-      doReturn(">!=_`7`2d(").when(heatTemplateParam0).getParamType();
-      linkedHashSet0.add(heatTemplateParam0);
-      yamlEditor0.addParameterList(linkedHashSet0);
-      Set<HeatTemplateParam> set0 = yamlEditor0.getParameterList();
-      assertFalse(set0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      HashMap<Object, String> hashMap0 = new HashMap<Object, String>();
-      Map<Integer, Object> map0 = (Map<Integer, Object>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn(hashMap0).when(map0).get(any());
-      hashMap0.put(yamlEditor0, "V28");
-      PrivateAccess.setVariable((Class<YamlEditor>) YamlEditor.class, yamlEditor0, "yml", (Object) map0);
-      // Undeclared exception!
-      try { 
-        yamlEditor0.getParameterList();
-        fail("Expecting exception: ClassCastException");
-      
-      } catch(ClassCastException e) {
-         //
-         // java.lang.String cannot be cast to java.util.Map
-         //
-         verifyException("org.openecomp.mso.asdc.util.YamlEditor", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      HashMap<Object, String> hashMap0 = new HashMap<Object, String>();
-      Map<Integer, Object> map0 = (Map<Integer, Object>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn(hashMap0).when(map0).get(any());
-      PrivateAccess.setVariable((Class<YamlEditor>) YamlEditor.class, yamlEditor0, "yml", (Object) map0);
-      List<String> list0 = yamlEditor0.getYamlResourceTypeList();
-      assertEquals(0, list0.size());
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      // Undeclared exception!
-      try { 
-        yamlEditor0.isParentTemplate((String) null);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.util.YamlEditor", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      yamlEditor0.verifyTemplate();
-      yamlEditor0.isParentTemplate("\"");
-      Map<String, Object> map0 = (Map<String, Object>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn(yamlEditor0).when(map0).get(any());
-      PrivateAccess.setVariable((Class<YamlEditor>) YamlEditor.class, yamlEditor0, "yml", (Object) map0);
-      // Undeclared exception!
-      try { 
-        yamlEditor0.getYamlNestedFileResourceTypeList();
-        fail("Expecting exception: ClassCastException");
-      
-      } catch(ClassCastException e) {
-         //
-         // org.openecomp.mso.asdc.util.YamlEditor cannot be cast to java.util.Map
-         //
-         verifyException("org.openecomp.mso.asdc.util.YamlEditor", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      HashMap<String, Object> hashMap0 = new HashMap<String, Object>();
-      String string0 = yamlEditor0.encode((Map<String, Object>) hashMap0);
-      assertEquals("{}\n", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      YamlEditor yamlEditor0 = null;
-      try {
-        yamlEditor0 = new YamlEditor((byte[]) null);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      YamlEditor yamlEditor0 = new YamlEditor();
-      String string0 = yamlEditor0.toString();
-      assertEquals("null\n", string0);
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/YamlEditorESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/YamlEditorESTestscaffolding.java
deleted file mode 100644
index dca8696ef2..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/YamlEditorESTestscaffolding.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Fri Nov 25 13:17:51 GMT 2016
- */
-
-package org.openecomp.mso.asdc.util;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-
-@EvoSuiteClassExclude
-public class YamlEditorESTestscaffolding {
-
-  @org.junit.Rule 
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.util.YamlEditor"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
-
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
-
-  @Before 
-  public void initTestCase(){ 
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
-
-  @After 
-  public void doneWithTestCase(){ 
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(YamlEditorESTestscaffolding.class.getClassLoader() ,
-      "org.yaml.snakeyaml.parser.ParserImpl",
-      "org.yaml.snakeyaml.nodes.SequenceNode",
-      "org.yaml.snakeyaml.composer.ComposerException",
-      "org.yaml.snakeyaml.introspector.BeanAccess",
-      "org.yaml.snakeyaml.representer.Representer$RepresentJavaBean",
-      "org.yaml.snakeyaml.external.com.google.gdata.util.common.base.PercentEscaper",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentNumber",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentBoolean",
-      "org.yaml.snakeyaml.scanner.ScannerImpl$Chomping",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructYamlPairs",
-      "org.yaml.snakeyaml.emitter.Emitter$ExpectNothing",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentList",
-      "org.yaml.snakeyaml.events.Event",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructYamlInt",
-      "org.yaml.snakeyaml.nodes.Node",
-      "org.yaml.snakeyaml.introspector.MissingProperty",
-      "org.yaml.snakeyaml.emitter.Emitable",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructYamlTimestamp",
-      "org.yaml.snakeyaml.constructor.Constructor$ConstructYamlObject",
-      "org.yaml.snakeyaml.composer.Composer",
-      "org.yaml.snakeyaml.tokens.FlowMappingStartToken",
-      "org.yaml.snakeyaml.emitter.Emitter$ExpectDocumentStart",
-      "org.yaml.snakeyaml.constructor.SafeConstructor",
-      "org.yaml.snakeyaml.nodes.NodeId",
-      "org.yaml.snakeyaml.events.SequenceEndEvent",
-      "org.yaml.snakeyaml.events.MappingStartEvent",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentArray",
-      "org.yaml.snakeyaml.parser.Parser",
-      "org.yaml.snakeyaml.tokens.AnchorToken",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentDate",
-      "org.yaml.snakeyaml.parser.Production",
-      "org.yaml.snakeyaml.introspector.Property",
-      "org.yaml.snakeyaml.tokens.StreamStartToken",
-      "org.yaml.snakeyaml.DumperOptions$Version",
-      "org.yaml.snakeyaml.constructor.ConstructorException",
-      "org.yaml.snakeyaml.emitter.EmitterException",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructYamlBool",
-      "org.yaml.snakeyaml.error.MarkedYAMLException",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructYamlFloat",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentNull",
-      "org.yaml.snakeyaml.events.DocumentEndEvent",
-      "org.yaml.snakeyaml.error.Mark",
-      "org.yaml.snakeyaml.emitter.Emitter$ExpectFirstFlowMappingKey",
-      "org.yaml.snakeyaml.tokens.DocumentEndToken",
-      "org.yaml.snakeyaml.introspector.PropertyUtils",
-      "org.yaml.snakeyaml.external.com.google.gdata.util.common.base.Escaper",
-      "org.yaml.snakeyaml.events.StreamStartEvent",
-      "org.yaml.snakeyaml.error.YAMLException",
-      "org.yaml.snakeyaml.scanner.ScannerImpl",
-      "org.yaml.snakeyaml.reader.UnicodeReader",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructYamlOmap",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentMap",
-      "org.yaml.snakeyaml.parser.ParserImpl$ParseBlockNode",
-      "org.yaml.snakeyaml.external.com.google.gdata.util.common.base.UnicodeEscaper",
-      "org.yaml.snakeyaml.parser.ParserImpl$ParseDocumentStart",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructYamlNull",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructYamlStr",
-      "org.yaml.snakeyaml.events.CollectionEndEvent",
-      "org.yaml.snakeyaml.DumperOptions",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentSet",
-      "org.yaml.snakeyaml.resolver.Resolver",
-      "org.yaml.snakeyaml.tokens.Token",
-      "org.yaml.snakeyaml.events.SequenceStartEvent",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructYamlMap",
-      "org.yaml.snakeyaml.constructor.Constructor$ConstructMapping",
-      "org.yaml.snakeyaml.serializer.Serializer$1",
-      "org.yaml.snakeyaml.constructor.Constructor",
-      "org.yaml.snakeyaml.scanner.ScannerException",
-      "org.yaml.snakeyaml.tokens.ScalarToken",
-      "org.yaml.snakeyaml.resolver.ResolverTuple",
-      "org.yaml.snakeyaml.constructor.AbstractConstruct",
-      "org.yaml.snakeyaml.tokens.TagToken",
-      "org.yaml.snakeyaml.nodes.CollectionNode",
-      "org.yaml.snakeyaml.nodes.ScalarNode",
-      "org.yaml.snakeyaml.TypeDescription",
-      "org.yaml.snakeyaml.events.AliasEvent",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructYamlSet",
-      "org.yaml.snakeyaml.constructor.Constructor$ConstructSequence",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructYamlSeq",
-      "org.yaml.snakeyaml.reader.ReaderException",
-      "org.yaml.snakeyaml.tokens.DocumentStartToken",
-      "org.yaml.snakeyaml.util.UriEncoder",
-      "org.yaml.snakeyaml.serializer.SerializerException",
-      "org.yaml.snakeyaml.external.com.google.gdata.util.common.base.UnicodeEscaper$2",
-      "org.yaml.snakeyaml.events.MappingEndEvent",
-      "org.yaml.snakeyaml.parser.VersionTagsTuple",
-      "org.yaml.snakeyaml.DumperOptions$FlowStyle",
-      "org.yaml.snakeyaml.events.DocumentStartEvent",
-      "org.yaml.snakeyaml.tokens.FlowMappingEndToken",
-      "org.yaml.snakeyaml.emitter.Emitter$ExpectDocumentRoot",
-      "org.yaml.snakeyaml.representer.BaseRepresenter",
-      "org.yaml.snakeyaml.nodes.AnchorNode",
-      "org.yaml.snakeyaml.tokens.FlowSequenceStartToken",
-      "org.yaml.snakeyaml.tokens.FlowSequenceEndToken",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructYamlBinary",
-      "org.openecomp.mso.asdc.util.YamlEditor",
-      "org.yaml.snakeyaml.emitter.EmitterState",
-      "org.yaml.snakeyaml.events.Event$ID",
-      "org.yaml.snakeyaml.parser.ParserImpl$ParseImplicitDocumentStart",
-      "org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder",
-      "org.yaml.snakeyaml.DumperOptions$LineBreak",
-      "org.yaml.snakeyaml.constructor.Construct",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentEnum",
-      "org.yaml.snakeyaml.introspector.PropertyUtils$1",
-      "org.yaml.snakeyaml.serializer.Serializer",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentPrimitiveArray",
-      "org.yaml.snakeyaml.scanner.Constant",
-      "org.yaml.snakeyaml.representer.SafeRepresenter",
-      "org.openecomp.mso.db.catalog.beans.HeatTemplateParam",
-      "org.yaml.snakeyaml.parser.ParserException",
-      "org.yaml.snakeyaml.tokens.AliasToken",
-      "org.yaml.snakeyaml.emitter.ScalarAnalysis",
-      "org.yaml.snakeyaml.constructor.SafeConstructor$ConstructUndefined",
-      "org.yaml.snakeyaml.events.CollectionStartEvent",
-      "org.yaml.snakeyaml.parser.ParserImpl$ParseStreamStart",
-      "org.yaml.snakeyaml.DumperOptions$ScalarStyle",
-      "org.yaml.snakeyaml.tokens.StreamEndToken",
-      "org.yaml.snakeyaml.constructor.BaseConstructor",
-      "org.yaml.snakeyaml.representer.BaseRepresenter$1",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentByteArray",
-      "org.yaml.snakeyaml.nodes.MappingNode",
-      "org.yaml.snakeyaml.Yaml",
-      "org.yaml.snakeyaml.constructor.Constructor$ConstructScalar",
-      "org.yaml.snakeyaml.scanner.SimpleKey",
-      "org.yaml.snakeyaml.resolver.Resolver$1",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentIterator",
-      "org.yaml.snakeyaml.emitter.Emitter$ExpectStreamStart",
-      "org.yaml.snakeyaml.tokens.DirectiveToken",
-      "org.yaml.snakeyaml.representer.Represent",
-      "org.yaml.snakeyaml.events.StreamEndEvent",
-      "org.yaml.snakeyaml.tokens.Token$ID",
-      "org.yaml.snakeyaml.parser.ParserImpl$ParseDocumentEnd",
-      "org.yaml.snakeyaml.nodes.Tag",
-      "org.yaml.snakeyaml.util.ArrayStack",
-      "org.yaml.snakeyaml.representer.SafeRepresenter$RepresentString",
-      "org.yaml.snakeyaml.events.ImplicitTuple",
-      "org.yaml.snakeyaml.scanner.Scanner",
-      "org.yaml.snakeyaml.emitter.Emitter$ExpectFirstDocumentStart",
-      "org.yaml.snakeyaml.events.NodeEvent",
-      "org.yaml.snakeyaml.emitter.Emitter",
-      "org.yaml.snakeyaml.reader.StreamReader",
-      "org.yaml.snakeyaml.representer.Representer",
-      "org.yaml.snakeyaml.emitter.Emitter$ExpectDocumentEnd",
-      "org.yaml.snakeyaml.events.ScalarEvent"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(YamlEditorESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.yaml.snakeyaml.constructor.SafeConstructor",
-      "org.yaml.snakeyaml.nodes.NodeId",
-      "org.yaml.snakeyaml.external.com.google.gdata.util.common.base.UnicodeEscaper",
-      "org.yaml.snakeyaml.external.com.google.gdata.util.common.base.PercentEscaper",
-      "org.yaml.snakeyaml.util.UriEncoder",
-      "org.yaml.snakeyaml.nodes.Tag",
-      "org.yaml.snakeyaml.representer.SafeRepresenter",
-      "org.yaml.snakeyaml.DumperOptions$FlowStyle",
-      "org.yaml.snakeyaml.representer.BaseRepresenter$1",
-      "org.yaml.snakeyaml.DumperOptions$ScalarStyle",
-      "org.yaml.snakeyaml.DumperOptions$LineBreak",
-      "org.yaml.snakeyaml.resolver.Resolver",
-      "org.yaml.snakeyaml.introspector.BeanAccess",
-      "org.yaml.snakeyaml.reader.StreamReader",
-      "org.yaml.snakeyaml.reader.UnicodeReader",
-      "org.yaml.snakeyaml.error.YAMLException",
-      "org.yaml.snakeyaml.reader.ReaderException",
-      "org.yaml.snakeyaml.emitter.Emitter",
-      "org.yaml.snakeyaml.serializer.Serializer$1",
-      "org.yaml.snakeyaml.resolver.Resolver$1",
-      "org.yaml.snakeyaml.scanner.Constant",
-      "org.yaml.snakeyaml.introspector.PropertyUtils$1",
-      "org.yaml.snakeyaml.parser.ParserImpl",
-      "org.yaml.snakeyaml.scanner.ScannerImpl",
-      "org.yaml.snakeyaml.events.Event$ID",
-      "org.yaml.snakeyaml.tokens.Token$ID",
-      "org.yaml.snakeyaml.error.MarkedYAMLException",
-      "org.yaml.snakeyaml.scanner.ScannerException",
-      "org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder",
-      "org.yaml.snakeyaml.parser.ParserException",
-      "org.openecomp.mso.asdc.util.YamlEditor"
-    );
-  }
-}