diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ScopedTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ContextTest.java
similarity index 92%
rename from src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ScopedTest.java
rename to src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ContextTest.java
index fa06b99..fb714e7 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ScopedTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ContextTest.java
@@ -22,9 +22,9 @@ import org.slf4j.LoggerFactory;
  * @author Luca Frosini (ISTI - CNR)
  *
  */
-public class ScopedTest {
+public class ContextTest {
 	
-	private static final Logger logger = LoggerFactory.getLogger(ScopedTest.class);
+	private static final Logger logger = LoggerFactory.getLogger(ContextTest.class);
 	
 	protected static final String PROPERTIES_FILENAME = "token.properties"; 
 	
@@ -54,7 +54,7 @@ public class ScopedTest {
 	
 	static {
 		Properties properties = new Properties();
-		InputStream input = ScopedTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME);
+		InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME);
 
 		try {
 			// load the properties file
@@ -76,7 +76,7 @@ public class ScopedTest {
 		
 		
 		properties = new Properties();
-		input = ScopedTest.class.getClassLoader().getResourceAsStream(REGISTRY_PROPERTIES_FILENAME);
+		input = ContextTest.class.getClassLoader().getResourceAsStream(REGISTRY_PROPERTIES_FILENAME);
 
 		try {
 			// load the properties file
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java
index afb025c..1c5c8bb 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
-public class ERManagementTest extends ScopedTest {
+public class ERManagementTest extends ContextTest {
 	
 	private static Logger logger = LoggerFactory.getLogger(ERManagementTest.class);
 	
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/EntityManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/EntityManagementTest.java
index 6b71d82..6b22c9c 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/EntityManagementTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/EntityManagementTest.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
-public class EntityManagementTest extends ScopedTest {
+public class EntityManagementTest extends ContextTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(EntityManagementTest.class);
 	
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/MultiContextTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/MultiContextTest.java
index 29b25a7..997206a 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/MultiContextTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/MultiContextTest.java
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
  * @author Luca Frosini (ISTI - CNR)
  *
  */
-public class MultiContextTest extends ScopedTest {
+public class MultiContextTest extends ContextTest {
 
 	private static Logger logger = LoggerFactory
 			.getLogger(MultiContextTest.class);
@@ -148,14 +148,14 @@ public class MultiContextTest extends ScopedTest {
 		
 		
 		logger.debug("Changing token to test add to scope");
-		ScopedTest.setContext(ScopedTest.ALTERNATIVE_TEST_SCOPE);
+		ContextTest.setContext(ContextTest.ALTERNATIVE_TEST_SCOPE);
 		
 		
 		UUID hostingNodeUUID = createdHN.getHeader().getUUID();
 		UUID eServiceUUID = createdEService.getHeader().getUUID();
 		
 		logger.debug("Changing token to test add to scope");
-		ScopedTest.setContext(ScopedTest.ALTERNATIVE_TEST_SCOPE);
+		ContextTest.setContext(ContextTest.ALTERNATIVE_TEST_SCOPE);
 		
 		try {
 			resourceRegistryClient.exists(EService.class, eServiceUUID);
@@ -193,7 +193,7 @@ public class MultiContextTest extends ScopedTest {
 		
 		
 		logger.debug("Restoring original scope");
-		ScopedTest.setContext(ScopedTest.DEFAULT_TEST_SCOPE);
+		ContextTest.setContext(ContextTest.DEFAULT_TEST_SCOPE);
 		
 		deleted = resourceRegistryPublisher.deleteResource(createdEService);
 		Assert.assertTrue(deleted);
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/RRClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/RRClientTest.java
index fa2da31..1107566 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/RRClientTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/RRClientTest.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
  * @author Luca Frosini (ISTI - CNR)
  *
  */
-public class RRClientTest extends ScopedTest {
+public class RRClientTest extends ContextTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(EntityManagementTest.class);
 	
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java
index 2cc3c7e..4895deb 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java
@@ -63,7 +63,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
  * @author Luca Frosini (ISTI - CNR)
  *
  */
-public class SmartgearResourcesTest extends ScopedTest {
+public class SmartgearResourcesTest extends ContextTest {
 
 	private static Logger logger = LoggerFactory.getLogger(SmartgearResourcesTest.class);