diff --git a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java
index 27c4347..52f6844 100644
--- a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java
+++ b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java
@@ -125,12 +125,11 @@ public class GXRestTest extends JerseyTest {
 
 		} else {
 			assertEquals("Unexpected returned code. Reason: " + response.getHTTPCode(),
-					Status.BAD_REQUEST.getStatusCode(), delete.getStatus());
+					Status.UNAUTHORIZED.getStatusCode(), delete.getStatus());
 			if (response.hasException()) {
 				try {
 					response.getException().printStackTrace();
 				} catch (Exception e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 					throw e;
 				}
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 53e5f78..1271221 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
@@ -25,9 +25,8 @@ import org.gcube.informationsystem.model.reference.entities.Context;
 import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClient;
 import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClientImpl;
 import org.gcube.informationsystem.utils.ISMapper;
-import org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode;
 import org.gcube.resourcemanagement.manager.io.rs.RMContextsAccess;
-import org.gcube.resourcemanagement.manager.webapp.rs.RMContext;
+import org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.AfterClass;
@@ -121,7 +120,7 @@ public class RMContextTest extends JerseyTest {
 
 	@Override
 	protected Application configure() {
-		return new ResourceConfig(RMContext.class);
+		return new ResourceConfig(RMContextsAccess.class);
 	}
 
 	/**
@@ -145,7 +144,7 @@ public class RMContextTest extends JerseyTest {
 
 	/**
 	 * Test method for
-	 * {@link RMContext#create(String, String)}.
+	 * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#create(String, String)}.
 	 * 
 	 * @throws Exception
 	 */
@@ -190,7 +189,7 @@ public class RMContextTest extends JerseyTest {
 
 	/**
 	 * Test method for
-	 * {@link RMContext#create(String, String)}
+	 * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#create(String, String)}
 	 * when the parent does not exist.
 	 */
 	@Test
@@ -219,7 +218,7 @@ public class RMContextTest extends JerseyTest {
 
 	/**
 	 * Test method for
-	 * {@link RMContext#create(String, String)}.
+	 * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#create(String, String)}.
 	 * when the parent does not exist.
 	 */
 	@Test
@@ -249,7 +248,7 @@ public class RMContextTest extends JerseyTest {
 
 	/**
 	 * Test method for
-	 * {@link RMContext#delete(String, String)}
+	 * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#delete(String, String)}
 	 * 
 	 * @throws Exception
 	 */
@@ -281,7 +280,7 @@ public class RMContextTest extends JerseyTest {
 
 	/**
 	 * Test method for
-	 * {@link RMContext#delete(String, String)}
+	 * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#delete(String, String)}
 	 */
 	@Test
 	public void step5_DeleteParent() {