diff --git a/src/main/webapp/META-INF/MANIFEST.MF b/WebContent/META-INF/MANIFEST.MF
similarity index 100%
rename from src/main/webapp/META-INF/MANIFEST.MF
rename to WebContent/META-INF/MANIFEST.MF
diff --git a/pom.xml b/pom.xml
index 1d4a23802a97da430ec8c974fbcab85b164863b0..1986eaa9660d209707e35712c95a78f5d25fab52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,72 +16,110 @@
 	</licenses>
 
 	<properties>
-		<maven.compiler.source>1.7</maven.compiler.source>
-		<maven.compiler.target>1.7</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<jersey.version>2.15</jersey.version>
+		<mysql.version>5.1.34</mysql.version>
+		<commons.codec.version>1.10</commons.codec.version>
+		<commons.dbcp.version>1.4</commons.dbcp.version>
+		<java.servlet.version>3.0.1</java.servlet.version>
+		<junit.version>4.12</junit.version>
+		<selenium.java.version>2.44.0</selenium.java.version>
+		<spring.test.version>4.1.4.RELEASE</spring.test.version>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
-			<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
-			<version>2.5.1</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.glassfish.jersey.containers</groupId>
 			<artifactId>jersey-container-servlet</artifactId>
-			<version>2.5.1</version>
+			<version>${jersey.version}</version>
 		</dependency>
-
+		
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>${java.servlet.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json-jackson</artifactId>
-			<version>2.5.1</version>
+			<version>${jersey.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.28</version>
+			<version>${mysql.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.9</version>
+			<version>${commons.codec.version}</version>
 		</dependency>
 
 		<!-- Test Scope -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
+			<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
 
 		<dependency>
 			<groupId>commons-dbcp</groupId>
 			<artifactId>commons-dbcp</artifactId>
-			<version>1.4</version>
-			<scope>test</scope>
+			<version>${commons.dbcp.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-java</artifactId>
-			<version>2.39.0</version>
+			<version>${selenium.java.version}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>4.0.0.RELEASE</version>
+			<version>${spring.test.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>cobertura-maven-plugin</artifactId>
+				<version>2.6</version>
+			</plugin>
+				
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.18.1</version>
+				<reportSets>
+					<reportSet>
+						<id>integration-tests</id>
+						<reports>
+							<report>failsafe-report-only</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+		</plugins>
+	</reporting>
+
 	<build>
 		<finalName>DAAExample</finalName>
 		<plugins>
@@ -89,39 +127,95 @@
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
 				<groupId>org.apache.maven.plugins</groupId>
-				<version>2.1.1</version>
+				<version>2.6</version>
 				<configuration>
 					<warName>DAAExample</warName>
 				</configuration>
 			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.18.1</version>
+				<configuration>
+					<excludes>
+						<exclude>**/*WebTest*</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>2.18.1</version>
+				<configuration>
+					<includes>
+						<include>**/*WebTest*</include>
+					</includes>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+				
 			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.18.1</version>
+				
 				<executions>
 					<execution>
-						<id>test-reports</id>
+						<id>test-report</id>
 						<phase>test</phase>
+						<goals>
+							<goal>report-only</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>integration-test-report</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>report-only</goal>
+							<goal>failsafe-report-only</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.tomcat.maven</groupId>
+				<artifactId>tomcat7-maven-plugin</artifactId>
+				<version>2.2</version>
+				<configuration>
+					<port>9080</port>
+					<path>/DAAExample</path>
+					<contextFile>src/test/webapp/META-INF/context.xml</contextFile>
+					<useTestClasspath>false</useTestClasspath>
+				</configuration>
+				<executions>
+					<execution>
+						<id>start-tomcat7</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
 						<configuration>
-							<tasks>
-								<junitreport todir="target/surefire-reports">
-									<fileset dir="target/surefire-reports">
-										<include name="**/*.xml" />
-									</fileset>
-									<!-- report format="noframes" todir="target/surefire-reports" /-->
-								</junitreport>
-							</tasks>
+							<fork>true</fork>
 						</configuration>
+					</execution>
+					<execution>
+						<id>stop-tomcat7</id>
+						<phase>post-integration-test</phase>
 						<goals>
-							<goal>run</goal>
+							<goal>shutdown</goal>
 						</goals>
 					</execution>
 				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>ant</groupId>
-						<artifactId>ant-junit</artifactId>
-						<version>1.6.2</version>
-					</dependency>
-				</dependencies>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
index d8b997cc05a20f3e7d88547c1a00aab25e9f7519..35bc2a76c7895ab4805dd6adb71fa848af3409a4 100644
--- a/src/main/webapp/META-INF/context.xml
+++ b/src/main/webapp/META-INF/context.xml
@@ -27,13 +27,4 @@
 		driverClassName="com.mysql.jdbc.Driver"
 		url="jdbc:mysql://localhost:3306/daaexample"
 	/>
-
-	<Resource name="jdbc/daaexampletest" 
-		auth="Container" 
-		type="javax.sql.DataSource"
-		maxActive="100" maxIdle="30" maxWait="10000" 
-		username="daa" password="daa"
-		driverClassName="com.mysql.jdbc.Driver"
-		url="jdbc:mysql://localhost:3306/daaexampletest"
-	/>
 </Context>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 623a8d2665728ef59ac4cfb18c2bc0a383945357..469592507737578d1ecc1e69bb79ed7fa344e661 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -2,7 +2,7 @@
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns="http://java.sun.com/xml/ns/javaee"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	id="WebApp_ID" version="3.0">
+	id="DAAExample" version="3.0">
 	<display-name>DAAExample</display-name>
 	
 	<welcome-file-list>
@@ -34,12 +34,12 @@
 		<url-pattern>/rest/*</url-pattern>
 	</servlet-mapping>
 
-	<!-- filter>
+	<filter>
 		<filter-name>LoginFilter</filter-name>
 		<filter-class>es.uvigo.esei.daa.LoginFilter</filter-class>
 	</filter>
 	<filter-mapping>
 		<filter-name>LoginFilter</filter-name>
 		<url-pattern>/*</url-pattern>
-	</filter-mapping-->
+	</filter-mapping>
 </web-app>
\ No newline at end of file
diff --git a/src/test/java/es/uvigo/esei/daa/dao/PeopleDAOTest.java b/src/test/java/es/uvigo/esei/daa/dao/PeopleDAOTest.java
index 0e527b3650f71cd4c369082c30f4c424decabd37..14ecc45ffaf9a59917182d73e1edc476cf19405d 100644
--- a/src/test/java/es/uvigo/esei/daa/dao/PeopleDAOTest.java
+++ b/src/test/java/es/uvigo/esei/daa/dao/PeopleDAOTest.java
@@ -16,6 +16,7 @@ public class PeopleDAOTest {
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
 		TestUtils.createFakeContext();
+		TestUtils.clearTestDatabase();
 	}
 
 	@Before
diff --git a/src/test/java/es/uvigo/esei/daa/rest/PeopleTest.java b/src/test/java/es/uvigo/esei/daa/rest/PeopleTest.java
index e3fc466c1585dae76c2fbb1d0a7c1c5e9d72e2ba..c6c92d1e2410294e8d3cb0260877146b2d541f92 100644
--- a/src/test/java/es/uvigo/esei/daa/rest/PeopleTest.java
+++ b/src/test/java/es/uvigo/esei/daa/rest/PeopleTest.java
@@ -1,7 +1,7 @@
 package es.uvigo.esei.daa.rest;
 
-import static es.uvigo.esei.daa.TestUtils.assertOkStatus;
 import static es.uvigo.esei.daa.TestUtils.assertBadRequestStatus;
+import static es.uvigo.esei.daa.TestUtils.assertOkStatus;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
@@ -14,7 +14,6 @@ import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
@@ -23,6 +22,8 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+
 import es.uvigo.esei.daa.TestUtils;
 import es.uvigo.esei.daa.entities.Person;
 
diff --git a/src/test/java/es/uvigo/esei/daa/web/PeopleWebTest.java b/src/test/java/es/uvigo/esei/daa/web/PeopleWebTest.java
index c757d703eb5183bc461ab9b32c215c1b7d361a6b..42d19bb8ecdb1639ee67dbebaf66f60578244166 100644
--- a/src/test/java/es/uvigo/esei/daa/web/PeopleWebTest.java
+++ b/src/test/java/es/uvigo/esei/daa/web/PeopleWebTest.java
@@ -26,6 +26,7 @@ public class PeopleWebTest {
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
 		TestUtils.createFakeContext();
+		TestUtils.clearTestDatabase();
 	}
 	
 	@Before
diff --git a/src/test/java/es/uvigo/esei/daa/mysql-tests-clear.sql b/src/test/resources/mysql-tests-clear.sql
similarity index 100%
rename from src/test/java/es/uvigo/esei/daa/mysql-tests-clear.sql
rename to src/test/resources/mysql-tests-clear.sql
diff --git a/src/test/java/es/uvigo/esei/daa/mysql-tests.sql b/src/test/resources/mysql-tests.sql
similarity index 100%
rename from src/test/java/es/uvigo/esei/daa/mysql-tests.sql
rename to src/test/resources/mysql-tests.sql
diff --git a/src/test/resources/mysql.sql b/src/test/resources/mysql.sql
new file mode 100644
index 0000000000000000000000000000000000000000..4f8926883c162542434436105f7ce403135a5919
--- /dev/null
+++ b/src/test/resources/mysql.sql
@@ -0,0 +1,16 @@
+CREATE DATABASE `daaexampletest`;
+
+CREATE TABLE `daaexampletest`.`people` (
+	`id` int NOT NULL AUTO_INCREMENT,
+	`name` varchar(50) DEFAULT NULL,
+	`surname` varchar(100) DEFAULT NULL,
+	PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `daaexampletest`.`users` (
+	`login` varchar(100) NOT NULL,
+	`password` varbinary(64) DEFAULT NULL,
+	PRIMARY KEY (`login`)
+);
+
+GRANT ALL ON `daaexampletest`.* TO 'daa'@'localhost' IDENTIFIED BY 'daa';
\ No newline at end of file
diff --git a/src/test/webapp/META-INF/context.xml b/src/test/webapp/META-INF/context.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dbba264d1c4141c9fe643ecd89e1e82e68525c9b
--- /dev/null
+++ b/src/test/webapp/META-INF/context.xml
@@ -0,0 +1,30 @@
+<Context>
+	<!-- maxActive: Maximum number of database connections in pool. Make sure 
+		you configure your mysqld max_connections large enough to handle all of your 
+		db connections. Set to -1 for no limit. -->
+
+	<!-- maxIdle: Maximum number of idle database connections to retain in pool. 
+		Set to -1 for no limit. See also the DBCP documentation on this and the minEvictableIdleTimeMillis 
+		configuration parameter. -->
+
+	<!-- maxWait: Maximum time to wait for a database connection to become available 
+		in ms, in this example 10 seconds. An Exception is thrown if this timeout 
+		is exceeded. Set to -1 to wait indefinitely. -->
+
+	<!-- username and password: MySQL username and password for database connections -->
+
+	<!-- driverClassName: Class name for the old mm.mysql JDBC driver is org.gjt.mm.mysql.Driver 
+		- we recommend using Connector/J though. Class name for the official MySQL 
+		Connector/J driver is com.mysql.jdbc.Driver. -->
+
+	<!-- url: The JDBC connection url for connecting to your MySQL database. -->
+
+	<Resource name="jdbc/daaexample" 
+		auth="Container" 
+		type="javax.sql.DataSource"
+		maxActive="100" maxIdle="30" maxWait="10000" 
+		username="daa" password="daa"
+		driverClassName="com.mysql.jdbc.Driver"
+		url="jdbc:mysql://localhost:3306/daaexampletest"
+	/>
+</Context>
\ No newline at end of file