diff --git a/src/main/java/es/uvigo/esei/daa/entities/Pet.java b/src/main/java/es/uvigo/esei/daa/entities/Pet.java
index e129d8be9e80e001fc66db10362e419d9bb5078f..e30a6f9e184b8b43380fb1dab019197c39bb0aa4 100644
--- a/src/main/java/es/uvigo/esei/daa/entities/Pet.java
+++ b/src/main/java/es/uvigo/esei/daa/entities/Pet.java
@@ -12,15 +12,15 @@ import static java.util.Objects.requireNonNull;
     private int id;
     private String name;
     private String animalType;
-    private int owner_id;
+    private int ownerId;
 
     Pet(){}
 
-    public Pet(int id, String name, String animalType, int owner_id) {
+    public Pet(int id, String name, String animalType, int ownerId) {
         this.id = id;
         this.setName(name);
         this.setAnimalType(animalType);
-        this.owner_id = owner_id;
+        this.ownerId = ownerId;
     }
 
     public int getId() {
@@ -44,7 +44,7 @@ import static java.util.Objects.requireNonNull;
     }
 
     public int getOwnerId() {
-        return owner_id;
+        return ownerId;
     }
 
     @Override
diff --git a/src/test/java/es/uvigo/esei/daa/dao/PetsDAOTest.java b/src/test/java/es/uvigo/esei/daa/dao/PetsDAOTest.java
index e791cab2b5f5d290d5ee35b636bead7e7f66dc8c..d3a09b8ef360b37b7955325bbe7aaa62970f3a27 100644
--- a/src/test/java/es/uvigo/esei/daa/dao/PetsDAOTest.java
+++ b/src/test/java/es/uvigo/esei/daa/dao/PetsDAOTest.java
@@ -79,7 +79,7 @@ public class PetsDAOTest {
 	}
 
 	@Test
-	@ExpectedDatabase("/datasets/dataset-delete.xml")
+	@ExpectedDatabase("/datasets/dataset-delete-pets.xml")
 	public void testDelete() throws DAOException {
 		this.dao.delete(existentId());
 
diff --git a/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java b/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java
index 8c15869633b8839ff967983f593676f7380e1aad..11c808e496a803d72f4b365eece07de84d0df915 100644
--- a/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java
+++ b/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java
@@ -95,7 +95,7 @@ public class PetUnitTest {
 	@Test
 	public void testEqualsHashcode() {
 		EqualsVerifier.forClass(Pet.class)
-			.withIgnoredFields("name", "animalType", "owner_id")
+			.withIgnoredFields("name", "animalType", "ownerId")
 			.suppress(Warning.STRICT_INHERITANCE)
 			.suppress(Warning.NONFINAL_FIELDS)
 		.verify();
diff --git a/src/test/resources/datasets/dataset-add.xml b/src/test/resources/datasets/dataset-add.xml
index 0344d588b41faba3dfec7b745121c70fdc3aedb7..d1a4f5eaa8b824c1057b9a9fa22dedc096c30267 100644
--- a/src/test/resources/datasets/dataset-add.xml
+++ b/src/test/resources/datasets/dataset-add.xml
@@ -23,6 +23,5 @@
 	<pet id="4" name="Tafi3" animalType="Perro3" owner_id="1"/>
 	<pet id="5" name="Tafi4" animalType="Perro4" owner_id="1"/>
 	<pet id="6" name="Tafi5" animalType="Perro5" owner_id="1"/>
-	<pet id="7" name="Tafi7" animalType="Perro6" owner_id="1"/>
 	
 </dataset>
\ No newline at end of file
diff --git a/src/test/resources/datasets/dataset-delete.xml b/src/test/resources/datasets/dataset-delete.xml
index 7ba238e442a2ca64ef73fba18400ce3375d3ff54..3607152478c43811a2cc19488e528d9473b05463 100644
--- a/src/test/resources/datasets/dataset-delete.xml
+++ b/src/test/resources/datasets/dataset-delete.xml
@@ -19,5 +19,6 @@
 	<pet id="2" name="Tafi1" animalType="Perro1" owner_id="1"/>
 	<pet id="3" name="Tafi2" animalType="Perro2" owner_id="1"/>
 	<pet id="4" name="Tafi3" animalType="Perro3" owner_id="1"/>
+	<pet id="5" name="Tafi4" animalType="Perro4" owner_id="1"/>
 	<pet id="6" name="Tafi5" animalType="Perro5" owner_id="1"/>
 </dataset>
\ No newline at end of file
diff --git a/src/test/resources/datasets/dataset-modify.xml b/src/test/resources/datasets/dataset-modify.xml
index 0c207dd5a4ae2dfd1427e1011113fd04efc68b3d..7c38f4db32d12c8d92b7f7f3f5f664db6eeea206 100644
--- a/src/test/resources/datasets/dataset-modify.xml
+++ b/src/test/resources/datasets/dataset-modify.xml
@@ -20,7 +20,6 @@
 	<pet id="2" name="Tafi1" animalType="Perro1" owner_id="1"/>
 	<pet id="3" name="Tafi2" animalType="Perro2" owner_id="1"/>
 	<pet id="4" name="Tafi3" animalType="Perro3" owner_id="1"/>
-	<pet id="5" name="Tafi7" animalType="Perro6" owner_id="1"/>
+	<pet id="5" name="Tafi4" animalType="Perro4" owner_id="1"/>
 	<pet id="6" name="Tafi5" animalType="Perro5" owner_id="1"/>
-	
 </dataset>
\ No newline at end of file