diff --git a/pom.xml b/pom.xml
index 960f0fc..82e006d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,13 +106,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.gcube.portal</groupId>
-			<artifactId>custom-portal-handler</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.gcube.applicationsupportlayer</groupId>
-			<artifactId>aslcore</artifactId>
+			<groupId>org.gcube.common.portal</groupId>
+			<artifactId>portal-manager</artifactId>
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
@@ -121,6 +117,15 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.gcube.portal</groupId>
+			<artifactId>client-context-library</artifactId>
+			<version>[1.0.0-SNAPSHOT,)</version>
+			<scope>compile</scope>
+		</dependency>
+		
+		
+
 
 		<!-- Authorization -->
 		<dependency>
@@ -171,8 +176,7 @@
 			<artifactId>aslsocial</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
-
+	
 
 		<!-- Apache Common Library -->
 		<dependency>
@@ -199,18 +203,7 @@
 
 
 
-		<!-- Social -->
-		<dependency>
-			<groupId>org.gcube.portal</groupId>
-			<artifactId>social-networking-library</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.gcube.applicationsupportlayer</groupId>
-			<artifactId>aslsocial</artifactId>
-			<scope>provided</scope>
-		</dependency>
+		
 
 		<!-- Storage -->
 		<dependency>
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
new file mode 100644
index 0000000..87b68a3
--- /dev/null
+++ b/src/test/resources/log4j.properties
@@ -0,0 +1,20 @@
+# A default log4j configuration for log4j users.
+#
+# To use this configuration, deploy it into your application's WEB-INF/classes
+# directory.  You are also encouraged to edit it as you like.
+
+log4j.rootLogger=DEBUG, stdout, rollingFile
+
+# Redirect log messages to console
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+
+log4j.appender.rollingFile=org.apache.log4j.RollingFileAppender
+log4j.appender.rollingFile.File=test.log
+log4j.appender.rollingFile.MaxFileSize=20MB
+log4j.appender.rollingFile.MaxBackupIndex=2
+log4j.appender.rollingFile.layout = org.apache.log4j.PatternLayout
+log4j.appender.rollingFile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n