diff --git a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java
index 49aaabbd7..9b3628e39 100644
--- a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java
+++ b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java
@@ -45,4 +45,8 @@ public double getSalary() {
   public void setSalary(double salary) {
     this.salary = salary;
   }
+
+  public String getDetails() {
+    return id + " " + name + " " + department + " " + salary + ".";
+  }
 }
diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagertest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagertest.java
new file mode 100644
index 000000000..3d62441cf
--- /dev/null
+++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagertest.java
@@ -0,0 +1,49 @@
+package com.codedifferently.lesson15;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class EmployeeManagertest {
+  private EmployeeManager employeeManager;
+  private Map<Integer, Employee> employees;
+  Employee newEmployee;
+  Employee tomCat;
+
+  @BeforeEach
+  void set_up() {
+    employees = new HashMap<Integer, Employee>();
+    newEmployee = new Employee(5, "Mike", "Human Resources", 900000.80);
+    employeeManager = new EmployeeManager();
+  }
+
+  @Test
+  void addEmployee() {
+
+    employees.put(newEmployee.getId(), newEmployee);
+    employeeManager.addEmployee(newEmployee);
+    assertEquals(employees.get(5), employeeManager.getEmployee(5));
+  }
+
+  @Test
+  void updateEmployee() {
+
+    tomCat = new Employee(5, "mike", "Human Resources", 900000.80);
+    employees.put(newEmployee.getId(), newEmployee);
+    employeeManager.addEmployee(newEmployee);
+
+    employees.put(tomCat.getId(), tomCat);
+    employeeManager.updateEmployee(tomCat);
+    assertEquals(employees.get(tomCat.getId()), employeeManager.getEmployee(newEmployee.getId()));
+  }
+
+  @Test
+  void RemoveEmployee() {
+    employeeManager.addEmployee(newEmployee);
+    employeeManager.removeEmployee(newEmployee.getId());
+    assertEquals(0, employeeManager.getEmployeeCount());
+  }
+}
diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.java
new file mode 100644
index 000000000..79256cc23
--- /dev/null
+++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.java
@@ -0,0 +1,61 @@
+package com.codedifferently.lesson15;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class EmployeeTest {
+  //  private class Employee employee;
+  Employee testEmployee;
+
+  @BeforeEach
+  void setUp() {
+    testEmployee = new Employee(3, "angie", "Software Engineer", 100000.99);
+  }
+
+  @Test
+  void getId_successful() {
+
+    Employee employee = new Employee(3, null, "", 0);
+    int actualId = employee.getId();
+    assertEquals(3, actualId);
+  }
+
+  @Test
+  void setName() {
+    testEmployee.setName("angie");
+    assertEquals("angie", testEmployee.getName());
+  }
+
+  @Test
+  void getName_successful() {
+    Employee testemployee = new Employee(0, "angie", "", 0);
+
+    String actualName = testemployee.getName();
+    assertEquals("angie", actualName);
+  }
+
+  @Test
+  void getDepartment_successful() {
+    Employee employee = new Employee(0, null, "test", 0);
+
+    String actualDepartment = employee.getDepartment();
+
+    assertEquals("test", actualDepartment);
+  }
+
+  @Test
+  void getSalary_successful() {
+    Employee employee = new Employee(0, null, "", 100000.99);
+
+    Double actualSalary = employee.getSalary();
+
+    assertEquals(100000.99, actualSalary);
+  }
+
+  @Test
+  public void testGetDetails() {
+    assertEquals("3 angie Software Engineer 100000.99.", testEmployee.getDetails());
+  }
+}