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..c9f8c8be5
--- /dev/null
+++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java
@@ -0,0 +1,69 @@
+package com.codedifferently.lesson15;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class EmployeeManagerTest {
+
+  EmployeeManager manager;
+
+  @BeforeEach
+  void setUp() {
+    manager = new EmployeeManager();
+    Map<Integer, Employee> employee1 = new HashMap<>();
+    Employee employee = new Employee(1234, "Pierson", "Tech Support", 5.00);
+  }
+
+  @Test
+  public void testGetEmployee() {
+    // Given
+    Employee employee = new Employee(1234, "Pierson", "Tech Support", 5.00);
+    // When
+    manager.addEmployee(employee);
+
+    // Then
+    assertNotNull(employee.getId());
+  }
+
+  @Test
+  public void testUpdateEmployee() {
+    // Given
+    Employee employee = new Employee(1234, "Pierson", "Tech Support", 5.00);
+    // When
+    manager.addEmployee(employee);
+    manager.updateEmployee(employee);
+
+    // Then
+    assertEquals(1234, employee.getId());
+  }
+
+  @Test
+  public void testGetEmployeeCount() {
+    // Given
+    Employee employee1 = new Employee(1234, "Pierson", "Tech Support", 5.00);
+    Employee employee2 = new Employee(2345, "George", "President", 10);
+    // When
+    manager.addEmployee(employee1);
+    manager.addEmployee(employee2);
+
+    // Then
+    assertEquals(2, manager.getEmployeeCount());
+  }
+
+  @Test
+  public void testRemoveEmployee() {
+    // Given
+    Employee employee = new Employee(1234, "Pierson", "Tech Support", 5.00);
+    // When
+    manager.addEmployee(employee);
+    manager.removeEmployee(employee.getId());
+
+    // Then
+    assertEquals(1234, employee.getId());
+  }
+}
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..197411321
--- /dev/null
+++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.java
@@ -0,0 +1,80 @@
+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 {
+
+  Employee employee;
+
+  @BeforeEach
+  void setUp() {
+    employee = new Employee(1234, "Pierson", "Tech Support", 5.00);
+  }
+
+  @Test
+  public void testGetId() {
+    // Given
+    // int expectedId = 1234;
+    employee.setId(1234);
+
+    // when
+    // Employee employee = new Employee(1234,"Pierson","Tech Support",5.00);
+
+    // Then
+    int actualId = employee.getId();
+    int expectedId = 1234;
+
+    assertEquals(expectedId, actualId);
+  }
+
+  @Test
+  public void testGetName() {
+    // Given
+    // String expectedName = "Pierson";
+    employee.setName("Pierson");
+
+    // when
+    // Employee employee = new Employee(1234,"Pierson","Tech Support",5.00);
+
+    // Then
+    String actualName = employee.getName();
+    String expectedName = "Pierson";
+
+    assertEquals(expectedName, actualName);
+  }
+
+  @Test
+  public void testGetDepartment() {
+    // Given
+    // String expectedDept = "Tech Support";
+    employee.setDepartment("Tech Support");
+
+    // when
+    // Employee employee = new Employee(1234,"Pierson","Tech Support",5.00);
+
+    // Then
+    String actualDept = employee.getDepartment();
+    String expectedDept = "Tech Support";
+
+    assertEquals(expectedDept, actualDept);
+  }
+
+  @Test
+  public void testGetSalary() {
+    // Given
+    // double expectedSalary = 5.00;
+    employee.setSalary(5.00);
+
+    // when
+    // Employee employee = new Employee(1234,"Pierson","Tech Support",5.00);
+
+    // Then
+    double actualSalary = employee.getSalary();
+    double expectedSalary = 5.00;
+
+    assertEquals(expectedSalary, actualSalary);
+  }
+}