diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/RestExecutor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/RestExecutor.java
index 05cbe3c..408f0a3 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/RestExecutor.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/RestExecutor.java
@@ -105,12 +105,12 @@ public class RestExecutor implements FlowExecutorInterface {
             clientResponse = webResource.request(responseDataType).get(javax.ws.rs.core.Response.class);
         } else if (HttpMethod.POST.equalsIgnoreCase(transaction.getExecutionRPC())) {
             clientResponse = webResource.request(requestDataType).post(Entity.json(transaction.getPayload()),
-		 javax.ws.rs.core.Response.class);
+         javax.ws.rs.core.Response.class);
         } else if (HttpMethod.PUT.equalsIgnoreCase(transaction.getExecutionRPC())) {
             clientResponse = webResource.request(requestDataType).put(Entity.json(transaction.getPayload()),
                 javax.ws.rs.core.Response.class);
         } else if (HttpMethod.DELETE.equalsIgnoreCase(transaction.getExecutionRPC())) {
-            clientResponse = webResource.request().delete(javax.ws.rs.core.Response.class);
+            clientResponse = webResource.request(requestDataType).delete(javax.ws.rs.core.Response.class);
         }
         return Optional.ofNullable(clientResponse);
     }
diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/executorImpl/RestExecutorTest.java b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/executorImpl/RestExecutorTest.java
index 2e673c1..967f7ef 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/executorImpl/RestExecutorTest.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/executorImpl/RestExecutorTest.java
@@ -28,22 +28,17 @@ import static javax.ws.rs.core.Response.Status.OK;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.mock;
 
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
 import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -51,6 +46,13 @@ import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
 import org.onap.appc.flow.controller.data.Transaction;
 
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+
 public class RestExecutorTest {
 
     private static final String ANY = "notNullString";
@@ -68,7 +70,7 @@ public class RestExecutorTest {
     @Mock
     private Invocation.Builder webResourceBuilder;
     @Mock
-    private Response clientResponse;
+    final private Response clientResponse = mock(Response.class);
 
 
     @Before
@@ -83,13 +85,14 @@ public class RestExecutorTest {
         doReturn(client).when(restExecutor).createClient(any());
         when(client.target(any(URI.class))).thenReturn(webResource);
 
-        when(webResource.request(anyString())).thenReturn(webResourceBuilder);
+        when(webResource.request(eq("Content-Type"),anyString())).thenReturn(webResourceBuilder);
         when(webResource.request(anyString())).thenReturn(webResourceBuilder);
 
-        when(webResourceBuilder.get(Response.class)).thenReturn(clientResponse);
-        when(webResourceBuilder.accept(MediaType.APPLICATION_JSON_TYPE).post(Entity.json(String.class),Response.class)).thenReturn(clientResponse);
-        when(webResourceBuilder.accept(MediaType.APPLICATION_JSON_TYPE).put(Entity.json(String.class),Response.class)).thenReturn(clientResponse);
-        when(webResource.request().delete(Response.class)).thenReturn(clientResponse);
+        when(webResourceBuilder.get(eq(Response.class))).thenReturn(clientResponse);
+        when(webResourceBuilder.post(any(Entity.class),eq(Response.class))).thenReturn(clientResponse);
+        when(webResourceBuilder.put(any(Entity.class),eq(Response.class))).thenReturn(clientResponse);
+        when(webResource.request(anyString()).delete(eq(Response.class))).thenReturn(clientResponse);
+        when(webResourceBuilder.delete(eq(Response.class))).thenReturn(clientResponse);
 
         when(clientResponse.getStatus()).thenReturn(OK.getStatusCode());
         when(clientResponse.readEntity(String.class)).thenReturn(OK.getReasonPhrase());
@@ -110,8 +113,7 @@ public class RestExecutorTest {
 
         transaction.setExecutionRPC(HttpMethod.POST);
 
-        outputMessage = restExecutor.execute(transaction,
-		 null);
+        outputMessage = restExecutor.execute(transaction, null);
 
         assertResponseOK();
     }
@@ -121,8 +123,7 @@ public class RestExecutorTest {
 
         transaction.setExecutionRPC(HttpMethod.PUT);
 
-        outputMessage = restExecutor.execute(transaction,
-		 null);
+        outputMessage = restExecutor.execute(transaction, null);
 
         assertResponseOK();
     }
@@ -142,8 +143,8 @@ public class RestExecutorTest {
         try {
             when(clientResponse.getStatus()).thenReturn(FORBIDDEN.getStatusCode());
             when(clientResponse.readEntity(String.class)).thenReturn(FORBIDDEN.getReasonPhrase());
-            transaction.setExecutionRPC(HttpMethod.GET);
-
+             transaction.setExecutionRPC(HttpMethod.GET);
+             
             outputMessage = restExecutor.execute(transaction, null);
 
         } catch(Exception e) {
@@ -184,5 +185,5 @@ public class RestExecutorTest {
         assertTrue("HTTP Method: " + transaction.getExecutionRPC() + " is supported but was not handled",
             Stream.of(HttpMethod.GET, HttpMethod.POST, HttpMethod.PUT, HttpMethod.DELETE)
                 .noneMatch(httpMethod -> httpMethod.equals(transaction.getExecutionRPC())));
-   }
+    }
 }