diff --git a/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java b/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java
index ef09a0c73..a844c62c1 100644
--- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java
+++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java
@@ -12,52 +12,52 @@ import org.springframework.core.style.ToStringCreator;
 
 public class OwnerTest {
 
-	private Owner instance;
+	private Owner ownerInstance;
 
 	@Before
 	public void setUp() {
-		this.instance = new Owner();
+		this.ownerInstance = new Owner();
 	}
 	
 	
 	@Test
 	public void getSetTelephoneTest() {
 		// Owner instance = new Owner();
-		instance.setTelephone("514 371 9999");
-		String result = instance.getTelephone();
+		ownerInstance.setTelephone("514 371 9999");
+		String result = ownerInstance.getTelephone();
 		assertEquals("514 371 9999", result);
 	}
 	
 	@Test
 	public void setGetCityTest() {
 		// Owner instance = new Owner();
-		instance.setCity("Montreal");
-		String result = instance.getCity();
+		ownerInstance.setCity("Montreal");
+		String result = ownerInstance.getCity();
 		assertEquals("Montreal", result);
 	}
 	
 	@Test
 	public void toStringTest() {
-		ToStringCreator creator = new ToStringCreator(instance);
+		ToStringCreator creator = new ToStringCreator(ownerInstance);
 		String expected = 
 				creator
-				.append("id", instance.getId())
-				.append("new", instance.isNew())
-				.append("lastName", instance.getLastName())
-				.append("firstName", instance.getFirstName())
-        			.append("address", instance.getAddress())
-                .append("city", instance.getCity())
-        			.append("telephone", instance.getTelephone())
+				.append("id", ownerInstance.getId())
+				.append("new", ownerInstance.isNew())
+				.append("lastName", ownerInstance.getLastName())
+				.append("firstName", ownerInstance.getFirstName())
+        			.append("address", ownerInstance.getAddress())
+                .append("city", ownerInstance.getCity())
+        			.append("telephone", ownerInstance.getTelephone())
 				.toString();
-		String result = instance.toString();
+		String result = ownerInstance.toString();
 		assertEquals(expected, result); 
 	}
 	
 	@Test
 	public void setPetgetPetsTest() {
 		Pet pet = new Pet();
-		instance.addPet(pet);
-		List<Pet> result = instance.getPets();
+		ownerInstance.addPet(pet);
+		List<Pet> result = ownerInstance.getPets();
 		Pet onlyPet = result.iterator().next();
 
 		assertEquals(1, result.size()); // Make sure there's only one element in the Collection returned	
@@ -65,14 +65,23 @@ public class OwnerTest {
 	}
 
 	@Test
-	public void getPetTest() {	
+	public void getPetExistsTest() {	
 		Pet pet = new Pet();
 		pet.setName("Pochi");
-		instance.addPet(pet);
+		ownerInstance.addPet(pet);
 		
-		assertEquals(pet, instance.getPet("Pochi"));	
-		assertEquals(pet, instance.getPet("Pochi", false)); //tests pet object exists
-		assertEquals(null, instance.getPet("Pochi", true));	//tests pet object doesn't exist
+		//tests pet object exists
+		assertEquals(pet, ownerInstance.getPet("Pochi"));	
+		assertEquals(pet, ownerInstance.getPet("Pochi", false));
+	}
+	
+	@Test
+	public void getPetDoesntExistsTest() {	
+		Pet pet = new Pet();
+		pet.setName("Pochi");
+		ownerInstance.addPet(pet);
+		//tests pet object doesn't exist
+		assertEquals(null, ownerInstance.getPet("Pochi", true));	
 	}
 	
 	@Test
@@ -80,20 +89,22 @@ public class OwnerTest {
 		Pet pet = new Pet();
 		List<Pet> list = new ArrayList<>();
 		list.add(pet);
-		instance.addPet(pet);
+		ownerInstance.addPet(pet);
 		
-		assertEquals(list, instance.getPets());
+		assertEquals(list, ownerInstance.getPets());
+		assertEquals(1, list.size());
 		
 		Pet pet2 = new Pet();
 		list.add(pet2);
-		instance.addPet(pet2);
+		ownerInstance.addPet(pet2);
 		
-		assertEquals(list, instance.getPets());
+		assertEquals(list, ownerInstance.getPets());
+		assertEquals(2, list.size());
 	}
 	
 	@Test
 	public void setGetAddress() {
-		instance.setAddress("123 FakeStreet");
-		assertEquals("123 FakeStreet", instance.getAddress());
+		ownerInstance.setAddress("123 FakeStreet");
+		assertEquals("123 FakeStreet", ownerInstance.getAddress());
 	}
 }
\ No newline at end of file