diff --git a/src/main/java/rocks/zipcodewilmington/MainApplication.java b/src/main/java/rocks/zipcodewilmington/MainApplication.java
index 1a21cb8..fecb914 100644
--- a/src/main/java/rocks/zipcodewilmington/MainApplication.java
+++ b/src/main/java/rocks/zipcodewilmington/MainApplication.java
@@ -4,4 +4,5 @@
  * @author leon on 4/19/18.
  */
 public class MainApplication {
+
 }
diff --git a/src/main/java/rocks/zipcodewilmington/animals/animal_creation/AnimalFactory.java b/src/main/java/rocks/zipcodewilmington/animals/animal_creation/AnimalFactory.java
index 3be9a59..fc6e77c 100644
--- a/src/main/java/rocks/zipcodewilmington/animals/animal_creation/AnimalFactory.java
+++ b/src/main/java/rocks/zipcodewilmington/animals/animal_creation/AnimalFactory.java
@@ -22,4 +22,6 @@ public static Cat createCat(String name, Date birthDate) {
         Integer newId = CatHouse.getNumberOfCats();
         return new Cat(name, birthDate, newId);
     }
+
+
 }
diff --git a/src/main/java/rocks/zipcodewilmington/animals/animal_storage/CatHouse.java b/src/main/java/rocks/zipcodewilmington/animals/animal_storage/CatHouse.java
index 10e191d..474c786 100644
--- a/src/main/java/rocks/zipcodewilmington/animals/animal_storage/CatHouse.java
+++ b/src/main/java/rocks/zipcodewilmington/animals/animal_storage/CatHouse.java
@@ -10,22 +10,27 @@ public class CatHouse {
     private static AnimalWarehouse<Cat> catHouse = new AnimalWarehouse<>();
 
     public static void add(Cat cat) {
+
         catHouse.add(cat);
     }
 
     public static void remove(Integer id) {
+
         catHouse.removeAnimalById(id);
     }
 
     public static void remove(Cat cat) {
+
         catHouse.removeAnimal(cat);
     }
 
     public static Cat getCatById(Integer id) {
+
         return catHouse.getAnimalById(id);
     }
 
     public static Integer getNumberOfCats() {
+
         return catHouse.getNumberOfAnimals();
     }
 
diff --git a/src/main/java/rocks/zipcodewilmington/animals/animal_storage/DogHouse.java b/src/main/java/rocks/zipcodewilmington/animals/animal_storage/DogHouse.java
index bc1feb0..ae34787 100644
--- a/src/main/java/rocks/zipcodewilmington/animals/animal_storage/DogHouse.java
+++ b/src/main/java/rocks/zipcodewilmington/animals/animal_storage/DogHouse.java
@@ -9,6 +9,7 @@ public class DogHouse {
     private static AnimalWarehouse<Dog> dogHouse = new AnimalWarehouse<>();
 
     public static void add(Dog dog) {
+
         dogHouse.add(dog);
     }
 
@@ -17,14 +18,17 @@ public static void remove(Integer id) {
     }
 
     public static void remove(Dog dog) {
+
         dogHouse.removeAnimal(dog);
     }
 
     public static Dog getDogById(Integer id) {
+
         return dogHouse.getAnimalById(id);
     }
 
     public static Integer getNumberOfDogs() {
+
         return dogHouse.getNumberOfAnimals();
     }
 
diff --git a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java
index 7522ce3..f8596aa 100644
--- a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java
+++ b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java
@@ -1,9 +1,47 @@
 package rocks.zipcodewilmington;
 
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcodewilmington.animals.Cat;
+import rocks.zipcodewilmington.animals.Dog;
+import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * @author leon on 4/19/18.
  */
 public class AnimalFactoryTest {
     //TODO - Create Test for `Animal createDog(String name, Date birthDate)`
     //TODO - Create Test for `Animal createCat(String name, Date birthDate)`
+    @Test
+    public void testCreateDog() throws ParseException {
+        //given
+
+        AnimalFactory animalFactory = new AnimalFactory();
+        String expected ="karadi";
+        SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy");
+        Date date = dateFormat.parse("02/01/2010");
+        //when
+        Dog dog = animalFactory.createDog(expected ,date);
+        //Then
+        Assert.assertEquals(expected,dog.getName());
+    }
+
+    @Test
+    public void testCreateCat() throws ParseException {
+        AnimalFactory animalFactory = new AnimalFactory();
+        String expected ="gundus";
+        SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy");
+        Date date = dateFormat.parse("02/01/2010");
+        //when
+        Cat cat = animalFactory.createCat(expected, date);
+        //Then
+        Assert.assertEquals(expected,cat.getName());
+    }
+
+
+
 }
diff --git a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
index f756b34..49de04f 100644
--- a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
+++ b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
@@ -1,5 +1,10 @@
 package rocks.zipcodewilmington;
 
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcodewilmington.animals.Cat;
+import rocks.zipcodewilmington.animals.animal_storage.CatHouse;
+
 /**
  * @author leon on 4/19/18.
  */
@@ -9,4 +14,53 @@ public class CatHouseTest {
     // TODO - Create tests for `void remove(Cat cat)`
     // TODO - Create tests for `Cat getCatById(Integer id)`
     // TODO - Create tests for `Integer getNumberOfCats()`
+    @Test
+    public void testAddCat(){
+        CatHouse catHouse=new CatHouse();
+        String expected="marble";
+        Cat cat= new Cat(expected,null,null);
+        catHouse.add(cat);
+        Assert.assertEquals(expected,cat.getName());
+    }
+
+     @Test
+     public void testGetIntegerId(){
+        CatHouse catHouse =new CatHouse();
+        Integer expectedId=1;
+        Cat cat =new Cat(null,null,expectedId);
+        catHouse.add(cat);
+        Assert.assertEquals(cat,catHouse.getCatById(expectedId));
+     }
+
+    @Test
+    public void testRemoveIntegerId() {
+        CatHouse catHouse = new CatHouse();
+        Integer id = 1;
+        Cat cat =new Cat(null,null,id);
+        catHouse.add(cat);
+        catHouse.remove(id);
+        Assert.assertEquals(null, catHouse.getCatById(id));
+
+    }
+
+    @Test
+    public void testRemoveCat() {
+        CatHouse catHouse = new CatHouse();
+        Integer id = 1;
+        Cat cat =new Cat("cora",null,id);
+        catHouse.add(cat);
+        catHouse.remove(cat);
+       // catHouse.remove(id);
+        Assert.assertEquals(null,catHouse.getCatById(id));
+
+    }
+     @Test
+    public void testGetNumberOfCats(){
+        Integer expectedNumber=2;
+        CatHouse catHouse=new CatHouse();
+        Cat cat=new Cat(null,null,null);
+        catHouse.add(cat);
+        catHouse.add(cat);
+        Assert.assertEquals(expectedNumber,catHouse.getNumberOfCats());
+     }
 }
diff --git a/src/test/java/rocks/zipcodewilmington/CatTest.java b/src/test/java/rocks/zipcodewilmington/CatTest.java
index 4bd465f..45c079e 100644
--- a/src/test/java/rocks/zipcodewilmington/CatTest.java
+++ b/src/test/java/rocks/zipcodewilmington/CatTest.java
@@ -2,8 +2,14 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import rocks.zipcodewilmington.animals.Animal;
 import rocks.zipcodewilmington.animals.Cat;
+import rocks.zipcodewilmington.animals.Dog;
+import rocks.zipcodewilmington.animals.Mammal;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 
 /**
@@ -40,4 +46,80 @@ public void constructorTest() {
         Assert.assertEquals(givenId, retrievedId);
     }
 
+    @Test
+    public void setNameTest() {
+        //Given
+        String expected = "Cora";
+        Date date = new Date();
+        //When
+        Cat cat = new Cat(expected, date, 1);
+        cat.setName(expected);
+        //Then
+        Assert.assertEquals(expected,cat.getName());
+
+
+    }
+    @Test
+    public void speakTest(){
+        //Given
+        String expected = "meow!";
+        //When
+        Cat cat = new Cat(null, null , null);
+        //Then
+        Assert.assertEquals(expected, cat.speak());
+    }
+
+    @Test
+    public void testSetBirthDate() throws ParseException {
+        //given
+        SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy");
+        Date expected = dateFormat.parse("02/01/2010");
+
+        //when
+        Cat cat=new Cat(null,null,null);
+        cat.setBirthDate(expected);
+
+        //then
+        Assert.assertEquals(expected,cat.getBirthDate());
+    }
+
+    @Test
+    public void testEat(){
+        ArrayList<Food> eatenMeals = new ArrayList<>();
+        Integer expected = 2;
+        Food food = new Food();
+        Cat cat= new Cat(null,null,null);
+        cat.eat(food);
+        cat.eat(food);
+
+        Assert.assertEquals(expected,cat.getNumberOfMealsEaten());
+
+    }
+
+    @Test
+    public void testIntegerGetId(){
+        //given
+        Cat cat = new Cat(null,null,null);
+        Integer expectedId = 1;
+
+        //when
+
+        //then
+        Assert.assertEquals(expectedId,cat.getId());
+    }
+
+    @Test
+    public void animalInheritanceTest(){
+        Cat cat = new Cat(null,null,null);
+        Assert.assertTrue(cat instanceof Animal);
+    }
+
+    @Test
+    public void mammalInheritanceTest(){
+        Cat cat = new Cat(null,null,null);
+        Assert.assertTrue(cat instanceof Mammal);
+    }
+
 }
+
+
diff --git a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
index b88b30b..9fb9a11 100644
--- a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
+++ b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
@@ -1,6 +1,8 @@
 package rocks.zipcodewilmington;
 
+import org.junit.Assert;
 import org.junit.Test;
+import org.omg.CORBA.PUBLIC_MEMBER;
 import rocks.zipcodewilmington.animals.Dog;
 import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory;
 import rocks.zipcodewilmington.animals.animal_storage.DogHouse;
@@ -31,4 +33,42 @@ public void testGetNumberOfDogs() {
         // Then
         DogHouse.getNumberOfDogs();
     }
+    @Test
+    public void testAddDog(){
+        DogHouse dogHouse=new DogHouse();
+        String expected="bear";
+        Dog dog =new Dog(expected,null,null);
+        dogHouse.add(dog);
+        Assert.assertEquals(expected,dog.getName());
+
+    }
+    @Test
+    public void testGetDogById(){
+        DogHouse dogHouse=new DogHouse();
+        Integer id=1;
+        Dog dog=new Dog(null,null,id);
+        dogHouse.add(dog);
+        Assert.assertEquals(dog,dogHouse.getDogById(id));
+
+    }
+    @Test
+    public void testRemoveIntegerId() {
+        DogHouse dogHouse = new DogHouse();
+        Integer id = 1;
+        Dog dog = new Dog(null, null, id);
+        dogHouse.add(dog);
+        dogHouse.remove(id);
+        Assert.assertEquals(null, dogHouse.getDogById(1));
+    }
+
+    @Test
+    public void testRemoveDog(){
+        DogHouse dogHouse=new DogHouse();
+        String expectedName="appukutts";
+        Integer id=1;
+        Dog dog=new Dog(expectedName,null,1);
+        dogHouse.add(dog);
+        dogHouse.remove(dog);
+        Assert.assertEquals(null,dogHouse.getDogById(1));
+    }
 }
diff --git a/src/test/java/rocks/zipcodewilmington/DogTest.java b/src/test/java/rocks/zipcodewilmington/DogTest.java
index 34a15bd..b25e77c 100644
--- a/src/test/java/rocks/zipcodewilmington/DogTest.java
+++ b/src/test/java/rocks/zipcodewilmington/DogTest.java
@@ -2,7 +2,15 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import rocks.zipcodewilmington.animals.Animal;
+import rocks.zipcodewilmington.animals.Cat;
 import rocks.zipcodewilmington.animals.Dog;
+import rocks.zipcodewilmington.animals.Mammal;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
 
 /**
  * @author leon on 4/19/18.
@@ -15,6 +23,23 @@ public class DogTest {
     // TODO - Create tests for `Integer getId()`
     // TODO - Create test to check Animal inheritance; google search `java instanceof keyword`
     // TODO - Create test to check Mammal inheritance; google search `java instanceof keyword`
+
+    @Test
+    public void TestNewDog() throws ParseException {
+        //given
+        String expectedName="naai";
+        SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy");
+        Date expectedDate =dateFormat.parse("02/02/2018");
+        Integer expectedId=0;
+        //when
+        Dog dog=new Dog(expectedName,expectedDate,expectedId);
+
+        //then
+        Assert.assertEquals(expectedName,dog.getName());
+        Assert.assertEquals(expectedDate,dog.getBirthDate());
+        Assert.assertEquals(expectedId,dog.getId());
+    }
+
     @Test
     public void setNameTest() {
         // Given (a name exists and a dog exists)
@@ -28,4 +53,51 @@ public void setNameTest() {
         String dogName = dog.getName();
         Assert.assertEquals(dogName, givenName);
     }
+    @Test
+    public void testSpeak(){
+        //given
+        String expected="bark!";
+        //when
+        Dog dog = new Dog(null,null,null);
+        //then
+        Assert.assertEquals(expected,dog.speak());
+    }
+
+    @Test
+    public void testIntegerGetId(){
+        //given
+        Dog dog = new Dog(null,null,1);
+        Integer expectedId = 1;
+
+        //when
+
+        //then
+        Assert.assertEquals(expectedId,dog.getId());
+    }
+
+    @Test
+    public void testEat(){
+        //given
+        ArrayList<Food> eatenMeals = new ArrayList<>();
+        Integer expected=2;
+        Dog dog = new Dog(null,null,null);
+        Food food =new Food();
+
+        //when
+        dog.eat(food);
+        dog.eat(food);
+        //then
+        Assert.assertEquals(expected,dog.getNumberOfMealsEaten());
+    }
+    @Test
+    public void animalInheritanceTest(){
+        Dog dog = new Dog(null, null , null);
+        Assert.assertTrue(dog instanceof Animal);
+    }
+    @Test
+    public void mammalInheritanceTest(){
+        Dog dog = new Dog(null, null , null);
+        Assert.assertTrue(dog instanceof Mammal);
+    }
 }
+