62 files changed, 2535 insertions, 1836 deletions

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/BadInjectedFiledExceptionTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/BadInjectedFiledExceptionTest.java
new file mode 100644
index 0000000000..b35e65485f
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/BadInjectedFiledExceptionTest.java
@@ -0,0 +1,46 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 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.onap.so.bpmn.core;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class BadInjectedFiledExceptionTest {
+
+	private BadInjectedFieldException badInjectedFieldException;
+	
+	@Test
+	public void test() {
+		String fieldName = "anyFieldName";
+		String taskName = "anyTask";
+		Object info = new String("info");
+		
+		String expectedMessage1 = taskName+" injected field '"+fieldName+"' is bad: "+(String)info;
+		badInjectedFieldException = new BadInjectedFieldException(fieldName, taskName, info);
+		assertEquals(expectedMessage1, badInjectedFieldException.getMessage());
+		
+		String expectedMessage2 = "java.lang.Throwable: anyCause";
+		Throwable cause = new Throwable("anyCause");
+		badInjectedFieldException = new BadInjectedFieldException(fieldName, taskName, info, cause);
+		assertEquals(expectedMessage2, badInjectedFieldException.getCause().toString());
+		
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/BaseTaskTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/BaseTaskTest.java
new file mode 100644
index 0000000000..40fcb982c1
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/BaseTaskTest.java
@@ -0,0 +1,247 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 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.onap.so.bpmn.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.camunda.bpm.engine.ProcessEngineServices;
+import org.camunda.bpm.engine.RepositoryService;
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.camunda.bpm.engine.delegate.Expression;
+import org.camunda.bpm.engine.repository.ProcessDefinition;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.junit.rules.ExpectedException;
+
+public class BaseTaskTest {
+
+	private String prefix = "PRE_";
+	private String processKey = "AnyProcessKey";
+	private String definitionId = "100";	
+	private String anyVariable = "anyVariable";
+	private String anyValueString = "anyValue";
+	private String badValueString = "123abc";
+	private int anyValueInt = 123;
+	private Integer anyValueInteger = new Integer(anyValueInt);
+	private long anyValuelong = 123L;
+	private Long anyValueLong = new Long(anyValuelong);
+	
+	private DelegateExecution mockExecution;
+	private Expression mockExpression;	
+	private BaseTask baseTask;
+	private Object obj1;
+	private Object obj2;
+	private Object objectString;
+	private Object objectInteger;
+	private Object objectLong;
+	private Object objectBoolean;
+
+	@Rule
+	public ExpectedException expectedException = ExpectedException.none();	
+	
+	@Before
+	public void before() throws Exception {
+		baseTask = new BaseTask();
+		ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class);
+		when(mockProcessDefinition.getKey()).thenReturn(processKey);
+		RepositoryService mockRepositoryService = mock(RepositoryService.class);
+		when(mockRepositoryService.getProcessDefinition(definitionId)).thenReturn(mockProcessDefinition);
+		ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class);
+		when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService);
+		mockExecution = mock(DelegateExecution.class);
+		when(mockExecution.getId()).thenReturn(definitionId);
+		when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices);
+		when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition);
+		when(mockExecution.getVariable("prefix")).thenReturn(prefix);
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true");
+		mockExpression = mock(Expression.class);
+	}		
+	
+	@Test
+	public void testExecution() throws Exception{
+		baseTask.execute(mockExecution);
+		assertEquals("BaseTask", baseTask.getTaskName());
+	}
+	
+	@Test
+	public void testGetFieldAndMissingInjectedException() throws Exception{
+		objectString = new String(anyValueString);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectString);		
+		obj1 = baseTask.getField(mockExpression, mockExecution, anyVariable);
+		assertEquals(anyValueString, obj1.toString());
+		
+		expectedException.expect(MissingInjectedFieldException.class);
+		obj2 = baseTask.getField(null, mockExecution, anyVariable);
+	}	
+	
+	@Test
+	public void testGetFieldAndBadInjectedFieldException() throws Exception{
+		expectedException.expect(BadInjectedFieldException.class);
+		obj1 = baseTask.getField(mockExpression, mockExecution, null);
+	}		
+	
+	@Test
+	public void testGetOptionalField() throws Exception{
+		objectString = new String(anyValueString);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectString);		
+		obj1 = baseTask.getOptionalField(mockExpression, mockExecution, anyVariable);
+		assertEquals(anyValueString, obj1.toString());		
+	}	
+
+	@Test
+	public void testGetStringFieldAndMissingInjectedFieldException() throws Exception{
+		objectString = new String(anyValueString);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectString);		
+		obj1 = baseTask.getStringField(mockExpression, mockExecution, anyVariable);
+		assertEquals(anyValueString, obj1.toString());		
+	
+		expectedException.expect(MissingInjectedFieldException.class);
+		Object objectBoolean = new Boolean(true); // bad data
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectBoolean);		
+		obj2 = baseTask.getStringField(null, mockExecution, anyVariable);
+	}		
+	
+	@Test
+	public void testGetStringFieldAndBadInjectedFieldException() throws Exception{
+		expectedException.expect(BadInjectedFieldException.class);		
+		obj1 = baseTask.getStringField(mockExpression, mockExecution, null);
+	}	
+	
+	@Test
+	public void testGetOptionalStringField() throws Exception{
+		objectString = new String(anyValueString);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectString);		
+		obj1 = baseTask.getOptionalStringField(mockExpression, mockExecution, anyVariable);
+		assertEquals(anyValueString, obj1.toString());		
+	}	
+	
+	@Test
+	public void testGetIntegerFieldAndMissingInjectedFieldException() throws Exception{
+		objectInteger = new Integer(anyValueInt);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectInteger);		
+		obj1 = baseTask.getIntegerField(mockExpression, mockExecution, anyVariable);
+		assertEquals(anyValueInteger, (Integer)obj1);
+		
+		expectedException.expect(MissingInjectedFieldException.class);
+		objectString = new String(badValueString); 
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectString);		
+		obj2 = baseTask.getIntegerField(null, mockExecution, anyVariable);
+	}	
+
+	@Test
+	public void testGetIntegerFieldAndBadInjectedFieldException() throws Exception{
+		expectedException.expect(BadInjectedFieldException.class);
+		obj1 = baseTask.getIntegerField(mockExpression, mockExecution, null);
+	}	
+	
+	
+	@Test
+	public void testGetOptionalIntegerField() throws Exception{
+		objectInteger = new Integer(anyValueInt);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectInteger);		
+		obj1 = baseTask.getOptionalIntegerField(mockExpression, mockExecution, anyVariable);
+		assertEquals(anyValueInteger, (Integer)obj1);		
+	}	
+	
+	@Test
+	public void testGetOptionalIntegerFieldAndBadInjectedFieldException() throws Exception{
+		expectedException.expect(BadInjectedFieldException.class);
+		objectBoolean = new Boolean(true);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectBoolean);		
+		obj1 = baseTask.getOptionalIntegerField(mockExpression, mockExecution, anyVariable);
+	}		
+	
+	@Test
+	public void testGetLongFieldAndMissingInjectedFieldException() throws Exception{
+		objectLong = new Long(anyValuelong);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectLong);		
+		obj1 = baseTask.getLongField(mockExpression, mockExecution, anyVariable);
+		assertEquals(anyValueLong, (Long)obj1);
+		
+		expectedException.expect(MissingInjectedFieldException.class);
+		objectString = new String(badValueString);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectString);		
+		obj2 = baseTask.getLongField(null, mockExecution, anyVariable);		
+	}	
+	
+	@Test
+	public void testGetLongFieldAndBadInjectedFieldException() throws Exception{
+		expectedException.expect(BadInjectedFieldException.class);
+		obj2 = baseTask.getLongField(mockExpression, mockExecution, null);		
+	}		
+	
+	@Test
+	public void testGetOptionalLongField() throws Exception{
+		objectLong = new Long(anyValuelong);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectLong);		
+		obj1 = baseTask.getOptionalLongField(mockExpression, mockExecution, anyVariable);
+		assertEquals(anyValueLong, (Long)obj1);
+	}	
+
+	@Test
+	public void testGetOptionalLongFieldAndBadInjectedFieldException() throws Exception{
+		expectedException.expect(BadInjectedFieldException.class);
+		objectBoolean = new Boolean(true);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectBoolean);		
+		obj1 = baseTask.getOptionalLongField(mockExpression, mockExecution, anyVariable);
+	}	
+	
+	@Test
+	public void testGetOutputAndMissingInjectedFieldException() throws Exception{
+		objectString = new String(anyValueString);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectString);		
+		obj1 = baseTask.getOutputField(mockExpression, mockExecution, anyVariable);
+		assertEquals(anyValueString, obj1.toString());
+		
+		expectedException.expect(MissingInjectedFieldException.class);
+		objectString = new String(anyValueString);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectString);		
+		obj2 = baseTask.getOutputField(null, mockExecution, anyVariable);		
+	}	
+	
+	@Test
+	public void testGetOutputAndBadInjectedFieldException() throws Exception{
+		expectedException.expect(BadInjectedFieldException.class);
+		obj2 = baseTask.getOutputField(null, mockExecution, anyVariable);		
+	}		
+	
+	@Test
+	public void testGetOptionalOutputField() throws Exception{
+		objectString = new String(anyValueString);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectString);		
+		obj1 = baseTask.getOptionalOutputField(mockExpression, mockExecution, anyVariable);
+		assertEquals(anyValueString, obj1.toString());
+	}	
+	
+	@Test
+	public void testGetOptionalOutputFieldAndBadInjectedFieldException() throws Exception{
+		expectedException.expect(BadInjectedFieldException.class);
+		objectBoolean = new Boolean(true);
+		when(mockExpression.getValue(mockExecution)).thenReturn(objectBoolean);		
+		obj1 = baseTask.getOptionalOutputField(mockExpression, mockExecution, anyVariable);
+	}	
+	
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/BeansTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/BeansTest.java
new file mode 100644
index 0000000000..2415e619d7
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/BeansTest.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.core;
+
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.onap.so.openpojo.rules.HasAnnotationMatcher.hasAnnotation;
+import static org.onap.so.openpojo.rules.HasAnnotationPropertyWithValueMatcher.hasAnnotationPropertyWithValue;
+
+import javax.persistence.Column;
+import javax.persistence.Temporal;
+
+import org.junit.Test;
+import org.onap.so.openpojo.rules.CustomSetterMustExistRule;
+import org.onap.so.openpojo.rules.EqualsAndHashCodeTester;
+import org.onap.so.openpojo.rules.HasEqualsAndHashCodeRule;
+import org.onap.so.openpojo.rules.HasToStringRule;
+import org.onap.so.openpojo.rules.ToStringTester;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.PojoClassFilter;
+import com.openpojo.reflection.filters.FilterEnum;
+import com.openpojo.reflection.filters.FilterNonConcrete;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.rule.impl.BusinessKeyMustExistRule;
+import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.rule.impl.NoNestedClassRule;
+import com.openpojo.validation.rule.impl.NoPrimitivesRule;
+import com.openpojo.validation.rule.impl.NoPublicFieldsExceptStaticFinalRule;
+import com.openpojo.validation.rule.impl.NoStaticExceptFinalRule;
+import com.openpojo.validation.rule.impl.SerializableMustHaveSerialVersionUIDRule;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+
+
+public class BeansTest {
+
+	private PojoClassFilter filterTestClasses = new FilterTestClasses();
+	
+	private PojoClassFilter  enumFilter = new FilterEnum();
+	
+	
+
+	@Test
+	public void pojoStructure() {	
+		test("org.onap.so.bpmn.core.domain");	
+		
+	}
+
+	private void test(String pojoPackage) {
+		Validator validator = ValidatorBuilder.create()
+				.with(new GetterMustExistRule())
+			    .with(new NoNestedClassRule())			   
+			    .with(new SerializableMustHaveSerialVersionUIDRule())								
+			    .with(new NoPublicFieldsExceptStaticFinalRule())			 
+				.with(new SetterTester())
+				.with(new GetterTester())
+				
+				
+			     
+				.build();
+		
+	
+		validator.validate(pojoPackage, new FilterPackageInfo(), filterTestClasses,enumFilter,new FilterNonConcrete());
+	}
+	private static class FilterTestClasses implements PojoClassFilter {
+		public boolean include(PojoClass pojoClass) {
+			return !pojoClass.getSourcePath().contains("/test-classes/");
+		}
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/MissingInjectedFiledExceptionTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/MissingInjectedFiledExceptionTest.java
new file mode 100644
index 0000000000..b0aa41b05d
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/MissingInjectedFiledExceptionTest.java
@@ -0,0 +1,39 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 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.onap.so.bpmn.core;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class MissingInjectedFiledExceptionTest {
+
+	private MissingInjectedFieldException missingInjectedFieldException;
+	
+	@Test
+	public void test() {
+		String fieldName = "anyFieldName";
+		String taskName = "anyTask";
+		String info = "missing required field";
+		String expectedMessage1 = taskName+" injected field '"+fieldName+"' is bad: "+info;
+		missingInjectedFieldException = new MissingInjectedFieldException(fieldName, taskName);
+		assertEquals(expectedMessage1, missingInjectedFieldException.getMessage());
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/ResponseBuilderTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/ResponseBuilderTest.java
new file mode 100644
index 0000000000..b605209739
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/ResponseBuilderTest.java
@@ -0,0 +1,110 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 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.onap.so.bpmn.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.camunda.bpm.engine.ProcessEngineServices;
+import org.camunda.bpm.engine.RepositoryService;
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.camunda.bpm.engine.repository.ProcessDefinition;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ResponseBuilderTest {
+
+	private String prefix = "PRE_";
+	private String processKey = "AnyProcessKey";
+	private String definitionId = "100";
+	private int errorCode_200 = 200;
+	private int errorCode_404 = 404;	
+	private String errorMessage = "any error message!";
+	private String errorMessageXML = "<ErrorMessage>any error message!</ErrorMessage><ErrorCode>200</ErrorCode>";	
+	private String response = "<WorkflowResponse>bad</WorkflowResponse>";
+	
+	private DelegateExecution mockExecution;
+	private ResponseBuilder responseBuilder;
+	private WorkflowException workflowException;
+	private Object obj;
+	
+	@Before
+	public void before() throws Exception {
+		responseBuilder = new ResponseBuilder();
+		ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class);
+		when(mockProcessDefinition.getKey()).thenReturn(processKey);
+		RepositoryService mockRepositoryService = mock(RepositoryService.class);
+		when(mockRepositoryService.getProcessDefinition(definitionId)).thenReturn(mockProcessDefinition);
+		ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class);
+		when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService);
+		mockExecution = mock(DelegateExecution.class);
+		when(mockExecution.getId()).thenReturn(definitionId);
+		when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices);
+		when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition);
+		when(mockExecution.getVariable("prefix")).thenReturn(prefix);
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true");
+	}	
+	
+	@Test
+	public void buildWorkflowException_WorkflowException_2000_Test() {
+		when(mockExecution.getVariable(prefix+"ErrorResponse")).thenReturn(errorMessage);
+		when(mockExecution.getVariable(prefix+"ResponseCode")).thenReturn(errorCode_200);
+		workflowException = responseBuilder.buildWorkflowException(mockExecution);
+		assertEquals(2000, workflowException.getErrorCode());
+		assertEquals("any error message!", workflowException.getErrorMessage());
+	}
+
+	@Test
+	public void buildWorkflowException_WorkflowException_XML_2000_Test() {
+		when(mockExecution.getVariable(prefix+"ErrorResponse")).thenReturn(errorMessageXML);
+		when(mockExecution.getVariable(prefix+"ResponseCode")).thenReturn(errorCode_200);
+		workflowException = responseBuilder.buildWorkflowException(mockExecution);
+		assertEquals(2000, workflowException.getErrorCode());
+		assertEquals("any error message!", workflowException.getErrorMessage());
+	}	
+	
+	@Test
+	public void buildWorkflowException_WorkflowException_NULL_Test() {
+		when(mockExecution.getVariable(prefix+"ErrorResponse")).thenReturn(null);		
+		when(mockExecution.getVariable(prefix+"ResponseCode")).thenReturn(null);
+		workflowException = responseBuilder.buildWorkflowException(mockExecution);
+		assertEquals(null, workflowException);
+	}
+	
+	@Test
+	public void buildWorkflowException_Response_1002_Test() {
+		when(mockExecution.getVariable(processKey+"Response")).thenReturn(response);		
+		when(mockExecution.getVariable(prefix+"ResponseCode")).thenReturn(errorCode_404);
+		workflowException = responseBuilder.buildWorkflowException(mockExecution);
+		assertEquals(response, workflowException.getErrorMessage());
+		assertEquals(1002, workflowException.getErrorCode());
+	}
+	
+	@Test
+	public void buildWorkflowResponse_Object_Test() {
+		String workflowResponse = "<WorkflowResponse>good</WorkflowResponse>";
+		when(mockExecution.getVariable("WorkflowResponse")).thenReturn(workflowResponse);
+		obj = responseBuilder.buildWorkflowResponse(mockExecution);
+		assertEquals(workflowResponse, obj);  
+	}	
+	
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/RollbackDataTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/RollbackDataTest.java
index c51af23e30..875df6cf94 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/RollbackDataTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/RollbackDataTest.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,10 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.core;
+package org.onap.so.bpmn.core;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.entry;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.hamcrest.Matchers.isIn;
+import java.util.Arrays;
+import java.util.Collections;
 
 import org.junit.Test;
 
@@ -41,11 +48,11 @@ public class RollbackDataTest {
         data.put(TYPE_A, "key2", "value2");
         data.put(TYPE_B, "key3", "value3");
         // when, then
-        assertThat(data.toString()).isIn(
+        assertThat(data.toString(), isIn(Arrays.asList(
                 "[typeB{key3=value3},typeA{key1=value1, key2=value2}]",
                 "[typeB{key3=value3},typeA{key2=value2, key1=value1}]",
                 "[typeA{key1=value1, key2=value2},typeB{key3=value3}]",
-                "[typeA{key2=value2, key1=value1},typeB{key3=value3}]");
+                "[typeA{key2=value2, key1=value1},typeB{key3=value3}]")));
     }
 
     @Test
@@ -53,8 +60,8 @@ public class RollbackDataTest {
         // given
         RollbackData data = new RollbackData();
         // then
-        assertThat(data.hasType(TYPE_A)).isFalse();
-        assertThat(data.get(TYPE_A, KEY_1)).isNull();
+        assertFalse(data.hasType(TYPE_A));
+        assertNull(data.get(TYPE_A, KEY_1));
     }
 
     @Test
@@ -64,9 +71,9 @@ public class RollbackDataTest {
         // when
         data.put(TYPE_A, KEY_1, VALUE_1);
         // then
-        assertThat(data.hasType(TYPE_A)).isTrue();
-        assertThat(data.hasType(TYPE_B)).isFalse();
-        assertThat(data.get(TYPE_A, KEY_1)).isEqualTo(VALUE_1);
+        assertTrue(data.hasType(TYPE_A));
+        assertFalse(data.hasType(TYPE_B));
+        assertEquals(VALUE_1, data.get(TYPE_A, KEY_1));
     }
 
     @Test
@@ -77,9 +84,9 @@ public class RollbackDataTest {
         data.put(TYPE_A, KEY_1, VALUE_1);
         data.put(TYPE_B, KEY_1, VALUE_2);
         // then
-        assertThat(data.get(TYPE_A, KEY_1)).isEqualTo(VALUE_1);
-        assertThat(data.get(TYPE_A)).containsExactly(entry(KEY_1, VALUE_1));
-        assertThat(data.get(TYPE_B, KEY_1)).isEqualTo(VALUE_2);
-        assertThat(data.get(TYPE_B)).containsExactly(entry(KEY_1, VALUE_2));
+        assertEquals(VALUE_1, data.get(TYPE_A, KEY_1));
+        assertThat(data.get(TYPE_A), is(Collections.singletonMap(KEY_1, VALUE_1)));
+        assertEquals(VALUE_2, data.get(TYPE_B, KEY_1));
+        assertThat(data.get(TYPE_B), is(Collections.singletonMap(KEY_1, VALUE_2)));
     }
 }
\ No newline at end of file
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/UrnPropertiesReaderTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/UrnPropertiesReaderTest.java
new file mode 100644
index 0000000000..5d9a1d61f2
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/UrnPropertiesReaderTest.java
@@ -0,0 +1,63 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.core;
+
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.core.env.Environment;
+
+import static org.mockito.Mockito.*;
+
+public class UrnPropertiesReaderTest {
+
+    @Test
+    public  void testGetVariableFromExecution() {
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class);
+        when(mockExecution.getVariable("testKey")).thenReturn("testValue");
+        String value = UrnPropertiesReader.getVariable("testKey",mockExecution);
+        Assert.assertEquals("testValue", value);
+        verify(mockExecution).getVariable("testKey");
+        verify(mockExecution, never()).setVariable("testKey", value);
+    }
+
+    @Test
+    public  void testGetVariableFromEnvironment() {
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class);
+        Environment mockEnvironment = mock(Environment.class);
+        when(mockEnvironment.getProperty("testKey")).thenReturn("testValue");
+        UrnPropertiesReader urnPropertiesReader = new UrnPropertiesReader();
+        urnPropertiesReader.setEnvironment(mockEnvironment);
+        String value = UrnPropertiesReader.getVariable("testKey",mockExecution);
+        Assert.assertEquals("testValue",value);
+        verify(mockExecution).getVariable("testKey");
+        verify(mockExecution).setVariable("testKey", value);
+    }
+
+    @Test
+    public  void testGetVariableNotExist() {
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class);
+        String value = UrnPropertiesReader.getVariable("notExist", mockExecution);
+        Assert.assertEquals(null, value);
+        verify(mockExecution).getVariable("notExist");
+        verify(mockExecution, never()).setVariable("notExist", value);
+    }
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/WorkflowExceptionTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/WorkflowExceptionTest.java
new file mode 100644
index 0000000000..c1e9b8776b
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/WorkflowExceptionTest.java
@@ -0,0 +1,47 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 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.onap.so.bpmn.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import org.junit.Test;
+
+public class WorkflowExceptionTest {
+
+	private WorkflowException workflowException;
+	
+	@Test
+	public void test() {
+		String processKey = "AnyProcessKey"; 
+		int errorCode = 200;
+		String errorMessage = "any error message!";
+		workflowException = new WorkflowException(processKey, errorCode, errorMessage);
+		assertEquals(errorCode, workflowException.getErrorCode());
+		assertEquals(errorMessage, workflowException.getErrorMessage());
+		assertEquals(processKey, workflowException.getProcessKey());
+		assertEquals("*", workflowException.getWorkStep());
+		String workStep = "one";
+		workflowException = new WorkflowException(processKey, errorCode, errorMessage, workStep);
+		assertEquals(workStep, workflowException.getWorkStep());
+		assertNotEquals(null, workflowException.toString());
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/AllottedResourceTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/AllottedResourceTest.java
index 09720be9b9..b1dd8659cd 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/AllottedResourceTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/AllottedResourceTest.java
@@ -1,57 +1,54 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class AllottedResourceTest {

-	private AllottedResource ar = new AllottedResource();

-	TunnelConnect tc = new TunnelConnect();

-

-	@Test

-	public void testAllottedResource() {

-		ar.setAllottedResourceType("allottedResourceType");

-		ar.setAllottedResourceRole("allottedResourceRole");

-		ar.setProvidingServiceModelName("providingServiceModelName");

-		ar.setProvidingServiceModelInvariantUuid("providingServiceModelInvariantUuid");

-		ar.setProvidingServiceModelUuid("providingServiceModelUuid");

-		ar.setNfFunction("nfFunction");

-		ar.setNfType("nfType");

-		ar.setNfRole("nfRole");

-		ar.setNfNamingCode("nfNamingCode");

-		ar.setOrchestrationStatus("orchestrationStatus");

-		ar.setTunnelConnect(tc);

-		assertEquals(ar.getAllottedResourceType(), "allottedResourceType");

-		assertEquals(ar.getAllottedResourceRole(), "allottedResourceRole");

-		assertEquals(ar.getProvidingServiceModelName(), "providingServiceModelName");

-		assertEquals(ar.getProvidingServiceModelInvariantUuid(), "providingServiceModelInvariantUuid");

-		assertEquals(ar.getProvidingServiceModelUuid(), "providingServiceModelUuid");

-		assertEquals(ar.getNfFunction(), "nfFunction");

-		assertEquals(ar.getNfType(), "nfType");

-		assertEquals(ar.getNfRole(), "nfRole");

-		assertEquals(ar.getNfNamingCode(), "nfNamingCode");

-		assertEquals(ar.getOrchestrationStatus(), "orchestrationStatus");

-		assertEquals(ar.getTunnelConnect(), tc);

-		

-	}

-

-}

+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class AllottedResourceTest {
+	private AllottedResource ar = new AllottedResource();
+
+	@Test
+	public void testAllottedResource() {
+		ar.setAllottedResourceType("allottedResourceType");
+		ar.setAllottedResourceRole("allottedResourceRole");
+		ar.setProvidingServiceModelName("providingServiceModelName");
+		ar.setProvidingServiceModelInvariantUuid("providingServiceModelInvariantUuid");
+		ar.setProvidingServiceModelUuid("providingServiceModelUuid");
+		ar.setNfFunction("nfFunction");
+		ar.setNfType("nfType");
+		ar.setNfRole("nfRole");
+		ar.setNfNamingCode("nfNamingCode");
+		ar.setOrchestrationStatus("orchestrationStatus");
+		assertEquals(ar.getAllottedResourceType(), "allottedResourceType");
+		assertEquals(ar.getAllottedResourceRole(), "allottedResourceRole");
+		assertEquals(ar.getProvidingServiceModelName(), "providingServiceModelName");
+		assertEquals(ar.getProvidingServiceModelInvariantUuid(), "providingServiceModelInvariantUuid");
+		assertEquals(ar.getProvidingServiceModelUuid(), "providingServiceModelUuid");
+		assertEquals(ar.getNfFunction(), "nfFunction");
+		assertEquals(ar.getNfType(), "nfType");
+		assertEquals(ar.getNfRole(), "nfRole");
+		assertEquals(ar.getNfNamingCode(), "nfNamingCode");
+		assertEquals(ar.getOrchestrationStatus(), "orchestrationStatus");
+
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/CompareModelsResultTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/CompareModelsResultTest.java
index 90cb7362cf..af9c7a7fa6 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/CompareModelsResultTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/CompareModelsResultTest.java
@@ -1,83 +1,83 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright (C) 2018 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.junit.Before;

-import org.junit.Test;

-

-public class CompareModelsResultTest {

-	

-	private CompareModelsResult modelsResult;

-	private List<ResourceModelInfo> addedResourceList;

-	private List<ResourceModelInfo> deletedResourceList;

-	private ResourceModelInfo resourceModelInfo1;

-	private ResourceModelInfo resourceModelInfo2;

-	private List<String> requestInputs;

-	

-	@Before

-	public void before() {

-		resourceModelInfo1 = new ResourceModelInfo();

-		resourceModelInfo1.setResourceCustomizationUuid("f1d563e8-e714-4393-8f99-cc480144a05e");

-		resourceModelInfo1.setResourceInvariantUuid("e1d563e8-e714-4393-8f99-cc480144a05f");

-		resourceModelInfo1.setResourceName("resourceName1");

-		resourceModelInfo1.setResourceUuid("f1d563e8-e714-4393-8f99-cc480144a05g");

-		resourceModelInfo2 = new ResourceModelInfo();

-		resourceModelInfo2.setResourceCustomizationUuid("a1d563e8-e714-4393-8f99-cc480144a05d");

-		resourceModelInfo2.setResourceInvariantUuid("b1d563e8-e714-4393-8f99-cc480144a05e");

-		resourceModelInfo2.setResourceName("resourceName2");

-		resourceModelInfo2.setResourceUuid("c1d563e8-e714-4393-8f99-cc480144a05f");				

-	}

-	

-	@Test

-	public void testSetAddedResourceList() {

-		addedResourceList = new ArrayList<ResourceModelInfo>();

-		addedResourceList.add(resourceModelInfo1);

-		addedResourceList.add(resourceModelInfo2);

-		modelsResult = new CompareModelsResult();

-		modelsResult.setAddedResourceList(addedResourceList);

-		assertEquals(addedResourceList, modelsResult.getAddedResourceList());

-	}

-

-	@Test

-	public void testSetDeletedResourceList() {

-		deletedResourceList = new ArrayList<ResourceModelInfo>();

-		deletedResourceList.add(resourceModelInfo1);

-		deletedResourceList.add(resourceModelInfo2);

-		modelsResult = new CompareModelsResult();

-		modelsResult.setDeletedResourceList(deletedResourceList);

-		assertEquals(deletedResourceList, modelsResult.getDeletedResourceList());

-	}	

-

-	@Test

-	public void testSetRequestInputs() {

-		requestInputs = new ArrayList<String>();

-		requestInputs.add("requestInput1");

-		requestInputs.add("requestInput2");

-		modelsResult = new CompareModelsResult();

-		modelsResult.setRequestInputs(requestInputs);

-		assertEquals(requestInputs, modelsResult.getRequestInputs());

-	}	

-	

-}

+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class CompareModelsResultTest {
+	
+	private CompareModelsResult modelsResult;
+	private List<ResourceModelInfo> addedResourceList;
+	private List<ResourceModelInfo> deletedResourceList;
+	private ResourceModelInfo resourceModelInfo1;
+	private ResourceModelInfo resourceModelInfo2;
+	private List<String> requestInputs;
+	
+	@Before
+	public void before() {
+		resourceModelInfo1 = new ResourceModelInfo();
+		resourceModelInfo1.setResourceCustomizationUuid("f1d563e8-e714-4393-8f99-cc480144a05e");
+		resourceModelInfo1.setResourceInvariantUuid("e1d563e8-e714-4393-8f99-cc480144a05f");
+		resourceModelInfo1.setResourceName("resourceName1");
+		resourceModelInfo1.setResourceUuid("f1d563e8-e714-4393-8f99-cc480144a05g");
+		resourceModelInfo2 = new ResourceModelInfo();
+		resourceModelInfo2.setResourceCustomizationUuid("a1d563e8-e714-4393-8f99-cc480144a05d");
+		resourceModelInfo2.setResourceInvariantUuid("b1d563e8-e714-4393-8f99-cc480144a05e");
+		resourceModelInfo2.setResourceName("resourceName2");
+		resourceModelInfo2.setResourceUuid("c1d563e8-e714-4393-8f99-cc480144a05f");				
+	}
+	
+	@Test
+	public void testSetAddedResourceList() {
+		addedResourceList = new ArrayList<ResourceModelInfo>();
+		addedResourceList.add(resourceModelInfo1);
+		addedResourceList.add(resourceModelInfo2);
+		modelsResult = new CompareModelsResult();
+		modelsResult.setAddedResourceList(addedResourceList);
+		assertEquals(addedResourceList, modelsResult.getAddedResourceList());
+	}
+
+	@Test
+	public void testSetDeletedResourceList() {
+		deletedResourceList = new ArrayList<ResourceModelInfo>();
+		deletedResourceList.add(resourceModelInfo1);
+		deletedResourceList.add(resourceModelInfo2);
+		modelsResult = new CompareModelsResult();
+		modelsResult.setDeletedResourceList(deletedResourceList);
+		assertEquals(deletedResourceList, modelsResult.getDeletedResourceList());
+	}	
+
+	@Test
+	public void testSetRequestInputs() {
+		requestInputs = new ArrayList<String>();
+		requestInputs.add("requestInput1");
+		requestInputs.add("requestInput2");
+		modelsResult = new CompareModelsResult();
+		modelsResult.setRequestInputs(requestInputs);
+		assertEquals(requestInputs, modelsResult.getRequestInputs());
+	}	
+	
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ConfigResourceTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ConfigResourceTest.java
new file mode 100644
index 0000000000..13a30d26ee
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ConfigResourceTest.java
@@ -0,0 +1,39 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ConfigResourceTest {
+	private ConfigResource configresource = new ConfigResource();{
+	configresource.resourceType = ResourceType.CONFIGURATION;
+	}
+
+	@Test
+	public void testConfigResource() {
+		configresource.setToscaNodeType("toscaNodeType");
+		assertEquals(configresource.getToscaNodeType(), "toscaNodeType");
+		
+		
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ConfigurationTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ConfigurationTest.java
index df8440addf..fe84a1b5a7 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ConfigurationTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ConfigurationTest.java
@@ -1,47 +1,47 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class ConfigurationTest {

-	private Configuration configuration = new Configuration();

-

-	@Test

-	public void testConfigurationTest() {

-		configuration.setId("id");

-		configuration.setName("name");

-		configuration.setType("type");

-		configuration.setOrchestrationStatus("orchestrationStatus");

-		configuration.setTunnelBandwidth("tunnelBandwidth");

-		configuration.setVendorAllowedMaxBandwidth("vendorAllowedMaxBandwidth");

-		configuration.setResourceVersion("resourceVersion");

-		assertEquals(configuration.getId(), "id");

-		assertEquals(configuration.getName(), "name");

-		assertEquals(configuration.getType(), "type");

-		assertEquals(configuration.getOrchestrationStatus(), "orchestrationStatus");

-		assertEquals(configuration.getTunnelBandwidth(), "tunnelBandwidth");

-		assertEquals(configuration.getVendorAllowedMaxBandwidth(), "vendorAllowedMaxBandwidth");

-		assertEquals(configuration.getResourceVersion(), "resourceVersion");

-	}

-

-}

+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ConfigurationTest {
+	private Configuration configuration = new Configuration();
+
+	@Test
+	public void testConfigurationTest() {
+		configuration.setId("id");
+		configuration.setName("name");
+		configuration.setType("type");
+		configuration.setOrchestrationStatus("orchestrationStatus");
+		configuration.setTunnelBandwidth("tunnelBandwidth");
+		configuration.setVendorAllowedMaxBandwidth("vendorAllowedMaxBandwidth");
+		configuration.setResourceVersion("resourceVersion");
+		assertEquals(configuration.getId(), "id");
+		assertEquals(configuration.getName(), "name");
+		assertEquals(configuration.getType(), "type");
+		assertEquals(configuration.getOrchestrationStatus(), "orchestrationStatus");
+		assertEquals(configuration.getTunnelBandwidth(), "tunnelBandwidth");
+		assertEquals(configuration.getVendorAllowedMaxBandwidth(), "vendorAllowedMaxBandwidth");
+		assertEquals(configuration.getResourceVersion(), "resourceVersion");
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/CustomerTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/CustomerTest.java
new file mode 100644
index 0000000000..86eb717664
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/CustomerTest.java
@@ -0,0 +1,38 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class CustomerTest {
+	private Customer customer = new Customer();
+
+	@Test
+	public void testCustomer() {
+		customer.setSubscriptionServiceType("subscriptionServiceType");
+		customer.setGlobalSubscriberId("globalSubscriberId");
+		assertEquals(customer.getSubscriptionServiceType(), "subscriptionServiceType");
+		assertEquals(customer.getGlobalSubscriberId(), "globalSubscriberId");
+		
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/DomainPojoTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/DomainPojoTest.java
new file mode 100644
index 0000000000..b4860c6323
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/DomainPojoTest.java
@@ -0,0 +1,56 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import org.junit.Test;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.PojoClassFilter;
+import com.openpojo.reflection.filters.FilterNonConcrete;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+
+
+public class DomainPojoTest {
+	private PojoClassFilter filterTestClasses = new FilterTestClasses();
+	
+	@Test
+	public void pojoStructure() {
+		test("org.onap.so.bpmn.core.domain");
+	}
+	
+	private void test(String pojoPackage) {
+		Validator validator = ValidatorBuilder.create()
+				.with(new SetterTester())
+				.with(new GetterTester())
+				.build();
+		validator.validate(pojoPackage, new FilterPackageInfo(), filterTestClasses, new FilterNonConcrete());
+	}
+	
+	private static class FilterTestClasses implements PojoClassFilter {
+		public boolean include(PojoClass pojoClass) {
+			return !pojoClass.getSourcePath().contains("/test-classes/");
+		}
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/HomingSolutionTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/HomingSolutionTest.java
index e334348b5d..9750e03b4c 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/HomingSolutionTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/HomingSolutionTest.java
@@ -1,58 +1,58 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class HomingSolutionTest {

-	

-	private HomingSolution homingsolution = new HomingSolution();

-	InventoryType inventory = InventoryType.cloud;

-	VnfResource vnfresource = new VnfResource();

-	License license = new License();

-

-	@Test

-	public void testHomingSolution() {

-		homingsolution.setInventoryType(inventory);

-		homingsolution.setRehome(true);

-		homingsolution.setServiceInstanceId("serviceInstanceId");

-		homingsolution.setCloudOwner("cloudOwner");

-		homingsolution.setCloudRegionId("cloudRegionId");

-		homingsolution.setAicClli("aicClli");

-		homingsolution.setAicVersion("aicVersion");

-		homingsolution.setTenant("tenant");

-		homingsolution.setVnf(vnfresource);

-		homingsolution.setLicense(license);

-		assertEquals(homingsolution.getInventoryType(), inventory);

-		assertEquals(homingsolution.isRehome(), true);

-		assertEquals(homingsolution.getServiceInstanceId(), "serviceInstanceId");

-		assertEquals(homingsolution.getCloudOwner(), "cloudOwner");

-		assertEquals(homingsolution.getCloudRegionId(), "cloudRegionId");

-		assertEquals(homingsolution.getAicClli(), "aicClli");

-		assertEquals(homingsolution.getAicVersion(), "aicVersion");

-		assertEquals(homingsolution.getTenant(), "tenant");

-		assertEquals(homingsolution.getVnf(), vnfresource);

-		assertEquals(homingsolution.getLicense(), license);

-		

-	}

-

-}

+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class HomingSolutionTest {
+	
+	private HomingSolution homingsolution = new HomingSolution();
+	InventoryType inventory = InventoryType.cloud;
+	VnfResource vnfresource = new VnfResource();
+	License license = new License();
+
+	@Test
+	public void testHomingSolution() {
+		homingsolution.setInventoryType(inventory);
+		homingsolution.setRehome(true);
+		homingsolution.setServiceInstanceId("serviceInstanceId");
+		homingsolution.setCloudOwner("cloudOwner");
+		homingsolution.setCloudRegionId("cloudRegionId");
+		homingsolution.setAicClli("aicClli");
+		homingsolution.setAicVersion("aicVersion");
+		homingsolution.setTenant("tenant");
+		homingsolution.setVnf(vnfresource);
+		homingsolution.setLicense(license);
+		assertEquals(homingsolution.getInventoryType(), inventory);
+		assertEquals(homingsolution.isRehome(), true);
+		assertEquals(homingsolution.getServiceInstanceId(), "serviceInstanceId");
+		assertEquals(homingsolution.getCloudOwner(), "cloudOwner");
+		assertEquals(homingsolution.getCloudRegionId(), "cloudRegionId");
+		assertEquals(homingsolution.getAicClli(), "aicClli");
+		assertEquals(homingsolution.getAicVersion(), "aicVersion");
+		assertEquals(homingsolution.getTenant(), "tenant");
+		assertEquals(homingsolution.getVnf(), vnfresource);
+		assertEquals(homingsolution.getLicense(), license);
+		
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/LicenseTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/LicenseTest.java
index 9ed194c455..e3133cb1c6 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/LicenseTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/LicenseTest.java
@@ -1,89 +1,89 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-

-import static org.junit.Assert.assertArrayEquals;

-import static org.junit.Assert.assertEquals;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.junit.Before;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.mockito.BDDMockito.Then;

-import org.mockito.InjectMocks;

-import org.mockito.Mock;

-import org.powermock.api.mockito.PowerMockito;

-import org.powermock.core.classloader.annotations.PrepareForTest;

-import org.powermock.modules.junit4.PowerMockRunner;

-

-

-//@RunWith(PowerMockRunner.class)

-//@PrepareForTest({License.class})

-public class LicenseTest {

-	

-	//@Mock

-	private License license= new License();

-	//@InjectMocks

-	//private LicenseTest licenceTest;

-	List<String> entitlementPoolList = new ArrayList<String>();

-	private List<String> licenseKeyGroupList = new ArrayList<String>();

-	//JSONArray array = new JSONArray(entitlementPoolList);

-	//JSONArray array1 = new JSONArray(licenseKeyGroupList);

-	//@PrepareForTest({License.class})

-	Long serialVersionUID = 333L;

-	

-	@Test

-	public void testLicense() {

-		license.setEntitlementPoolList(entitlementPoolList);

-		license.setLicenseKeyGroupList(licenseKeyGroupList);

-		//license.addEntitlementPool("entitlementPoolUuid");

-		license.addLicenseKeyGroup("licenseKeyGroupUuid");

-		assertEquals(license.getEntitlementPoolList(), entitlementPoolList);

-		assertEquals(license.getLicenseKeyGroupList(), licenseKeyGroupList);

-		assert(license.getEntitlementPoolListAsString()!= null);

-		assert(license.getLicenseKeyGroupListAsString()!=null);

-		license.addEntitlementPool("entitlementPoolUuid");

-		//assertEquals(license.getSerialversionuid(), serialVersionUID);

-		//assertArrayEquals(license.getSerialversionuid(), serialVersionUID);

-		//assert

-	

-		/*PowerMockito.mockStatic(License.class);

-		Mockito.when(License.getSerialversionuid()).thenReturn(getserial());

-		assertEquals(License.getSerialversionuid(),"abc");*/

-		

-	}

-	// @Before 

-	// public void mocksetUp() {

-//      Long serialVersionUID = 333L;

-//	      PowerMockito.mockStatic(License.class);

-//	      expect (license.getSerialversionuid()).andReturn(serialVersionUID);

-//	      //PowerMockito.when(license.getSerialversionuid().

-//	      //PowerMockito.when(MathUtil.addInteger(2, 2)).thenReturn(1);

-//	   }

-	

-	/*private Long getserial() {

-		

-		return abc;

-	}*/

-

-}

+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.BDDMockito.Then;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+
+//@RunWith(PowerMockRunner.class)
+//@PrepareForTest({License.class})
+public class LicenseTest {
+	
+	//@Mock
+	private License license= new License();
+	//@InjectMocks
+	//private LicenseTest licenceTest;
+	List<String> entitlementPoolList = new ArrayList<String>();
+	private List<String> licenseKeyGroupList = new ArrayList<String>();
+	//JSONArray array = new JSONArray(entitlementPoolList);
+	//JSONArray array1 = new JSONArray(licenseKeyGroupList);
+	//@PrepareForTest({License.class})
+	Long serialVersionUID = 333L;
+	
+	@Test
+	public void testLicense() {
+		license.setEntitlementPoolList(entitlementPoolList);
+		license.setLicenseKeyGroupList(licenseKeyGroupList);
+		//license.addEntitlementPool("entitlementPoolUuid");
+		license.addLicenseKeyGroup("licenseKeyGroupUuid");
+		assertEquals(license.getEntitlementPoolList(), entitlementPoolList);
+		assertEquals(license.getLicenseKeyGroupList(), licenseKeyGroupList);
+		assert(license.getEntitlementPoolListAsString()!= null);
+		assert(license.getLicenseKeyGroupListAsString()!=null);
+		license.addEntitlementPool("entitlementPoolUuid");
+		//assertEquals(license.getSerialversionuid(), serialVersionUID);
+		//assertArrayEquals(license.getSerialversionuid(), serialVersionUID);
+		//assert
+	
+		/*PowerMockito.mockStatic(License.class);
+		Mockito.when(License.getSerialversionuid()).thenReturn(getserial());
+		assertEquals(License.getSerialversionuid(),"abc");*/
+		
+	}
+	// @Before 
+	// public void mocksetUp() {
+//      Long serialVersionUID = 333L;
+//	      PowerMockito.mockStatic(License.class);
+//	      expect (license.getSerialversionuid()).andReturn(serialVersionUID);
+//	      //PowerMockito.when(license.getSerialversionuid().
+//	      //PowerMockito.when(MathUtil.addInteger(2, 2)).thenReturn(1);
+//	   }
+	
+	/*private Long getserial() {
+		
+		return abc;
+	}*/
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ModelInfoTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ModelInfoTest.java
index 90eb230a4c..3d07f85c04 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ModelInfoTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ModelInfoTest.java
@@ -1,47 +1,47 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class ModelInfoTest {

-	private ModelInfo modelinfo = new ModelInfo();

-

-	@Test

-	public void testModelInfo() {

-		modelinfo.setModelName("modelName");

-		modelinfo.setModelUuid("modelUuid");

-		modelinfo.setModelInvariantUuid("modelInvariantUuid");

-		modelinfo.setModelVersion("modelVersion");

-		modelinfo.setModelCustomizationUuid("modelCustomizationUuid");

-		modelinfo.setModelInstanceName("modelInstanceName");

-		modelinfo.setModelType("modelType");

-		assertEquals(modelinfo.getModelName(), "modelName");

-		assertEquals(modelinfo.getModelUuid(), "modelUuid");

-		assertEquals(modelinfo.getModelInvariantUuid(), "modelInvariantUuid");

-		assertEquals(modelinfo.getModelVersion(), "modelVersion");

-		assertEquals(modelinfo.getModelCustomizationUuid(), "modelCustomizationUuid");

-		assertEquals(modelinfo.getModelInstanceName(), "modelInstanceName");

-		assertEquals(modelinfo.getModelType(), "modelType");

-	}

-

-}

+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ModelInfoTest {
+	private ModelInfo modelinfo = new ModelInfo();
+
+	@Test
+	public void testModelInfo() {
+		modelinfo.setModelName("modelName");
+		modelinfo.setModelUuid("modelUuid");
+		modelinfo.setModelInvariantUuid("modelInvariantUuid");
+		modelinfo.setModelVersion("modelVersion");
+		modelinfo.setModelCustomizationUuid("modelCustomizationUuid");
+		modelinfo.setModelInstanceName("modelInstanceName");
+		modelinfo.setModelType("modelType");
+		assertEquals(modelinfo.getModelName(), "modelName");
+		assertEquals(modelinfo.getModelUuid(), "modelUuid");
+		assertEquals(modelinfo.getModelInvariantUuid(), "modelInvariantUuid");
+		assertEquals(modelinfo.getModelVersion(), "modelVersion");
+		assertEquals(modelinfo.getModelCustomizationUuid(), "modelCustomizationUuid");
+		assertEquals(modelinfo.getModelInstanceName(), "modelInstanceName");
+		assertEquals(modelinfo.getModelType(), "modelType");
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ModuleResourceTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ModuleResourceTest.java
index 58cd45c3f1..dcb62cfc40 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ModuleResourceTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ModuleResourceTest.java
@@ -1,48 +1,48 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class ModuleResourceTest {

-	private ModuleResource moduleresource = new ModuleResource();

-

-	@Test

-	public void testModuleResource() {

-		

-		moduleresource.setVfModuleName("vfModuleName");

-		moduleresource.setHeatStackId("heatStackId");

-		moduleresource.setIsBase(true);

-		moduleresource.setVfModuleLabel("vfModuleLabel");

-		moduleresource.setInitialCount(0);

-		moduleresource.setVfModuleType("vfModuleType");

-		moduleresource.setHasVolumeGroup(true);

-		assertEquals(moduleresource.getVfModuleName(), "vfModuleName");

-		assertEquals(moduleresource.getHeatStackId(), "heatStackId");

-		assertEquals(moduleresource.getIsBase(), true);

-		assertEquals(moduleresource.getVfModuleLabel(), "vfModuleLabel");

-		assertEquals(moduleresource.getInitialCount(), 0);

-		assertEquals(moduleresource.getVfModuleType(), "vfModuleType");

-		assertEquals(moduleresource.isHasVolumeGroup(), true);

-			}

-

-}

+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ModuleResourceTest {
+	private ModuleResource moduleresource = new ModuleResource();
+
+	@Test
+	public void testModuleResource() {
+		
+		moduleresource.setVfModuleName("vfModuleName");
+		moduleresource.setHeatStackId("heatStackId");
+		moduleresource.setIsBase(true);
+		moduleresource.setVfModuleLabel("vfModuleLabel");
+		moduleresource.setInitialCount(0);
+		moduleresource.setVfModuleType("vfModuleType");
+		moduleresource.setHasVolumeGroup(true);
+		assertEquals(moduleresource.getVfModuleName(), "vfModuleName");
+		assertEquals(moduleresource.getHeatStackId(), "heatStackId");
+		assertEquals(moduleresource.getIsBase(), true);
+		assertEquals(moduleresource.getVfModuleLabel(), "vfModuleLabel");
+		assertEquals(moduleresource.getInitialCount(), 0);
+		assertEquals(moduleresource.getVfModuleType(), "vfModuleType");
+		assertEquals(moduleresource.isHasVolumeGroup(), true);
+			}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/NetworkResourceTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/NetworkResourceTest.java
new file mode 100644
index 0000000000..6ca9cef8d2
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/NetworkResourceTest.java
@@ -0,0 +1,42 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class NetworkResourceTest {
+	private NetworkResource nr = new NetworkResource();
+
+	@Test
+	public void testNetworkResource() {
+		nr.setNetworkType("networkType");
+		nr.setNetworkRole("networkRole");
+		nr.setNetworkTechnology("networkTechnology");
+		nr.setNetworkScope("networkScope");
+		assertEquals(nr.getNetworkType(), "networkType");
+		assertEquals(nr.getNetworkRole(), "networkRole");
+		assertEquals(nr.getNetworkTechnology(), "networkTechnology");
+		assertEquals(nr.getNetworkScope(), "networkScope");
+		
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/HealthCheckHandlerTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/OwningEntityTest.java
index 1086cc75ef..396d866446 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/HealthCheckHandlerTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/OwningEntityTest.java
@@ -1,38 +1,39 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
  * ================================================================================
- * Copyright (C) 2018 Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (C) 2018 TechMahindra
  * ================================================================================
  * 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.bpmn.core;
+*/
 
-import org.junit.Test;
+package org.onap.so.bpmn.core.domain;
 
-public class HealthCheckHandlerTest {
+import static org.junit.Assert.*;
 
-    HealthCheckHandler healthCheckHandler = new HealthCheckHandler();
+import org.junit.Test;
 
-    @Test
-    public void nodeHealthcheck() throws Exception {
-        healthCheckHandler.nodeHealthcheck();
-    }
+public class OwningEntityTest {
+	private OwningEntity oe = new OwningEntity();
 
-    @Test
-    public void healthcheck() throws Exception {
-        healthCheckHandler.healthcheck("test-123");
-    }
+	@Test
+	public void testOwingEntity() {
+		oe.setOwningEntityId("owningEntityId");
+		oe.setOwningEntityName("owningEntityName");
+		assertEquals(oe.getOwningEntityId(), "owningEntityId");
+		assertEquals(oe.getOwningEntityName(), "owningEntityName");
+		
+	}
 
-}
\ No newline at end of file
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ProjectTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ProjectTest.java
new file mode 100644
index 0000000000..9081f9dd14
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ProjectTest.java
@@ -0,0 +1,36 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ProjectTest {
+	
+	private Project project = new Project();
+
+	@Test
+	public void testProject() {
+		project.setProjectName("projectName");
+		assertEquals(project.getProjectName(), "projectName");
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/RequestTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/RequestTest.java
new file mode 100644
index 0000000000..0c552ce19e
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/RequestTest.java
@@ -0,0 +1,44 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class RequestTest {
+	
+	private Request request = new Request();
+	ModelInfo model = new ModelInfo();
+
+	@Test
+	public void testRequest() {
+		request.setSdncRequestId("sdncRequestId");
+		request.setRequestId("requestId");
+		request.setModelInfo(model);
+		request.setProductFamilyId("productFamilyId");
+		assertEquals(request.getSdncRequestId(), "sdncRequestId");
+		assertEquals(request.getRequestId(), "requestId");
+		assertEquals(request.getModelInfo(), model);
+		assertEquals(request.getProductFamilyId(), "productFamilyId");
+		
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ResourceDecompositionTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ResourceDecompositionTest.java
new file mode 100644
index 0000000000..573ffab4aa
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ResourceDecompositionTest.java
@@ -0,0 +1,50 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ResourceDecompositionTest {
+	
+	private ResourceDecomposition rd = new ResourceDecomposition() {
+		private static final long serialVersionUID = 1L;
+	};
+	ModelInfo model = new ModelInfo();
+	ResourceInstance ri = new ResourceInstance();
+	
+	
+
+	@Test
+	public void testResourceDecomposition() {
+		rd.setModelInfo(model);
+		rd.setInstanceData(ri);
+		rd.setResourceType("resourceType");
+		rd.setResourceInstanceId("newInstanceId");
+		rd.setResourceInstanceName("newInstanceName");
+		assertEquals(rd.getResourceModel(), model);
+		assertEquals(rd.getModelInfo(), model);
+		assertEquals(rd.getInstanceData(), ri);
+		assertEquals(rd.getResourceInstanceId(), "newInstanceId");
+		assertEquals(rd.getResourceInstanceName(), "newInstanceName");
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ResourceTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ResourceTest.java
index 8d6b61f4aa..afdbcd9f98 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ResourceTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ResourceTest.java
@@ -1,68 +1,68 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class ResourceTest {

-	private Resource resource = new Resource() {

-		private static final long serialVersionUID = 1L;

-		 

-		

-	};

-	ModelInfo model = new ModelInfo();

-	ResourceInstance ri = new ResourceInstance();

-	HomingSolution hs = new HomingSolution();

-	ResourceType rt = ResourceType.VNF;

-	public long concurrencyCounter = 1L;

-	long initval = resource.getConcurrencyCounter();

-

-	@Test

-	public void testResource() {

-		resource.setResourceId("resourceId");

-		resource.setModelInfo(model);

-		resource.setResourceInstance(ri);

-		resource.setHomingSolution(hs);

-		resource.setCurrentHomingSolution(hs);

-		resource.setResourceType(rt);

-		resource.setToscaNodeType("toscaNodeType");

-		resource.setResourceInstanceId("newInstanceId");

-		resource.setResourceInstanceName("newInstanceName");

-		resource.incrementConcurrencyCounter();

-		assertEquals(resource.getResourceId(), "resourceId");

-		assertEquals(resource.getModelInfo(), model);

-		assertEquals(resource.getResourceInstance(), ri);

-		assertEquals(resource.getHomingSolution(), hs);

-		assertEquals(resource.getCurrentHomingSolution(), hs);

-		assertEquals(resource.getResourceType(), rt);

-		assertEquals(resource.getToscaNodeType(), "toscaNodeType");

-		assertEquals(resource.getResourceInstanceId(), "newInstanceId");

-		assertEquals(resource.getResourceInstanceName(), "newInstanceName");

-		assertEquals(resource.getConcurrencyCounter(), initval+1);

-	

-		

-		

-		

-		

-	}

-

-}

+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ResourceTest {
+	private Resource resource = new Resource() {
+		private static final long serialVersionUID = 1L;
+		 
+		
+	};
+	ModelInfo model = new ModelInfo();
+	ResourceInstance ri = new ResourceInstance();
+	HomingSolution hs = new HomingSolution();
+	ResourceType rt = ResourceType.VNF;
+	public long concurrencyCounter = 1L;
+	long initval = resource.getConcurrencyCounter();
+
+	@Test
+	public void testResource() {
+		resource.setResourceId("resourceId");
+		resource.setModelInfo(model);
+		resource.setResourceInstance(ri);
+		resource.setHomingSolution(hs);
+		resource.setCurrentHomingSolution(hs);
+		resource.setResourceType(rt);
+		resource.setToscaNodeType("toscaNodeType");
+		resource.setResourceInstanceId("newInstanceId");
+		resource.setResourceInstanceName("newInstanceName");
+		resource.incrementConcurrencyCounter();
+		assertEquals(resource.getResourceId(), "resourceId");
+		assertEquals(resource.getModelInfo(), model);
+		assertEquals(resource.getResourceInstance(), ri);
+		assertEquals(resource.getHomingSolution(), hs);
+		assertEquals(resource.getCurrentHomingSolution(), hs);
+		assertEquals(resource.getResourceType(), rt);
+		assertEquals(resource.getToscaNodeType(), "toscaNodeType");
+		assertEquals(resource.getResourceInstanceId(), "newInstanceId");
+		assertEquals(resource.getResourceInstanceName(), "newInstanceName");
+		assertEquals(resource.getConcurrencyCounter(), initval+1);
+	
+		
+		
+		
+		
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ServiceDecompositionTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ServiceDecompositionTest.java
new file mode 100644
index 0000000000..82470f125b
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ServiceDecompositionTest.java
@@ -0,0 +1,125 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static com.shazam.shazamcrest.MatcherAssert.assertThat;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+public class ServiceDecompositionTest {
+	private static final String RESOURCE_PATH = "src/test/resources/json-examples/";
+	
+	VnfResource vnfResource;
+	NetworkResource networkResource;
+	AllottedResource allottedResource;
+	ConfigResource configResource;
+	
+	@Before
+	public void before() {
+		vnfResource = new VnfResource();
+		vnfResource.setResourceId("vnfResourceId");
+		vnfResource.setModules(new ArrayList<>());
+		
+		networkResource = new NetworkResource();
+		networkResource.setResourceId("networkResourceId");
+		
+		allottedResource = new AllottedResource();
+		allottedResource.setResourceId("allottedResourceId");
+	
+		configResource = new ConfigResource();
+		configResource.setResourceId("configResourceId");
+	}
+
+	@Test
+	public void serviceDecompositionTest() throws JsonProcessingException, IOException {
+		// covering methods not covered by openpojo test
+		String catalogRestOutput = new String(Files.readAllBytes(Paths.get(RESOURCE_PATH + "ServiceDecomposition.json")));
+		
+		ServiceDecomposition serviceDecomp = new ServiceDecomposition(catalogRestOutput);
+		serviceDecomp.addVnfResource(vnfResource);
+		serviceDecomp.addNetworkResource(networkResource);
+		serviceDecomp.addAllottedResource(allottedResource);
+		serviceDecomp.addConfigResource(configResource);
+		
+		assertThat(serviceDecomp.getServiceResource(vnfResource.getResourceId()), sameBeanAs(vnfResource));
+		assertThat(serviceDecomp.getServiceResource(networkResource.getResourceId()), sameBeanAs(networkResource));
+		assertThat(serviceDecomp.getServiceResource(allottedResource.getResourceId()), sameBeanAs(allottedResource));
+		assertThat(serviceDecomp.getServiceResource(configResource.getResourceId()), sameBeanAs(configResource));
+		
+		VnfResource vnfResourceReplace = new VnfResource();
+		vnfResourceReplace.setResourceId(vnfResource.getResourceId());
+		vnfResourceReplace.setResourceInstanceName("vnfResourceReplaceInstanceName");
+		
+		assertTrue(serviceDecomp.replaceResource(vnfResourceReplace));
+		assertTrue(serviceDecomp.getVnfResources().contains(vnfResourceReplace));
+		
+		assertTrue(serviceDecomp.deleteResource(vnfResourceReplace));
+		assertFalse(serviceDecomp.deleteResource(vnfResourceReplace));
+		assertFalse(serviceDecomp.deleteResource(new VnfResource()));
+	}
+		
+	@Test
+	public void serviceDecompositionJsonTest() throws IOException {
+		String catalogRestOutput = new String(Files.readAllBytes(Paths.get(RESOURCE_PATH + "ServiceDecomposition.json")));
+		String expectedCatalogRestOutput = new String(Files.readAllBytes(Paths.get(RESOURCE_PATH + "ServiceDecompositionExpected.json")));
+		String vnfResourceJson = new String(Files.readAllBytes(Paths.get(RESOURCE_PATH + "VnfResource.json")));
+		String networkResourceJson = new String(Files.readAllBytes(Paths.get(RESOURCE_PATH + "NetworkResource.json")));
+		String allottedResourceJson = new String(Files.readAllBytes(Paths.get(RESOURCE_PATH + "AllottedResource.json")));
+		String configResourceJson = new String(Files.readAllBytes(Paths.get(RESOURCE_PATH + "ConfigResource.json")));
+		
+		ServiceDecomposition serviceDecomp = new ServiceDecomposition(catalogRestOutput, "serviceInstanceId");
+		serviceDecomp.addResource(vnfResource);
+		serviceDecomp.addResource(networkResource);
+		serviceDecomp.addResource(allottedResource);
+		serviceDecomp.addResource(configResource);
+		
+		assertThat(serviceDecomp.getServiceResource(vnfResource.getResourceId()), sameBeanAs(vnfResource));
+		assertThat(serviceDecomp.getServiceResource(networkResource.getResourceId()), sameBeanAs(networkResource));
+		assertThat(serviceDecomp.getServiceResource(allottedResource.getResourceId()), sameBeanAs(allottedResource));
+		assertThat(serviceDecomp.getServiceResource(configResource.getResourceId()), sameBeanAs(configResource));
+		
+		serviceDecomp = new ServiceDecomposition(catalogRestOutput, "serviceInstanceId");
+		serviceDecomp.addVnfResource(vnfResourceJson);
+		serviceDecomp.addNetworkResource(networkResourceJson);
+		serviceDecomp.addAllottedResource(allottedResourceJson);
+		serviceDecomp.addConfigResource(configResourceJson);
+		
+		ServiceDecomposition expectedServiceDecomp = new ServiceDecomposition(expectedCatalogRestOutput, "serviceInstanceId");
+		
+		assertThat(serviceDecomp, sameBeanAs(expectedServiceDecomp));
+		assertEquals(serviceDecomp.listToJson(Arrays.asList(networkResource)) + serviceDecomp.listToJson(Arrays.asList(vnfResource)) + 
+				serviceDecomp.listToJson(Arrays.asList(allottedResource)) + serviceDecomp.listToJson(Arrays.asList(configResource)), 
+				serviceDecomp.getServiceResourcesJsonString());
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ServiceInstanceTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ServiceInstanceTest.java
index b600fef3fd..7cacc9da88 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ServiceInstanceTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ServiceInstanceTest.java
@@ -1,61 +1,61 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import java.util.Map;

-

-import org.junit.Test;

-

-public class ServiceInstanceTest {

-	

-	private ServiceInstance si= new ServiceInstance();

-	Map serviceParams;

-	Configuration config= new Configuration();

-	ModelInfo model= new ModelInfo();

-

-	@Test

-	public void testServiceInstance() {

-		si.setServiceType("serviceType");

-		si.setServiceId("serviceId");

-		si.setServiceParams(serviceParams);

-		si.setInstanceId("instanceId");

-		si.setInstanceName("instanceName");

-		si.setOrchestrationStatus("orchestrationStatus");

-		si.setConfiguration(config);

-		si.setModelInfo(model);

-		si.setEnvironmentContext("environmentContext");

-		si.setWorkloadContext("workloadContext");

-		assertEquals(si.getServiceType(), "serviceType");

-		assertEquals(si.getServiceId(), "serviceId");

-		assertEquals(si.getServiceParams(), serviceParams);

-		assertEquals(si.getInstanceId(), "instanceId");

-		assertEquals(si.getInstanceName(), "instanceName");

-		assertEquals(si.getOrchestrationStatus(), "orchestrationStatus");

-		assertEquals(si.getConfiguration(), config);

-		assertEquals(si.getModelInfo(), model);

-		assertEquals(si.getEnvironmentContext(), "environmentContext");

-		assertEquals(si.getWorkloadContext(), "workloadContext");

-		

-		

-	}

-

-}

+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import java.util.Map;
+
+import org.junit.Test;
+
+public class ServiceInstanceTest {
+	
+	private ServiceInstance si= new ServiceInstance();
+	Map serviceParams;
+	Configuration config= new Configuration();
+	ModelInfo model= new ModelInfo();
+
+	@Test
+	public void testServiceInstance() {
+		si.setServiceType("serviceType");
+		si.setServiceId("serviceId");
+		si.setServiceParams(serviceParams);
+		si.setInstanceId("instanceId");
+		si.setInstanceName("instanceName");
+		si.setOrchestrationStatus("orchestrationStatus");
+		si.setConfiguration(config);
+		si.setModelInfo(model);
+		si.setEnvironmentContext("environmentContext");
+		si.setWorkloadContext("workloadContext");
+		assertEquals(si.getServiceType(), "serviceType");
+		assertEquals(si.getServiceId(), "serviceId");
+		assertEquals(si.getServiceParams(), serviceParams);
+		assertEquals(si.getInstanceId(), "instanceId");
+		assertEquals(si.getInstanceName(), "instanceName");
+		assertEquals(si.getOrchestrationStatus(), "orchestrationStatus");
+		assertEquals(si.getConfiguration(), config);
+		assertEquals(si.getModelInfo(), model);
+		assertEquals(si.getEnvironmentContext(), "environmentContext");
+		assertEquals(si.getWorkloadContext(), "workloadContext");
+		
+		
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/SubscriberTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/SubscriberTest.java
new file mode 100644
index 0000000000..b862c8704f
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/SubscriberTest.java
@@ -0,0 +1,41 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class SubscriberTest {
+	Subscriber subscriber= new Subscriber("globalId", "name", "commonSiteId");
+
+	@Test
+	public void testSubscriber() {
+		subscriber.setGlobalId("globalId");
+		subscriber.setName("name");
+		subscriber.setCommonSiteId("commonSiteId");
+		assertEquals(subscriber.getGlobalId(), "globalId");
+		assertEquals(subscriber.getName(), "name");
+		assertEquals(subscriber.getCommonSiteId(), "commonSiteId");
+		
+		
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/VnfResourceTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/VnfResourceTest.java
index e476ef9fd5..24947e9a8d 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/VnfResourceTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/VnfResourceTest.java
@@ -1,55 +1,55 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import java.util.List;

-

-import org.junit.Test;

-

-public class VnfResourceTest {

-	

-	private VnfResource vnf= new VnfResource();

-	List<ModuleResource> moduleResources;

-

-	@Test

-	public void testVnfResource() {

-		vnf.setModules(moduleResources);

-		vnf.setVnfHostname("vnfHostname");

-		vnf.setVnfType("vnfType");

-		vnf.setNfFunction("nfFunction");

-		vnf.setNfType("nfType");

-		vnf.setNfRole("nfRole");

-		vnf.setNfNamingCode("nfNamingCode");

-		vnf.setMultiStageDesign("multiStageDesign");

-		assertEquals(vnf.getVfModules(), moduleResources);

-		assertEquals(vnf.getVnfHostname(), "vnfHostname");

-		assertEquals(vnf.getVnfType(), "vnfType");

-		assertEquals(vnf.getNfFunction(), "nfFunction");

-		assertEquals(vnf.getNfType(), "nfType");

-		assertEquals(vnf.getNfRole(), "nfRole");

-		assertEquals(vnf.getNfNamingCode(), "nfNamingCode");

-		assertEquals(vnf.getMultiStageDesign(), "multiStageDesign");

-		

-		

-	}

-

-}

+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.core.domain;
+
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import org.junit.Test;
+
+public class VnfResourceTest {
+	
+	private VnfResource vnf= new VnfResource();
+	List<ModuleResource> moduleResources;
+
+	@Test
+	public void testVnfResource() {
+		vnf.setModules(moduleResources);
+		vnf.setVnfHostname("vnfHostname");
+		vnf.setVnfType("vnfType");
+		vnf.setNfFunction("nfFunction");
+		vnf.setNfType("nfType");
+		vnf.setNfRole("nfRole");
+		vnf.setNfNamingCode("nfNamingCode");
+		vnf.setMultiStageDesign("multiStageDesign");
+		assertEquals(vnf.getVfModules(), moduleResources);
+		assertEquals(vnf.getVnfHostname(), "vnfHostname");
+		assertEquals(vnf.getVnfType(), "vnfType");
+		assertEquals(vnf.getNfFunction(), "nfFunction");
+		assertEquals(vnf.getNfType(), "nfType");
+		assertEquals(vnf.getNfRole(), "nfRole");
+		assertEquals(vnf.getNfNamingCode(), "nfNamingCode");
+		assertEquals(vnf.getMultiStageDesign(), "multiStageDesign");
+		
+		
+	}
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/internal/VariableNameExtractorTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/internal/VariableNameExtractorTest.java
index 57f479f7cb..e32bc88b7c 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/internal/VariableNameExtractorTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/internal/VariableNameExtractorTest.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,9 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.core.internal;
-
-import static org.assertj.core.api.Assertions.assertThat;
+package org.onap.so.bpmn.core.internal;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.contains;
 
 import java.util.Optional;
 import org.junit.Test;
@@ -36,7 +37,8 @@ public class VariableNameExtractorTest {
         // when
         Optional<String> extracted = extractor.extract();
         // then
-        assertThat(extracted).isPresent().contains(name);
+        assertTrue(extracted.isPresent());
+        assertThat(extracted.get(), containsString(name));
     }
 
     @Test
@@ -48,7 +50,8 @@ public class VariableNameExtractorTest {
         // when
         Optional<String> extracted = extractor.extract();
         // then
-        assertThat(extracted).isPresent().contains(name);
+        assertTrue(extracted.isPresent());
+        assertThat(extracted.get(), containsString(name));
     }
 
     @Test
@@ -59,7 +62,7 @@ public class VariableNameExtractorTest {
         // when
         Optional<String> extracted = extractor.extract();
         // then
-        assertThat(extracted).isNotPresent();
+        assertFalse(extracted.isPresent());
     }
 
     @Test
@@ -70,7 +73,7 @@ public class VariableNameExtractorTest {
         // when
         Optional<String> extracted = extractor.extract();
         // then
-        assertThat(extracted).isNotPresent();
+        assertFalse(extracted.isPresent());
     }
 
     @Test
@@ -81,6 +84,6 @@ public class VariableNameExtractorTest {
         // when
         Optional<String> extracted = extractor.extract();
         // then
-        assertThat(extracted).isNotPresent();
+        assertFalse(extracted.isPresent());
     }
 }
\ No newline at end of file
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/DecomposeJsonUtilTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/DecomposeJsonUtilTest.java
new file mode 100644
index 0000000000..c1f7cce30b
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/DecomposeJsonUtilTest.java
@@ -0,0 +1,170 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 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.onap.so.bpmn.core.json;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.onap.so.bpmn.core.domain.AllottedResource;
+import org.onap.so.bpmn.core.domain.ConfigResource;
+import org.onap.so.bpmn.core.domain.NetworkResource;
+import org.onap.so.bpmn.core.domain.ServiceDecomposition;
+import org.onap.so.bpmn.core.domain.VnfResource;
+
+public class DecomposeJsonUtilTest {
+
+	private VnfResource vnfResource;
+	private NetworkResource networkResource;
+	private AllottedResource allottedResource;
+	private ConfigResource configResource;
+	private ServiceDecomposition serviceDecomposition;
+
+	private String serviceInstanceId = "serviceInstanceId";
+	
+	@Rule
+	public ExpectedException expectedException = ExpectedException.none();	
+	
+	@Before
+	public void before() throws Exception {
+		
+	}
+	
+	@Test
+	public void testJsonToServiceDecomposition_twoParams() throws JsonDecomposingException {
+		serviceDecomposition = createServiceDecompositionData();
+		ServiceDecomposition serviceDecompositionObj = DecomposeJsonUtil.jsonToServiceDecomposition(serviceDecomposition.toString(), "serviceInstanceId");
+		assertEquals(serviceInstanceId, serviceDecompositionObj.getServiceInstance().getInstanceId());
+	}	
+	
+	@Test
+	public void testJsonToServiceDecomposition() throws JsonDecomposingException {
+		serviceDecomposition = createServiceDecompositionData();
+		ServiceDecomposition serviceDecompositionObj = DecomposeJsonUtil.jsonToServiceDecomposition(serviceDecomposition.toString());
+		assertEquals(serviceDecomposition.getServiceType(), serviceDecompositionObj.getServiceType());
+	}	
+	
+	@Test
+	public void testJsonToServiceDecomposition_JsonDecomposingException() throws JsonDecomposingException {
+		expectedException.expect(JsonDecomposingException.class);
+		vnfResource = createVnfResourceData(); // wrong object
+		ServiceDecomposition serviceDecompositionObj = DecomposeJsonUtil.jsonToServiceDecomposition(vnfResource.toString());
+	}	
+	
+	@Test
+	public void testJsonToVnfResource() throws JsonDecomposingException {
+		vnfResource = createVnfResourceData();
+		VnfResource vnfResourceObj = DecomposeJsonUtil.jsonToVnfResource(vnfResource.toString());
+		assertEquals(vnfResource.getResourceId(), vnfResourceObj.getResourceId());
+	}
+	
+	@Test
+	public void testJsonToVnfResource_JsonDecomposingException() throws JsonDecomposingException {
+		expectedException.expect(JsonDecomposingException.class);
+		networkResource = createNetworkResourceData();  // wrong object
+		VnfResource vnfResourceObj = DecomposeJsonUtil.jsonToVnfResource(networkResource.toString());
+	}	
+	
+	@Test
+	public void testJsonToNetworkResource() throws JsonDecomposingException {
+		networkResource = createNetworkResourceData();
+		NetworkResource networkResourceObj = DecomposeJsonUtil.jsonToNetworkResource(networkResource.toString());
+		assertEquals(networkResource.getResourceId(), networkResourceObj.getResourceId());
+	}
+	
+	@Test
+	public void testJsonToNetworkResource_JsonDecomposingException() throws JsonDecomposingException {
+		expectedException.expect(JsonDecomposingException.class);
+		vnfResource = createVnfResourceData(); // wrong object
+		NetworkResource networkResourceObj = DecomposeJsonUtil.jsonToNetworkResource(vnfResource.toString());
+	}	
+	
+	@Test
+	public void testJsonToAllottedResource() throws JsonDecomposingException {
+		allottedResource = createAllottedResourceData();
+		AllottedResource allottedResourceObj = DecomposeJsonUtil.jsonToAllottedResource(allottedResource.toString());
+		assertEquals(allottedResource.getResourceId(), allottedResourceObj.getResourceId());
+	}
+	
+	@Test
+	public void testJsonToAllottedResource_JsonDecomposingException() throws JsonDecomposingException {
+		expectedException.expect(JsonDecomposingException.class);
+		configResource = createConfigResourceData(); // wrong object
+		AllottedResource allottedResourceObj = DecomposeJsonUtil.jsonToAllottedResource(configResource.toString());
+	}	
+	
+	@Test
+	public void testJsonToConfigResource() throws JsonDecomposingException {
+		configResource = createConfigResourceData();
+		ConfigResource configResourceObj = DecomposeJsonUtil.jsonToConfigResource(configResource.toString());
+		assertEquals(configResource.getResourceId(), configResourceObj.getResourceId());
+	}
+	
+	@Test
+	public void testJsonToConfigResource_JsonDecomposingException() throws JsonDecomposingException {
+		expectedException.expect(JsonDecomposingException.class);
+		allottedResource = createAllottedResourceData(); // wrong object
+		ConfigResource configResourceObj = DecomposeJsonUtil.jsonToConfigResource(allottedResource.toString());
+	}	
+	
+	// data creation section
+	private VnfResource createVnfResourceData() {
+	 	vnfResource = new VnfResource();
+	 	vnfResource.setResourceId("resourceId");
+	 	vnfResource.setNfFunction("nfFunction");
+	 	vnfResource.setNfNamingCode("nfNamingCode");
+	 	vnfResource.setNfRole("nfRole");
+	 	return vnfResource;
+	}
+	
+	private NetworkResource createNetworkResourceData() {
+		networkResource = new NetworkResource();
+		networkResource.setNetworkRole("networkRole");
+		networkResource.setResourceId("resourceId");
+		return networkResource;
+	}
+	
+	private AllottedResource createAllottedResourceData() {
+		allottedResource = new AllottedResource();
+		allottedResource.setResourceId("resourceId");
+		allottedResource.setNfFunction("nfFunction");
+		allottedResource.setNfNamingCode("nfNamingCode");
+		allottedResource.setNfRole("nfRole");
+		return allottedResource;
+	}
+
+	private ConfigResource createConfigResourceData() {
+		configResource = new ConfigResource();
+		configResource.setResourceId("resourceId");
+		configResource.setToscaNodeType("toscaNodeType");
+		return configResource;
+	}
+	
+	private ServiceDecomposition createServiceDecompositionData() {
+		serviceDecomposition = new ServiceDecomposition();
+		serviceDecomposition.setSdncVersion("sdncVersion");
+		serviceDecomposition.setServiceRole("serviceRole");
+		serviceDecomposition.setServiceType("serviceType");
+		return serviceDecomposition;
+	}	
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonDecomposingExceptionTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonDecomposingExceptionTest.java
new file mode 100644
index 0000000000..6c8b7326e2
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonDecomposingExceptionTest.java
@@ -0,0 +1,38 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 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.onap.so.bpmn.core.json;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class JsonDecomposingExceptionTest {
+
+	private JsonDecomposingException jsonDecomposingException;
+	
+	@Test
+	public void test() {
+		String expectedMessage = "java.lang.Throwable: anyCause";
+		String message = "java.lang.Throwable: anyCause";
+		Throwable cause = new Throwable("anyCause");
+		jsonDecomposingException = new JsonDecomposingException(message, cause);
+		assertEquals(expectedMessage, jsonDecomposingException.getMessage());
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/JsonUtilsTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonUtils2Test.java
index 9643db7834..667027f8de 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/JsonUtilsTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonUtils2Test.java
@@ -18,31 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.bpmn.core;
-
+package org.onap.so.bpmn.core.json;
 
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -53,9 +32,9 @@ import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openecomp.mso.apihandler.common.ValidationException;
-import org.openecomp.mso.bpmn.core.json.JsonUtils;
-import org.openecomp.mso.bpmn.core.xml.XmlTool;
+import org.onap.so.bpmn.core.json.JsonUtils;
+import org.onap.so.bpmn.core.xml.XmlTool;
+import org.onap.so.exceptions.ValidationException;
 import org.xmlunit.builder.DiffBuilder;
 import org.xmlunit.diff.DefaultNodeMatcher;
 import org.xmlunit.diff.Diff;
@@ -64,11 +43,11 @@ import org.xmlunit.diff.ElementSelectors;
 /**
  * @version 1.0
  */
-public class JsonUtilsTest {
+public class JsonUtils2Test {
 
     private static final String EOL = "\n";
     private static final String XML_REQ =
-                    "<vnf-request xmlns=\"http://org.openecomp/mso/infra/vnf-request/v1\">" + EOL +
+                    "<vnf-request xmlns=\"http://org.onap/so/infra/vnf-request/v1\">" + EOL +
                     "  <request-info>" + EOL +
                     "    <request-id>DEV-VF-0021</request-id>" + EOL +
                     "    <action>CREATE_VF_MODULE</action>" + EOL +
@@ -92,14 +71,14 @@ public class JsonUtilsTest {
                     "    <aic-cloud-region>RDM2WAGPLCP</aic-cloud-region>" + EOL +
                     "    <asdc-service-model-version>1</asdc-service-model-version>" + EOL +
                     "  </vnf-inputs>" + EOL +
-                    "  <vnf-params xmlns:tns=\"http://org.openecomp/mso/infra/vnf-request/v1\">" + EOL +
+                    "  <vnf-params xmlns:tns=\"http://org.onap/so/infra/vnf-request/v1\">" + EOL +
                     "    <param name=\"network\">network1111</param>" + EOL +
                     "    <param name=\"server\">server1111</param>" + EOL +
                     "  </vnf-params> " + EOL +
                     "</vnf-request>" + EOL;
     
     private static final String XML_REQ_NO_ATTRS =
-                    "<vnf-request xmlns=\"http://org.openecomp/mso/infra/vnf-request/v1\">" + EOL +
+                    "<vnf-request xmlns=\"http://org.onap/so/infra/vnf-request/v1\">" + EOL +
                     "  <request-info>" + EOL +
                     "    <action>DELETE_VF_MODULE</action>" + EOL +
                     "    <source>PORTAL</source>" + EOL +
@@ -116,7 +95,7 @@ public class JsonUtilsTest {
                     "    <orchestration-status>pending-delete</orchestration-status>" + EOL +
                     "    <aic-cloud-region>RDM2WAGPLCP</aic-cloud-region>" + EOL +
                     "  </vnf-inputs>" + EOL +
-                    "  <vnf-params xmlns:tns=\"http://org.openecomp/mso/infra/vnf-request/v1\"/>" + EOL +
+                    "  <vnf-params xmlns:tns=\"http://org.onap/so/infra/vnf-request/v1\"/>" + EOL +
                     "</vnf-request>" + EOL;
 
     private static final String XML_ARRAY_REQ =
@@ -184,7 +163,7 @@ public class JsonUtilsTest {
         Diff diffXml = DiffBuilder.compare(xmlIn).withTest(xmlOut).ignoreWhitespace()
                 .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byName)).checkForSimilar().build();
 
-        assertThat(diffXml.hasDifferences()).withFailMessage(diffXml.toString()).isFalse();
+        assertFalse(diffXml.hasDifferences());
     }
 
     @Test
@@ -192,11 +171,11 @@ public class JsonUtilsTest {
         // given
         String json = JsonUtils.xml2json(XML_REQ);
         // when, then
-        assertThat(JsonUtils.getJsonValue(json, "vnf-request.vnf-inputs.vnf-name")).isEqualTo("STMTN5MMSC21");
-        assertThat(JsonUtils.getJsonValue(json, "vnf-request.request-info.action")).isEqualTo("CREATE_VF_MODULE");
-        assertThat(JsonUtils.getJsonValue(json, "vnf-request.vnf-inputs.persona-model-version")).isEqualTo("1");
-        assertThat(JsonUtils.getJsonValue(json, "vnf-request.vnf-inputs.vnf-persona-model-version")).isEqualTo("1.5");
-        assertThat(JsonUtils.getJsonValue(json, "vnf-request.vnf-inputs.is-base-module")).isEqualTo("true");
+        assertEquals("STMTN5MMSC21", JsonUtils.getJsonValue(json, "vnf-request.vnf-inputs.vnf-name"));
+        assertEquals("CREATE_VF_MODULE", JsonUtils.getJsonValue(json, "vnf-request.request-info.action"));
+        assertEquals("1", JsonUtils.getJsonValue(json, "vnf-request.vnf-inputs.persona-model-version"));
+        assertEquals("1.5", JsonUtils.getJsonValue(json, "vnf-request.vnf-inputs.vnf-persona-model-version"));
+        assertEquals("true", JsonUtils.getJsonValue(json, "vnf-request.vnf-inputs.is-base-module"));
     }
 
     @Test
@@ -204,7 +183,7 @@ public class JsonUtilsTest {
         // given
         String json = JsonUtils.xml2json(XML_REQ);
         // when, then
-        assertThat(JsonUtils.getJsonValueForKey(json, "source")).isEqualTo("PORTAL");
+        assertEquals("PORTAL", JsonUtils.getJsonValueForKey(json, "source"));
     }
 
     @Test
@@ -212,7 +191,7 @@ public class JsonUtilsTest {
         // given
         String json = JsonUtils.xml2json(XML_REQ);
         // when, then
-        assertThat(JsonUtils.getJsonValueForKey(json, "nonexistent-node")).isNull();
+        assertNull(JsonUtils.getJsonValueForKey(json, "nonexistent-node"));
     }
 
     @Test
@@ -220,7 +199,7 @@ public class JsonUtilsTest {
         // given
         String json = JsonUtils.xml2json(XML_REQ);
         // when, then
-        assertThat(JsonUtils.getJsonValue(json, "vnf-request.vnf-inputs.bad")).isNull();
+        assertNull(JsonUtils.getJsonValue(json, "vnf-request.vnf-inputs.bad"));
     }
 
     @Test
@@ -228,16 +207,12 @@ public class JsonUtilsTest {
         // given
         String json = JsonUtils.xml2json(XML_REQ);
         // when, then
-        assertThat(JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "name")).isEqualTo("network");
-        assertThat(JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "content"))
-                .isEqualTo("network1111");
-        assertThat(JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "name", 1)).isEqualTo("server");
-        assertThat(JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "content", 1))
-                .isEqualTo("server1111");
-        assertThat(JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "badParam"))
-                .withFailMessage("Expected null for nonexistent param").isNull();
-        assertThat(JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "name", 2))
-                .withFailMessage("Expected null for index out of bound").isNull();
+        assertEquals("network", JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "name"));
+        assertEquals("network1111", JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "content"));
+        assertEquals("server", JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "name", 1));
+        assertEquals("server1111", JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "content", 1));
+        assertNull(JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "badParam"));
+        assertNull(JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "name", 2));
     }
             
     @Test
@@ -250,7 +225,7 @@ public class JsonUtilsTest {
         String jsonUpd = JsonUtils.addJsonValue(json, key, value);
         // then
         String extractedValue = JsonUtils.getJsonValue(jsonUpd, key);
-        assertThat(extractedValue).isEqualTo(value);
+        assertEquals(value, extractedValue);
     }
 
     @Test
@@ -259,13 +234,12 @@ public class JsonUtilsTest {
         String json = JsonUtils.xml2json(XML_REQ);
         String key = "vnf-request.vnf-inputs.vnf-name";
         String newValue = "STMTN5MMSC22";
-        String oldValue = JsonUtils.getJsonValue(json, key);
         // when
         String jsonUpd = JsonUtils.addJsonValue(json, key, newValue);
         // then
         String extractedValue = JsonUtils.getJsonValue(jsonUpd, key);
-        assertThat(extractedValue).isEqualTo(oldValue).isNotEqualTo(newValue);
-            }
+        assertNotEquals(newValue, extractedValue);
+    }
 
     @Test
     public void shouldUpdateValueInJson() throws Exception {
@@ -278,7 +252,7 @@ public class JsonUtilsTest {
         String jsonUpd = JsonUtils.updJsonValue(json, key, newValue);
         // then
         String extractedValue = JsonUtils.getJsonValue(jsonUpd, key);
-        assertThat(extractedValue).isNotEqualTo(oldValue).isEqualTo(newValue);
+        assertEquals(newValue, extractedValue);
     }
 
     @Test
@@ -286,12 +260,11 @@ public class JsonUtilsTest {
         // given
         String json = JsonUtils.xml2json(XML_REQ);
         String key = "vnf-request.vnf-inputs.vnf-name";
-        String oldValue = JsonUtils.getJsonValue(json, key);
         // when
         String jsonUpd = JsonUtils.delJsonValue(json, key);
         // then
         String extractedValue = JsonUtils.getJsonValue(jsonUpd, key);
-        assertThat(extractedValue).isNotEqualTo(oldValue).isNull();
+        assertNull(extractedValue);
 			JSONObject jsonObj = new JSONObject(json);
             Integer intValue = JsonUtils.getJsonIntValueForKey(jsonObj, "persona-model-version");
             Assert.assertTrue(intValue == 1);
@@ -307,7 +280,7 @@ public class JsonUtilsTest {
         // when
         String jsonUpd = JsonUtils.delJsonValue(json, key);
         // then
-        assertThat(jsonUpd).isEqualTo(json);
+        assertEquals(json, jsonUpd);
     }
     
     @Test
@@ -321,8 +294,8 @@ public class JsonUtilsTest {
         // then
         Diff diffXml = DiffBuilder.compare(xmlReq).withTest(xmlOut).ignoreWhitespace()
                 .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byName)).checkForSimilar().build();
-        assertThat(diffXml.hasDifferences()).withFailMessage(diffXml.toString()).isFalse();
-                    }
+        assertFalse(diffXml.hasDifferences());
+     }
                     
     @Test
     public void shouldConvertJsonContainingArrayToXml() throws Exception {
@@ -332,7 +305,7 @@ public class JsonUtilsTest {
         // then
         Diff diffXml = DiffBuilder.compare(XML_ARRAY_REQ).withTest(xmlOut).ignoreWhitespace()
                 .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byName)).checkForSimilar().build();
-        assertThat(diffXml.hasDifferences()).withFailMessage(diffXml.toString()).isFalse();
+        assertFalse(diffXml.hasDifferences());
     }
 
     @Test
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonUtilsTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonUtilsTest.java
new file mode 100644
index 0000000000..07523ca931
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonUtilsTest.java
@@ -0,0 +1,233 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.core.json;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Map;
+
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.camunda.bpm.engine.runtime.Execution;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mock;
+import org.onap.so.exceptions.ValidationException;
+
+public class JsonUtilsTest {
+
+	@Mock public DelegateExecution execution;
+	@Mock public Execution mockEexecution;
+	private final String fileLocation = "src/test/resources/json-examples/";
+
+	@Rule
+	public ExpectedException expectedException = ExpectedException.none();	
+	
+	@Test
+	public void jsonStringToMapTest() throws IOException {
+
+		JsonUtils utils = new JsonUtils();
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		String entry = JsonUtils.getJsonValue(response, "SDNCServiceResponse.params");
+		Map<String, String> map = utils.jsonStringToMap(execution, entry);
+		assertEquals(map.get("e2e-vpn-key"), "my-key");
+	}
+
+	@Test
+	public void entryArrayToMapTest() throws IOException {
+		JsonUtils utils = new JsonUtils();
+		String response = this.getJson("SNIROExample.json");
+		String entry = JsonUtils.getJsonValue(response, "solutionInfo.placementInfo");
+		JSONArray arr = new JSONArray(entry);
+		JSONObject homingDataJson = arr.getJSONObject(0);
+		JSONArray assignmentInfo = homingDataJson.getJSONArray("assignmentInfo");
+		Map<String, String> map = utils.entryArrayToMap(execution, assignmentInfo.toString(), "variableName", "variableValue");
+		assertEquals(map.get("cloudOwner"), "att-aic");
+	}
+	@Test
+	public void entryArrayToMapStringTest() throws IOException {
+		JsonUtils utils = new JsonUtils();
+		String response = this.getJson("SNIROExample.json");
+		String entry = JsonUtils.getJsonValue(response, "solutionInfo.placementInfo");
+		JSONArray arr = new JSONArray(entry);
+		JSONObject homingDataJson = arr.getJSONObject(0);
+		JSONArray assignmentInfo = homingDataJson.getJSONArray("assignmentInfo");
+		Map<String, String> map = utils.entryArrayToMap(assignmentInfo.toString(), "variableName", "variableValue");
+		assertEquals(map.get("cloudOwner"), "att-aic");
+	}	
+	@Test
+	public void getJsonRootPropertyTest() throws IOException {
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		assertEquals("SDNCServiceResponse",JsonUtils.getJsonRootProperty(response));
+	}	
+	@Test
+	public void getJsonRootProperty_ExceptionTest() throws IOException {
+		expectedException.expect(JSONException.class);
+		String response = this.getJson("SNIROExample.json");
+		String root = JsonUtils.getJsonRootProperty(response);
+	}
+	@Test
+	public void getJsonNodeValueTest() throws IOException {
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		String code = JsonUtils.getJsonNodeValue(response,"SDNCServiceResponse.responseCode");
+		assertEquals("200", code); 
+	}	
+	@Test
+	public void  stringArrayToList_jsonStringTest() throws IOException {
+		String response = this.getJson("SNIROExample.json");
+		String licenseInfo = JsonUtils.getJsonNodeValue(response,"solutionInfo.licenseInfo");
+		JsonUtils utils = new JsonUtils();
+		List<String> listString = utils.StringArrayToList(licenseInfo);
+		assertNotNull(listString.get(0)); 
+	}	
+	@Test
+	public void  stringArrayToList_JSONArrayTest() throws IOException {
+		String response = this.getJson("SNIROExample.json");
+		String licenseInfo = JsonUtils.getJsonNodeValue(response,"solutionInfo.licenseInfo");
+		JSONArray jsonArray = new JSONArray(licenseInfo);
+		JsonUtils utils = new JsonUtils();
+		List<String> listString = utils.StringArrayToList(jsonArray);
+		assertNotNull(listString.get(0)); 
+	}	
+	@Test
+	public void  stringArrayToList_withExecutionTest() throws IOException {
+		String response = this.getJson("SNIROExample.json");
+		String licenseInfo = JsonUtils.getJsonNodeValue(response,"solutionInfo.licenseInfo");
+		JsonUtils utils = new JsonUtils();
+		List<String> listString = utils.StringArrayToList(mockEexecution, licenseInfo);
+		assertNotNull(listString.get(0)); 
+	}
+	@Test
+	public void jsonElementExist_trueTest() throws IOException {
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		boolean isExist = JsonUtils.jsonElementExist(response,"SDNCServiceResponse.responseCode");
+		assertEquals(true, isExist); 
+	}
+	@Test
+	public void jsonElementExist_falseTest() throws IOException {
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		boolean isExist = JsonUtils.jsonElementExist(response,"SDNCServiceResponse.responseX");
+		assertEquals(false, isExist); 
+	}
+	@Test
+	public void jsonElementExist_NullTest() throws IOException  {
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		boolean isExist = JsonUtils.jsonElementExist(response, null);
+		assertEquals(true, isExist);
+	}	
+	@Test
+	public void jsonSchemaValidation_ExceptionTest() throws IOException, ValidationException  {
+		expectedException.expect(ValidationException.class);
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		String isExist = JsonUtils.jsonSchemaValidation(response, fileLocation);
+	}	
+	@Test
+	public void getJsonIntValueTest() throws IOException {
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		int intValue = JsonUtils.getJsonIntValue(response,"SDNCServiceResponse.responseCode");
+		assertEquals(0, intValue); 
+	}
+	@Test
+	public void getJsonBooleanValueTest() throws IOException {
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		boolean isBoolean = JsonUtils.getJsonBooleanValue(response,"SDNCServiceResponse.responseCode");
+		assertEquals(false, isBoolean); 
+	}	
+	@Test
+	public void prettyJsonTest() throws IOException {
+		String response = this.getJson("SNIROExample.json");
+		assertNotNull(JsonUtils.prettyJson(response));
+		String malformedJson = "{\"name\" \"myName\"}";
+		assertNull(JsonUtils.prettyJson(malformedJson));
+	}
+	@Test
+	public void xml2jsonTest() throws IOException {
+		String expectedJson = "{\"name\":\"myName\"}";
+		String xml = "<name>myName</name>";
+		assertEquals(expectedJson, JsonUtils.xml2json(xml,false));
+	}	
+	@Test
+	public void xml2jsonErrorTest() throws IOException {
+		String malformedXml = "<name>myName<name>";
+		assertNull(JsonUtils.xml2json(malformedXml));
+	}
+	@Test
+	public void json2xmlTest() throws IOException {
+		String expectedXml = "<name>myName</name>";
+		String malformedJson = "{\"name\":\"myName\"}";
+		assertEquals(expectedXml, JsonUtils.json2xml(malformedJson, false));
+	}
+	@Test
+	public void json2xmlErrorTest() throws IOException {
+		String malformedJson = "{\"name\" \"myName\"}";
+		assertNull(JsonUtils.json2xml(malformedJson));
+	}
+	@Test
+	public void getJsonValueErrorTest() throws IOException {
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		assertNull(JsonUtils.getJsonValue(response,null)); 
+	}
+	@Test
+	public void getJsonNodeValueErrorTest() throws IOException {
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		assertNull(JsonUtils.getJsonNodeValue(response,null)); 
+	}
+	@Test
+	public void getJsonIntValueErrorTest() throws IOException {
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		assertEquals(0, JsonUtils.getJsonIntValue(response,null));
+	}
+	@Test
+	public void getJsonBooleanValueErrorTest() throws IOException {
+		String response = this.getJson("SDNCServiceResponseExample.json");
+		assertEquals(false, JsonUtils.getJsonBooleanValue(response,null));
+	}
+	@Test
+	public void getJsonValueForKeyErrorTest() throws IOException {
+		String malformedJson = "{\"name\" \"myName\"}";
+		assertNull(JsonUtils.getJsonValueForKey(malformedJson, "name"));
+	}
+	@Test
+	public void updJsonValueTest() throws IOException {
+		String expectedJson = "{\"name\": \"yourName\"}";
+		String json = "{\"name\":\"myName\"}";
+		assertEquals(expectedJson, JsonUtils.updJsonValue(json, "name", "yourName"));
+	}
+	@Test
+	public void updJsonValueErrorTest() throws IOException {
+		String expectedJson = "{\"name\" \"myName\"}";
+		String json = "{\"name\" \"myName\"}";
+		assertEquals(expectedJson, JsonUtils.updJsonValue(json, "name", "yourName"));
+	}
+	
+	private String getJson(String filename) throws IOException {
+		return new String(Files.readAllBytes(Paths.get(fileLocation + filename)));
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/utils/CamundaDBSetup.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/utils/CamundaDBSetup.java
index f29ccc75e0..f3cc094873 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/utils/CamundaDBSetup.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/utils/CamundaDBSetup.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,21 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.core.utils;
+package org.onap.so.bpmn.core.utils;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.logger.MsoLogger;
 
 /**
  * Sets up the unit test (H2) database for Camunda.
  */
 public class CamundaDBSetup {
 	private static boolean isDBConfigured = false;
-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, CamundaDBSetup.class);
 	
 	private CamundaDBSetup() {
 	}
@@ -48,51 +48,10 @@ public class CamundaDBSetup {
 		PreparedStatement stmt = null;
 
 		try {
-			connection = DriverManager.getConnection(
-				"jdbc:h2:mem:camunda;DB_CLOSE_DELAY=-1", "sa", "");
 
-			stmt = connection.prepareStatement("delete from ACT_HI_VARINST");
-			stmt.executeUpdate();
-			stmt.close();
-			stmt = null;
-
-			stmt = connection.prepareStatement("ALTER TABLE ACT_HI_VARINST alter column TEXT_ clob");
-			stmt.executeUpdate();
-			stmt.close();
-			stmt = null;
-			
-//			stmt = connection.prepareStatement("ALTER TABLE ACT_HI_VARINST alter column NAME_ clob");
-//			stmt.executeUpdate();
-//			stmt.close();
-//			stmt = null;
-
-			stmt = connection.prepareStatement("delete from ACT_HI_DETAIL");
-			stmt.executeUpdate();
-			stmt.close();
-			stmt = null;
-
-			stmt = connection.prepareStatement("ALTER TABLE ACT_HI_DETAIL alter column TEXT_ clob");
-			stmt.executeUpdate();
-			stmt.close();
-			stmt = null;
-
-//			stmt = connection.prepareStatement("ALTER TABLE ACT_HI_DETAIL alter column NAME_ clob");
-//			stmt.executeUpdate();
-//			stmt.close();
-//			stmt = null;
-
-			stmt = connection.prepareStatement("ALTER TABLE ACT_RU_VARIABLE alter column TEXT_ clob");
-			stmt.executeUpdate();
-			stmt.close();
-			stmt = null;
-
-			connection.close();
-			connection = null;
 
 			isDBConfigured = true;
-		} catch (SQLException e) {
-		    LOGGER.debug ("CamundaDBSetup caught " + e.getClass().getSimpleName());
-			LOGGER.debug("SQLException :",e);
+		
 		} finally {
 			if (stmt != null) {
 				try {
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/xml/XmlToolTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/xml/XmlToolTest.java
new file mode 100644
index 0000000000..6bad0c6c29
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/xml/XmlToolTest.java
@@ -0,0 +1,82 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 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.onap.so.bpmn.core.xml;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class XmlToolTest {
+
+	private String response = "<Response>good</Response>";
+	private String responseModified = "<Response>veryGood</Response>";
+	private String encodeResponse = "&lt;Response&gt;good&lt;/Response&gt;";
+	private String encodeResponseNamespace = "<Response xmlns:ns2=\"http://ecomp.att.com/mso/request/types/v1\">good</Response>";
+	private String attribute  = "<Response>good&\"bad\"</Response>";
+	private String updatedAttribute = "&lt;Response&gt;good&amp;&quot;bad&quot;&lt;/Response&gt;";
+
+	private String content = "<dummy><configuration-event>" +
+			"<event-type>test</event-type>" +
+			"<event-correlator-type>test</event-correlator-type>" +
+			"<event-correlator>123</event-correlator>" +
+			"<event-parameters><event-parameter>" +
+			"<tag-name>test</tag-name>" +
+			"<tag-value>test</tag-value></event-parameter></event-parameters>" +
+			"</configuration-event></dummy>";
+	
+	@Test
+	public void test() throws Exception {
+		Object xmlMessage = new String(response);
+		String xmlResponse = XmlTool.normalize(xmlMessage);
+		assertEquals(response, xmlResponse.toString());
+		String xmlEncode = XmlTool.encode(xmlMessage);
+		assertEquals(encodeResponse, xmlEncode.toString());
+		Optional<String> optXml = XmlTool.modifyElement(response, "Response", "veryGood");
+		Object obj1 = new String(optXml.get().toString());
+		String noPreamble = XmlTool.removePreamble(obj1);
+		assertEquals(responseModified, noPreamble.toString());
+		Object obj2 = new String(encodeResponseNamespace);
+		String noNamespace = XmlTool.removeNamespaces(obj2);
+		assertEquals(response, noNamespace.toString());
+		Object obj3 = new String(attribute);
+		
+		assertEquals(null, XmlTool.normalize(null));
+		assertEquals(null, XmlTool.encode(null));
+		assertEquals(null, XmlTool.removePreamble(null));
+		assertEquals(null, XmlTool.removeNamespaces(null));
+		assertEquals(Optional.empty(), XmlTool.modifyElement(null, "Response", "veryGood"));
+	}
+
+	@Test
+	public void normalizeTest() throws Exception {
+		String response = XmlTool.normalize(content);
+		assertNotNull(response);
+	}
+
+	@Test
+	public void modifyElementTest() throws Exception {
+		String response = XmlTool.modifyElement(content, "event-type", "uCPE-VMS").get();
+		assertNotNull(response);
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java
deleted file mode 100644
index 57a512891f..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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=========================================================
- */
-
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.bpmn.core;
-
-import java.io.IOException;
-import java.util.Map;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class PropertyConfigurationTest {
-	@Before
-	public void beforeTest() throws IOException {
-		PropertyConfiguration.resetPropertyConfigurationSingletonInstance();
-
-		Map<String, String> defaultProperties = PropertyConfigurationSetup.createBpmnProperties();
-		defaultProperties.put("testValue", "testKey");
-		PropertyConfigurationSetup.init(defaultProperties);
-	}
-	
-	@Test
-	public void testPropertyFileWatcher() throws InterruptedException, IOException {
-		Assert.assertEquals(true, PropertyConfiguration.getInstance().isFileWatcherRunning());
-	}
-	
-	@Test
-	public void testPropertyLoading() throws IOException, InterruptedException {
-		PropertyConfiguration propertyConfiguration = PropertyConfiguration.getInstance();
-		Map<String,String> props = propertyConfiguration.getProperties(PropertyConfiguration.MSO_BPMN_PROPERTIES);
-		Assert.assertNotNull(props);
-		Assert.assertEquals("testValue", props.get("testKey"));
-	}
-	
-	@Test
-	public void testPropertyReload() throws IOException, InterruptedException {
-		PropertyConfiguration propertyConfiguration = PropertyConfiguration.getInstance();
-		Map<String,String> properties = propertyConfiguration.getProperties(PropertyConfiguration.MSO_BPMN_PROPERTIES);
-		Assert.assertNotNull(properties);
-		Assert.assertEquals("testValue", properties.get("testKey"));
-
-		Map<String, String> newProperties = PropertyConfigurationSetup.createBpmnProperties();
-		newProperties.put("newKey", "newValue");
-		PropertyConfigurationSetup.addProperties(newProperties, 10000);
-
-		// Reload and check for the new value
-		properties = propertyConfiguration.getProperties(PropertyConfiguration.MSO_BPMN_PROPERTIES);
-		Assert.assertNotNull(properties);
-		Assert.assertEquals("newValue", properties.get("newKey"));
-	}
-	
-	@Test(expected=IllegalArgumentException.class)
-	public void testPropertyFileDoesNotExists_NotIntheList() throws IOException {
-		PropertyConfiguration propertyConfiguration = PropertyConfiguration.getInstance();
-		propertyConfiguration.getProperties("badfile.properties");
-		Assert.fail("Expected IllegalArgumentException");
-	}
-	
-	@Test(expected=java.lang.UnsupportedOperationException.class)
-	public void testPropertyModificationException() throws IOException {
-		PropertyConfiguration propertyConfiguration = PropertyConfiguration.getInstance();
-		Map<String,String> props = propertyConfiguration.getProperties(PropertyConfiguration.MSO_BPMN_PROPERTIES);
-		Assert.assertNotNull(props);
-		Assert.assertEquals("testValue", props.get("testKey"));
-		props.put("newKey", "newvalue");
-	}
-}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java
deleted file mode 100644
index 1346fde674..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.bpmn.core;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.camunda.bpm.engine.RuntimeService;
-import org.camunda.bpm.engine.delegate.DelegateExecution;
-import org.camunda.bpm.engine.delegate.Expression;
-import org.camunda.bpm.engine.test.Deployment;
-import org.camunda.bpm.engine.test.ProcessEngineRule;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.openecomp.mso.bpmn.core.utils.CamundaDBSetup;
-import org.openecomp.mso.logger.MsoLogger;
-
-/**
- * Unit test for BaseTask class.
- */
-public class TestBaseTask {
-
-	@Rule
-	public ProcessEngineRule processEngineRule = new ProcessEngineRule();
-
-	@BeforeClass
-	public static void setUpClass() {
-		System.setProperty("mso.config.path", "src/test/resources");
-		PropertyConfiguration.resetPropertyConfigurationSingletonInstance();
-	}
-
-	@Before
-	public void beforeTest() throws Exception {
-		CamundaDBSetup.configure();
-		PropertyConfigurationSetup.init();
-	}
-	
-	@Test
-	@Deployment(resources={"BaseTaskTest.bpmn"})
-	public void shouldInvokeService() {
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("firstName", "Jane");
-		variables.put("lastName", "Doe");
-		variables.put("age", 25);
-		variables.put("lastVisit", 1438270117000L);
-
-		RuntimeService runtimeService = processEngineRule.getRuntimeService();
-		assertNotNull(runtimeService);
-		processEngineRule.getTaskService();
-		runtimeService.startProcessInstanceByKey("BaseTaskTest", variables);
-	}
-	
-	/**
-	 * Unit test code for BaseTask.
-	 */
-	public static class TestTask extends BaseTask {
-		private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
-
-		private Expression existingString;
-		private Expression nonExistingString;
-		private Expression existingStringFromVar;
-		private Expression nonExistingStringFromVar;
-		
-		private Expression existingInteger;
-		private Expression nonExistingInteger;
-		private Expression existingIntegerFromVar;
-		private Expression nonExistingIntegerFromVar;
-		
-		private Expression existingLong;
-		private Expression nonExistingLong;
-		private Expression existingLongFromVar;
-		private Expression nonExistingLongFromVar;
-		
-		private Expression existingOutputVar;
-		private Expression nonExistingOutputVar;
-		private Expression existingBadOutputVar;
-		
-		public void execute(DelegateExecution execution) throws Exception {
-			msoLogger.debug("Started executing " + getClass().getSimpleName());
-
-			/*********************************************************************/
-			msoLogger.debug("Running String Field Tests");
-			/*********************************************************************/
-
-			String s = getStringField(existingString, execution, "existingString");
-			Assert.assertEquals("Hello World", s);
-
-			try {
-				s = getStringField(nonExistingString, execution, "nonExistingString");
-				Assert.fail("Expected BadInjectedFieldException for nonExistingString");
-			} catch (Exception e) {
-				if (!(e instanceof BadInjectedFieldException)) {
-					Assert.fail("Expected BadInjectedFieldException for nonExistingString");
-				}
-			}
-
-			s = getOptionalStringField(existingString, execution, "existingString");
-			Assert.assertEquals("Hello World", s);
-
-			s = getOptionalStringField(nonExistingString, execution, "nonExistingString");
-			Assert.assertEquals(null, s);
-
-			/*********************************************************************/
-			msoLogger.debug("Running String Expression Tests");
-			/*********************************************************************/
-
-			s = getStringField(existingStringFromVar, execution, "existingStringFromVar");
-			Assert.assertEquals("Jane", s);
-
-			try {
-				s = getStringField(nonExistingStringFromVar, execution, "nonExistingStringFromVar");
-				Assert.fail("Expected BadInjectedFieldException for nonExistingString");
-			} catch (Exception e) {
-				if (!(e instanceof BadInjectedFieldException)) {
-					Assert.fail("Expected BadInjectedFieldException for nonExistingStringFromVar");
-				}
-			}
-
-			s = getOptionalStringField(existingStringFromVar, execution, "existingStringFromVar");
-			Assert.assertEquals("Jane", s);
-
-			s = getOptionalStringField(nonExistingStringFromVar, execution, "nonExistingStringFromVar");
-			Assert.assertEquals(null, s);
-
-			/*********************************************************************/
-			msoLogger.debug("Running Integer Field Tests");
-			/*********************************************************************/
-
-			Integer i = getIntegerField(existingInteger, execution, "existingInteger");
-			Assert.assertEquals((Integer)42, i);
-
-			try {
-				i = getIntegerField(nonExistingInteger, execution, "nonExistingInteger");
-				Assert.fail("Expected BadInjectedFieldException for nonExistingInteger");
-			} catch (Exception e) {
-				if (!(e instanceof BadInjectedFieldException)) {
-					Assert.fail("Expected BadInjectedFieldException for nonExistingInteger");
-				}
-			}
-
-			i = getOptionalIntegerField(existingInteger, execution, "existingInteger");
-			Assert.assertEquals((Integer)42, i);
-
-			i = getOptionalIntegerField(nonExistingInteger, execution, "nonExistingInteger");
-			Assert.assertEquals(null, i);
-
-			/*********************************************************************/
-			msoLogger.debug("Running Integer Expression Tests");
-			/*********************************************************************/
-
-			i = getIntegerField(existingIntegerFromVar, execution, "existingIntegerFromVar");
-			Assert.assertEquals((Integer)25, i);
-
-			try {
-				i = getIntegerField(nonExistingIntegerFromVar, execution, "nonExistingIntegerFromVar");
-				Assert.fail("Expected BadInjectedFieldException for nonExistingInteger");
-			} catch (Exception e) {
-				if (!(e instanceof BadInjectedFieldException)) {
-					Assert.fail("Expected BadInjectedFieldException for nonExistingIntegerFromVar");
-				}
-			}
-
-			i = getOptionalIntegerField(existingIntegerFromVar, execution, "existingIntegerFromVar");
-			Assert.assertEquals((Integer)25, i);
-
-			i = getOptionalIntegerField(nonExistingIntegerFromVar, execution, "nonExistingIntegerFromVar");
-			Assert.assertEquals(null, i);
-
-			/*********************************************************************/
-			msoLogger.debug("Running Long Field Tests");
-			/*********************************************************************/
-
-			Long l = getLongField(existingLong, execution, "existingLong");
-			Assert.assertEquals((Long)123456789L, l);
-
-			try {
-				l = getLongField(nonExistingLong, execution, "nonExistingLong");
-				Assert.fail("Expected BadInjectedFieldException for nonExistingLong");
-			} catch (Exception e) {
-				if (!(e instanceof BadInjectedFieldException)) {
-					Assert.fail("Expected BadInjectedFieldException for nonExistingLong");
-				}
-			}
-
-			l = getOptionalLongField(existingLong, execution, "existingLong");
-			Assert.assertEquals((Long)123456789L, l);
-
-			l = getOptionalLongField(nonExistingLong, execution, "nonExistingLong");
-			Assert.assertEquals(null, l);
-
-			/*********************************************************************/
-			msoLogger.debug("Running Long Expression Tests");
-			/*********************************************************************/
-
-			l = getLongField(existingLongFromVar, execution, "existingLongFromVar");
-			Assert.assertEquals((Long)1438270117000L, l);
-
-			try {
-				l = getLongField(nonExistingLongFromVar, execution, "nonExistingLongFromVar");
-				Assert.fail("Expected BadInjectedFieldException for nonExistingLong");
-			} catch (Exception e) {
-				if (!(e instanceof BadInjectedFieldException)) {
-					Assert.fail("Expected BadInjectedFieldException for nonExistingLongFromVar");
-				}
-			}
-
-			l = getOptionalLongField(existingLongFromVar, execution, "existingLongFromVar");
-			Assert.assertEquals((Long)1438270117000L, l);
-
-			l = getOptionalLongField(nonExistingLongFromVar, execution, "nonExistingLongFromVar");
-			Assert.assertEquals(null, i);
-
-			/*********************************************************************/
-			msoLogger.debug("Running Output Variable Field Tests");
-			/*********************************************************************/
-
-			String var = getOutputField(existingOutputVar, execution, "existingOutputVar");
-			Assert.assertEquals("goodVariable", var);
-
-			try {
-				var = getOutputField(nonExistingOutputVar, execution, "nonExistingOutputVar");
-				Assert.fail("Expected BadInjectedFieldException for nonExistingString");
-			} catch (Exception e) {
-				if (!(e instanceof BadInjectedFieldException)) {
-					Assert.fail("Expected BadInjectedFieldException for nonExistingString");
-				}
-			}
-
-			var = getOptionalOutputField(existingOutputVar, execution, "existingOutputVar");
-			Assert.assertEquals("goodVariable", var);
-
-			var = getOptionalOutputField(nonExistingOutputVar, execution, "nonExistingOutputVar");
-			Assert.assertEquals(null, var);
-
-			try {
-				var = getOutputField(existingBadOutputVar, execution, "existingBadOutputVar");
-				Assert.fail("Expected BadInjectedFieldException for nonExistingString");
-			} catch (Exception e) {
-				if (!(e instanceof BadInjectedFieldException)) {
-					Assert.fail("Expected BadInjectedFieldException for nonExistingString");
-				}
-			}
-
-			msoLogger.debug("Finished executing " + getClass().getSimpleName());
-		}
-	}
-}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ConfigResourceTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ConfigResourceTest.java
deleted file mode 100644
index ecaf601c90..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ConfigResourceTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class ConfigResourceTest {

-	private ConfigResource configresource = new ConfigResource();{

-	configresource.resourceType = ResourceType.CONFIGURATION;

-	}

-

-	@Test

-	public void testConfigResource() {

-		configresource.setToscaNodeType("toscaNodeType");

-		assertEquals(configresource.getToscaNodeType(), "toscaNodeType");

-		

-		

-	}

-

-}

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/CustomerTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/CustomerTest.java
deleted file mode 100644
index 1a4e0898ee..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/CustomerTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class CustomerTest {

-	private Customer customer = new Customer();

-

-	@Test

-	public void testCustomer() {

-		customer.setSubscriptionServiceType("subscriptionServiceType");

-		customer.setGlobalSubscriberId("globalSubscriberId");

-		assertEquals(customer.getSubscriptionServiceType(), "subscriptionServiceType");

-		assertEquals(customer.getGlobalSubscriberId(), "globalSubscriberId");

-		

-	}

-

-}

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/NetworkResourceTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/NetworkResourceTest.java
deleted file mode 100644
index 22e62663c9..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/NetworkResourceTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class NetworkResourceTest {

-	private NetworkResource nr = new NetworkResource();

-

-	@Test

-	public void testNetworkResource() {

-		nr.setNetworkType("networkType");

-		nr.setNetworkRole("networkRole");

-		nr.setNetworkTechnology("networkTechnology");

-		nr.setNetworkScope("networkScope");

-		assertEquals(nr.getNetworkType(), "networkType");

-		assertEquals(nr.getNetworkRole(), "networkRole");

-		assertEquals(nr.getNetworkTechnology(), "networkTechnology");

-		assertEquals(nr.getNetworkScope(), "networkScope");

-		

-	}

-

-}

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/OwningEntityTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/OwningEntityTest.java
deleted file mode 100644
index 215fa3cff9..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/OwningEntityTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class OwningEntityTest {

-	private OwningEntity oe = new OwningEntity();

-

-	@Test

-	public void testOwingEntity() {

-		oe.setOwningEntityId("owningEntityId");

-		oe.setOwningEntityName("owningEntityName");

-		assertEquals(oe.getOwningEntityId(), "owningEntityId");

-		assertEquals(oe.getOwningEntityName(), "owningEntityName");

-		

-	}

-

-}

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ProjectTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ProjectTest.java
deleted file mode 100644
index 3a9a53f743..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ProjectTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class ProjectTest {

-	

-	private Project project = new Project();

-

-	@Test

-	public void testProject() {

-		project.setProjectName("projectName");

-		assertEquals(project.getProjectName(), "projectName");

-	}

-

-}

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/RequestTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/RequestTest.java
deleted file mode 100644
index 9a9d41567a..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/RequestTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class RequestTest {

-	

-	private Request request = new Request();

-	ModelInfo model = new ModelInfo();

-

-	@Test

-	public void testRequest() {

-		request.setSdncRequestId("sdncRequestId");

-		request.setRequestId("requestId");

-		request.setModelInfo(model);

-		request.setProductFamilyId("productFamilyId");

-		assertEquals(request.getSdncRequestId(), "sdncRequestId");

-		assertEquals(request.getRequestId(), "requestId");

-		assertEquals(request.getModelInfo(), model);

-		assertEquals(request.getProductFamilyId(), "productFamilyId");

-		

-	}

-

-}

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ResourceDecompositionTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ResourceDecompositionTest.java
deleted file mode 100644
index 5eaa60260b..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ResourceDecompositionTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class ResourceDecompositionTest {

-	

-	private ResourceDecomposition rd = new ResourceDecomposition() {

-		private static final long serialVersionUID = 1L;

-	};

-	ModelInfo model = new ModelInfo();

-	ResourceInstance ri = new ResourceInstance();

-	

-	

-

-	@Test

-	public void testResourceDecomposition() {

-		rd.setModelInfo(model);

-		rd.setInstanceData(ri);

-		rd.setResourceType("resourceType");

-		rd.setResourceInstanceId("newInstanceId");

-		rd.setResourceInstanceName("newInstanceName");

-		assertEquals(rd.getResourceModel(), model);

-		assertEquals(rd.getModelInfo(), model);

-		assertEquals(rd.getInstanceData(), ri);

-		assertEquals(rd.getResourceInstanceId(), "newInstanceId");

-		assertEquals(rd.getResourceInstanceName(), "newInstanceName");

-	}

-

-}

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ServiceDecompositionTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ServiceDecompositionTest.java
deleted file mode 100644
index 58548db23b..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/ServiceDecompositionTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import java.util.List;

-

-import org.junit.Test;

-

-public class ServiceDecompositionTest {

-	private ServiceDecomposition sd = new ServiceDecomposition();

-	ModelInfo model= new ModelInfo();

-	ServiceInstance si= new ServiceInstance();

-	Project project= new Project();

-	OwningEntity oe= new OwningEntity();

-	//VnfResource vnf = new VnfResource();

-	List<VnfResource> vnfResources;

-	List<NetworkResource> networkResources;

-	List<ConfigResource> configResources;

-	List<AllottedResource> allottedResources;

-	Request request= new Request();

-	Customer customer= new Customer();

-	

-

-	@Test

-	public void testServiceDecomposition() {

-		sd.setModelInfo(model);

-		sd.setServiceInstance(si);

-		sd.setProject(project);

-		sd.setOwningEntity(oe);

-		sd.setServiceVnfs(vnfResources);

-		sd.setServiceConfigs(configResources);

-		sd.setServiceNetworks(networkResources);

-		sd.setServiceAllottedResources(allottedResources);

-		sd.setServiceConfigResources(configResources);

-		sd.setServiceType("serviceType");

-		sd.setServiceRole("serviceRole");

-		sd.setRequest(request);

-		sd.setCustomer(customer);

-		sd.setCallbackURN("callbackURN");

-		sd.setSdncVersion("sdncVersion");

-		assertEquals(sd.getModelInfo(), model);

-		assertEquals(sd.getServiceInstance(), si);

-		assertEquals(sd.getProject(), project);

-		assertEquals(sd.getOwningEntity(), oe);

-		assertEquals(sd.getServiceVnfs(), vnfResources);

-		assertEquals(sd.getServiceConfigs(), configResources);

-		assertEquals(sd.getServiceNetworks(), networkResources);

-		assertEquals(sd.getServiceAllottedResources(), allottedResources);

-		assertEquals(sd.getServiceConfigResources(), configResources);

-		assertEquals(sd.getRequest(), request);

-		assertEquals(sd.getCustomer(), customer);

-		assertEquals(sd.getCallbackURN(), "callbackURN");

-		assertEquals(sd.getSdncVersion(), "sdncVersion");

-		

-		

-		

-		

-		

-		

-		

-		

-	}

-

-}

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/SubscriberTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/SubscriberTest.java
deleted file mode 100644
index 7e9aef29a6..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/SubscriberTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class SubscriberTest {

-	Subscriber subscriber= new Subscriber("globalId", "name", "commonSiteId");

-

-	@Test

-	public void testSubscriber() {

-		subscriber.setGlobalId("globalId");

-		subscriber.setName("name");

-		subscriber.setCommonSiteId("commonSiteId");

-		assertEquals(subscriber.getGlobalId(), "globalId");

-		assertEquals(subscriber.getName(), "name");

-		assertEquals(subscriber.getCommonSiteId(), "commonSiteId");

-		

-		

-	}

-

-}

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/TunnelConnectTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/TunnelConnectTest.java
deleted file mode 100644
index 2a5639f0ff..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/domain/TunnelConnectTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.bpmn.core.domain;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class TunnelConnectTest {

-	private TunnelConnect tc= new TunnelConnect();

-

-	@Test

-	public void testTunnelConnect() {

-		tc.setId("id");

-		tc.setUpBandwidth("upBandwidth");

-		tc.setDownBandwidth("downBandwidth");

-		tc.setUpBandwidth2("upBandwidth2");

-		tc.setDownBandwidth2("downBandwidth2");

-		assertEquals(tc.getId(), "id");

-		assertEquals(tc.getUpBandwidth(), "upBandwidth");

-		assertEquals(tc.getDownBandwidth(), "downBandwidth");

-		assertEquals(tc.getUpBandwidth2(), "upBandwidth2");

-		assertEquals(tc.getDownBandwidth2(), "downBandwidth2");

-		

-	}

-

-}

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/json/JsonUtilsTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/json/JsonUtilsTest.java
deleted file mode 100644
index 644f98349c..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/json/JsonUtilsTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.bpmn.core.json;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Map;
-
-import org.camunda.bpm.engine.delegate.DelegateExecution;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.junit.Test;
-import org.mockito.Mock;
-
-public class JsonUtilsTest {
-
-	@Mock public DelegateExecution execution;
-	private final String fileLocation = "src/test/resources/json-examples/";
-
-	@Test
-	public void jsonStringToMapTest() throws IOException {
-		
-		JsonUtils utils = new JsonUtils();
-		String response = this.getJson("SDNCServiceResponseExample.json");
-		String entry = utils.getJsonValue(response, "SDNCServiceResponse.params");
-		Map<String, String> map = utils.jsonStringToMap(execution, entry);
-		assertEquals(map.get("e2e-vpn-key"), "my-key");
-	}
-	
-	@Test
-	public void entryArrayToMapTest() throws IOException {
-		JsonUtils utils = new JsonUtils();
-		String response = this.getJson("SNIROExample.json");
-		String entry = utils.getJsonValue(response, "solutionInfo.placement");
-		JSONArray arr = new JSONArray(entry);
-		JSONObject homingDataJson = arr.getJSONObject(0);
-		JSONArray assignmentInfo = homingDataJson.getJSONArray("assignmentInfo");
-		Map<String, String> map = utils.entryArrayToMap(execution, assignmentInfo.toString(), "variableName", "variableValue");
-		assertEquals(map.get("cloudOwner"), "att-aic");
-	}
-	private String getJson(String filename) throws IOException {
-		return new String(Files.readAllBytes(Paths.get(fileLocation + filename)));
-	}
-}
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/BaseTaskTest.bpmn b/bpmn/MSOCoreBPMN/src/test/resources/BaseTaskTest.bpmn
index bb15ce2e5e..4d531d23e2 100644
--- a/bpmn/MSOCoreBPMN/src/test/resources/BaseTaskTest.bpmn
+++ b/bpmn/MSOCoreBPMN/src/test/resources/BaseTaskTest.bpmn
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_IS440DbGEeWouodEI7MXGQ" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">

-  <bpmn2:process id="BaseTaskTest" name="BaseTaskTest" isExecutable="true">

-    <bpmn2:startEvent id="StartEvent_1">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:serviceTask id="ServiceTask_1" camunda:class="org.openecomp.mso.bpmn.core.TestBaseTask$TestTask" name="TestTask">

-      <bpmn2:extensionElements>

-        <camunda:field name="existingString">

-          <camunda:string>Hello World</camunda:string>

-        </camunda:field>

-        <camunda:field name="existingStringFromVar">

-          <camunda:expression>${firstName}</camunda:expression>

-        </camunda:field>

-        <camunda:field name="nonExistingStringFromVar">

-          <camunda:expression>${undefinedVariable}</camunda:expression>

-        </camunda:field>

-        <camunda:field name="existingInteger">

-          <camunda:string>42</camunda:string>

-        </camunda:field>

-        <camunda:field name="existingIntegerFromVar">

-          <camunda:expression>${age}</camunda:expression>

-        </camunda:field>

-        <camunda:field name="nonExistingIntegerFromVar">

-          <camunda:expression>${undefinedVariable}</camunda:expression>

-        </camunda:field>

-        <camunda:field name="existingLong">

-          <camunda:string>123456789</camunda:string>

-        </camunda:field>

-        <camunda:field name="existingLongFromVar">

-          <camunda:expression>${lastVisit}</camunda:expression>

-        </camunda:field>

-        <camunda:field name="nonExistingLongFromVar">

-          <camunda:expression>${undefinedVariable}</camunda:expression>

-        </camunda:field>

-        <camunda:field name="existingOutputVar">

-          <camunda:string>goodVariable</camunda:string>

-        </camunda:field>

-        <camunda:field name="existingBadOutputVar">

-          <camunda:string>bad Variable</camunda:string>

-        </camunda:field>

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

-    </bpmn2:serviceTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="ServiceTask_1"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="ServiceTask_1" targetRef="EndEvent_1"/>

-    <bpmn2:endEvent id="EndEvent_1">

-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

-    </bpmn2:endEvent>

-  </bpmn2:process>

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="BaseTaskTest">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_36" bpmnElement="StartEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="55.0" y="38.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_68" bpmnElement="ServiceTask_1">

-        <dc:Bounds height="80.0" width="100.0" x="180.0" y="16.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_36" targetElement="_BPMNShape_ServiceTask_68">

-        <di:waypoint xsi:type="dc:Point" x="91.0" y="56.0"/>

-        <di:waypoint xsi:type="dc:Point" x="180.0" y="56.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_83" bpmnElement="EndEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="369.0" y="38.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="387.0" y="79.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ServiceTask_68" targetElement="_BPMNShape_EndEvent_83">

-        <di:waypoint xsi:type="dc:Point" x="280.0" y="56.0"/>

-        <di:waypoint xsi:type="dc:Point" x="369.0" y="56.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="370.0" y="57.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_IS440DbGEeWouodEI7MXGQ" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
+  <bpmn2:process id="BaseTaskTest" name="BaseTaskTest" isExecutable="true">
+    <bpmn2:startEvent id="StartEvent_1">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:serviceTask id="ServiceTask_1" camunda:class="org.onap.so.bpmn.core.TestBaseTask$TestTask" name="TestTask">
+      <bpmn2:extensionElements>
+        <camunda:field name="existingString">
+          <camunda:string>Hello World</camunda:string>
+        </camunda:field>
+        <camunda:field name="existingStringFromVar">
+          <camunda:expression>${firstName}</camunda:expression>
+        </camunda:field>
+        <camunda:field name="nonExistingStringFromVar">
+          <camunda:expression>${undefinedVariable}</camunda:expression>
+        </camunda:field>
+        <camunda:field name="existingInteger">
+          <camunda:string>42</camunda:string>
+        </camunda:field>
+        <camunda:field name="existingIntegerFromVar">
+          <camunda:expression>${age}</camunda:expression>
+        </camunda:field>
+        <camunda:field name="nonExistingIntegerFromVar">
+          <camunda:expression>${undefinedVariable}</camunda:expression>
+        </camunda:field>
+        <camunda:field name="existingLong">
+          <camunda:string>123456789</camunda:string>
+        </camunda:field>
+        <camunda:field name="existingLongFromVar">
+          <camunda:expression>${lastVisit}</camunda:expression>
+        </camunda:field>
+        <camunda:field name="nonExistingLongFromVar">
+          <camunda:expression>${undefinedVariable}</camunda:expression>
+        </camunda:field>
+        <camunda:field name="existingOutputVar">
+          <camunda:string>goodVariable</camunda:string>
+        </camunda:field>
+        <camunda:field name="existingBadOutputVar">
+          <camunda:string>bad Variable</camunda:string>
+        </camunda:field>
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
+    </bpmn2:serviceTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="ServiceTask_1"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="ServiceTask_1" targetRef="EndEvent_1"/>
+    <bpmn2:endEvent id="EndEvent_1">
+      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
+    </bpmn2:endEvent>
+  </bpmn2:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="BaseTaskTest">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_36" bpmnElement="StartEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="55.0" y="38.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_68" bpmnElement="ServiceTask_1">
+        <dc:Bounds height="80.0" width="100.0" x="180.0" y="16.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_36" targetElement="_BPMNShape_ServiceTask_68">
+        <di:waypoint xsi:type="dc:Point" x="91.0" y="56.0"/>
+        <di:waypoint xsi:type="dc:Point" x="180.0" y="56.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_83" bpmnElement="EndEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="369.0" y="38.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="387.0" y="79.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ServiceTask_68" targetElement="_BPMNShape_EndEvent_83">
+        <di:waypoint xsi:type="dc:Point" x="280.0" y="56.0"/>
+        <di:waypoint xsi:type="dc:Point" x="369.0" y="56.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="370.0" y="57.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/application-dev.yaml b/bpmn/MSOCoreBPMN/src/test/resources/application-dev.yaml
new file mode 100644
index 0000000000..7aa9a26e63
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/resources/application-dev.yaml
@@ -0,0 +1,5 @@
+log:
+  debug:
+    TestTask: 'true'
+
+testKey: 'testValue'
\ No newline at end of file
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/camunda.cfg.xml b/bpmn/MSOCoreBPMN/src/test/resources/camunda.cfg.xml
deleted file mode 100644
index bc218f0125..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/resources/camunda.cfg.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-  <bean id="processEngineConfiguration" class="org.camunda.bpm.engine.impl.cfg.StandaloneInMemProcessEngineConfiguration">
-
-    <property name="jdbcUrl" value="jdbc:h2:mem:camunda;DB_CLOSE_DELAY=1000" />
-    <property name="jdbcDriver" value="org.h2.Driver" />
-    <property name="jdbcUsername" value="sa" />
-    <property name="jdbcPassword" value="" />
-
-    <!-- Database configurations -->
-    <property name="databaseSchemaUpdate" value="true" />
-
-    <!-- job executor configurations -->
-    <property name="jobExecutorActivate" value="false" />
-
-    <property name="history" value="full" />
-
-    <!--<property name="idGenerator" ref="uuidGenerator" />-->
-
-    <!-- engine plugins -->
-    <property name="processEnginePlugins">
-      <list>
-        <ref bean="connectProcessEnginePlugin" />
-        <ref bean="spinProcessEnginePlugin" />
-        <ref bean="loggingPlugin" />
-        <ref bean="workflowExceptionPlugin" />
-      </list>
-    </property>
-
-  </bean>
-
-  <bean id="loggingPlugin" class="org.openecomp.mso.bpmn.core.plugins.LoggingAndURNMappingPlugin" />
-
-  <!-- Needed until all subflows generate MSOWorkflowException events -->
-  <bean id="workflowExceptionPlugin" class="org.openecomp.mso.bpmn.core.plugins.WorkflowExceptionPlugin" />
-  
-  <!--<bean id="uuidGenerator" class="org.camunda.bpm.engine.impl.persistence.StrongUuidGenerator" />-->
-
-  <!-- engine plugin beans -->
-  <bean id="connectProcessEnginePlugin" class="org.camunda.connect.plugin.impl.ConnectProcessEnginePlugin" />
-  <bean id="spinProcessEnginePlugin" class="org.camunda.spin.plugin.impl.SpinProcessEnginePlugin" />
-
-</beans>
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/AllottedResource.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/AllottedResource.json
new file mode 100644
index 0000000000..9731e70dde
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/AllottedResource.json
@@ -0,0 +1,6 @@
+{
+	"allottedResource" : {
+		"resourceId" : "allottedResourceId",
+		"resourceType" : "ALLOTTED_RESOURCE"
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ConfigResource.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ConfigResource.json
new file mode 100644
index 0000000000..412d13bcb6
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ConfigResource.json
@@ -0,0 +1,6 @@
+{
+	"configResource" : {
+		"resourceId" : "configResourceId",
+		"resourceType" : "CONFIGURATION"
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/NetworkResource.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/NetworkResource.json
new file mode 100644
index 0000000000..57d3c5d70d
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/NetworkResource.json
@@ -0,0 +1,6 @@
+{
+	"networkResource" : {
+		"resourceId" : "networkResourceId",
+		"resourceType" : "NETWORK"
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json
index 7e56b1a59d..838bcd85a7 100644
--- a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json
+++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json
@@ -11,7 +11,7 @@
 				]
 			}
 		],
-		"placement": [
+		"placementInfo": [
 			{
 				"assignmentInfo": [
 					{
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecomposition.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecomposition.json
new file mode 100644
index 0000000000..9acaabe2d1
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecomposition.json
@@ -0,0 +1,22 @@
+{
+	"serviceResources" : {
+		"modelInfo" : {
+			"modelName" : "modelName",
+			"modelUuid" : "modelUuid",
+			"modelInvariantUuid" : "modelInvariantUuid",
+			"modelVersion" : "modelVersion",
+			"modelCustomizationUuid" : "modelCustomizationUuid",
+			"modelCustomizationName" : "modelCustomizationName",
+			"modelInstanceName" : "modelInstanceName",
+			"modelType" : "modelType"
+		},
+		"serviceType" : "serviceType",
+		"serviceRole" : "serviceRole",
+		"project" : {},
+		"owningEntity" : {},
+		"vnfResource" : [],
+		"networkResource" : [],
+		"allottedResource" : [],
+		"configResource" : []
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecompositionExpected.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecompositionExpected.json
new file mode 100644
index 0000000000..c424293ca2
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecompositionExpected.json
@@ -0,0 +1,51 @@
+{
+	"serviceResources" : {
+		"modelInfo" : {
+			"modelName" : "modelName",
+			"modelUuid" : "modelUuid",
+			"modelInvariantUuid" : "modelInvariantUuid",
+			"modelVersion" : "modelVersion",
+			"modelCustomizationUuid" : "modelCustomizationUuid",
+			"modelCustomizationName" : "modelCustomizationName",
+			"modelInstanceName" : "modelInstanceName",
+			"modelType" : "modelType"
+		},
+		"serviceType" : "serviceType",
+		"serviceRole" : "serviceRole",
+		"project" : {},
+		"owningEntity" : {},
+		"serviceInstance" : {
+			"serviceInstanceId" : "serviceInstanceId"
+		},
+		"serviceVnfs" : [
+			{
+				"resourceId" : "vnfResourceId",
+				"resourceType" : "VNF",
+				"resourceInstance" : {},
+				"homingSolution" : {
+					"license" : {},
+					"rehome" : false
+				},
+				"vfModules" : []
+			}
+		],
+		"networkResource" : [
+			{
+				"resourceId" : "networkResourceId",
+				"resourceType" : "NETWORK"
+			}
+		],
+		"serviceAllottedResources" : [
+			{
+				"resourceId" : "allottedResourceId",
+				"resourceType" : "ALLOTTED_RESOURCE"
+			}
+		],
+		"configResource" : [
+			{
+				"resourceId" : "configResourceId",
+				"resourceType" : "CONFIGURATION"
+			}
+		]
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/VnfResource.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/VnfResource.json
new file mode 100644
index 0000000000..cd8c59d248
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/VnfResource.json
@@ -0,0 +1,12 @@
+{
+	"vnfResource" : {
+		"resourceId" : "vnfResourceId",
+		"resourceType" : "VNF",
+		"resourceInstance" : {},
+		"homingSolution" : {
+			"license" : {},
+			"rehome" : false
+		},
+		"vfModules" : []
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/logback-test.xml b/bpmn/MSOCoreBPMN/src/test/resources/logback-test.xml
index 92876fcb19..02ac437db6 100644
--- a/bpmn/MSOCoreBPMN/src/test/resources/logback-test.xml
+++ b/bpmn/MSOCoreBPMN/src/test/resources/logback-test.xml
@@ -39,7 +39,9 @@
   <logger name="com.att.eelf.error" level="trace" additivity="false">
     <appender-ref ref="STDOUT" />
   </logger> 
-
+	<logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
+		<appender-ref ref="STDOUT" />
+	</logger>
   <root level="info">
     <appender-ref ref="STDOUT" />
   </root>
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.properties b/bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.properties
deleted file mode 100644
index d329dbb207..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ECOMP 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=========================================================
-###
-
-URNMapping.FileSystemLoading.Enabled=true
-testKey=testValue
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.urn.properties
deleted file mode 100644
index 7fa587311a..0000000000
--- a/bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.urn.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ECOMP 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=========================================================
-###
-
-log.debug.TestTask=true
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/request.json b/bpmn/MSOCoreBPMN/src/test/resources/request.json
index 8fa195b839..9513e81d6a 100644
--- a/bpmn/MSOCoreBPMN/src/test/resources/request.json
+++ b/bpmn/MSOCoreBPMN/src/test/resources/request.json
@@ -1,7 +1,7 @@
 {
   "variables": {
     "bpmnRequest": {
-      "value": "<aetgt:service-request xmlns:aetgt=\"http://org.openecomp/mso/request/layer3serviceactivate/schema/v1\"\n                       xmlns=\"http://org.openecomp/mso/request/layer3serviceactivate/schema/v1\"\n                       xmlns:msoservtypes=\"http://org.openecomp/mso/request/types/v1\"\n                       xmlns:msolayer3=\"http://org.openecomp/mso/request/layer3/schema/v1\"\n                       xmlns:rest=\"http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd\">\n  <msoservtypes:request-information>\n    <msoservtypes:request-id>d00eb185-b1d7-429e-aca3-42a61b459535</msoservtypes:request-id>\n    <msoservtypes:request-action>Layer3ServiceActivateRequest</msoservtypes:request-action>\n    <msoservtypes:source>OMX</msoservtypes:source>\n    <msoservtypes:notification-url>http://localhost:28080/simulada/CSI/SendManagedNetworkStatusNotification</msoservtypes:notification-url>\n    <msoservtypes:order-number>19630501</msoservtypes:order-number>\n    <msoservtypes:order-version>1</msoservtypes:order-version>\n  </msoservtypes:request-information>\n  <msoservtypes:service-information>\n    <msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>\n    <msoservtypes:service-instance-id>AA01|VLXM|003717||SW_INTERNET</msoservtypes:service-instance-id>\n    <msoservtypes:subscriber-name>TEST_4306301</msoservtypes:subscriber-name>\n  </msoservtypes:service-information>\n  <service-parameters>\n    <msolayer3:l2-homing-information>\n      <msolayer3:evc-name>01|VLXM|121601/PT</msolayer3:evc-name>\n      <msolayer3:topology>PointToPoint</msolayer3:topology>\n      <msolayer3:preferred-aic-clli>MTSNJA4LX01</msolayer3:preferred-aic-clli>\n    </msolayer3:l2-homing-information>\n    <msolayer3:internet-service-information>\n      <msolayer3:internet-evc-access-information>\n        <msolayer3:internet-evc-speed-value>10</msolayer3:internet-evc-speed-value>\n        <msolayer3:internet-evc-speed-units>Mbps</msolayer3:internet-evc-speed-units>\n        <msolayer3:ip-version>ds</msolayer3:ip-version>\n      </msolayer3:internet-evc-access-information>\n      <msolayer3:vr-lan>\n        <msolayer3:routing-protocol>none</msolayer3:routing-protocol>\n        <msolayer3:vr-lan-interface>\n          <msolayer3:vr-designation>primary</msolayer3:vr-designation>\n          <msolayer3:v4-public-lan-prefixes>\n            <msolayer3:t-provided-v4-lan-public-prefixes>\n              <msolayer3:request-index>1</msolayer3:request-index>\n              <msolayer3:v4-next-hop-address>32.10.30.116</msolayer3:v4-next-hop-address>\n              <msolayer3:v4-lan-public-prefix-length>32</msolayer3:v4-lan-public-prefix-length>\n            </msolayer3:t-provided-v4-lan-public-prefixes>\n          </msolayer3:v4-public-lan-prefixes>\n          <msolayer3:v6-public-lan-prefixes>\n            <msolayer3:t-provided-v6-lan-public-prefixes>\n              <msolayer3:request-index>1</msolayer3:request-index>\n              <msolayer3:v6-next-hop-address>2507:0CB4:85A5:0030:0000:0000:0000:0010</msolayer3:v6-next-hop-address>\n              <msolayer3:v6-lan-public-prefix-length>48</msolayer3:v6-lan-public-prefix-length>\n            </msolayer3:t-provided-v6-lan-public-prefixes>\n          </msolayer3:v6-public-lan-prefixes>\n          <msolayer3:dhcp>\n            <msolayer3:v4-dhcp-server-enabled>Y</msolayer3:v4-dhcp-server-enabled>\n            <msolayer3:v6-dhcp-server-enabled>Y</msolayer3:v6-dhcp-server-enabled>\n            <msolayer3:use-v4-default-pool>Y</msolayer3:use-v4-default-pool>\n            <msolayer3:use-v6-default-pool>Y</msolayer3:use-v6-default-pool>\n          </msolayer3:dhcp>\n          <msolayer3:pat>\n            <msolayer3:v4-pat-enabled>Y</msolayer3:v4-pat-enabled>\n            <msolayer3:use-v4-default-pool>N</msolayer3:use-v4-default-pool>\n          </msolayer3:pat>\n          <msolayer3:firewall-lite>\n            <msolayer3:stateful-firewall-lite-v4-enabled>Y</msolayer3:stateful-firewall-lite-v4-enabled>\n            <msolayer3:stateful-firewall-lite-v6-enabled>Y</msolayer3:stateful-firewall-lite-v6-enabled>\n          </msolayer3:firewall-lite>\n        </msolayer3:vr-lan-interface>\n      </msolayer3:vr-lan>\n    </msolayer3:internet-service-information>\n  </service-parameters>\n</aetgt:service-request>\n",
+      "value": "<aetgt:service-request xmlns:aetgt=\"http://org.onap/so/request/layer3serviceactivate/schema/v1\"\n                       xmlns=\"http://org.onap/so/request/layer3serviceactivate/schema/v1\"\n                       xmlns:msoservtypes=\"http://org.onap/so/request/types/v1\"\n                       xmlns:msolayer3=\"http://org.onap/so/request/layer3/schema/v1\"\n                       xmlns:rest=\"http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd\">\n  <msoservtypes:request-information>\n    <msoservtypes:request-id>d00eb185-b1d7-429e-aca3-42a61b459535</msoservtypes:request-id>\n    <msoservtypes:request-action>Layer3ServiceActivateRequest</msoservtypes:request-action>\n    <msoservtypes:source>OMX</msoservtypes:source>\n    <msoservtypes:notification-url>http://localhost:28080/simulada/CSI/SendManagedNetworkStatusNotification</msoservtypes:notification-url>\n    <msoservtypes:order-number>19630501</msoservtypes:order-number>\n    <msoservtypes:order-version>1</msoservtypes:order-version>\n  </msoservtypes:request-information>\n  <msoservtypes:service-information>\n    <msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>\n    <msoservtypes:service-instance-id>AA01|VLXM|003717||SW_INTERNET</msoservtypes:service-instance-id>\n    <msoservtypes:subscriber-name>TEST_4306301</msoservtypes:subscriber-name>\n  </msoservtypes:service-information>\n  <service-parameters>\n    <msolayer3:l2-homing-information>\n      <msolayer3:evc-name>01|VLXM|121601/PT</msolayer3:evc-name>\n      <msolayer3:topology>PointToPoint</msolayer3:topology>\n      <msolayer3:preferred-aic-clli>MTSNJA4LX01</msolayer3:preferred-aic-clli>\n    </msolayer3:l2-homing-information>\n    <msolayer3:internet-service-information>\n      <msolayer3:internet-evc-access-information>\n        <msolayer3:internet-evc-speed-value>10</msolayer3:internet-evc-speed-value>\n        <msolayer3:internet-evc-speed-units>Mbps</msolayer3:internet-evc-speed-units>\n        <msolayer3:ip-version>ds</msolayer3:ip-version>\n      </msolayer3:internet-evc-access-information>\n      <msolayer3:vr-lan>\n        <msolayer3:routing-protocol>none</msolayer3:routing-protocol>\n        <msolayer3:vr-lan-interface>\n          <msolayer3:vr-designation>primary</msolayer3:vr-designation>\n          <msolayer3:v4-public-lan-prefixes>\n            <msolayer3:t-provided-v4-lan-public-prefixes>\n              <msolayer3:request-index>1</msolayer3:request-index>\n              <msolayer3:v4-next-hop-address>32.10.30.116</msolayer3:v4-next-hop-address>\n              <msolayer3:v4-lan-public-prefix-length>32</msolayer3:v4-lan-public-prefix-length>\n            </msolayer3:t-provided-v4-lan-public-prefixes>\n          </msolayer3:v4-public-lan-prefixes>\n          <msolayer3:v6-public-lan-prefixes>\n            <msolayer3:t-provided-v6-lan-public-prefixes>\n              <msolayer3:request-index>1</msolayer3:request-index>\n              <msolayer3:v6-next-hop-address>2507:0CB4:85A5:0030:0000:0000:0000:0010</msolayer3:v6-next-hop-address>\n              <msolayer3:v6-lan-public-prefix-length>48</msolayer3:v6-lan-public-prefix-length>\n            </msolayer3:t-provided-v6-lan-public-prefixes>\n          </msolayer3:v6-public-lan-prefixes>\n          <msolayer3:dhcp>\n            <msolayer3:v4-dhcp-server-enabled>Y</msolayer3:v4-dhcp-server-enabled>\n            <msolayer3:v6-dhcp-server-enabled>Y</msolayer3:v6-dhcp-server-enabled>\n            <msolayer3:use-v4-default-pool>Y</msolayer3:use-v4-default-pool>\n            <msolayer3:use-v6-default-pool>Y</msolayer3:use-v6-default-pool>\n          </msolayer3:dhcp>\n          <msolayer3:pat>\n            <msolayer3:v4-pat-enabled>Y</msolayer3:v4-pat-enabled>\n            <msolayer3:use-v4-default-pool>N</msolayer3:use-v4-default-pool>\n          </msolayer3:pat>\n          <msolayer3:firewall-lite>\n            <msolayer3:stateful-firewall-lite-v4-enabled>Y</msolayer3:stateful-firewall-lite-v4-enabled>\n            <msolayer3:stateful-firewall-lite-v6-enabled>Y</msolayer3:stateful-firewall-lite-v6-enabled>\n          </msolayer3:firewall-lite>\n        </msolayer3:vr-lan-interface>\n      </msolayer3:vr-lan>\n    </msolayer3:internet-service-information>\n  </service-parameters>\n</aetgt:service-request>\n",
       "type": "String"
     },
     "host": {