diff --git a/src/test/java/org/gcube/gcat/ContextTest.java b/src/test/java/org/gcube/gcat/ContextTest.java
index f6bd4f6..d68683a 100644
--- a/src/test/java/org/gcube/gcat/ContextTest.java
+++ b/src/test/java/org/gcube/gcat/ContextTest.java
@@ -7,14 +7,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-import org.gcube.common.authorization.client.Constants;
-import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
-import org.gcube.common.authorization.library.AuthorizationEntry;
-import org.gcube.common.authorization.library.provider.AuthorizationProvider;
-import org.gcube.common.authorization.library.provider.ClientInfo;
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.authorization.library.utils.Caller;
-import org.gcube.common.scope.api.ScopeProvider;
+import org.gcube.common.authorization.utils.manager.SecretManager;
+import org.gcube.common.authorization.utils.secret.GCubeSecret;
+import org.gcube.common.authorization.utils.secret.Secret;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.slf4j.Logger;
@@ -58,37 +53,29 @@ public class ContextTest {
 		DEV_VRE = ALTERNATIVE_TEST_SCOPE;
 	}
 	
-	public static String getCurrentContextFullName() {
-		String token = SecurityTokenProvider.instance.get();
-		AuthorizationEntry authorizationEntry = null;
-		try {
-			authorizationEntry = Constants.authorizationService().get(token);
-		} catch(Exception e) {
-			return ScopeProvider.instance.get();
-		}
-		return authorizationEntry.getContext();
+	public static void set(Secret secret) throws Exception {
+		SecretManager.instance.get().reset();
+		secret.set();
 	}
 	
-	public static String getContextFullName(String token) throws ObjectNotFound, Exception {
-		AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
-		return authorizationEntry.getContext();
+	public static void setContext(String token) throws Exception {
+		Secret secret = getSecret(token);
+		set(secret);
+	}
+
+	public static void setContextByName(String fullContextName) throws Exception {
+		Secret secret = getSecretByContextName(fullContextName);
+		set(secret);
 	}
 	
-	public static void setContextByName(String fullContextName) throws ObjectNotFound, Exception {
+	private static Secret getSecret(String token) throws Exception {
+		GCubeSecret secret = new GCubeSecret(token);
+		return secret;
+	}
+	
+	private static Secret getSecretByContextName(String fullContextName) throws Exception {
 		String token = ContextTest.properties.getProperty(fullContextName);
-		setContext(token);
-	}
-	
-	public static void setContext(String token) throws ObjectNotFound, Exception {
-		SecurityTokenProvider.instance.set(token);
-		AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
-		ClientInfo clientInfo = authorizationEntry.getClientInfo();
-		String qualifier = authorizationEntry.getQualifier();
-		Caller caller = new Caller(clientInfo, qualifier);
-		AuthorizationProvider.instance.set(caller);
-		String contextFullNane = getContextFullName(token);
-		ScopeProvider.instance.set(contextFullNane);
-		logger.debug("Context: {} - User : {} - Type : {}", contextFullNane, clientInfo.getId(), clientInfo.getType().name());
+		return getSecret(token);
 	}
 	
 	@BeforeClass
@@ -98,8 +85,7 @@ public class ContextTest {
 	
 	@AfterClass
 	public static void afterClass() throws Exception {
-		SecurityTokenProvider.instance.reset();
-		ScopeProvider.instance.reset();
+		SecretManager.instance.get().reset();
 	}
 	
 }
diff --git a/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java b/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java
index 690f9ab..caa64d2 100644
--- a/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java
+++ b/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java
@@ -58,7 +58,7 @@ public class CKANPackageTest extends ContextTest {
 	public void count() throws Exception {
 		CKANPackage ckanPackage = new CKANPackage();
 		int count = ckanPackage.count();
-		logger.debug("Number of items in {} is {}", ContextTest.getCurrentContextFullName(), count);
+		logger.debug("Number of items in {} is {}", SecretManager.instance.get().getContext(), count);
 	}
 	
 	@Test