[MSO-8] Remove files that crash the commonBPMN

Some files in commonBPMN have been removed as they prevent the war to be
successfully deployed on Jboss + Remove rest interfaces files for
catalog that should not be there anymore

Change-Id: Iaf83f8b60610624e160feac8a96b7eaed7f161d1
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

8 files changed, 0 insertions, 1571 deletions

diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomizationESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomizationESTest.java
deleted file mode 100644
index 5addb999ce..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomizationESTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Feb 20 14:08:31 GMT 2017
- */
-
-package org.openecomp.mso.adapters.catalogrest;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-import java.util.LinkedList;
-import java.util.List;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class QueryAllottedResourceCustomizationESTest extends QueryAllottedResourceCustomizationESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization();
-      queryAllottedResourceCustomization0.setServiceAllottedResources((List<AllottedResourceCustomization>) null);
-      List<AllottedResourceCustomization> list0 = queryAllottedResourceCustomization0.getServiceAllottedResources();
-      assertNull(list0);
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      LinkedList<AllottedResourceCustomization> linkedList0 = new LinkedList<AllottedResourceCustomization>();
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      linkedList0.add(allottedResourceCustomization0);
-      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization((List<AllottedResourceCustomization>) linkedList0);
-      List<AllottedResourceCustomization> list0 = queryAllottedResourceCustomization0.getServiceAllottedResources();
-      assertFalse(list0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      LinkedList<AllottedResourceCustomization> linkedList0 = new LinkedList<AllottedResourceCustomization>();
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      linkedList0.add(allottedResourceCustomization0);
-      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization((List<AllottedResourceCustomization>) linkedList0);
-      linkedList0.add(allottedResourceCustomization0);
-      String string0 = queryAllottedResourceCustomization0.toString();
-      assertEquals("1\tmodelName=null,modelVersion=null,version=null,modelUuid=null,modelInvariantUuid=null,modelCustomizationUuid=null,modelInstanceName=null,description=null,modelInstanceName=null,created=null1\t\nmodelName=null,modelVersion=null,version=null,modelUuid=null,modelInvariantUuid=null,modelCustomizationUuid=null,modelInstanceName=null,description=null,modelInstanceName=null,created=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test3()  throws Throwable  {
-      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization();
-      String string0 = queryAllottedResourceCustomization0.toString();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test4()  throws Throwable  {
-      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization();
-      List<AllottedResourceCustomization> list0 = queryAllottedResourceCustomization0.getServiceAllottedResources();
-      assertTrue(list0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test5()  throws Throwable  {
-      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization();
-      queryAllottedResourceCustomization0.setServiceAllottedResources((List<AllottedResourceCustomization>) null);
-      // Undeclared exception!
-      try {
-        queryAllottedResourceCustomization0.toString();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.adapters.catalogrest.QueryAllottedResourceCustomization", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test6()  throws Throwable  {
-      LinkedList<AllottedResourceCustomization> linkedList0 = new LinkedList<AllottedResourceCustomization>();
-      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization((List<AllottedResourceCustomization>) linkedList0);
-      // Undeclared exception!
-      try {
-        queryAllottedResourceCustomization0.toJsonString();
-        fail("Expecting exception: VerifyError");
-
-      } catch(VerifyError e) {
-         //
-         // (class: org/codehaus/jackson/map/MapperConfig, method: <clinit> signature: ()V) Bad type in putfield/putstatic
-         //
-         verifyException("org.codehaus.jackson.map.ObjectMapper", e);
-      }
-  }
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomizationESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomizationESTestscaffolding.java
deleted file mode 100644
index 0ce23dc7c2..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomizationESTestscaffolding.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Mon Feb 20 14:08:31 GMT 2017
- */
-
-package org.openecomp.mso.adapters.catalogrest;
-
-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 QueryAllottedResourceCustomizationESTestscaffolding {
-
-  @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.adapters.catalogrest.QueryAllottedResourceCustomization";
-    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(QueryAllottedResourceCustomizationESTestscaffolding.class.getClassLoader() ,
-      "org.codehaus.jackson.map.JsonSerializableWithType",
-      "org.codehaus.jackson.map.HandlerInstantiator",
-      "org.codehaus.jackson.map.deser.StdDeserializerProvider",
-      "org.codehaus.jackson.map.SerializerFactory",
-      "org.codehaus.jackson.map.SerializerProvider",
-      "org.codehaus.jackson.map.type.TypeBindings",
-      "org.codehaus.jackson.map.SerializationConfig",
-      "org.codehaus.jackson.JsonProcessingException",
-      "org.codehaus.jackson.map.introspect.AnnotationMap",
-      "org.codehaus.jackson.map.introspect.Annotated",
-      "org.codehaus.jackson.io.InputDecorator",
-      "org.codehaus.jackson.map.Module",
-      "org.codehaus.jackson.map.util.Annotations",
-      "org.codehaus.jackson.map.type.TypeModifier",
-      "org.codehaus.jackson.sym.NameN",
-      "org.codehaus.jackson.JsonGenerator",
-      "org.codehaus.jackson.map.introspect.AnnotatedClass",
-      "org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector",
-      "org.codehaus.jackson.annotate.JsonAutoDetect$1",
-      "org.codehaus.jackson.map.JsonSerializable",
-      "org.codehaus.jackson.annotate.JsonMethod",
-      "com.att.eelf.i18n.EELFResolvableErrorEnum",
-      "org.codehaus.jackson.node.BaseJsonNode",
-      "org.openecomp.mso.logger.MsoLogger$StatusCode",
-      "org.codehaus.jackson.map.ObjectReader",
-      "org.codehaus.jackson.map.DeserializerProvider",
-      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
-      "org.codehaus.jackson.node.ValueNode",
-      "org.codehaus.jackson.map.ser.BeanSerializerFactory",
-      "org.codehaus.jackson.map.JsonSerializer",
-      "org.codehaus.jackson.map.introspect.AnnotatedWithParams",
-      "com.att.eelf.i18n.EELFMsgs",
-      "org.codehaus.jackson.map.AnnotationIntrospector",
-      "org.codehaus.jackson.map.MappingJsonFactory",
-      "com.att.eelf.configuration.EELFLogger$Level",
-      "org.codehaus.jackson.map.MapperConfig$Impl",
-      "org.codehaus.jackson.sym.Name1",
-      "org.codehaus.jackson.sym.Name2",
-      "org.codehaus.jackson.sym.Name3",
-      "org.codehaus.jackson.map.introspect.MethodFilter",
-      "org.codehaus.jackson.map.ser.StdSerializerProvider",
-      "org.codehaus.jackson.map.deser.StdDeserializationContext",
-      "org.codehaus.jackson.type.TypeReference",
-      "org.codehaus.jackson.map.ClassIntrospector",
-      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
-      "org.codehaus.jackson.map.PropertyNamingStrategy$LowerCaseWithUnderscoresStrategy",
-      "org.codehaus.jackson.map.MapperConfig$ConfigFeature",
-      "org.codehaus.jackson.map.SerializationConfig$Feature",
-      "org.codehaus.jackson.Versioned",
-      "org.codehaus.jackson.io.IOContext",
-      "org.openecomp.mso.adapters.catalogrest.QueryAllottedResourceCustomization",
-      "org.codehaus.jackson.map.type.TypeBase",
-      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
-      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
-      "org.codehaus.jackson.map.PropertyNamingStrategy",
-      "org.codehaus.jackson.node.ContainerNode",
-      "org.codehaus.jackson.map.ser.FilterProvider",
-      "org.codehaus.jackson.map.jsontype.NamedType",
-      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
-      "com.att.eelf.configuration.EELFLogger",
-      "org.codehaus.jackson.map.DeserializationConfig",
-      "org.codehaus.jackson.map.introspect.AnnotatedConstructor",
-      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
-      "org.codehaus.jackson.map.type.TypeFactory",
-      "org.codehaus.jackson.impl.ReaderBasedParser",
-      "org.codehaus.jackson.sym.BytesToNameCanonicalizer$TableInfo",
-      "org.codehaus.jackson.JsonEncoding",
-      "org.codehaus.jackson.map.type.MapLikeType",
-      "org.codehaus.jackson.map.JsonDeserializer",
-      "org.codehaus.jackson.map.PropertyNamingStrategy$PropertyNamingStrategyBase",
-      "org.codehaus.jackson.node.ObjectNode",
-      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
-      "org.codehaus.jackson.map.ser.std.SerializerBase",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
-      "org.codehaus.jackson.map.type.CollectionLikeType",
-      "org.openecomp.mso.logger.MessageEnum",
-      "org.codehaus.jackson.map.DeserializationConfig$Feature",
-      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
-      "org.codehaus.jackson.map.introspect.AnnotatedMethodMap",
-      "org.codehaus.jackson.impl.JsonParserMinimalBase",
-      "org.codehaus.jackson.map.type.TypeParser",
-      "org.codehaus.jackson.map.introspect.POJOPropertiesCollector",
-      "org.codehaus.jackson.JsonParseException",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterMethodFilter",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker",
-      "org.codehaus.jackson.map.introspect.AnnotatedField",
-      "org.codehaus.jackson.impl.JsonGeneratorBase",
-      "org.codehaus.jackson.map.ObjectMapper",
-      "org.codehaus.jackson.util.ByteArrayBuilder",
-      "org.codehaus.jackson.map.ser.impl.FailingSerializer",
-      "org.codehaus.jackson.PrettyPrinter",
-      "org.codehaus.jackson.JsonToken",
-      "org.codehaus.jackson.map.jsontype.SubtypeResolver",
-      "org.codehaus.jackson.map.type.SimpleType",
-      "org.codehaus.jackson.map.util.StdDateFormat",
-      "org.codehaus.jackson.impl.Utf8Generator",
-      "org.codehaus.jackson.node.NumericNode",
-      "org.jboss.resteasy.annotations.providers.NoJackson",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterAndGetterMethodFilter",
-      "org.codehaus.jackson.JsonNode",
-      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
-      "org.codehaus.jackson.annotate.JacksonAnnotation",
-      "org.codehaus.jackson.map.ObjectWriter",
-      "org.codehaus.jackson.schema.SchemaAware",
-      "org.codehaus.jackson.io.OutputDecorator",
-      "com.att.eelf.configuration.SLF4jWrapper",
-      "org.codehaus.jackson.FormatSchema",
-      "org.codehaus.jackson.format.MatchStrength",
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.codehaus.jackson.ObjectCodec",
-      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.codehaus.jackson.JsonGenerationException",
-      "org.openecomp.mso.entity.MsoRequest",
-      "org.codehaus.jackson.format.InputAccessor",
-      "org.codehaus.jackson.JsonFactory",
-      "org.codehaus.jackson.node.ArrayNode",
-      "org.codehaus.jackson.util.BufferRecycler",
-      "org.codehaus.jackson.io.SegmentedStringWriter",
-      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
-      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
-      "org.codehaus.jackson.map.type.HierarchicType",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$GetterMethodFilter",
-      "org.codehaus.jackson.JsonParser$Feature",
-      "org.codehaus.jackson.map.BeanDescription",
-      "org.codehaus.jackson.JsonParser$1",
-      "org.codehaus.jackson.impl.WriterBasedGenerator",
-      "org.codehaus.jackson.JsonGenerator$Feature",
-      "org.codehaus.jackson.sym.Name",
-      "org.codehaus.jackson.Version",
-      "org.codehaus.jackson.io.CharacterEscapes",
-      "org.codehaus.jackson.map.introspect.BasicBeanDescription",
-      "org.codehaus.jackson.schema.JsonSchema",
-      "org.codehaus.jackson.util.TokenBuffer",
-      "org.codehaus.jackson.map.MappingIterator",
-      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
-      "org.codehaus.jackson.map.DeserializationContext",
-      "org.codehaus.jackson.impl.JsonParserBase",
-      "org.codehaus.jackson.map.ObjectMapper$DefaultTyping",
-      "org.codehaus.jackson.map.JsonMappingException",
-      "org.codehaus.jackson.map.introspect.AnnotatedMember",
-      "org.codehaus.jackson.node.JsonNodeFactory",
-      "org.codehaus.jackson.type.JavaType",
-      "com.att.eelf.i18n.EELFResourceManager",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
-      "org.codehaus.jackson.annotate.JsonTypeInfo$As",
-      "org.codehaus.jackson.JsonParser",
-      "org.codehaus.jackson.node.NullNode",
-      "org.codehaus.jackson.map.InjectableValues",
-      "org.codehaus.jackson.map.jsontype.impl.StdSubtypeResolver",
-      "org.codehaus.jackson.node.TreeTraversingParser",
-      "org.codehaus.jackson.map.type.CollectionType",
-      "com.att.eelf.configuration.EELFManager",
-      "org.codehaus.jackson.map.MapperConfig",
-      "org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization",
-      "org.codehaus.jackson.map.Module$SetupContext",
-      "org.codehaus.jackson.io.UTF8Writer",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker$1",
-      "org.codehaus.jackson.map.type.MapType",
-      "org.codehaus.jackson.annotate.JsonAutoDetect",
-      "org.codehaus.jackson.map.type.ArrayType",
-      "org.openecomp.mso.logger.MsoLogger",
-      "org.codehaus.jackson.map.ClassIntrospector$MixInResolver"
-    );
-  }
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryAllottedResourceCustomizationESTestscaffolding.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.adapters.catalogrest.QueryAllottedResourceCustomization",
-      "org.codehaus.jackson.map.introspect.AnnotatedClass",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
-      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
-      "org.codehaus.jackson.annotate.JsonMethod",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
-      "org.codehaus.jackson.map.ObjectMapper",
-      "org.codehaus.jackson.JsonParser$Feature",
-      "org.codehaus.jackson.JsonGenerator$Feature",
-      "org.codehaus.jackson.JsonFactory",
-      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
-      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
-      "org.codehaus.jackson.map.type.TypeFactory"
-    );
-  }
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolderESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolderESTest.java
deleted file mode 100644
index 6f3fa5aec5..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolderESTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Feb 20 14:12:21 GMT 2017
- */
-
-package org.openecomp.mso.adapters.catalogrest;
-
-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.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.db.catalog.beans.ServiceMacroHolder;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class QueryServiceMacroHolderESTest extends QueryServiceMacroHolderESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(serviceMacroHolder0).toString();
-      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder(serviceMacroHolder0);
-      String string0 = queryServiceMacroHolder0.toString();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
-      doReturn("com.att.eelf.policy").when(serviceMacroHolder0).toString();
-      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder(serviceMacroHolder0);
-      String string0 = queryServiceMacroHolder0.toString();
-      assertEquals("com.att.eelf.policy", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
-      doReturn("com.att.eelf.policy").when(serviceMacroHolder0).toString();
-      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder(serviceMacroHolder0);
-      ServiceMacroHolder serviceMacroHolder1 = queryServiceMacroHolder0.getServiceResources();
-      assertSame(serviceMacroHolder1, serviceMacroHolder0);
-  }
-
-  @Test(timeout = 4000)
-  public void test3()  throws Throwable  {
-      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder((ServiceMacroHolder) null);
-      // Undeclared exception!
-      try {
-        queryServiceMacroHolder0.toString();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceMacroHolder", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test4()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
-      doReturn("").when(serviceMacroHolder0).toString();
-      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder(serviceMacroHolder0);
-      String string0 = queryServiceMacroHolder0.toString();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test5()  throws Throwable  {
-      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder();
-  }
-
-  @Test(timeout = 4000)
-  public void test6()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
-      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder(serviceMacroHolder0);
-      // Undeclared exception!
-      try {
-        queryServiceMacroHolder0.toJsonString();
-        fail("Expecting exception: VerifyError");
-
-      } catch(VerifyError e) {
-         //
-         // (class: org/codehaus/jackson/map/MapperConfig, method: <clinit> signature: ()V) Bad type in putfield/putstatic
-         //
-         verifyException("org.codehaus.jackson.map.ObjectMapper", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test7()  throws Throwable  {
-      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder((ServiceMacroHolder) null);
-      ServiceMacroHolder serviceMacroHolder0 = queryServiceMacroHolder0.getServiceResources();
-      assertNull(serviceMacroHolder0);
-  }
-
-  @Test(timeout = 4000)
-  public void test8()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
-      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder(serviceMacroHolder0);
-      ServiceMacroHolder serviceMacroHolder1 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
-      queryServiceMacroHolder0.setServiceResources(serviceMacroHolder1);
-  }
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolderESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolderESTestscaffolding.java
deleted file mode 100644
index 4a5898649b..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolderESTestscaffolding.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Mon Feb 20 14:12:21 GMT 2017
- */
-
-package org.openecomp.mso.adapters.catalogrest;
-
-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 QueryServiceMacroHolderESTestscaffolding {
-
-  @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.adapters.catalogrest.QueryServiceMacroHolder";
-    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(QueryServiceMacroHolderESTestscaffolding.class.getClassLoader() ,
-      "org.codehaus.jackson.map.JsonSerializableWithType",
-      "org.codehaus.jackson.map.deser.StdDeserializerProvider",
-      "org.codehaus.jackson.map.SerializerFactory",
-      "org.codehaus.jackson.map.SerializerProvider",
-      "org.codehaus.jackson.map.SerializationConfig",
-      "org.codehaus.jackson.JsonProcessingException",
-      "org.codehaus.jackson.map.introspect.AnnotationMap",
-      "org.codehaus.jackson.map.introspect.Annotated",
-      "org.codehaus.jackson.map.util.Annotations",
-      "org.codehaus.jackson.sym.NameN",
-      "org.codehaus.jackson.JsonGenerator",
-      "org.codehaus.jackson.map.introspect.AnnotatedClass",
-      "org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector",
-      "org.codehaus.jackson.map.JsonSerializable",
-      "org.codehaus.jackson.annotate.JsonMethod",
-      "com.att.eelf.i18n.EELFResolvableErrorEnum",
-      "org.codehaus.jackson.node.BaseJsonNode",
-      "org.openecomp.mso.logger.MsoLogger$StatusCode",
-      "org.codehaus.jackson.map.DeserializerProvider",
-      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
-      "org.codehaus.jackson.node.ValueNode",
-      "org.codehaus.jackson.map.ser.BeanSerializerFactory",
-      "org.codehaus.jackson.map.introspect.AnnotatedWithParams",
-      "com.att.eelf.i18n.EELFMsgs",
-      "org.codehaus.jackson.map.AnnotationIntrospector",
-      "org.codehaus.jackson.map.MappingJsonFactory",
-      "com.att.eelf.configuration.EELFLogger$Level",
-      "org.codehaus.jackson.map.MapperConfig$Impl",
-      "org.codehaus.jackson.sym.Name1",
-      "org.codehaus.jackson.sym.Name2",
-      "org.codehaus.jackson.sym.Name3",
-      "org.codehaus.jackson.map.introspect.MethodFilter",
-      "org.codehaus.jackson.map.ser.StdSerializerProvider",
-      "org.codehaus.jackson.map.deser.StdDeserializationContext",
-      "org.codehaus.jackson.map.ClassIntrospector",
-      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
-      "org.codehaus.jackson.Versioned",
-      "org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization",
-      "org.codehaus.jackson.map.type.TypeBase",
-      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
-      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
-      "org.codehaus.jackson.node.ContainerNode",
-      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
-      "com.att.eelf.configuration.EELFLogger",
-      "org.codehaus.jackson.map.DeserializationConfig",
-      "org.codehaus.jackson.map.introspect.AnnotatedConstructor",
-      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
-      "org.codehaus.jackson.map.type.TypeFactory",
-      "org.codehaus.jackson.impl.ReaderBasedParser",
-      "org.codehaus.jackson.sym.BytesToNameCanonicalizer$TableInfo",
-      "org.codehaus.jackson.map.type.MapLikeType",
-      "org.openecomp.mso.db.catalog.beans.VnfResource",
-      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
-      "org.codehaus.jackson.node.ObjectNode",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
-      "org.codehaus.jackson.map.type.CollectionLikeType",
-      "org.openecomp.mso.logger.MessageEnum",
-      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
-      "org.codehaus.jackson.impl.JsonParserMinimalBase",
-      "org.openecomp.mso.db.catalog.beans.ServiceMacroHolder",
-      "org.codehaus.jackson.map.type.TypeParser",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterMethodFilter",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker",
-      "org.codehaus.jackson.map.introspect.AnnotatedField",
-      "org.codehaus.jackson.impl.JsonGeneratorBase",
-      "org.codehaus.jackson.map.ObjectMapper",
-      "org.codehaus.jackson.util.ByteArrayBuilder",
-      "org.codehaus.jackson.PrettyPrinter",
-      "org.codehaus.jackson.map.jsontype.SubtypeResolver",
-      "org.codehaus.jackson.map.type.SimpleType",
-      "org.codehaus.jackson.map.util.StdDateFormat",
-      "org.codehaus.jackson.impl.Utf8Generator",
-      "org.jboss.resteasy.annotations.providers.NoJackson",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterAndGetterMethodFilter",
-      "org.codehaus.jackson.JsonNode",
-      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
-      "org.codehaus.jackson.annotate.JacksonAnnotation",
-      "com.att.eelf.configuration.SLF4jWrapper",
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.codehaus.jackson.ObjectCodec",
-      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.entity.MsoRequest",
-      "org.codehaus.jackson.JsonFactory",
-      "org.codehaus.jackson.node.ArrayNode",
-      "org.codehaus.jackson.io.SegmentedStringWriter",
-      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
-      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
-      "org.openecomp.mso.adapters.catalogrest.QueryServiceMacroHolder",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$GetterMethodFilter",
-      "org.codehaus.jackson.JsonParser$Feature",
-      "org.codehaus.jackson.map.BeanDescription",
-      "org.codehaus.jackson.impl.WriterBasedGenerator",
-      "org.codehaus.jackson.JsonGenerator$Feature",
-      "org.codehaus.jackson.sym.Name",
-      "org.openecomp.mso.db.catalog.beans.Service",
-      "org.codehaus.jackson.map.introspect.BasicBeanDescription",
-      "org.codehaus.jackson.util.TokenBuffer",
-      "org.codehaus.jackson.map.DeserializationContext",
-      "org.codehaus.jackson.impl.JsonParserBase",
-      "org.codehaus.jackson.map.JsonMappingException",
-      "org.codehaus.jackson.map.introspect.AnnotatedMember",
-      "org.codehaus.jackson.type.JavaType",
-      "com.att.eelf.i18n.EELFResourceManager",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
-      "org.codehaus.jackson.JsonParser",
-      "org.codehaus.jackson.node.NullNode",
-      "org.codehaus.jackson.map.jsontype.impl.StdSubtypeResolver",
-      "org.codehaus.jackson.node.TreeTraversingParser",
-      "org.codehaus.jackson.map.type.CollectionType",
-      "com.att.eelf.configuration.EELFManager",
-      "org.codehaus.jackson.map.MapperConfig",
-      "org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization",
-      "org.codehaus.jackson.map.Module$SetupContext",
-      "org.codehaus.jackson.io.UTF8Writer",
-      "org.codehaus.jackson.map.type.MapType",
-      "org.codehaus.jackson.annotate.JsonAutoDetect",
-      "org.codehaus.jackson.map.type.ArrayType",
-      "org.openecomp.mso.logger.MsoLogger",
-      "org.codehaus.jackson.map.ClassIntrospector$MixInResolver"
-    );
-  }
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryServiceMacroHolderESTestscaffolding.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.adapters.catalogrest.QueryServiceMacroHolder",
-      "org.codehaus.jackson.map.introspect.AnnotatedClass",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
-      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
-      "org.codehaus.jackson.annotate.JsonMethod",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
-      "org.codehaus.jackson.map.ObjectMapper",
-      "org.codehaus.jackson.JsonParser$Feature",
-      "org.codehaus.jackson.JsonGenerator$Feature",
-      "org.codehaus.jackson.JsonFactory",
-      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
-      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
-      "org.codehaus.jackson.map.type.TypeFactory"
-    );
-  }
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworksESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworksESTest.java
deleted file mode 100644
index 0219fb52fa..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworksESTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Feb 20 14:04:40 GMT 2017
- */
-
-package org.openecomp.mso.adapters.catalogrest;
-
-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.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class QueryServiceNetworksESTest extends QueryServiceNetworksESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      LinkedList<NetworkResourceCustomization> linkedList0 = new LinkedList<NetworkResourceCustomization>();
-      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks((List<NetworkResourceCustomization>) linkedList0);
-      queryServiceNetworks0.setServiceNetworks((List<NetworkResourceCustomization>) null);
-      List<NetworkResourceCustomization> list0 = queryServiceNetworks0.getServiceNetworks();
-      assertNull(list0);
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      LinkedList<NetworkResourceCustomization> linkedList0 = new LinkedList<NetworkResourceCustomization>();
-      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks();
-      Object[] objectArray0 = new Object[3];
-      objectArray0[0] = (Object) queryServiceNetworks0;
-      Collection<NetworkResourceCustomization> collection0 = (Collection<NetworkResourceCustomization>) mock(Collection.class, new ViolatedAssumptionAnswer());
-      doReturn(objectArray0).when(collection0).toArray();
-      linkedList0.addAll(collection0);
-      queryServiceNetworks0.setServiceNetworks(linkedList0);
-      // Undeclared exception!
-      try {
-        queryServiceNetworks0.toString();
-        fail("Expecting exception: ClassCastException");
-
-      } catch(ClassCastException e) {
-         //
-         // org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks cannot be cast to org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization
-         //
-         verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      QueryServiceNetworks queryServiceNetworks0 = null;
-      try {
-        queryServiceNetworks0 = new QueryServiceNetworks((List<NetworkResourceCustomization>) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test3()  throws Throwable  {
-      LinkedList<NetworkResourceCustomization> linkedList0 = new LinkedList<NetworkResourceCustomization>();
-      NetworkResourceCustomization networkResourceCustomization0 = new NetworkResourceCustomization();
-      linkedList0.add(networkResourceCustomization0);
-      Object[] objectArray0 = new Object[4];
-      objectArray0[0] = (Object) linkedList0;
-      Collection<NetworkResourceCustomization> collection0 = (Collection<NetworkResourceCustomization>) mock(Collection.class, new ViolatedAssumptionAnswer());
-      doReturn(objectArray0).when(collection0).toArray();
-      linkedList0.addAll(1, collection0);
-      QueryServiceNetworks queryServiceNetworks0 = null;
-      try {
-        queryServiceNetworks0 = new QueryServiceNetworks((List<NetworkResourceCustomization>) linkedList0);
-        fail("Expecting exception: ClassCastException");
-
-      } catch(ClassCastException e) {
-         //
-         // java.util.LinkedList cannot be cast to org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization
-         //
-         verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test4()  throws Throwable  {
-      LinkedList<NetworkResourceCustomization> linkedList0 = new LinkedList<NetworkResourceCustomization>();
-      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks();
-      queryServiceNetworks0.setServiceNetworks(linkedList0);
-      NetworkResourceCustomization networkResourceCustomization0 = new NetworkResourceCustomization();
-      linkedList0.add(networkResourceCustomization0);
-      linkedList0.add(networkResourceCustomization0);
-      String string0 = queryServiceNetworks0.toString();
-      assertEquals("1\tmodelName=nullmodelUuid=nullmodelUuid=nullmodelInvariantUuid=nullmodelVersion=nullmodelCustomizationUuid=nullmodelInstanceName=nullnetworkResourceId=0networkType=null1\t\nmodelName=nullmodelUuid=nullmodelUuid=nullmodelInvariantUuid=nullmodelVersion=nullmodelCustomizationUuid=nullmodelInstanceName=nullnetworkResourceId=0networkType=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test5()  throws Throwable  {
-      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks();
-      String string0 = queryServiceNetworks0.toString();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test6()  throws Throwable  {
-      LinkedList<NetworkResourceCustomization> linkedList0 = new LinkedList<NetworkResourceCustomization>();
-      NetworkResourceCustomization networkResourceCustomization0 = new NetworkResourceCustomization();
-      linkedList0.add(networkResourceCustomization0);
-      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks((List<NetworkResourceCustomization>) linkedList0);
-      List<NetworkResourceCustomization> list0 = queryServiceNetworks0.getServiceNetworks();
-      assertEquals(1, list0.size());
-  }
-
-  @Test(timeout = 4000)
-  public void test7()  throws Throwable  {
-      LinkedList<NetworkResourceCustomization> linkedList0 = new LinkedList<NetworkResourceCustomization>();
-      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks((List<NetworkResourceCustomization>) linkedList0);
-      queryServiceNetworks0.setServiceNetworks((List<NetworkResourceCustomization>) null);
-      // Undeclared exception!
-      try {
-        queryServiceNetworks0.toString();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test8()  throws Throwable  {
-      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks();
-      List<NetworkResourceCustomization> list0 = queryServiceNetworks0.getServiceNetworks();
-      assertTrue(list0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test9()  throws Throwable  {
-      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks();
-      // Undeclared exception!
-      try {
-        queryServiceNetworks0.toJsonString();
-        fail("Expecting exception: VerifyError");
-
-      } catch(VerifyError e) {
-         //
-         // (class: org/codehaus/jackson/map/MapperConfig, method: <clinit> signature: ()V) Bad type in putfield/putstatic
-         //
-         verifyException("org.codehaus.jackson.map.ObjectMapper", e);
-      }
-  }
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworksESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworksESTestscaffolding.java
deleted file mode 100644
index e47d9b2a5b..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworksESTestscaffolding.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Mon Feb 20 14:04:40 GMT 2017
- */
-
-package org.openecomp.mso.adapters.catalogrest;
-
-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 QueryServiceNetworksESTestscaffolding {
-
-  @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.adapters.catalogrest.QueryServiceNetworks";
-    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(QueryServiceNetworksESTestscaffolding.class.getClassLoader() ,
-      "org.codehaus.jackson.map.JsonSerializableWithType",
-      "org.codehaus.jackson.map.HandlerInstantiator",
-      "org.codehaus.jackson.map.deser.StdDeserializerProvider",
-      "org.codehaus.jackson.map.SerializerFactory",
-      "org.codehaus.jackson.map.SerializerProvider",
-      "org.codehaus.jackson.map.type.TypeBindings",
-      "org.codehaus.jackson.map.SerializationConfig",
-      "org.codehaus.jackson.JsonProcessingException",
-      "org.codehaus.jackson.map.introspect.AnnotationMap",
-      "org.codehaus.jackson.map.introspect.Annotated",
-      "org.codehaus.jackson.io.InputDecorator",
-      "org.codehaus.jackson.map.Module",
-      "org.codehaus.jackson.map.util.Annotations",
-      "org.codehaus.jackson.map.type.TypeModifier",
-      "org.codehaus.jackson.sym.NameN",
-      "org.codehaus.jackson.JsonGenerator",
-      "org.codehaus.jackson.map.introspect.AnnotatedClass",
-      "org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector",
-      "org.codehaus.jackson.annotate.JsonAutoDetect$1",
-      "org.codehaus.jackson.map.JsonSerializable",
-      "org.codehaus.jackson.annotate.JsonMethod",
-      "com.att.eelf.i18n.EELFResolvableErrorEnum",
-      "org.codehaus.jackson.node.BaseJsonNode",
-      "org.openecomp.mso.logger.MsoLogger$StatusCode",
-      "org.codehaus.jackson.map.ObjectReader",
-      "org.codehaus.jackson.map.DeserializerProvider",
-      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
-      "org.codehaus.jackson.node.ValueNode",
-      "org.codehaus.jackson.map.ser.BeanSerializerFactory",
-      "org.codehaus.jackson.map.JsonSerializer",
-      "org.codehaus.jackson.map.introspect.AnnotatedWithParams",
-      "com.att.eelf.i18n.EELFMsgs",
-      "org.codehaus.jackson.map.AnnotationIntrospector",
-      "org.codehaus.jackson.map.MappingJsonFactory",
-      "com.att.eelf.configuration.EELFLogger$Level",
-      "org.codehaus.jackson.map.MapperConfig$Impl",
-      "org.codehaus.jackson.sym.Name1",
-      "org.codehaus.jackson.sym.Name2",
-      "org.codehaus.jackson.sym.Name3",
-      "org.codehaus.jackson.map.introspect.MethodFilter",
-      "org.codehaus.jackson.map.ser.StdSerializerProvider",
-      "org.codehaus.jackson.map.deser.StdDeserializationContext",
-      "org.codehaus.jackson.type.TypeReference",
-      "org.codehaus.jackson.map.ClassIntrospector",
-      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
-      "org.codehaus.jackson.map.PropertyNamingStrategy$LowerCaseWithUnderscoresStrategy",
-      "org.codehaus.jackson.map.MapperConfig$ConfigFeature",
-      "org.codehaus.jackson.map.SerializationConfig$Feature",
-      "org.codehaus.jackson.Versioned",
-      "org.codehaus.jackson.io.IOContext",
-      "org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization",
-      "org.codehaus.jackson.map.type.TypeBase",
-      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
-      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
-      "org.codehaus.jackson.map.PropertyNamingStrategy",
-      "org.codehaus.jackson.node.ContainerNode",
-      "org.codehaus.jackson.map.jsontype.NamedType",
-      "org.codehaus.jackson.map.ser.FilterProvider",
-      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
-      "com.att.eelf.configuration.EELFLogger",
-      "org.codehaus.jackson.map.DeserializationConfig",
-      "org.codehaus.jackson.map.introspect.AnnotatedConstructor",
-      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
-      "org.codehaus.jackson.map.type.TypeFactory",
-      "org.codehaus.jackson.impl.ReaderBasedParser",
-      "org.codehaus.jackson.sym.BytesToNameCanonicalizer$TableInfo",
-      "org.codehaus.jackson.JsonEncoding",
-      "org.codehaus.jackson.map.type.MapLikeType",
-      "org.codehaus.jackson.map.JsonDeserializer",
-      "org.codehaus.jackson.map.PropertyNamingStrategy$PropertyNamingStrategyBase",
-      "org.codehaus.jackson.node.ObjectNode",
-      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
-      "org.codehaus.jackson.map.ser.std.SerializerBase",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
-      "org.codehaus.jackson.map.type.CollectionLikeType",
-      "org.openecomp.mso.logger.MessageEnum",
-      "org.codehaus.jackson.map.DeserializationConfig$Feature",
-      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
-      "org.codehaus.jackson.map.introspect.AnnotatedMethodMap",
-      "org.codehaus.jackson.impl.JsonParserMinimalBase",
-      "org.codehaus.jackson.map.type.TypeParser",
-      "org.codehaus.jackson.map.introspect.POJOPropertiesCollector",
-      "org.codehaus.jackson.JsonParseException",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterMethodFilter",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker",
-      "org.codehaus.jackson.map.introspect.AnnotatedField",
-      "org.codehaus.jackson.impl.JsonGeneratorBase",
-      "org.codehaus.jackson.map.ObjectMapper",
-      "org.codehaus.jackson.util.ByteArrayBuilder",
-      "org.codehaus.jackson.map.ser.impl.FailingSerializer",
-      "org.codehaus.jackson.PrettyPrinter",
-      "org.codehaus.jackson.JsonToken",
-      "org.codehaus.jackson.map.jsontype.SubtypeResolver",
-      "org.codehaus.jackson.map.type.SimpleType",
-      "org.codehaus.jackson.map.util.StdDateFormat",
-      "org.codehaus.jackson.impl.Utf8Generator",
-      "org.codehaus.jackson.node.NumericNode",
-      "org.jboss.resteasy.annotations.providers.NoJackson",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterAndGetterMethodFilter",
-      "org.codehaus.jackson.JsonNode",
-      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
-      "org.codehaus.jackson.annotate.JacksonAnnotation",
-      "org.codehaus.jackson.map.ObjectWriter",
-      "org.codehaus.jackson.schema.SchemaAware",
-      "org.codehaus.jackson.io.OutputDecorator",
-      "com.att.eelf.configuration.SLF4jWrapper",
-      "org.codehaus.jackson.FormatSchema",
-      "org.codehaus.jackson.format.MatchStrength",
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.codehaus.jackson.ObjectCodec",
-      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.codehaus.jackson.JsonGenerationException",
-      "org.openecomp.mso.entity.MsoRequest",
-      "org.codehaus.jackson.format.InputAccessor",
-      "org.codehaus.jackson.JsonFactory",
-      "org.codehaus.jackson.node.ArrayNode",
-      "org.codehaus.jackson.util.BufferRecycler",
-      "org.codehaus.jackson.io.SegmentedStringWriter",
-      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
-      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
-      "org.codehaus.jackson.map.type.HierarchicType",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$GetterMethodFilter",
-      "org.codehaus.jackson.JsonParser$Feature",
-      "org.codehaus.jackson.map.BeanDescription",
-      "org.codehaus.jackson.JsonParser$1",
-      "org.codehaus.jackson.impl.WriterBasedGenerator",
-      "org.codehaus.jackson.JsonGenerator$Feature",
-      "org.codehaus.jackson.sym.Name",
-      "org.codehaus.jackson.Version",
-      "org.codehaus.jackson.io.CharacterEscapes",
-      "org.codehaus.jackson.map.introspect.BasicBeanDescription",
-      "org.codehaus.jackson.schema.JsonSchema",
-      "org.codehaus.jackson.util.TokenBuffer",
-      "org.codehaus.jackson.map.MappingIterator",
-      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
-      "org.codehaus.jackson.map.DeserializationContext",
-      "org.codehaus.jackson.impl.JsonParserBase",
-      "org.codehaus.jackson.map.ObjectMapper$DefaultTyping",
-      "org.codehaus.jackson.map.JsonMappingException",
-      "org.codehaus.jackson.map.introspect.AnnotatedMember",
-      "org.codehaus.jackson.node.JsonNodeFactory",
-      "org.codehaus.jackson.type.JavaType",
-      "com.att.eelf.i18n.EELFResourceManager",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
-      "org.codehaus.jackson.annotate.JsonTypeInfo$As",
-      "org.codehaus.jackson.JsonParser",
-      "org.codehaus.jackson.node.NullNode",
-      "org.codehaus.jackson.map.InjectableValues",
-      "org.codehaus.jackson.map.jsontype.impl.StdSubtypeResolver",
-      "org.codehaus.jackson.node.TreeTraversingParser",
-      "org.codehaus.jackson.map.type.CollectionType",
-      "com.att.eelf.configuration.EELFManager",
-      "org.codehaus.jackson.map.MapperConfig",
-      "org.codehaus.jackson.map.Module$SetupContext",
-      "org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks",
-      "org.codehaus.jackson.io.UTF8Writer",
-      "org.openecomp.mso.db.catalog.beans.NetworkResource",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker$1",
-      "org.codehaus.jackson.map.type.MapType",
-      "org.codehaus.jackson.annotate.JsonAutoDetect",
-      "org.codehaus.jackson.map.type.ArrayType",
-      "org.openecomp.mso.logger.MsoLogger",
-      "org.codehaus.jackson.map.ClassIntrospector$MixInResolver"
-    );
-  }
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryServiceNetworksESTestscaffolding.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.adapters.catalogrest.QueryServiceNetworks",
-      "org.codehaus.jackson.map.introspect.AnnotatedClass",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
-      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
-      "org.codehaus.jackson.annotate.JsonMethod",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
-      "org.codehaus.jackson.map.ObjectMapper",
-      "org.codehaus.jackson.JsonParser$Feature",
-      "org.codehaus.jackson.JsonGenerator$Feature",
-      "org.codehaus.jackson.JsonFactory",
-      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
-      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
-      "org.codehaus.jackson.map.type.TypeFactory"
-    );
-  }
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfsESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfsESTest.java
deleted file mode 100644
index 4f963032d0..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfsESTest.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Feb 22 12:31:50 GMT 2017
- */
-
-package org.openecomp.mso.adapters.catalogrest;
-
-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.ConcurrentModificationException;
-import java.util.LinkedList;
-import java.util.List;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs;
-import org.openecomp.mso.db.catalog.beans.VnfResource;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class QueryServiceVnfsESTest extends QueryServiceVnfsESTestscaffolding {
-
-    @Test(timeout = 4000)
-    public void test00()  throws Throwable  {
-        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
-        queryServiceVnfs0.setServiceVnfs((List<VnfResource>) null);
-        List<VnfResource> list0 = queryServiceVnfs0.getServiceVnfs();
-        assertNull(list0);
-    }
-
-    @Test(timeout = 4000)
-    public void test01()  throws Throwable  {
-        LinkedList<VnfResource> linkedList0 = new LinkedList<VnfResource>();
-        VnfResource vnfResource0 = new VnfResource();
-        linkedList0.add(vnfResource0);
-        List<VnfResource> list0 = linkedList0.subList(1, 1);
-        linkedList0.add(vnfResource0);
-        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
-        queryServiceVnfs0.setServiceVnfs(list0);
-        // Undeclared exception!
-        try {
-            queryServiceVnfs0.toString();
-            fail("Expecting exception: ConcurrentModificationException");
-
-        } catch(ConcurrentModificationException e) {
-            //
-            // no message in exception (getMessage() returned null)
-            //
-            verifyException("java.util.SubList", e);
-        }
-    }
-
-    @Test(timeout = 4000)
-    public void test02()  throws Throwable  {
-        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
-        queryServiceVnfs0.setServiceVnfs((List<VnfResource>) null);
-        // Undeclared exception!
-        try {
-            queryServiceVnfs0.toString();
-            fail("Expecting exception: NullPointerException");
-
-        } catch(NullPointerException e) {
-            //
-            // no message in exception (getMessage() returned null)
-            //
-            verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs", e);
-        }
-    }
-
-    @Test(timeout = 4000)
-    public void test03()  throws Throwable  {
-        LinkedList<VnfResource> linkedList0 = new LinkedList<VnfResource>();
-        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
-        Object[] objectArray0 = new Object[3];
-        objectArray0[1] = (Object) queryServiceVnfs0;
-        queryServiceVnfs0.setServiceVnfs(linkedList0);
-        Collection<VnfResource> collection0 = (Collection<VnfResource>) mock(Collection.class, new ViolatedAssumptionAnswer());
-        doReturn(objectArray0).when(collection0).toArray();
-        linkedList0.addAll(collection0);
-        // Undeclared exception!
-        try {
-            queryServiceVnfs0.toString();
-            fail("Expecting exception: ClassCastException");
-
-        } catch(ClassCastException e) {
-            //
-            // org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs cannot be cast to org.openecomp.mso.db.catalog.beans.VnfResource
-            //
-            verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs", e);
-        }
-    }
-
-    @Test(timeout = 4000)
-    public void test04()  throws Throwable  {
-        LinkedList<VnfResource> linkedList0 = new LinkedList<VnfResource>();
-        linkedList0.add((VnfResource) null);
-        QueryServiceVnfs queryServiceVnfs0 = null;
-        try {
-            queryServiceVnfs0 = new QueryServiceVnfs((List<VnfResource>) linkedList0);
-            fail("Expecting exception: NullPointerException");
-
-        } catch(NullPointerException e) {
-            //
-            // no message in exception (getMessage() returned null)
-            //
-            verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs", e);
-        }
-    }
-
-    @Test(timeout = 4000)
-    public void test05()  throws Throwable  {
-        LinkedList<VnfResource> linkedList0 = new LinkedList<VnfResource>();
-        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
-        Object[] objectArray0 = new Object[8];
-        objectArray0[0] = (Object) queryServiceVnfs0;
-        Collection<VnfResource> collection0 = (Collection<VnfResource>) mock(Collection.class, new ViolatedAssumptionAnswer());
-        doReturn(objectArray0).when(collection0).toArray();
-        linkedList0.addAll(0, collection0);
-        QueryServiceVnfs queryServiceVnfs1 = null;
-        try {
-            queryServiceVnfs1 = new QueryServiceVnfs((List<VnfResource>) linkedList0);
-            fail("Expecting exception: ClassCastException");
-
-        } catch(ClassCastException e) {
-            //
-            // org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs cannot be cast to org.openecomp.mso.db.catalog.beans.VnfResource
-            //
-            verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs", e);
-        }
-    }
-
-    @Test(timeout = 4000)
-    public void test06()  throws Throwable  {
-        LinkedList<VnfResource> linkedList0 = new LinkedList<VnfResource>();
-        VnfResource vnfResource0 = new VnfResource();
-        linkedList0.add(vnfResource0);
-        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
-        queryServiceVnfs0.setServiceVnfs(linkedList0);
-        linkedList0.add(vnfResource0);
-        String string0 = queryServiceVnfs0.toString();
-        assertEquals("1\tVNF=null,version=null,mode=null,template=null,envtId=null,asdcUuid=null,aicVersionMin=null,aicVersionMax=null,modelInvariantUuid=null,modelVersion=null,modelCustomizationName=null,modelName=null,serviceModelInvariantUUID=null,modelCustomizationUuid=nullVfModules: NONE1\t\nVNF=null,version=null,mode=null,template=null,envtId=null,asdcUuid=null,aicVersionMin=null,aicVersionMax=null,modelInvariantUuid=null,modelVersion=null,modelCustomizationName=null,modelName=null,serviceModelInvariantUUID=null,modelCustomizationUuid=nullVfModules: NONE", string0);
-    }
-
-    @Test(timeout = 4000)
-    public void test07()  throws Throwable  {
-        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
-        String string0 = queryServiceVnfs0.toString();
-        assertEquals("", string0);
-    }
-
-    @Test(timeout = 4000)
-    public void test08()  throws Throwable  {
-        LinkedList<VnfResource> linkedList0 = new LinkedList<VnfResource>();
-        VnfResource vnfResource0 = new VnfResource();
-        linkedList0.add(vnfResource0);
-        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs((List<VnfResource>) linkedList0);
-        List<VnfResource> list0 = queryServiceVnfs0.getServiceVnfs();
-        assertEquals(1, list0.size());
-    }
-
-    @Test(timeout = 4000)
-    public void test09()  throws Throwable  {
-        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
-        List<VnfResource> list0 = queryServiceVnfs0.getServiceVnfs();
-        queryServiceVnfs0.setServiceVnfs(list0);
-        assertTrue(list0.isEmpty());
-    }
-
-    @Test(timeout = 4000)
-    public void test10()  throws Throwable  {
-        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
-        // Undeclared exception!
-        try {
-            queryServiceVnfs0.toJsonString();
-            fail("Expecting exception: VerifyError");
-
-        } catch(VerifyError e) {
-            //
-            // (class: org/codehaus/jackson/map/MapperConfig, method: <clinit> signature: ()V) Bad type in putfield/putstatic
-            //
-            verifyException("org.codehaus.jackson.map.ObjectMapper", e);
-        }
-    }
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfsESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfsESTestscaffolding.java
deleted file mode 100644
index aa9a411de2..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfsESTestscaffolding.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Mon Feb 20 14:04:40 GMT 2017
- */
-
-package org.openecomp.mso.adapters.catalogrest;
-
-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 QueryServiceVnfsESTestscaffolding {
-
-  @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.adapters.catalogrest.QueryServiceVnfs";
-    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(QueryServiceVnfsESTestscaffolding.class.getClassLoader() ,
-      "org.codehaus.jackson.map.JsonSerializableWithType",
-      "org.codehaus.jackson.map.HandlerInstantiator",
-      "org.codehaus.jackson.map.deser.StdDeserializerProvider",
-      "org.codehaus.jackson.map.SerializerFactory",
-      "org.codehaus.jackson.map.SerializerProvider",
-      "org.codehaus.jackson.map.type.TypeBindings",
-      "org.codehaus.jackson.map.SerializationConfig",
-      "org.codehaus.jackson.JsonProcessingException",
-      "org.codehaus.jackson.map.introspect.AnnotationMap",
-      "org.codehaus.jackson.map.introspect.Annotated",
-      "org.codehaus.jackson.io.InputDecorator",
-      "org.codehaus.jackson.map.Module",
-      "org.codehaus.jackson.map.util.Annotations",
-      "org.codehaus.jackson.map.type.TypeModifier",
-      "org.codehaus.jackson.sym.NameN",
-      "org.codehaus.jackson.JsonGenerator",
-      "org.codehaus.jackson.map.introspect.AnnotatedClass",
-      "org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector",
-      "org.codehaus.jackson.annotate.JsonAutoDetect$1",
-      "org.codehaus.jackson.map.JsonSerializable",
-      "org.codehaus.jackson.annotate.JsonMethod",
-      "com.att.eelf.i18n.EELFResolvableErrorEnum",
-      "org.codehaus.jackson.node.BaseJsonNode",
-      "org.openecomp.mso.logger.MsoLogger$StatusCode",
-      "org.codehaus.jackson.map.ObjectReader",
-      "org.codehaus.jackson.map.DeserializerProvider",
-      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
-      "org.codehaus.jackson.node.ValueNode",
-      "org.codehaus.jackson.map.ser.BeanSerializerFactory",
-      "org.codehaus.jackson.map.JsonSerializer",
-      "org.codehaus.jackson.map.introspect.AnnotatedWithParams",
-      "com.att.eelf.i18n.EELFMsgs",
-      "org.codehaus.jackson.map.AnnotationIntrospector",
-      "org.codehaus.jackson.map.MappingJsonFactory",
-      "com.att.eelf.configuration.EELFLogger$Level",
-      "org.codehaus.jackson.map.MapperConfig$Impl",
-      "org.codehaus.jackson.sym.Name1",
-      "org.codehaus.jackson.sym.Name2",
-      "org.codehaus.jackson.sym.Name3",
-      "org.codehaus.jackson.map.introspect.MethodFilter",
-      "org.codehaus.jackson.map.ser.StdSerializerProvider",
-      "org.codehaus.jackson.map.deser.StdDeserializationContext",
-      "org.codehaus.jackson.type.TypeReference",
-      "org.codehaus.jackson.map.ClassIntrospector",
-      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
-      "org.codehaus.jackson.map.PropertyNamingStrategy$LowerCaseWithUnderscoresStrategy",
-      "org.codehaus.jackson.map.MapperConfig$ConfigFeature",
-      "org.codehaus.jackson.map.SerializationConfig$Feature",
-      "org.codehaus.jackson.Versioned",
-      "org.codehaus.jackson.io.IOContext",
-      "org.codehaus.jackson.map.type.TypeBase",
-      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
-      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
-      "org.codehaus.jackson.map.PropertyNamingStrategy",
-      "org.codehaus.jackson.node.ContainerNode",
-      "org.codehaus.jackson.map.jsontype.NamedType",
-      "org.codehaus.jackson.map.ser.FilterProvider",
-      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
-      "com.att.eelf.configuration.EELFLogger",
-      "org.codehaus.jackson.map.DeserializationConfig",
-      "org.codehaus.jackson.map.introspect.AnnotatedConstructor",
-      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
-      "org.codehaus.jackson.map.type.TypeFactory",
-      "org.codehaus.jackson.impl.ReaderBasedParser",
-      "org.codehaus.jackson.sym.BytesToNameCanonicalizer$TableInfo",
-      "org.codehaus.jackson.JsonEncoding",
-      "org.codehaus.jackson.map.type.MapLikeType",
-      "org.codehaus.jackson.map.JsonDeserializer",
-      "org.openecomp.mso.db.catalog.beans.VnfResource",
-      "org.codehaus.jackson.map.PropertyNamingStrategy$PropertyNamingStrategyBase",
-      "org.codehaus.jackson.node.ObjectNode",
-      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
-      "org.codehaus.jackson.map.ser.std.SerializerBase",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
-      "org.codehaus.jackson.map.type.CollectionLikeType",
-      "org.openecomp.mso.logger.MessageEnum",
-      "org.codehaus.jackson.map.DeserializationConfig$Feature",
-      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
-      "org.codehaus.jackson.map.introspect.AnnotatedMethodMap",
-      "org.codehaus.jackson.impl.JsonParserMinimalBase",
-      "org.codehaus.jackson.map.type.TypeParser",
-      "org.codehaus.jackson.map.introspect.POJOPropertiesCollector",
-      "org.codehaus.jackson.JsonParseException",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterMethodFilter",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker",
-      "org.codehaus.jackson.map.introspect.AnnotatedField",
-      "org.codehaus.jackson.impl.JsonGeneratorBase",
-      "org.codehaus.jackson.map.ObjectMapper",
-      "org.codehaus.jackson.util.ByteArrayBuilder",
-      "org.codehaus.jackson.map.ser.impl.FailingSerializer",
-      "org.codehaus.jackson.PrettyPrinter",
-      "org.codehaus.jackson.JsonToken",
-      "org.codehaus.jackson.map.jsontype.SubtypeResolver",
-      "org.codehaus.jackson.map.type.SimpleType",
-      "org.codehaus.jackson.map.util.StdDateFormat",
-      "org.codehaus.jackson.impl.Utf8Generator",
-      "org.codehaus.jackson.node.NumericNode",
-      "org.jboss.resteasy.annotations.providers.NoJackson",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterAndGetterMethodFilter",
-      "org.codehaus.jackson.JsonNode",
-      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
-      "org.codehaus.jackson.annotate.JacksonAnnotation",
-      "org.codehaus.jackson.map.ObjectWriter",
-      "org.codehaus.jackson.schema.SchemaAware",
-      "org.codehaus.jackson.io.OutputDecorator",
-      "com.att.eelf.configuration.SLF4jWrapper",
-      "org.codehaus.jackson.FormatSchema",
-      "org.codehaus.jackson.format.MatchStrength",
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.codehaus.jackson.ObjectCodec",
-      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.codehaus.jackson.JsonGenerationException",
-      "org.openecomp.mso.entity.MsoRequest",
-      "org.codehaus.jackson.format.InputAccessor",
-      "org.codehaus.jackson.JsonFactory",
-      "org.codehaus.jackson.node.ArrayNode",
-      "org.codehaus.jackson.util.BufferRecycler",
-      "org.codehaus.jackson.io.SegmentedStringWriter",
-      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
-      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
-      "org.codehaus.jackson.map.type.HierarchicType",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$GetterMethodFilter",
-      "org.codehaus.jackson.JsonParser$Feature",
-      "org.codehaus.jackson.map.BeanDescription",
-      "org.codehaus.jackson.JsonParser$1",
-      "org.codehaus.jackson.impl.WriterBasedGenerator",
-      "org.codehaus.jackson.JsonGenerator$Feature",
-      "org.codehaus.jackson.sym.Name",
-      "org.codehaus.jackson.Version",
-      "org.codehaus.jackson.io.CharacterEscapes",
-      "org.codehaus.jackson.map.introspect.BasicBeanDescription",
-      "org.codehaus.jackson.schema.JsonSchema",
-      "org.codehaus.jackson.util.TokenBuffer",
-      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
-      "org.codehaus.jackson.map.MappingIterator",
-      "org.codehaus.jackson.map.DeserializationContext",
-      "org.codehaus.jackson.impl.JsonParserBase",
-      "org.codehaus.jackson.map.ObjectMapper$DefaultTyping",
-      "org.codehaus.jackson.map.JsonMappingException",
-      "org.codehaus.jackson.map.introspect.AnnotatedMember",
-      "org.codehaus.jackson.node.JsonNodeFactory",
-      "org.codehaus.jackson.type.JavaType",
-      "com.att.eelf.i18n.EELFResourceManager",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
-      "org.codehaus.jackson.annotate.JsonTypeInfo$As",
-      "org.codehaus.jackson.JsonParser",
-      "org.codehaus.jackson.node.NullNode",
-      "org.codehaus.jackson.map.InjectableValues",
-      "org.codehaus.jackson.map.jsontype.impl.StdSubtypeResolver",
-      "org.codehaus.jackson.node.TreeTraversingParser",
-      "org.codehaus.jackson.map.type.CollectionType",
-      "com.att.eelf.configuration.EELFManager",
-      "org.codehaus.jackson.map.MapperConfig",
-      "org.codehaus.jackson.map.Module$SetupContext",
-      "org.codehaus.jackson.io.UTF8Writer",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker$1",
-      "org.codehaus.jackson.map.type.MapType",
-      "org.codehaus.jackson.annotate.JsonAutoDetect",
-      "org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs",
-      "org.codehaus.jackson.map.type.ArrayType",
-      "org.openecomp.mso.logger.MsoLogger",
-      "org.codehaus.jackson.map.ClassIntrospector$MixInResolver"
-    );
-  }
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryServiceVnfsESTestscaffolding.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.adapters.catalogrest.QueryServiceVnfs",
-      "org.codehaus.jackson.map.introspect.AnnotatedClass",
-      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
-      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
-      "org.codehaus.jackson.annotate.JsonMethod",
-      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
-      "org.codehaus.jackson.map.ObjectMapper",
-      "org.codehaus.jackson.JsonParser$Feature",
-      "org.codehaus.jackson.JsonGenerator$Feature",
-      "org.codehaus.jackson.JsonFactory",
-      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
-      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
-      "org.codehaus.jackson.map.type.TypeFactory"
-    );
-  }
-}