diff --git a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java
index 1e74e5a..8372a23 100644
--- a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java
+++ b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java
@@ -12,6 +12,7 @@ import javax.ws.rs.core.Application;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.Response.StatusType;
 
 import org.gcube.common.authorization.client.Constants;
 import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
@@ -154,19 +155,18 @@ public class RMContextTest extends JerseyTest {
 			Response create = target("context").queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request()
 					.post(Entity.entity(ISMapper.marshal(newContext), MediaType.APPLICATION_JSON + ";charset=UTF-8"));
 			assertNotNull(create);
+			GXInboundResponse response = new GXInboundResponse(create);
+
 			logger.info("RM returned status: " + create.getStatusInfo());
-			if (create.getStatusInfo().getStatusCode() == Status.CREATED.getStatusCode()) {
-				String message = create.readEntity(String.class);
-				logger.info("RM says: " + message);
+			if (response.hasCREATEDCode()) {
+				logger.info("RM says: " + response.getMessage());
 			} else {
 				assertEquals("Unexpected returned code. Reason: " + create.getStatusInfo().getReasonPhrase(),
-						Status.NOT_ACCEPTABLE.getStatusCode(), create.getStatus());
-				GXInboundResponse response = new GXInboundResponse(create);
+						Status.NOT_ACCEPTABLE.getStatusCode(), response.getHTTPStatus().getStatusCode());
 				if (response.hasException()) {
 					try {
 						throw response.getException();
 					} catch (Exception e) {
-						// TODO Auto-generated catch block
 						e.printStackTrace();
 						throw e;
 					}
@@ -288,8 +288,14 @@ public class RMContextTest extends JerseyTest {
 					.queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request().delete();
 			assertNotNull(delete);
 			GXInboundResponse response = new GXInboundResponse(delete);
-			assertTrue("Unexpected returned code. Reason: " + response.getHTTPStatus().getReasonPhrase(),
-					response.hasOKCode());
+			StatusType status = response.getHTTPStatus();
+			logger.info("Returnes status: " + status.getStatusCode());
+			logger.info("Message: " + status.getReasonPhrase());
+			if (!response.hasOKCode()) {
+				assertTrue("Unexpected returned code. Reason: " + response.getHTTPStatus().getReasonPhrase(),
+						response.hasNOT_ACCEPTABLECode());	
+			}
+			
 		} catch (Exception e) {
 			assertFalse("Failed to delete the context.", false);
 		}