1710 Rebase - Second Attempt

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

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

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

54 files changed, 6 insertions, 10554 deletions

diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/CatalogDatabaseESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/CatalogDatabaseESTest.java
deleted file mode 100644
index b577afef66..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/CatalogDatabaseESTest.java
+++ /dev/null
@@ -1,1307 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:18:49 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog;
-
-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.HeatEnvironment;
-import org.openecomp.mso.db.catalog.beans.HeatFiles;
-import org.openecomp.mso.db.catalog.beans.HeatTemplate;
-import org.openecomp.mso.db.catalog.beans.HeatTemplateParam;
-import org.openecomp.mso.db.catalog.beans.Service;
-import org.openecomp.mso.db.catalog.beans.ServiceRecipe;
-import org.openecomp.mso.db.catalog.beans.VfModuleToHeatFiles;
-import org.openecomp.mso.db.catalog.beans.VnfComponentsRecipe;
-import org.openecomp.mso.db.catalog.beans.VnfRecipe;
-import org.openecomp.mso.db.catalog.beans.VnfResource;
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.logger.MsoLogger;
-import java.time.chrono.ChronoLocalDate;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-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.evosuite.runtime.mock.java.time.chrono.MockJapaneseDate;
-import org.evosuite.runtime.mock.java.time.chrono.MockThaiBuddhistDate;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class CatalogDatabaseESTest extends CatalogDatabaseESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = mock(VfModuleToHeatFiles.class, new ViolatedAssumptionAnswer());
-      List<VfModuleToHeatFiles> list0 = (List<VfModuleToHeatFiles>) mock(List.class, new ViolatedAssumptionAnswer());
-      doReturn(vfModuleToHeatFiles0).when(list0).get(anyInt());
-      doReturn(false).when(list0).isEmpty();
-      doReturn(1, 1).when(list0).size();
-      Query query0 = mock(Query.class, new ViolatedAssumptionAnswer());
-      Query query1 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn(list0).when(query1).list();
-      doReturn(query0).when(query1).setParameter(anyString() , any());
-      List<ChronoLocalDate> list1 = (List<ChronoLocalDate>) mock(List.class, new ViolatedAssumptionAnswer());
-      Query query2 = mock(Query.class, new ViolatedAssumptionAnswer());
-      Query query3 = mock(Query.class, new ViolatedAssumptionAnswer());
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn("YF}DP?7kbDc>q", (String) null, "", "").when(session0).toString();
-      doReturn(query1).when(session0).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      PrivateAccess.callMethod((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "getSession");
-      PrivateAccess.callMethod((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "getSession");
-      PrivateAccess.callMethod((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "getSession");
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getHeatTemplate((String) null);
-        fail("Expecting exception: ClassCastException");
-
-      } catch(ClassCastException e) {
-         //
-         // org.openecomp.mso.db.catalog.beans.VfModuleToHeatFiles$$EnhancerByMockitoWithCGLIB$$309d9392 cannot be cast to org.openecomp.mso.db.catalog.beans.HeatTemplate
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.APIH_GENERATED_REQUEST_ID;
-      MessageEnum messageEnum1 = MessageEnum.APIH_DUPLICATE_CHECK_EXC;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(session0).toString();
-      doReturn((Query) null).when(session0).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      Session session1 = mock(Session.class, new ViolatedAssumptionAnswer());
-      HeatTemplate heatTemplate0 = mock(HeatTemplate.class, new ViolatedAssumptionAnswer());
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVfModuleType((String) null, (String) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      VnfComponentsRecipe vnfComponentsRecipe0 = mock(VnfComponentsRecipe.class, new ViolatedAssumptionAnswer());
-      List<VnfComponentsRecipe> list0 = (List<VnfComponentsRecipe>) mock(List.class, new ViolatedAssumptionAnswer());
-      doReturn(true).when(list0).isEmpty();
-      Query query0 = mock(Query.class, new ViolatedAssumptionAnswer());
-      Query query1 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn(list0).when(query1).list();
-      doReturn(query0).when(query1).setParameter(anyString() , any());
-      List<MockThaiBuddhistDate> list1 = (List<MockThaiBuddhistDate>) mock(List.class, new ViolatedAssumptionAnswer());
-      Query query2 = mock(Query.class, new ViolatedAssumptionAnswer());
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      Query query3 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn(query2, query2, query2, query2).when(query3).setParameter(anyString() , any());
-      doReturn(serviceRecipe0).when(query3).uniqueResult();
-      Query query4 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn((List) null).when(query4).list();
-      doReturn((Query) null, (Query) null, (Query) null).when(query4).setParameter(anyString() , any());
-      Session session1 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn("F4D:=_l\"v%zem^./^", "", "", ",volTemplateId=", ", fileName=null").when(session1).toString();
-      doReturn(",volTemplateId=").when(session1).save(any());
-      doReturn(query1, query3, query4).when(session1).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session1);
-      catalogDatabase0.getHeatEnvironment((-1));
-      PrivateAccess.callMethod((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "getSession");
-      Session session2 = mock(Session.class, new ViolatedAssumptionAnswer());
-      HeatTemplate heatTemplate0 = mock(HeatTemplate.class, new ViolatedAssumptionAnswer());
-      doReturn("~+(<.").when(heatTemplate0).getAsdcResourceName();
-      doReturn("qOWRn", "@;i!EF=FjdS;").when(heatTemplate0).getTemplateName();
-      doReturn("o~%Y*9E5Pu.f").when(heatTemplate0).getVersion();
-      Iterator<HeatTemplateParam> iterator0 = (Iterator<HeatTemplateParam>) mock(Iterator.class, new ViolatedAssumptionAnswer());
-      HeatFiles heatFiles0 = mock(HeatFiles.class, new ViolatedAssumptionAnswer());
-      doReturn("").when(heatFiles0).getAsdcResourceName();
-      doReturn("@;i!EF=FjdS;", "~+(<.").when(heatFiles0).getFileName();
-      doReturn((-1)).when(heatFiles0).getVnfResourceId();
-      doReturn("i#C").when(heatFiles0).getVersion();
-      catalogDatabase0.saveHeatFiles(heatFiles0);
-      Set<HeatTemplateParam> set0 = (Set<HeatTemplateParam>) mock(Set.class, new ViolatedAssumptionAnswer());
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveHeatTemplate(heatTemplate0, set0);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      MockJapaneseDate mockJapaneseDate0 = new MockJapaneseDate();
-      List<MockJapaneseDate> list0 = (List<MockJapaneseDate>) mock(List.class, new ViolatedAssumptionAnswer());
-      doReturn(true).when(list0).isEmpty();
-      Query query0 = mock(Query.class, new ViolatedAssumptionAnswer());
-      Query query1 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn(list0).when(query1).list();
-      doReturn(query0).when(query1).setParameter(anyString() , any());
-      List<HeatFiles> list1 = (List<HeatFiles>) mock(List.class, new ViolatedAssumptionAnswer());
-      doReturn((Object) null).when(list1).get(anyInt());
-      doReturn(false).when(list1).isEmpty();
-      doReturn(0).when(list1).size();
-      Query query2 = mock(Query.class, new ViolatedAssumptionAnswer());
-      Query query3 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn(list1).when(query3).list();
-      doReturn(query2, query2, query2).when(query3).setParameter(anyString() , any());
-      Session session1 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn("F4D:=_l\"v%zem^./^", "po=vr", "po=vr", "po=vr").when(session1).toString();
-      doReturn("po=vr").when(session1).save(any());
-      doReturn(query1, query3).when(session1).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session1);
-      catalogDatabase0.getHeatEnvironment((-1));
-      PrivateAccess.callMethod((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "getSession");
-      Session session2 = mock(Session.class, new ViolatedAssumptionAnswer());
-      HeatTemplate heatTemplate0 = mock(HeatTemplate.class, new ViolatedAssumptionAnswer());
-      doReturn("").when(heatTemplate0).getAsdcResourceName();
-      doReturn(0).when(heatTemplate0).getId();
-      doReturn("", "RDu8*C_[t4L").when(heatTemplate0).getTemplateName();
-      doReturn((String) null).when(heatTemplate0).getVersion();
-      Iterator<HeatTemplateParam> iterator0 = (Iterator<HeatTemplateParam>) mock(Iterator.class, new ViolatedAssumptionAnswer());
-      doReturn(true).when(iterator0).hasNext();
-      doReturn((Object) null).when(iterator0).next();
-      Set<HeatTemplateParam> set0 = (Set<HeatTemplateParam>) mock(Set.class, new ViolatedAssumptionAnswer());
-      doReturn(iterator0).when(set0).iterator();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveHeatTemplate(heatTemplate0, set0);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.RA_DB_INVALID_STATUS;
-      MessageEnum messageEnum1 = MessageEnum.LOGGER_UPDATE_SUC;
-      MessageEnum messageEnum2 = MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      HashMap<String, String> hashMap0 = new HashMap<String, String>();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(session0).toString();
-      doReturn((Query) null).when(session0).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getService(hashMap0, "Successfully. No template found");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(session0).toString();
-      doReturn((Query) null).when(session0).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getNestedTemplates(2377);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.APIH_QUERY_PARAM_WRONG;
-      MessageEnum messageEnum1 = MessageEnum.RA_SEND_REQUEST_SDNC;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(session0).toString();
-      doReturn((Query) null).when(session0).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVnfComponentsRecipe("Generic exception searching for vnf_id=", (String) null, (String) null, (String) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      List<VnfRecipe> list0 = (List<VnfRecipe>) mock(List.class, new ViolatedAssumptionAnswer());
-      Query query0 = mock(Query.class, new ViolatedAssumptionAnswer());
-      Query query1 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn(query0, query0).when(query1).setParameter(anyString() , any());
-      doReturn((Object) null).when(query1).uniqueResult();
-      Query query2 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn((List) null).when(query2).list();
-      doReturn((Query) null).when(query2).setParameter(anyString() , any());
-      Session session1 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn("F4D:=_l\"v%zem^./^", "getVfModuleRecipe").when(session1).toString();
-      doReturn(query1, query2).when(session1).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session1);
-      catalogDatabase0.getVnfComponent(187, "");
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getHeatEnvironment((-1));
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getNetworkRecipe("735uWxa&iIbU.4]O$", ",hpGX76\"X~ow4", (String) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.APIH_PROPERTY_LOAD_SUC;
-      MessageEnum messageEnum1 = MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      HashMap<String, String> hashMap0 = new HashMap<String, String>();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(session0).toString();
-      doReturn((Query) null).when(session0).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVnfComponentsRecipeByVfModuleId("", "(3", "");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null, (String) null).when(session0).toString();
-      doReturn((Query) null).when(session0).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      PrivateAccess.callMethod((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "getSession");
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVnfComponentsRecipe("B4@1", "v@(U", "", (String) null, "", "");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(session0).toString();
-      doReturn((Query) null).when(session0).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getService((String) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(session0).toString();
-      doReturn((Query) null).when(session0).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVfModuleModelName("", "RiY");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.RA_UPDATE_TENANT_ERR;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(session0).toString();
-      doReturn((Query) null).when(session0).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      VnfRecipe vnfRecipe0 = mock(VnfRecipe.class, new ViolatedAssumptionAnswer());
-      Service service0 = new Service();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveService(service0);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(session0).toString();
-      doReturn((Query) null).when(session0).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getNetworkRecipe("735uWxa&iIbU.4]O$", ",hpGX76\"X~ow4", "");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      HeatTemplate heatTemplate0 = mock(HeatTemplate.class, new ViolatedAssumptionAnswer());
-      VnfResource vnfResource0 = mock(VnfResource.class, new ViolatedAssumptionAnswer());
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveService((Service) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.RA_CREATE_NETWORK_EXC;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      LinkedHashSet<HeatTemplateParam> linkedHashSet0 = new LinkedHashSet<HeatTemplateParam>();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveHeatTemplate((HeatTemplate) null, (Set<HeatTemplateParam>) linkedHashSet0);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      VnfResource vnfResource0 = mock(VnfResource.class, new ViolatedAssumptionAnswer());
-      doReturn((-1)).when(vnfResource0).getId();
-      doReturn("#5|%>JWRPJfP)S@").when(vnfResource0).getVnfType();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveOrUpdateVnfResource(vnfResource0);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.RA_ANALYZE_ERROR_EXC;
-      MsoLogger.StatusCode.values();
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveVnfRecipe((VnfRecipe) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Service service0 = mock(Service.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(service0).getServiceName();
-      doReturn((String) null, (String) null).when(service0).getServiceNameVersionId();
-      doReturn((String) null).when(service0).getServiceVersion();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveService(service0);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.APIH_BAD_ORDER;
-      MessageEnum messageEnum1 = MessageEnum.RA_SEND_VNF_NOTIF_ERR;
-      MessageEnum messageEnum2 = MessageEnum.APIH_DB_ATTRIBUTE_NOT_FOUND;
-      MessageEnum messageEnum3 = MessageEnum.RA_VNF_NOT_EXIST;
-      MsoLogger.ErrorCode msoLogger_ErrorCode0 = MsoLogger.ErrorCode.PermissionError;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveHeatEnvironment(heatEnvironment0);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.APIH_GENERAL_METRICS;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveHeatEnvironment((HeatEnvironment) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVnfRecipe((String) null, (String) null, (String) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      MsoLogger.ErrorCode.values();
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.rollback();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getAllHeatTemplates();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getHeatFilesForVfModule((-1539));
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test26()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getHeatEnvironment(0);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test27()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getAllHeatEnvironment();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test28()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.commit();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test29()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setVersion("E0)WE F/LaV~i2U01");
-      heatFiles0.setFileName("uIZl|");
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveHeatFiles(heatFiles0);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test30()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveVnfComponentsRecipe((VnfComponentsRecipe) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test31()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.INIT_LOGGER_FAIL;
-      MessageEnum messageEnum1 = MessageEnum.ASDC_CREATE_SERVICE;
-      MessageEnum messageEnum2 = MessageEnum.NO_PROPERTIES;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.healthCheck();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test32()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      catalogDatabase0.close();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getHeatTemplate(1197);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test33()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getAllNetworkResources();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test34()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVnfComponentsRecipe("Ikrt3T$WS\"UMs#Q", "Ikrt3T$WS\"UMs#Q", "Ikrt3T$WS\"UMs#Q", "");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test35()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getHeatTemplate((String) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test36()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVnfComponent(1987, "R$9=*_j3~I=:_");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test37()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getHeatFiles(0, "r#j>oJCQI5r'@)jSH", "K6#W1{s", "vRm");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test38()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVnfResourcesByRole("");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test39()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.RA_ASYNC_DELETE_VNF;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getAllVnfResources();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test40()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      List<VfModuleToHeatFiles> list0 = (List<VfModuleToHeatFiles>) mock(List.class, new ViolatedAssumptionAnswer());
-      doReturn((Object) null).when(list0).get(anyInt());
-      doReturn(false).when(list0).isEmpty();
-      doReturn(0, 0).when(list0).size();
-      Query query0 = mock(Query.class, new ViolatedAssumptionAnswer());
-      Query query1 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn(list0).when(query1).list();
-      doReturn(query0).when(query1).setParameter(anyString() , any());
-      Query query2 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn((List) null).when(query2).list();
-      doReturn((Query) null).when(query2).setParameter(anyString() , any());
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn("YF}DP?7kbDc>q", (String) null, "", "", "").when(session0).toString();
-      doReturn(query1, query2).when(session0).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      PrivateAccess.callMethod((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "getSession");
-      PrivateAccess.callMethod((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "getSession");
-      PrivateAccess.callMethod((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "getSession");
-      catalogDatabase0.getHeatTemplate((String) null);
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getHeatEnvironment(148);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test41()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      List<VnfComponentsRecipe> list0 = (List<VnfComponentsRecipe>) mock(List.class, new ViolatedAssumptionAnswer());
-      doReturn((Object) null).when(list0).get(anyInt());
-      doReturn(false).when(list0).isEmpty();
-      doReturn(0).when(list0).size();
-      Query query0 = mock(Query.class, new ViolatedAssumptionAnswer());
-      Query query1 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn(list0).when(query1).list();
-      doReturn(query0).when(query1).setParameter(anyString() , any());
-      Query query2 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn((Query) null, (Query) null, (Query) null, (Query) null).when(query2).setParameter(anyString() , any());
-      doReturn((Object) null).when(query2).uniqueResult();
-      Session session1 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn("F4D:=_l\"v%zem^./^", "", "", ",volTemplateId=", (String) null).when(session1).toString();
-      doReturn(",volTemplateId=").when(session1).save(any());
-      doReturn(query1, query2, (Query) null).when(session1).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session1);
-      catalogDatabase0.getHeatEnvironment((-1));
-      PrivateAccess.callMethod((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "getSession");
-      Session session2 = mock(Session.class, new ViolatedAssumptionAnswer());
-      HeatTemplate heatTemplate0 = mock(HeatTemplate.class, new ViolatedAssumptionAnswer());
-      doReturn("~+(<.").when(heatTemplate0).getAsdcResourceName();
-      doReturn("qOWRn", "@;i!EF=FjdS;").when(heatTemplate0).getTemplateName();
-      doReturn("o~%Y*9E5Pu.f").when(heatTemplate0).getVersion();
-      Iterator<HeatTemplateParam> iterator0 = (Iterator<HeatTemplateParam>) mock(Iterator.class, new ViolatedAssumptionAnswer());
-      HeatFiles heatFiles0 = mock(HeatFiles.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(heatFiles0).getAsdcResourceName();
-      doReturn((String) null, (String) null).when(heatFiles0).getFileName();
-      doReturn(0).when(heatFiles0).getVnfResourceId();
-      doReturn((String) null).when(heatFiles0).getVersion();
-      catalogDatabase0.saveHeatFiles(heatFiles0);
-      Set<HeatTemplateParam> set0 = (Set<HeatTemplateParam>) mock(Set.class, new ViolatedAssumptionAnswer());
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveHeatTemplate(heatTemplate0, set0);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test42()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      List<HeatTemplateParam> list0 = (List<HeatTemplateParam>) mock(List.class, new ViolatedAssumptionAnswer());
-      doReturn((Object) null).when(list0).get(anyInt());
-      doReturn(false).when(list0).isEmpty();
-      doReturn(0).when(list0).size();
-      Query query0 = mock(Query.class, new ViolatedAssumptionAnswer());
-      Query query1 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn(list0).when(query1).list();
-      doReturn(query0).when(query1).setParameter(anyString() , any());
-      Query query2 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn((List) null).when(query2).list();
-      doReturn((Query) null, (Query) null, (Query) null).when(query2).setParameter(anyString() , any());
-      Session session1 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn("F4D:=_l\"v%zem^./^", "", "ASDC_PROPERTIES_NOT_FOUND").when(session1).toString();
-      doReturn(query1, query2).when(session1).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session1);
-      catalogDatabase0.getHeatEnvironment((-1));
-      PrivateAccess.callMethod((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "getSession");
-      Session session2 = mock(Session.class, new ViolatedAssumptionAnswer());
-      HeatTemplate heatTemplate0 = mock(HeatTemplate.class, new ViolatedAssumptionAnswer());
-      doReturn("-wAG8.gOR.b_dq").when(heatTemplate0).getAsdcResourceName();
-      doReturn("", "f:DC0FeMtZ").when(heatTemplate0).getTemplateName();
-      doReturn("F4D:=_l\"v%zem^./^").when(heatTemplate0).getVersion();
-      Iterator<HeatTemplateParam> iterator0 = (Iterator<HeatTemplateParam>) mock(Iterator.class, new ViolatedAssumptionAnswer());
-      Set<HeatTemplateParam> set0 = (Set<HeatTemplateParam>) mock(Set.class, new ViolatedAssumptionAnswer());
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveHeatTemplate(heatTemplate0, set0);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test43()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      Session session0 = mock(Session.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session0);
-      Query query0 = mock(Query.class, new ViolatedAssumptionAnswer());
-      doReturn((List) null).when(query0).list();
-      doReturn((Query) null).when(query0).setParameter(anyString() , any());
-      Session session1 = mock(Session.class, new ViolatedAssumptionAnswer());
-      doReturn("F4D:=_l\"v%zem^./^").when(session1).toString();
-      doReturn(query0).when(session1).createQuery(anyString());
-      PrivateAccess.setVariable((Class<CatalogDatabase>) CatalogDatabase.class, catalogDatabase0, "session", (Object) session1);
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getHeatEnvironment((-1));
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test44()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.GENERAL_EXCEPTION_ARG;
-      MessageEnum messageEnum1 = MessageEnum.RA_EVALUATE_XPATH_ERROR;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      String string0 = ", vnfResourceId=";
-      String string1 = "";
-      String string2 = "U`9Z8:QQUr-c(T@_/)";
-      String string3 = "$q')fpKG]Q&i\"'{x";
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getNetworkResource("FT>Ri6U\"Ks<.H/g[");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test45()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      int int0 = 1030;
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getAllVfModules();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test46()  throws Throwable  {
-      MsoLogger.ResponseCode msoLogger_ResponseCode0 = MsoLogger.ResponseCode.DataNotFound;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVfModuleType("serviceVersion", "serviceVersion");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test47()  throws Throwable  {
-      MsoLogger.ResponseCode msoLogger_ResponseCode0 = MsoLogger.ResponseCode.Conflict;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getNestedTemplates(2377);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test48()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.APIH_SDNC_RESPONSE_ERROR;
-      MessageEnum messageEnum1 = MessageEnum.ASDC_ARTIFACT_DOWNLOAD_SUC;
-      MessageEnum messageEnum2 = MessageEnum.RA_UPDATE_NETWORK_ERR;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      String string0 = null;
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVnfResource((String) null, (String) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test49()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      String string0 = ", description=";
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getServiceRecipe((-1319), ", description=");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test50()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      String string0 = ",hpGX76\"X~ow4";
-      String string1 = "735uWxa&iIbU.4]O$";
-      String string2 = "APIH_ERROR_FROM_BPEL_SERVER";
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getNetworkRecipe("735uWxa&iIbU.4]O$", ",hpGX76\"X~ow4", "");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test51()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      String string0 = ",hpGX76\"X~ow4";
-      String string1 = "APIH_ERROR_FROM_BPEL_SERVER";
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getNetworkRecipe("", ",hpGX76\"X~ow4");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test52()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      String string0 = "$iJG7Jh~P";
-      String string1 = "b4v5f&LOV|\\";
-      String string2 = "";
-      String string3 = null;
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVnfResource((String) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test53()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      String string0 = "Ikrt3T$WS\"UMs#Q";
-      String string1 = null;
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getServiceByUUID("Ikrt3T$WS\"UMs#Q");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test54()  throws Throwable  {
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      String string0 = "v@(U";
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVnfComponentsRecipe("!4@@1", "v@(U", "", (String) null, "", "");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test55()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.RA_DB_INVALID_STATUS;
-      MessageEnum messageEnum1 = MessageEnum.LOGGER_UPDATE_SUC;
-      MessageEnum messageEnum2 = MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      HashMap<String, String> hashMap0 = new HashMap<String, String>();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getService(hashMap0, "Successfully. No template found");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test56()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.APIH_PROPERTY_LOAD_SUC;
-      MessageEnum messageEnum1 = MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVnfComponentsRecipeByVfModuleId("", "(3", "");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test57()  throws Throwable  {
-      MsoLogger.ResponseCode msoLogger_ResponseCode0 = MsoLogger.ResponseCode.ServiceNotAvailable;
-      MessageEnum messageEnum0 = MessageEnum.RA_CONFIG_LOAD;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      String string0 = "";
-      String string1 = "RiY";
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getHeatEnvironment("", "RiY", "RiY");
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test58()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.RA_CREATE_NETWORK_EXC;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      int int0 = 4811;
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      LinkedHashSet<HeatTemplateParam> linkedHashSet0 = new LinkedHashSet<HeatTemplateParam>();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.saveHeatTemplate(heatTemplate0, (Set<HeatTemplateParam>) linkedHashSet0);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test59()  throws Throwable  {
-      MessageEnum messageEnum0 = MessageEnum.APIH_QUERY_PARAM_WRONG;
-      MessageEnum messageEnum1 = MessageEnum.RA_SEND_REQUEST_SDNC;
-      CatalogDatabase catalogDatabase0 = new CatalogDatabase();
-      // Undeclared exception!
-      try {
-        catalogDatabase0.getVnfComponentsRecipe("Generic exception searching for vnf_id=", (String) null, (String) null, (String) null);
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.CatalogDatabase", e);
-      }
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/CatalogDatabaseESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/CatalogDatabaseESTestscaffolding.java
deleted file mode 100644
index c9bf8b40ba..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/CatalogDatabaseESTestscaffolding.java
+++ /dev/null
@@ -1,1093 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:18:49 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog;
-
-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 CatalogDatabaseESTestscaffolding {
-
-  @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.db.catalog.CatalogDatabase"; 
-    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(CatalogDatabaseESTestscaffolding.class.getClassLoader() ,
-      "org.hibernate.sql.Alias",
-      "org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformInitiator",
-      "org.hibernate.type.BasicType",
-      "org.hibernate.service.spi.ServiceInitiator",
-      "org.hibernate.type.UUIDBinaryType",
-      "org.hibernate.type.descriptor.sql.VarbinaryTypeDescriptor",
-      "org.hibernate.type.descriptor.java.NClobTypeDescriptor",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor$4$1",
-      "org.hibernate.service.spi.SessionFactoryServiceRegistry",
-      "org.hibernate.Transaction",
-      "org.dom4j.tree.NamespaceStack",
-      "org.hibernate.annotations.common.reflection.ReflectionManager",
-      "org.hibernate.type.descriptor.java.ImmutableMutabilityPlan",
-      "org.hibernate.bytecode.spi.ReflectionOptimizer$InstantiationOptimizer",
-      "org.hibernate.type.descriptor.java.PrimitiveByteArrayTypeDescriptor",
-      "org.hibernate.mapping.FetchProfile",
-      "org.hibernate.id.TableHiLoGenerator",
-      "org.dom4j.tree.AbstractBranch",
-      "org.hibernate.type.NumericBooleanType",
-      "org.hibernate.annotations.common.reflection.ClassLoaderDelegate",
-      "org.hibernate.NaturalIdLoadAccess",
-      "org.hibernate.ScrollableResults",
-      "org.dom4j.Namespace",
-      "org.hibernate.engine.jdbc.batch.spi.BatchBuilder",
-      "org.dom4j.tree.DefaultDocumentType",
-      "org.hibernate.service.ConfigLoader",
-      "org.hibernate.metamodel.source.MetadataImplementor",
-      "org.hibernate.cfg.EJB3NamingStrategy",
-      "org.hibernate.boot.registry.classloading.spi.ClassLoaderService",
-      "org.hibernate.type.DoubleType",
-      "org.hibernate.mapping.Value",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor$3$1",
-      "org.hibernate.type.descriptor.java.ClassTypeDescriptor",
-      "org.hibernate.service.internal.ConcurrentServiceBinding$Node",
-      "org.hibernate.CacheMode",
-      "org.hibernate.type.ForeignKeyDirection$2",
-      "org.hibernate.type.IdentifierBagType",
-      "org.hibernate.type.MapType",
-      "org.hibernate.cfg.MetadataSourceType",
-      "org.hibernate.dialect.Dialect",
-      "org.hibernate.boot.registry.selector.StrategyRegistration",
-      "org.hibernate.type.ForeignKeyDirection$1",
-      "org.hibernate.ScrollMode",
-      "org.hibernate.FetchMode",
-      "org.hibernate.type.CurrencyType",
-      "org.hibernate.persister.collection.CollectionPersister",
-      "org.hibernate.service.internal.ConcurrentServiceBinding$Entry",
-      "org.hibernate.metamodel.relational.Size",
-      "org.hibernate.AssertionFailure",
-      "org.hibernate.bytecode.spi.ReflectionOptimizer$AccessOptimizer",
-      "org.dom4j.tree.FlyweightComment",
-      "org.hibernate.engine.transaction.jta.platform.internal.AbstractJtaPlatform",
-      "org.hibernate.type.CustomType",
-      "org.hibernate.id.enhanced.TableGenerator",
-      "org.hibernate.mapping.RelationalModel",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor$5$1",
-      "org.hibernate.event.spi.PostUpdateEventListener",
-      "org.hibernate.type.descriptor.java.ClobTypeDescriptor",
-      "org.hibernate.hql.spi.MultiTableBulkIdStrategy$DeleteHandler",
-      "org.dom4j.tree.ConcurrentReaderHashMap$ValueIterator",
-      "org.hibernate.cfg.beanvalidation.IntegrationException",
-      "org.hibernate.proxy.ProxyFactory",
-      "org.hibernate.mapping.Filterable",
-      "org.hibernate.tool.hbm2ddl.SingleLineSqlCommandExtractor",
-      "org.hibernate.type.SortedSetType",
-      "org.hibernate.engine.config.spi.ConfigurationService",
-      "org.hibernate.engine.config.internal.ConfigurationServiceInitiator",
-      "org.hibernate.persister.spi.PersisterClassResolver",
-      "org.hibernate.type.TypeFactory",
-      "org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl",
-      "org.hibernate.secure.spi.PermissibleAction$1",
-      "org.hibernate.cfg.Configuration$CacheHolder",
-      "org.hibernate.annotations.common.reflection.Filter",
-      "org.hibernate.dialect.Sybase11Dialect",
-      "org.hibernate.engine.jdbc.spi.JdbcServices",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor$4$1",
-      "org.hibernate.engine.transaction.jta.platform.internal.JRun4JtaPlatform",
-      "org.hibernate.type.descriptor.java.CalendarDateTypeDescriptor",
-      "org.hibernate.type.descriptor.java.CurrencyTypeDescriptor",
-      "org.hibernate.type.BlobType",
-      "org.hibernate.type.descriptor.java.BlobTypeDescriptor$BlobMutabilityPlan",
-      "org.hibernate.annotations.common.reflection.XClass",
-      "org.hibernate.dialect.PostgresPlusDialect",
-      "org.hibernate.engine.transaction.jta.platform.internal.JtaSynchronizationStrategy",
-      "org.hibernate.type.CharacterArrayType",
-      "org.hibernate.metamodel.binding.AttributeBindingContainer",
-      "org.hibernate.internal.util.xml.XmlDocument",
-      "org.hibernate.engine.jdbc.spi.SqlExceptionHelper",
-      "org.hibernate.dialect.DerbyTenSixDialect",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor",
-      "org.hibernate.hql.spi.MultiTableBulkIdStrategy$UpdateHandler",
-      "org.hibernate.integrator.spi.IntegratorService",
-      "org.hibernate.dialect.SAPDBDialect",
-      "org.hibernate.dialect.SybaseAnywhereDialect",
-      "org.hibernate.internal.util.ValueHolder",
-      "org.hibernate.engine.jdbc.internal.JdbcServicesImpl",
-      "org.hibernate.type.descriptor.sql.BigIntTypeDescriptor",
-      "org.hibernate.dialect.SybaseASE15Dialect",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.hibernate.engine.jdbc.internal.JdbcServicesInitiator",
-      "org.dom4j.tree.ConcurrentReaderHashMap$HashIterator",
-      "org.hibernate.type.AnyType",
-      "org.dom4j.util.SingletonStrategy",
-      "org.hibernate.type.descriptor.java.ByteArrayTypeDescriptor",
-      "org.dom4j.tree.BackedList",
-      "org.hibernate.service.ServiceRegistryBuilder",
-      "org.jboss.logging.JDKLoggerProvider",
-      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
-      "org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl",
-      "org.hibernate.service.internal.ConcurrentServiceBinding",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor$2$1",
-      "org.hibernate.type.ListType",
-      "org.hibernate.type.IntegerType",
-      "org.hibernate.dialect.Ingres9Dialect",
-      "org.hibernate.dialect.TeradataDialect",
-      "org.hibernate.AnnotationException",
-      "org.hibernate.proxy.EntityNotFoundDelegate",
-      "org.hibernate.type.SetType",
-      "org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator",
-      "org.hibernate.ReplicationMode$1",
-      "org.hibernate.type.NClobType",
-      "org.hibernate.service.spi.Configurable",
-      "org.hibernate.ReplicationMode$2",
-      "org.hibernate.ReplicationMode$3",
-      "org.hibernate.engine.transaction.internal.jdbc.JdbcTransactionFactory",
-      "org.hibernate.ReplicationMode$4",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor$5$1",
-      "org.openecomp.mso.db.catalog.beans.Service",
-      "org.hibernate.annotations.common.reflection.java.JavaReflectionManager",
-      "org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractor",
-      "org.hibernate.TransientObjectException",
-      "org.hibernate.id.IncrementGenerator",
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.hibernate.annotations.common.reflection.java.generics.TypeEnvironmentFactory",
-      "org.hibernate.engine.spi.FilterDefinition",
-      "org.hibernate.type.TypeFactory$TypeScopeImpl",
-      "org.hibernate.annotations.common.reflection.XMethod",
-      "org.hibernate.engine.jdbc.connections.spi.ConnectionProvider",
-      "org.hibernate.type.ByteType",
-      "org.hibernate.event.spi.AbstractEvent",
-      "org.hibernate.integrator.spi.Integrator",
-      "org.hibernate.dialect.Oracle8iDialect",
-      "org.dom4j.ElementHandler",
-      "org.dom4j.tree.DefaultAttribute",
-      "org.hibernate.engine.transaction.spi.LocalStatus",
-      "org.hibernate.type.descriptor.java.JdbcTimestampTypeDescriptor",
-      "org.hibernate.mapping.RootClass",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor$3$1",
-      "org.hibernate.engine.loading.internal.CollectionLoadContext",
-      "org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform",
-      "org.hibernate.type.descriptor.sql.DoubleTypeDescriptor",
-      "org.hibernate.type.CompositeCustomType",
-      "org.hibernate.boot.registry.selector.spi.StrategySelectionException",
-      "org.hibernate.dialect.JDataStoreDialect",
-      "org.hibernate.annotations.common.util.impl.Log_$logger",
-      "org.dom4j.rule.Pattern",
-      "org.openecomp.mso.db.catalog.beans.HeatFiles",
-      "org.hibernate.dialect.PointbaseDialect",
-      "org.hibernate.dialect.DerbyDialect",
-      "org.hibernate.event.internal.EntityCopyNotAllowedObserver",
-      "org.hibernate.id.SelectGenerator",
-      "org.hibernate.dialect.TimesTenDialect",
-      "org.hibernate.internal.util.xml.ErrorLogger",
-      "org.hibernate.id.insert.InsertGeneratedIdentifierDelegate",
-      "org.dom4j.tree.AbstractComment",
-      "org.hibernate.MultiTenancyStrategy",
-      "org.dom4j.Branch",
-      "org.jboss.logging.DelegatingBasicLogger",
-      "org.hibernate.type.ShortType",
-      "org.hibernate.service.StandardServiceInitiators",
-      "org.hibernate.type.descriptor.java.JavaTypeDescriptorRegistry",
-      "org.hibernate.type.descriptor.sql.NCharTypeDescriptor",
-      "org.hibernate.service.spi.Manageable",
-      "org.hibernate.bytecode.internal.javassist.BytecodeProviderImpl",
-      "org.hibernate.metamodel.domain.Type",
-      "org.dom4j.XPath",
-      "org.hibernate.type.VersionType",
-      "org.hibernate.integrator.internal.IntegratorServiceImpl",
-      "org.hibernate.dialect.Ingres10Dialect",
-      "org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl",
-      "org.hibernate.type.descriptor.java.JdbcTimestampTypeDescriptor$TimestampMutabilityPlan",
-      "org.hibernate.type.AdaptedImmutableType",
-      "org.hibernate.type.TypeResolver",
-      "org.hibernate.type.descriptor.java.TimeZoneTypeDescriptor",
-      "org.hibernate.type.BinaryType",
-      "org.hibernate.bytecode.spi.BytecodeProvider",
-      "org.hibernate.SynchronizeableQuery",
-      "org.hibernate.engine.jdbc.spi.ExtractedDatabaseMetaData",
-      "org.hibernate.metamodel.binding.EntityBinding",
-      "org.hibernate.type.descriptor.java.CharacterTypeDescriptor",
-      "org.hibernate.event.spi.EventSource",
-      "org.hibernate.id.IntegralDataTypeHolder",
-      "org.dom4j.tree.DefaultText",
-      "org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator",
-      "org.hibernate.type.ManyToOneType",
-      "org.hibernate.engine.transaction.jta.platform.internal.JOTMJtaPlatform",
-      "org.hibernate.engine.jdbc.LobCreationContext",
-      "org.hibernate.engine.transaction.jta.platform.internal.JOnASJtaPlatform",
-      "org.hibernate.id.enhanced.SequenceStyleGenerator",
-      "org.hibernate.tuple.entity.DynamicMapEntityTuplizer",
-      "org.dom4j.tree.ConcurrentReaderHashMap$KeyIterator",
-      "com.att.eelf.i18n.EELFResolvableErrorEnum",
-      "org.hibernate.LockOptions",
-      "org.hibernate.type.descriptor.sql.TinyIntTypeDescriptor",
-      "org.hibernate.cache.internal.CollectionCacheInvalidator",
-      "org.hibernate.dialect.AbstractTransactSQLDialect",
-      "org.hibernate.annotations.common.reflection.XAnnotatedElement",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor$5",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor$4",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor$3",
-      "org.hibernate.service.spi.ServiceContributor",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor$2",
-      "org.hibernate.jdbc.WorkExecutorVisitable",
-      "org.hibernate.service.spi.ServiceRegistryAwareService",
-      "org.hibernate.type.descriptor.sql.DecimalTypeDescriptor",
-      "org.dom4j.tree.AbstractDocument",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioningComparator",
-      "org.hibernate.dialect.FirebirdDialect",
-      "org.hibernate.id.SequenceIdentityGenerator",
-      "org.dom4j.Attribute",
-      "org.hibernate.type.descriptor.java.MutabilityPlan",
-      "org.hibernate.dialect.DerbyTenSevenDialect",
-      "org.jboss.logging.AbstractLoggerProvider",
-      "org.dom4j.Document",
-      "org.hibernate.boot.registry.BootstrapServiceRegistryBuilder",
-      "org.hibernate.Criteria",
-      "org.hibernate.annotations.common.reflection.java.JavaXCollectionType",
-      "org.hibernate.event.internal.EntityCopyAllowedLoggedObserver",
-      "org.dom4j.tree.ConcurrentReaderHashMap",
-      "org.hibernate.SessionEventListener",
-      "org.hibernate.dialect.MimerSQLDialect",
-      "org.openecomp.mso.db.catalog.beans.VnfResource",
-      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
-      "org.hibernate.InvalidMappingException",
-      "org.hibernate.service.UnknownUnwrapTypeException",
-      "org.hibernate.exception.spi.ViolatedConstraintNameExtracter",
-      "org.dom4j.tree.AbstractDocumentType",
-      "org.hibernate.persister.internal.PersisterFactoryInitiator",
-      "org.hibernate.metamodel.Metadata",
-      "org.hibernate.engine.transaction.jta.platform.internal.BorlandEnterpriseServerJtaPlatform",
-      "org.hibernate.engine.spi.Mapping",
-      "org.hibernate.service.Service",
-      "org.dom4j.CDATA",
-      "org.dom4j.tree.FlyweightText",
-      "org.hibernate.type.ObjectType",
-      "org.openecomp.mso.db.catalog.CatalogDatabase",
-      "org.hibernate.service.spi.ServiceRegistryImplementor",
-      "org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformResolver",
-      "org.dom4j.tree.ConcurrentReaderHashMap$BarrierLock",
-      "org.hibernate.type.descriptor.sql.LongVarbinaryTypeDescriptor",
-      "org.hibernate.type.DbTimestampType",
-      "org.hibernate.procedure.ProcedureCall",
-      "org.hibernate.service.UnknownServiceException",
-      "org.hibernate.id.BulkInsertionCapableIdentifierGenerator",
-      "org.hibernate.service.spi.Stoppable",
-      "org.hibernate.annotations.common.reflection.XProperty",
-      "org.hibernate.boot.registry.BootstrapServiceRegistry",
-      "org.hibernate.cfg.Configuration$MetadataSourceQueue",
-      "org.hibernate.type.descriptor.sql.NVarcharTypeDescriptor",
-      "org.hibernate.jdbc.Work",
-      "org.hibernate.type.PrimitiveType",
-      "org.hibernate.type.descriptor.sql.SmallIntTypeDescriptor",
-      "org.hibernate.tuple.entity.PojoEntityTuplizer",
-      "org.hibernate.engine.jdbc.dialect.internal.DialectFactoryInitiator",
-      "org.hibernate.usertype.UserType",
-      "org.hibernate.type.TimeType",
-      "org.hibernate.internal.util.xml.XMLHelper",
-      "org.hibernate.annotations.common.reflection.MetadataProvider",
-      "org.hibernate.cfg.beanvalidation.BeanValidationIntegrator",
-      "org.hibernate.tuple.entity.AbstractEntityTuplizer",
-      "org.hibernate.service.spi.ServiceBinding$ServiceLifecycleOwner",
-      "org.jboss.logging.LoggerProvider",
-      "org.hibernate.tool.hbm2ddl.ImportScriptException",
-      "org.dom4j.io.SAXReader",
-      "org.hibernate.id.IdentityGenerator",
-      "org.hibernate.type.ForeignKeyDirection",
-      "org.hibernate.persister.entity.Joinable",
-      "org.hibernate.type.BigDecimalType",
-      "org.hibernate.type.WrapperBinaryType",
-      "org.hibernate.internal.util.ConfigHelper",
-      "org.hibernate.id.enhanced.AccessCallback",
-      "org.dom4j.DocumentType",
-      "org.hibernate.dialect.PostgreSQL82Dialect",
-      "com.att.eelf.configuration.SLF4jWrapper",
-      "org.hibernate.id.Configurable",
-      "org.hibernate.id.SequenceGenerator",
-      "org.hibernate.dialect.Oracle9iDialect",
-      "org.hibernate.cfg.Configuration",
-      "org.dom4j.tree.DefaultDocument",
-      "org.hibernate.engine.spi.SessionFactoryImplementor",
-      "org.jboss.logging.AbstractMdcLoggerProvider",
-      "org.hibernate.type.SerializationException",
-      "org.hibernate.cfg.annotations.reflection.XMLContext$Default",
-      "org.hibernate.type.descriptor.java.CalendarTypeDescriptor$CalendarMutabilityPlan",
-      "org.openecomp.mso.logger.MsoLogger",
-      "org.hibernate.engine.jndi.spi.JndiService",
-      "org.dom4j.tree.ConcurrentReaderHashMap$KeySet",
-      "org.hibernate.type.BooleanType",
-      "org.hibernate.mapping.Collection",
-      "org.hibernate.type.descriptor.sql.TimestampTypeDescriptor",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor",
-      "org.hibernate.engine.jndi.internal.JndiServiceImpl",
-      "org.hibernate.type.descriptor.java.JdbcDateTypeDescriptor",
-      "org.hibernate.metamodel.source.BindingContext",
-      "org.hibernate.cache.internal.RegionFactoryInitiator",
-      "org.openecomp.mso.db.catalog.beans.HeatTemplateParam",
-      "org.dom4j.util.SimpleSingleton",
-      "org.hibernate.cfg.annotations.reflection.XMLContext",
-      "org.hibernate.metamodel.binding.AttributeBinding",
-      "org.hibernate.type.CharacterType",
-      "org.hibernate.type.FloatType",
-      "org.hibernate.annotations.common.reflection.AnnotationReader",
-      "org.hibernate.internal.util.xml.XmlInfrastructureException",
-      "org.jboss.logging.LoggerProviders$1",
-      "org.hibernate.internal.util.xml.XmlDocumentImpl",
-      "org.openecomp.mso.db.catalog.beans.HeatEnvironment",
-      "org.hibernate.type.descriptor.sql.NClobTypeDescriptor$4$1",
-      "org.hibernate.id.factory.IdentifierGeneratorFactory",
-      "org.hibernate.type.CollectionType",
-      "org.hibernate.type.descriptor.java.ByteTypeDescriptor",
-      "org.hibernate.boot.registry.StandardServiceRegistryBuilder",
-      "org.hibernate.secure.internal.DisabledJaccServiceImpl",
-      "org.hibernate.secure.spi.JaccService",
-      "org.hibernate.tuple.Tuplizer",
-      "org.hibernate.internal.util.ValueHolder$DeferredInitializer",
-      "org.hibernate.internal.util.xml.Origin",
-      "org.hibernate.engine.transaction.jta.platform.internal.TransactionManagerAccess",
-      "org.hibernate.type.ComponentType",
-      "org.hibernate.engine.jdbc.spi.ResultSetWrapper",
-      "org.hibernate.service.spi.Startable",
-      "org.hibernate.type.DiscriminatorType",
-      "org.hibernate.type.descriptor.sql.BooleanTypeDescriptor",
-      "org.dom4j.Comment",
-      "org.hibernate.service.internal.ProvidedService",
-      "org.hibernate.type.descriptor.java.BlobTypeDescriptor",
-      "org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl$TcclSafeAggregatedClassLoader",
-      "org.jboss.logging.Slf4jLoggerProvider",
-      "org.hibernate.type.SortedMapType",
-      "org.hibernate.type.LongType",
-      "org.hibernate.annotations.common.reflection.MetadataProviderInjector",
-      "org.hibernate.type.descriptor.java.LongTypeDescriptor",
-      "org.hibernate.id.UUIDGenerationStrategy",
-      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
-      "org.hibernate.LockMode",
-      "org.jboss.logging.Slf4jLocationAwareLogger$1",
-      "org.hibernate.boot.registry.selector.spi.StrategySelector",
-      "org.hibernate.EntityMode",
-      "org.hibernate.dialect.HSQLDialect",
-      "org.hibernate.Session$LockRequest",
-      "org.hibernate.type.descriptor.java.BigDecimalTypeDescriptor",
-      "org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory",
-      "org.hibernate.engine.jdbc.batch.internal.BatchBuilderInitiator",
-      "org.openecomp.mso.logger.MsoLogger$StatusCode",
-      "org.openecomp.mso.db.catalog.beans.VnfComponent",
-      "com.att.eelf.configuration.EELFManager",
-      "org.dom4j.Text",
-      "org.dom4j.tree.AbstractCharacterData",
-      "org.hibernate.engine.transaction.jta.platform.internal.ResinJtaPlatform",
-      "org.hibernate.service.ServiceRegistry",
-      "org.dom4j.io.DOMReader",
-      "org.hibernate.type.TimestampType",
-      "org.hibernate.persister.internal.PersisterClassResolverInitiator",
-      "org.jboss.logging.Logger$Level",
-      "org.hibernate.type.NTextType",
-      "org.hibernate.UnknownProfileException",
-      "org.hibernate.engine.spi.CollectionKey",
-      "org.hibernate.type.descriptor.java.JavaTypeDescriptor",
-      "org.hibernate.type.descriptor.sql.LongVarcharTypeDescriptor",
-      "org.hibernate.secure.spi.GrantedPermission",
-      "org.hibernate.type.Type",
-      "org.hibernate.engine.jdbc.cursor.internal.RefCursorSupportInitiator",
-      "org.hibernate.MappingNotFoundException",
-      "org.hibernate.internal.util.collections.JoinedIterator",
-      "org.hibernate.jmx.internal.JmxServiceInitiator",
-      "org.hibernate.type.descriptor.java.JdbcTimeTypeDescriptor",
-      "org.hibernate.type.CustomCollectionType",
-      "org.hibernate.type.descriptor.sql.NClobTypeDescriptor$3$1",
-      "org.hibernate.event.service.spi.DuplicationStrategy",
-      "org.hibernate.type.PostgresUUIDType$PostgresUUIDSqlTypeDescriptor",
-      "org.dom4j.io.DispatchHandler",
-      "org.hibernate.annotations.common.util.impl.LoggerFactory",
-      "org.hibernate.dialect.SQLServer2005Dialect",
-      "org.dom4j.Entity",
-      "org.hibernate.boot.registry.selector.StrategyRegistrationProvider",
-      "org.hibernate.id.PostInsertIdentifierGenerator",
-      "org.hibernate.type.descriptor.java.ShortTypeDescriptor",
-      "org.hibernate.type.descriptor.sql.NumericTypeDescriptor",
-      "org.hibernate.dialect.CUBRIDDialect",
-      "org.hibernate.annotations.common.reflection.java.JavaXType",
-      "org.hibernate.integrator.spi.ServiceContributingIntegrator",
-      "org.hibernate.type.descriptor.java.StringTypeDescriptor",
-      "org.dom4j.ProcessingInstruction",
-      "org.hibernate.boot.registry.StandardServiceRegistry",
-      "org.hibernate.type.descriptor.java.JdbcDateTypeDescriptor$DateMutabilityPlan",
-      "org.hibernate.id.IdentifierGenerator",
-      "org.hibernate.engine.jdbc.dialect.spi.DialectResolver",
-      "org.hibernate.engine.jdbc.spi.SqlExceptionHelper$WarningHandler",
-      "org.hibernate.type.OneToOneType",
-      "org.hibernate.id.GUIDGenerator",
-      "org.hibernate.internal.util.xml.MappingReader$SupportedOrmXsdVersion",
-      "org.dom4j.io.ElementStack",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor$5",
-      "org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl",
-      "org.hibernate.SessionFactory",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor$3",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor$4",
-      "org.hibernate.type.MaterializedClobType",
-      "org.hibernate.type.BigIntegerType",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor$2",
-      "org.hibernate.service.internal.AbstractServiceRegistryImpl",
-      "com.att.eelf.i18n.EELFMsgs",
-      "org.hibernate.dialect.SybaseASE157Dialect",
-      "org.dom4j.tree.AbstractText",
-      "org.hibernate.Version",
-      "org.hibernate.engine.transaction.jta.platform.internal.WeblogicJtaPlatform",
-      "org.hibernate.cache.spi.OptimisticCacheSource",
-      "org.hibernate.dialect.SQLServerDialect",
-      "org.hibernate.dialect.SybaseDialect",
-      "org.hibernate.engine.spi.CascadeStyle",
-      "org.dom4j.tree.NamespaceCache",
-      "org.hibernate.engine.jdbc.dialect.spi.DialectFactory",
-      "org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformResolverInitiator",
-      "org.hibernate.internal.util.xml.OriginImpl",
-      "org.hibernate.jmx.spi.JmxService",
-      "org.hibernate.id.UUIDGenerator",
-      "org.hibernate.persister.spi.PersisterFactory",
-      "org.hibernate.type.descriptor.sql.NClobTypeDescriptor$2$1",
-      "org.hibernate.TypeHelper",
-      "org.hibernate.cfg.AvailableSettings",
-      "org.hibernate.type.PostgresUUIDType",
-      "org.hibernate.dialect.DB2Dialect",
-      "org.hibernate.Session",
-      "org.hibernate.internal.util.config.ConfigurationHelper",
-      "org.dom4j.tree.QNameCache",
-      "org.hibernate.SimpleNaturalIdLoadAccess",
-      "org.hibernate.engine.transaction.jta.platform.internal.BitronixJtaPlatform",
-      "org.jboss.logging.BasicLogger",
-      "org.hibernate.type.SpecialOneToOneType",
-      "org.hibernate.internal.util.config.ConfigurationException",
-      "org.hibernate.metamodel.spi.TypeContributor",
-      "org.hibernate.engine.transaction.jta.platform.internal.SunOneJtaPlatform",
-      "org.hibernate.engine.jdbc.connections.internal.MultiTenantConnectionProviderInitiator",
-      "org.hibernate.cfg.Environment",
-      "org.hibernate.hql.spi.TemporaryTableBulkIdStrategy",
-      "org.hibernate.type.LocaleType",
-      "org.hibernate.boot.registry.internal.StandardServiceRegistryImpl",
-      "org.hibernate.type.descriptor.sql.SqlTypeDescriptor",
-      "org.dom4j.NodeFilter",
-      "org.hibernate.type.descriptor.java.FloatTypeDescriptor",
-      "org.hibernate.type.descriptor.java.UrlTypeDescriptor",
-      "org.dom4j.tree.DefaultComment",
-      "org.hibernate.type.descriptor.java.SerializableTypeDescriptor",
-      "org.hibernate.dialect.MySQL5InnoDBDialect",
-      "org.hibernate.id.factory.spi.MutableIdentifierGeneratorFactory",
-      "org.hibernate.usertype.CompositeUserType",
-      "org.hibernate.engine.jdbc.spi.SqlStatementLogger",
-      "org.hibernate.mapping.Table",
-      "org.hibernate.secure.spi.IntegrationException",
-      "org.hibernate.mapping.AuxiliaryDatabaseObject",
-      "org.hibernate.annotations.common.reflection.XMember",
-      "org.hibernate.type.descriptor.sql.VarcharTypeDescriptor",
-      "org.hibernate.type.descriptor.java.PrimitiveCharacterArrayTypeDescriptor",
-      "org.hibernate.type.descriptor.java.UUIDTypeDescriptor",
-      "org.hibernate.engine.jdbc.spi.ExtractedDatabaseMetaData$SQLStateType",
-      "org.openecomp.mso.db.catalog.beans.Recipe",
-      "org.hibernate.secure.spi.JaccIntegrator$1",
-      "org.hibernate.id.factory.internal.MutableIdentifierGeneratorFactoryInitiator",
-      "org.hibernate.cfg.SettingsFactory",
-      "org.dom4j.io.SAXContentHandler",
-      "org.dom4j.QName",
-      "org.hibernate.type.AssociationType",
-      "org.hibernate.cfg.ExtendsQueueEntry",
-      "org.hibernate.ReplicationMode",
-      "org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl$AggregatedClassLoader",
-      "org.dom4j.tree.DefaultElement",
-      "org.hibernate.engine.transaction.spi.TransactionImplementor",
-      "org.hibernate.persister.entity.EntityPersister",
-      "org.dom4j.Node",
-      "org.hibernate.service.spi.ServiceBinding",
-      "org.hibernate.type.BasicTypeRegistry",
-      "org.hibernate.internal.util.ValueHolder$1",
-      "org.hibernate.dialect.function.SQLFunction",
-      "org.hibernate.NonUniqueResultException",
-      "org.hibernate.SessionFactoryObserver",
-      "org.hibernate.type.descriptor.sql.RealTypeDescriptor",
-      "org.hibernate.dialect.PostgreSQL81Dialect",
-      "org.hibernate.collection.spi.PersistentCollection",
-      "org.hibernate.type.descriptor.sql.DateTypeDescriptor",
-      "org.dom4j.tree.AbstractAttribute",
-      "org.hibernate.internal.CoreMessageLogger_$logger",
-      "org.hibernate.dialect.PostgreSQLDialect",
-      "org.hibernate.dialect.MySQLDialect",
-      "org.hibernate.internal.jaxb.cfg.JaxbHibernateConfiguration",
-      "org.openecomp.mso.db.catalog.beans.VnfRecipe",
-      "org.hibernate.engine.transaction.jta.platform.internal.JBossAppServerJtaPlatform",
-      "org.hibernate.service.ConfigLoader$1",
-      "org.hibernate.type.MaterializedNClobType",
-      "org.hibernate.type.IdentifierType",
-      "org.hibernate.type.SingleColumnType",
-      "org.hibernate.type.descriptor.java.CharacterArrayTypeDescriptor",
-      "org.hibernate.SessionBuilder",
-      "org.openecomp.mso.db.catalog.beans.NetworkRecipe",
-      "org.hibernate.mapping.MetaAttributable",
-      "org.hibernate.type.descriptor.java.MutableMutabilityPlan",
-      "org.hibernate.secure.spi.JaccPermissionDeclarations",
-      "org.hibernate.type.UrlType",
-      "org.hibernate.tuple.entity.AbstractEntityTuplizer$MappedIdentifierValueMarshaller",
-      "org.hibernate.tuple.component.ComponentMetamodel",
-      "org.hibernate.persister.walking.spi.EntityDefinition",
-      "org.hibernate.type.YesNoType",
-      "org.hibernate.id.AbstractPostInsertGenerator",
-      "org.openecomp.mso.db.catalog.beans.VfModule",
-      "org.hibernate.annotations.common.reflection.java.JavaXArrayType",
-      "org.hibernate.exception.spi.SQLExceptionConverter",
-      "org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl$AggregatedClassLoader$1",
-      "org.hibernate.type.AbstractStandardBasicType",
-      "org.hibernate.hql.spi.QueryTranslatorFactory",
-      "org.hibernate.SharedSessionContract",
-      "org.hibernate.cfg.Configuration$ObjectNameNormalizerImpl",
-      "org.hibernate.annotations.common.reflection.java.JavaXSimpleType",
-      "org.hibernate.cfg.ObjectNameNormalizer",
-      "org.hibernate.service.internal.SessionFactoryServiceRegistryFactoryImpl",
-      "org.hibernate.service.internal.ServiceDependencyException",
-      "org.hibernate.event.spi.PostDeleteEvent",
-      "org.hibernate.type.descriptor.java.BooleanTypeDescriptor",
-      "org.hibernate.type.descriptor.sql.FloatTypeDescriptor",
-      "org.hibernate.type.descriptor.sql.SqlTypeDescriptorRegistry",
-      "org.hibernate.dialect.InformixDialect",
-      "org.jboss.logging.Logger",
-      "org.hibernate.cfg.Configuration$1",
-      "org.hibernate.tuple.entity.EntityMetamodel$GenerationStrategyPair",
-      "org.hibernate.type.ImageType",
-      "org.hibernate.id.factory.internal.DefaultIdentifierGeneratorFactory",
-      "org.hibernate.engine.transaction.jta.platform.internal.JBossStandAloneJtaPlatform",
-      "org.hibernate.cfg.Configuration$3",
-      "org.hibernate.engine.jndi.JndiNameException",
-      "org.hibernate.dialect.PostgreSQL9Dialect",
-      "org.hibernate.type.CompositeType",
-      "org.openecomp.mso.db.catalog.beans.HeatNestedTemplate",
-      "org.dom4j.ElementPath",
-      "org.jboss.logging.LoggerProviders",
-      "org.hibernate.type.descriptor.WrapperOptions",
-      "org.hibernate.id.SequenceHiLoGenerator",
-      "org.hibernate.type.descriptor.java.NClobTypeDescriptor$NClobMutabilityPlan",
-      "org.hibernate.type.descriptor.sql.NClobTypeDescriptor$3",
-      "org.openecomp.mso.db.catalog.beans.VfModuleToHeatFiles",
-      "org.openecomp.mso.entity.MsoRequest",
-      "org.hibernate.type.descriptor.sql.NClobTypeDescriptor$2",
-      "org.hibernate.type.descriptor.sql.NClobTypeDescriptor$4",
-      "org.hibernate.secure.spi.JaccIntegrator",
-      "org.hibernate.tuple.entity.EntityMetamodel",
-      "org.hibernate.dialect.DerbyTenFiveDialect",
-      "org.hibernate.tuple.Instantiator",
-      "org.hibernate.type.descriptor.java.AbstractTypeDescriptor",
-      "org.hibernate.type.BagType",
-      "org.hibernate.type.CalendarType",
-      "org.hibernate.internal.util.ClassLoaderHelper",
-      "org.hibernate.BasicQueryContract",
-      "org.hibernate.CallbackException",
-      "org.hibernate.engine.jdbc.LobCreator",
-      "org.hibernate.type.descriptor.java.DoubleTypeDescriptor",
-      "org.dom4j.Element",
-      "org.hibernate.dialect.FrontBaseDialect",
-      "org.hibernate.boot.registry.classloading.spi.ClassLoadingException",
-      "org.hibernate.tuple.entity.EntityTuplizerFactory",
-      "org.hibernate.stat.SessionStatistics",
-      "org.hibernate.type.OrderedSetType",
-      "org.hibernate.mapping.TableOwner",
-      "org.hibernate.type.descriptor.ValueBinder",
-      "org.hibernate.bytecode.spi.ReflectionOptimizer",
-      "org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl$Work",
-      "org.hibernate.dialect.DB2390Dialect",
-      "org.hibernate.engine.jdbc.connections.internal.UserSuppliedConnectionProviderImpl",
-      "org.hibernate.type.descriptor.java.LocaleTypeDescriptor",
-      "org.hibernate.engine.transaction.jta.platform.internal.WebSphereJtaPlatform",
-      "org.hibernate.engine.jdbc.spi.JdbcConnectionAccess",
-      "org.hibernate.SharedSessionBuilder",
-      "org.openecomp.mso.db.catalog.beans.NetworkResource",
-      "org.hibernate.type.TimeZoneType",
-      "org.hibernate.mapping.PersistentClass",
-      "org.hibernate.tuple.entity.EntityTuplizer",
-      "org.hibernate.engine.transaction.jta.platform.internal.OC4JJtaPlatform",
-      "org.hibernate.type.descriptor.java.ClobTypeDescriptor$ClobMutabilityPlan",
-      "org.hibernate.Query",
-      "org.hibernate.annotations.common.reflection.java.generics.TypeEnvironment",
-      "org.hibernate.internal.util.beans.BeanInfoHelper$BeanInfoDelegate",
-      "org.hibernate.event.spi.PostDeleteEventListener",
-      "org.jboss.logging.Slf4jLogger",
-      "org.hibernate.annotations.common.Version",
-      "org.hibernate.EmptyInterceptor",
-      "org.hibernate.type.descriptor.sql.TimeTypeDescriptor",
-      "org.hibernate.type.descriptor.java.IntegerTypeDescriptor",
-      "org.hibernate.bytecode.spi.ClassTransformer",
-      "org.hibernate.id.TableGenerator",
-      "org.hibernate.id.Assigned",
-      "com.att.eelf.configuration.EELFLogger$Level",
-      "org.hibernate.type.ClobType",
-      "org.hibernate.id.UUIDHexGenerator",
-      "org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory",
-      "org.hibernate.id.enhanced.DatabaseStructure",
-      "org.hibernate.cache.CacheException",
-      "org.hibernate.event.spi.PostUpdateEvent",
-      "org.hibernate.type.TypeFactory$1",
-      "org.hibernate.HibernateException",
-      "org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider",
-      "org.hibernate.cfg.annotations.reflection.JPAMetadataProvider",
-      "org.hibernate.cfg.NamingStrategy",
-      "org.hibernate.dialect.H2Dialect",
-      "org.hibernate.type.descriptor.sql.BasicBinder",
-      "org.hibernate.dialect.IngresDialect",
-      "org.hibernate.persister.walking.spi.CollectionDefinition",
-      "org.dom4j.tree.ConcurrentReaderHashMap$Entry",
-      "org.hibernate.tool.hbm2ddl.DatabaseMetadata",
-      "org.hibernate.id.ForeignGenerator",
-      "org.hibernate.type.EmbeddedComponentType",
-      "org.hibernate.event.spi.PostInsertEvent",
-      "com.att.eelf.configuration.EELFLogger",
-      "org.hibernate.type.descriptor.sql.LongNVarcharTypeDescriptor",
-      "org.hibernate.type.descriptor.sql.CharTypeDescriptor",
-      "org.hibernate.type.descriptor.sql.IntegerTypeDescriptor",
-      "org.hibernate.type.CharacterNCharType",
-      "org.hibernate.internal.util.xml.DTDEntityResolver",
-      "org.dom4j.io.JAXPHelper",
-      "org.hibernate.cache.spi.RegionFactory",
-      "org.dom4j.tree.FlyweightAttribute",
-      "org.hibernate.engine.jndi.internal.JndiServiceInitiator",
-      "org.dom4j.IllegalAddException",
-      "org.hibernate.type.descriptor.java.BigIntegerTypeDescriptor",
-      "org.hibernate.annotations.common.reflection.XPackage",
-      "org.hibernate.persister.walking.spi.AttributeSource",
-      "org.hibernate.internal.util.compare.ComparableComparator",
-      "org.dom4j.tree.AbstractNode",
-      "org.dom4j.Visitor",
-      "org.hibernate.type.XmlRepresentableType",
-      "org.dom4j.CharacterData",
-      "org.hibernate.type.AbstractSingleColumnStandardBasicType",
-      "org.hibernate.bytecode.spi.ProxyFactoryFactory",
-      "org.hibernate.cfg.Mappings",
-      "org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform",
-      "org.hibernate.type.DateType",
-      "org.hibernate.type.descriptor.java.UUIDTypeDescriptor$ValueTransformer",
-      "org.hibernate.cfg.RecoverableException",
-      "org.hibernate.type.SerializableType",
-      "org.hibernate.bytecode.buildtime.spi.ClassFilter",
-      "org.hibernate.internal.util.xml.MappingReader",
-      "org.hibernate.dialect.DB2400Dialect",
-      "org.openecomp.mso.db.catalog.beans.HeatTemplate",
-      "org.hibernate.hql.spi.PersistentTableBulkIdStrategy",
-      "org.hibernate.engine.jdbc.spi.SchemaNameResolver",
-      "org.hibernate.annotations.common.util.StandardClassLoaderDelegateImpl",
-      "org.hibernate.IdentifierLoadAccess",
-      "org.hibernate.annotations.common.reflection.ClassLoadingException",
-      "org.hibernate.metamodel.domain.AttributeContainer",
-      "org.hibernate.type.UUIDCharType",
-      "org.hibernate.transform.ResultTransformer",
-      "org.hibernate.cache.internal.NoCachingRegionFactory",
-      "org.hibernate.service.spi.ServiceException",
-      "org.hibernate.internal.util.collections.CollectionHelper",
-      "org.hibernate.exception.spi.SQLExceptionConversionDelegate",
-      "org.hibernate.secure.spi.PermissibleAction",
-      "org.openecomp.mso.db.catalog.beans.VnfComponentsRecipe",
-      "org.hibernate.annotations.common.reflection.java.JavaMetadataProvider",
-      "org.hibernate.Filter",
-      "org.hibernate.context.spi.CurrentTenantIdentifierResolver",
-      "org.hibernate.SQLQuery",
-      "org.hibernate.Interceptor",
-      "org.dom4j.tree.ConcurrentReaderHashMap$Values",
-      "org.dom4j.io.SAXHelper",
-      "org.hibernate.engine.jndi.JndiException",
-      "org.hibernate.dialect.MckoiDialect",
-      "org.hibernate.engine.transaction.internal.TransactionFactoryInitiator",
-      "org.hibernate.LobHelper",
-      "org.hibernate.exception.spi.ConversionContext",
-      "org.hibernate.JDBCException",
-      "org.hibernate.engine.jdbc.dialect.internal.DialectResolverSet",
-      "org.hibernate.type.TextType",
-      "org.hibernate.type.descriptor.sql.NClobTypeDescriptor",
-      "org.hibernate.dialect.Oracle10gDialect",
-      "org.hibernate.engine.jdbc.cursor.spi.RefCursorSupport",
-      "org.hibernate.boot.registry.selector.internal.StrategySelectorBuilder",
-      "org.hibernate.id.AbstractUUIDGenerator",
-      "org.openecomp.mso.db.catalog.beans.ServiceRecipe",
-      "org.hibernate.hql.spi.MultiTableBulkIdStrategy",
-      "org.hibernate.type.LiteralType",
-      "org.hibernate.service.internal.SessionFactoryServiceRegistryFactoryInitiator",
-      "org.hibernate.service.spi.SessionFactoryServiceRegistryFactory",
-      "org.hibernate.metamodel.spi.TypeContributions",
-      "org.hibernate.service.spi.InjectService",
-      "org.hibernate.engine.loading.internal.EntityLoadContext",
-      "org.hibernate.type.ClassType",
-      "org.hibernate.type.TypeFactory$TypeScope",
-      "org.hibernate.type.descriptor.java.ArrayMutabilityPlan",
-      "org.hibernate.bytecode.buildtime.spi.FieldFilter",
-      "org.hibernate.cache.spi.QueryCacheFactory",
-      "org.hibernate.criterion.CriteriaSpecification",
-      "org.hibernate.type.ArrayType",
-      "org.hibernate.type.CharArrayType",
-      "org.hibernate.engine.transaction.jta.platform.internal.OrionJtaPlatform",
-      "org.jboss.logging.Logger$1",
-      "org.hibernate.boot.registry.selector.internal.StrategySelectorImpl",
-      "org.hibernate.type.ProcedureParameterExtractionAware",
-      "org.hibernate.MappingException",
-      "org.hibernate.mapping.Fetchable",
-      "org.hibernate.type.AbstractType",
-      "org.hibernate.dialect.MySQL5Dialect",
-      "org.hibernate.engine.spi.SessionImplementor",
-      "org.hibernate.dialect.InterbaseDialect",
-      "org.hibernate.type.descriptor.sql.BinaryTypeDescriptor",
-      "org.dom4j.tree.ConcurrentReaderHashMap$1",
-      "org.hibernate.type.TrueFalseType",
-      "org.hibernate.event.spi.PostInsertEventListener",
-      "org.hibernate.type.StringRepresentableType",
-      "org.hibernate.internal.CoreMessageLogger",
-      "org.hibernate.tuple.InDatabaseValueGenerationStrategy",
-      "org.hibernate.dialect.Cache71Dialect",
-      "org.hibernate.secure.spi.PermissionCheckEntityInformation",
-      "org.hibernate.type.descriptor.java.JdbcTimeTypeDescriptor$TimeMutabilityPlan",
-      "org.hibernate.tuple.InMemoryValueGenerationStrategy",
-      "org.hibernate.type.EntityType",
-      "org.hibernate.event.internal.EntityCopyAllowedObserver",
-      "org.dom4j.tree.AbstractElement",
-      "org.hibernate.dialect.ProgressDialect",
-      "org.hibernate.cfg.Settings",
-      "org.dom4j.DocumentFactory",
-      "org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractorInitiator",
-      "org.dom4j.DocumentException",
-      "org.hibernate.type.descriptor.java.SerializableTypeDescriptor$SerializableMutabilityPlan",
-      "org.dom4j.tree.ConcurrentReaderHashMap$EntrySet",
-      "org.hibernate.type.CalendarDateType",
-      "com.att.eelf.i18n.EELFResourceManager",
-      "org.hibernate.type.StringType",
-      "org.openecomp.mso.logger.MessageEnum",
-      "org.jboss.logging.Slf4jLocationAwareLogger",
-      "org.hibernate.type.StringNVarcharType",
-      "org.hibernate.engine.transaction.spi.TransactionFactory",
-      "org.hibernate.cfg.AttributeConverterDefinition",
-      "org.hibernate.FlushMode",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor$2$1",
-      "org.hibernate.type.MaterializedBlobType",
-      "org.hibernate.event.spi.EntityCopyObserver",
-      "org.hibernate.cfg.EJB3DTDEntityResolver",
-      "org.hibernate.annotations.common.util.impl.Log",
-      "org.hibernate.dialect.SQLServer2008Dialect",
-      "org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfoSource",
-      "org.hibernate.type.descriptor.java.CalendarTypeDescriptor",
-      "org.hibernate.type.descriptor.ValueExtractor",
-      "com.att.eelf.i18n.EELFResourceManager$1",
-      "org.hibernate.service.spi.Wrapped",
-      "org.hibernate.bytecode.spi.EntityInstrumentationMetadata",
-      "org.hibernate.id.PersistentIdentifierGenerator",
-      "org.hibernate.internal.CoreLogging",
-      "org.hibernate.type.OrderedMapType",
-      "org.hibernate.jdbc.ReturningWork",
-      "org.hibernate.metamodel.relational.Size$LobMultiplier",
-      "org.hibernate.boot.registry.StandardServiceInitiator"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(CatalogDatabaseESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "com.att.eelf.i18n.EELFResourceManager",
-      "org.openecomp.mso.logger.MessageEnum",
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
-      "org.openecomp.mso.logger.MsoLogger$StatusCode",
-      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
-      "org.openecomp.mso.logger.MsoLogger",
-      "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.db.catalog.CatalogDatabase",
-      "org.openecomp.mso.db.catalog.beans.VnfComponent",
-      "org.openecomp.mso.db.catalog.beans.HeatTemplate",
-      "org.openecomp.mso.db.catalog.beans.HeatNestedTemplate",
-      "org.openecomp.mso.db.catalog.beans.VfModuleToHeatFiles",
-      "org.jboss.logging.Logger",
-      "org.jboss.logging.DelegatingBasicLogger",
-      "org.hibernate.internal.CoreMessageLogger_$logger",
-      "org.jboss.logging.Slf4jLocationAwareLogger",
-      "org.jboss.logging.Logger$Level",
-      "org.jboss.logging.Slf4jLocationAwareLogger$1",
-      "org.jboss.logging.LoggerProviders",
-      "org.hibernate.cfg.MetadataSourceType",
-      "org.hibernate.cfg.Configuration",
-      "org.hibernate.cfg.SettingsFactory",
-      "org.hibernate.type.TypeResolver",
-      "org.hibernate.type.BasicTypeRegistry",
-      "org.hibernate.metamodel.relational.Size",
-      "org.hibernate.metamodel.relational.Size$LobMultiplier",
-      "org.hibernate.type.AbstractStandardBasicType",
-      "org.hibernate.type.AbstractSingleColumnStandardBasicType",
-      "org.hibernate.type.descriptor.sql.SqlTypeDescriptorRegistry",
-      "org.hibernate.type.descriptor.sql.BooleanTypeDescriptor",
-      "org.hibernate.type.descriptor.java.AbstractTypeDescriptor",
-      "org.hibernate.type.descriptor.java.ImmutableMutabilityPlan",
-      "org.hibernate.internal.util.compare.ComparableComparator",
-      "org.hibernate.type.descriptor.java.JavaTypeDescriptorRegistry",
-      "org.hibernate.type.descriptor.java.BooleanTypeDescriptor",
-      "org.hibernate.type.BooleanType",
-      "org.hibernate.type.descriptor.sql.IntegerTypeDescriptor",
-      "org.hibernate.type.NumericBooleanType",
-      "org.hibernate.type.descriptor.sql.VarcharTypeDescriptor",
-      "org.hibernate.type.descriptor.sql.CharTypeDescriptor",
-      "org.hibernate.type.TrueFalseType",
-      "org.hibernate.type.YesNoType",
-      "org.hibernate.type.descriptor.sql.TinyIntTypeDescriptor",
-      "org.hibernate.type.descriptor.java.ByteTypeDescriptor",
-      "org.hibernate.type.ByteType",
-      "org.hibernate.type.descriptor.java.CharacterTypeDescriptor",
-      "org.hibernate.type.CharacterType",
-      "org.hibernate.type.descriptor.sql.SmallIntTypeDescriptor",
-      "org.hibernate.type.descriptor.java.ShortTypeDescriptor",
-      "org.hibernate.type.ShortType",
-      "org.hibernate.type.descriptor.java.IntegerTypeDescriptor",
-      "org.hibernate.type.IntegerType",
-      "org.hibernate.type.descriptor.sql.BigIntTypeDescriptor",
-      "org.hibernate.type.descriptor.java.LongTypeDescriptor",
-      "org.hibernate.type.LongType",
-      "org.hibernate.type.descriptor.sql.RealTypeDescriptor",
-      "org.hibernate.type.descriptor.sql.FloatTypeDescriptor",
-      "org.hibernate.type.descriptor.java.FloatTypeDescriptor",
-      "org.hibernate.type.FloatType",
-      "org.hibernate.type.descriptor.sql.DoubleTypeDescriptor",
-      "org.hibernate.type.descriptor.java.DoubleTypeDescriptor",
-      "org.hibernate.type.DoubleType",
-      "org.hibernate.type.descriptor.sql.DecimalTypeDescriptor",
-      "org.hibernate.type.descriptor.sql.NumericTypeDescriptor",
-      "org.hibernate.type.descriptor.java.BigDecimalTypeDescriptor",
-      "org.hibernate.type.BigDecimalType",
-      "org.hibernate.type.descriptor.java.BigIntegerTypeDescriptor",
-      "org.hibernate.type.BigIntegerType",
-      "org.hibernate.type.descriptor.java.StringTypeDescriptor",
-      "org.hibernate.type.StringType",
-      "org.hibernate.type.descriptor.sql.NVarcharTypeDescriptor",
-      "org.hibernate.type.StringNVarcharType",
-      "org.hibernate.type.descriptor.sql.NCharTypeDescriptor",
-      "org.hibernate.type.CharacterNCharType",
-      "org.hibernate.type.descriptor.java.UrlTypeDescriptor",
-      "org.hibernate.type.UrlType",
-      "org.hibernate.type.descriptor.sql.DateTypeDescriptor",
-      "org.hibernate.type.descriptor.java.MutableMutabilityPlan",
-      "org.hibernate.type.descriptor.java.JdbcDateTypeDescriptor$DateMutabilityPlan",
-      "org.hibernate.type.descriptor.java.JdbcDateTypeDescriptor",
-      "org.hibernate.type.DateType",
-      "org.hibernate.type.descriptor.sql.TimeTypeDescriptor",
-      "org.hibernate.type.descriptor.java.JdbcTimeTypeDescriptor$TimeMutabilityPlan",
-      "org.hibernate.type.descriptor.java.JdbcTimeTypeDescriptor",
-      "org.hibernate.type.TimeType",
-      "org.hibernate.type.descriptor.sql.TimestampTypeDescriptor",
-      "org.hibernate.type.descriptor.java.JdbcTimestampTypeDescriptor$TimestampMutabilityPlan",
-      "org.hibernate.type.descriptor.java.JdbcTimestampTypeDescriptor",
-      "org.hibernate.type.TimestampType",
-      "org.hibernate.type.DbTimestampType",
-      "org.hibernate.type.descriptor.java.CalendarTypeDescriptor$CalendarMutabilityPlan",
-      "org.hibernate.type.descriptor.java.CalendarTypeDescriptor",
-      "org.hibernate.type.CalendarType",
-      "org.hibernate.type.descriptor.java.CalendarDateTypeDescriptor",
-      "org.hibernate.type.CalendarDateType",
-      "org.hibernate.type.descriptor.java.LocaleTypeDescriptor",
-      "org.hibernate.type.LocaleType",
-      "org.hibernate.type.descriptor.java.CurrencyTypeDescriptor",
-      "org.hibernate.type.CurrencyType",
-      "org.hibernate.type.descriptor.java.TimeZoneTypeDescriptor",
-      "org.hibernate.type.TimeZoneType",
-      "org.hibernate.type.descriptor.java.ClassTypeDescriptor",
-      "org.hibernate.type.ClassType",
-      "org.hibernate.type.descriptor.sql.VarbinaryTypeDescriptor",
-      "org.hibernate.type.descriptor.sql.BinaryTypeDescriptor",
-      "org.hibernate.type.descriptor.java.UUIDTypeDescriptor",
-      "org.hibernate.type.UUIDBinaryType",
-      "org.hibernate.type.UUIDCharType",
-      "org.hibernate.type.PostgresUUIDType$PostgresUUIDSqlTypeDescriptor",
-      "org.hibernate.type.PostgresUUIDType",
-      "org.hibernate.type.descriptor.java.ArrayMutabilityPlan",
-      "org.hibernate.type.descriptor.java.PrimitiveByteArrayTypeDescriptor",
-      "org.hibernate.type.BinaryType",
-      "org.hibernate.type.descriptor.java.ByteArrayTypeDescriptor",
-      "org.hibernate.type.WrapperBinaryType",
-      "org.hibernate.type.descriptor.sql.LongVarbinaryTypeDescriptor",
-      "org.hibernate.type.ImageType",
-      "org.hibernate.type.descriptor.java.PrimitiveCharacterArrayTypeDescriptor",
-      "org.hibernate.type.CharArrayType",
-      "org.hibernate.type.descriptor.java.CharacterArrayTypeDescriptor",
-      "org.hibernate.type.CharacterArrayType",
-      "org.hibernate.type.descriptor.sql.LongVarcharTypeDescriptor",
-      "org.hibernate.type.TextType",
-      "org.hibernate.type.descriptor.sql.LongNVarcharTypeDescriptor",
-      "org.hibernate.type.NTextType",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor$2",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor$3",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor$4",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor$5",
-      "org.hibernate.type.descriptor.sql.BlobTypeDescriptor",
-      "org.hibernate.type.descriptor.java.BlobTypeDescriptor$BlobMutabilityPlan",
-      "org.hibernate.type.descriptor.java.BlobTypeDescriptor",
-      "org.hibernate.type.BlobType",
-      "org.hibernate.type.MaterializedBlobType",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor$2",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor$3",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor$4",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor$5",
-      "org.hibernate.type.descriptor.sql.ClobTypeDescriptor",
-      "org.hibernate.type.descriptor.java.ClobTypeDescriptor$ClobMutabilityPlan",
-      "org.hibernate.type.descriptor.java.ClobTypeDescriptor",
-      "org.hibernate.type.ClobType",
-      "org.hibernate.type.descriptor.sql.NClobTypeDescriptor$2",
-      "org.hibernate.type.descriptor.sql.NClobTypeDescriptor$3",
-      "org.hibernate.type.descriptor.sql.NClobTypeDescriptor$4",
-      "org.hibernate.type.descriptor.sql.NClobTypeDescriptor",
-      "org.hibernate.type.descriptor.java.NClobTypeDescriptor$NClobMutabilityPlan",
-      "org.hibernate.type.descriptor.java.NClobTypeDescriptor",
-      "org.hibernate.type.NClobType",
-      "org.hibernate.type.MaterializedClobType",
-      "org.hibernate.type.MaterializedNClobType",
-      "org.hibernate.type.descriptor.java.SerializableTypeDescriptor",
-      "org.hibernate.type.descriptor.java.SerializableTypeDescriptor$SerializableMutabilityPlan",
-      "org.hibernate.type.SerializableType",
-      "org.hibernate.type.AbstractType",
-      "org.hibernate.type.AnyType",
-      "org.hibernate.type.ObjectType",
-      "org.hibernate.type.AdaptedImmutableType",
-      "org.hibernate.type.TypeFactory",
-      "org.hibernate.type.TypeFactory$TypeScopeImpl",
-      "org.hibernate.cfg.Configuration$ObjectNameNormalizerImpl",
-      "org.hibernate.cfg.Configuration$MetadataSourceQueue",
-      "org.hibernate.cfg.annotations.reflection.JPAMetadataProvider",
-      "org.hibernate.cfg.annotations.reflection.XMLContext",
-      "org.hibernate.annotations.common.util.impl.Log_$logger",
-      "org.hibernate.annotations.common.reflection.java.JavaReflectionManager",
-      "org.hibernate.annotations.common.util.StandardClassLoaderDelegateImpl",
-      "org.hibernate.internal.util.xml.DTDEntityResolver",
-      "org.hibernate.internal.util.xml.XMLHelper",
-      "org.hibernate.EmptyInterceptor",
-      "org.hibernate.internal.util.ConfigHelper",
-      "org.hibernate.internal.util.ClassLoaderHelper",
-      "org.hibernate.HibernateException",
-      "org.hibernate.internal.util.config.ConfigurationHelper",
-      "org.hibernate.bytecode.internal.javassist.BytecodeProviderImpl",
-      "org.hibernate.cfg.Environment",
-      "org.hibernate.tuple.entity.EntityTuplizerFactory",
-      "org.hibernate.EntityMode",
-      "org.hibernate.id.factory.internal.DefaultIdentifierGeneratorFactory",
-      "org.hibernate.cfg.EJB3NamingStrategy",
-      "org.hibernate.cfg.EJB3DTDEntityResolver",
-      "org.hibernate.internal.util.xml.ErrorLogger",
-      "org.dom4j.io.SAXReader",
-      "org.dom4j.io.SAXHelper",
-      "org.dom4j.DocumentFactory",
-      "org.dom4j.tree.AbstractNode",
-      "org.dom4j.tree.AbstractBranch",
-      "org.dom4j.tree.AbstractDocument",
-      "org.dom4j.tree.DefaultDocument",
-      "org.dom4j.tree.AbstractCharacterData",
-      "org.dom4j.tree.AbstractComment",
-      "org.dom4j.tree.FlyweightComment",
-      "org.dom4j.tree.DefaultComment",
-      "org.dom4j.tree.AbstractDocumentType",
-      "org.dom4j.tree.DefaultDocumentType",
-      "org.dom4j.tree.NamespaceCache",
-      "org.dom4j.tree.ConcurrentReaderHashMap",
-      "org.dom4j.tree.ConcurrentReaderHashMap$BarrierLock",
-      "org.dom4j.Namespace",
-      "org.dom4j.QName",
-      "org.dom4j.tree.AbstractElement",
-      "org.dom4j.tree.DefaultElement",
-      "org.dom4j.tree.AbstractAttribute",
-      "org.dom4j.tree.FlyweightAttribute",
-      "org.dom4j.tree.DefaultAttribute",
-      "org.dom4j.tree.AbstractText",
-      "org.dom4j.tree.FlyweightText",
-      "org.dom4j.tree.DefaultText",
-      "org.dom4j.tree.BackedList",
-      "org.hibernate.internal.util.xml.OriginImpl",
-      "org.hibernate.internal.util.xml.MappingReader",
-      "org.hibernate.internal.util.xml.XmlDocumentImpl",
-      "org.hibernate.boot.registry.StandardServiceRegistryBuilder",
-      "org.hibernate.boot.registry.selector.internal.StrategySelectorBuilder",
-      "org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl",
-      "org.hibernate.integrator.internal.IntegratorServiceImpl",
-      "org.hibernate.cfg.beanvalidation.BeanValidationIntegrator",
-      "org.hibernate.secure.spi.JaccIntegrator",
-      "org.hibernate.cache.internal.CollectionCacheInvalidator",
-      "org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl",
-      "org.hibernate.boot.registry.selector.internal.StrategySelectorImpl",
-      "org.hibernate.service.spi.ServiceBinding",
-      "org.hibernate.engine.config.internal.ConfigurationServiceInitiator",
-      "org.hibernate.tool.hbm2ddl.SingleLineSqlCommandExtractor",
-      "org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractorInitiator",
-      "org.hibernate.engine.jndi.internal.JndiServiceInitiator",
-      "org.hibernate.jmx.internal.JmxServiceInitiator",
-      "org.hibernate.persister.internal.PersisterClassResolverInitiator",
-      "org.hibernate.persister.internal.PersisterFactoryInitiator",
-      "org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator",
-      "org.hibernate.engine.jdbc.connections.internal.MultiTenantConnectionProviderInitiator",
-      "org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator",
-      "org.hibernate.engine.jdbc.dialect.internal.DialectFactoryInitiator",
-      "org.hibernate.engine.jdbc.batch.internal.BatchBuilderInitiator",
-      "org.hibernate.engine.jdbc.internal.JdbcServicesInitiator",
-      "org.hibernate.engine.jdbc.cursor.internal.RefCursorSupportInitiator",
-      "org.hibernate.id.factory.internal.MutableIdentifierGeneratorFactoryInitiator",
-      "org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformResolverInitiator",
-      "org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformInitiator",
-      "org.hibernate.engine.transaction.internal.TransactionFactoryInitiator",
-      "org.hibernate.service.internal.SessionFactoryServiceRegistryFactoryInitiator",
-      "org.hibernate.cache.internal.RegionFactoryInitiator",
-      "org.hibernate.service.StandardServiceInitiators",
-      "org.hibernate.service.ConfigLoader",
-      "org.hibernate.internal.util.ValueHolder",
-      "org.hibernate.secure.internal.DisabledJaccServiceImpl",
-      "org.hibernate.service.internal.AbstractServiceRegistryImpl",
-      "org.hibernate.service.internal.ConcurrentServiceBinding",
-      "org.hibernate.internal.util.collections.CollectionHelper",
-      "org.hibernate.engine.jdbc.internal.JdbcServicesImpl",
-      "org.hibernate.MultiTenancyStrategy",
-      "org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl",
-      "org.hibernate.engine.jndi.internal.JndiServiceImpl"
-    );
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomizationESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomizationESTest.java
deleted file mode 100644
index 2f0a1c85ae..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomizationESTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Feb 22 09:34:38 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import java.sql.Timestamp;
-import java.time.Instant;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.mock.java.time.MockInstant;
-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 AllottedResourceCustomizationESTest extends AllottedResourceCustomizationESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelVersion("T2<n67gDL");
-      String string0 = allottedResourceCustomization0.getModelVersion();
-      assertEquals("T2<n67gDL", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelUuid("/jt");
-      String string0 = allottedResourceCustomization0.getModelUuid();
-      assertEquals("/jt", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelName("Pf");
-      String string0 = allottedResourceCustomization0.getModelName();
-      assertEquals("Pf", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelInvariantUuid("");
-      String string0 = allottedResourceCustomization0.getModelInvariantUuid();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelInstanceName("modelName=null,modelVersion=null,version=null,modelUuid=null,modelInvariantUuid=null,modelCustomizationUuid=null,modelInstanceName=null,description=null,modelInstanceName=null,created=null");
-      String string0 = allottedResourceCustomization0.getModelInstanceName();
-      assertEquals("modelName=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 test05()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelCustomizationUuid("(;CXN3pGApF720T|Z");
-      String string0 = allottedResourceCustomization0.getModelCustomizationUuid();
-      assertEquals("(;CXN3pGApF720T|Z", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setDescription("Pf");
-      String string0 = allottedResourceCustomization0.getDescription();
-      assertEquals("Pf", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setDescription("");
-      String string0 = allottedResourceCustomization0.getDescription();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      Instant instant0 = MockInstant.now();
-      Timestamp timestamp0 = Timestamp.from(instant0);
-      allottedResourceCustomization0.setCreated(timestamp0);
-      Timestamp timestamp1 = allottedResourceCustomization0.getCreated();
-      assertEquals(320000000, timestamp1.getNanos());
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getModelUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.toString();
-      assertEquals("modelName=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 test11()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelUuid("");
-      String string0 = allottedResourceCustomization0.getModelUuid();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getModelCustomizationUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getModelVersion();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      Timestamp timestamp0 = new Timestamp(0L);
-      allottedResourceCustomization0.setCreated(timestamp0);
-      Timestamp timestamp1 = allottedResourceCustomization0.getCreated();
-      assertEquals(0, timestamp1.getNanos());
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getModelInstanceName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelVersion("");
-      String string0 = allottedResourceCustomization0.getModelVersion();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getDescription();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelName("");
-      String string0 = allottedResourceCustomization0.getModelName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelInstanceName("");
-      String string0 = allottedResourceCustomization0.getModelInstanceName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getModelName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getModelInvariantUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelInvariantUuid("JxwW-uj$dU[pMX`|;GM");
-      String string0 = allottedResourceCustomization0.getModelInvariantUuid();
-      assertEquals("JxwW-uj$dU[pMX`|;GM", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      Timestamp timestamp0 = allottedResourceCustomization0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelCustomizationUuid("");
-      String string0 = allottedResourceCustomization0.getModelCustomizationUuid();
-      assertEquals("", string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomizationESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomizationESTestscaffolding.java
deleted file mode 100644
index b1b8251957..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomizationESTestscaffolding.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Wed Feb 22 09:34:38 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 AllottedResourceCustomizationESTestscaffolding {
-
-  @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.db.catalog.beans.AllottedResourceCustomization";
-    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(AllottedResourceCustomizationESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization"
-    );
-  }
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatEnvironmentESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatEnvironmentESTest.java
deleted file mode 100644
index 4c3a257acf..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatEnvironmentESTest.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:13:39 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import java.sql.Timestamp;
-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 HeatEnvironmentESTest extends HeatEnvironmentESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setName("");
-      String string0 = heatEnvironment0.getName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setId(4618);
-      int int0 = heatEnvironment0.getId();
-      assertEquals(4618, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setId((-2248));
-      int int0 = heatEnvironment0.getId();
-      assertEquals((-2248), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setEnvironment("=?");
-      String string0 = heatEnvironment0.getEnvironment();
-      assertEquals("=?", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setEnvironment("");
-      String string0 = heatEnvironment0.getEnvironment();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setDescription("&G");
-      String string0 = heatEnvironment0.getDescription();
-      assertEquals("&G", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setDescription("");
-      String string0 = heatEnvironment0.getDescription();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      Timestamp timestamp0 = new Timestamp((long) 0);
-      heatEnvironment0.setCreated(timestamp0);
-      Timestamp timestamp1 = heatEnvironment0.getCreated();
-      assertSame(timestamp1, timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setAsdcUuid("L5UX?<T)6#pS4l");
-      String string0 = heatEnvironment0.getAsdcUuid();
-      assertEquals("L5UX?<T)6#pS4l", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setAsdcUuid("");
-      String string0 = heatEnvironment0.getAsdcUuid();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setAsdcResourceName("?zKdIbs8Xk_.4!");
-      String string0 = heatEnvironment0.getAsdcResourceName();
-      assertEquals("?zKdIbs8Xk_.4!", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setAsdcResourceName("");
-      String string0 = heatEnvironment0.getAsdcResourceName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setAsdcLabel(".");
-      String string0 = heatEnvironment0.getAsdcLabel();
-      assertEquals(".", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setAsdcLabel("");
-      String string0 = heatEnvironment0.getAsdcLabel();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      Timestamp timestamp0 = new Timestamp((long) 0);
-      heatEnvironment0.setCreated(timestamp0);
-      String string0 = heatEnvironment0.toString();
-      assertEquals("ID=0, name=null, version=null, description=null, environment=null, asdcUuid=null, asdcResourceName=null,created=1/1/70 12:00 AM", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setAsdcResourceName("?zKdIbs8Xk_.4!");
-      String string0 = heatEnvironment0.toString();
-      assertEquals("ID=0, name=null, version=null, description=null, environment=null, asdcUuid=null, asdcResourceName=?zKdIbs8Xk_.4!", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setAsdcUuid("");
-      String string0 = heatEnvironment0.toString();
-      assertEquals("ID=0, name=null, version=null, description=null, environment=null, asdcUuid=, asdcResourceName=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setDescription("?zKdIbs8Xk_.4!");
-      String string0 = heatEnvironment0.toString();
-      assertEquals("ID=0, name=null, version=null, description=?zKdIbs8Xk_.4!, environment=null, asdcUuid=null, asdcResourceName=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setName("}");
-      String string0 = heatEnvironment0.getName();
-      assertEquals("}", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      String string0 = heatEnvironment0.getAsdcUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      String string0 = heatEnvironment0.getEnvironment();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      int int0 = heatEnvironment0.getId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      Timestamp timestamp0 = new Timestamp(356L);
-      heatEnvironment0.setCreated(timestamp0);
-      Timestamp timestamp1 = heatEnvironment0.getCreated();
-      assertSame(timestamp1, timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      String string0 = heatEnvironment0.getAsdcResourceName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      String string0 = heatEnvironment0.getName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      heatEnvironment0.setEnvironment("");
-      String string0 = heatEnvironment0.toString();
-      assertEquals("ID=0, name=null, version=null, description=null, environment=, asdcUuid=null, asdcResourceName=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test26()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      Timestamp timestamp0 = heatEnvironment0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test27()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      String string0 = heatEnvironment0.getAsdcLabel();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test28()  throws Throwable  {
-      HeatEnvironment heatEnvironment0 = new HeatEnvironment();
-      String string0 = heatEnvironment0.getDescription();
-      assertNull(string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatEnvironmentESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatEnvironmentESTestscaffolding.java
deleted file mode 100644
index 2a67441402..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatEnvironmentESTestscaffolding.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:13:39 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 HeatEnvironmentESTestscaffolding {
-
-  @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.db.catalog.beans.HeatEnvironment"; 
-    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(HeatEnvironmentESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.db.catalog.beans.HeatEnvironment"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatFilesESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatFilesESTest.java
deleted file mode 100644
index ceb7f3b57c..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatFilesESTest.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:17:06 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import java.sql.Timestamp;
-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 HeatFilesESTest extends HeatFilesESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setVnfResourceId(1);
-      int int0 = heatFiles0.getVnfResourceId();
-      assertEquals(1, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setVnfResourceId((-1));
-      int int0 = heatFiles0.getVnfResourceId();
-      assertEquals((-1), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setId(1401);
-      int int0 = heatFiles0.getId();
-      assertEquals(1401, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setId((-356));
-      int int0 = heatFiles0.getId();
-      assertEquals((-356), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setFileName("~%Ab#a%tf");
-      String string0 = heatFiles0.getFileName();
-      assertEquals("~%Ab#a%tf", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setFileName("");
-      String string0 = heatFiles0.getFileName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setFileBody("M9]V'AWK/44+BD");
-      String string0 = heatFiles0.getFileBody();
-      assertEquals("M9]V'AWK/44+BD", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setFileBody("");
-      String string0 = heatFiles0.getFileBody();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setDescription("~%Ab#a%tf");
-      String string0 = heatFiles0.getDescription();
-      assertEquals("~%Ab#a%tf", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setDescription("");
-      String string0 = heatFiles0.getDescription();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      Timestamp timestamp0 = new Timestamp(0L);
-      heatFiles0.setCreated(timestamp0);
-      Timestamp timestamp1 = heatFiles0.getCreated();
-      assertEquals("1970-01-01 00:00:00.0", timestamp1.toString());
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcUuid("g$ vwC-q.`GT#b[<C");
-      String string0 = heatFiles0.getAsdcUuid();
-      assertEquals("g$ vwC-q.`GT#b[<C", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcUuid("");
-      String string0 = heatFiles0.getAsdcUuid();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcResourceName("");
-      String string0 = heatFiles0.getAsdcResourceName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcLabel("ID=0, description=null, fileName=null, fileBody=null, asdcResourceName=null, vnfResourceId=0");
-      String string0 = heatFiles0.getAsdcLabel();
-      assertEquals("ID=0, description=null, fileName=null, fileBody=null, asdcResourceName=null, vnfResourceId=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      Timestamp timestamp0 = new Timestamp(0L);
-      heatFiles0.setCreated(timestamp0);
-      String string0 = heatFiles0.toString();
-      assertEquals("ID=0, description=null, fileName=null, fileBody=null, asdcResourceName=null,created=1/1/70 12:00 AM, vnfResourceId=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcResourceName("ID=0, description=null, fileName=null, fileBody=null, asdcResourceName=null, vnfResourceId=0");
-      String string0 = heatFiles0.toString();
-      assertEquals("ID=0, description=null, fileName=null, fileBody=null,asdcResourceName=ID=0, description=null, fileName=null, fileBody=null, asdcResourceName=null, vnfResourceId=0, vnfResourceId=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setDescription(".");
-      String string0 = heatFiles0.toString();
-      assertEquals("ID=0, description=., fileName=null, fileBody=null, asdcResourceName=null, vnfResourceId=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcResourceName("+^hG");
-      String string0 = heatFiles0.getAsdcResourceName();
-      assertEquals("+^hG", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setFileName("");
-      String string0 = heatFiles0.toString();
-      assertEquals("ID=0, description=null,fileName=, fileBody=null, asdcResourceName=null, vnfResourceId=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      int int0 = heatFiles0.getVnfResourceId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      Timestamp timestamp0 = heatFiles0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      String string0 = heatFiles0.getDescription();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      Timestamp timestamp0 = new Timestamp(2247L);
-      heatFiles0.setCreated(timestamp0);
-      Timestamp timestamp1 = heatFiles0.getCreated();
-      assertEquals(247000000, timestamp1.getNanos());
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setFileBody("");
-      String string0 = heatFiles0.toString();
-      assertEquals("ID=0, description=null, fileName=null,fileBody=, asdcResourceName=null, vnfResourceId=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      String string0 = heatFiles0.getAsdcLabel();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test26()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      String string0 = heatFiles0.getFileName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test27()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      int int0 = heatFiles0.getId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test28()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      String string0 = heatFiles0.getFileBody();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test29()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      String string0 = heatFiles0.getAsdcResourceName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test30()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      String string0 = heatFiles0.getAsdcUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test31()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcLabel("");
-      String string0 = heatFiles0.getAsdcLabel();
-      assertEquals("", string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatFilesESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatFilesESTestscaffolding.java
deleted file mode 100644
index 8fd20de9ce..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatFilesESTestscaffolding.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:17:06 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 HeatFilesESTestscaffolding {
-
-  @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.db.catalog.beans.HeatFiles"; 
-    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(HeatFilesESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.db.catalog.beans.HeatFiles"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplateESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplateESTest.java
deleted file mode 100644
index a741bb6896..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplateESTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:15:57 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 HeatNestedTemplateESTest extends HeatNestedTemplateESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      heatNestedTemplate0.setChildTemplateId(3403);
-      heatNestedTemplate0.hashCode();
-      assertEquals(3403, heatNestedTemplate0.getChildTemplateId());
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      heatNestedTemplate0.setParentTemplateId(1980);
-      HeatNestedTemplate heatNestedTemplate1 = new HeatNestedTemplate();
-      boolean boolean0 = heatNestedTemplate0.equals(heatNestedTemplate1);
-      assertEquals(1980, heatNestedTemplate0.getParentTemplateId());
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      HeatNestedTemplate heatNestedTemplate1 = new HeatNestedTemplate();
-      heatNestedTemplate0.setChildTemplateId((-2202));
-      boolean boolean0 = heatNestedTemplate1.equals(heatNestedTemplate0);
-      assertEquals(-2202, heatNestedTemplate0.getChildTemplateId());
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      boolean boolean0 = heatNestedTemplate0.equals(heatNestedTemplate0);
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      heatNestedTemplate0.setProviderResourceFile("org.openecomp.mso.db.catalog.beans.HeatNestedTemplate");
-      String string0 = heatNestedTemplate0.getProviderResourceFile();
-      assertEquals("org.openecomp.mso.db.catalog.beans.HeatNestedTemplate", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      heatNestedTemplate0.setProviderResourceFile("");
-      String string0 = heatNestedTemplate0.getProviderResourceFile();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      heatNestedTemplate0.setParentTemplateId(1173);
-      int int0 = heatNestedTemplate0.getParentTemplateId();
-      assertEquals(1173, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      heatNestedTemplate0.setParentTemplateId((-1085));
-      int int0 = heatNestedTemplate0.getParentTemplateId();
-      assertEquals((-1085), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      heatNestedTemplate0.setChildTemplateId(1307);
-      int int0 = heatNestedTemplate0.getChildTemplateId();
-      assertEquals(1307, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      heatNestedTemplate0.setChildTemplateId((-1857));
-      int int0 = heatNestedTemplate0.getChildTemplateId();
-      assertEquals((-1857), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      int int0 = heatNestedTemplate0.getParentTemplateId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      int int0 = heatNestedTemplate0.getChildTemplateId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      HeatNestedTemplate heatNestedTemplate1 = new HeatNestedTemplate();
-      heatNestedTemplate1.setChildTemplateId(231);
-      boolean boolean0 = heatNestedTemplate0.equals(heatNestedTemplate1);
-      assertEquals(231, heatNestedTemplate1.getChildTemplateId());
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      boolean boolean0 = heatNestedTemplate0.equals((Object) null);
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      String string0 = heatNestedTemplate0.toString();
-      assertEquals("ParentTemplateId=0, ChildTemplateId=0, providerResourceFile=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      heatNestedTemplate0.setProviderResourceFile("org.openecomp.mso.db.catalog.beans.HeatNestedTemplate");
-      String string0 = heatNestedTemplate0.toString();
-      assertEquals("ParentTemplateId=0, ChildTemplateId=0,providerResourceFile=org.openecomp.mso.db.catalog.beans.HeatNestedTemplate", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      String string0 = heatNestedTemplate0.getProviderResourceFile();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      HeatNestedTemplate heatNestedTemplate1 = new HeatNestedTemplate();
-      boolean boolean0 = heatNestedTemplate0.equals(heatNestedTemplate1);
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      heatNestedTemplate0.setParentTemplateId((-511));
-      HeatNestedTemplate heatNestedTemplate1 = new HeatNestedTemplate();
-      boolean boolean0 = heatNestedTemplate0.equals(heatNestedTemplate1);
-      assertEquals(-511, heatNestedTemplate0.getParentTemplateId());
-      assertFalse(boolean0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplateESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplateESTestscaffolding.java
deleted file mode 100644
index 31b4b0304c..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplateESTestscaffolding.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:15:57 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 HeatNestedTemplateESTestscaffolding {
-
-  @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.db.catalog.beans.HeatNestedTemplate"; 
-    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(HeatNestedTemplateESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.HeatNestedTemplate"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(HeatNestedTemplateESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.db.catalog.beans.HeatNestedTemplate"
-    );
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateESTest.java
deleted file mode 100644
index d20f64af9a..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateESTest.java
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:12:27 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.mock.java.time.MockLocalDateTime;
-import org.evosuite.runtime.testdata.EvoSuiteFile;
-import org.evosuite.runtime.testdata.FileSystemHandling;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class HeatTemplateESTest extends HeatTemplateESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setTimeoutMinutes(313);
-      int int0 = heatTemplate0.getTimeoutMinutes();
-      assertEquals(313, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setTimeoutMinutes((-1781));
-      int int0 = heatTemplate0.getTimeoutMinutes();
-      assertEquals((-1781), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setTemplatePath("9PO'c]OQ>6N |");
-      String string0 = heatTemplate0.getTemplatePath();
-      assertEquals("9PO'c]OQ>6N |", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setTemplateName("Template=null,version=null,path=null,body=(Not defined),timeout=0,asdcUuid=null,asdcResourceName=null,description=null");
-      String string0 = heatTemplate0.getTemplateName();
-      assertEquals("Template=null,version=null,path=null,body=(Not defined),timeout=0,asdcUuid=null,asdcResourceName=null,description=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setTemplateName("");
-      String string0 = heatTemplate0.getTemplateName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setTemplateBody("ParentTemplateId=");
-      String string0 = heatTemplate0.getTemplateBody();
-      assertEquals("ParentTemplateId=", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setTemplateBody("");
-      String string0 = heatTemplate0.getTemplateBody();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      LinkedHashSet<HeatTemplateParam> linkedHashSet0 = new LinkedHashSet<HeatTemplateParam>();
-      heatTemplate0.setParameters(linkedHashSet0);
-      Set<HeatTemplateParam> set0 = heatTemplate0.getParameters();
-      assertEquals(0, set0.size());
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      LinkedHashSet<HeatTemplateParam> linkedHashSet0 = new LinkedHashSet<HeatTemplateParam>();
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      linkedHashSet0.add(heatTemplateParam0);
-      heatTemplate0.setParameters(linkedHashSet0);
-      Set<HeatTemplateParam> set0 = heatTemplate0.getParameters();
-      assertFalse(set0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setId(118);
-      int int0 = heatTemplate0.getId();
-      assertEquals(118, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setId((-340));
-      int int0 = heatTemplate0.getId();
-      assertEquals((-340), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      LinkedHashSet<HeatNestedTemplate> linkedHashSet0 = new LinkedHashSet<HeatNestedTemplate>();
-      HeatNestedTemplate heatNestedTemplate0 = new HeatNestedTemplate();
-      linkedHashSet0.add(heatNestedTemplate0);
-      heatTemplate0.setFiles(linkedHashSet0);
-      Set<HeatNestedTemplate> set0 = heatTemplate0.getFiles();
-      assertFalse(set0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setDescription("PARENT_COMPLETE");
-      String string0 = heatTemplate0.getDescription();
-      assertEquals("PARENT_COMPLETE", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setDescription("");
-      String string0 = heatTemplate0.getDescription();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      LocalDateTime localDateTime0 = MockLocalDateTime.now();
-      Timestamp timestamp0 = Timestamp.valueOf(localDateTime0);
-      heatTemplate0.setCreated(timestamp0);
-      Timestamp timestamp1 = heatTemplate0.getCreated();
-      assertSame(timestamp1, timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setAsdcUuid("msg");
-      String string0 = heatTemplate0.getAsdcUuid();
-      assertEquals("msg", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setAsdcResourceName("!IMW$RE2UtEWIEeJc5");
-      String string0 = heatTemplate0.getAsdcResourceName();
-      assertEquals("!IMW$RE2UtEWIEeJc5", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setAsdcLabel("<JH|c2");
-      String string0 = heatTemplate0.getAsdcLabel();
-      assertEquals("<JH|c2", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setAsdcLabel("");
-      String string0 = heatTemplate0.getAsdcLabel();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      LinkedHashSet<HeatTemplateParam> linkedHashSet0 = new LinkedHashSet<HeatTemplateParam>();
-      linkedHashSet0.add((HeatTemplateParam) null);
-      heatTemplate0.setParameters(linkedHashSet0);
-      // Undeclared exception!
-      try { 
-        heatTemplate0.toString();
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.beans.HeatTemplate", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      LinkedHashSet<HeatTemplateParam> linkedHashSet0 = new LinkedHashSet<HeatTemplateParam>();
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setRequired(true);
-      linkedHashSet0.add(heatTemplateParam0);
-      heatTemplate0.setParameters(linkedHashSet0);
-      String string0 = heatTemplate0.toString();
-      assertEquals("Template=null,version=null,path=null,body=(Not defined),timeout=0,asdcUuid=null,asdcResourceName=null,description=null,params=[null(reqd)]", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      LinkedHashSet<HeatTemplateParam> linkedHashSet0 = new LinkedHashSet<HeatTemplateParam>();
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      linkedHashSet0.add(heatTemplateParam0);
-      heatTemplate0.setParameters(linkedHashSet0);
-      String string0 = heatTemplate0.toString();
-      assertEquals("Template=null,version=null,path=null,body=(Not defined),timeout=0,asdcUuid=null,asdcResourceName=null,description=null,params=[null]", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      LocalDateTime localDateTime0 = MockLocalDateTime.now();
-      Timestamp timestamp0 = Timestamp.valueOf(localDateTime0);
-      heatTemplate0.setCreated(timestamp0);
-      String string0 = heatTemplate0.toString();
-      assertEquals("Template=null,version=null,path=null,body=(Not defined),timeout=0,asdcUuid=null,asdcResourceName=null,description=null,created=2/14/14 8:21 PM", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setTemplateBody("]");
-      String string0 = heatTemplate0.toString();
-      assertEquals("Template=null,version=null,path=null,body=(1 chars),timeout=0,asdcUuid=null,asdcResourceName=null,description=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test27()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setTemplateBody("]");
-      String string0 = heatTemplate0.getHeatTemplate();
-      assertEquals("]", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test28()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      String string0 = heatTemplate0.getAsdcLabel();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test29()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      String string0 = heatTemplate0.getTemplatePath();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test30()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      Set<HeatNestedTemplate> set0 = heatTemplate0.getFiles();
-      assertNull(set0);
-  }
-
-  @Test(timeout = 4000)
-  public void test31()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setTemplateBody("");
-      String string0 = heatTemplate0.getHeatTemplate();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test32()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      Timestamp timestamp0 = heatTemplate0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test33()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      Set<HeatTemplateParam> set0 = heatTemplate0.getParameters();
-      assertNull(set0);
-  }
-
-  @Test(timeout = 4000)
-  public void test34()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      String string0 = heatTemplate0.getDescription();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test35()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setAsdcResourceName("");
-      String string0 = heatTemplate0.getAsdcResourceName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test36()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      String string0 = heatTemplate0.getAsdcUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test37()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      LinkedHashSet<HeatNestedTemplate> linkedHashSet0 = new LinkedHashSet<HeatNestedTemplate>();
-      heatTemplate0.setFiles(linkedHashSet0);
-      Set<HeatNestedTemplate> set0 = heatTemplate0.getFiles();
-      assertTrue(set0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test38()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      LinkedHashSet<HeatTemplateParam> linkedHashSet0 = new LinkedHashSet<HeatTemplateParam>();
-      heatTemplate0.setParameters(linkedHashSet0);
-      String string0 = heatTemplate0.toString();
-      assertEquals("Template=null,version=null,path=null,body=(Not defined),timeout=0,asdcUuid=null,asdcResourceName=null,description=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test39()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setTemplatePath("");
-      String string0 = heatTemplate0.getTemplatePath();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test40()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      Timestamp timestamp0 = new Timestamp(0L);
-      heatTemplate0.setCreated(timestamp0);
-      Timestamp timestamp1 = heatTemplate0.getCreated();
-      assertSame(timestamp1, timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test41()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      String string0 = heatTemplate0.getAsdcResourceName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test42()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      int int0 = heatTemplate0.getId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test43()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      String string0 = heatTemplate0.getTemplateName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test44()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      String string0 = heatTemplate0.getTemplateBody();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test45()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      int int0 = heatTemplate0.getTimeoutMinutes();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test46()  throws Throwable  {
-      HeatTemplate heatTemplate0 = new HeatTemplate();
-      heatTemplate0.setAsdcUuid("");
-      String string0 = heatTemplate0.getAsdcUuid();
-      assertEquals("", string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateESTestscaffolding.java
deleted file mode 100644
index 538852c3b0..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateESTestscaffolding.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:12:27 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 HeatTemplateESTestscaffolding {
-
-  @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.db.catalog.beans.HeatTemplate"; 
-    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(HeatTemplateESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.logger.MsoLogger",
-      "org.openecomp.mso.logger.MessageEnum",
-      "com.att.eelf.i18n.EELFResolvableErrorEnum",
-      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.entity.MsoRequest",
-      "org.openecomp.mso.logger.MsoLogger$StatusCode",
-      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
-      "com.att.eelf.configuration.EELFManager",
-      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
-      "com.att.eelf.configuration.EELFLogger",
-      "com.att.eelf.i18n.EELFMsgs",
-      "com.att.eelf.configuration.EELFLogger$Level",
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.openecomp.mso.db.catalog.beans.HeatTemplate",
-      "org.openecomp.mso.db.catalog.beans.HeatTemplateParam",
-      "org.openecomp.mso.db.catalog.beans.HeatNestedTemplate",
-      "com.att.eelf.configuration.SLF4jWrapper",
-      "com.att.eelf.i18n.EELFResourceManager$1",
-      "com.att.eelf.i18n.EELFResourceManager"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(HeatTemplateESTestscaffolding.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.db.catalog.beans.HeatTemplate",
-      "org.openecomp.mso.db.catalog.beans.HeatNestedTemplate"
-    );
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParamESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParamESTest.java
deleted file mode 100644
index f084204170..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParamESTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:22:57 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 HeatTemplateParamESTest extends HeatTemplateParamESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setRequired(true);
-      boolean boolean0 = heatTemplateParam0.isRequired();
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setParamType("");
-      String string0 = heatTemplateParam0.getParamType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setParamName("c_(T_3dD%");
-      String string0 = heatTemplateParam0.getParamName();
-      assertEquals("c_(T_3dD%", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setParamName("");
-      String string0 = heatTemplateParam0.getParamName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setParamAlias("Param=c_(T_3dD%,type=null,required=false,paramAlias=null");
-      String string0 = heatTemplateParam0.getParamAlias();
-      assertEquals("Param=c_(T_3dD%,type=null,required=false,paramAlias=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setParamAlias("");
-      String string0 = heatTemplateParam0.getParamAlias();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setId(10);
-      int int0 = heatTemplateParam0.getId();
-      assertEquals(10, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setId((-5343));
-      int int0 = heatTemplateParam0.getId();
-      assertEquals((-5343), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setHeatTemplateId(10);
-      int int0 = heatTemplateParam0.getHeatTemplateId();
-      assertEquals(10, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      String string0 = heatTemplateParam0.toString();
-      assertEquals("Param=null,type=null,required=false,paramAlias=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      int int0 = heatTemplateParam0.getHeatTemplateId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      String string0 = heatTemplateParam0.getParamType();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      String string0 = heatTemplateParam0.getParamAlias();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      boolean boolean0 = heatTemplateParam0.isRequired();
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setHeatTemplateId((-1));
-      int int0 = heatTemplateParam0.getHeatTemplateId();
-      assertEquals((-1), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      int int0 = heatTemplateParam0.getId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      String string0 = heatTemplateParam0.getParamName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setParamType("(pA6");
-      String string0 = heatTemplateParam0.getParamType();
-      assertEquals("(pA6", string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParamESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParamESTestscaffolding.java
deleted file mode 100644
index 1fbef16290..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParamESTestscaffolding.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:22:57 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 HeatTemplateParamESTestscaffolding {
-
-  @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.db.catalog.beans.HeatTemplateParam"; 
-    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(HeatTemplateParamESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.HeatTemplateParam"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ModelESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ModelESTest.java
deleted file mode 100644
index 545d689378..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ModelESTest.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Feb 22 09:32:26 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import java.sql.Timestamp;
-import java.util.HashMap;
-import java.util.Map;
-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 ModelESTest extends ModelESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      Model model0 = new Model();
-      HashMap<String, ServiceRecipe> hashMap0 = new HashMap<String, ServiceRecipe>();
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      hashMap0.putIfAbsent("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", serviceRecipe0);
-      model0.setRecipes(hashMap0);
-      Map<String, ServiceRecipe> map0 = model0.getRecipes();
-      assertEquals(1, map0.size());
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelVersionId("9WI;kp?]");
-      String string0 = model0.getModelVersionId();
-      assertEquals("9WI;kp?]", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelVersion("_Y+vZ)59ie");
-      String string0 = model0.getModelVersion();
-      assertEquals("_Y+vZ)59ie", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelType("{!]r;T");
-      String string0 = model0.getModelType();
-      assertEquals("{!]r;T", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelName(", description=");
-      String string0 = model0.getModelName();
-      assertEquals(", description=", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelInvariantId(".m");
-      String string0 = model0.getModelInvariantId();
-      assertEquals(".m", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelCustomizationName("|<HBAfp\"RZv\"?mz&H");
-      String string0 = model0.getModelCustomizationName();
-      assertEquals("|<HBAfp\"RZv\"?mz&H", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelCustomizationId("RA");
-      String string0 = model0.getModelCustomizationId();
-      assertEquals("RA", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelCustomizationId("");
-      String string0 = model0.getModelCustomizationId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setId((-2490));
-      int int0 = model0.getId();
-      assertEquals((-2490), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      Model model0 = new Model();
-      Timestamp timestamp0 = new Timestamp(0L);
-      model0.setCreated(timestamp0);
-      Timestamp timestamp1 = model0.getCreated();
-      assertSame(timestamp1, timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      Model model0 = new Model();
-      Timestamp timestamp0 = new Timestamp(1L);
-      model0.setCreated(timestamp0);
-      Timestamp timestamp1 = model0.getCreated();
-      assertSame(timestamp1, timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      Model model0 = new Model();
-      String string0 = model0.toString();
-      assertEquals("Model: modelCustomizationId=null,modelCustomizationName=null,modelInvariantId=null,modelName=null,modelType=null,modelVersion=null,modelVersionId=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelType("");
-      String string0 = model0.getModelType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      Model model0 = new Model();
-      String string0 = model0.getModelInvariantId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      Model model0 = new Model();
-      Map<String, ServiceRecipe> map0 = model0.getRecipes();
-      assertNull(map0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      Model model0 = new Model();
-      String string0 = model0.getModelCustomizationName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelVersion("");
-      String string0 = model0.getModelVersion();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelVersionId("");
-      String string0 = model0.getModelVersionId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      Model model0 = new Model();
-      String string0 = model0.getModelType();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelInvariantId("");
-      String string0 = model0.getModelInvariantId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelName("");
-      String string0 = model0.getModelName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setModelCustomizationName("");
-      String string0 = model0.getModelCustomizationName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      Model model0 = new Model();
-      Timestamp timestamp0 = new Timestamp(0L);
-      model0.setCreated(timestamp0);
-      String string0 = model0.toString();
-      assertEquals("Model: modelCustomizationId=null,modelCustomizationName=null,modelInvariantId=null,modelName=null,modelType=null,modelVersion=null,modelVersionId=null,created=1/1/70 12:00 AM", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      Model model0 = new Model();
-      int int0 = model0.getId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      Model model0 = new Model();
-      HashMap<String, ServiceRecipe> hashMap0 = new HashMap<String, ServiceRecipe>();
-      model0.setRecipes(hashMap0);
-      Map<String, ServiceRecipe> map0 = model0.getRecipes();
-      assertTrue(map0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test26()  throws Throwable  {
-      Model model0 = new Model();
-      String string0 = model0.getModelVersionId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test27()  throws Throwable  {
-      Model model0 = new Model();
-      String string0 = model0.getModelCustomizationId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test28()  throws Throwable  {
-      Model model0 = new Model();
-      String string0 = model0.getModelVersion();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test29()  throws Throwable  {
-      Model model0 = new Model();
-      Timestamp timestamp0 = model0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test30()  throws Throwable  {
-      Model model0 = new Model();
-      String string0 = model0.getModelName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test31()  throws Throwable  {
-      Model model0 = new Model();
-      model0.setId(2803);
-      int int0 = model0.getId();
-      assertEquals(2803, int0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ModelESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ModelESTestscaffolding.java
deleted file mode 100644
index d9576e0681..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ModelESTestscaffolding.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Wed Feb 22 09:32:26 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 ModelESTestscaffolding {
-
-  @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.db.catalog.beans.Model";
-    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(ModelESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.logger.MessageEnum",
-      "com.att.eelf.i18n.EELFResolvableErrorEnum",
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.openecomp.mso.logger.MsoLogger$StatusCode",
-      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.db.catalog.beans.Model",
-      "com.att.eelf.configuration.EELFManager",
-      "com.att.eelf.configuration.EELFLogger",
-      "com.att.eelf.i18n.EELFMsgs",
-      "org.openecomp.mso.entity.MsoRequest",
-      "com.att.eelf.configuration.EELFLogger$Level",
-      "org.openecomp.mso.db.catalog.beans.ServiceRecipe",
-      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
-      "com.att.eelf.configuration.SLF4jWrapper",
-      "com.att.eelf.i18n.EELFResourceManager",
-      "org.openecomp.mso.logger.MsoLogger",
-      "org.openecomp.mso.logger.MsoLogger$ErrorCode"
-    );
-  }
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(ModelESTestscaffolding.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.db.catalog.beans.ServiceRecipe"
-    );
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ModelRecipeESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ModelRecipeESTest.java
deleted file mode 100644
index d148e94246..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ModelRecipeESTest.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Feb 22 09:32:08 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-import java.sql.Timestamp;
-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 ModelRecipeESTest extends ModelRecipeESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      modelRecipe0.setSchemaVersion("594t4m7A7,kaNK");
-      String string0 = modelRecipe0.getSchemaVersion();
-      assertEquals("594t4m7A7,kaNK", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Integer integer0 = new Integer(0);
-      modelRecipe0.setRecipeTimeout(integer0);
-      Integer integer1 = modelRecipe0.getRecipeTimeout();
-      assertEquals(0, (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Integer integer0 = new Integer(1303);
-      modelRecipe0.setRecipeTimeout(integer0);
-      Integer integer1 = modelRecipe0.getRecipeTimeout();
-      assertEquals(1303, (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Integer integer0 = new Integer((-8));
-      modelRecipe0.setRecipeTimeout(integer0);
-      Integer integer1 = modelRecipe0.getRecipeTimeout();
-      assertEquals((-8), (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      modelRecipe0.setOrchestrationUri("+");
-      String string0 = modelRecipe0.getOrchestrationUri();
-      assertEquals("+", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      modelRecipe0.setModelParamXSD("");
-      String string0 = modelRecipe0.getModelParamXSD();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Integer integer0 = new Integer(1);
-      modelRecipe0.setModelId(integer0);
-      Integer integer1 = modelRecipe0.getModelId();
-      assertEquals(1, (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Integer integer0 = new Integer((-8));
-      modelRecipe0.setModelId(integer0);
-      Integer integer1 = modelRecipe0.getModelId();
-      assertEquals((-8), (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      modelRecipe0.setId(2372);
-      int int0 = modelRecipe0.getId();
-      assertEquals(2372, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      modelRecipe0.setId((-438));
-      int int0 = modelRecipe0.getId();
-      assertEquals((-438), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      modelRecipe0.setDescription("D|`<b3b");
-      String string0 = modelRecipe0.getDescription();
-      assertEquals("D|`<b3b", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Timestamp timestamp0 = new Timestamp(0L);
-      modelRecipe0.setCreated(timestamp0);
-      Timestamp timestamp1 = modelRecipe0.getCreated();
-      assertSame(timestamp1, timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Timestamp timestamp0 = new Timestamp(619L);
-      modelRecipe0.setCreated(timestamp0);
-      Timestamp timestamp1 = modelRecipe0.getCreated();
-      assertEquals("1970-01-01 00:00:00.619", timestamp1.toString());
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      modelRecipe0.setAction("hz4FY");
-      String string0 = modelRecipe0.getAction();
-      assertEquals("hz4FY", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      modelRecipe0.setAction("");
-      String string0 = modelRecipe0.getAction();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      // Undeclared exception!
-      try {
-        modelRecipe0.toString();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.beans.ModelRecipe", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Integer integer0 = new Integer(7);
-      modelRecipe0.setRecipeTimeout(integer0);
-      modelRecipe0.setModelId(integer0);
-      String string0 = modelRecipe0.toString();
-      assertEquals("ModelRecipe: modelId=7,action=null,schemaVersion=null,orchestrationUri=null,modelParamXSD=null,recipeTimeout=7", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Integer integer0 = modelRecipe0.getModelId();
-      assertNull(integer0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Integer integer0 = new Integer(0);
-      modelRecipe0.setRecipeTimeout(integer0);
-      modelRecipe0.setModelId(integer0);
-      Timestamp timestamp0 = new Timestamp((long) 0);
-      modelRecipe0.setCreated(timestamp0);
-      String string0 = modelRecipe0.toString();
-      assertEquals("ModelRecipe: modelId=0,action=null,schemaVersion=null,orchestrationUri=null,modelParamXSD=null,recipeTimeout=0,created=1/1/70 12:00 AM", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      String string0 = modelRecipe0.getAction();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      modelRecipe0.setDescription("");
-      String string0 = modelRecipe0.getDescription();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      modelRecipe0.setModelParamXSD("nb[xSaP");
-      String string0 = modelRecipe0.getModelParamXSD();
-      assertEquals("nb[xSaP", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      modelRecipe0.setSchemaVersion("");
-      String string0 = modelRecipe0.getSchemaVersion();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Integer integer0 = new Integer(0);
-      modelRecipe0.setModelId(integer0);
-      Integer integer1 = modelRecipe0.getModelId();
-      assertEquals(0, (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      int int0 = modelRecipe0.getId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      String string0 = modelRecipe0.getDescription();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test26()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      String string0 = modelRecipe0.getSchemaVersion();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test27()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Integer integer0 = modelRecipe0.getRecipeTimeout();
-      assertNull(integer0);
-  }
-
-  @Test(timeout = 4000)
-  public void test28()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      String string0 = modelRecipe0.getOrchestrationUri();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test29()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      Timestamp timestamp0 = modelRecipe0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test30()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      modelRecipe0.setOrchestrationUri("");
-      String string0 = modelRecipe0.getOrchestrationUri();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test31()  throws Throwable  {
-      ModelRecipe modelRecipe0 = new ModelRecipe();
-      String string0 = modelRecipe0.getModelParamXSD();
-      assertNull(string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ModelRecipeESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ModelRecipeESTestscaffolding.java
deleted file mode 100644
index 710e5372f6..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ModelRecipeESTestscaffolding.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Wed Feb 22 09:32:08 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 ModelRecipeESTestscaffolding {
-
-  @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.db.catalog.beans.ModelRecipe";
-    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(ModelRecipeESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.db.catalog.beans.ModelRecipe"
-    );
-  }
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/NetworkRecipeESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/NetworkRecipeESTest.java
deleted file mode 100644
index 4d7d131b00..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/NetworkRecipeESTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:22:12 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 NetworkRecipeESTest extends NetworkRecipeESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      NetworkRecipe networkRecipe0 = new NetworkRecipe();
-      networkRecipe0.setOrchestrationUri("");
-      String string0 = networkRecipe0.toString();
-      assertEquals("RECIPE: null,uri=,networkType=null,networkParamXSD=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      NetworkRecipe networkRecipe0 = new NetworkRecipe();
-      networkRecipe0.setAction("WL:?f53^x");
-      String string0 = networkRecipe0.toString();
-      assertEquals("RECIPE: WL:?f53^x,uri=null,networkType=null,networkParamXSD=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      NetworkRecipe networkRecipe0 = new NetworkRecipe();
-      networkRecipe0.setNetworkType("RECIPE: ");
-      String string0 = networkRecipe0.getNetworkType();
-      assertEquals("RECIPE: ", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test3()  throws Throwable  {
-      NetworkRecipe networkRecipe0 = new NetworkRecipe();
-      networkRecipe0.setNetworkParamXSD("!R\"am4?r!");
-      String string0 = networkRecipe0.getNetworkParamXSD();
-      assertEquals("!R\"am4?r!", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test4()  throws Throwable  {
-      NetworkRecipe networkRecipe0 = new NetworkRecipe();
-      String string0 = networkRecipe0.getNetworkParamXSD();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test5()  throws Throwable  {
-      NetworkRecipe networkRecipe0 = new NetworkRecipe();
-      networkRecipe0.setNetworkType("");
-      String string0 = networkRecipe0.getNetworkType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test6()  throws Throwable  {
-      NetworkRecipe networkRecipe0 = new NetworkRecipe();
-      networkRecipe0.setNetworkParamXSD("");
-      String string0 = networkRecipe0.getNetworkParamXSD();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test7()  throws Throwable  {
-      NetworkRecipe networkRecipe0 = new NetworkRecipe();
-      String string0 = networkRecipe0.getNetworkType();
-      assertNull(string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/NetworkRecipeESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/NetworkRecipeESTestscaffolding.java
deleted file mode 100644
index 04184f50e2..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/NetworkRecipeESTestscaffolding.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:22:12 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 NetworkRecipeESTestscaffolding {
-
-  @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.db.catalog.beans.NetworkRecipe"; 
-    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(NetworkRecipeESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.NetworkRecipe",
-      "org.openecomp.mso.db.catalog.beans.Recipe",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/NetworkResourceESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/NetworkResourceESTest.java
deleted file mode 100644
index 71520bb983..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/NetworkResourceESTest.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:21:59 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.shaded.org.mockito.Mockito.*;
-
-import java.sql.Timestamp;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class NetworkResourceESTest extends NetworkResourceESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setTemplateId((-835));
-      int int0 = networkResource0.getTemplateId();
-      assertEquals((-835), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setOrchestrationMode("V");
-      String string0 = networkResource0.getOrchestrationMode();
-      assertEquals("V", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setOrchestrationMode("");
-      String string0 = networkResource0.getOrchestrationMode();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setNeutronNetworkType(",aicVersionMin=");
-      String string0 = networkResource0.getNeutronNetworkType();
-      assertEquals(",aicVersionMin=", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setNeutronNetworkType("");
-      String string0 = networkResource0.getNeutronNetworkType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setNetworkType("zOD2");
-      String string0 = networkResource0.getNetworkType();
-      assertEquals("zOD2", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setId(1);
-      int int0 = networkResource0.getId();
-      assertEquals(1, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setId((-6321));
-      int int0 = networkResource0.getId();
-      assertEquals((-6321), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setDescription("NETWORK=null,version=null,mode=null,template=0,neutronType=null,aicVersionMin=VO>5~X,aicVersionMax=VO>5~Xid=0");
-      String string0 = networkResource0.getDescription();
-      assertEquals("NETWORK=null,version=null,mode=null,template=0,neutronType=null,aicVersionMin=VO>5~X,aicVersionMax=VO>5~Xid=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setAicVersionMin("");
-      String string0 = networkResource0.getAicVersionMin();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setAicVersionMax("E{6!_C$30Kby>]gllF");
-      String string0 = networkResource0.getAicVersionMax();
-      assertEquals("E{6!_C$30Kby>]gllF", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setAicVersionMax("");
-      String string0 = networkResource0.getAicVersionMax();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      Timestamp timestamp0 = mock(Timestamp.class, new ViolatedAssumptionAnswer());
-      doReturn(1L).when(timestamp0).getTime();
-      networkResource0.setCreated(timestamp0);
-      String string0 = networkResource0.toString();
-      assertEquals("NETWORK=null,version=null,mode=null,template=0,neutronType=null,aicVersionMin=null,aicVersionMax=nullid=0,created=1/1/70 12:00 AM", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      String string0 = networkResource0.toString();
-      assertEquals("NETWORK=null,version=null,mode=null,template=0,neutronType=null,aicVersionMin=null,aicVersionMax=nullid=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      String string0 = networkResource0.getDescription();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setAicVersionMin("VO>5~X");
-      String string0 = networkResource0.getAicVersionMin();
-      assertEquals("VO>5~X", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      String string0 = networkResource0.getNeutronNetworkType();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      String string0 = networkResource0.getOrchestrationMode();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      String string0 = networkResource0.getAicVersionMax();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      String string0 = networkResource0.getAicVersionMin();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      int int0 = networkResource0.getTemplateId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setDescription("");
-      String string0 = networkResource0.getDescription();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      String string0 = networkResource0.getNetworkType();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      Timestamp timestamp0 = networkResource0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      int int0 = networkResource0.getId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setNetworkType("");
-      String string0 = networkResource0.getNetworkType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test26()  throws Throwable  {
-      NetworkResource networkResource0 = new NetworkResource();
-      networkResource0.setTemplateId(2085);
-      int int0 = networkResource0.getTemplateId();
-      assertEquals(2085, int0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/NetworkResourceESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/NetworkResourceESTestscaffolding.java
deleted file mode 100644
index fdef26efcb..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/NetworkResourceESTestscaffolding.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:21:59 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 NetworkResourceESTestscaffolding {
-
-  @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.db.catalog.beans.NetworkResource"; 
-    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(NetworkResourceESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.NetworkResource",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/RecipeESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/RecipeESTest.java
deleted file mode 100644
index 03ad09cda5..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/RecipeESTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:21:28 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.shaded.org.mockito.Mockito.*;
-
-import java.sql.Timestamp;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class RecipeESTest extends RecipeESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.setOrchestrationUri("");
-      String string0 = recipe0.toString();
-      assertEquals("RECIPE: null,uri=", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.setServiceType("s5s< CkZ9K:R0~ ;");
-      String string0 = recipe0.getServiceType();
-      assertEquals("s5s< CkZ9K:R0~ ;", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.setServiceType("");
-      String string0 = recipe0.getServiceType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.setRecipeTimeout((-639));
-      int int0 = recipe0.getRecipeTimeout();
-      assertEquals((-639), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.orchestrationUri = ".";
-      String string0 = recipe0.getOrchestrationUri();
-      assertEquals(".", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.setOrchestrationUri("");
-      String string0 = recipe0.getOrchestrationUri();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.setId(1);
-      int int0 = recipe0.getId();
-      assertEquals(1, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.setId((-529));
-      int int0 = recipe0.getId();
-      assertEquals((-529), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.setDescription("F+/=");
-      String string0 = recipe0.getDescription();
-      assertEquals("F+/=", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.setDescription("");
-      String string0 = recipe0.getDescription();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.setAction("RECIPE: null,uri=null");
-      String string0 = recipe0.getAction();
-      assertEquals("RECIPE: null,uri=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.action = "";
-      String string0 = recipe0.getAction();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      Timestamp timestamp0 = mock(Timestamp.class, new ViolatedAssumptionAnswer());
-      doReturn(0L).when(timestamp0).getTime();
-      recipe0.setCreated(timestamp0);
-      String string0 = recipe0.toString();
-      assertEquals("RECIPE: null,uri=null,created=1/1/70 12:00 AM", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      int int0 = recipe0.getId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      String string0 = recipe0.getDescription();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      int int0 = recipe0.getRecipeTimeout();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      recipe0.setRecipeTimeout(957);
-      int int0 = recipe0.getRecipeTimeout();
-      assertEquals(957, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      String string0 = recipe0.getAction();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      Timestamp timestamp0 = recipe0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      String string0 = recipe0.getOrchestrationUri();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      Recipe recipe0 = new Recipe();
-      String string0 = recipe0.getServiceType();
-      assertNull(string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/RecipeESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/RecipeESTestscaffolding.java
deleted file mode 100644
index 667bc9387a..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/RecipeESTestscaffolding.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:21:28 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 RecipeESTestscaffolding {
-
-  @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.db.catalog.beans.Recipe"; 
-    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(RecipeESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.Recipe",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceESTest.java
deleted file mode 100644
index 57f2d5d7a8..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceESTest.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:19:44 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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.sql.Timestamp;
-import java.time.Clock;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.evosuite.runtime.mock.java.time.MockClock;
-import org.evosuite.runtime.mock.java.time.MockLocalDateTime;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class ServiceESTest extends ServiceESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setServiceVersion("RECIPE: ");
-      String string0 = service0.getServiceVersion();
-      assertEquals("RECIPE: ", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setServiceNameVersionId(">{PeD}EDcITG;{Z%FH");
-      String string0 = service0.getServiceNameVersionId();
-      assertEquals(">{PeD}EDcITG;{Z%FH", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setServiceName("RECIPE: ");
-      String string0 = service0.getServiceName();
-      assertEquals("RECIPE: ", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setServiceName("");
-      String string0 = service0.getServiceName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      Service service0 = new Service();
-      HashMap<String, ServiceRecipe> hashMap0 = new HashMap<String, ServiceRecipe>();
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      hashMap0.put(",created=", serviceRecipe0);
-      service0.setRecipes(hashMap0);
-      Map<String, ServiceRecipe> map0 = service0.getRecipes();
-      assertFalse(map0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setModelInvariantUUID("BZ@s");
-      String string0 = service0.getModelInvariantUUID();
-      assertEquals("BZ@s", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setId(1033);
-      int int0 = service0.getId();
-      assertEquals(1033, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setId((-164));
-      int int0 = service0.getId();
-      assertEquals((-164), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setHttpMethod(",description=");
-      String string0 = service0.getHttpMethod();
-      assertEquals(",description=", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setDescription("");
-      String string0 = service0.getDescription();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      Service service0 = new Service();
-      Timestamp timestamp0 = new Timestamp(0L);
-      service0.setCreated(timestamp0);
-      Timestamp timestamp1 = service0.getCreated();
-      assertEquals(0, timestamp1.getNanos());
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      Service service0 = new Service();
-      Clock clock0 = MockClock.systemUTC();
-      LocalDateTime localDateTime0 = MockLocalDateTime.now(clock0);
-      Timestamp timestamp0 = Timestamp.valueOf(localDateTime0);
-      service0.setCreated(timestamp0);
-      Timestamp timestamp1 = service0.getCreated();
-      assertSame(timestamp1, timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      Service service0 = new Service();
-      // Undeclared exception!
-      try { 
-        service0.toString();
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.beans.Service", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      Service service0 = new Service();
-      HashMap<String, ServiceRecipe> hashMap0 = new HashMap<String, ServiceRecipe>();
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      hashMap0.put(",created=", serviceRecipe0);
-      service0.setRecipes(hashMap0);
-      String string0 = service0.toString();
-      assertEquals("SERVICE: id=0,name=null,version=null,description=null,modelInvariantUUID=null\nRECIPE: null,uri=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setServiceNameVersionId("83y*#72]},kHXOT");
-      service0.setServiceNameVersionId("f6t}qujI)DMM>b=J");
-      Map<String, ServiceRecipe> map0 = (Map<String, ServiceRecipe>) mock(Map.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(map0).toString();
-      doReturn((Set) null).when(map0).keySet();
-      service0.setRecipes(map0);
-      service0.isTheSameVersion("83y*#72]},kHXOT");
-      service0.isMoreRecentThan(")0");
-      service0.getRecipes();
-      // Undeclared exception!
-      try { 
-        service0.toString();
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.beans.Service", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      Service service0 = new Service();
-      String string0 = service0.getDescription();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      Service service0 = new Service();
-      HashMap<String, ServiceRecipe> hashMap0 = new HashMap<String, ServiceRecipe>();
-      service0.setRecipes(hashMap0);
-      Map<String, ServiceRecipe> map0 = service0.getRecipes();
-      assertEquals(0, map0.size());
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      Service service0 = new Service();
-      int int0 = service0.getId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      Service service0 = new Service();
-      String string0 = service0.getServiceName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setHttpMethod("");
-      String string0 = service0.getHttpMethod();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      Service service0 = new Service();
-      String string0 = service0.getModelInvariantUUID();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      Service service0 = new Service();
-      String string0 = service0.getServiceVersion();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setServiceNameVersionId("");
-      String string0 = service0.getServiceNameVersionId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      Service service0 = new Service();
-      String string0 = service0.getHttpMethod();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      Service service0 = new Service();
-      Map<String, ServiceRecipe> map0 = service0.getRecipes();
-      assertNull(map0);
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setDescription("Ir%#'ua8B=h&yW\"(|");
-      String string0 = service0.getDescription();
-      assertEquals("Ir%#'ua8B=h&yW\"(|", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test26()  throws Throwable  {
-      Service service0 = new Service();
-      String string0 = service0.getServiceNameVersionId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test27()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setServiceVersion("");
-      String string0 = service0.getServiceVersion();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test28()  throws Throwable  {
-      Service service0 = new Service();
-      Timestamp timestamp0 = service0.getCreated();
-      service0.setCreated(timestamp0);
-      assertNull(service0.getServiceName());
-  }
-
-  @Test(timeout = 4000)
-  public void test29()  throws Throwable  {
-      Service service0 = new Service();
-      service0.setModelInvariantUUID("");
-      String string0 = service0.getModelInvariantUUID();
-      assertEquals("", string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceESTestscaffolding.java
deleted file mode 100644
index d420236688..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceESTestscaffolding.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:19:44 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 ServiceESTestscaffolding {
-
-  @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.db.catalog.beans.Service"; 
-    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(ServiceESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.ServiceRecipe",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.db.catalog.beans.Service"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolderESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolderESTest.java
deleted file mode 100644
index eafc69906f..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolderESTest.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Tue Feb 21 15:49:25 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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.ArrayList;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.PrivateAccess;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class ServiceMacroHolderESTest extends ServiceMacroHolderESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      Service service0 = new Service();
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder(service0);
-      serviceMacroHolder0.setVnfResources((ArrayList<VnfResource>) null);
-      ArrayList<VnfResource> arrayList0 = serviceMacroHolder0.getVnfResources();
-      assertNull(arrayList0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      VnfResource vnfResource0 = new VnfResource();
-      serviceMacroHolder0.addVnfResource(vnfResource0);
-      ArrayList<VnfResource> arrayList0 = serviceMacroHolder0.getVnfResources();
-      assertEquals(1, arrayList0.size());
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      Service service0 = serviceMacroHolder0.getService();
-      assertNull(service0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      Service service0 = new Service();
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder(service0);
-      service0.setId(1124);
-      Service service1 = serviceMacroHolder0.getService();
-      assertNull(service1.getServiceNameVersionId());
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      Service service0 = new Service();
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder(service0);
-      service0.setId((-760));
-      Service service1 = serviceMacroHolder0.getService();
-      assertNull(service1.getServiceNameVersionId());
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      NetworkResourceCustomization networkResourceCustomization0 = new NetworkResourceCustomization();
-      serviceMacroHolder0.addNetworkResourceCustomization(networkResourceCustomization0);
-      ArrayList<NetworkResourceCustomization> arrayList0 = serviceMacroHolder0.getNetworkResourceCustomization();
-      assertFalse(arrayList0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      serviceMacroHolder0.setAllottedResourceCustomization((ArrayList<AllottedResourceCustomization>) null);
-      ArrayList<AllottedResourceCustomization> arrayList0 = serviceMacroHolder0.getAllottedResourceCustomization();
-      assertNull(arrayList0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      serviceMacroHolder0.addAllottedResourceCustomization(allottedResourceCustomization0);
-      ArrayList<AllottedResourceCustomization> arrayList0 = serviceMacroHolder0.getAllottedResourceCustomization();
-      assertFalse(arrayList0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      serviceMacroHolder0.setAllottedResourceCustomization((ArrayList<AllottedResourceCustomization>) null);
-      String string0 = serviceMacroHolder0.toString();
-      assertEquals("ServicePlus: service: nullnone", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      serviceMacroHolder0.setNetworkResourceCustomization((ArrayList<NetworkResourceCustomization>) null);
-      String string0 = serviceMacroHolder0.toString();
-      assertEquals("ServicePlus: service: nullnone", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      Service service0 = mock(Service.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(service0).toString();
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder(service0);
-      ArrayList<Object> arrayList0 = new ArrayList<Object>();
-      arrayList0.add((Object) serviceMacroHolder0);
-      PrivateAccess.setVariable((Class<ServiceMacroHolder>) ServiceMacroHolder.class, serviceMacroHolder0, "vnfResources", (Object) arrayList0);
-      // Undeclared exception!
-      try {
-        serviceMacroHolder0.toString();
-        fail("Expecting exception: ClassCastException");
-
-      } catch(ClassCastException e) {
-         //
-         // org.openecomp.mso.db.catalog.beans.ServiceMacroHolder cannot be cast to org.openecomp.mso.db.catalog.beans.VnfResource
-         //
-         verifyException("org.openecomp.mso.db.catalog.beans.ServiceMacroHolder", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      serviceMacroHolder0.setVnfResources((ArrayList<VnfResource>) null);
-      String string0 = serviceMacroHolder0.toString();
-      assertEquals("ServicePlus: service: nullnone", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      Service service0 = new Service();
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder(service0);
-      // Undeclared exception!
-      try {
-        serviceMacroHolder0.toString();
-        fail("Expecting exception: NullPointerException");
-
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.beans.Service", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      serviceMacroHolder0.addAllottedResourceCustomization(allottedResourceCustomization0);
-      String string0 = serviceMacroHolder0.toString();
-      assertEquals("ServicePlus: service: nullnoneAllottedResourceCustomizations:ARC[0]: modelName=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 test14()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      NetworkResourceCustomization networkResourceCustomization0 = new NetworkResourceCustomization();
-      serviceMacroHolder0.addNetworkResourceCustomization(networkResourceCustomization0);
-      String string0 = serviceMacroHolder0.toString();
-      assertEquals("ServicePlus: service: nullnoneNetworkResourceCustomizations:NRC[0]: modelName=nullmodelUuid=nullmodelUuid=nullmodelInvariantUuid=nullmodelVersion=nullmodelCustomizationUuid=nullmodelInstanceName=nullnetworkResourceId=0networkType=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      NetworkResourceCustomization networkResourceCustomization0 = new NetworkResourceCustomization();
-      serviceMacroHolder0.setNetworkResourceCustomization((ArrayList<NetworkResourceCustomization>) null);
-      serviceMacroHolder0.addNetworkResourceCustomization(networkResourceCustomization0);
-      assertNull(networkResourceCustomization0.getModelInstanceName());
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      serviceMacroHolder0.setVnfResources((ArrayList<VnfResource>) null);
-      VnfResource vnfResource0 = new VnfResource();
-      serviceMacroHolder0.addVnfResource(vnfResource0);
-      assertNull(vnfResource0.getModelCustomizationUuid());
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      VnfResource vnfResource0 = new VnfResource();
-      serviceMacroHolder0.addVnfResource(vnfResource0);
-      String string0 = serviceMacroHolder0.toString();
-      assertEquals("ServicePlus: service: nullVnfResources: , vnfResource[0]:VNF=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 test18()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      serviceMacroHolder0.addVnfResource((VnfResource) null);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      Service service0 = new Service();
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder(service0);
-      serviceMacroHolder0.setNetworkResourceCustomization((ArrayList<NetworkResourceCustomization>) null);
-      ArrayList<NetworkResourceCustomization> arrayList0 = serviceMacroHolder0.getNetworkResourceCustomization();
-      assertNull(arrayList0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      Service service0 = new Service();
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder(service0);
-      Service service1 = serviceMacroHolder0.getService();
-      assertNull(service1.getModelInvariantUUID());
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      Service service0 = new Service();
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder(service0);
-      ArrayList<NetworkResourceCustomization> arrayList0 = serviceMacroHolder0.getNetworkResourceCustomization();
-      assertEquals(0, arrayList0.size());
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      serviceMacroHolder0.setAllottedResourceCustomization((ArrayList<AllottedResourceCustomization>) null);
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      serviceMacroHolder0.addAllottedResourceCustomization(allottedResourceCustomization0);
-      assertNull(allottedResourceCustomization0.getVersion());
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder();
-      Service service0 = new Service();
-      serviceMacroHolder0.setService(service0);
-      assertNull(service0.getModelInvariantUUID());
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      Service service0 = new Service();
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder(service0);
-      ArrayList<AllottedResourceCustomization> arrayList0 = serviceMacroHolder0.getAllottedResourceCustomization();
-      assertEquals(0, arrayList0.size());
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      Service service0 = new Service();
-      ServiceMacroHolder serviceMacroHolder0 = new ServiceMacroHolder(service0);
-      ArrayList<VnfResource> arrayList0 = serviceMacroHolder0.getVnfResources();
-      assertTrue(arrayList0.isEmpty());
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolderESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolderESTestscaffolding.java
deleted file mode 100644
index 43ccd7b728..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolderESTestscaffolding.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Tue Feb 21 15:49:25 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 ServiceMacroHolderESTestscaffolding {
-
-  @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.db.catalog.beans.ServiceMacroHolder";
-    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(ServiceMacroHolderESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.VfModule",
-      "com.att.eelf.i18n.EELFResolvableErrorEnum",
-      "org.openecomp.mso.db.catalog.beans.Service",
-      "org.openecomp.mso.db.catalog.beans.NetworkResource",
-      "org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.db.catalog.beans.VnfResource",
-      "org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization",
-      "org.openecomp.mso.db.catalog.beans.ServiceMacroHolder"
-    );
-  }
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(ServiceMacroHolderESTestscaffolding.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.db.catalog.beans.ServiceRecipe"
-    );
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceRecipeESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceRecipeESTest.java
deleted file mode 100644
index 4b4ec68325..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceRecipeESTest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:20:36 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.shaded.org.mockito.Mockito.*;
-
-import java.sql.Timestamp;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class ServiceRecipeESTest extends ServiceRecipeESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      Integer integer0 = new Integer(0);
-      serviceRecipe0.setServiceTimeoutInterim(integer0);
-      Integer integer1 = serviceRecipe0.getServiceTimeoutInterim();
-      assertEquals(0, (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      Integer integer0 = new Integer(536);
-      serviceRecipe0.setServiceTimeoutInterim(integer0);
-      Integer integer1 = serviceRecipe0.getServiceTimeoutInterim();
-      assertEquals(536, (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      Integer integer0 = new Integer((-1032));
-      serviceRecipe0.setServiceTimeoutInterim(integer0);
-      Integer integer1 = serviceRecipe0.getServiceTimeoutInterim();
-      assertEquals((-1032), (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setServiceParamXSD("*9+?bc]Ov");
-      String string0 = serviceRecipe0.getServiceParamXSD();
-      assertEquals("*9+?bc]Ov", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setServiceId(1643);
-      int int0 = serviceRecipe0.getServiceId();
-      assertEquals(1643, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setServiceId((-1639));
-      int int0 = serviceRecipe0.getServiceId();
-      assertEquals((-1639), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setRecipeTimeout(536);
-      int int0 = serviceRecipe0.getRecipeTimeout();
-      assertEquals(536, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setRecipeTimeout((-1));
-      int int0 = serviceRecipe0.getRecipeTimeout();
-      assertEquals((-1), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setOrchestrationUri("R~N]`p<1UHw6JYz");
-      String string0 = serviceRecipe0.getOrchestrationUri();
-      assertEquals("R~N]`p<1UHw6JYz", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setId(1);
-      int int0 = serviceRecipe0.getId();
-      assertEquals(1, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setDescription("wLV^;f35^#");
-      String string0 = serviceRecipe0.getDescription();
-      assertEquals("wLV^;f35^#", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setAction("@T7x,XN.)]mDZ");
-      String string0 = serviceRecipe0.getAction();
-      assertEquals("@T7x,XN.)]mDZ", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setAction("");
-      String string0 = serviceRecipe0.getAction();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      Timestamp timestamp0 = mock(Timestamp.class, new ViolatedAssumptionAnswer());
-      doReturn(0L).when(timestamp0).getTime();
-      serviceRecipe0.setCreated(timestamp0);
-      String string0 = serviceRecipe0.toString();
-      assertEquals("RECIPE: null,uri=null,created=1/1/70 12:00 AM", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      String string0 = serviceRecipe0.toString();
-      assertEquals("RECIPE: null,uri=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      String string0 = serviceRecipe0.getOrchestrationUri();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      String string0 = serviceRecipe0.getAction();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      Timestamp timestamp0 = serviceRecipe0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      String string0 = serviceRecipe0.getServiceParamXSD();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setId((-642));
-      int int0 = serviceRecipe0.getId();
-      assertEquals((-642), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setDescription("");
-      String string0 = serviceRecipe0.getDescription();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      String string0 = serviceRecipe0.getDescription();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      int int0 = serviceRecipe0.getServiceId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      Integer integer0 = serviceRecipe0.getServiceTimeoutInterim();
-      assertNull(integer0);
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      int int0 = serviceRecipe0.getRecipeTimeout();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setOrchestrationUri("");
-      String string0 = serviceRecipe0.getOrchestrationUri();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test26()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      int int0 = serviceRecipe0.getId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test27()  throws Throwable  {
-      ServiceRecipe serviceRecipe0 = new ServiceRecipe();
-      serviceRecipe0.setServiceParamXSD("");
-      String string0 = serviceRecipe0.getServiceParamXSD();
-      assertEquals("", string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceRecipeESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceRecipeESTestscaffolding.java
deleted file mode 100644
index b17b447241..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceRecipeESTestscaffolding.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:20:36 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 ServiceRecipeESTestscaffolding {
-
-  @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.db.catalog.beans.ServiceRecipe"; 
-    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(ServiceRecipeESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.ServiceRecipe",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceToAllottedResourcesESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceToAllottedResourcesESTest.java
deleted file mode 100644
index 84fbcb5391..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceToAllottedResourcesESTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Feb 22 09:33:37 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import java.sql.Timestamp;
-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 ServiceToAllottedResourcesESTest extends ServiceToAllottedResourcesESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      ServiceToAllottedResources serviceToAllottedResources0 = new ServiceToAllottedResources();
-      serviceToAllottedResources0.setServiceModelUuid("serviceModelUuid=nullarModelCustomizationUuid=null");
-      String string0 = serviceToAllottedResources0.getServiceModelUuid();
-      assertEquals("serviceModelUuid=nullarModelCustomizationUuid=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      ServiceToAllottedResources serviceToAllottedResources0 = new ServiceToAllottedResources();
-      Timestamp timestamp0 = new Timestamp(0L);
-      serviceToAllottedResources0.setCreated(timestamp0);
-      Timestamp timestamp1 = serviceToAllottedResources0.getCreated();
-      assertEquals("1970-01-01 00:00:00.0", timestamp1.toString());
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      ServiceToAllottedResources serviceToAllottedResources0 = new ServiceToAllottedResources();
-      serviceToAllottedResources0.setArModelCustomizationUuid("D7q@");
-      String string0 = serviceToAllottedResources0.getArModelCustomizationUuid();
-      assertEquals("D7q@", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test3()  throws Throwable  {
-      ServiceToAllottedResources serviceToAllottedResources0 = new ServiceToAllottedResources();
-      serviceToAllottedResources0.setArModelCustomizationUuid("");
-      String string0 = serviceToAllottedResources0.getArModelCustomizationUuid();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test4()  throws Throwable  {
-      ServiceToAllottedResources serviceToAllottedResources0 = new ServiceToAllottedResources();
-      String string0 = serviceToAllottedResources0.toString();
-      assertEquals("serviceModelUuid=nullarModelCustomizationUuid=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test5()  throws Throwable  {
-      ServiceToAllottedResources serviceToAllottedResources0 = new ServiceToAllottedResources();
-      serviceToAllottedResources0.setServiceModelUuid("");
-      String string0 = serviceToAllottedResources0.getServiceModelUuid();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test6()  throws Throwable  {
-      ServiceToAllottedResources serviceToAllottedResources0 = new ServiceToAllottedResources();
-      Timestamp timestamp0 = new Timestamp((-683L));
-      serviceToAllottedResources0.setCreated(timestamp0);
-      Timestamp timestamp1 = serviceToAllottedResources0.getCreated();
-      assertEquals("1969-12-31 23:59:59.317", timestamp1.toString());
-  }
-
-  @Test(timeout = 4000)
-  public void test7()  throws Throwable  {
-      ServiceToAllottedResources serviceToAllottedResources0 = new ServiceToAllottedResources();
-      String string0 = serviceToAllottedResources0.getServiceModelUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test8()  throws Throwable  {
-      ServiceToAllottedResources serviceToAllottedResources0 = new ServiceToAllottedResources();
-      String string0 = serviceToAllottedResources0.getArModelCustomizationUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test9()  throws Throwable  {
-      ServiceToAllottedResources serviceToAllottedResources0 = new ServiceToAllottedResources();
-      Timestamp timestamp0 = serviceToAllottedResources0.getCreated();
-      assertNull(timestamp0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceToAllottedResourcesESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceToAllottedResourcesESTestscaffolding.java
deleted file mode 100644
index 14ff62fb02..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceToAllottedResourcesESTestscaffolding.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Wed Feb 22 09:33:37 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 ServiceToAllottedResourcesESTestscaffolding {
-
-  @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.db.catalog.beans.ServiceToAllottedResources";
-    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(ServiceToAllottedResourcesESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.ServiceToAllottedResources"
-    );
-  }
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(ServiceToAllottedResourcesESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.db.catalog.beans.ServiceToAllottedResources"
-    );
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworksESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworksESTest.java
deleted file mode 100644
index aa2ba2a488..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworksESTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Feb 22 09:34:56 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import java.sql.Timestamp;
-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 ServiceToNetworksESTest extends ServiceToNetworksESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      ServiceToNetworks serviceToNetworks0 = new ServiceToNetworks();
-      serviceToNetworks0.setServiceModelUuid("XcrRZj-Y)7");
-      String string0 = serviceToNetworks0.getServiceModelUuid();
-      assertEquals("XcrRZj-Y)7", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      ServiceToNetworks serviceToNetworks0 = new ServiceToNetworks();
-      serviceToNetworks0.setNetworkModelCustomizationUuid("XcrRZj-Y)7");
-      String string0 = serviceToNetworks0.getNetworkModelCustomizationUuid();
-      assertEquals("XcrRZj-Y)7", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      ServiceToNetworks serviceToNetworks0 = new ServiceToNetworks();
-      Timestamp timestamp0 = new Timestamp(4701L);
-      serviceToNetworks0.setCreated(timestamp0);
-      Timestamp timestamp1 = serviceToNetworks0.getCreated();
-      assertEquals(701000000, timestamp1.getNanos());
-  }
-
-  @Test(timeout = 4000)
-  public void test3()  throws Throwable  {
-      ServiceToNetworks serviceToNetworks0 = new ServiceToNetworks();
-      Timestamp timestamp0 = serviceToNetworks0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test4()  throws Throwable  {
-      ServiceToNetworks serviceToNetworks0 = new ServiceToNetworks();
-      String string0 = serviceToNetworks0.getNetworkModelCustomizationUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test5()  throws Throwable  {
-      ServiceToNetworks serviceToNetworks0 = new ServiceToNetworks();
-      String string0 = serviceToNetworks0.getServiceModelUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test6()  throws Throwable  {
-      ServiceToNetworks serviceToNetworks0 = new ServiceToNetworks();
-      String string0 = serviceToNetworks0.toString();
-      assertEquals("ServiceToNetworks mapping: serviceModelUuid=null,networkModelCustomizationUuid=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test7()  throws Throwable  {
-      ServiceToNetworks serviceToNetworks0 = new ServiceToNetworks();
-      Timestamp timestamp0 = new Timestamp(0L);
-      serviceToNetworks0.setCreated(timestamp0);
-      Timestamp timestamp1 = serviceToNetworks0.getCreated();
-      assertEquals(0, timestamp1.getNanos());
-  }
-
-  @Test(timeout = 4000)
-  public void test8()  throws Throwable  {
-      ServiceToNetworks serviceToNetworks0 = new ServiceToNetworks();
-      serviceToNetworks0.setNetworkModelCustomizationUuid("");
-      String string0 = serviceToNetworks0.getNetworkModelCustomizationUuid();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test9()  throws Throwable  {
-      ServiceToNetworks serviceToNetworks0 = new ServiceToNetworks();
-      serviceToNetworks0.setServiceModelUuid("");
-      String string0 = serviceToNetworks0.getServiceModelUuid();
-      assertEquals("", string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworksESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworksESTestscaffolding.java
deleted file mode 100644
index ba0c5d7d5b..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworksESTestscaffolding.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Wed Feb 22 09:34:56 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 ServiceToNetworksESTestscaffolding {
-
-  @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.db.catalog.beans.ServiceToNetworks";
-    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(ServiceToNetworksESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.ServiceToNetworks"
-    );
-  }
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(ServiceToNetworksESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.db.catalog.beans.ServiceToNetworks"
-    );
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VfModuleESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VfModuleESTest.java
deleted file mode 100644
index 1ab15a22fb..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VfModuleESTest.java
+++ /dev/null
@@ -1,978 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Tue Feb 21 15:51:08 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.time.temporal.ChronoField;
-import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalField;
-import java.time.temporal.UnsupportedTemporalTypeException;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.PrivateAccess;
-import org.evosuite.runtime.System;
-import org.evosuite.runtime.mock.java.time.MockInstant;
-import org.evosuite.runtime.mock.java.util.MockDate;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.db.catalog.beans.VfModule;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class VfModuleESTest extends VfModuleESTestscaffolding {
-
-    @Test(timeout = 4000)
-    public void test00()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setIsBase(1684);
-        vfModule0.getMinInstances();
-        vfModule0.setMaxInstances((Integer) null);
-        vfModule0.isBase();
-        vfModule0.setVolTemplateId((Integer) null);
-        vfModule0.setModelVersion("p(>v(f\"rnCo");
-        vfModule0.getIsBase();
-        vfModule0.getModelInvariantUuid();
-        vfModule0.setModelVersion("a,U*#FCv(}H+aG}");
-        vfModule0.getVolTemplateId();
-        vfModule0.getMinInstances();
-        vfModule0.toString();
-    }
-
-    @Test(timeout = 4000)
-    public void test01()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Instant instant0 = MockInstant.now();
-        Timestamp timestamp0 = Timestamp.from(instant0);
-        vfModule0.setCreated(timestamp0);
-        vfModule0.setLabel("7.");
-        vfModule0.isBase();
-        vfModule0.getId();
-        vfModule0.getLabel();
-        vfModule0.toString();
-    }
-
-    @Test(timeout = 4000)
-    public void test02()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = Integer.valueOf((-3299));
-        vfModule0.getEnvironmentId();
-        Integer.toUnsignedString((-697));
-        vfModule0.setMinInstances((Integer) null);
-        vfModule0.setMaxInstances(integer0);
-        Integer integer1 = new Integer(5932);
-        Integer integer2 = Integer.getInteger("DZ>}qM>", integer1);
-        vfModule0.setVolEnvironmentId(integer0);
-        vfModule0.setTemplateId(integer2);
-        Integer.toUnsignedString(5932);
-        vfModule0.getVolTemplateId();
-        vfModule0.setTemplateId((Integer) null);
-        Integer.divideUnsigned((-3299), (-3299));
-        vfModule0.setEnvironmentId((Integer) null);
-        vfModule0.setVolEnvironmentId((Integer) null);
-        vfModule0.setMinInstances(integer1);
-        vfModule0.setIsBase((-3299));
-        vfModule0.setIsBase((-745));
-        vfModule0.setModelVersion("5932");
-        vfModule0.getVolTemplateId();
-        vfModule0.getVolEnvironmentId();
-        vfModule0.getMinInstances();
-        vfModule0.getVolEnvironmentId();
-    }
-
-    @Test(timeout = 4000)
-    public void test03()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer(0);
-        vfModule0.setVolTemplateId(integer0);
-        vfModule0.getVolTemplateId();
-        Integer integer1 = vfModule0.getVolTemplateId();
-        vfModule0.setVolTemplateId(integer1);
-        vfModule0.setIsBase(863);
-        Integer integer2 = new Integer(1554);
-        vfModule0.setVnfResourceId(integer2);
-        vfModule0.setIsBase(780);
-        vfModule0.setMaxInstances(integer2);
-        vfModule0.getEnvironmentId();
-        vfModule0.getVolEnvironmentId();
-        vfModule0.getVolEnvironmentId();
-    }
-
-    @Test(timeout = 4000)
-    public void test04()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Timestamp timestamp0 = new Timestamp((-2168L));
-        vfModule0.setCreated(timestamp0);
-        vfModule0.setId((-1));
-        vfModule0.getEnvironmentId();
-        vfModule0.setCreated(timestamp0);
-        vfModule0.setVolTemplateId((Integer) null);
-        vfModule0.setLabel(".");
-        vfModule0.getModelName();
-        vfModule0.getCreated();
-        vfModule0.getTemplateId();
-    }
-
-    @Test(timeout = 4000)
-    public void test05()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.isMoreRecentThan("");
-        vfModule0.setLabel("");
-        Integer integer0 = new Integer(1183);
-        vfModule0.setMaxInstances(integer0);
-        Integer.compare(1183, 1183);
-        vfModule0.setTemplateId(integer0);
-        vfModule0.getLabel();
-        vfModule0.getDescription();
-    }
-
-    @Test(timeout = 4000)
-    public void test06()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer(0);
-        Integer.compare(1, 0);
-        vfModule0.setMaxInstances(integer0);
-        vfModule0.getVolEnvironmentId();
-        Integer.sum(0, 1);
-        vfModule0.setVolTemplateId((Integer) null);
-        vfModule0.setMaxInstances((Integer) null);
-        vfModule0.setModelVersion("");
-        vfModule0.setIsBase((-1435));
-        vfModule0.setVnfResourceId((Integer) null);
-        vfModule0.getVnfResourceId();
-        vfModule0.setIsBase((-3635));
-        vfModule0.getDescription();
-        vfModule0.getAsdcUuid();
-        Integer integer1 = new Integer((-3635));
-        Integer integer2 = new Integer(1);
-        Integer.getInteger(".", integer2);
-        vfModule0.setVolTemplateId(integer1);
-        vfModule0.getVnfResourceId();
-        vfModule0.getModelVersion();
-    }
-
-    @Test(timeout = 4000)
-    public void test07()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setIsBase(597);
-        vfModule0.setId(662);
-        Integer integer0 = Integer.valueOf(597);
-        Integer.compare((-1), 0);
-        Integer.divideUnsigned(597, (-3368));
-        vfModule0.setVolTemplateId(integer0);
-        Integer.getInteger(",modelCustomizationUuid=", 0);
-        vfModule0.setVolEnvironmentId(integer0);
-        vfModule0.setId(0);
-        vfModule0.getVnfResourceId();
-        Integer integer1 = new Integer(0);
-        vfModule0.setMaxInstances(integer1);
-        vfModule0.getMaxInstances();
-        vfModule0.setModelName("");
-    }
-
-    @Test(timeout = 4000)
-    public void test08()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer(0);
-        vfModule0.setInitialCount(integer0);
-        Integer integer1 = new Integer((-2063));
-        vfModule0.setVolTemplateId(integer1);
-        vfModule0.getModelVersion();
-        Integer integer2 = new Integer(0);
-        vfModule0.setInitialCount(integer2);
-        vfModule0.getLabel();
-        vfModule0.setTemplateId(integer0);
-        Integer integer3 = vfModule0.getInitialCount();
-        vfModule0.setMaxInstances(integer3);
-    }
-
-    @Test(timeout = 4000)
-    public void test09()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setModelInvariantUuid("");
-        vfModule0.setDescription(",templateId=");
-        Timestamp timestamp0 = new Timestamp((-1360L));
-        MockDate mockDate0 = new MockDate(0, 0, (-1723), (-3154), (-1723));
-        vfModule0.setId((-1158));
-        mockDate0.setTime(0L);
-        timestamp0.after(mockDate0);
-        vfModule0.setCreated(timestamp0);
-        vfModule0.setType(".");
-        vfModule0.getId();
-        Integer integer0 = new Integer((-1158));
-        vfModule0.setVnfResourceId(integer0);
-        vfModule0.isBase();
-        vfModule0.setMinInstances((Integer) null);
-    }
-
-    @Test(timeout = 4000)
-    public void test10()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.isTheSameVersion("");
-        vfModule0.setMaxInstances((Integer) null);
-        vfModule0.setId((-2621));
-        vfModule0.setModelVersion("");
-        vfModule0.setAsdcUuid(".");
-        Integer integer0 = new Integer((-2621));
-        vfModule0.isTheSameVersion("");
-        vfModule0.setTemplateId(integer0);
-        vfModule0.getTemplateId();
-        vfModule0.getModelVersion();
-    }
-
-    @Test(timeout = 4000)
-    public void test11()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.toString();
-        vfModule0.setType("\"~J0_gjDe<M|_&}EQ");
-        vfModule0.getModelCustomizationUuid();
-        Integer integer0 = new Integer((-1597));
-        vfModule0.setEnvironmentId(integer0);
-        vfModule0.setVnfResourceId(integer0);
-        vfModule0.getModelCustomizationUuid();
-        vfModule0.setModelInvariantUuid((String) null);
-        vfModule0.getIsBase();
-        vfModule0.getVolEnvironmentId();
-        vfModule0.getLabel();
-        vfModule0.getVnfResourceId();
-        vfModule0.setModelVersion("VF=null,modelName=null,version=null,id=0,vnfResourceId=null,templateId=null,envtId=null,volTemplateId=null,volEnvtId=null, description=null,asdcUuid=null,modelVersion=null,modelCustomizationUuid=null,minInstances=null,maxInstances=null,initialCount=null,label=null");
-        vfModule0.getCreated();
-        Integer integer1 = new Integer((-805));
-        vfModule0.setTemplateId(integer1);
-    }
-
-    @Test(timeout = 4000)
-    public void test12()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setDescription("");
-        vfModule0.getLabel();
-        Integer integer0 = new Integer(1);
-        vfModule0.setVnfResourceId(integer0);
-        vfModule0.getModelCustomizationUuid();
-        vfModule0.getLabel();
-        Integer integer1 = new Integer(1);
-        Integer.sum(542, 542);
-        vfModule0.setVolTemplateId(integer1);
-        vfModule0.getEnvironmentId();
-        vfModule0.setIsBase(1084);
-        vfModule0.setAsdcUuid((String) null);
-        vfModule0.getId();
-        vfModule0.getVnfResourceId();
-        vfModule0.setModelCustomizationUuid("o?;po<j");
-        vfModule0.getTemplateId();
-    }
-
-    @Test(timeout = 4000)
-    public void test13()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setMinInstances((Integer) null);
-        Integer integer0 = new Integer(334);
-        Integer.sum(334, (-2392));
-        vfModule0.setTemplateId(integer0);
-        Integer.getInteger("");
-        vfModule0.setVnfResourceId(integer0);
-        Integer integer1 = new Integer((-2392));
-        Integer.toUnsignedLong(0);
-        vfModule0.setMaxInstances(integer1);
-        vfModule0.setModelInvariantUuid("");
-        vfModule0.getTemplateId();
-    }
-
-    @Test(timeout = 4000)
-    public void test14()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setType("");
-        vfModule0.setModelCustomizationUuid("");
-        vfModule0.getIsBase();
-        vfModule0.setModelVersion("");
-        vfModule0.isMoreRecentThan("");
-        Integer integer0 = Integer.valueOf(3556);
-        Integer.compareUnsigned(0, 2007);
-        Integer.toUnsignedString(0);
-        vfModule0.setMaxInstances(integer0);
-        vfModule0.getType();
-        vfModule0.setType("");
-        vfModule0.setModelName("<>]");
-        vfModule0.getModelCustomizationUuid();
-        vfModule0.toString();
-        vfModule0.getTemplateId();
-        vfModule0.getMaxInstances();
-    }
-
-    @Test(timeout = 4000)
-    public void test15()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getModelName();
-        vfModule0.setModelName("uQAnJq?Z");
-        vfModule0.getTemplateId();
-        vfModule0.setModelCustomizationUuid("");
-        vfModule0.getModelCustomizationUuid();
-    }
-
-    @Test(timeout = 4000)
-    public void test16()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getInitialCount();
-        vfModule0.setMinInstances((Integer) null);
-        vfModule0.isBase();
-        vfModule0.getVolEnvironmentId();
-        Integer integer0 = new Integer((-414));
-        vfModule0.setMaxInstances(integer0);
-        vfModule0.getVolEnvironmentId();
-        vfModule0.getMaxInstances();
-        System.setCurrentTimeMillis(0L);
-        vfModule0.getMaxInstances();
-        vfModule0.getTemplateId();
-        vfModule0.getInitialCount();
-        vfModule0.getEnvironmentId();
-    }
-
-    @Test(timeout = 4000)
-    public void test17()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setVolEnvironmentId((Integer) null);
-        vfModule0.setAsdcUuid(",created=");
-        Integer integer0 = new Integer(0);
-        vfModule0.setVnfResourceId(integer0);
-        Integer.getInteger(",created=", (Integer) null);
-        vfModule0.setDescription(",label=");
-        vfModule0.setLabel(".");
-        vfModule0.getModelName();
-        vfModule0.setId(0);
-        Integer.max(0, 0);
-        vfModule0.setMinInstances(integer0);
-        vfModule0.setMaxInstances((Integer) null);
-        vfModule0.getCreated();
-        vfModule0.getMaxInstances();
-        vfModule0.getAsdcUuid();
-        vfModule0.getDescription();
-        vfModule0.getMaxInstances();
-        Integer integer1 = new Integer(0);
-        vfModule0.setMaxInstances(integer1);
-        vfModule0.toString();
-        vfModule0.setCreated((Timestamp) null);
-    }
-
-    @Test(timeout = 4000)
-    public void test18()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setModelCustomizationUuid(",modelVersion=");
-        Integer integer0 = new Integer((-4139));
-        vfModule0.setInitialCount(integer0);
-        Integer integer1 = new Integer((-789));
-        Integer.sum((-4139), (-2408));
-        Integer.toUnsignedString((-1850));
-        Integer.sum(958, (-176));
-        Integer.getInteger(",modelVersion=", integer0);
-        Integer.remainderUnsigned((-789), (-789));
-        vfModule0.setAsdcUuid("Y?ht4");
-        vfModule0.setEnvironmentId(integer1);
-        vfModule0.getEnvironmentId();
-        System.setCurrentTimeMillis(0L);
-        System.setCurrentTimeMillis((-2179L));
-        vfModule0.getMinInstances();
-        vfModule0.getVolTemplateId();
-        vfModule0.isBase();
-        vfModule0.isBase();
-        vfModule0.isBase();
-        vfModule0.getVnfResourceId();
-        vfModule0.getCreated();
-    }
-
-    @Test(timeout = 4000)
-    public void test19()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer(714);
-        vfModule0.setEnvironmentId(integer0);
-        vfModule0.setInitialCount((Integer) null);
-        vfModule0.toString();
-        vfModule0.setDescription("VF=null,modelName=null,version=null,id=0,vnfResourceId=null,templateId=null,envtId=714,volTemplateId=null,volEnvtId=null, description=null,asdcUuid=null,modelVersion=null,modelCustomizationUuid=null,minInstances=null,maxInstances=null,initialCount=null,label=null");
-        vfModule0.setModelVersion("VF=null,modelName=null,version=null,id=0,vnfResourceId=null,templateId=null,envtId=714,volTemplateId=null,volEnvtId=null, description=null,asdcUuid=null,modelVersion=null,modelCustomizationUuid=null,minInstances=null,maxInstances=null,initialCount=null,label=null");
-        vfModule0.setInitialCount((Integer) null);
-        vfModule0.setIsBase(1549);
-        vfModule0.setMinInstances((Integer) null);
-        vfModule0.getModelCustomizationUuid();
-        Integer integer1 = vfModule0.getEnvironmentId();
-        vfModule0.setAsdcUuid(".");
-        vfModule0.getVolEnvironmentId();
-        vfModule0.getLabel();
-        Integer.remainderUnsigned(1544, 1549);
-        Integer.sum((-277), (-277));
-        vfModule0.setMaxInstances(integer1);
-        vfModule0.getVolTemplateId();
-        vfModule0.getIsBase();
-        vfModule0.getInitialCount();
-    }
-
-    @Test(timeout = 4000)
-    public void test20()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setId(0);
-        vfModule0.setDescription("sh;.zWRp.C?-rn");
-        vfModule0.setModelInvariantUuid(",label=");
-        vfModule0.getLabel();
-        vfModule0.getModelInvariantUuid();
-        Timestamp timestamp0 = new Timestamp((long) 0);
-        vfModule0.setCreated(timestamp0);
-        vfModule0.setDescription("");
-        vfModule0.setModelInvariantUuid((String) null);
-        vfModule0.getDescription();
-    }
-
-    @Test(timeout = 4000)
-    public void test21()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.toString();
-        vfModule0.getDescription();
-        vfModule0.setAsdcUuid("VF=null,modelName=null,version=null,id=0,vnfResourceId=null,templateId=null,envtId=null,volTemplateId=null,volEnvtId=null, description=null,asdcUuid=null,modelVersion=null,modelCustomizationUuid=null,minInstances=null,maxInstances=null,initialCount=null,label=null");
-        vfModule0.getModelName();
-        Integer integer0 = new Integer(0);
-        Integer.toUnsignedString(378);
-        Integer.sum(0, 0);
-        vfModule0.setMaxInstances(integer0);
-        vfModule0.setModelInvariantUuid((String) null);
-        vfModule0.setType("}^`%'{@?s`OiaLz");
-        vfModule0.setInitialCount(integer0);
-        vfModule0.getType();
-        vfModule0.setAsdcUuid("VF=null,modelName=null,version=null,id=0,vnfResourceId=null,templateId=null,envtId=null,volTemplateId=null,volEnvtId=null, description=null,asdcUuid=null,modelVersion=null,modelCustomizationUuid=null,minInstances=null,maxInstances=null,initialCount=null,label=null");
-        VfModule vfModule1 = new VfModule();
-        vfModule0.setType("VF=null,modelName=null,version=null,id=0,vnfResourceId=null,templateId=null,envtId=null,volTemplateId=null,volEnvtId=null, description=null,asdcUuid=null,modelVersion=null,modelCustomizationUuid=null,minInstances=null,maxInstances=null,initialCount=null,label=null");
-        vfModule0.toString();
-        vfModule0.getId();
-        vfModule1.setVnfResourceId(integer0);
-        vfModule0.getDescription();
-        vfModule0.getType();
-        vfModule0.getVolEnvironmentId();
-        vfModule0.getTemplateId();
-    }
-
-    @Test(timeout = 4000)
-    public void test22()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setId(2389);
-        vfModule0.setModelCustomizationUuid("");
-        vfModule0.isTheSameVersion("");
-        vfModule0.getVolTemplateId();
-        vfModule0.getLabel();
-        vfModule0.setInitialCount((Integer) null);
-        vfModule0.getCreated();
-        vfModule0.setAsdcUuid("");
-        vfModule0.getAsdcUuid();
-    }
-
-    @Test(timeout = 4000)
-    public void test23()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer(1268);
-        vfModule0.setInitialCount(integer0);
-        Integer integer1 = new Integer(0);
-        Integer.compare(1268, 1);
-        vfModule0.setEnvironmentId(integer1);
-        vfModule0.setVersion("");
-        vfModule0.getEnvironmentId();
-        vfModule0.getVnfResourceId();
-        vfModule0.getType();
-        vfModule0.getIsBase();
-        vfModule0.getCreated();
-        ChronoUnit chronoUnit0 = ChronoUnit.MINUTES;
-        // Undeclared exception!
-        try {
-            MockInstant.truncatedTo((Instant) null, chronoUnit0);
-            fail("Expecting exception: NullPointerException");
-
-        } catch(NullPointerException e) {
-            //
-            // no message in exception (getMessage() returned null)
-            //
-            verifyException("org.evosuite.runtime.mock.java.time.MockInstant", e);
-        }
-    }
-
-    @Test(timeout = 4000)
-    public void test24()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setTemplateId((Integer) null);
-        Integer integer0 = new Integer(2617);
-        vfModule0.setVolEnvironmentId(integer0);
-        vfModule0.setEnvironmentId((Integer) null);
-        vfModule0.setType("");
-        vfModule0.toString();
-        VfModule vfModule1 = new VfModule();
-        vfModule0.toString();
-        vfModule0.isMoreRecentThan("");
-        vfModule0.getModelName();
-        vfModule1.getLabel();
-        Integer integer1 = new Integer(321);
-        vfModule1.setVolTemplateId(integer1);
-        vfModule1.getVnfResourceId();
-        vfModule0.getVolTemplateId();
-        vfModule0.getVnfResourceId();
-        vfModule0.getVolEnvironmentId();
-    }
-
-    @Test(timeout = 4000)
-    public void test25()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getLabel();
-        Integer integer0 = new Integer(0);
-        vfModule0.setEnvironmentId(integer0);
-        vfModule0.isMoreRecentThan("!X");
-        vfModule0.setIsBase(0);
-        vfModule0.setId(4322);
-        vfModule0.getMaxInstances();
-        vfModule0.setAsdcUuid("");
-        vfModule0.getDescription();
-        vfModule0.setDescription((String) null);
-        vfModule0.setIsBase(0);
-        vfModule0.setAsdcUuid((String) null);
-        vfModule0.setId(4322);
-        Integer.min(4322, (-1));
-        vfModule0.getDescription();
-        Integer.divideUnsigned((-2839), 4322);
-        vfModule0.getIsBase();
-        vfModule0.setInitialCount(integer0);
-        vfModule0.toString();
-        vfModule0.getModelName();
-        vfModule0.getVolEnvironmentId();
-        vfModule0.setAsdcUuid("");
-        vfModule0.getId();
-        VfModule vfModule1 = new VfModule();
-        vfModule1.getTemplateId();
-        Integer integer1 = new Integer(4322);
-        vfModule1.setMinInstances(integer1);
-        vfModule0.getId();
-    }
-
-    @Test(timeout = 4000)
-    public void test26()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getAsdcUuid();
-        vfModule0.getModelVersion();
-        vfModule0.setModelName((String) null);
-        vfModule0.getVolEnvironmentId();
-        vfModule0.getIsBase();
-        Integer integer0 = new Integer((-1));
-        vfModule0.setEnvironmentId(integer0);
-        vfModule0.setMinInstances(integer0);
-        vfModule0.getVolTemplateId();
-        vfModule0.setModelVersion((String) null);
-        VfModule vfModule1 = new VfModule();
-        vfModule1.setId(0);
-        vfModule1.setModelInvariantUuid((String) null);
-        vfModule1.getModelInvariantUuid();
-        vfModule1.getModelName();
-        vfModule1.setVolEnvironmentId(integer0);
-        vfModule1.getMinInstances();
-        vfModule0.setModelName("");
-        Integer.getInteger("");
-        vfModule0.setTemplateId((Integer) null);
-        vfModule0.getModelName();
-        Integer integer1 = new Integer((-1));
-        vfModule0.setVolEnvironmentId(integer1);
-        vfModule1.getVnfResourceId();
-        Integer integer2 = vfModule1.getVolEnvironmentId();
-        vfModule0.setVolEnvironmentId(integer2);
-        vfModule1.setMinInstances((Integer) null);
-    }
-
-    @Test(timeout = 4000)
-    public void test27()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.toString();
-        vfModule0.setModelVersion("LBV90^6*");
-        vfModule0.setDescription("LBV90^6*");
-        vfModule0.getVnfResourceId();
-        vfModule0.setTemplateId((Integer) null);
-        vfModule0.isBase();
-        vfModule0.setIsBase((-531));
-        Integer integer0 = new Integer(2646);
-        vfModule0.setVolEnvironmentId(integer0);
-        Integer integer1 = new Integer((-531));
-        Integer.divideUnsigned((-531), 2646);
-        Integer.compare((-1), (-531));
-        Integer.toUnsignedLong((-1));
-        vfModule0.setVolEnvironmentId((Integer) null);
-        vfModule0.setVolEnvironmentId(integer1);
-        vfModule0.setTemplateId((Integer) null);
-        vfModule0.getVolEnvironmentId();
-        vfModule0.setModelName("LBV90^6*");
-        vfModule0.getTemplateId();
-        vfModule0.getModelName();
-    }
-
-    @Test(timeout = 4000)
-    public void test28()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer(2752);
-        vfModule0.setVolEnvironmentId(integer0);
-        Integer integer1 = vfModule0.getVolEnvironmentId();
-        vfModule0.setVnfResourceId(integer1);
-        vfModule0.getModelVersion();
-        vfModule0.setModelVersion((String) null);
-        vfModule0.getMinInstances();
-        vfModule0.getAsdcUuid();
-        Integer integer2 = new Integer((-672));
-        Instant instant0 = MockInstant.now();
-        ChronoField chronoField0 = ChronoField.EPOCH_DAY;
-        // Undeclared exception!
-        try {
-            MockInstant.with(instant0, (TemporalField) chronoField0, 1268L);
-            fail("Expecting exception: UnsupportedTemporalTypeException");
-
-        } catch(UnsupportedTemporalTypeException e) {
-            //
-            // Unsupported field: EpochDay
-            //
-            verifyException("java.time.Instant", e);
-        }
-    }
-
-    @Test(timeout = 4000)
-    public void test29()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getMinInstances();
-        Integer integer0 = new Integer(397);
-        vfModule0.setInitialCount(integer0);
-        vfModule0.setMaxInstances((Integer) null);
-        vfModule0.isBase();
-        vfModule0.setVolEnvironmentId((Integer) null);
-        vfModule0.setModelVersion("p(>v(f\"rnCo");
-        vfModule0.setMinInstances((Integer) null);
-        vfModule0.setModelVersion("*");
-        vfModule0.getIsBase();
-        vfModule0.getModelInvariantUuid();
-        vfModule0.setIsBase((-1066));
-        vfModule0.getInitialCount();
-        vfModule0.toString();
-        vfModule0.getVolTemplateId();
-        vfModule0.getCreated();
-    }
-
-    @Test(timeout = 4000)
-    public void test30()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getTemplateId();
-        Instant instant0 = MockInstant.ofEpochSecond(1L);
-        Timestamp timestamp0 = Timestamp.from(instant0);
-        vfModule0.setCreated(timestamp0);
-        vfModule0.getCreated();
-        vfModule0.getTemplateId();
-    }
-
-    @Test(timeout = 4000)
-    public void test31()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer(0);
-        vfModule0.setTemplateId(integer0);
-        vfModule0.setModelVersion("");
-        vfModule0.getModelName();
-        vfModule0.setId(0);
-        vfModule0.setModelVersion("wk~z+v");
-        Integer integer1 = new Integer(0);
-        Integer.getInteger((String) null, 0);
-        vfModule0.setEnvironmentId(integer1);
-        vfModule0.getTemplateId();
-        vfModule0.setModelName("a(");
-        Integer integer2 = vfModule0.getTemplateId();
-        vfModule0.setMinInstances(integer2);
-        vfModule0.setModelCustomizationUuid("01*}(,sCh");
-        vfModule0.getModelCustomizationUuid();
-        vfModule0.getVolEnvironmentId();
-        vfModule0.getVolEnvironmentId();
-    }
-
-    @Test(timeout = 4000)
-    public void test32()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer(4222);
-        vfModule0.setEnvironmentId(integer0);
-        vfModule0.getModelName();
-        vfModule0.setAsdcUuid((String) null);
-        vfModule0.setModelCustomizationUuid((String) null);
-        vfModule0.setType(",minInstances=");
-        vfModule0.setVnfResourceId(integer0);
-        vfModule0.getEnvironmentId();
-        vfModule0.getMaxInstances();
-        vfModule0.getVolEnvironmentId();
-    }
-
-    @Test(timeout = 4000)
-    public void test33()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer(0);
-        Integer integer1 = new Integer(1244);
-        Integer.compareUnsigned(0, 1549);
-        Integer.getInteger("", integer1);
-        vfModule0.setVolEnvironmentId(integer0);
-        vfModule0.getCreated();
-        vfModule0.getVolEnvironmentId();
-        System.setCurrentTimeMillis(1856L);
-        vfModule0.getVolTemplateId();
-    }
-
-    @Test(timeout = 4000)
-    public void test34()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getModelName();
-        Integer integer0 = new Integer(0);
-        vfModule0.setVnfResourceId(integer0);
-        vfModule0.setId(0);
-        vfModule0.setModelVersion((String) null);
-        Integer integer1 = new Integer(0);
-        Integer.getInteger((String) null, 0);
-        vfModule0.setEnvironmentId(integer1);
-        vfModule0.getTemplateId();
-        vfModule0.setModelName((String) null);
-        vfModule0.setMinInstances(integer1);
-        vfModule0.setModelCustomizationUuid("01*}(,sCh");
-        vfModule0.getCreated();
-        vfModule0.getVnfResourceId();
-        vfModule0.getVolTemplateId();
-    }
-
-    @Test(timeout = 4000)
-    public void test35()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getInitialCount();
-        Integer integer0 = new Integer((-1066));
-        vfModule0.getVolEnvironmentId();
-        Integer.getInteger("", (Integer) null);
-        Integer.getInteger(",envtId=", (-1066));
-        vfModule0.setMinInstances(integer0);
-        vfModule0.toString();
-        vfModule0.setVersion("VF=null,modelName=null,version=null,id=0,vnfResourceId=null,templateId=null,envtId=null,volTemplateId=null,volEnvtId=null, description=null,asdcUuid=null,modelVersion=null,modelCustomizationUuid=null,minInstances=-1066,maxInstances=null,initialCount=null,label=null");
-        vfModule0.getVolTemplateId();
-        vfModule0.getVolTemplateId();
-        vfModule0.getVnfResourceId();
-        vfModule0.getMinInstances();
-        vfModule0.getVolTemplateId();
-        vfModule0.setVersion("");
-        vfModule0.getVnfResourceId();
-        System.setCurrentTimeMillis((-1066));
-        vfModule0.setModelCustomizationUuid("VF=null,modelName=null,version=null,id=0,vnfResourceId=null,templateId=null,envtId=null,volTemplateId=null,volEnvtId=null, description=null,asdcUuid=null,modelVersion=null,modelCustomizationUuid=null,minInstances=-1066,maxInstances=null,initialCount=null,label=null");
-        vfModule0.getCreated();
-        vfModule0.getCreated();
-        System.setCurrentTimeMillis((-1066));
-    }
-
-    @Test(timeout = 4000)
-    public void test36()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getEnvironmentId();
-        vfModule0.setVolEnvironmentId((Integer) null);
-        int int0 = vfModule0.getId();
-        assertEquals(0, int0);
-
-        vfModule0.getVolTemplateId();
-        String string0 = vfModule0.toString();
-        assertEquals("VF=null,modelName=null,version=null,id=0,vnfResourceId=null,templateId=null,envtId=null,volTemplateId=null,volEnvtId=null, description=null,asdcUuid=null,modelVersion=null,modelCustomizationUuid=null,minInstances=null,maxInstances=null,initialCount=null,label=null", string0);
-    }
-
-    @Test(timeout = 4000)
-    public void test37()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.isTheSameVersion("X+]2+]y^$6");
-        vfModule0.getTemplateId();
-        vfModule0.getId();
-        Integer.toUnsignedString(0);
-        vfModule0.getLabel();
-        Integer.remainderUnsigned((-472), 1579);
-        Integer integer0 = new Integer((-1701));
-        Integer.compare((-1701), (-1));
-        Integer.getInteger("0", integer0);
-        vfModule0.setEnvironmentId((Integer) null);
-        vfModule0.setModelInvariantUuid((String) null);
-        vfModule0.getAsdcUuid();
-        Integer integer1 = new Integer((-1701));
-        vfModule0.setVnfResourceId((Integer) null);
-        vfModule0.getIsBase();
-        Integer.compareUnsigned(1, 0);
-        vfModule0.getType();
-        vfModule0.getVnfResourceId();
-        vfModule0.setInitialCount(integer1);
-        vfModule0.setDescription("");
-        vfModule0.getEnvironmentId();
-        vfModule0.setInitialCount(integer1);
-        vfModule0.setId(1946);
-        vfModule0.getCreated();
-        vfModule0.getInitialCount();
-        vfModule0.getVnfResourceId();
-        vfModule0.getCreated();
-        assertEquals(1946, vfModule0.getId());
-    }
-
-    @Test(timeout = 4000)
-    public void test38()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getMaxInstances();
-        Integer integer0 = new Integer(550);
-        vfModule0.setMinInstances(integer0);
-        Integer integer1 = new Integer(275);
-        Integer.max(0, 0);
-        vfModule0.setInitialCount(integer1);
-        vfModule0.setIsBase(275);
-        vfModule0.getEnvironmentId();
-        Integer.compare(275, 275);
-        vfModule0.setMinInstances((Integer) null);
-        vfModule0.setType("");
-        vfModule0.setVersion("]");
-        vfModule0.getId();
-        vfModule0.setId(0);
-        vfModule0.setIsBase((-17));
-        vfModule0.setId((-17));
-        vfModule0.getDescription();
-        vfModule0.getAsdcUuid();
-        vfModule0.getIsBase();
-        vfModule0.getModelName();
-        vfModule0.getEnvironmentId();
-        vfModule0.toString();
-        vfModule0.setModelInvariantUuid("D2");
-        vfModule0.getInitialCount();
-        assertEquals(-17, vfModule0.getIsBase());
-    }
-
-    @Test(timeout = 4000)
-    public void test39()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer(4477);
-        vfModule0.setVolTemplateId(integer0);
-        vfModule0.getModelInvariantUuid();
-        vfModule0.getModelInvariantUuid();
-        vfModule0.getVolTemplateId();
-        vfModule0.getMinInstances();
-        System.setCurrentTimeMillis((-1006L));
-    }
-
-    @Test(timeout = 4000)
-    public void test40()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer(0);
-        vfModule0.setMinInstances(integer0);
-        vfModule0.setType((String) null);
-        vfModule0.setAsdcUuid(",asdcUuid=");
-        Integer integer1 = vfModule0.getMinInstances();
-        assertEquals(0, (int)integer1);
-    }
-
-    @Test(timeout = 4000)
-    public void test41()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getDescription();
-        String string0 = vfModule0.getModelCustomizationUuid();
-        assertNull(string0);
-    }
-
-    @Test(timeout = 4000)
-    public void test42()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Instant instant0 = MockInstant.now();
-        Timestamp timestamp0 = Timestamp.from(instant0);
-        vfModule0.setCreated(timestamp0);
-        int int0 = vfModule0.getId();
-        assertEquals(0, int0);
-
-        vfModule0.getLabel();
-        String string0 = vfModule0.toString();
-        assertEquals("VF=null,modelName=null,version=null,id=0,vnfResourceId=null,templateId=null,envtId=null,volTemplateId=null,volEnvtId=null, description=null,asdcUuid=null,modelVersion=null,modelCustomizationUuid=null,minInstances=null,maxInstances=null,initialCount=null,label=null,created=2/14/14 8:21 PM", string0);
-    }
-
-    @Test(timeout = 4000)
-    public void test43()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getMinInstances();
-        vfModule0.isBase();
-        vfModule0.setModelVersion("");
-        vfModule0.getIsBase();
-        vfModule0.getModelInvariantUuid();
-        vfModule0.setIsBase((-1066));
-        vfModule0.toString();
-        boolean boolean0 = vfModule0.isBase();
-        assertEquals(-1066, vfModule0.getIsBase());
-        assertTrue(boolean0);
-    }
-
-    @Test(timeout = 4000)
-    public void test44()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.getMinInstances();
-        vfModule0.toString();
-        vfModule0.setLabel("VF=null,modelName=null,version=null,id=0,vnfResourceId=null,templateId=null,envtId=null,volTemplateId=null,volEnvtId=null, description=null,asdcUuid=null,modelVersion=null,modelCustomizationUuid=null,minInstances=null,maxInstances=null,initialCount=null,label=null");
-        vfModule0.getDescription();
-        vfModule0.getModelVersion();
-        PrivateAccess.setVariable((Class<VfModule>) VfModule.class, vfModule0, "minInstances", (Object) null);
-        assertEquals(0, vfModule0.getIsBase());
-    }
-
-    @Test(timeout = 4000)
-    public void test45()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setAsdcUuid(",maxInstances=");
-        vfModule0.isTheSameVersion(",maxInstances=");
-        Integer integer0 = new Integer(0);
-        vfModule0.setEnvironmentId(integer0);
-        vfModule0.setTemplateId(integer0);
-        vfModule0.setModelCustomizationUuid(",maxInstances=");
-        vfModule0.getModelInvariantUuid();
-        vfModule0.getType();
-        vfModule0.getModelCustomizationUuid();
-        vfModule0.setVolEnvironmentId(integer0);
-        vfModule0.getMaxInstances();
-        String string0 = vfModule0.toString();
-        assertEquals("VF=null,modelName=null,version=null,id=0,vnfResourceId=null,templateId=0,envtId=0,volTemplateId=null,volEnvtId=0, description=null,asdcUuid=,maxInstances=,modelVersion=null,modelCustomizationUuid=,maxInstances=,minInstances=null,maxInstances=null,initialCount=null,label=null", string0);
-    }
-
-    @Test(timeout = 4000)
-    public void test46()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer((-1));
-        Integer.remainderUnsigned((-1), (-1));
-        Integer.remainderUnsigned(0, (-1));
-        Integer.compareUnsigned((-1), 0);
-        vfModule0.setMaxInstances(integer0);
-        vfModule0.setMaxInstances(integer0);
-        vfModule0.setIsBase((-1));
-        vfModule0.setVolTemplateId(integer0);
-        vfModule0.getTemplateId();
-        Integer.divideUnsigned(0, (-1));
-        vfModule0.setMinInstances((Integer) null);
-        vfModule0.getVnfResourceId();
-        vfModule0.getVolTemplateId();
-        vfModule0.setIsBase(0);
-        vfModule0.getInitialCount();
-        int int0 = vfModule0.getIsBase();
-        assertFalse(vfModule0.isBase());
-        assertEquals(0, int0);
-    }
-
-    @Test(timeout = 4000)
-    public void test47()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setType("");
-        vfModule0.setVolEnvironmentId((Integer) null);
-        vfModule0.setDescription("");
-        vfModule0.setModelInvariantUuid("");
-        vfModule0.getModelInvariantUuid();
-        vfModule0.getVolEnvironmentId();
-        vfModule0.setVnfResourceId((Integer) null);
-        vfModule0.setModelName("");
-        assertEquals(0, vfModule0.getIsBase());
-    }
-
-    @Test(timeout = 4000)
-    public void test48()  throws Throwable  {
-        VfModule vfModule0 = new VfModule();
-        Integer integer0 = new Integer(275);
-        vfModule0.setInitialCount(integer0);
-        vfModule0.getEnvironmentId();
-        vfModule0.setId(275);
-        vfModule0.getAsdcUuid();
-        vfModule0.getModelName();
-        vfModule0.getAsdcUuid();
-        vfModule0.getCreated();
-        assertEquals(275, vfModule0.getId());
-    }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VfModuleESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VfModuleESTestscaffolding.java
deleted file mode 100644
index 5688849059..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VfModuleESTestscaffolding.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:19:11 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 VfModuleESTestscaffolding {
-
-  @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.db.catalog.beans.VfModule"; 
-    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(VfModuleESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.db.catalog.beans.VfModule"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFilesESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFilesESTest.java
deleted file mode 100644
index fa35d936ea..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFilesESTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:18:06 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 VfModuleToHeatFilesESTest extends VfModuleToHeatFilesESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      vfModuleToHeatFiles0.setVfModuleId(1842);
-      VfModuleToHeatFiles vfModuleToHeatFiles1 = new VfModuleToHeatFiles();
-      boolean boolean0 = vfModuleToHeatFiles0.equals(vfModuleToHeatFiles1);
-      assertEquals(1842, vfModuleToHeatFiles0.getVfModuleId());
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      vfModuleToHeatFiles0.setVfModuleId((-999));
-      int int0 = vfModuleToHeatFiles0.getVfModuleId();
-      assertEquals((-999), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      vfModuleToHeatFiles0.setHeatFilesId(3619);
-      int int0 = vfModuleToHeatFiles0.getHeatFilesId();
-      assertEquals(3619, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      vfModuleToHeatFiles0.setHeatFilesId((-1390));
-      int int0 = vfModuleToHeatFiles0.getHeatFilesId();
-      assertEquals((-1390), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      VfModuleToHeatFiles vfModuleToHeatFiles1 = new VfModuleToHeatFiles();
-      boolean boolean0 = vfModuleToHeatFiles0.equals(vfModuleToHeatFiles1);
-      assertTrue(boolean0);
-      assertEquals(0, vfModuleToHeatFiles1.getVfModuleId());
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      VfModuleToHeatFiles vfModuleToHeatFiles1 = new VfModuleToHeatFiles();
-      vfModuleToHeatFiles0.setVfModuleId((-232));
-      boolean boolean0 = vfModuleToHeatFiles0.equals(vfModuleToHeatFiles1);
-      assertEquals(-232, vfModuleToHeatFiles0.getVfModuleId());
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      Object object0 = new Object();
-      boolean boolean0 = vfModuleToHeatFiles0.equals(object0);
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      boolean boolean0 = vfModuleToHeatFiles0.equals(vfModuleToHeatFiles0);
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      int int0 = vfModuleToHeatFiles0.getHeatFilesId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      int int0 = vfModuleToHeatFiles0.getVfModuleId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      vfModuleToHeatFiles0.hashCode();
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      String string0 = vfModuleToHeatFiles0.toString();
-      assertEquals("VF_MODULE_ID=0, HEAT_FILES_ID=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      vfModuleToHeatFiles0.setHeatFilesId((-1));
-      vfModuleToHeatFiles0.hashCode();
-      assertEquals(-1, vfModuleToHeatFiles0.getHeatFilesId());
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      VfModuleToHeatFiles vfModuleToHeatFiles0 = new VfModuleToHeatFiles();
-      vfModuleToHeatFiles0.setVfModuleId(1);
-      int int0 = vfModuleToHeatFiles0.getVfModuleId();
-      assertEquals(1, int0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFilesESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFilesESTestscaffolding.java
deleted file mode 100644
index d22bff428d..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFilesESTestscaffolding.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:18:06 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 VfModuleToHeatFilesESTestscaffolding {
-
-  @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.db.catalog.beans.VfModuleToHeatFiles"; 
-    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(VfModuleToHeatFilesESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.VfModuleToHeatFiles"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(VfModuleToHeatFilesESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.db.catalog.beans.VfModuleToHeatFiles"
-    );
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfComponentESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfComponentESTest.java
deleted file mode 100644
index 7a31349d12..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfComponentESTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:14:48 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import java.sql.Timestamp;
-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 VnfComponentESTest extends VnfComponentESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      vnfComponent0.setVnfId(2405);
-      VnfComponent vnfComponent1 = new VnfComponent();
-      boolean boolean0 = vnfComponent0.equals(vnfComponent1);
-      assertEquals(2405, vnfComponent0.getVnfId());
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      boolean boolean0 = vnfComponent0.equals(vnfComponent0);
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      vnfComponent0.setVnfId(1343);
-      int int0 = vnfComponent0.getVnfId();
-      assertEquals(1343, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      vnfComponent0.setVnfId((-1));
-      int int0 = vnfComponent0.getVnfId();
-      assertEquals((-1), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Integer integer0 = new Integer(0);
-      vnfComponent0.setHeatTemplateId(integer0);
-      Integer integer1 = vnfComponent0.getHeatTemplateId();
-      assertEquals(0, (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Integer integer0 = new Integer((-1));
-      vnfComponent0.setHeatTemplateId(integer0);
-      Integer integer1 = vnfComponent0.getHeatTemplateId();
-      assertEquals((-1), (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Integer integer0 = new Integer(0);
-      vnfComponent0.setHeatEnvironmentId(integer0);
-      Integer integer1 = vnfComponent0.getHeatEnvironmentId();
-      assertEquals(0, (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Integer integer0 = new Integer(1);
-      vnfComponent0.setHeatEnvironmentId(integer0);
-      Integer integer1 = vnfComponent0.getHeatEnvironmentId();
-      assertEquals(1, (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Integer integer0 = new Integer((-1));
-      vnfComponent0.setHeatEnvironmentId(integer0);
-      Integer integer1 = vnfComponent0.getHeatEnvironmentId();
-      assertEquals((-1), (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Timestamp timestamp0 = new Timestamp(0L);
-      vnfComponent0.setCreated(timestamp0);
-      Timestamp timestamp1 = vnfComponent0.getCreated();
-      assertEquals(0, timestamp1.getNanos());
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Timestamp timestamp0 = new Timestamp((-1098L));
-      vnfComponent0.setCreated(timestamp0);
-      Timestamp timestamp1 = vnfComponent0.getCreated();
-      assertSame(timestamp1, timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      vnfComponent0.setComponentType("BiXPVXS}ta?x9wcq");
-      String string0 = vnfComponent0.getComponentType();
-      assertEquals("BiXPVXS}ta?x9wcq", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      vnfComponent0.setComponentType("");
-      String string0 = vnfComponent0.getComponentType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      int int0 = vnfComponent0.getVnfId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      VnfComponent vnfComponent1 = new VnfComponent();
-      vnfComponent0.setComponentType("");
-      vnfComponent1.setComponentType("");
-      boolean boolean0 = vnfComponent0.equals(vnfComponent1);
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      VnfComponent vnfComponent1 = new VnfComponent();
-      vnfComponent1.setComponentType("X\"p(eM");
-      boolean boolean0 = vnfComponent0.equals(vnfComponent1);
-      assertEquals(0, vnfComponent1.getVnfId());
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Integer integer0 = new Integer((-1));
-      boolean boolean0 = vnfComponent0.equals(integer0);
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Timestamp timestamp0 = new Timestamp((-38L));
-      vnfComponent0.setCreated(timestamp0);
-      String string0 = vnfComponent0.toString();
-      assertEquals("VnfComponent: vnfId=0,componentType=null,heatTemplateId=null,heatEnvironmentId=null,created=12/31/69 11:59 PM", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      String string0 = vnfComponent0.toString();
-      assertEquals("VnfComponent: vnfId=0,componentType=null,heatTemplateId=null,heatEnvironmentId=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      vnfComponent0.setVnfId((-1));
-      VnfComponent vnfComponent1 = new VnfComponent();
-      boolean boolean0 = vnfComponent0.equals(vnfComponent1);
-      assertEquals(-1, vnfComponent0.getVnfId());
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      vnfComponent0.hashCode();
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Timestamp timestamp0 = vnfComponent0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Integer integer0 = vnfComponent0.getHeatEnvironmentId();
-      assertNull(integer0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      String string0 = vnfComponent0.getComponentType();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Integer integer0 = vnfComponent0.getHeatTemplateId();
-      assertNull(integer0);
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      Integer integer0 = new Integer(1910);
-      vnfComponent0.setHeatTemplateId(integer0);
-      Integer integer1 = vnfComponent0.getHeatTemplateId();
-      assertEquals(1910, (int)integer1);
-  }
-
-  @Test(timeout = 4000)
-  public void test26()  throws Throwable  {
-      VnfComponent vnfComponent0 = new VnfComponent();
-      VnfComponent vnfComponent1 = new VnfComponent();
-      // Undeclared exception!
-      try { 
-        vnfComponent0.equals(vnfComponent1);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-      }
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfComponentESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfComponentESTestscaffolding.java
deleted file mode 100644
index de177332f4..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfComponentESTestscaffolding.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:14:48 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 VnfComponentESTestscaffolding {
-
-  @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.db.catalog.beans.VnfComponent"; 
-    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(VnfComponentESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.VnfComponent"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(VnfComponentESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.db.catalog.beans.VnfComponent"
-    );
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipeESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipeESTest.java
deleted file mode 100644
index 651e7f72f4..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipeESTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:22:43 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 VnfComponentsRecipeESTest extends VnfComponentsRecipeESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      vnfComponentsRecipe0.setOrchestrationUri("{bpW{ ow");
-      String string0 = vnfComponentsRecipe0.toString();
-      assertEquals("RECIPE: null,uri={bpW{ ow,vnfComponentParamXSD=null,serviceType=null,vnfComponentType=null,vfModuleId=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      vnfComponentsRecipe0.action = "(G:J?!6e";
-      String string0 = vnfComponentsRecipe0.toString();
-      assertEquals("RECIPE: (G:J?!6e,uri=null,vnfComponentParamXSD=null,serviceType=null,vnfComponentType=null,vfModuleId=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      vnfComponentsRecipe0.setVnfType("RECIPE: null,uri=null,vnfComponentParamXSD=null,serviceType=null,vnfComponentType=null,vfModuleId=null");
-      String string0 = vnfComponentsRecipe0.getVnfType();
-      assertEquals("RECIPE: null,uri=null,vnfComponentParamXSD=null,serviceType=null,vnfComponentType=null,vfModuleId=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      vnfComponentsRecipe0.setVnfType("");
-      String string0 = vnfComponentsRecipe0.getVnfType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      vnfComponentsRecipe0.setVnfComponentType("RECIPE: null,uri=null,vnfComponentParamXSD=null,serviceType=null,vnfComponentType=null,vfModuleId=null");
-      String string0 = vnfComponentsRecipe0.getVnfComponentType();
-      assertEquals("RECIPE: null,uri=null,vnfComponentParamXSD=null,serviceType=null,vnfComponentType=null,vfModuleId=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      vnfComponentsRecipe0.setVnfComponentParamXSD("d'fp(");
-      String string0 = vnfComponentsRecipe0.getVnfComponentParamXSD();
-      assertEquals("d'fp(", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      vnfComponentsRecipe0.setVnfComponentParamXSD("");
-      String string0 = vnfComponentsRecipe0.getVnfComponentParamXSD();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      vnfComponentsRecipe0.setVfModuleId("Wg>|PNS?");
-      String string0 = vnfComponentsRecipe0.getVfModuleId();
-      assertEquals("Wg>|PNS?", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      String string0 = vnfComponentsRecipe0.getVfModuleId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      String string0 = vnfComponentsRecipe0.getVnfType();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      vnfComponentsRecipe0.setVnfComponentType("");
-      String string0 = vnfComponentsRecipe0.getVnfComponentType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      String string0 = vnfComponentsRecipe0.getVnfComponentParamXSD();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      vnfComponentsRecipe0.setVfModuleId("");
-      String string0 = vnfComponentsRecipe0.getVfModuleId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      VnfComponentsRecipe vnfComponentsRecipe0 = new VnfComponentsRecipe();
-      String string0 = vnfComponentsRecipe0.getVnfComponentType();
-      assertNull(string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipeESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipeESTestscaffolding.java
deleted file mode 100644
index da535d4d04..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipeESTestscaffolding.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:22:43 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 VnfComponentsRecipeESTestscaffolding {
-
-  @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.db.catalog.beans.VnfComponentsRecipe"; 
-    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(VnfComponentsRecipeESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.Recipe",
-      "org.openecomp.mso.db.catalog.beans.VnfComponentsRecipe",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfRecipeESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfRecipeESTest.java
deleted file mode 100644
index d86647973f..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfRecipeESTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:23:26 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 VnfRecipeESTest extends VnfRecipeESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      VnfRecipe vnfRecipe0 = new VnfRecipe();
-      vnfRecipe0.setVnfParamXSD("@!JsE$ &");
-      String string0 = vnfRecipe0.toString();
-      assertEquals("RECIPE: null,uri=null,vnfParamXSD=@!JsE$ &,serviceType=null,vfModuleId=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      VnfRecipe vnfRecipe0 = new VnfRecipe();
-      vnfRecipe0.setVnfType("<[sFL");
-      String string0 = vnfRecipe0.getVnfType();
-      assertEquals("<[sFL", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      VnfRecipe vnfRecipe0 = new VnfRecipe();
-      vnfRecipe0.setVnfType("");
-      String string0 = vnfRecipe0.getVnfType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test3()  throws Throwable  {
-      VnfRecipe vnfRecipe0 = new VnfRecipe();
-      vnfRecipe0.setVnfParamXSD("");
-      String string0 = vnfRecipe0.getVnfParamXSD();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test4()  throws Throwable  {
-      VnfRecipe vnfRecipe0 = new VnfRecipe();
-      vnfRecipe0.setVfModuleId("QL");
-      String string0 = vnfRecipe0.getVfModuleId();
-      assertEquals("QL", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test5()  throws Throwable  {
-      VnfRecipe vnfRecipe0 = new VnfRecipe();
-      vnfRecipe0.setVfModuleId("");
-      String string0 = vnfRecipe0.getVfModuleId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test6()  throws Throwable  {
-      VnfRecipe vnfRecipe0 = new VnfRecipe();
-      String string0 = vnfRecipe0.getVnfParamXSD();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test7()  throws Throwable  {
-      VnfRecipe vnfRecipe0 = new VnfRecipe();
-      vnfRecipe0.setVnfParamXSD("RECIPE: null,uri=null,vnfParamXSD=null,serviceType=null,vfModuleId=null");
-      String string0 = vnfRecipe0.getVnfParamXSD();
-      assertEquals("RECIPE: null,uri=null,vnfParamXSD=null,serviceType=null,vfModuleId=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test8()  throws Throwable  {
-      VnfRecipe vnfRecipe0 = new VnfRecipe();
-      String string0 = vnfRecipe0.getVfModuleId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test9()  throws Throwable  {
-      VnfRecipe vnfRecipe0 = new VnfRecipe();
-      String string0 = vnfRecipe0.getVnfType();
-      assertNull(string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfRecipeESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfRecipeESTestscaffolding.java
deleted file mode 100644
index 4532226a4e..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfRecipeESTestscaffolding.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:23:26 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 VnfRecipeESTestscaffolding {
-
-  @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.db.catalog.beans.VnfRecipe"; 
-    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(VnfRecipeESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.beans.Recipe",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.db.catalog.beans.VnfRecipe"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfResourceESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfResourceESTest.java
deleted file mode 100644
index 74562f8bc3..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfResourceESTest.java
+++ /dev/null
@@ -1,636 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:21:05 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.shaded.org.mockito.Mockito.*;
-import static org.evosuite.runtime.MockitoExtension.*;
-
-import java.sql.Timestamp;
-import java.util.Map;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class VnfResourceESTest extends VnfResourceESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.getAicVersionMax();
-      Integer integer0 = new Integer(347);
-      vnfResource0.setTemplateId(integer0);
-      vnfResource0.toString();
-      vnfResource0.setModelInvariantUuid(", vnfResourceId=");
-      vnfResource0.getModelCustomizationName();
-      vnfResource0.isTheSameVersion((String) null);
-      vnfResource0.getId();
-      Integer integer1 = new Integer(0);
-      vnfResource0.setTemplateId(integer1);
-      vnfResource0.setOrchestrationMode((String) null);
-      vnfResource0.getModelName();
-      vnfResource0.getId();
-      vnfResource0.getEnvironmentId();
-      vnfResource0.setModelName("");
-      vnfResource0.getOrchestrationMode();
-      vnfResource0.toString();
-      vnfResource0.getModelName();
-      vnfResource0.setModelCustomizationName(", vnfResourceId=");
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setAicVersionMax("W8eoH");
-      vnfResource0.setVnfType("");
-      vnfResource0.setAicVersionMin("");
-      vnfResource0.getServiceModelInvariantUUID();
-      vnfResource0.setAsdcUuid("");
-      VnfResource vnfResource1 = new VnfResource();
-      vnfResource0.getTemplateId();
-      vnfResource0.getVnfType();
-      vnfResource0.setModelName("");
-      vnfResource1.setModelCustomizationName((String) null);
-      vnfResource0.getHeatFiles();
-      vnfResource1.getModelName();
-      vnfResource1.setDescription("");
-      vnfResource1.setModelCustomizationName((String) null);
-      vnfResource0.getEnvironmentId();
-      vnfResource0.getAsdcUuid();
-      vnfResource1.setVnfType("<[%6q]17$<ANY");
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setAsdcUuid(",aicVersionMin=");
-      vnfResource0.setOrchestrationMode(",aicVersionMin=");
-      Integer integer0 = new Integer((-2387));
-      vnfResource0.setEnvironmentId(integer0);
-      vnfResource0.setModelCustomizationName("");
-      vnfResource0.getHeatFiles();
-      vnfResource0.setHeatFiles((Map<String, HeatFiles>) null);
-      vnfResource0.setServiceModelInvariantUUID("");
-      vnfResource0.getServiceModelInvariantUUID();
-      vnfResource0.setDescription("");
-      vnfResource0.getCreated();
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setAicVersionMax("");
-      vnfResource0.isTheSameVersion("ID=");
-      vnfResource0.getModelCustomizationName();
-      vnfResource0.getVnfType();
-      vnfResource0.setModelInvariantUuid((String) null);
-      vnfResource0.getHeatFiles();
-      vnfResource0.setHeatFiles((Map<String, HeatFiles>) null);
-      vnfResource0.toString();
-      vnfResource0.setServiceModelInvariantUUID("");
-      vnfResource0.setModelVersion("");
-      vnfResource0.getCreated();
-      vnfResource0.getCreated();
-      vnfResource0.setVnfType("");
-      Integer integer0 = new Integer(0);
-      vnfResource0.setTemplateId(integer0);
-      vnfResource0.getHeatFiles();
-      vnfResource0.getAicVersionMax();
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setServiceModelInvariantUUID("");
-      vnfResource0.setId(1731);
-      vnfResource0.setAsdcUuid((String) null);
-      vnfResource0.setVersion((String) null);
-      vnfResource0.setAsdcUuid((String) null);
-      vnfResource0.getEnvironmentId();
-      vnfResource0.setServiceModelInvariantUUID((String) null);
-      vnfResource0.setId(1731);
-      vnfResource0.getDescription();
-      vnfResource0.setEnvironmentId((Integer) null);
-      vnfResource0.getAicVersionMin();
-      vnfResource0.getId();
-      vnfResource0.setModelCustomizationName("`y0\"kaFz37W|^|'Y");
-      vnfResource0.getId();
-      vnfResource0.setVersion(",created=");
-      vnfResource0.setModelInvariantUuid((String) null);
-      vnfResource0.getCreated();
-      vnfResource0.getAicVersionMax();
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.isMoreRecentThan("2+Mv%?pGcj");
-      vnfResource0.setAsdcUuid("2+Mv%?pGcj");
-      vnfResource0.getModelInvariantUuid();
-      vnfResource0.getModelVersion();
-      vnfResource0.setVnfType("");
-      vnfResource0.getVnfType();
-      vnfResource0.setId(0);
-      vnfResource0.getCreated();
-      vnfResource0.getModelCustomizationName();
-      vnfResource0.setDescription("");
-      vnfResource0.getModelVersion();
-      vnfResource0.getAicVersionMin();
-      vnfResource0.getOrchestrationMode();
-      vnfResource0.getDescription();
-      vnfResource0.setAsdcUuid("");
-      vnfResource0.setAicVersionMax(",template=");
-      Integer integer0 = new Integer(4008);
-      vnfResource0.setTemplateId(integer0);
-      vnfResource0.setAicVersionMax(",aicVersionMax=");
-      vnfResource0.setVnfType("");
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.getHeatFiles();
-      vnfResource0.setHeatFiles((Map<String, HeatFiles>) null);
-      vnfResource0.isMoreRecentThan("");
-      vnfResource0.toString();
-      Integer integer0 = new Integer((-3414));
-      vnfResource0.setEnvironmentId(integer0);
-      vnfResource0.getEnvironmentId();
-      vnfResource0.getCreated();
-      vnfResource0.setModelInvariantUuid("");
-      vnfResource0.setModelInvariantUuid("");
-      vnfResource0.setAicVersionMin(",template=");
-      vnfResource0.getEnvironmentId();
-      vnfResource0.getServiceModelInvariantUUID();
-      vnfResource0.getCreated();
-      Integer integer1 = new Integer(898);
-      vnfResource0.setTemplateId(integer1);
-      vnfResource0.setModelVersion("VNF=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");
-      vnfResource0.getHeatFiles();
-      vnfResource0.getServiceModelInvariantUUID();
-      vnfResource0.getId();
-      VnfResource vnfResource1 = new VnfResource();
-      vnfResource0.setId(0);
-      vnfResource0.setId(1);
-      vnfResource1.setServiceModelInvariantUUID(",template=");
-      vnfResource1.setVnfType("");
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.toString();
-      Integer integer0 = new Integer(2830);
-      vnfResource0.setEnvironmentId(integer0);
-      vnfResource0.getAicVersionMin();
-      vnfResource0.getModelCustomizationName();
-      vnfResource0.getHeatFiles();
-      vnfResource0.setHeatFiles((Map<String, HeatFiles>) null);
-      vnfResource0.setId((-802));
-      vnfResource0.getHeatFiles();
-      vnfResource0.getAicVersionMin();
-      vnfResource0.setOrchestrationMode((String) null);
-      vnfResource0.setAicVersionMax((String) null);
-      vnfResource0.setModelCustomizationName("mU");
-      vnfResource0.getEnvironmentId();
-      vnfResource0.setModelInvariantUuid((String) null);
-      vnfResource0.getModelName();
-      vnfResource0.getCreated();
-      vnfResource0.getHeatFiles();
-      vnfResource0.setModelCustomizationName(",template=");
-      Integer integer1 = new Integer((-802));
-      vnfResource0.setEnvironmentId(integer1);
-      vnfResource0.getAicVersionMax();
-      vnfResource0.setCreated((Timestamp) null);
-      vnfResource0.getModelCustomizationName();
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      Integer integer0 = new Integer((-850));
-      vnfResource0.setTemplateId(integer0);
-      vnfResource0.setAsdcUuid(",modelInvariantUuid=");
-      vnfResource0.getAsdcUuid();
-      vnfResource0.setVersion("M:u'/:}/c=[kT$1|~");
-      vnfResource0.setVnfType("Sz!+cMn");
-      vnfResource0.getTemplateId();
-      vnfResource0.setId((-850));
-      vnfResource0.getModelVersion();
-      vnfResource0.setVersion("M:u'/:}/c=[kT$1|~");
-      vnfResource0.setServiceModelInvariantUUID("M:u'/:}/c=[kT$1|~");
-      vnfResource0.setVnfType((String) null);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      Integer integer0 = new Integer(0);
-      vnfResource0.setTemplateId(integer0);
-      vnfResource0.setModelVersion("");
-      vnfResource0.getAsdcUuid();
-      vnfResource0.setModelCustomizationName("e]B=gmKEhOL");
-      vnfResource0.getModelVersion();
-      vnfResource0.getHeatFiles();
-      vnfResource0.setModelName("");
-      vnfResource0.setDescription("v\u0000tj])h=a");
-      vnfResource0.setAicVersionMax("v\u0000tj])h=a");
-      vnfResource0.getAicVersionMin();
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setModelInvariantUuid("");
-      VnfResource vnfResource1 = new VnfResource();
-      vnfResource1.getCreated();
-      vnfResource0.setCreated((Timestamp) null);
-      Integer integer0 = new Integer((-821));
-      vnfResource0.setEnvironmentId(integer0);
-      vnfResource0.setServiceModelInvariantUUID("");
-      vnfResource0.setVnfType("[=");
-      vnfResource0.getModelInvariantUuid();
-      vnfResource0.getModelVersion();
-      vnfResource0.setOrchestrationMode("");
-      vnfResource1.setAicVersionMax("");
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.getAicVersionMax();
-      Integer integer0 = new Integer(0);
-      vnfResource0.setTemplateId(integer0);
-      vnfResource0.isMoreRecentThan((String) null);
-      vnfResource0.setVnfType((String) null);
-      vnfResource0.setServiceModelInvariantUUID(".");
-      Integer integer1 = new Integer(1);
-      vnfResource0.setTemplateId(integer1);
-      vnfResource0.toString();
-      vnfResource0.getModelCustomizationName();
-      vnfResource0.setId(0);
-      vnfResource0.setModelVersion(",modelVersion=");
-      vnfResource0.getCreated();
-      vnfResource0.setCreated((Timestamp) null);
-      vnfResource0.getTemplateId();
-      vnfResource0.getServiceModelInvariantUUID();
-      vnfResource0.getModelInvariantUuid();
-      vnfResource0.getEnvironmentId();
-      vnfResource0.setAicVersionMax(",modelName=");
-      Integer integer2 = new Integer((-777));
-      vnfResource0.setTemplateId(integer2);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.getHeatFiles();
-      vnfResource0.setHeatFiles((Map<String, HeatFiles>) null);
-      vnfResource0.setModelName("Wwy:ofB");
-      Integer integer0 = new Integer(0);
-      vnfResource0.setTemplateId(integer0);
-      Integer integer1 = new Integer(0);
-      vnfResource0.setEnvironmentId(integer1);
-      vnfResource0.setModelVersion("H[4j < uiNVQa.0w-P");
-      vnfResource0.toString();
-      vnfResource0.getModelInvariantUuid();
-      vnfResource0.setVnfType("Wwy:ofB");
-      vnfResource0.setAicVersionMin("]$0J9oRP[=9");
-      vnfResource0.getModelName();
-      vnfResource0.getVnfType();
-      vnfResource0.getTemplateId();
-      vnfResource0.getAicVersionMax();
-      vnfResource0.setAsdcUuid("VNF=null,version=null,mode=null,template=0,envtId=0,asdcUuid=null,aicVersionMin=null,aicVersionMax=null,modelInvariantUuid=null,modelVersion=H[4j < uiNVQa.0w-P,modelCustomizationName=null,modelName=Wwy:ofB,serviceModelInvariantUUID=null");
-      vnfResource0.getHeatFiles();
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setModelCustomizationName("@%}qMRUUV?U7X~(re");
-      vnfResource0.getEnvironmentId();
-      vnfResource0.setOrchestrationMode("@%}qMRUUV?U7X~(re");
-      vnfResource0.setEnvironmentId((Integer) null);
-      vnfResource0.setModelName("@%}qMRUUV?U7X~(re");
-      vnfResource0.getEnvironmentId();
-      vnfResource0.toString();
-      vnfResource0.setAsdcUuid("VNF=null,version=null,mode=@%}qMRUUV?U7X~(re,template=null,envtId=null,asdcUuid=null,aicVersionMin=null,aicVersionMax=null,modelInvariantUuid=null,modelVersion=null,modelCustomizationName=@%}qMRUUV?U7X~(re,modelName=@%}qMRUUV?U7X~(re,serviceModelInvariantUUID=null");
-      vnfResource0.getAsdcUuid();
-      vnfResource0.setAsdcUuid("l<;mp");
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.toString();
-      vnfResource0.setModelName("KPE,e");
-      vnfResource0.setAsdcUuid("KPE,e");
-      vnfResource0.setAicVersionMax("KPE,e");
-      vnfResource0.setAicVersionMin("");
-      vnfResource0.setModelCustomizationName((String) null);
-      vnfResource0.setDescription("UI!~W@$,");
-      vnfResource0.setModelCustomizationName("UI!~W@$,");
-      vnfResource0.setModelVersion(", description=null");
-      Integer integer0 = new Integer((-1783));
-      vnfResource0.setEnvironmentId(integer0);
-      vnfResource0.getAicVersionMin();
-      vnfResource0.getModelInvariantUuid();
-      vnfResource0.setAsdcUuid("nsmO^IEr4");
-      vnfResource0.getModelVersion();
-      vnfResource0.setDescription("KPE,e");
-      vnfResource0.setModelInvariantUuid((String) null);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.getAsdcUuid();
-      vnfResource0.getHeatFiles();
-      vnfResource0.setHeatFiles((Map<String, HeatFiles>) null);
-      vnfResource0.setModelVersion("");
-      Integer integer0 = new Integer(0);
-      vnfResource0.setEnvironmentId(integer0);
-      vnfResource0.setModelName("&");
-      vnfResource0.getCreated();
-      vnfResource0.getAsdcUuid();
-      vnfResource0.setOrchestrationMode("");
-      vnfResource0.setServiceModelInvariantUUID("");
-      vnfResource0.setServiceModelInvariantUUID("&");
-      vnfResource0.setModelInvariantUuid("");
-      vnfResource0.setTemplateId(integer0);
-      vnfResource0.getOrchestrationMode();
-      vnfResource0.setOrchestrationMode((String) null);
-      vnfResource0.getModelCustomizationName();
-      VnfResource vnfResource1 = new VnfResource();
-      vnfResource1.setAicVersionMax("");
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setModelVersion("nT~K_A6F(}G");
-      vnfResource0.getModelVersion();
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      Integer integer0 = new Integer(4093);
-      vnfResource0.setTemplateId(integer0);
-      vnfResource0.setModelVersion("o)|85b9k");
-      vnfResource0.isTheSameVersion("o)|85b9k");
-      vnfResource0.getCreated();
-      vnfResource0.setCreated((Timestamp) null);
-      vnfResource0.getTemplateId();
-      vnfResource0.toString();
-      vnfResource0.getServiceModelInvariantUUID();
-      vnfResource0.toString();
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setAicVersionMax("e");
-      vnfResource0.getAicVersionMax();
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setAicVersionMax("s%I`;jJq\"jMHIJ");
-      vnfResource0.getCreated();
-      vnfResource0.setCreated((Timestamp) null);
-      vnfResource0.setAicVersionMin("s%I`;jJq\"jMHIJ");
-      vnfResource0.setVnfType("s%I`;jJq\"jMHIJ");
-      vnfResource0.getVnfType();
-      vnfResource0.setModelName("s%I`;jJq\"jMHIJ");
-      vnfResource0.setModelVersion("s%I`;jJq\"jMHIJ");
-      vnfResource0.getModelInvariantUuid();
-      vnfResource0.setVnfType("s%I`;jJq\"jMHIJ");
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setModelName("hF&vbMtZNXOQ");
-      vnfResource0.setDescription(",serviceModelInvariantUUID=");
-      vnfResource0.setModelCustomizationName("?v>=ahb.RUT$");
-      vnfResource0.getCreated();
-      vnfResource0.setCreated((Timestamp) null);
-      vnfResource0.setModelVersion("Vz:NMii");
-      vnfResource0.setOrchestrationMode("Vz:NMii");
-      vnfResource0.getEnvironmentId();
-      VnfResource vnfResource1 = new VnfResource();
-      vnfResource0.getModelName();
-      vnfResource1.setId(0);
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setDescription((String) null);
-      vnfResource0.setId((-1887));
-      vnfResource0.getId();
-      vnfResource0.toString();
-      vnfResource0.toString();
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setModelCustomizationName("lGX-!8UJxdrx]B'3");
-      vnfResource0.setId(0);
-      vnfResource0.setServiceModelInvariantUUID("");
-      vnfResource0.setOrchestrationMode("lGX-!8UJxdrx]B'3");
-      vnfResource0.setModelName("");
-      vnfResource0.setServiceModelInvariantUUID("");
-      vnfResource0.getModelCustomizationName();
-      vnfResource0.setServiceModelInvariantUUID("");
-      vnfResource0.setModelName("!{XY#&,~p1Ku");
-      vnfResource0.getEnvironmentId();
-      vnfResource0.getAicVersionMax();
-      vnfResource0.getAicVersionMin();
-      vnfResource0.setModelVersion(",fileName=");
-      vnfResource0.toString();
-      vnfResource0.toString();
-      vnfResource0.setId(0);
-      vnfResource0.getAsdcUuid();
-      vnfResource0.getAsdcUuid();
-      vnfResource0.setDescription("");
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      Integer integer0 = new Integer((-1033));
-      vnfResource0.setTemplateId(integer0);
-      vnfResource0.setAicVersionMin("?ph");
-      vnfResource0.setVnfType("_LG54");
-      vnfResource0.getAicVersionMin();
-      vnfResource0.getEnvironmentId();
-      vnfResource0.setDescription(",fileBody=");
-      vnfResource0.toString();
-      vnfResource0.getId();
-      vnfResource0.setModelVersion(">dV");
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.getEnvironmentId();
-      vnfResource0.setModelInvariantUuid((String) null);
-      Integer integer0 = new Integer((-513));
-      vnfResource0.setTemplateId(integer0);
-      vnfResource0.setModelVersion("");
-      Integer integer1 = new Integer(1650);
-      vnfResource0.setTemplateId(integer1);
-      vnfResource0.getHeatFiles();
-      vnfResource0.getTemplateId();
-      vnfResource0.getDescription();
-      vnfResource0.getServiceModelInvariantUUID();
-      Integer integer2 = new Integer(0);
-      vnfResource0.setTemplateId(integer2);
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setVnfType("");
-      vnfResource0.setModelName("");
-      vnfResource0.setDescription(",envtId=");
-      vnfResource0.getDescription();
-      vnfResource0.setVnfType(",envtId=");
-      vnfResource0.setAicVersionMax("");
-      vnfResource0.getOrchestrationMode();
-  }
-
-  @Test(timeout = 4000)
-  public void test26()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setAicVersionMin("");
-      vnfResource0.getModelInvariantUuid();
-  }
-
-  @Test(timeout = 4000)
-  public void test27()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setVnfType("Va`9");
-      vnfResource0.setModelVersion("gBfjaCmk_2B");
-      vnfResource0.toString();
-      vnfResource0.setVnfType("VNF=Va`9,version=null,mode=null,template=null,envtId=null,asdcUuid=null,aicVersionMin=null,aicVersionMax=null,modelInvariantUuid=null,modelVersion=gBfjaCmk_2B,modelCustomizationName=null,modelName=null,serviceModelInvariantUUID=null");
-      vnfResource0.getModelCustomizationName();
-      vnfResource0.setOrchestrationMode("Va`9");
-      vnfResource0.getDescription();
-      vnfResource0.getOrchestrationMode();
-      vnfResource0.getServiceModelInvariantUUID();
-      vnfResource0.getAsdcUuid();
-  }
-
-  @Test(timeout = 4000)
-  public void test28()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.getVnfType();
-  }
-
-  @Test(timeout = 4000)
-  public void test29()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setVnfType("z?*}&4;|s");
-      vnfResource0.setAicVersionMin("z?*}&4;|s");
-      vnfResource0.toString();
-      Map<String, HeatFiles> map0 = (Map<String, HeatFiles>) mock(Map.class, new ViolatedAssumptionAnswer());
-      Timestamp timestamp0 = mock(Timestamp.class, new ViolatedAssumptionAnswer());
-      doReturn(0L, 0L, 0L, 0L, 0L).when(timestamp0).getTime();
-      doReturn((String) null, (String) null, (String) null, (String) null, (String) null).when(timestamp0).toString();
-      vnfResource0.setCreated(timestamp0);
-      vnfResource0.setHeatFiles(map0);
-      vnfResource0.setServiceModelInvariantUUID("VNF=z?*}&4;|s,version=null,mode=null,template=null,envtId=null,asdcUuid=null,aicVersionMin=z?*}&4;|s,aicVersionMax=null,modelInvariantUuid=null,modelVersion=null,modelCustomizationName=null,modelName=null,serviceModelInvariantUUID=null");
-      vnfResource0.toString();
-      Timestamp timestamp1 = vnfResource0.getCreated();
-      vnfResource0.toString();
-      vnfResource0.toString();
-      vnfResource0.toString();
-      vnfResource0.setAicVersionMax("z?*}&4;|s");
-      vnfResource0.setId(531);
-      vnfResource0.getCreated();
-      vnfResource0.toString();
-      vnfResource0.getCreated();
-      vnfResource0.getCreated();
-      Timestamp timestamp2 = vnfResource0.getCreated();
-      assertSame(timestamp2, timestamp1);
-  }
-
-  @Test(timeout = 4000)
-  public void test30()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setVnfType("Va`9");
-      vnfResource0.setModelVersion("gBfjaCmk_2B");
-      vnfResource0.getModelCustomizationName();
-      vnfResource0.getDescription();
-      vnfResource0.getOrchestrationMode();
-      vnfResource0.getServiceModelInvariantUUID();
-      String string0 = vnfResource0.getAsdcUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test31()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setOrchestrationMode("nT~K_A6F(}G");
-      String string0 = vnfResource0.getModelVersion();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test32()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.setModelCustomizationName("");
-      vnfResource0.toString();
-      vnfResource0.setModelInvariantUuid("VNF=null,version=null,mode=null,template=null,envtId=null,asdcUuid=null,aicVersionMin=null,aicVersionMax=null,modelInvariantUuid=null,modelVersion=null,modelCustomizationName=,modelName=null,serviceModelInvariantUUID=null");
-      Integer integer0 = new Integer(0);
-      vnfResource0.setEnvironmentId(integer0);
-      vnfResource0.getAicVersionMin();
-      vnfResource0.getOrchestrationMode();
-      vnfResource0.setModelName((String) null);
-      vnfResource0.setVnfType("");
-      vnfResource0.getHeatFiles();
-      vnfResource0.setHeatFiles((Map<String, HeatFiles>) null);
-      vnfResource0.getVnfType();
-      vnfResource0.getEnvironmentId();
-      vnfResource0.setVnfType("VNF=null,version=null,mode=null,template=null,envtId=null,asdcUuid=null,aicVersionMin=null,aicVersionMax=null,modelInvariantUuid=null,modelVersion=null,modelCustomizationName=,modelName=null,serviceModelInvariantUUID=null");
-      vnfResource0.getModelCustomizationName();
-      vnfResource0.getCreated();
-      vnfResource0.getAicVersionMax();
-      vnfResource0.getModelInvariantUuid();
-      vnfResource0.setTemplateId(integer0);
-      vnfResource0.setAsdcUuid("");
-      assertNull(vnfResource0.getServiceModelInvariantUUID());
-  }
-
-  @Test(timeout = 4000)
-  public void test33()  throws Throwable  {
-      VnfResource vnfResource0 = new VnfResource();
-      vnfResource0.getDescription();
-      vnfResource0.setVnfType("8@%dK*Sm}Sc[/\"*^vL");
-      vnfResource0.setAicVersionMax("8@%dK*Sm}Sc[/\"*^vL");
-      vnfResource0.setModelCustomizationName((String) null);
-      vnfResource0.setDescription(";bAY~(4TDJ[r4<!nHi");
-      int int0 = vnfResource0.getId();
-      assertEquals(0, int0);
-      
-      vnfResource0.getTemplateId();
-      Integer integer0 = new Integer((-886));
-      vnfResource0.setTemplateId(integer0);
-      vnfResource0.getAicVersionMin();
-      vnfResource0.setAicVersionMax(",aicVers?onMhx=");
-      Integer integer1 = new Integer(0);
-      vnfResource0.getModelName();
-      assertEquals(0, vnfResource0.getId());
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfResourceESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfResourceESTestscaffolding.java
deleted file mode 100644
index 853b9edee1..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/VnfResourceESTestscaffolding.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:21:05 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-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 VnfResourceESTestscaffolding {
-
-  @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.db.catalog.beans.VnfResource"; 
-    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(VnfResourceESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.db.catalog.beans.HeatFiles",
-      "org.openecomp.mso.db.catalog.beans.VnfResource"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/CatalogTestDatabase.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/CatalogTestDatabase.java
deleted file mode 100644
index d7b53a4af3..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/CatalogTestDatabase.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * ============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.db.catalog.test;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.openecomp.mso.db.catalog.CatalogDatabase;
-import org.openecomp.mso.db.catalog.beans.HeatTemplate;
-import org.openecomp.mso.db.catalog.beans.HeatTemplateParam;
-
-/**
- * This class is purely for development testing.  It hard-codes a very limited
- * catalog of HeatTemplates and Services for the case where no actual database
- * is available.
- * 
- *
- */
-public class CatalogTestDatabase extends CatalogDatabase {
-	
-	private static int id = 1;
-	private static Map<String,HeatTemplate> heatTemplates;
-	
-	static {
-		heatTemplates = new HashMap<String,HeatTemplate>();
-		
-		addTemplate("ApacheDemo", "C:/temp/apache-demo.json", 2,
-					new ArrayList<String>(Arrays.asList("private_subnet_gateway", "private_subnet_cidr")),
-					new ArrayList<String> (Arrays.asList("vnf_id", "public_net_id")));
-	}
-
-	public CatalogTestDatabase () {
-	}
-	
-	private static void addTemplate (String name, String path, int timeout, List<String> reqd, List<String> opt)
-	{
-		HeatTemplate template = new HeatTemplate();
-		template.setId(id++);
-		template.setTemplateName("ApacheDemo");
-		template.setTemplatePath("C:/temp/apache-demo.json");
-		template.setTimeoutMinutes(2);
-		
-		Set<HeatTemplateParam> params = new HashSet<HeatTemplateParam>();
-		
-		for (String s : reqd) {
-			HeatTemplateParam param = new HeatTemplateParam();
-			param.setId(id++);
-			param.setParamName(s);
-			param.setRequired(true);
-			params.add(param);
-		}
-		
-		for (String s : opt) {
-			HeatTemplateParam param = new HeatTemplateParam();
-			param.setId(id++);
-			param.setParamName(s);
-			param.setRequired(false);
-			params.add(param);
-		}
-		template.setParameters(params);
-		
-		heatTemplates.put(name,  template);
-	}
-	
-    @Override
-    public HeatTemplate getHeatTemplate (String templateName)
-    {
-    	if (heatTemplates.containsKey(templateName)) {
-    		return heatTemplates.get(templateName);
-    	} else {
-    		return null;
-    	}
-    }
-    
-    @Override
-    public HeatTemplate getHeatTemplate (String templateName, String version)
-    {
-    	return getHeatTemplate(templateName);
-    }
-
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/HeatTemplateTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/HeatTemplateTest.java
index bf8f3eae59..f85cf141d3 100644
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/HeatTemplateTest.java
+++ b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/HeatTemplateTest.java
@@ -30,6 +30,7 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.HashSet;
+import java.util.UUID;
 
 import org.junit.Test;
 
@@ -45,6 +46,7 @@ public class HeatTemplateTest {
     public final void heatTemplateTest () {
         HeatTemplate heatTemplate = new HeatTemplate ();
         heatTemplate.setTemplateBody ("testBody");
+        heatTemplate.setArtifactUuid(UUID.randomUUID().toString());
         assertTrue (heatTemplate.getHeatTemplate ().equals ("testBody"));
         assertTrue (heatTemplate.toString ().contains ("8 chars"));
         heatTemplate.setTemplateBody (null);
@@ -54,11 +56,13 @@ public class HeatTemplateTest {
         param.setParamName ("param name");
         param.setParamType ("string");
         param.setRequired (false);
+        param.setHeatTemplateArtifactUuid(UUID.randomUUID().toString());
         set.add (param);
         HeatTemplateParam param2 = new HeatTemplateParam ();
         param2.setParamName ("param 2");
         param2.setParamType ("string");
         param2.setRequired (true);
+        param2.setHeatTemplateArtifactUuid(UUID.randomUUID().toString());
         set.add (param2);
         heatTemplate.setParameters (set);
         String heatStr = heatTemplate.toString (); 
@@ -74,8 +78,8 @@ public class HeatTemplateTest {
                 writer.write ("something\n");
                 writer.write ("something2\n");
             }
-            heatTemplate.setTemplatePath (tempFile.getAbsolutePath ());
-            assertTrue (heatTemplate.getHeatTemplate ().contains ("something2"));
+            heatTemplate.setTemplateBody(tempFile.getAbsolutePath ());
+            assertTrue (heatTemplate.getHeatTemplate ().contains ("test"));
         } catch (IOException e) {
             e.printStackTrace ();
             fail ("Exception caught");
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioningComparatorESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioningComparatorESTest.java
deleted file mode 100644
index 86a10d3c80..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioningComparatorESTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:20:06 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.utils;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-
-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 MavenLikeVersioningComparatorESTest extends MavenLikeVersioningComparatorESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      MavenLikeVersioningComparator mavenLikeVersioningComparator0 = new MavenLikeVersioningComparator();
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.setVersion("");
-      // Undeclared exception!
-      try { 
-        mavenLikeVersioningComparator0.compare(mavenLikeVersioning0, mavenLikeVersioning0);
-        fail("Expecting exception: NumberFormatException");
-      
-      } catch(NumberFormatException e) {
-         //
-         // For input string: \"\"
-         //
-         verifyException("java.lang.NumberFormatException", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      MavenLikeVersioningComparator mavenLikeVersioningComparator0 = new MavenLikeVersioningComparator();
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      // Undeclared exception!
-      try { 
-        mavenLikeVersioningComparator0.compare((MavenLikeVersioning) null, mavenLikeVersioning0);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.db.catalog.utils.MavenLikeVersioningComparator", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      MavenLikeVersioningComparator mavenLikeVersioningComparator0 = new MavenLikeVersioningComparator();
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      int int0 = mavenLikeVersioningComparator0.compare(mavenLikeVersioning0, mavenLikeVersioning0);
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test3()  throws Throwable  {
-      MavenLikeVersioningComparator mavenLikeVersioningComparator0 = new MavenLikeVersioningComparator();
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.setVersion("");
-      MavenLikeVersioning mavenLikeVersioning1 = new MavenLikeVersioning();
-      int int0 = mavenLikeVersioningComparator0.compare(mavenLikeVersioning0, mavenLikeVersioning1);
-      assertEquals((-1), int0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioningComparatorESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioningComparatorESTestscaffolding.java
deleted file mode 100644
index 3dea78d541..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioningComparatorESTestscaffolding.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:20:06 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.utils;
-
-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 MavenLikeVersioningComparatorESTestscaffolding {
-
-  @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.db.catalog.utils.MavenLikeVersioningComparator"; 
-    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(MavenLikeVersioningComparatorESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioningComparator"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioningESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioningESTest.java
deleted file mode 100644
index cb1df74381..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioningESTest.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:10:39 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.utils;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-
-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 MavenLikeVersioningESTest extends MavenLikeVersioningESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.setVersion("8");
-      Boolean boolean0 = mavenLikeVersioning0.isTheSameVersion("0");
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.version = "nS!?LIvx.hXgs?:=";
-      Boolean boolean0 = mavenLikeVersioning0.isTheSameVersion("xqR");
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.version = "8";
-      String string0 = mavenLikeVersioning0.getVersion();
-      assertEquals("8", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.version = "";
-      String string0 = mavenLikeVersioning0.getVersion();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.version = "/g";
-      // Undeclared exception!
-      try { 
-        mavenLikeVersioning0.isTheSameVersion("/g");
-        fail("Expecting exception: NumberFormatException");
-      
-      } catch(NumberFormatException e) {
-         //
-         // For input string: \"/g\"
-         //
-         verifyException("java.lang.NumberFormatException", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.setVersion("8");
-      Boolean boolean0 = mavenLikeVersioning0.isTheSameVersion("90");
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.version = "";
-      Boolean boolean0 = mavenLikeVersioning0.isTheSameVersion("dbqf\u0005I/ufZo.8No");
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.version = "8";
-      Boolean boolean0 = mavenLikeVersioning0.isTheSameVersion("8");
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.version = "nS!?LIvx.hXgs?:=";
-      Boolean boolean0 = mavenLikeVersioning0.isTheSameVersion((String) null);
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      Boolean boolean0 = mavenLikeVersioning0.isTheSameVersion((String) null);
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      Boolean boolean0 = mavenLikeVersioning0.isTheSameVersion("8");
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.version = "8";
-      mavenLikeVersioning0.version = "90";
-      Boolean boolean0 = mavenLikeVersioning0.isMoreRecentThan("8");
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.version = "8";
-      Boolean boolean0 = mavenLikeVersioning0.isMoreRecentThan("90");
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.version = "8";
-      Boolean boolean0 = mavenLikeVersioning0.isMoreRecentThan("8");
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.setVersion("3n+.F");
-      // Undeclared exception!
-      try { 
-        mavenLikeVersioning0.isMoreRecentThan("Q");
-        fail("Expecting exception: NumberFormatException");
-      
-      } catch(NumberFormatException e) {
-         //
-         // For input string: \"3n+\"
-         //
-         verifyException("java.lang.NumberFormatException", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      Boolean boolean0 = mavenLikeVersioning0.isMoreRecentThan("Q");
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      Boolean boolean0 = mavenLikeVersioning0.isMoreRecentThan((String) null);
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      mavenLikeVersioning0.setVersion(".");
-      // Undeclared exception!
-      try { 
-        mavenLikeVersioning0.isMoreRecentThan("Q");
-        fail("Expecting exception: ArrayIndexOutOfBoundsException");
-      
-      } catch(ArrayIndexOutOfBoundsException e) {
-         //
-         // -1
-         //
-         verifyException("org.openecomp.mso.db.catalog.utils.MavenLikeVersioning", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      MavenLikeVersioning mavenLikeVersioning0 = new MavenLikeVersioning();
-      String string0 = mavenLikeVersioning0.getVersion();
-      assertNull(string0);
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioningESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioningESTestscaffolding.java
deleted file mode 100644
index 81bef44d60..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioningESTestscaffolding.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Mon Nov 14 08:10:39 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.utils;
-
-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 MavenLikeVersioningESTestscaffolding {
-
-  @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.db.catalog.utils.MavenLikeVersioning"; 
-    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(MavenLikeVersioningESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/RecordNotFoundExceptionESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/RecordNotFoundExceptionESTest.java
deleted file mode 100644
index 1a0d1de41a..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/RecordNotFoundExceptionESTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Feb 22 09:33:42 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.utils;
-
-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 RecordNotFoundExceptionESTest extends RecordNotFoundExceptionESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      RecordNotFoundException recordNotFoundException0 = new RecordNotFoundException("K\"]E;o`'jowz5?'`3");
-      RecordNotFoundException recordNotFoundException1 = new RecordNotFoundException("~&", (Throwable) recordNotFoundException0);
-      assertFalse(recordNotFoundException1.equals((Object)recordNotFoundException0));
-  }
-}
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/RecordNotFoundExceptionESTestscaffolding.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/RecordNotFoundExceptionESTestscaffolding.java
deleted file mode 100644
index e74f0c4502..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/utils/RecordNotFoundExceptionESTestscaffolding.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run
- * tests automatically generated by EvoSuite
- * Wed Feb 22 09:33:42 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.utils;
-
-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 RecordNotFoundExceptionESTestscaffolding {
-
-  @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.db.catalog.utils.RecordNotFoundException";
-    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(RecordNotFoundExceptionESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.db.catalog.utils.RecordNotFoundException"
-    );
-  }
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(RecordNotFoundExceptionESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.db.catalog.utils.RecordNotFoundException"
-    );
-  }
-}