diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java
index 4d78b455d..b864b48a7 100644
--- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java
+++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java
@@ -105,7 +105,6 @@ class ClearingMemberCategoryServiceTest {
         memberCategoryNewRequest.setCompanyId(TEST_COMPANY.getId());
 
         ClearingMemberCategory predictableClearingMemberCategory = new ClearingMemberCategory();
-        predictableClearingMemberCategory.setId(ID);
         predictableClearingMemberCategory.setCompanyId(COMPANY_ID);
         predictableClearingMemberCategory.setClearingMemberCategory(clearingMemberCategory);
 
@@ -117,6 +116,7 @@ class ClearingMemberCategoryServiceTest {
         //ASSERT
         waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord);
         ClearingMemberCategory resultNew = memberCategoryImdg.getSingleObjectBySQL(String.format("clearingMemberCategory = %s", clearingMemberCategory));
+        predictableClearingMemberCategory.setId(resultNew.getId());
         MEMBER_CATEGORY_MATCHER.assertMatch(resultNew, predictableClearingMemberCategory);
     }
 
@@ -132,28 +132,27 @@ class ClearingMemberCategoryServiceTest {
         //ARRANGE
         String clearingMemberCategory = CLEARING_CATEGORY_DICT_CODE;
         ClearingMemberCategory existsClearingMemberCategory = new ClearingMemberCategory();
-        existsClearingMemberCategory.setId(ID);
         existsClearingMemberCategory.setClearingMemberCategory("0000");
         existsClearingMemberCategory.setCompanyId(COMPANY_ID);
-        memberCategoryImdg.insert(existsClearingMemberCategory);
+        Long id = memberCategoryImdg.insert(existsClearingMemberCategory);
 
         ClearingMemberCategoryUpdateRequest memberCategoryUpdateRequest = new ClearingMemberCategoryUpdateRequest();
-        memberCategoryUpdateRequest.setId(ID);
+        memberCategoryUpdateRequest.setId(id);
         memberCategoryUpdateRequest.setClearingMemberCategory(clearingMemberCategory);
 
         ClearingMemberCategory predictableClearingMemberCategory = new ClearingMemberCategory();
         predictableClearingMemberCategory.setCompanyId(COMPANY_ID);
-        predictableClearingMemberCategory.setId(ID);
+        predictableClearingMemberCategory.setId(id);
         predictableClearingMemberCategory.setClearingMemberCategory(clearingMemberCategory);
 
         //ACT
-        String jsonString = getJsonStringForUPDATE(memberCategoryUpdateRequest, ID);
+        String jsonString = getJsonStringForUPDATE(memberCategoryUpdateRequest, id);
         addRecordToKafka((MockConsumer) clearingMemberCategoryService.getConsumer(), TOPIC_MEMBER_CATEGORY_UPDATE, PARTITION, 0, jsonString);
 
         //ASSERT
-        waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord);
+        waitingWhenAddedRecordAndCheckIt(id, mockProducer, producerRecord);
 
-        ClearingMemberCategory resultUpdating = memberCategoryImdg.getSingleObjectBySQL(String.format("clearingMemberCategory = %s", clearingMemberCategory));
+        ClearingMemberCategory resultUpdating = memberCategoryImdg.getSingleObjectByID(id);
         MEMBER_CATEGORY_MATCHER.assertMatch(resultUpdating, predictableClearingMemberCategory);
     }
 
@@ -168,19 +167,18 @@ class ClearingMemberCategoryServiceTest {
         //ARRANGE
         String clearingMemberCategory = "0000";
         ClearingMemberCategory existsClearingMemberCategory = new ClearingMemberCategory();
-        existsClearingMemberCategory.setId(ID);
         existsClearingMemberCategory.setClearingMemberCategory(clearingMemberCategory);
-        memberCategoryImdg.insert(existsClearingMemberCategory);
+        Long id = memberCategoryImdg.insert(existsClearingMemberCategory);
 
         CommonDeleteRequest memberCategoryDeleteRequest = new CommonDeleteRequest();
-        memberCategoryDeleteRequest.setId(ID);
+        memberCategoryDeleteRequest.setId(id);
 
         //ACT
-        String jsonString = getJsonStringForDELETE(memberCategoryDeleteRequest, ID);
+        String jsonString = getJsonStringForDELETE(memberCategoryDeleteRequest, id);
         addRecordToKafka((MockConsumer) clearingMemberCategoryService.getConsumer(), TOPIC_MEMBER_CATEGORY_DELETE, PARTITION, 0, jsonString);
 
         //ASSERT
-        waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord);
+        waitingWhenAddedRecordAndCheckIt(id, mockProducer, producerRecord);
 
         ClearingMemberCategory resultDeleting = memberCategoryImdg.getSingleObjectBySQL(String.format("clearingMemberCategory = %s", clearingMemberCategory));
         Assertions.assertNull(resultDeleting);