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 87be65b55e88b0641c905eedb74319a732d56ed0..ac9735b5a54a72019fd39a51ef3a94914a86a7a1 100644
--- a/src/main/java/es/uvigo/esei/daa/entities/Pet.java
+++ b/src/main/java/es/uvigo/esei/daa/entities/Pet.java
@@ -28,6 +28,7 @@ public class Pet {
         this.setownerID(ownerID);
     }
 
+
     /**
      * Returns the identifier of the pet.
      *
diff --git a/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java b/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9516b7b542a989d94a2ecd805d8e39f7ec8c0134
--- /dev/null
+++ b/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java
@@ -0,0 +1,78 @@
+package es.uvigo.esei.daa.entities;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Created by cya on 3/7/17.
+ */
+public class PetUnitTest {
+    @Test
+    public void testPetIntStringInt() {
+        final int id = 1;
+        final String name = "John";
+        final int ownerID = 2;
+
+        final Pet pet = new Pet(id, name, ownerID);
+
+        assertThat(pet.getId(), is(equalTo(id)));
+        assertThat(pet.getName(), is(equalTo(name)));
+        assertThat(pet.getownerID(), is(equalTo(ownerID)));
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testPetIntStringStringNullName() {
+        new Pet(1, null, 2);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testPetIntStringStringInvalidOwnerID() {
+        new Pet(1, "Pet McPetface", (Integer) null);
+    }
+
+    @Test
+    public void testSetName() {
+        final int id = 1;
+        final int ownerID = 2;
+
+        final Pet pet = new Pet(id, "Mr. Friskies", ownerID);
+        pet.setName("Pet McPetface");
+
+        assertThat(pet.getId(), is(equalTo(id)));
+        assertThat(pet.getName(), is(equalTo("Pet McPetface")));
+        assertThat(pet.getownerID(), is(equalTo(ownerID)));
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testSetNullName() {
+        final Pet pet = new Pet(1, "Pet McPetface", 2);
+
+        pet.setName(null);
+    }
+
+    @Test
+    public void testSetOwnerID() {
+        final int id = 1;
+        final String name = "Pet McPetface";
+
+        final Pet pet = new Pet(id, name, 2);
+        pet.setownerID(3);
+
+        assertThat(pet.getId(), is(equalTo(id)));
+        assertThat(pet.getName(), is(equalTo(name)));
+        assertThat(pet.getownerID(), is(equalTo(3)));
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testSetNullOwnerID() {
+        final Pet pet = new Pet(1, "Pet McPetface", 2);
+
+        pet.setownerID((Integer) null);
+    }
+
+    //TODO ownerID can't be less than 1. Also comparing and hashing methods are not implemented
+
+}