diff --git a/pom.xml b/pom.xml
index f80986e..cf5f0a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,14 @@
 			<artifactId>gxt</artifactId>
 			<version>3.0.1</version>
 		</dependency>
-
+		
+		<!-- Portlet -->
+		<dependency>
+			<groupId>javax.portlet</groupId>
+			<artifactId>portlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		
 
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
@@ -130,15 +137,12 @@
 			<version>[1.0.2-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>javax.portlet</groupId>
-			<artifactId>portlet-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
+		
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>custom-portal-handler</artifactId>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslcore</artifactId>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 484d914..d95b44f 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -6,6 +6,14 @@
 <web-app>
 
 	<!-- Servlets -->
+	<!-- JUnit -->
+	<servlet>
+		<servlet-name>jUnitHostImpl</servlet-name>
+		<servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>
+	</servlet>
+	
+	
+	<!-- Base Service -->
 	<servlet>
 		<servlet-name>tdservlet</servlet-name>
 		<servlet-class>org.gcube.portlets.user.td.server.TabularDataServiceImpl</servlet-class>
@@ -99,10 +107,7 @@
 		</servlet> <servlet> <servlet-name>uploadServlet</servlet-name> <servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class> 
 		</servlet> -->
 
-	<servlet>
-		<servlet-name>jUnitHostImpl</servlet-name>
-		<servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>
-	</servlet>
+	
 
 	<!-- Check Session Expired -->
 	<servlet>
@@ -117,17 +122,22 @@
 	</servlet>
 
 	
-	
-	
 
 	<!-- Servlets Mapping -->
+	<!-- JUnit -->
+	<servlet-mapping>
+		<servlet-name>jUnitHostImpl</servlet-name>
+		<url-pattern>/tabulardataportlet/junithost/*</url-pattern>
+	</servlet-mapping>
+	
+	
+	<!-- Base Service -->
 	<servlet-mapping>
 		<servlet-name>tdservlet</servlet-name>
 		<url-pattern>/tabulardataportlet/tds</url-pattern>
 	</servlet-mapping>
 
 	<!-- TDWidget -->
-
 	<servlet-mapping>
 		<servlet-name>tdwxService</servlet-name>
 		<url-pattern>/tabulardataportlet/tdwx</url-pattern>
@@ -226,17 +236,6 @@
 		<url-pattern>/tabulardataportlet/TDLogsServlet</url-pattern>
 	</servlet-mapping>
 	
-
-
-	<servlet-mapping>
-		<servlet-name>jUnitHostImpl</servlet-name>
-		<url-pattern>/tabulardataportlet/junithost/*</url-pattern>
-	</servlet-mapping>
-
-	
-	
-	
-	
 	<!-- Default page to serve -->
 	<welcome-file-list>
 		<welcome-file>tabulardataportlet.html</welcome-file>