Initial OpenECOMP MSO commit

Change-Id: Ia6a7574859480717402cc2f22534d9973a78fa6d
Signed-off-by: ChrisC <cc697w@intl.att.com>

32 files changed, 5073 insertions, 0 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
new file mode 100644
index 0000000000..9ca02e218a
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/ASDCControllerSingletonESTest.java
@@ -0,0 +1,38 @@
+/*
+ * 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
new file mode 100644
index 0000000000..e099e9ceaf
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/ASDCControllerSingletonESTestscaffolding.java
@@ -0,0 +1,120 @@
+/**
+ * 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
new file mode 100644
index 0000000000..e2112cee03
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/DistributionStatusMessageESTest.java
@@ -0,0 +1,134 @@
+/*
+ * 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
new file mode 100644
index 0000000000..f234ca64d5
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/DistributionStatusMessageESTestscaffolding.java
@@ -0,0 +1,79 @@
+/**
+ * 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
new file mode 100644
index 0000000000..37af59c639
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCControllerExceptionESTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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
new file mode 100644
index 0000000000..d6041c2fb2
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCControllerExceptionESTestscaffolding.java
@@ -0,0 +1,82 @@
+/**
+ * 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
new file mode 100644
index 0000000000..75f4b5d27c
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCDownloadExceptionESTest.java
@@ -0,0 +1,24 @@
+/*
+ * 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
new file mode 100644
index 0000000000..5db3c2098f
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCDownloadExceptionESTestscaffolding.java
@@ -0,0 +1,82 @@
+/**
+ * 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
new file mode 100644
index 0000000000..afc28346e3
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCParametersExceptionESTest.java
@@ -0,0 +1,24 @@
+/*
+ * 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
new file mode 100644
index 0000000000..ce3afc92cd
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ASDCParametersExceptionESTestscaffolding.java
@@ -0,0 +1,82 @@
+/**
+ * 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
new file mode 100644
index 0000000000..2a1c8177de
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ArtifactInstallerExceptionESTest.java
@@ -0,0 +1,24 @@
+/*
+ * 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
new file mode 100644
index 0000000000..0bd3d65f0e
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/exceptions/ArtifactInstallerExceptionESTestscaffolding.java
@@ -0,0 +1,82 @@
+/**
+ * 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/ASDCConfigurationTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCConfigurationTest.java
new file mode 100644
index 0000000000..168f830f83
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCConfigurationTest.java
@@ -0,0 +1,356 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.asdc.client.tests;
+
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import org.openecomp.mso.asdc.client.ASDCConfiguration;
+import org.openecomp.mso.asdc.client.exceptions.ASDCParametersException;
+import org.openecomp.mso.properties.MsoPropertiesException;
+import org.openecomp.mso.properties.MsoPropertiesFactory;
+
+/**
+ * THis class tests the ASDC Controller by using the ASDC Mock CLient
+ * 
+ *
+ */
+public class ASDCConfigurationTest {
+	
+	public static MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
+	public final String ASDC_PROP = ASDCConfigurationTest.class.getClassLoader().getResource("mso.json").toString().substring(5);
+	public final String ASDC_PROP2 = ASDCConfigurationTest.class.getClassLoader().getResource("mso2.json").toString().substring(5);
+	public final String ASDC_PROP3 = ASDCConfigurationTest.class.getClassLoader().getResource("mso3.json").toString().substring(5);
+	public final String ASDC_PROP_BAD = ASDCConfigurationTest.class.getClassLoader().getResource("mso-bad.json").toString().substring(5);
+	public final String ASDC_PROP_WITH_NULL = ASDCConfigurationTest.class.getClassLoader().getResource("mso-with-NULL.json").toString().substring(5);
+	public final String ASDC_PROP_DOUBLE_CONFIG = ASDCConfigurationTest.class.getClassLoader().getResource("mso-two-configs.json").toString().substring(5);
+	public final String ASDC_PROP4_WITH_TLS = ASDCConfigurationTest.class.getClassLoader().getResource("mso4-with-TLS.json").toString().substring(5);
+	
+	@BeforeClass
+	public static final void prepareBeforeAllTests() {
+		msoPropertiesFactory.removeAllMsoProperties();
+	}
+	
+	@Before
+	public final void prepareBeforeEachTest () throws MsoPropertiesException {
+		msoPropertiesFactory.initializeMsoProperties(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP);
+	}
+	
+	@After
+	public final void cleanAfterEachTest () {
+		msoPropertiesFactory.removeAllMsoProperties();
+	}
+	
+	@Test
+	public final void testTheInit() throws ASDCParametersException, IOException {
+		ASDCConfiguration asdcConfig = new ASDCConfiguration("asdc-controller1");
+		assertNotNull(asdcConfig.getUser());
+		assertTrue("User".equals(asdcConfig.getUser()));
+		
+		assertNotNull(asdcConfig.getPassword());
+		assertTrue("ThePassword".equals(asdcConfig.getPassword()));
+		
+		assertNotNull(asdcConfig.getConsumerGroup());
+		assertTrue("consumerGroup".equals(asdcConfig.getConsumerGroup()));
+		
+		assertNotNull(asdcConfig.getConsumerID());
+		assertTrue("consumerId".equals(asdcConfig.getConsumerID()));
+		
+		assertNotNull(asdcConfig.getEnvironmentName());
+		assertTrue("environmentName".equals(asdcConfig.getEnvironmentName()));
+		
+		assertNotNull(asdcConfig.getAsdcAddress());
+		assertTrue("hostname".equals(asdcConfig.getAsdcAddress()));
+		
+		assertNotNull(asdcConfig.getPollingInterval());
+		assertTrue(asdcConfig.getPollingInterval() == 10);
+		
+		assertNotNull(asdcConfig.getPollingTimeout());
+		assertTrue(asdcConfig.getPollingTimeout() == 30);
+		
+		assertNotNull(asdcConfig.getRelevantArtifactTypes());
+		assertTrue(asdcConfig.getRelevantArtifactTypes().size() == ASDCConfiguration.SUPPORTED_ARTIFACT_TYPES_LIST.size());
+		
+		assertFalse(asdcConfig.activateServerTLSAuth());
+		
+	}
+	
+	@Test
+	public final void testAllParametersMethod() throws ASDCParametersException, IOException {
+		ASDCConfiguration asdcConfig = new ASDCConfiguration("asdc-controller1");
+		
+		// No exception should be raised
+		asdcConfig.testAllParameters();
+	}
+
+	@Test
+	public final void testTheRefreshConfigFalseCase() throws ASDCParametersException, IOException {
+		ASDCConfiguration asdcConfig = new ASDCConfiguration("asdc-controller1");
+		
+		// No update should be done as we use the mso.properties located in the resource folder for testing
+		assertFalse(asdcConfig.hasASDCConfigChanged());
+		assertFalse(asdcConfig.refreshASDCConfig());
+		
+		assertNotNull(asdcConfig.getUser());
+		assertTrue("User".equals(asdcConfig.getUser()));
+		
+		assertNotNull(asdcConfig.getPassword());
+		assertTrue("ThePassword".equals(asdcConfig.getPassword()));
+		
+		assertNotNull(asdcConfig.getConsumerGroup());
+		assertTrue("consumerGroup".equals(asdcConfig.getConsumerGroup()));
+		
+		assertNotNull(asdcConfig.getConsumerID());
+		assertTrue("consumerId".equals(asdcConfig.getConsumerID()));
+		
+		assertNotNull(asdcConfig.getEnvironmentName());
+		assertTrue("environmentName".equals(asdcConfig.getEnvironmentName()));
+		
+		assertNotNull(asdcConfig.getAsdcAddress());
+		assertTrue("hostname".equals(asdcConfig.getAsdcAddress()));
+		
+		assertNotNull(asdcConfig.getPollingInterval());
+		assertTrue(asdcConfig.getPollingInterval() == 10);
+		
+		assertNotNull(asdcConfig.getPollingTimeout());
+		assertTrue(asdcConfig.getPollingTimeout() == 30);
+		
+		assertNotNull(asdcConfig.getRelevantArtifactTypes());
+		assertTrue(asdcConfig.getRelevantArtifactTypes().size() == ASDCConfiguration.SUPPORTED_ARTIFACT_TYPES_LIST.size());
+		
+		msoPropertiesFactory.removeAllMsoProperties();
+		
+		try {
+			asdcConfig.refreshASDCConfig();
+			fail("Should have thrown an ASDCParametersException because config does not exist anymore!");
+		} catch (ASDCParametersException e) {
+			assertTrue(e.getMessage().contains(("mso.asdc.json not initialized properly, ASDC config cannot be reloaded")));
+		}
+		
+		try {
+			asdcConfig.hasASDCConfigChanged();
+			fail("Should have thrown an ASDCParametersException because config does not exist anymore!");
+		} catch (ASDCParametersException e) {
+			assertTrue(e.getMessage().contains(("mso.asdc.json not initialized properly, ASDC config cannot be read")));
+		}
+		
+	}	
+	
+	
+	@Test
+	public final void testToChangeTheFileAndRefresh () throws ASDCParametersException, IOException, MsoPropertiesException  {
+		ASDCConfiguration asdcConfig = new ASDCConfiguration("asdc-controller1");
+
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP2);
+		msoPropertiesFactory.reloadMsoProperties();
+		
+		// SHould be the same file untouched just a different file name, there should be no difference between them
+		// In a normal case a different Filename should force the system to reload the config but not here as we have changed the filename by reflection
+		assertFalse(asdcConfig.hasASDCConfigChanged());
+		assertFalse(asdcConfig.refreshASDCConfig());
+
+		assertNotNull(asdcConfig.getUser());
+		assertTrue("User".equals(asdcConfig.getUser()));
+
+		assertNotNull(asdcConfig.getPassword());
+		assertTrue("ThePassword".equals(asdcConfig.getPassword()));
+
+		assertNotNull(asdcConfig.getConsumerGroup());
+		assertTrue("consumerGroup".equals(asdcConfig.getConsumerGroup()));
+
+		assertNotNull(asdcConfig.getConsumerID());
+		assertTrue("consumerId".equals(asdcConfig.getConsumerID()));
+
+		assertNotNull(asdcConfig.getEnvironmentName());
+		assertTrue("environmentName".equals(asdcConfig.getEnvironmentName()));
+
+		assertNotNull(asdcConfig.getAsdcAddress());
+		assertTrue("hostname".equals(asdcConfig.getAsdcAddress()));
+
+		assertNotNull(asdcConfig.getPollingInterval());
+		assertTrue(asdcConfig.getPollingInterval() == 10);
+
+		assertNotNull(asdcConfig.getPollingTimeout());
+		assertTrue(asdcConfig.getPollingTimeout() == 30);
+
+		assertNotNull(asdcConfig.getRelevantArtifactTypes());
+		assertTrue(asdcConfig.getRelevantArtifactTypes().size() == ASDCConfiguration.SUPPORTED_ARTIFACT_TYPES_LIST.size());
+
+		// Set another file that has some attributes changed
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP3);
+		msoPropertiesFactory.reloadMsoProperties();
+		
+		// SHould be the same file untouched just a different file name, so new config
+		assertTrue(asdcConfig.hasASDCConfigChanged());
+		assertTrue(asdcConfig.refreshASDCConfig());
+
+		assertNotNull(asdcConfig.getUser());
+		assertTrue("User".equals(asdcConfig.getUser()));
+
+		assertNotNull(asdcConfig.getPassword());
+		assertTrue("ThePassword".equals(asdcConfig.getPassword()));
+
+		assertNotNull(asdcConfig.getConsumerGroup());
+		assertTrue("consumerGroup".equals(asdcConfig.getConsumerGroup()));
+
+		assertNotNull(asdcConfig.getConsumerID());
+		assertTrue("consumerId".equals(asdcConfig.getConsumerID()));
+
+		assertNotNull(asdcConfig.getEnvironmentName());
+		assertTrue("environmentName".equals(asdcConfig.getEnvironmentName()));
+
+		// only this field has been changed
+		assertNotNull(asdcConfig.getAsdcAddress());
+		assertTrue("hostname1".equals(asdcConfig.getAsdcAddress()));
+
+		assertNotNull(asdcConfig.getPollingInterval());
+		assertTrue(asdcConfig.getPollingInterval() == 10);
+
+		assertNotNull(asdcConfig.getPollingTimeout());
+		assertTrue(asdcConfig.getPollingTimeout() == 30);
+
+		assertNotNull(asdcConfig.getRelevantArtifactTypes());
+		assertTrue(asdcConfig.getRelevantArtifactTypes().size() == ASDCConfiguration.SUPPORTED_ARTIFACT_TYPES_LIST.size());
+
+
+		// reload the good property file for other test cases
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP);
+		msoPropertiesFactory.reloadMsoProperties();
+
+	}
+	
+	@Test
+	public final void testAllParametersCheck () throws ASDCParametersException, IOException, MsoPropertiesException  {
+		ASDCConfiguration asdcConfig = new ASDCConfiguration("asdc-controller1");
+
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP_BAD);
+		msoPropertiesFactory.reloadMsoProperties();
+		// SHould be a bad file, it should raise an exception
+		try {
+			asdcConfig.refreshASDCConfig();
+			fail("Should have thrown an ASDCControllerException because one param is missing!");
+		} catch (ASDCParametersException e) {
+			assertTrue(e.getMessage().contains(("consumerGroup parameter cannot be found in config mso.properties")));
+		}
+
+
+		// reload the good property file for other test cases
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP);
+		msoPropertiesFactory.reloadMsoProperties();
+		
+		assertTrue(asdcConfig.refreshASDCConfig());
+ 
+	}
+	
+	@Test
+	public final void testConsumerGroupWithNULL () throws MsoPropertiesException, ASDCParametersException, IOException {
+		ASDCConfiguration asdcConfig = new ASDCConfiguration("asdc-controller1");
+		
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP_WITH_NULL);
+		msoPropertiesFactory.reloadMsoProperties();
+
+		asdcConfig.refreshASDCConfig();
+		assertTrue(asdcConfig.getConsumerGroup()==null);
+
+		// reload the good property file for other test cases
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP);
+		msoPropertiesFactory.reloadMsoProperties();
+		
+		assertTrue(asdcConfig.refreshASDCConfig());
+
+
+	}
+
+	@Test
+	public final void testGetAllDefinedControllers() throws MsoPropertiesException, ASDCParametersException, IOException {
+		List<String> listControllers = ASDCConfiguration.getAllDefinedControllers();
+		
+		assertTrue(listControllers.size()==1);
+		assertTrue("asdc-controller1".equals(listControllers.get(0)));
+		
+		ASDCConfiguration asdcConfiguration = new ASDCConfiguration("asdc-controller1");
+		assertTrue(asdcConfiguration.getAsdcControllerName().equals("asdc-controller1"));
+		
+		
+		// Try to reload a wrong Json file
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP_BAD);
+		msoPropertiesFactory.reloadMsoProperties();
+		
+		listControllers = ASDCConfiguration.getAllDefinedControllers();
+		assertTrue(listControllers.size()==0);
+
+	}
+	
+	@Test
+	public final void testABadInit() throws MsoPropertiesException {
+		msoPropertiesFactory.removeAllMsoProperties();		
+		
+		try {
+			ASDCConfiguration asdcConfiguration = new ASDCConfiguration("asdc-controller1");
+			fail("Should have thrown an ASDCParametersException because prop factory is empty!");
+		} catch (ASDCParametersException e) {
+			assertTrue(e.getMessage().contains(("mso.asdc.json not initialized properly, ASDC config cannot be reloaded")));
+		} catch (IOException e) {
+			fail("Should have thrown an ASDCParametersException, not IOException because file is corrupted!");
+		}
+	}
+	
+	@Test
+	public final void testFileDoesNotExist() throws MsoPropertiesException, ASDCParametersException, IOException {
+				
+			ASDCConfiguration asdcConfiguration = new ASDCConfiguration("asdc-controller1");
+		
+			msoPropertiesFactory.removeAllMsoProperties();
+			
+		try {	
+			asdcConfiguration.refreshASDCConfig();
+			fail("Should have thrown an ASDCParametersException because factory is empty!");
+		} catch (ASDCParametersException e) {
+			assertTrue(e.getMessage().contains(("mso.asdc.json not initialized properly, ASDC config cannot be reloaded")));
+		} 
+	}
+
+	@Test
+	public final void testWithTLS () throws ASDCParametersException, IOException, MsoPropertiesException {
+		ASDCConfiguration asdcConfiguration = new ASDCConfiguration("asdc-controller1");
+		
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP4_WITH_TLS);
+		msoPropertiesFactory.reloadMsoProperties();
+
+		asdcConfiguration.refreshASDCConfig();
+		
+		assertTrue(asdcConfiguration.activateServerTLSAuth());
+		assertTrue("/test".equals(asdcConfiguration.getKeyStorePath()));
+		assertTrue("ThePassword".equals(asdcConfiguration.getKeyStorePassword()));
+	}
+	
+}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCControllerTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCControllerTest.java
new file mode 100644
index 0000000000..b6c5577b63
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCControllerTest.java
@@ -0,0 +1,412 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.asdc.client.tests;
+
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.codec.binary.Base64;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import org.openecomp.sdc.api.IDistributionClient;
+import org.openecomp.sdc.api.consumer.INotificationCallback;
+import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.openecomp.sdc.api.notification.INotificationData;
+import org.openecomp.sdc.api.notification.IResourceInstance;
+import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
+import org.openecomp.sdc.api.results.IDistributionClientResult;
+import org.openecomp.sdc.impl.mock.DistributionClientStubImpl;
+import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.openecomp.mso.asdc.client.ASDCConfiguration;
+import org.openecomp.mso.asdc.client.ASDCController;
+import org.openecomp.mso.asdc.client.ASDCControllerStatus;
+import org.openecomp.mso.asdc.client.exceptions.ASDCControllerException;
+import org.openecomp.mso.asdc.client.exceptions.ASDCParametersException;
+import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;
+import org.openecomp.mso.asdc.installer.heat.VfResourceInstaller;
+import org.openecomp.mso.properties.MsoJavaProperties;
+import org.openecomp.mso.properties.MsoPropertiesException;
+import org.openecomp.mso.properties.MsoPropertiesFactory;
+
+
+
+/**
+ * THis class tests the ASDC Controller by using the ASDC Mock CLient
+ *
+ *
+ */
+public class ASDCControllerTest {
+
+	private static MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
+
+	private static String heatExample;
+	private static String heatExampleMD5HashBase64;
+
+	private static INotificationData iNotif;
+
+	private static IDistributionClientDownloadResult downloadResult;
+	private static IDistributionClientDownloadResult downloadCorruptedResult;
+
+	private static IDistributionClientResult successfulClientInitResult;
+	private static IDistributionClientResult unsuccessfulClientInitResult;
+
+	private static IArtifactInfo artifactInfo1;
+
+	private static IResourceInstance resource1;
+
+	private static VfResourceInstaller vnfInstaller;
+	
+	public static final String ASDC_PROP = MsoJavaProperties.class.getClassLoader().getResource("mso.json").toString().substring(5);
+	public static final String ASDC_PROP2 = MsoJavaProperties.class.getClassLoader().getResource("mso2.json").toString().substring(5);
+	public static final String ASDC_PROP3 = MsoJavaProperties.class.getClassLoader().getResource("mso3.json").toString().substring(5);
+	public static final String ASDC_PROP_BAD = MsoJavaProperties.class.getClassLoader().getResource("mso-bad.json").toString().substring(5);
+	public static final String ASDC_PROP_WITH_NULL = MsoJavaProperties.class.getClassLoader().getResource("mso-with-NULL.json").toString().substring(5);
+
+	@BeforeClass
+	public static final void prepareMockNotification() throws MsoPropertiesException, IOException, URISyntaxException, NoSuchAlgorithmException, ArtifactInstallerException  {
+
+		heatExample = new String(Files.readAllBytes(Paths.get(ASDCControllerTest.class.getClassLoader().getResource("resource-examples/autoscaling.yaml").toURI())));
+		MessageDigest md = MessageDigest.getInstance("MD5");
+		byte[] md5Hash = md.digest(heatExample.getBytes());
+		heatExampleMD5HashBase64 = Base64.encodeBase64String(md5Hash);
+
+		iNotif= Mockito.mock(INotificationData.class);
+
+		// Create fake ArtifactInfo
+		artifactInfo1 = Mockito.mock(IArtifactInfo.class);
+		Mockito.when(artifactInfo1.getArtifactChecksum()).thenReturn(ASDCControllerTest.heatExampleMD5HashBase64);
+
+		Mockito.when(artifactInfo1.getArtifactName()).thenReturn("artifact1");
+		Mockito.when(artifactInfo1.getArtifactType()).thenReturn(ASDCConfiguration.HEAT);
+		Mockito.when(artifactInfo1.getArtifactURL()).thenReturn("https://localhost:8080/v1/catalog/services/srv1/2.0/resources/aaa/1.0/artifacts/aaa.yml");
+		Mockito.when(artifactInfo1.getArtifactUUID()).thenReturn("UUID1");
+		Mockito.when(artifactInfo1.getArtifactDescription()).thenReturn("testos artifact1");
+
+		// Now provision the NotificationData mock
+		List<IArtifactInfo> listArtifact = new ArrayList<IArtifactInfo>();
+		listArtifact.add(artifactInfo1);
+
+		// Create fake resource Instance
+        resource1 = Mockito.mock (IResourceInstance.class);
+        Mockito.when (resource1.getResourceType ()).thenReturn ("VF");
+        Mockito.when (resource1.getResourceName ()).thenReturn ("resourceName");
+        Mockito.when (resource1.getArtifacts ()).thenReturn (listArtifact);
+
+        List<IResourceInstance> resources = new ArrayList<> ();
+        resources.add (resource1);
+
+		Mockito.when(iNotif.getResources()).thenReturn(resources);
+		Mockito.when(iNotif.getDistributionID()).thenReturn("distributionID1");
+		Mockito.when(iNotif.getServiceName()).thenReturn("serviceName1");
+		Mockito.when(iNotif.getServiceUUID()).thenReturn("serviceNameUUID1");
+		Mockito.when(iNotif.getServiceVersion()).thenReturn("1.0");
+
+		downloadResult = Mockito.mock(IDistributionClientDownloadResult.class);
+		Mockito.when(downloadResult.getArtifactPayload()).thenReturn(heatExample.getBytes());
+		Mockito.when(downloadResult.getDistributionActionResult()).thenReturn(DistributionActionResultEnum.SUCCESS);
+		Mockito.when(downloadResult.getDistributionMessageResult()).thenReturn("Success");
+
+		downloadCorruptedResult = Mockito.mock(IDistributionClientDownloadResult.class);
+		Mockito.when(downloadCorruptedResult.getArtifactPayload()).thenReturn((heatExample+"badone").getBytes());
+		Mockito.when(downloadCorruptedResult.getDistributionActionResult()).thenReturn(DistributionActionResultEnum.SUCCESS);
+		Mockito.when(downloadCorruptedResult.getDistributionMessageResult()).thenReturn("Success");
+
+		vnfInstaller = Mockito.mock(VfResourceInstaller.class);
+		
+		// Mock now the ASDC distribution client behavior
+		successfulClientInitResult = Mockito.mock(IDistributionClientResult.class);
+		Mockito.when(successfulClientInitResult.getDistributionActionResult ()).thenReturn(DistributionActionResultEnum.SUCCESS);
+
+		unsuccessfulClientInitResult = Mockito.mock(IDistributionClientResult.class);
+		Mockito.when(unsuccessfulClientInitResult.getDistributionActionResult ()).thenReturn(DistributionActionResultEnum.GENERAL_ERROR);
+
+	}
+	
+	@Before
+	public final void initBeforeEachTest() throws MsoPropertiesException {
+		// load the config
+		msoPropertiesFactory.removeAllMsoProperties();
+		msoPropertiesFactory.initializeMsoProperties(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP);
+	}
+
+	@AfterClass
+	public static final void kill () throws MsoPropertiesException {
+
+		msoPropertiesFactory.removeMsoProperties(ASDCConfiguration.MSO_PROP_ASDC);
+
+	}
+
+	@Test
+	public final void testTheInitWithASDCStub() throws ASDCControllerException, ASDCParametersException, IOException {
+
+		ASDCController asdcController = new ASDCController("asdc-controller1",new DistributionClientStubImpl());
+		asdcController.initASDC();
+		assertTrue(asdcController.getControllerStatus()== ASDCControllerStatus.IDLE);
+		assertTrue(asdcController.getNbOfNotificationsOngoing()== 0);
+	}
+
+	@Test
+	public final void testTheNotificationWithASDCStub() throws ASDCControllerException, ASDCParametersException, IOException {
+
+		ASDCController asdcController = new ASDCController("asdc-controller1",new DistributionClientStubImpl(),vnfInstaller);
+		asdcController.initASDC();
+		// try to send a notif, this should fail internally, we just want to ensure that in case of crash, controller status goes to IDLE
+		asdcController.treatNotification(iNotif);
+
+		assertTrue(asdcController.getControllerStatus()== ASDCControllerStatus.IDLE);
+		assertTrue(asdcController.getNbOfNotificationsOngoing()== 0);
+
+	}
+
+	@Test
+	public final void testASecondInit() throws ASDCControllerException, ASDCParametersException, IOException {
+		ASDCController asdcController = new ASDCController("asdc-controller1",new DistributionClientStubImpl(),vnfInstaller);
+		asdcController.initASDC();
+		// try to send a notif, this should fail internally, we just want to ensure that in case of crash, controller status goes to IDLE
+
+		assertTrue(asdcController.getControllerStatus()== ASDCControllerStatus.IDLE);
+		assertTrue(asdcController.getNbOfNotificationsOngoing()== 0);
+
+		try {
+			asdcController.initASDC();
+			fail("ASDCControllerException should have been raised for the init");
+		} catch (ASDCControllerException e) {
+			assertTrue("The controller is already initialized, call the closeASDC method first".equals(e.getMessage()));
+		}
+
+		// No changes expected on the controller state
+		assertTrue(asdcController.getControllerStatus()== ASDCControllerStatus.IDLE);
+		assertTrue(asdcController.getNbOfNotificationsOngoing()== 0);
+	}
+
+	@Test
+	public final void testInitCrashWithMockitoClient() throws ASDCParametersException, IOException {
+
+		IDistributionClient distributionClient;
+		// First case for init method
+		distributionClient = Mockito.mock(IDistributionClient.class);
+		Mockito.when(distributionClient.download(artifactInfo1)).thenThrow(new RuntimeException("ASDC Client not initialized"));
+		Mockito.when(distributionClient.init(any(ASDCConfiguration.class),any(INotificationCallback.class))).thenReturn(unsuccessfulClientInitResult);
+		Mockito.when(distributionClient.start()).thenReturn(unsuccessfulClientInitResult);
+
+		ASDCController asdcController = new ASDCController("asdc-controller1",distributionClient,vnfInstaller);
+
+		// This should return an exception
+		try {
+			asdcController.initASDC();
+			fail("ASDCControllerException should have been raised for the init");
+		} catch (ASDCControllerException e) {
+			assertTrue("Initialization of the ASDC Controller failed with reason: null".equals(e.getMessage()));
+		}
+
+		assertTrue(asdcController.getControllerStatus() == ASDCControllerStatus.STOPPED);
+		assertTrue(asdcController.getNbOfNotificationsOngoing()== 0);
+
+		// Second case for start method
+
+		Mockito.when(distributionClient.init(any(ASDCConfiguration.class),any(INotificationCallback.class))).thenReturn(successfulClientInitResult);
+		Mockito.when(distributionClient.start()).thenReturn(unsuccessfulClientInitResult);
+
+		// This should return an exception
+		try {
+			asdcController.initASDC();
+			fail("ASDCControllerException should have been raised for the init");
+		} catch (ASDCControllerException e) {
+			assertTrue("Startup of the ASDC Controller failed with reason: null".equals(e.getMessage()));
+		}
+
+		assertTrue(asdcController.getControllerStatus() == ASDCControllerStatus.STOPPED);
+		assertTrue(asdcController.getNbOfNotificationsOngoing()== 0);
+	}
+
+	@Test
+	public final void testTheStop() throws ASDCControllerException, ASDCParametersException, IOException {
+
+		ASDCController asdcController = new ASDCController("asdc-controller1",new DistributionClientStubImpl(),vnfInstaller);
+
+		asdcController.closeASDC();
+		assertTrue(asdcController.getControllerStatus()== ASDCControllerStatus.STOPPED);
+
+
+		asdcController = new ASDCController("asdc-controller1",new DistributionClientStubImpl(),vnfInstaller);
+		asdcController.initASDC();
+		asdcController.closeASDC();
+		assertTrue(asdcController.getControllerStatus()== ASDCControllerStatus.STOPPED);
+	}
+
+	@Test
+	public final void testConfigRefresh () throws ASDCParametersException, ASDCControllerException, IOException, MsoPropertiesException {
+		IDistributionClient distributionClient;
+		distributionClient = Mockito.mock(IDistributionClient.class);
+		Mockito.when(distributionClient.download(artifactInfo1)).thenReturn(downloadResult);
+		Mockito.when(distributionClient.init(any(ASDCConfiguration.class),any(INotificationCallback.class))).thenReturn(successfulClientInitResult);
+		Mockito.when(distributionClient.start()).thenReturn(successfulClientInitResult);
+
+
+		ASDCController asdcController = new ASDCController("asdc-controller1",distributionClient,vnfInstaller);
+
+		// it should not raise any exception even if controller is not yet initialized
+		asdcController.updateConfigIfNeeded();
+
+		asdcController.initASDC();
+		assertTrue(asdcController.getControllerStatus()== ASDCControllerStatus.IDLE);
+		assertFalse(asdcController.updateConfigIfNeeded());
+
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP3);
+		msoPropertiesFactory.reloadMsoProperties();
+		// It should fail if it tries to refresh the config as the init will now fail
+		assertTrue(asdcController.updateConfigIfNeeded());
+		assertTrue(asdcController.getControllerStatus()== ASDCControllerStatus.IDLE);
+
+
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP);
+		msoPropertiesFactory.reloadMsoProperties();
+	}
+
+	@Test
+	public final void testConfigRefreshWhenBusy () throws  IOException, MsoPropertiesException, NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException, ASDCParametersException, ASDCControllerException {
+		IDistributionClient distributionClient;
+		distributionClient = Mockito.mock(IDistributionClient.class);
+		Mockito.when(distributionClient.download(artifactInfo1)).thenReturn(downloadResult);
+		Mockito.when(distributionClient.init(any(ASDCConfiguration.class),any(INotificationCallback.class))).thenReturn(successfulClientInitResult);
+		Mockito.when(distributionClient.start()).thenReturn(successfulClientInitResult);
+
+		ASDCController asdcController = new ASDCController("asdc-controller1",distributionClient,vnfInstaller);
+
+		// it should not raise any exception even if controller is not yet initialized
+		asdcController.updateConfigIfNeeded();
+
+		asdcController.initASDC();
+		assertTrue(asdcController.getControllerStatus()== ASDCControllerStatus.IDLE);
+		assertFalse(asdcController.updateConfigIfNeeded());
+
+		// Simulate a BUSY case by reflection
+		Field controllerStatus;
+		controllerStatus = ASDCController.class.getDeclaredField("controllerStatus");
+		controllerStatus.setAccessible(true);
+		controllerStatus.set(asdcController,ASDCControllerStatus.BUSY);
+
+
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP3);
+		msoPropertiesFactory.reloadMsoProperties();
+		// It should fail if it tries to refresh the config as the init will now fail
+		try {
+			asdcController.updateConfigIfNeeded();
+			fail ("ASDCControllerException should have been raised");
+		} catch (ASDCControllerException e) {
+			assertTrue("Cannot close the ASDC controller as it's currently in BUSY state".equals(e.getMessage()));
+		}
+
+		// Try it a second time to see if we still see the changes
+		try {
+			asdcController.updateConfigIfNeeded();
+			fail ("ASDCControllerException should have been raised");
+		} catch (ASDCControllerException e) {
+			assertTrue("Cannot close the ASDC controller as it's currently in BUSY state".equals(e.getMessage()));
+		}
+
+		// Revert to Idle by reflection
+		controllerStatus.set(asdcController,ASDCControllerStatus.IDLE);
+		controllerStatus.setAccessible(false);
+
+		// This should work now, controller should be restarted
+		assertTrue(asdcController.updateConfigIfNeeded());
+		assertTrue(asdcController.getControllerStatus()== ASDCControllerStatus.IDLE);
+
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP);
+		msoPropertiesFactory.reloadMsoProperties();
+	}
+
+
+	@Test
+	public final void testBadConfigRefresh () throws ASDCParametersException, ASDCControllerException, IOException, MsoPropertiesException {
+		IDistributionClient distributionClient;
+		distributionClient = Mockito.mock(IDistributionClient.class);
+		Mockito.when(distributionClient.download(artifactInfo1)).thenReturn(downloadResult);
+		Mockito.when(distributionClient.init(any(ASDCConfiguration.class),any(INotificationCallback.class))).thenReturn(successfulClientInitResult);
+		Mockito.when(distributionClient.start()).thenReturn(successfulClientInitResult);
+
+
+		ASDCController asdcController = new ASDCController("asdc-controller1",distributionClient,vnfInstaller);
+
+		// it should not raise any exception even if controller is not yet initialized
+		asdcController.updateConfigIfNeeded();
+
+		asdcController.initASDC();
+		assertTrue(asdcController.getControllerStatus()== ASDCControllerStatus.IDLE);
+		assertFalse(asdcController.updateConfigIfNeeded());
+
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP_BAD);
+		msoPropertiesFactory.reloadMsoProperties();
+		// It should fail if it tries to refresh the config as the init will now fail
+		try {
+			asdcController.updateConfigIfNeeded();
+			fail ("ASDCParametersException should have been raised");
+		} catch (ASDCParametersException ep) {
+			assertTrue("consumerGroup parameter cannot be found in config mso.properties".equals(ep.getMessage()));
+		}
+
+		// This should stop the controller, as it can't work with a bad config file
+		assertTrue(asdcController.getControllerStatus()== ASDCControllerStatus.STOPPED);
+
+
+		msoPropertiesFactory.changeMsoPropertiesFilePath(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP);
+		msoPropertiesFactory.reloadMsoProperties();
+	}
+
+	@Test
+	public final void testConfigAccess () throws ASDCControllerException, ASDCParametersException, IOException {
+		IDistributionClient distributionClient;
+		distributionClient = Mockito.mock(IDistributionClient.class);
+		Mockito.when(distributionClient.download(artifactInfo1)).thenReturn(downloadResult);
+		Mockito.when(distributionClient.init(any(ASDCConfiguration.class),any(INotificationCallback.class))).thenReturn(successfulClientInitResult);
+		Mockito.when(distributionClient.start()).thenReturn(successfulClientInitResult);
+
+		
+		ASDCController asdcController = new ASDCController("asdc-controller1",distributionClient,vnfInstaller);
+		
+		assertTrue("Unknown".equals(asdcController.getAddress()));
+		assertTrue("Unknown".equals(asdcController.getEnvironment()));
+		
+		asdcController.initASDC();
+		
+		assertTrue("hostname".equals(asdcController.getAddress()));
+		assertTrue("environmentName".equals(asdcController.getEnvironment()));
+		
+	}
+
+}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCElementInfoTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCElementInfoTest.java
new file mode 100644
index 0000000000..23b7a80dbe
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCElementInfoTest.java
@@ -0,0 +1,175 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+
+package org.openecomp.mso.asdc.client.tests;
+
+
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.UUID;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.openecomp.sdc.api.notification.INotificationData;
+import org.openecomp.sdc.api.notification.IResourceInstance;
+import org.openecomp.sdc.api.notification.IVfModuleMetadata;
+import org.openecomp.mso.asdc.client.ASDCConfiguration;
+import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;
+import org.openecomp.mso.asdc.installer.ASDCElementInfo;
+import org.openecomp.mso.asdc.installer.VfModuleStructure;
+import org.openecomp.mso.asdc.installer.VfResourceStructure;
+
+
+public class ASDCElementInfoTest {
+	
+	@Test
+	public void createASDCElementInfoWithNullParameterTest() {
+		ASDCElementInfo elementInfoFromNullVfArtifact = ASDCElementInfo.createElementFromVfArtifactInfo(null);
+		ASDCElementInfo elementInfoFromNullVfModuleStructure = ASDCElementInfo.createElementFromVfModuleStructure(null);
+		ASDCElementInfo elementInfoFromNullVfResourceStructure = ASDCElementInfo.createElementFromVfResourceStructure(null);
+		
+		elementInfoFromNullVfArtifact.addElementInfo(null, null);
+		elementInfoFromNullVfModuleStructure.addElementInfo(null, "someValue");
+		elementInfoFromNullVfResourceStructure.addElementInfo("someKey", null);
+		
+		assertEquals(elementInfoFromNullVfArtifact.toString(), "");
+		assertEquals(elementInfoFromNullVfModuleStructure.toString(), "");
+		assertEquals(elementInfoFromNullVfResourceStructure.toString(), "");
+
+		assertNotNull(elementInfoFromNullVfArtifact);
+		assertNotNull(elementInfoFromNullVfModuleStructure);
+		assertNotNull(elementInfoFromNullVfResourceStructure);
+
+		assertNotNull(ASDCElementInfo.EMPTY_INSTANCE);
+		
+		assertEquals(elementInfoFromNullVfArtifact, ASDCElementInfo.EMPTY_INSTANCE);
+		assertEquals(elementInfoFromNullVfModuleStructure, ASDCElementInfo.EMPTY_INSTANCE);
+		assertEquals(elementInfoFromNullVfResourceStructure, ASDCElementInfo.EMPTY_INSTANCE);
+		
+		assertEquals(ASDCElementInfo.EMPTY_INSTANCE.getType(), "");
+		assertEquals(ASDCElementInfo.EMPTY_INSTANCE.toString(), "");
+		
+		assertEquals(elementInfoFromNullVfArtifact.getType(), ASDCElementInfo.EMPTY_INSTANCE.getType());
+		assertEquals(elementInfoFromNullVfModuleStructure.getType(), ASDCElementInfo.EMPTY_INSTANCE.getType());
+		assertEquals(elementInfoFromNullVfResourceStructure.getType(), ASDCElementInfo.EMPTY_INSTANCE.getType());
+	}
+	
+	@Test
+	public void createASDCElementInfoFromVfResourceTest() {
+		
+		String resourceInstanceName = "Resource 1";
+		
+		UUID generatedUUID = UUID.randomUUID();
+		
+		INotificationData notificationData = Mockito.mock(INotificationData.class);
+		IResourceInstance resourceInstance = Mockito.mock(IResourceInstance.class);
+		
+		Mockito.when(resourceInstance.getResourceInstanceName()).thenReturn(resourceInstanceName);
+		Mockito.when(resourceInstance.getResourceInvariantUUID()).thenReturn(generatedUUID.toString());
+		
+		VfResourceStructure vfResourceStructure = new VfResourceStructure(notificationData, resourceInstance);
+		
+		ASDCElementInfo elementInfoFromVfResource = ASDCElementInfo.createElementFromVfResourceStructure(vfResourceStructure);
+		
+		assertTrue(elementInfoFromVfResource.toString().contains(resourceInstanceName));
+		assertTrue(elementInfoFromVfResource.toString().contains(generatedUUID.toString()));
+		
+		assertFalse(ASDCConfiguration.VF_MODULES_METADATA.equals(elementInfoFromVfResource.getType()));
+		assertEquals(ASDCElementInfo.ASDCElementTypeEnum.VNF_RESOURCE.name(), elementInfoFromVfResource.getType());
+		
+		assertFalse(elementInfoFromVfResource.toString().contains("MyInfo1: someValue"));
+		elementInfoFromVfResource.addElementInfo("MyInfo1", "someValue");
+		assertTrue(elementInfoFromVfResource.toString().contains("MyInfo1: someValue"));
+	}
+	
+	@Test
+	public void createASDCElementInfoFromVfModuleTest() throws ArtifactInstallerException {
+		
+		String resourceInstanceName = "Resource 1";
+		
+		UUID generatedUUID = UUID.randomUUID();
+		
+		INotificationData notificationData = Mockito.mock(INotificationData.class);
+		IResourceInstance resourceInstance = Mockito.mock(IResourceInstance.class);
+		
+		Mockito.when(resourceInstance.getResourceInstanceName()).thenReturn(resourceInstanceName);
+		Mockito.when(resourceInstance.getResourceInvariantUUID()).thenReturn(generatedUUID.toString());
+		
+		VfResourceStructure vfResourceStructure = new VfResourceStructure(notificationData, resourceInstance);
+		
+		// Create module structure now
+		
+		String vfModuleModelName = "Module Model XYZ";
+		
+		UUID generatedUUIDForModule = UUID.randomUUID();
+		
+		IVfModuleMetadata moduleMetadata = Mockito.mock(IVfModuleMetadata.class);
+		Mockito.when(moduleMetadata.getVfModuleModelName()).thenReturn(vfModuleModelName);
+		Mockito.when(moduleMetadata.getVfModuleModelInvariantUUID()).thenReturn(generatedUUIDForModule.toString());
+		Mockito.when(moduleMetadata.getArtifacts()).thenReturn(Collections.<String> emptyList());
+		
+		VfModuleStructure vfModuleStructure = new VfModuleStructure(vfResourceStructure, moduleMetadata);
+		
+		ASDCElementInfo elementInfoFromVfModule = ASDCElementInfo.createElementFromVfModuleStructure(vfModuleStructure);
+		
+		assertTrue(elementInfoFromVfModule.toString().contains(vfModuleModelName));
+		assertTrue(elementInfoFromVfModule.toString().contains(generatedUUIDForModule.toString()));
+		
+		assertFalse(ASDCElementInfo.ASDCElementTypeEnum.VNF_RESOURCE.name().equals(elementInfoFromVfModule.getType()));
+		assertEquals(ASDCConfiguration.VF_MODULES_METADATA, elementInfoFromVfModule.getType());
+		
+		assertFalse(elementInfoFromVfModule.toString().contains("MyInfo2: someValue"));
+		elementInfoFromVfModule.addElementInfo("MyInfo2", "someValue");
+		assertTrue(elementInfoFromVfModule.toString().contains("MyInfo2: someValue"));
+	}
+	
+	@Test
+	public void createASDCElementInfoFromArtifact() {
+		for (String eVal : ASDCConfiguration.SUPPORTED_ARTIFACT_TYPES_LIST) {
+			String generatedArtifactName = eVal + " 1";
+			UUID generatedUUIDForArtifact = UUID.randomUUID();
+			
+			IArtifactInfo artifactInfo = Mockito.mock(IArtifactInfo.class);
+			Mockito.when(artifactInfo.getArtifactType()).thenReturn(eVal);
+			Mockito.when(artifactInfo.getArtifactName()).thenReturn(generatedArtifactName);
+			Mockito.when(artifactInfo.getArtifactUUID()).thenReturn(generatedUUIDForArtifact.toString());
+			
+			ASDCElementInfo elementInfoFromArtifact = ASDCElementInfo.createElementFromVfArtifactInfo(artifactInfo);
+
+			assertTrue(elementInfoFromArtifact.toString().contains(generatedArtifactName));
+			assertTrue(elementInfoFromArtifact.toString().contains(generatedUUIDForArtifact.toString()));
+			
+			assertFalse(ASDCElementInfo.ASDCElementTypeEnum.VNF_RESOURCE.name().equals(elementInfoFromArtifact.getType()));
+			assertEquals(eVal, elementInfoFromArtifact.getType());
+			
+			assertFalse(elementInfoFromArtifact.toString().contains("MyInfo3: someValue"));
+			elementInfoFromArtifact.addElementInfo("MyInfo3", "someValue");
+			assertTrue(elementInfoFromArtifact.toString().contains("MyInfo3: someValue"));
+		}
+	}
+}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCGlobalControllerTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCGlobalControllerTest.java
new file mode 100644
index 0000000000..9ac50c4854
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCGlobalControllerTest.java
@@ -0,0 +1,213 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.asdc.client.tests;
+
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.codec.binary.Base64;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.openecomp.sdc.api.notification.INotificationData;
+import org.openecomp.sdc.api.notification.IResourceInstance;
+import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
+import org.openecomp.sdc.api.results.IDistributionClientResult;
+import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.openecomp.mso.asdc.client.ASDCConfiguration;
+import org.openecomp.mso.asdc.client.ASDCGlobalController;
+import org.openecomp.mso.asdc.client.exceptions.ASDCControllerException;
+import org.openecomp.mso.asdc.client.exceptions.ASDCParametersException;
+import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;
+import org.openecomp.mso.properties.MsoJavaProperties;
+import org.openecomp.mso.properties.MsoPropertiesException;
+import org.openecomp.mso.properties.MsoPropertiesFactory;
+
+
+
+/**
+ * THis class tests the ASDC Controller by using the ASDC Mock CLient
+ *
+ *
+ */
+public class ASDCGlobalControllerTest {
+
+	private static MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
+
+	private static String heatExample;
+	private static String heatExampleMD5HashBase64;
+
+	private static INotificationData iNotif;
+
+	private static IDistributionClientDownloadResult downloadResult;
+	private static IDistributionClientDownloadResult downloadCorruptedResult;
+
+	private static IDistributionClientResult successfulClientInitResult;
+	private static IDistributionClientResult unsuccessfulClientInitResult;
+
+	private static IArtifactInfo artifactInfo1;
+
+	private static IResourceInstance resource1;
+
+	public static final String ASDC_PROP = MsoJavaProperties.class.getClassLoader().getResource("mso.json").toString().substring(5);
+	public static final String ASDC_PROP2 = MsoJavaProperties.class.getClassLoader().getResource("mso2.json").toString().substring(5);
+	public static final String ASDC_PROP3 = MsoJavaProperties.class.getClassLoader().getResource("mso3.json").toString().substring(5);
+	public static final String ASDC_PROP_BAD = MsoJavaProperties.class.getClassLoader().getResource("mso-bad.json").toString().substring(5);
+	public static final String ASDC_PROP_WITH_NULL = MsoJavaProperties.class.getClassLoader().getResource("mso-with-NULL.json").toString().substring(5);
+	public static final String ASDC_PROP_WITH_DOUBLE = MsoJavaProperties.class.getClassLoader().getResource("mso-two-configs.json").toString().substring(5);
+	public static final String ASDC_PROP_WITH_DOUBLE2 = MsoJavaProperties.class.getClassLoader().getResource("mso-two-configs2.json").toString().substring(5);
+
+	@BeforeClass
+	public static final void prepareMockNotification() throws MsoPropertiesException, IOException, URISyntaxException, NoSuchAlgorithmException, ArtifactInstallerException  {
+
+		heatExample = new String(Files.readAllBytes(Paths.get(ASDCGlobalControllerTest.class.getClassLoader().getResource("resource-examples/autoscaling.yaml").toURI())));
+		MessageDigest md = MessageDigest.getInstance("MD5");
+		byte[] md5Hash = md.digest(heatExample.getBytes());
+		heatExampleMD5HashBase64 = Base64.encodeBase64String(md5Hash);
+
+		iNotif= Mockito.mock(INotificationData.class);
+
+		// Create fake ArtifactInfo
+		artifactInfo1 = Mockito.mock(IArtifactInfo.class);
+		Mockito.when(artifactInfo1.getArtifactChecksum()).thenReturn(ASDCGlobalControllerTest.heatExampleMD5HashBase64);
+
+		Mockito.when(artifactInfo1.getArtifactName()).thenReturn("artifact1");
+		Mockito.when(artifactInfo1.getArtifactType()).thenReturn(ASDCConfiguration.HEAT);
+		Mockito.when(artifactInfo1.getArtifactURL()).thenReturn("https://localhost:8080/v1/catalog/services/srv1/2.0/resources/aaa/1.0/artifacts/aaa.yml");
+		Mockito.when(artifactInfo1.getArtifactUUID()).thenReturn("UUID1");
+		Mockito.when(artifactInfo1.getArtifactDescription()).thenReturn("testos artifact1");
+
+		// Now provision the NotificationData mock
+		List<IArtifactInfo> listArtifact = new ArrayList<IArtifactInfo>();
+		listArtifact.add(artifactInfo1);
+
+		// Create fake resource Instance
+        resource1 = Mockito.mock (IResourceInstance.class);
+        Mockito.when (resource1.getResourceType ()).thenReturn ("VF");
+        Mockito.when (resource1.getResourceName ()).thenReturn ("resourceName");
+        Mockito.when (resource1.getArtifacts ()).thenReturn (listArtifact);
+
+        List<IResourceInstance> resources = new ArrayList<> ();
+        resources.add (resource1);
+
+		Mockito.when(iNotif.getResources()).thenReturn(resources);
+		Mockito.when(iNotif.getDistributionID()).thenReturn("distributionID1");
+		Mockito.when(iNotif.getServiceName()).thenReturn("serviceName1");
+		Mockito.when(iNotif.getServiceUUID()).thenReturn("serviceNameUUID1");
+		Mockito.when(iNotif.getServiceVersion()).thenReturn("1.0");
+
+		downloadResult = Mockito.mock(IDistributionClientDownloadResult.class);
+		Mockito.when(downloadResult.getArtifactPayload()).thenReturn(heatExample.getBytes());
+		Mockito.when(downloadResult.getDistributionActionResult()).thenReturn(DistributionActionResultEnum.SUCCESS);
+		Mockito.when(downloadResult.getDistributionMessageResult()).thenReturn("Success");
+
+		downloadCorruptedResult = Mockito.mock(IDistributionClientDownloadResult.class);
+		Mockito.when(downloadCorruptedResult.getArtifactPayload()).thenReturn((heatExample+"badone").getBytes());
+		Mockito.when(downloadCorruptedResult.getDistributionActionResult()).thenReturn(DistributionActionResultEnum.SUCCESS);
+		Mockito.when(downloadCorruptedResult.getDistributionMessageResult()).thenReturn("Success");
+
+
+		// Mock now the ASDC distribution client behavior
+		successfulClientInitResult = Mockito.mock(IDistributionClientResult.class);
+		Mockito.when(successfulClientInitResult.getDistributionActionResult ()).thenReturn(DistributionActionResultEnum.SUCCESS);
+
+		unsuccessfulClientInitResult = Mockito.mock(IDistributionClientResult.class);
+		Mockito.when(unsuccessfulClientInitResult.getDistributionActionResult ()).thenReturn(DistributionActionResultEnum.GENERAL_ERROR);
+
+	}
+	
+	@Before
+	public final void initBeforeEachTest() throws MsoPropertiesException {
+		// load the config
+		msoPropertiesFactory.removeAllMsoProperties();
+		msoPropertiesFactory.initializeMsoProperties(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP);
+	}
+
+	@AfterClass
+	public static final void kill () throws MsoPropertiesException {
+
+		msoPropertiesFactory.removeMsoProperties(ASDCConfiguration.MSO_PROP_ASDC);
+	}
+
+	@Test
+	public final void testUpdateControllersConfigIfNeeded() throws ASDCControllerException, ASDCParametersException, IOException, MsoPropertiesException {
+
+		ASDCGlobalController asdcGlobalController = new ASDCGlobalController();
+		assertTrue(asdcGlobalController.getControllers().size()==0);
+		
+		// first init
+		assertTrue(asdcGlobalController.updateControllersConfigIfNeeded());
+		assertTrue(asdcGlobalController.getControllers().size()==1);
+		assertTrue(asdcGlobalController.getControllers().get("asdc-controller1") != null);
+		
+		// Add a second one
+		msoPropertiesFactory.removeAllMsoProperties();
+		msoPropertiesFactory.initializeMsoProperties(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP_WITH_DOUBLE);
+		assertTrue(asdcGlobalController.updateControllersConfigIfNeeded());
+		assertTrue(asdcGlobalController.getControllers().size()==2);
+		assertTrue(asdcGlobalController.getControllers().get("asdc-controller1") != null);
+		assertTrue(asdcGlobalController.getControllers().get("asdc-controller2") != null);
+		// Check that update does nothing
+		assertFalse(asdcGlobalController.updateControllersConfigIfNeeded());
+		assertTrue(asdcGlobalController.getControllers().size()==2);
+		
+		// Change the second one name
+		msoPropertiesFactory.removeAllMsoProperties();
+		msoPropertiesFactory.initializeMsoProperties(ASDCConfiguration.MSO_PROP_ASDC, ASDC_PROP_WITH_DOUBLE2);
+		assertTrue(asdcGlobalController.updateControllersConfigIfNeeded());
+		assertTrue(asdcGlobalController.getControllers().size()==2);
+		assertTrue(asdcGlobalController.getControllers().get("asdc-controller1") != null);
+		assertTrue(asdcGlobalController.getControllers().get("asdc-controller2B") != null);
+		
+		
+	}
+	
+	@Test
+	public final void testCloseASDC()  {
+
+		ASDCGlobalController asdcGlobalController = new ASDCGlobalController();
+		assertTrue(asdcGlobalController.getControllers().size()==0);
+		
+		// first init
+		assertTrue(asdcGlobalController.updateControllersConfigIfNeeded());
+		assertTrue(asdcGlobalController.getControllers().size()==1);
+		assertTrue(asdcGlobalController.getControllers().get("asdc-controller1") != null);
+		
+		asdcGlobalController.closeASDC();
+		assertTrue(asdcGlobalController.getControllers().size()==0);
+		
+		
+	}
+
+}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/BigDecimalVersionTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/BigDecimalVersionTest.java
new file mode 100644
index 0000000000..7decaffb2b
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/BigDecimalVersionTest.java
@@ -0,0 +1,53 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.asdc.client.tests;
+
+
+import static org.junit.Assert.assertTrue;
+import java.math.BigDecimal;
+import org.junit.Test;
+
+import org.openecomp.mso.asdc.installer.BigDecimalVersion;
+
+
+public class BigDecimalVersionTest {
+
+    @Test
+    public final void versionCastTest () {
+
+    	BigDecimal versionDecimal = BigDecimalVersion.castAndCheckNotificationVersion("12.0");
+    	assertTrue(versionDecimal.equals(new BigDecimal("12.0")));
+    	assertTrue("12.0".equals(BigDecimalVersion.castAndCheckNotificationVersionToString("12.0")));
+
+    	versionDecimal = BigDecimalVersion.castAndCheckNotificationVersion("12.0.2");
+    	assertTrue(versionDecimal.equals(new BigDecimal("12.02")));
+    	assertTrue("12.02".equals(BigDecimalVersion.castAndCheckNotificationVersionToString("12.0.2")));
+
+    	versionDecimal = BigDecimalVersion.castAndCheckNotificationVersion("10");
+    	assertTrue(versionDecimal.equals(new BigDecimal("10")));
+    	assertTrue("10".equals(BigDecimalVersion.castAndCheckNotificationVersionToString("10")));
+
+    	versionDecimal = BigDecimalVersion.castAndCheckNotificationVersion("10.1.2.6");
+    	assertTrue(versionDecimal.equals(new BigDecimal("10.126")));
+    	assertTrue("10.126".equals(BigDecimalVersion.castAndCheckNotificationVersionToString("10.1.2.6")));
+
+    }
+}
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
new file mode 100644
index 0000000000..bce9324de9
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java
@@ -0,0 +1,165 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.asdc.client.tests;
+
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+
+import org.openecomp.mso.asdc.installer.heat.VfResourceInstaller;
+import org.openecomp.mso.asdc.util.YamlEditor;
+import org.openecomp.mso.db.catalog.beans.HeatTemplateParam;
+
+
+public class YamlTest {
+	@Test
+	public void getYamlResourceTypeTestList() throws Exception {
+  
+		    	InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTest.yaml"));
+		    	YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input));
+		    	List<String> typeList = decoder.getYamlNestedFileResourceTypeList();
+			    
+		    	assertTrue(typeList.size() == 1 && typeList.get(0).equals("file:///my_test.yaml"));
+	}
+
+	@Test
+	public void getParameterListTest() throws Exception {
+  
+		    	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();
+			    
+		    	assertTrue(paramSet.size() == 5);
+
+		    	for (HeatTemplateParam param : paramSet) {
+		    		if ("ip_port_snmp_manager".equals(param.getParamName()) || "cor_direct_net_name".equals(param.getParamName()) || "cor_direct_net_RT".equals(param.getParamName())) {
+		    			
+		    			assertTrue(param.isRequired()==false);
+		    		} else {
+		    			
+		    			assertTrue(param.isRequired()==true);
+		    		}
+		    		
+		    		assertTrue("string".equals(param.getParamType()));
+		    	}
+	}
+	
+	@Test
+	public void addParameterListWhenEmptyTest() throws Exception {
+  
+		    	InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTestWithoutParam.yaml"));
+		    	YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input));
+		    	
+		    	Set <HeatTemplateParam> newParamSet = new HashSet <HeatTemplateParam> (); 
+		    	
+		    	HeatTemplateParam heatParam1 = new HeatTemplateParam();
+		    	heatParam1.setId(1);
+		    	heatParam1.setParamName("testos1");
+		    	heatParam1.setParamType("string");
+		    	
+		    	HeatTemplateParam heatParam2 = new HeatTemplateParam();
+		    	heatParam2.setId(2);
+		    	heatParam2.setParamName("testos2");
+		    	heatParam2.setParamType("number");
+		    	
+		    	newParamSet.add(heatParam1);
+		    	newParamSet.add(heatParam2);
+		    	
+		    	decoder.addParameterList(newParamSet);
+			    
+		    	Set <HeatTemplateParam> paramSet = decoder.getParameterList();
+		    	assertTrue(paramSet.size() == 2);
+		    	
+		    	assertTrue(decoder.encode().contains("testos1"));
+		    	assertTrue(decoder.encode().contains("string"));
+		    	assertTrue(decoder.encode().contains("testos2"));
+		    	assertTrue(decoder.encode().contains("number"));
+	}
+	
+	@Test
+	public void addParameterListTest() throws Exception {
+  
+		    	InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTest.yaml"));
+		    	YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input));
+		    	
+		    	Set <HeatTemplateParam> newParamSet = new HashSet <HeatTemplateParam> (); 
+		    	
+		    	HeatTemplateParam heatParam1 = new HeatTemplateParam();
+		    	heatParam1.setId(1);
+		    	heatParam1.setParamName("testos1");
+		    	heatParam1.setParamType("string");
+		    	
+		    	HeatTemplateParam heatParam2 = new HeatTemplateParam();
+		    	heatParam2.setId(2);
+		    	heatParam2.setParamName("testos2");
+		    	heatParam2.setParamType("number");
+		    	
+		    	newParamSet.add(heatParam1);
+		    	newParamSet.add(heatParam2);
+		    	
+		    	decoder.addParameterList(newParamSet);
+			    
+		    	Set <HeatTemplateParam> paramSet = decoder.getParameterList();
+		    	
+		    	assertTrue(paramSet.size() == 7);
+		    	
+		    	Boolean check1 = Boolean.FALSE;
+		    	Boolean check2 = Boolean.FALSE;
+		    	
+		    	for (HeatTemplateParam param : paramSet) {
+		    		if ("ip_port_snmp_manager".equals(param.getParamName()) || "cor_direct_net_name".equals(param.getParamName()) || "cor_direct_net_RT".equals(param.getParamName())) {
+		    			assertFalse(param.isRequired());
+		    		} else {
+		    			assertTrue(param.isRequired());
+		    		}
+		    		
+		    		if ("testos1".equals(param.getParamName()) && "string".equals(param.getParamType())) {
+		    			check1=Boolean.TRUE;
+		    		}
+
+		    		if ("testos2".equals(param.getParamName()) && "number".equals(param.getParamType())) {
+		    			check2=Boolean.TRUE;
+		    		}
+
+		    	}
+		    	
+		    	assertTrue(check1);
+		    	assertTrue(check2);
+	}
+	
+	@Test
+	public void VfResourceInstallerTest() throws Exception {
+		
+		assertTrue("mon ami toto, est dans le bois: toto ici".equals(VfResourceInstaller.verifyTheFilePrefixInString("mon ami toto, est dans le bois: toto ici","toto")));
+		assertTrue("mon ami toto, est dans le bois: toto ici".equals(VfResourceInstaller.verifyTheFilePrefixInString("mon ami file:///toto, est dans le bois: file:///toto ici","toto")));
+		assertTrue("mon ami toto, est dans le bois: toto ici".equals(VfResourceInstaller.verifyTheFilePrefixInString("mon ami file:///toto, est dans le bois: toto ici","toto")));
+		assertTrue("mon ami toto, est dans le bois: toto ici".equals(VfResourceInstaller.verifyTheFilePrefixInString("mon ami toto, est dans le bois: file:///toto ici","toto")));
+		
+	}
+}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/ASDCElementInfoESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/ASDCElementInfoESTest.java
new file mode 100644
index 0000000000..8dd5afe7e0
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/ASDCElementInfoESTest.java
@@ -0,0 +1,139 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Fri Nov 25 13:35:55 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 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;
+import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.openecomp.sdc.api.notification.INotificationData;
+import org.openecomp.sdc.api.notification.IResourceInstance;
+import org.openecomp.sdc.api.notification.IVfModuleMetadata;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+public class ASDCElementInfoESTest extends ASDCElementInfoESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iResourceInstance0).getResourceInstanceName();
+      doReturn((String) null).when(iResourceInstance0).getResourceInvariantUUID();
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.createElementFromVfResourceStructure(vfResourceStructure0);
+      String string0 = aSDCElementInfo0.getType();
+      assertEquals("VNF_RESOURCE", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.createElementFromVfModuleStructure((VfModuleStructure) null);
+      Map<String, String> map0 = aSDCElementInfo0.getElementInfoMap();
+      assertTrue(map0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      Map<String, String> map0 = ASDCElementInfo.EMPTY_INSTANCE.getElementInfoMap();
+      assertTrue(map0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.EMPTY_INSTANCE;
+      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iArtifactInfo0).getArtifactName();
+      doReturn((String) null).when(iArtifactInfo0).getArtifactType();
+      doReturn((String) null).when(iArtifactInfo0).getArtifactUUID();
+      ASDCElementInfo aSDCElementInfo1 = ASDCElementInfo.createElementFromVfArtifactInfo(iArtifactInfo0);
+      aSDCElementInfo0.toString();
+      PrivateAccess.setVariable((Class<ASDCElementInfo>) ASDCElementInfo.class, aSDCElementInfo1, "elementInfoMap", (Object) null);
+      aSDCElementInfo0.toString();
+      // Undeclared exception!
+      try { 
+        aSDCElementInfo1.toString();
+        fail("Expecting exception: NullPointerException");
+      
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.ASDCElementInfo", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.EMPTY_INSTANCE;
+      aSDCElementInfo0.addElementInfo("V$", (String) null);
+      assertEquals("", aSDCElementInfo0.getType());
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.createElementFromVfModuleStructure((VfModuleStructure) null);
+      String string0 = aSDCElementInfo0.EMPTY_INSTANCE.getType();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, (IResourceInstance) null);
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      doReturn((List) null).when(iVfModuleMetadata0).getArtifacts();
+      VfModuleStructure vfModuleStructure0 = null;
+      try {
+        vfModuleStructure0 = new VfModuleStructure(vfResourceStructure0, iVfModuleMetadata0);
+        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 test08()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      doReturn(" Name").when(iResourceInstance0).getResourceInstanceName();
+      doReturn(" Name").when(iResourceInstance0).getResourceInvariantUUID();
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.createElementFromVfResourceStructure(vfResourceStructure0);
+      String string0 = aSDCElementInfo0.toString();
+      assertEquals("Resource Instance Invariant UUID:  Name, Resource Instance Name:  Name", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.createElementFromVfArtifactInfo((IArtifactInfo) null);
+      aSDCElementInfo0.addElementInfo((String) null, "");
+      assertEquals("", aSDCElementInfo0.getType());
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iArtifactInfo0).getArtifactName();
+      doReturn((String) null).when(iArtifactInfo0).getArtifactType();
+      doReturn((String) null).when(iArtifactInfo0).getArtifactUUID();
+      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.createElementFromVfArtifactInfo(iArtifactInfo0);
+      String string0 = aSDCElementInfo0.getType();
+      assertNull(string0);
+  }
+}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/ASDCElementInfoESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/ASDCElementInfoESTestscaffolding.java
new file mode 100644
index 0000000000..075970b066
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/ASDCElementInfoESTestscaffolding.java
@@ -0,0 +1,100 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Fri Nov 25 13:35:55 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 ASDCElementInfoESTestscaffolding {
+
+  @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.ASDCElementInfo"; 
+    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(ASDCElementInfoESTestscaffolding.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.mso.asdc.installer.ASDCElementInfo",
+      "org.openecomp.sdc.api.results.IDistributionClientDownloadResult",
+      "org.openecomp.mso.asdc.installer.ASDCElementInfo$ASDCElementTypeEnum"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(ASDCElementInfoESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.asdc.installer.ASDCElementInfo$ASDCElementTypeEnum",
+      "org.openecomp.mso.asdc.installer.ASDCElementInfo",
+      "org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException"
+    );
+  }
+}
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
new file mode 100644
index 0000000000..4675f05477
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/BigDecimalVersionESTest.java
@@ -0,0 +1,138 @@
+/*
+ * 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
new file mode 100644
index 0000000000..c04ada8396
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/BigDecimalVersionESTestscaffolding.java
@@ -0,0 +1,77 @@
+/**
+ * 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
new file mode 100644
index 0000000000..c9b29ae57f
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleArtifactESTest.java
@@ -0,0 +1,154 @@
+/*
+ * 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
new file mode 100644
index 0000000000..75c5f1588f
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleArtifactESTestscaffolding.java
@@ -0,0 +1,83 @@
+/**
+ * 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/VfModuleStructureESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleStructureESTest.java
new file mode 100644
index 0000000000..f3c20c5eb7
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleStructureESTest.java
@@ -0,0 +1,108 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Fri Nov 25 13:37:00 GMT 2016
+ */
+
+package org.openecomp.mso.asdc.installer;
+
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.evosuite.runtime.ViolatedAssumptionAnswer;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openecomp.sdc.api.notification.INotificationData;
+import org.openecomp.sdc.api.notification.IResourceInstance;
+import org.openecomp.sdc.api.notification.IVfModuleMetadata;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.evosuite.runtime.EvoAssertions.verifyException;
+import static org.evosuite.shaded.org.mockito.Mockito.doReturn;
+import static org.evosuite.shaded.org.mockito.Mockito.mock;
+import static org.junit.Assert.fail;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+public class VfModuleStructureESTest extends VfModuleStructureESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      doReturn((List) null).when(iVfModuleMetadata0).getArtifacts();
+      VfModuleStructure vfModuleStructure0 = null;
+      try {
+        vfModuleStructure0 = new VfModuleStructure(vfResourceStructure0, iVfModuleMetadata0);
+        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 test2()  throws Throwable  {
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      doReturn((List) null).when(iVfModuleMetadata0).getArtifacts();
+      VfModuleStructure vfModuleStructure0 = null;
+      try {
+        vfModuleStructure0 = new VfModuleStructure((VfResourceStructure) null, iVfModuleMetadata0);
+        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 test3()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      LinkedList<String> linkedList0 = new LinkedList<String>();
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      doReturn(linkedList0).when(iVfModuleMetadata0).getArtifacts();
+      linkedList0.add("");
+      VfModuleStructure vfModuleStructure0 = null;
+      try {
+        vfModuleStructure0 = new VfModuleStructure(vfResourceStructure0, iVfModuleMetadata0);
+        fail("Expecting exception: Exception");
+      
+      } catch(Exception e) {
+         //
+         // Artifact (UUID:) referenced in the VFModule UUID list has not been downloaded, cancelling the Resource deployment
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleStructure", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      vfResourceStructure0.setSuccessfulDeployment();
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      doReturn((List) null).when(iVfModuleMetadata0).getArtifacts();
+      vfResourceStructure0.setSuccessfulDeployment();
+      VfModuleStructure vfModuleStructure0 = null;
+      try {
+        vfModuleStructure0 = new VfModuleStructure(vfResourceStructure0, iVfModuleMetadata0);
+        fail("Expecting exception: NullPointerException");
+      
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleStructure", e);
+      }
+  }
+}
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
new file mode 100644
index 0000000000..f6aa2ab5f2
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleStructureESTestscaffolding.java
@@ -0,0 +1,96 @@
+/**
+ * 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/installer/VfResourceStructureESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfResourceStructureESTest.java
new file mode 100644
index 0000000000..4a27df3a48
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfResourceStructureESTest.java
@@ -0,0 +1,400 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Fri Nov 25 13:29:36 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.openecomp.mso.db.catalog.beans.Service;
+import org.openecomp.mso.db.catalog.beans.VnfResource;
+import java.time.chrono.ChronoLocalDate;
+import java.util.Iterator;
+import java.util.LinkedList;
+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.evosuite.runtime.mock.java.time.chrono.MockHijrahDate;
+import org.junit.runner.RunWith;
+import org.openecomp.sdc.api.IDistributionClient;
+import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.openecomp.sdc.api.notification.INotificationData;
+import org.openecomp.sdc.api.notification.IResourceInstance;
+import org.openecomp.sdc.impl.DistributionClientDownloadResultImpl;
+import org.openecomp.sdc.impl.mock.DistributionClientDownloadResultStubImpl;
+import org.openecomp.sdc.impl.mock.DistributionClientStubImpl;
+import org.openecomp.sdc.utils.DistributionActionResultEnum;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+public class VfResourceStructureESTest extends VfResourceStructureESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesStructureList", (Object) null);
+      vfResourceStructure0.getVfModuleStructure();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      LinkedList<Object> linkedList0 = new LinkedList<Object>();
+      linkedList0.add((Object) vfResourceStructure0);
+      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesStructureList", (Object) linkedList0);
+      vfResourceStructure0.getVfModuleStructure();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure((INotificationData) null, (IResourceInstance) null);
+      vfResourceStructure0.getResourceInstance();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn("").when(iNotificationData0).toString();
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      vfResourceStructure0.getNotification();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      Service service0 = new Service();
+      service0.setId(6);
+      vfResourceStructure0.setCatalogService(service0);
+      vfResourceStructure0.getCatalogService();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      Iterator<ChronoLocalDate> iterator0 = (Iterator<ChronoLocalDate>) mock(Iterator.class, new ViolatedAssumptionAnswer());
+      List<ChronoLocalDate> list0 = (List<ChronoLocalDate>) mock(List.class, new ViolatedAssumptionAnswer());
+      doReturn((Iterator) null).when(list0).iterator();
+      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesMetadataList", (Object) list0);
+      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "isDeployedSuccessfully", (Object) true);
+      List<MockHijrahDate> list1 = (List<MockHijrahDate>) mock(List.class, new ViolatedAssumptionAnswer());
+      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "isDeployedSuccessfully", (Object) true);
+      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesStructureList", (Object) list1);
+      // Undeclared exception!
+      try { 
+        vfResourceStructure0.createVfModuleStructures();
+        fail("Expecting exception: NullPointerException");
+      
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfResourceStructure", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      Iterator<ChronoLocalDate> iterator0 = (Iterator<ChronoLocalDate>) mock(Iterator.class, new ViolatedAssumptionAnswer());
+      doReturn(false).when(iterator0).hasNext();
+      List<ChronoLocalDate> list0 = (List<ChronoLocalDate>) mock(List.class, new ViolatedAssumptionAnswer());
+      doReturn(iterator0).when(list0).iterator();
+      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesMetadataList", (Object) list0);
+      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "isDeployedSuccessfully", (Object) true);
+      List<MockHijrahDate> list1 = (List<MockHijrahDate>) mock(List.class, new ViolatedAssumptionAnswer());
+      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "isDeployedSuccessfully", (Object) true);
+      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesStructureList", (Object) list1);
+      vfResourceStructure0.createVfModuleStructures();
+      IDistributionClient iDistributionClient0 = mock(IDistributionClient.class, new ViolatedAssumptionAnswer());
+      IArtifactInfo iArtifactInfo0 = null;
+      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.ARTIFACT_NOT_FOUND;
+      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "");
+      List<Object> list2 = (List<Object>) mock(List.class, new ViolatedAssumptionAnswer());
+      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesMetadataList", (Object) list2);
+      // Undeclared exception!
+      try { 
+        vfResourceStructure0.addArtifactToStructure(iDistributionClient0, (IArtifactInfo) null, distributionClientDownloadResultImpl0);
+        fail("Expecting exception: NullPointerException");
+      
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      ChronoLocalDate chronoLocalDate0 = mock(ChronoLocalDate.class, new ViolatedAssumptionAnswer());
+      Iterator<ChronoLocalDate> iterator0 = (Iterator<ChronoLocalDate>) mock(Iterator.class, new ViolatedAssumptionAnswer());
+      doReturn(true).when(iterator0).hasNext();
+      doReturn(chronoLocalDate0).when(iterator0).next();
+      List<ChronoLocalDate> list0 = (List<ChronoLocalDate>) mock(List.class, new ViolatedAssumptionAnswer());
+      doReturn(iterator0).when(list0).iterator();
+      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesMetadataList", (Object) list0);
+      // Undeclared exception!
+      try { 
+        vfResourceStructure0.createVfModuleStructures();
+        fail("Expecting exception: ClassCastException");
+      
+      } catch(ClassCastException e) {
+         //
+         // $java.time.chrono.ChronoLocalDate$$EnhancerByMockitoWithCGLIB$$27d47344 cannot be cast to org.openecomp.sdc.api.notification.IVfModuleMetadata
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfResourceStructure", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      try { 
+        vfResourceStructure0.createVfModuleStructures();
+        fail("Expecting exception: Exception");
+      
+      } catch(Exception e) {
+         //
+         // VfModule Meta DATA could not be decoded properly or was not present in the notification
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfResourceStructure", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
+      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      doReturn("%[76").when(iArtifactInfo0).getArtifactType();
+      DistributionClientDownloadResultStubImpl distributionClientDownloadResultStubImpl0 = (DistributionClientDownloadResultStubImpl)distributionClientStubImpl0.download(iArtifactInfo0);
+      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo0, distributionClientDownloadResultStubImpl0);
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
+      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      doReturn("HEAT_ARTIFACT").when(iArtifactInfo0).getArtifactType();
+      doReturn((String) null).when(iArtifactInfo0).getArtifactUUID();
+      DistributionClientDownloadResultStubImpl distributionClientDownloadResultStubImpl0 = (DistributionClientDownloadResultStubImpl)distributionClientStubImpl0.download(iArtifactInfo0);
+      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo0, distributionClientDownloadResultStubImpl0);
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
+      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      DistributionClientDownloadResultStubImpl distributionClientDownloadResultStubImpl0 = (DistributionClientDownloadResultStubImpl)distributionClientStubImpl0.download(iArtifactInfo0);
+      IArtifactInfo iArtifactInfo1 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      doReturn("HEAT").when(iArtifactInfo1).getArtifactType();
+      doReturn("%[76").when(iArtifactInfo1).getArtifactUUID();
+      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo1, distributionClientDownloadResultStubImpl0);
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
+      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      DistributionClientDownloadResultStubImpl distributionClientDownloadResultStubImpl0 = (DistributionClientDownloadResultStubImpl)distributionClientStubImpl0.download(iArtifactInfo0);
+      IArtifactInfo iArtifactInfo1 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      doReturn("HEAT_NET").when(iArtifactInfo1).getArtifactType();
+      doReturn("HEAT_ENV").when(iArtifactInfo1).getArtifactUUID();
+      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo1, distributionClientDownloadResultStubImpl0);
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure((INotificationData) null, iResourceInstance0);
+      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
+      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      doReturn("HEAT_ENV").when(iArtifactInfo0).getArtifactType();
+      doReturn("*Z\"P4rvOA+mW").when(iArtifactInfo0).getArtifactUUID();
+      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.UEB_KEYS_CREATION_FAILED;
+      byte[] byteArray0 = new byte[6];
+      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "]=)|;N.$hV]d^", "s:h+", byteArray0);
+      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo0, distributionClientDownloadResultImpl0);
+      Map<String, VfModuleArtifact> map0 = vfResourceStructure0.getArtifactsMapByUUID();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+      assertFalse(map0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
+      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      doReturn("VF_MODULES_METADATA").when(iArtifactInfo0).getArtifactType();
+      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.BAD_REQUEST;
+      byte[] byteArray0 = new byte[2];
+      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "<B['", "<B['", byteArray0);
+      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo0, distributionClientDownloadResultImpl0);
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
+      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      doReturn("HEAT_NESTED").when(iArtifactInfo0).getArtifactType();
+      doReturn("HEAT_NESTED").when(iArtifactInfo0).getArtifactUUID();
+      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.BAD_REQUEST;
+      byte[] byteArray0 = new byte[2];
+      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "<B['", "<B['", byteArray0);
+      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo0, distributionClientDownloadResultImpl0);
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      vfResourceStructure0.getCatalogService();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      vfResourceStructure0.getVfModulesStructureList();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test18()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      vfResourceStructure0.getArtifactsMapByUUID();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test19()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+      
+      vfResourceStructure0.setSuccessfulDeployment();
+      boolean boolean0 = vfResourceStructure0.isDeployedSuccessfully();
+      assertTrue(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test20()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      vfResourceStructure0.getCatalogVnfResource();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test21()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      vfResourceStructure0.getVfModuleStructure();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test22()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      boolean boolean0 = vfResourceStructure0.isDeployedSuccessfully();
+      assertFalse(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test23()  throws Throwable  {
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure((INotificationData) null, iResourceInstance0);
+      vfResourceStructure0.getNotification();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test24()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      VnfResource vnfResource0 = new VnfResource();
+      vfResourceStructure0.setCatalogVnfResource(vnfResource0);
+      vfResourceStructure0.getCatalogVnfResource();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test25()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      Service service0 = new Service();
+      vfResourceStructure0.setCatalogService(service0);
+      vfResourceStructure0.getCatalogService();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+
+  @Test(timeout = 4000)
+  public void test26()  throws Throwable  {
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iResourceInstance0).toString();
+      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
+      vfResourceStructure0.getResourceInstance();
+      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
+  }
+}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfResourceStructureESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfResourceStructureESTestscaffolding.java
new file mode 100644
index 0000000000..f78949eecc
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfResourceStructureESTestscaffolding.java
@@ -0,0 +1,105 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Fri Nov 25 13:29:36 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 VfResourceStructureESTestscaffolding {
+
+  @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.VfResourceStructure"; 
+    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(VfResourceStructureESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.sdc.api.IDistributionClient",
+      "org.openecomp.mso.db.catalog.beans.ServiceRecipe",
+      "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.utils.DistributionActionResultEnum",
+      "org.openecomp.sdc.impl.DistributionClientResultImpl",
+      "org.openecomp.sdc.impl.mock.DistributionClientStubImpl",
+      "org.openecomp.sdc.impl.DistributionClientDownloadResultImpl",
+      "org.openecomp.sdc.api.consumer.IConfiguration",
+      "org.openecomp.sdc.api.notification.IVfModuleMetadata",
+      "org.openecomp.sdc.api.results.IDistributionClientResult",
+      "org.openecomp.mso.db.catalog.beans.Service",
+      "org.openecomp.sdc.api.notification.IArtifactInfo",
+      "org.openecomp.sdc.impl.mock.DistributionClientDownloadResultStubImpl",
+      "org.openecomp.sdc.api.consumer.INotificationCallback",
+      "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.impl.mock.DistributionClientResultStubImpl",
+      "org.openecomp.sdc.api.results.IDistributionClientDownloadResult",
+      "org.openecomp.sdc.api.consumer.IDistributionStatusMessage"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(VfResourceStructureESTestscaffolding.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
new file mode 100644
index 0000000000..77c70e015e
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTest.java
@@ -0,0 +1,746 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Fri Nov 25 13:31:27 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 java.util.Collection;
+import java.util.Comparator;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.function.Predicate;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.evosuite.runtime.ViolatedAssumptionAnswer;
+import org.junit.runner.RunWith;
+import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.openecomp.sdc.api.notification.INotificationData;
+import org.openecomp.sdc.api.notification.IResourceInstance;
+import org.openecomp.sdc.api.notification.IVfModuleMetadata;
+
+@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  {
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
+      LinkedList<IArtifactInfo> linkedList1 = new LinkedList<IArtifactInfo>();
+      Integer integer0 = new Integer(2147483645);
+      Integer integer1 = new Integer(2147483645);
+      Integer integer2 = new Integer(2147483645);
+      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();
+      IArtifactInfo iArtifactInfo1 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      doReturn("Resource Instance Info:").when(iArtifactInfo1).getArtifactChecksum();
+      doReturn("~1xF'ZQr|qhuc{").when(iArtifactInfo1).getArtifactDescription();
+      doReturn("").when(iArtifactInfo1).getArtifactName();
+      doReturn(integer1).when(iArtifactInfo1).getArtifactTimeout();
+      doReturn("7<\"g").when(iArtifactInfo1).getArtifactType();
+      doReturn("").when(iArtifactInfo1).getArtifactURL();
+      doReturn("").when(iArtifactInfo1).getArtifactUUID();
+      doReturn("7<\"g").when(iArtifactInfo1).getArtifactVersion();
+      doReturn(iArtifactInfo0).when(iArtifactInfo1).getGeneratedArtifact();
+      doReturn(linkedList1, linkedList1).when(iArtifactInfo1).getRelatedArtifacts();
+      LinkedList<IArtifactInfo> linkedList2 = new LinkedList<IArtifactInfo>();
+      Integer integer3 = new Integer(1);
+      LinkedList<IArtifactInfo> linkedList3 = new LinkedList<IArtifactInfo>();
+      IArtifactInfo iArtifactInfo2 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      doReturn("-X^ og(1=?-*/%4", "%jgpj", (String) null).when(iArtifactInfo2).getArtifactChecksum();
+      doReturn("7<\"g", "", (String) null).when(iArtifactInfo2).getArtifactDescription();
+      doReturn("7 'W{]65Y%Vh_ynFOr", "]+O?<_o+Mx?P@|^<:|/", (String) null).when(iArtifactInfo2).getArtifactName();
+      doReturn(integer0, integer3, (Integer) null).when(iArtifactInfo2).getArtifactTimeout();
+      doReturn("]+O?<_o+Mx?P@|^<:|/", "", (String) null).when(iArtifactInfo2).getArtifactType();
+      doReturn("i]\r7Wr. <gStwjW", "Ns3ZUZX(", (String) null).when(iArtifactInfo2).getArtifactURL();
+      doReturn("7 'W{]65Y%Vh_ynFOr", "7<\"g", (String) null).when(iArtifactInfo2).getArtifactUUID();
+      doReturn("7 'W{]65Y%Vh_ynFOr", "YuS7'", (String) null).when(iArtifactInfo2).getArtifactVersion();
+      doReturn(iArtifactInfo1, (IArtifactInfo) null, (IArtifactInfo) null).when(iArtifactInfo2).getGeneratedArtifact();
+      doReturn(linkedList2, linkedList2, linkedList3, linkedList3, (List) null).when(iArtifactInfo2).getRelatedArtifacts();
+      linkedList1.add(iArtifactInfo2);
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn("~1xF'ZQr|qhuc{").when(iNotificationData0).getDistributionID();
+      doReturn(linkedList0, linkedList0).when(iNotificationData0).getResources();
+      doReturn(linkedList1).when(iNotificationData0).getServiceArtifacts();
+      doReturn("").when(iNotificationData0).getServiceDescription();
+      doReturn("").when(iNotificationData0).getServiceInvariantUUID();
+      doReturn("").when(iNotificationData0).getServiceName();
+      doReturn("").when(iNotificationData0).getServiceUUID();
+      doReturn("TvEm!").when(iNotificationData0).getServiceVersion();
+      String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData1).getDistributionID();
+      doReturn(linkedList0, linkedList0).when(iNotificationData1).getResources();
+      doReturn(linkedList1).when(iNotificationData1).getServiceArtifacts();
+      doReturn("").when(iNotificationData1).getServiceDescription();
+      doReturn("Tz)|, ,").when(iNotificationData1).getServiceInvariantUUID();
+      doReturn("").when(iNotificationData1).getServiceName();
+      doReturn("").when(iNotificationData1).getServiceUUID();
+      doReturn("Tz)|, ,").when(iNotificationData1).getServiceVersion();
+      String string1 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
+      assertFalse(string1.equals((Object)string0));
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
+      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      linkedList0.add(iVfModuleMetadata0);
+      LinkedList<Object> linkedList1 = new LinkedList<Object>();
+      Object object0 = new Object();
+      linkedList1.push(object0);
+      linkedList0.spliterator();
+      linkedList0.removeAll(linkedList1);
+      linkedList0.clear();
+      LinkedList<String> linkedList2 = new LinkedList<String>();
+      IVfModuleMetadata iVfModuleMetadata1 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      doReturn((List<String>) null, (List<String>) null, linkedList2, (List<String>) null).when(iVfModuleMetadata1).getArtifacts();
+      doReturn("e.tf%6&", "e.tf%6&", "").when(iVfModuleMetadata1).getVfModuleModelDescription();
+      doReturn("", "", "").when(iVfModuleMetadata1).getVfModuleModelInvariantUUID();
+      doReturn("", "", "e.tf%6&").when(iVfModuleMetadata1).getVfModuleModelName();
+      doReturn("VfModuleMetaData:", "e.tf%6&", "BaseArtifactInfoImpl [artifactName=").when(iVfModuleMetadata1).getVfModuleModelUUID();
+      doReturn("e.tf%6&", "e.tf%6&", "e.tf%6&").when(iVfModuleMetadata1).getVfModuleModelVersion();
+      doReturn(false, false).when(iVfModuleMetadata1).isBase();
+      linkedList0.add(iVfModuleMetadata1);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      // 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.util.ASDCNotificationLogging", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
+      ASDCNotificationLogging aSDCNotificationLogging1 = new ASDCNotificationLogging();
+      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      doReturn((List<String>) null, (List<String>) null).when(iVfModuleMetadata0).getArtifacts();
+      doReturn("TTq", (String) null).when(iVfModuleMetadata0).getVfModuleModelDescription();
+      doReturn("", (String) null).when(iVfModuleMetadata0).getVfModuleModelInvariantUUID();
+      doReturn("w1e~\"rjNBjuq*0HB!3&", (String) null).when(iVfModuleMetadata0).getVfModuleModelName();
+      doReturn("+l", (String) null).when(iVfModuleMetadata0).getVfModuleModelUUID();
+      doReturn("]", (String) null).when(iVfModuleMetadata0).getVfModuleModelVersion();
+      doReturn(true, false).when(iVfModuleMetadata0).isBase();
+      linkedList0.add(iVfModuleMetadata0);
+      IVfModuleMetadata iVfModuleMetadata1 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      linkedList0.removeFirstOccurrence(aSDCNotificationLogging1);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      assertEquals("{\nVfModuleMetaData:\nVfModuleModelName:NULL\nVfModuleModelVersion:NULL\nVfModuleModelUUID:NULL\nVfModuleModelInvariantUUID:NULL\nVfModuleModelDescription:NULL\nArtifacts UUID List:NULL\nisBase:false\n\n\n}\n", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      List<IResourceInstance> list0 = (List<IResourceInstance>) mock(List.class, new ViolatedAssumptionAnswer());
+      List<IArtifactInfo> list1 = (List<IArtifactInfo>) mock(List.class, new ViolatedAssumptionAnswer());
+      doReturn(false).when(list1).isEmpty();
+      doReturn((Iterator) null).when(list1).iterator();
+      doReturn(0).when(list1).size();
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData0).getDistributionID();
+      doReturn(list1).when(iNotificationData0).getServiceArtifacts();
+      doReturn("9").when(iNotificationData0).getServiceDescription();
+      doReturn("9").when(iNotificationData0).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData0).getServiceName();
+      doReturn("Type not recognized").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 test04()  throws Throwable  {
+      LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn("(ICU8j3G)Z4Z[GAE").when(iNotificationData0).getDistributionID();
+      doReturn(linkedList0, linkedList0).when(iNotificationData0).getResources();
+      doReturn((List<IArtifactInfo>) null).when(iNotificationData0).getServiceArtifacts();
+      doReturn(")&42fB6dZT&HRAb1a").when(iNotificationData0).getServiceDescription();
+      doReturn("(ICU8j3G)Z4Z[GAE").when(iNotificationData0).getServiceInvariantUUID();
+      doReturn(")&42fB6dZT&HRAb1a").when(iNotificationData0).getServiceName();
+      doReturn(")&42fB6dZT&HRAb1a").when(iNotificationData0).getServiceUUID();
+      doReturn("cHH N9Ha9YUPSpX00i").when(iNotificationData0).getServiceVersion();
+      String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+      assertEquals("ASDC Notification:\nDistributionID:(ICU8j3G)Z4Z[GAE\nServiceName:)&42fB6dZT&HRAb1a\nServiceVersion:cHH N9Ha9YUPSpX00i\nServiceUUID:)&42fB6dZT&HRAb1a\nServiceInvariantUUID:(ICU8j3G)Z4Z[GAE\nServiceDescription:)&42fB6dZT&HRAb1a\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
+      assertEquals(0, linkedList0.size());
+      
+      LinkedList<String> linkedList1 = new LinkedList<String>();
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      doReturn(linkedList1, linkedList1).when(iVfModuleMetadata0).getArtifacts();
+      doReturn(", artifactTimeout=").when(iVfModuleMetadata0).getVfModuleModelDescription();
+      doReturn(", artifactChecksum=").when(iVfModuleMetadata0).getVfModuleModelInvariantUUID();
+      doReturn(", artifactTimeout=").when(iVfModuleMetadata0).getVfModuleModelName();
+      doReturn(", artifactTimeout=").when(iVfModuleMetadata0).getVfModuleModelUUID();
+      doReturn(", artifactTimeout=").when(iVfModuleMetadata0).getVfModuleModelVersion();
+      doReturn(false).when(iVfModuleMetadata0).isBase();
+      IVfModuleMetadata iVfModuleMetadata1 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      linkedList0.add(iVfModuleMetadata1);
+      linkedList1.push("dzjz-zmMzFE");
+      linkedList0.listIterator();
+      linkedList0.toArray();
+      linkedList0.add(iVfModuleMetadata0);
+      linkedList0.pollFirst();
+      String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      assertEquals("{\nVfModuleMetaData:\nVfModuleModelName:, artifactTimeout=\nVfModuleModelVersion:, artifactTimeout=\nVfModuleModelUUID:, artifactTimeout=\nVfModuleModelInvariantUUID:, artifactChecksum=\nVfModuleModelDescription:, artifactTimeout=\nArtifacts UUID List:{\ndzjz-zmMzFE\n\n}\n\nisBase:false\n\n\n}\n", string0);
+      
+      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
+      LinkedList<IResourceInstance> linkedList2 = new LinkedList<IResourceInstance>();
+      LinkedList<IResourceInstance> linkedList3 = new LinkedList<IResourceInstance>((Collection<? extends IResourceInstance>) linkedList2);
+      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 string1 = 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", string1);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  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();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
+      List<IVfModuleMetadata> list0 = linkedList0.subList(0, 0);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      linkedList0.removeAll(list0);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      Comparator<Object> comparator0 = (Comparator<Object>) mock(Comparator.class, new ViolatedAssumptionAnswer());
+      linkedList0.sort(comparator0);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      linkedList0.offerLast(iVfModuleMetadata0);
+      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
+      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData1).getDistributionID();
+      doReturn((List) null).when(iNotificationData1).getResources();
+      doReturn((List) null).when(iNotificationData1).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData1).getServiceDescription();
+      doReturn((String) null).when(iNotificationData1).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData1).getServiceName();
+      doReturn((String) null).when(iNotificationData1).getServiceUUID();
+      doReturn((String) null).when(iNotificationData1).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
+      // Undeclared exception!
+      try { 
+        ASDCNotificationLogging.dumpVfModuleMetaDataList(list0);
+        fail("Expecting exception: ConcurrentModificationException");
+      
+      } catch(ConcurrentModificationException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("java.util.SubList", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
+      ASDCNotificationLogging aSDCNotificationLogging1 = new ASDCNotificationLogging();
+      LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
+      LinkedList<IArtifactInfo> linkedList1 = new LinkedList<IArtifactInfo>();
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn("ResourceInstanceName:").when(iNotificationData0).getDistributionID();
+      doReturn(linkedList0, linkedList0).when(iNotificationData0).getResources();
+      doReturn(linkedList1).when(iNotificationData0).getServiceArtifacts();
+      doReturn("ResourceInstanceName:").when(iNotificationData0).getServiceDescription();
+      doReturn((String) null).when(iNotificationData0).getServiceInvariantUUID();
+      doReturn("ResourceInstanceName:").when(iNotificationData0).getServiceName();
+      doReturn("pr26M0Ud8~n6#j/;g").when(iNotificationData0).getServiceUUID();
+      doReturn((String) null).when(iNotificationData0).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+      ASDCNotificationLogging aSDCNotificationLogging2 = new ASDCNotificationLogging();
+      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn("ResourceInstanceName:").when(iNotificationData1).getDistributionID();
+      doReturn(linkedList0, linkedList0).when(iNotificationData1).getResources();
+      doReturn(linkedList1).when(iNotificationData1).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData1).getServiceDescription();
+      doReturn("").when(iNotificationData1).getServiceInvariantUUID();
+      doReturn("pr26M0Ud8~n6#j/;g").when(iNotificationData1).getServiceName();
+      doReturn("").when(iNotificationData1).getServiceUUID();
+      doReturn("Resource Artifacts List:").when(iNotificationData1).getServiceVersion();
+      String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
+      assertEquals("ASDC Notification:\nDistributionID:ResourceInstanceName:\nServiceName:pr26M0Ud8~n6#j/;g\nServiceVersion:Resource Artifacts List:\nServiceUUID:\nServiceInvariantUUID:\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n", string0);
+      
+      ASDCNotificationLogging aSDCNotificationLogging3 = new ASDCNotificationLogging();
+      LinkedList<IVfModuleMetadata> linkedList2 = new LinkedList<IVfModuleMetadata>();
+      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList2);
+      LinkedList<IResourceInstance> linkedList3 = new LinkedList<IResourceInstance>();
+      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactChecksum();
+      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactDescription();
+      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactName();
+      doReturn((Integer) null, (Integer) null, (Integer) null).when(iArtifactInfo0).getArtifactTimeout();
+      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactType();
+      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactURL();
+      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactUUID();
+      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactVersion();
+      doReturn((IArtifactInfo) null, (IArtifactInfo) null, (IArtifactInfo) null).when(iArtifactInfo0).getGeneratedArtifact();
+      doReturn((List) null, (List) null, (List) null).when(iArtifactInfo0).getRelatedArtifacts();
+      linkedList1.add(iArtifactInfo0);
+      INotificationData iNotificationData2 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn("tlh7ku").when(iNotificationData2).getDistributionID();
+      doReturn(linkedList3, linkedList0).when(iNotificationData2).getResources();
+      doReturn(linkedList1).when(iNotificationData2).getServiceArtifacts();
+      doReturn("").when(iNotificationData2).getServiceDescription();
+      doReturn("").when(iNotificationData2).getServiceInvariantUUID();
+      doReturn("tlh7ku").when(iNotificationData2).getServiceName();
+      doReturn("_B4BTx//Er%IWM}et0").when(iNotificationData2).getServiceUUID();
+      doReturn("").when(iNotificationData2).getServiceVersion();
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      doReturn(linkedList1).when(iResourceInstance0).getArtifacts();
+      doReturn("").when(iResourceInstance0).getResourceInstanceName();
+      doReturn("Resource Artifacts List:").when(iResourceInstance0).getResourceInvariantUUID();
+      doReturn("Hq^8Xl<>T").when(iResourceInstance0).getResourceName();
+      doReturn((String) null).when(iResourceInstance0).getResourceType();
+      doReturn("ASDC Notification:\nDistributionID:ResourceInstanceName:\nServiceName:ResourceInstanceName:\nServiceVersion:NULL\nServiceUUID:pr26M0Ud8~n6#j/;g\nServiceInvariantUUID:NULL\nServiceDescription:ResourceInstanceName:\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n").when(iResourceInstance0).getResourceUUID();
+      doReturn("zIQ?4(U$K ").when(iResourceInstance0).getResourceVersion();
+      linkedList0.add(iResourceInstance0);
+      IResourceInstance iResourceInstance1 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      doReturn(linkedList1).when(iResourceInstance1).getArtifacts();
+      doReturn("ASDC Notification:\nDistributionID:ResourceInstanceName:\nServiceName:pr26M0Ud8~n6#j/;g\nServiceVersion:Resource Artifacts List:\nServiceUUID:\nServiceInvariantUUID:\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n").when(iResourceInstance1).getResourceInstanceName();
+      doReturn("5yNU;|<:T-ixwLB").when(iResourceInstance1).getResourceInvariantUUID();
+      doReturn("").when(iResourceInstance1).getResourceName();
+      doReturn("xguM[yK-\"").when(iResourceInstance1).getResourceType();
+      doReturn("").when(iResourceInstance1).getResourceUUID();
+      doReturn("ASDC Notification:\nDistributionID:ResourceInstanceName:\nServiceName:pr26M0Ud8~n6#j/;g\nServiceVersion:Resource Artifacts List:\nServiceUUID:\nServiceInvariantUUID:\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n").when(iResourceInstance1).getResourceVersion();
+      linkedList1.removeFirstOccurrence((Object) null);
+      linkedList0.add(iResourceInstance1);
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData2);
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      String string1 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList2);
+      assertEquals("\n}\n", string1);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      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();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData1).getDistributionID();
+      doReturn((List) null).when(iNotificationData1).getResources();
+      doReturn((List) null).when(iNotificationData1).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData1).getServiceDescription();
+      doReturn((String) null).when(iNotificationData1).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData1).getServiceName();
+      doReturn((String) null).when(iNotificationData1).getServiceUUID();
+      doReturn((String) null).when(iNotificationData1).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
+      INotificationData iNotificationData2 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData2).getDistributionID();
+      doReturn((List) null).when(iNotificationData2).getResources();
+      doReturn((List) null).when(iNotificationData2).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData2).getServiceDescription();
+      doReturn((String) null).when(iNotificationData2).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData2).getServiceName();
+      doReturn((String) null).when(iNotificationData2).getServiceUUID();
+      doReturn((String) null).when(iNotificationData2).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData2);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      INotificationData iNotificationData3 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData3).getDistributionID();
+      doReturn((List) null).when(iNotificationData3).getResources();
+      doReturn((List) null).when(iNotificationData3).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData3).getServiceDescription();
+      doReturn((String) null).when(iNotificationData3).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData3).getServiceName();
+      doReturn((String) null).when(iNotificationData3).getServiceUUID();
+      doReturn((String) null).when(iNotificationData3).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData3);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      INotificationData iNotificationData4 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData4).getDistributionID();
+      doReturn((List) null).when(iNotificationData4).getResources();
+      doReturn((List) null).when(iNotificationData4).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData4).getServiceDescription();
+      doReturn((String) null).when(iNotificationData4).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData4).getServiceName();
+      doReturn((String) null).when(iNotificationData4).getServiceUUID();
+      doReturn((String) null).when(iNotificationData4).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData4);
+      INotificationData iNotificationData5 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData5).getDistributionID();
+      doReturn((List) null).when(iNotificationData5).getResources();
+      doReturn((List) null).when(iNotificationData5).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData5).getServiceDescription();
+      doReturn((String) null).when(iNotificationData5).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData5).getServiceName();
+      doReturn((String) null).when(iNotificationData5).getServiceUUID();
+      doReturn((String) null).when(iNotificationData5).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData5);
+      INotificationData iNotificationData6 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData6).getDistributionID();
+      doReturn((List) null).when(iNotificationData6).getResources();
+      doReturn((List) null).when(iNotificationData6).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData6).getServiceDescription();
+      doReturn((String) null).when(iNotificationData6).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData6).getServiceName();
+      doReturn((String) null).when(iNotificationData6).getServiceUUID();
+      doReturn((String) null).when(iNotificationData6).getServiceVersion();
+      String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData6);
+      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);
+      
+      ASDCNotificationLogging.dumpASDCNotification((INotificationData) null);
+      String string1 = ASDCNotificationLogging.dumpASDCNotification((INotificationData) null);
+      assertEquals("NULL", string1);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      LinkedList<IArtifactInfo> linkedList0 = new LinkedList<IArtifactInfo>();
+      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.add(iArtifactInfo0);
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData0).getDistributionID();
+      doReturn((List<IResourceInstance>) null).when(iNotificationData0).getResources();
+      doReturn(linkedList0).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("(").when(iNotificationData0).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
+      LinkedList<IVfModuleMetadata> linkedList1 = new LinkedList<IVfModuleMetadata>();
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      linkedList1.add(iVfModuleMetadata0);
+      LinkedList<String> linkedList2 = new LinkedList<String>();
+      LinkedList<String> linkedList3 = new LinkedList<String>();
+      linkedList1.removeFirst();
+      linkedList0.addAll((Collection<? extends IVfModuleMetadata>) linkedList1);
+      LinkedList<String> linkedList4 = new LinkedList<String>();
+      LinkedList<String> linkedList5 = new LinkedList<String>();
+      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      LinkedList<IResourceInstance> linkedList6 = new LinkedList<IResourceInstance>();
+      LinkedList<IArtifactInfo> linkedList7 = new LinkedList<IArtifactInfo>();
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn("]=ztki(=]").when(iNotificationData0).getDistributionID();
+      doReturn(linkedList6, linkedList6).when(iNotificationData0).getResources();
+      doReturn(linkedList7).when(iNotificationData0).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData0).getServiceDescription();
+      doReturn("").when(iNotificationData0).getServiceInvariantUUID();
+      doReturn("").when(iNotificationData0).getServiceName();
+      doReturn("VG).").when(iNotificationData0).getServiceUUID();
+      doReturn("").when(iNotificationData0).getServiceVersion();
+      linkedList0.spliterator();
+      linkedList0.containsAll(linkedList1);
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+      LinkedList<IResourceInstance> linkedList8 = new LinkedList<IResourceInstance>();
+      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn("C'K").when(iNotificationData1).getDistributionID();
+      doReturn(linkedList6, linkedList8).when(iNotificationData1).getResources();
+      doReturn(linkedList7).when(iNotificationData1).getServiceArtifacts();
+      doReturn("NotificationDataImpl [distributionID=").when(iNotificationData1).getServiceDescription();
+      doReturn((String) null).when(iNotificationData1).getServiceInvariantUUID();
+      doReturn("B.").when(iNotificationData1).getServiceName();
+      doReturn("").when(iNotificationData1).getServiceUUID();
+      doReturn("").when(iNotificationData1).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      linkedList0.add(iVfModuleMetadata0);
+      linkedList0.add((IVfModuleMetadata) null);
+      LinkedList<String> linkedList1 = new LinkedList<String>();
+      IVfModuleMetadata iVfModuleMetadata1 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      doReturn(linkedList1, linkedList1, linkedList1, linkedList1).when(iVfModuleMetadata1).getArtifacts();
+      doReturn("8u1XbrrMy{J2", "").when(iVfModuleMetadata1).getVfModuleModelDescription();
+      doReturn("YR/UZ7qrmvO", "8u1XbrrMy{J2").when(iVfModuleMetadata1).getVfModuleModelInvariantUUID();
+      doReturn("8u1XbrrMy{J2", ".l=(8f`8f}.9>yn").when(iVfModuleMetadata1).getVfModuleModelName();
+      doReturn("", "YR/UZ7qrmvO").when(iVfModuleMetadata1).getVfModuleModelUUID();
+      doReturn("[66/OPYLD.B%", ".l=(8f`8f}.9>yn").when(iVfModuleMetadata1).getVfModuleModelVersion();
+      doReturn(false, true).when(iVfModuleMetadata1).isBase();
+      LinkedList<IVfModuleMetadata> linkedList2 = new LinkedList<IVfModuleMetadata>();
+      linkedList2.add((IVfModuleMetadata) null);
+      linkedList2.offer((IVfModuleMetadata) null);
+      Predicate<IVfModuleMetadata> predicate0 = (Predicate<IVfModuleMetadata>) mock(Predicate.class, new ViolatedAssumptionAnswer());
+      doReturn(true, false).when(predicate0).test(any());
+      linkedList2.removeIf(predicate0);
+      linkedList0.retainAll(linkedList2);
+      LinkedList<String> linkedList3 = new LinkedList<String>();
+      IVfModuleMetadata iVfModuleMetadata2 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      doReturn(linkedList3, linkedList3, linkedList3, linkedList1).when(iVfModuleMetadata2).getArtifacts();
+      doReturn("YR/UZ7qrmvO", "8u1XbrrMy{J2").when(iVfModuleMetadata2).getVfModuleModelDescription();
+      doReturn("", "8u1XbrrMy{J2").when(iVfModuleMetadata2).getVfModuleModelInvariantUUID();
+      doReturn("[66/OPYLD.B%", "").when(iVfModuleMetadata2).getVfModuleModelName();
+      doReturn("", "[66/OPYLD.B%").when(iVfModuleMetadata2).getVfModuleModelUUID();
+      doReturn((String) null, "").when(iVfModuleMetadata2).getVfModuleModelVersion();
+      doReturn(true, false).when(iVfModuleMetadata2).isBase();
+      linkedList0.add(iVfModuleMetadata2);
+      linkedList0.push(iVfModuleMetadata1);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
+      ASDCNotificationLogging aSDCNotificationLogging1 = new ASDCNotificationLogging();
+      ASDCNotificationLogging aSDCNotificationLogging2 = new ASDCNotificationLogging();
+      ASDCNotificationLogging aSDCNotificationLogging3 = new ASDCNotificationLogging();
+      String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      assertEquals("{\nVfModuleMetaData:\nVfModuleModelName:.l=(8f`8f}.9>yn\nVfModuleModelVersion:.l=(8f`8f}.9>yn\nVfModuleModelUUID:YR/UZ7qrmvO\nVfModuleModelInvariantUUID:8u1XbrrMy{J2\nVfModuleModelDescription:\nArtifacts UUID List:\n}\n\nisBase:true\n\n,\nNULL\n,\nVfModuleMetaData:\nVfModuleModelName:\nVfModuleModelVersion:\nVfModuleModelUUID:[66/OPYLD.B%\nVfModuleModelInvariantUUID:8u1XbrrMy{J2\nVfModuleModelDescription:8u1XbrrMy{J2\nArtifacts UUID List:\n}\n\nisBase:false\n\n\n}\n", string0);
+      
+      LinkedList<IResourceInstance> linkedList4 = new LinkedList<IResourceInstance>();
+      LinkedList<IResourceInstance> linkedList5 = new LinkedList<IResourceInstance>((Collection<? extends IResourceInstance>) linkedList4);
+      LinkedList<IArtifactInfo> linkedList6 = new LinkedList<IArtifactInfo>();
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn("95y$c-.BW5V()41WR").when(iNotificationData0).getDistributionID();
+      doReturn(linkedList5, linkedList4).when(iNotificationData0).getResources();
+      doReturn(linkedList6).when(iNotificationData0).getServiceArtifacts();
+      doReturn(", artifactTimeout=").when(iNotificationData0).getServiceDescription();
+      doReturn("[66/OPYLD.B%").when(iNotificationData0).getServiceInvariantUUID();
+      doReturn("[66/OPYLD.B%").when(iNotificationData0).getServiceName();
+      doReturn(", artifactChecksum=").when(iNotificationData0).getServiceUUID();
+      doReturn("W1vX^KnIx[x").when(iNotificationData0).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+      ASDCNotificationLogging aSDCNotificationLogging4 = new ASDCNotificationLogging();
+      ASDCNotificationLogging aSDCNotificationLogging5 = new ASDCNotificationLogging();
+      LinkedList<IResourceInstance> linkedList7 = new LinkedList<IResourceInstance>();
+      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn("").when(iNotificationData1).getDistributionID();
+      doReturn(linkedList4, linkedList7).when(iNotificationData1).getResources();
+      doReturn(linkedList6).when(iNotificationData1).getServiceArtifacts();
+      doReturn("3l\"ZrTP`IQ-4x]").when(iNotificationData1).getServiceDescription();
+      doReturn("").when(iNotificationData1).getServiceInvariantUUID();
+      doReturn("").when(iNotificationData1).getServiceName();
+      doReturn("").when(iNotificationData1).getServiceUUID();
+      doReturn("").when(iNotificationData1).getServiceVersion();
+      String string1 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
+      assertEquals("ASDC Notification:\nDistributionID:\nServiceName:\nServiceVersion:\nServiceUUID:\nServiceInvariantUUID:\nServiceDescription:3l\"ZrTP`IQ-4x]\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n", string1);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  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();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData1).getDistributionID();
+      doReturn((List) null).when(iNotificationData1).getResources();
+      doReturn((List) null).when(iNotificationData1).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData1).getServiceDescription();
+      doReturn((String) null).when(iNotificationData1).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData1).getServiceName();
+      doReturn((String) null).when(iNotificationData1).getServiceUUID();
+      doReturn((String) null).when(iNotificationData1).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
+      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
+      INotificationData iNotificationData2 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData2).getDistributionID();
+      doReturn((List) null).when(iNotificationData2).getResources();
+      doReturn((List) null).when(iNotificationData2).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData2).getServiceDescription();
+      doReturn((String) null).when(iNotificationData2).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData2).getServiceName();
+      doReturn((String) null).when(iNotificationData2).getServiceUUID();
+      doReturn((String) null).when(iNotificationData2).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData2);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      ASDCNotificationLogging aSDCNotificationLogging1 = new ASDCNotificationLogging();
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      INotificationData iNotificationData3 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData3).getDistributionID();
+      doReturn((List) null).when(iNotificationData3).getResources();
+      doReturn((List) null).when(iNotificationData3).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData3).getServiceDescription();
+      doReturn((String) null).when(iNotificationData3).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData3).getServiceName();
+      doReturn((String) null).when(iNotificationData3).getServiceUUID();
+      doReturn((String) null).when(iNotificationData3).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData3);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      ASDCNotificationLogging aSDCNotificationLogging2 = new ASDCNotificationLogging();
+      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      doReturn((List) null, (List) null, (List) null).when(iVfModuleMetadata0).getArtifacts();
+      doReturn((String) null, (String) null, (String) null).when(iVfModuleMetadata0).getVfModuleModelDescription();
+      doReturn((String) null, (String) null, (String) null).when(iVfModuleMetadata0).getVfModuleModelInvariantUUID();
+      doReturn((String) null, (String) null, (String) null).when(iVfModuleMetadata0).getVfModuleModelName();
+      doReturn((String) null, (String) null, (String) null).when(iVfModuleMetadata0).getVfModuleModelUUID();
+      doReturn((String) null, (String) null, (String) null).when(iVfModuleMetadata0).getVfModuleModelVersion();
+      doReturn(false, false, false).when(iVfModuleMetadata0).isBase();
+      linkedList0.add(iVfModuleMetadata0);
+      linkedList0.removeLastOccurrence("ASDC Notification:\nDistributionID:NULL\nServiceName:NULL\nServiceVersion:NULL\nServiceUUID:NULL\nServiceInvariantUUID:NULL\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n");
+      linkedList0.remove((Object) null);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      ASDCNotificationLogging aSDCNotificationLogging3 = new ASDCNotificationLogging();
+      String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      String string1 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      assertEquals("{\nVfModuleMetaData:\nVfModuleModelName:NULL\nVfModuleModelVersion:NULL\nVfModuleModelUUID:NULL\nVfModuleModelInvariantUUID:NULL\nVfModuleModelDescription:NULL\nArtifacts UUID List:NULL\nisBase:false\n\n\n}\n", string1);
+      assertTrue(string1.equals((Object)string0));
+      
+      ASDCNotificationLogging aSDCNotificationLogging4 = new ASDCNotificationLogging();
+      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
+      INotificationData iNotificationData4 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(iNotificationData4).getDistributionID();
+      doReturn((List) null).when(iNotificationData4).getResources();
+      doReturn((List) null).when(iNotificationData4).getServiceArtifacts();
+      doReturn((String) null).when(iNotificationData4).getServiceDescription();
+      doReturn((String) null).when(iNotificationData4).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData4).getServiceName();
+      doReturn((String) null).when(iNotificationData4).getServiceUUID();
+      doReturn((String) null).when(iNotificationData4).getServiceVersion();
+      String string2 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData4);
+      assertEquals("ASDC Notification:\nDistributionID:NULL\nServiceName:NULL\nServiceVersion:NULL\nServiceUUID:NULL\nServiceInvariantUUID:NULL\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\nNULL\n", string2);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
+      LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
+      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+      doReturn((List) null).when(iResourceInstance0).getArtifacts();
+      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();
+      linkedList0.add(iResourceInstance0);
+      LinkedList<IArtifactInfo> linkedList1 = new LinkedList<IArtifactInfo>();
+      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+      doReturn("(n,0").when(iNotificationData0).getDistributionID();
+      doReturn(linkedList0, linkedList0).when(iNotificationData0).getResources();
+      doReturn(linkedList1).when(iNotificationData0).getServiceArtifacts();
+      doReturn("(n,0").when(iNotificationData0).getServiceDescription();
+      doReturn((String) null).when(iNotificationData0).getServiceInvariantUUID();
+      doReturn((String) null).when(iNotificationData0).getServiceName();
+      doReturn("").when(iNotificationData0).getServiceUUID();
+      doReturn("t1N;ZSJsATt:&Ug").when(iNotificationData0).getServiceVersion();
+      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+      LinkedList<IVfModuleMetadata> linkedList2 = new LinkedList<IVfModuleMetadata>();
+      linkedList2.clear();
+      // Undeclared exception!
+      try { 
+        linkedList2.remove();
+        fail("Expecting exception: NoSuchElementException");
+      
+      } catch(NoSuchElementException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("java.util.LinkedList", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
+      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      linkedList0.add(iVfModuleMetadata0);
+      linkedList0.remove((Object) "\n}\n");
+      IVfModuleMetadata iVfModuleMetadata1 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
+      linkedList0.offerLast(iVfModuleMetadata1);
+      // Undeclared exception!
+      try { 
+        linkedList0.subList((-1), (-1));
+        fail("Expecting exception: IndexOutOfBoundsException");
+      
+      } catch(IndexOutOfBoundsException e) {
+         //
+         // fromIndex = -1
+         //
+         verifyException("java.util.SubList", e);
+      }
+  }
+}
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
new file mode 100644
index 0000000000..1344bbe45d
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTestscaffolding.java
@@ -0,0 +1,81 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Fri Nov 25 13:31:27 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 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) 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.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 = 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(ASDCNotificationLoggingESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.sdc.api.notification.INotificationData",
+      "org.openecomp.sdc.api.notification.IResourceInstance",
+      "org.openecomp.sdc.api.notification.IVfModuleMetadata",
+      "org.openecomp.mso.asdc.util.ASDCNotificationLogging",
+      "org.openecomp.sdc.api.notification.IArtifactInfo"
+    );
+  } 
+
+  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
new file mode 100644
index 0000000000..c050a9cc20
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/YamlEditorESTest.java
@@ -0,0 +1,420 @@
+/*
+ * 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
new file mode 100644
index 0000000000..dca8696ef2
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/YamlEditorESTestscaffolding.java
@@ -0,0 +1,255 @@
+/**
+ * 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"
+    );
+  }
+}