diff --git a/src/main/java/edu/hw7/task3/CachingPersonDatabase.java b/src/main/java/edu/hw7/task3/SynchronizedCachingPersonDatabase.java
similarity index 90%
rename from src/main/java/edu/hw7/task3/CachingPersonDatabase.java
rename to src/main/java/edu/hw7/task3/SynchronizedCachingPersonDatabase.java
index 260d75d..f3ceb18 100644
--- a/src/main/java/edu/hw7/task3/CachingPersonDatabase.java
+++ b/src/main/java/edu/hw7/task3/SynchronizedCachingPersonDatabase.java
@@ -4,7 +4,7 @@
 import lombok.SneakyThrows;
 import org.jetbrains.annotations.Nullable;
 
-public class CachingPersonDatabase extends AbstractPersonDatabase {
+public class SynchronizedCachingPersonDatabase extends AbstractPersonDatabase {
 
     @SneakyThrows
     @Override
diff --git a/src/test/java/edu/hw7/task3/PersonDatabaseTest.java b/src/test/java/edu/hw7/task3/PersonDatabaseTest.java
index 6a0bb47..8560bc0 100644
--- a/src/test/java/edu/hw7/task3/PersonDatabaseTest.java
+++ b/src/test/java/edu/hw7/task3/PersonDatabaseTest.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import lombok.SneakyThrows;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
@@ -19,9 +20,9 @@ public void lockDatabase_shouldReturnCorrectPerson_whenPersonAdded() {
     }
 
     @Test
-    @DisplayName("Тестирование CachingPersonDatabase")
+    @DisplayName("Тестирование SynchronizedCachingPersonDatabase")
     public void synchronizedDatabase_shouldReturnCorrectPerson_whenPersonAdded() {
-        PersonDatabase personDatabase = new CachingPersonDatabase() {
+        PersonDatabase personDatabase = new SynchronizedCachingPersonDatabase() {
             @SneakyThrows
             @Override
             public synchronized void add(Person person) {
@@ -42,6 +43,7 @@ private static void testDatabase(PersonDatabase personDatabase) {
         Future<List<Person>> futureByName = executorService.submit(() -> personDatabase.findByName("Ivan"));
         Future<List<Person>> futureByAddress = executorService.submit(() -> personDatabase.findByAddress("Moscow"));
         executorService.shutdown();
+        executorService.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);
         assertAll(
             () -> Assertions.assertThat(futureByPhone.get()).contains(person),
             () -> Assertions.assertThat(futureByName.get()).contains(person),