diff --git a/pom.xml b/pom.xml
index d638f8a..90856d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,6 +6,7 @@
 		<artifactId>maven-parent</artifactId>
 		<version>1.0.0</version>
 	</parent>
+	
 	<groupId>org.gcube.information-system</groupId>
 	<artifactId>resource-registry</artifactId>
 	<version>1.7.0-SNAPSHOT</version>
@@ -53,7 +54,6 @@
 	</dependencyManagement>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-encryption</artifactId>
@@ -64,7 +64,6 @@
 			<artifactId>common-smartgears-app</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>authorization-client</artifactId>
@@ -75,7 +74,6 @@
 			<artifactId>common-authorization</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.gcube.information-system</groupId>
 			<artifactId>resource-registry-api</artifactId>
@@ -85,74 +83,53 @@
 			<groupId>org.gcube.information-system</groupId>
 			<artifactId>information-system-model</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>com.orientechnologies</groupId>
 			<artifactId>orientdb-graphdb</artifactId>
 		</dependency>
-
-<!-- 
-		<dependency>
-			<groupId>com.tinkerpop</groupId>
-			<artifactId>frames</artifactId>
-		</dependency>
- -->
-
-		<!-- jersey -->
+		<!-- Jersey -->
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
 			<artifactId>javax.ws.rs-api</artifactId>
 			<version>2.0.1</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.glassfish.jersey.containers</groupId>
 			<artifactId>jersey-container-servlet</artifactId>
 			<version>2.13</version>
 		</dependency>
-
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 			<version>3.0.1</version>
 			<scope>provided</scope>
 		</dependency>
-
+		<!-- END Jersey -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
-		<!-- Test Dependency -->
+		<!-- Test Dependencies -->
+		<dependency>
+			<groupId>org.gcube.information-system</groupId>
+			<artifactId>gcube-resources</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
-			<artifactId>jersey-test-framework-provider-simple</artifactId>
-			<version>2.17</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.gcube.information-system</groupId>
-			<artifactId>gcube-resources</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
 			<version>1.0.13</version>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>