Package rename

Step 2: package rename, fix pom.xml, fix integration tests

Issue-ID: INT-1869
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
Change-Id: Ia4c6823e4facc3791583fb39caba3bcc125b3af7

43 files changed, 113 insertions, 120 deletions

diff --git a/src/test/java/org/onap/pnfsimulator/event/EventDataServiceTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataServiceTest.java
index 5ed51cc..637c658 100644
--- a/src/test/java/org/onap/pnfsimulator/event/EventDataServiceTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataServiceTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.event;
+package org.onap.integration.simulators.nfsimulator.vesclient.event;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/onap/pnfsimulator/filesystem/InMemoryTemplateStorage.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/InMemoryTemplateStorage.java
index b86a0f9..b4534bf 100644
--- a/src/test/java/org/onap/pnfsimulator/filesystem/InMemoryTemplateStorage.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/InMemoryTemplateStorage.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.filesystem;
+package org.onap.integration.simulators.nfsimulator.vesclient.filesystem;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 import com.google.gson.JsonObject;
-import org.onap.pnfsimulator.db.Storage;
-import org.onap.pnfsimulator.template.Template;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.Template;
 
 public class InMemoryTemplateStorage implements Storage<Template> {
 
diff --git a/src/test/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessorTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherEventProcessorTest.java
index 9dfa002..e88715a 100644
--- a/src/test/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessorTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherEventProcessorTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.filesystem;
+package org.onap.integration.simulators.nfsimulator.vesclient.filesystem;
 
 import static junit.framework.TestCase.fail;
 import static org.mockito.MockitoAnnotations.initMocks;
@@ -39,8 +39,8 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.pnfsimulator.db.Storage;
-import org.onap.pnfsimulator.template.Template;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.Template;
 
 class WatcherEventProcessorTest {
 
@@ -54,7 +54,7 @@ class WatcherEventProcessorTest {
 
     @BeforeAll
     static void init() {
-        jsonFilePath = Paths.get("src/test/resources/org/onap/pnfsimulator/simulator/filesystem/test1.json");
+        jsonFilePath = Paths.get("src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/filesystem/test1.json");
     }
 
     @BeforeEach
diff --git a/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/SimulatorControllerTest.java
index 8dba750..2f13cec 100644
--- a/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/SimulatorControllerTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
@@ -30,14 +30,14 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.onap.pnfsimulator.event.EventData;
-import org.onap.pnfsimulator.event.EventDataService;
-import org.onap.pnfsimulator.rest.model.FullEvent;
-import org.onap.pnfsimulator.rest.model.SimulatorParams;
-import org.onap.pnfsimulator.rest.model.SimulatorRequest;
-import org.onap.pnfsimulator.simulator.SimulatorService;
-import org.onap.pnfsimulator.simulator.client.HttpResponseAdapter;
-import org.onap.pnfsimulator.simulatorconfig.SimulatorConfig;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.FullEvent;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorParams;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorRequest;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.SimulatorService;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpResponseAdapter;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig.SimulatorConfig;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventData;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventDataService;
 import org.quartz.SchedulerException;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
diff --git a/src/test/java/org/onap/pnfsimulator/rest/TemplateControllerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/TemplateControllerTest.java
index 17be475..0f468b9 100644
--- a/src/test/java/org/onap/pnfsimulator/rest/TemplateControllerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/TemplateControllerTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.onap.pnfsimulator.rest.TemplateController.CANNOT_OVERRIDE_TEMPLATE_MSG;
-import static org.onap.pnfsimulator.rest.TemplateController.TEMPLATE_NOT_FOUND_MSG;
+import static org.onap.integration.simulators.nfsimulator.vesclient.rest.TemplateController.CANNOT_OVERRIDE_TEMPLATE_MSG;
+import static org.onap.integration.simulators.nfsimulator.vesclient.rest.TemplateController.TEMPLATE_NOT_FOUND_MSG;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@@ -53,10 +53,10 @@ import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.onap.pnfsimulator.db.Storage;
-import org.onap.pnfsimulator.rest.model.SearchExp;
-import org.onap.pnfsimulator.template.Template;
-import org.onap.pnfsimulator.template.search.IllegalJsonValueException;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.IllegalJsonValueException;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SearchExp;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.Template;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
diff --git a/src/test/java/org/onap/pnfsimulator/rest/util/DateUtilTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/DateUtilTest.java
index 1591a59..f9bf3ef 100644
--- a/src/test/java/org/onap/pnfsimulator/rest/util/DateUtilTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/DateUtilTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest.util;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/ResponseBuilderTest.java
index 4e8e4dc..36d6c20 100644
--- a/src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/ResponseBuilderTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest.util;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest.util;
 
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/DbTemplateReaderTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/DbTemplateReaderTest.java
index c3f85f5..cc03d8a 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/DbTemplateReaderTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/DbTemplateReaderTest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -25,8 +25,8 @@ import org.assertj.core.api.Assertions;
 import org.bson.Document;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.onap.pnfsimulator.template.Template;
-import org.onap.pnfsimulator.template.TemplateService;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.Template;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.TemplateService;
 
 import java.io.IOException;
 import java.util.Optional;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProviderImplTest.java
index b5304a7..d57b653 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProviderImplTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -32,8 +32,8 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.onap.pnfsimulator.event.EventData;
-import org.onap.pnfsimulator.event.EventDataRepository;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventData;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventDataRepository;
 
 public class IncrementProviderImplTest {
     private IncrementProvider incrementProvider;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidRandomIntegerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidRandomIntegerTest.java
index 8198e95..e6a1213 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidRandomIntegerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidRandomIntegerTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidRandomStringTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidRandomStringTest.java
index 6834c0d..fad4ff9 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidRandomStringTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidRandomStringTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidTimestampTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidTimestampTest.java
index eda4070..54a72a9 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidTimestampTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidTimestampTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomIntegerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomIntegerTest.java
index be79488..5befed8 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomIntegerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomIntegerTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomPrimitiveIntegerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomPrimitiveIntegerTest.java
index 0843ad1..4747e4e 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomPrimitiveIntegerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomPrimitiveIntegerTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomStringTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomStringTest.java
index f0fdc0f..69d603c 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomStringTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomStringTest.java
@@ -18,10 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.DEFAULT_STRING_LENGTH;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -38,8 +37,8 @@ public class KeywordsExtractorValidRandomStringTest {
     private KeywordsExtractor keywordsExtractor;
 
     private static final Collection VALID_STRING_KEYWORDS = Arrays.asList(new Object[][]{
-        {"#RandomString", DEFAULT_STRING_LENGTH},
-        {"1#RandomString2", 1 + DEFAULT_STRING_LENGTH + 1},
+        {"#RandomString", KeywordsValueProvider.DEFAULT_STRING_LENGTH},
+        {"1#RandomString2", 1 + KeywordsValueProvider.DEFAULT_STRING_LENGTH + 1},
         {"#RandomString(23)", 23},
         {"#RandomString(11)12", 11 + 2},
         {"1#RandomString(11)", 1 + 11},
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampPrimitiveTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidTimestampPrimitiveTest.java
index 7743e55..af5fd8e 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampPrimitiveTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidTimestampPrimitiveTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidTimestampTest.java
index bf6f290..11c709b 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidTimestampTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandlerTest.java
index e36bb28..09bb46f 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandlerTest.java
@@ -18,10 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.DEFAULT_STRING_LENGTH;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
@@ -166,7 +165,7 @@ class KeywordsHandlerTest {
                 .get("domain").getAsString();
 
         assertThat(extraFields.length()).isEqualTo(4);
-        assertThat(newDomain.length()).isEqualTo(DEFAULT_STRING_LENGTH);
+        assertThat(newDomain.length()).isEqualTo(KeywordsValueProvider.DEFAULT_STRING_LENGTH);
     }
 
     @Test
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsValueProviderTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsValueProviderTest.java
index ac54237..43d6b73 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsValueProviderTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsValueProviderTest.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.DEFAULT_STRING_LENGTH;
 
 import java.util.Random;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 
@@ -34,7 +34,7 @@ class KeywordsValueProviderTest {
     @RepeatedTest(10)
     void randomLimitedStringTest() {
         String supplierResult = KeywordsValueProvider.getRandomLimitedString().apply();
-        assertEquals(DEFAULT_STRING_LENGTH, supplierResult.length());
+        Assertions.assertEquals(KeywordsValueProvider.DEFAULT_STRING_LENGTH, supplierResult.length());
     }
 
     @RepeatedTest(10)
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/SimulatorServiceTest.java
index d5426ec..4580714 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/SimulatorServiceTest.java
@@ -18,28 +18,29 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
-import org.onap.pnfsimulator.event.EventData;
-import org.onap.pnfsimulator.event.EventDataService;
-import org.onap.pnfsimulator.rest.model.FullEvent;
-import org.onap.pnfsimulator.rest.model.SimulatorParams;
-import org.onap.pnfsimulator.rest.model.SimulatorRequest;
-import org.onap.pnfsimulator.simulator.client.HttpClientAdapter;
-import org.onap.pnfsimulator.simulator.client.HttpResponseAdapter;
-import org.onap.pnfsimulator.simulator.client.HttpTestUtils;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
-import org.onap.pnfsimulator.simulator.scheduler.EventScheduler;
-import org.onap.pnfsimulator.simulatorconfig.SimulatorConfig;
-import org.onap.pnfsimulator.simulatorconfig.SimulatorConfigService;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.FullEvent;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorParams;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorRequest;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapter;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpResponseAdapter;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventScheduler;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig.SimulatorConfig;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig.SimulatorConfigService;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventData;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventDataService;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpTestUtils;
 import org.quartz.SchedulerException;
 
 import java.io.IOException;
@@ -102,7 +103,7 @@ class SimulatorServiceTest {
     private final SslAuthenticationHelper sslAuthenticationHelper = new SslAuthenticationHelper();
     private final TemplatePatcher templatePatcher = new TemplatePatcher();
     private final TemplateReader templateReader = new FilesystemTemplateReader(
-        "src/test/resources/org/onap/pnfsimulator/simulator/", GSON);
+        "src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/", GSON);
 
     private SimulatorService simulatorService;
     private EventDataService eventDataService;
@@ -234,7 +235,7 @@ class SimulatorServiceTest {
 
         when(simulatorConfigService.getConfiguration()).thenReturn(simulatorConfig);
 
-        assertEquals(simulatorService.getConfiguration(), simulatorConfig);
+        Assertions.assertEquals(simulatorService.getConfiguration(), simulatorConfig);
     }
 
     @Test
@@ -243,7 +244,7 @@ class SimulatorServiceTest {
 
         when(simulatorConfigService.updateConfiguration(simulatorConfig)).thenReturn(simulatorConfig);
 
-        assertEquals(simulatorService.updateConfiguration(simulatorConfig), simulatorConfig);
+        Assertions.assertEquals(simulatorService.updateConfiguration(simulatorConfig), simulatorConfig);
     }
 
     @Test
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplatePatcherTest.java
index 818c8be..13179aa 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplatePatcherTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/TemplateReaderTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateReaderTest.java
index f029fce..d25df49 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/TemplateReaderTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateReaderTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -34,7 +34,7 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
 @TestPropertySource
 class TemplateReaderTest {
 
-    private FilesystemTemplateReader templateReader = new FilesystemTemplateReader("src/test/resources/org/onap/pnfsimulator/simulator/", new Gson());
+    private FilesystemTemplateReader templateReader = new FilesystemTemplateReader("src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/", new Gson());
 
     @Test
     void testShouldReadJsonFromFile() throws IOException {
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/TemplateVariablesReplacerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateVariablesReplacerTest.java
index 5b7e4f4..9bbc3e1 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/TemplateVariablesReplacerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateVariablesReplacerTest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 
 import com.google.gson.Gson;
@@ -171,4 +171,4 @@ class TemplateVariablesReplacerTest {
         JSONAssert.assertEquals(expectedAsString, result.toString(), true);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/HttpApacheResponseAdapterFactoryTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpApacheResponseAdapterFactoryTest.java
index 2f8c6b3..136a7d9 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/HttpApacheResponseAdapterFactoryTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpApacheResponseAdapterFactoryTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -31,8 +31,8 @@ import java.io.IOException;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.onap.pnfsimulator.simulator.client.HttpTestUtils.createMockedHttpEntity;
-import static org.onap.pnfsimulator.simulator.client.HttpTestUtils.createStatusLine;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpTestUtils.createMockedHttpEntity;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpTestUtils.createStatusLine;
 
 class HttpApacheResponseAdapterFactoryTest {
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapterImplTest.java
index cfbc8c1..34243b6 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapterImplTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client;
 
 import org.apache.http.Header;
 import org.apache.http.HttpHeaders;
@@ -33,7 +33,7 @@ import org.apache.tomcat.util.codec.binary.Base64;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -49,8 +49,8 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.onap.pnfsimulator.simulator.client.HttpTestUtils.createMockedHttpEntity;
-import static org.onap.pnfsimulator.simulator.client.HttpTestUtils.createStatusLine;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpTestUtils.createMockedHttpEntity;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpTestUtils.createStatusLine;
 
 class HttpClientAdapterImplTest {
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/HttpTestUtils.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpTestUtils.java
index 02ff531..5dc8d8c 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/HttpTestUtils.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpTestUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.ProtocolVersion;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertAuthSslContextFactoryTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertAuthSslContextFactoryTest.java
index c64ddd7..eac7384 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertAuthSslContextFactoryTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertAuthSslContextFactoryTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
@@ -138,4 +138,4 @@ public class CertAuthSslContextFactoryTest {
     private String getPath(String fileName) {
         return CERTIFICATES_DIRECTORY + fileName;
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryFacadeTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryFacadeTest.java
index e6d3d03..805b54a 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryFacadeTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryFacadeTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryTest.java
index c213982..c5b447e 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/PasswordConverterTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/PasswordConverterTest.java
index fddfc5f..67a1599 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/PasswordConverterTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/PasswordConverterTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SSLContextFactoryTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SSLContextFactoryTest.java
index 85e40e5..cf22ebf 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SSLContextFactoryTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SSLContextFactoryTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/keywords/TwoParameterKeywordTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/TwoParameterKeywordTest.java
index 6477fbf..8e38738 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/keywords/TwoParameterKeywordTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/TwoParameterKeywordTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.keywords;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords;
 
 
 import io.vavr.Tuple1;
@@ -45,4 +45,4 @@ class TwoParameterKeywordTest {
         assertEquals(twoParameterKeyword.getAdditionalParameter1(), expectedParam1);
         assertEquals(twoParameterKeyword.getAdditionalParameter2(), expectedParam2);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventJobTest.java
index fed6bb6..b452956 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventJobTest.java
@@ -18,26 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.scheduler;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.BODY;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.CLIENT_ADAPTER;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.EVENT_ID;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.KEYWORDS_HANDLER;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.TEMPLATE_NAME;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.VES_URL;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
-import org.onap.pnfsimulator.simulator.KeywordsExtractor;
-import org.onap.pnfsimulator.simulator.KeywordsHandler;
-import org.onap.pnfsimulator.simulator.client.HttpClientAdapter;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.KeywordsExtractor;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.KeywordsHandler;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapter;
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
@@ -73,12 +67,12 @@ class EventJobTest {
         JsonObject body, HttpClientAdapter clientAdapter) {
 
         JobDataMap jobDataMap = new JobDataMap();
-        jobDataMap.put(TEMPLATE_NAME, templateName);
-        jobDataMap.put(KEYWORDS_HANDLER, new KeywordsHandler(new KeywordsExtractor(), (id) -> 1));
-        jobDataMap.put(EVENT_ID, eventId);
-        jobDataMap.put(VES_URL, vesUrl);
-        jobDataMap.put(BODY, body);
-        jobDataMap.put(CLIENT_ADAPTER, clientAdapter);
+        jobDataMap.put(EventJob.TEMPLATE_NAME, templateName);
+        jobDataMap.put(EventJob.KEYWORDS_HANDLER, new KeywordsHandler(new KeywordsExtractor(), (id) -> 1));
+        jobDataMap.put(EventJob.EVENT_ID, eventId);
+        jobDataMap.put(EventJob.VES_URL, vesUrl);
+        jobDataMap.put(EventJob.BODY, body);
+        jobDataMap.put(EventJob.CLIENT_ADAPTER, clientAdapter);
 
         JobExecutionContext jobExecutionContext = mock(JobExecutionContext.class);
         JobDetail jobDetail = mock(JobDetail.class);
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventSchedulerTest.java
index d7cabb7..88abeb5 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventSchedulerTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.scheduler;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.mock;
@@ -38,7 +38,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper;
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
@@ -54,7 +54,7 @@ class EventSchedulerTest {
 
     @Mock
     Scheduler quartzScheduler;
-    
+
     @Mock
     SslAuthenticationHelper sslAuthenticationHelper;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigServiceTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigServiceTest.java
index 4ed0972..35eac53 100644
--- a/src/test/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigServiceTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigServiceTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulatorconfig;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig;
 
 import org.assertj.core.util.Lists;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/onap/pnfsimulator/template/FsToDbTemplateSynchronizerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/FsToDbTemplateSynchronizerTest.java
index 2d65097..4f92558 100644
--- a/src/test/java/org/onap/pnfsimulator/template/FsToDbTemplateSynchronizerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/FsToDbTemplateSynchronizerTest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.template;
+package org.onap.integration.simulators.nfsimulator.vesclient.template;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
@@ -50,4 +50,4 @@ public class FsToDbTemplateSynchronizerTest {
         assertEquals(Level.ERROR, logsList.get(0)
                 .getLevel());
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/onap/pnfsimulator/template/TemplateServiceTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateServiceTest.java
index fd41045..617e7b5 100644
--- a/src/test/java/org/onap/pnfsimulator/template/TemplateServiceTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateServiceTest.java
@@ -18,10 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template;
+package org.onap.integration.simulators.nfsimulator.vesclient.template;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import org.assertj.core.api.Assertions;
 import org.assertj.core.util.Lists;
 import org.bson.Document;
 import org.junit.Assert;
@@ -29,8 +30,8 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.onap.pnfsimulator.template.search.viewmodel.FlatTemplateContent;
-import org.onap.pnfsimulator.template.search.TemplateSearchHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.TemplateSearchHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.viewmodel.FlatTemplateContent;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Query;
 
@@ -74,7 +75,7 @@ class TemplateServiceTest {
         when(templateRepositoryMock.findAll()).thenReturn(SAMPLE_TEMPLATE_LIST);
 
         List<Template> actual = service.getAll();
-        assertThat(actual).containsExactly(SAMPLE_TEMPLATE_LIST.get(0));
+        Assertions.assertThat(actual).containsExactly(SAMPLE_TEMPLATE_LIST.get(0));
     }
 
 
@@ -83,7 +84,7 @@ class TemplateServiceTest {
         when(templateRepositoryMock.findById("sample name")).thenReturn(Optional.of(SAMPLE_TEMPLATE));
 
         Optional<Template> actualTemplate = service.get("sample name");
-        assertThat(actualTemplate).isPresent();
+        Assertions.assertThat(actualTemplate).isPresent();
         assertThat(actualTemplate.get()).isEqualTo(SAMPLE_TEMPLATE);
     }
 
diff --git a/src/test/java/org/onap/pnfsimulator/template/search/JsonUtilsTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/JsonUtilsTest.java
index aac15a6..6690aa6 100644
--- a/src/test/java/org/onap/pnfsimulator/template/search/JsonUtilsTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/JsonUtilsTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template.search;
+package org.onap.integration.simulators.nfsimulator.vesclient.template.search;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
diff --git a/src/test/java/org/onap/pnfsimulator/template/search/TemplateSearchHelperTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/TemplateSearchHelperTest.java
index 13ea7c6..01e06b1 100644
--- a/src/test/java/org/onap/pnfsimulator/template/search/TemplateSearchHelperTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/TemplateSearchHelperTest.java
@@ -18,11 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template.search;
+package org.onap.integration.simulators.nfsimulator.vesclient.template.search;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import com.mongodb.BasicDBList;
 import org.assertj.core.util.Lists;
 import org.bson.Document;
 import org.junit.jupiter.api.BeforeEach;
@@ -30,7 +29,7 @@ import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.onap.pnfsimulator.template.search.viewmodel.FlatTemplateContent;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.viewmodel.FlatTemplateContent;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
diff --git a/src/test/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilderTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/handler/PrimitiveValueCriteriaBuilderTest.java
index 6de86e0..2626253 100644
--- a/src/test/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilderTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/handler/PrimitiveValueCriteriaBuilderTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template.search.handler;
+package org.onap.integration.simulators.nfsimulator.vesclient.template.search.handler;
 
 import com.google.gson.JsonPrimitive;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/resources/org/onap/pnfsimulator/simulator/filesystem/test1.json b/src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/filesystem/test1.json
index 89e4a76..89e4a76 100644
--- a/src/test/resources/org/onap/pnfsimulator/simulator/filesystem/test1.json
+++ b/src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/filesystem/test1.json
diff --git a/src/test/resources/org/onap/pnfsimulator/simulator/invalidJsonStructureEvent.json b/src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/invalidJsonStructureEvent.json
index 4d6ef7d..4d6ef7d 100644
--- a/src/test/resources/org/onap/pnfsimulator/simulator/invalidJsonStructureEvent.json
+++ b/src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/invalidJsonStructureEvent.json
diff --git a/src/test/resources/org/onap/pnfsimulator/simulator/validExampleMeasurementEvent.json b/src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/validExampleMeasurementEvent.json
index a240b93..a240b93 100644
--- a/src/test/resources/org/onap/pnfsimulator/simulator/validExampleMeasurementEvent.json
+++ b/src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/validExampleMeasurementEvent.json