diff --git a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/ReflectionUtilTest.java b/common/taskana-common/src/test/java/pro/taskana/common/internal/util/ReflectionUtilTest.java
index a19357b27..9798103b7 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/ReflectionUtilTest.java
+++ b/common/taskana-common/src/test/java/pro/taskana/common/internal/util/ReflectionUtilTest.java
@@ -6,7 +6,7 @@ import java.lang.reflect.Field;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 
-public class ReflectionUtilTest {
+class ReflectionUtilTest {
 
   @Test
   void should_RetrieveAllFieldsFromClassAndSuperClass() {
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java
index fc53521a9..cfb9dcda6 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java
@@ -360,7 +360,6 @@ public class ClassificationServiceImpl implements ClassificationService {
 
   private void addClassificationToMasterDomain(ClassificationImpl classification) {
     if (!Objects.equals(classification.getDomain(), "")) {
-      boolean doesExist = true;
       ClassificationImpl masterClassification = classification.copy(classification.getKey());
       masterClassification.setId(
           IdGenerator.generateWithPrefix(IdGenerator.ID_PREFIX_CLASSIFICATION));
@@ -375,28 +374,24 @@ public class ClassificationServiceImpl implements ClassificationService {
         this.getClassification(masterClassification.getKey(), masterClassification.getDomain());
         throw new ClassificationAlreadyExistException(masterClassification);
       } catch (ClassificationNotFoundException e) {
-        doesExist = false;
         if (LOGGER.isDebugEnabled()) {
           LOGGER.debug(
               "Method createClassification: Classification does not "
                   + "exist in master domain. Classification {}.",
               masterClassification);
         }
+        classificationMapper.insert(masterClassification);
+        if (LOGGER.isDebugEnabled()) {
+          LOGGER.debug(
+              "Method createClassification: Classification created in "
+                  + "master-domain, too. Classification {}.",
+              masterClassification);
+        }
       } catch (ClassificationAlreadyExistException ex) {
         LOGGER.warn(
             "Method createClassification: Classification does already exist "
                 + "in master domain. Classification {}.",
             LogSanitizer.stripLineBreakingChars(masterClassification));
-      } finally {
-        if (!doesExist) {
-          classificationMapper.insert(masterClassification);
-          if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(
-                "Method createClassification: Classification created in "
-                    + "master-domain, too. Classification {}.",
-                masterClassification);
-          }
-        }
       }
     }
   }
diff --git a/lib/taskana-core/src/test/java/acceptance/builder/ClassificationBuilderTest.java b/lib/taskana-core/src/test/java/acceptance/builder/ClassificationBuilderTest.java
index e9c9b06e3..cd2fd67e6 100644
--- a/lib/taskana-core/src/test/java/acceptance/builder/ClassificationBuilderTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/builder/ClassificationBuilderTest.java
@@ -196,13 +196,13 @@ class ClassificationBuilderTest {
 
   private <T> void applyBuilderFunctionAndVerifyValue(
       T value,
-      BiFunction<ClassificationBuilder, T, ClassificationBuilder> builderfunction,
+      BiFunction<ClassificationBuilder, T, ClassificationBuilder> builderFunction,
       Function<Classification, T> retriever)
       throws Exception {
     ClassificationBuilder builder =
-        newClassification().domain("DOMAIN_A").key("A" + builderfunction.hashCode());
+        newClassification().domain("DOMAIN_A").key("A" + builderFunction.hashCode());
 
-    builderfunction.apply(builder, value);
+    builderFunction.apply(builder, value);
     Classification classification = builder.buildAndStore(classificationService);
     T retrievedValue = retriever.apply(classification);
 
@@ -211,14 +211,14 @@ class ClassificationBuilderTest {
 
   private <T> void applyAndOverrideWithApiDefaultValue(
       T value,
-      BiFunction<ClassificationBuilder, T, ClassificationBuilder> builderfunction,
+      BiFunction<ClassificationBuilder, T, ClassificationBuilder> builderFunction,
       Function<Classification, T> retriever)
       throws Exception {
     ClassificationBuilder builder =
-        newClassification().domain("DOMAIN_A").key("B" + builderfunction.hashCode());
+        newClassification().domain("DOMAIN_A").key("B" + builderFunction.hashCode());
 
-    builderfunction.apply(builder, value);
-    builderfunction.apply(builder, null);
+    builderFunction.apply(builder, value);
+    builderFunction.apply(builder, null);
 
     Classification classification = builder.buildAndStore(classificationService);
     T retrievedValue = retriever.apply(classification);
diff --git a/lib/taskana-core/src/test/java/acceptance/builder/TaskBuilderTest.java b/lib/taskana-core/src/test/java/acceptance/builder/TaskBuilderTest.java
index 1505c5354..132247009 100644
--- a/lib/taskana-core/src/test/java/acceptance/builder/TaskBuilderTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/builder/TaskBuilderTest.java
@@ -294,7 +294,7 @@ class TaskBuilderTest {
   }
 
   private <T> void applyBuilderFunctionAndVerifyValue(
-      T value, BiFunction<TaskBuilder, T, TaskBuilder> builderfunction, Function<Task, T> retriever)
+      T value, BiFunction<TaskBuilder, T, TaskBuilder> builderFunction, Function<Task, T> retriever)
       throws Exception {
     TaskBuilder builder =
         newTask()
@@ -302,7 +302,7 @@ class TaskBuilderTest {
             .classificationSummary(classificationSummary)
             .primaryObjRef(defaultTestObjectReference().build());
 
-    builderfunction.apply(builder, value);
+    builderFunction.apply(builder, value);
     Task task = builder.buildAndStore(taskService);
     T retrievedValue = retriever.apply(task);
 
@@ -310,7 +310,7 @@ class TaskBuilderTest {
   }
 
   private <T> void applyAndOverrideWithApiDefaultValue(
-      T value, BiFunction<TaskBuilder, T, TaskBuilder> builderfunction, Function<Task, T> retriever)
+      T value, BiFunction<TaskBuilder, T, TaskBuilder> builderFunction, Function<Task, T> retriever)
       throws Exception {
     TaskBuilder builder =
         newTask()
@@ -318,8 +318,8 @@ class TaskBuilderTest {
             .classificationSummary(classificationSummary)
             .primaryObjRef(defaultTestObjectReference().build());
 
-    builderfunction.apply(builder, value);
-    builderfunction.apply(builder, null);
+    builderFunction.apply(builder, value);
+    builderFunction.apply(builder, null);
 
     Task task = builder.buildAndStore(taskService);
     T retrievedValue = retriever.apply(task);
diff --git a/lib/taskana-core/src/test/java/acceptance/builder/TaskCommentBuilderTest.java b/lib/taskana-core/src/test/java/acceptance/builder/TaskCommentBuilderTest.java
index 03577ca53..4ed09d41d 100644
--- a/lib/taskana-core/src/test/java/acceptance/builder/TaskCommentBuilderTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/builder/TaskCommentBuilderTest.java
@@ -169,11 +169,11 @@ class TaskCommentBuilderTest {
 
   private <T> void applyBuilderFunctionAndVerifyValue(
       T value,
-      BiFunction<TaskCommentBuilder, T, TaskCommentBuilder> builderfunction,
+      BiFunction<TaskCommentBuilder, T, TaskCommentBuilder> builderFunction,
       Function<TaskComment, T> retriever)
       throws Exception {
     TaskCommentBuilder builder = newTaskComment().taskId(task.getId());
-    builderfunction.apply(builder, value);
+    builderFunction.apply(builder, value);
     TaskComment classification = builder.buildAndStore(taskService);
     T retrievedValue = retriever.apply(classification);
 
@@ -182,13 +182,13 @@ class TaskCommentBuilderTest {
 
   private <T> void applyAndOverrideWithApiDefaultValue(
       T value,
-      BiFunction<TaskCommentBuilder, T, TaskCommentBuilder> builderfunction,
+      BiFunction<TaskCommentBuilder, T, TaskCommentBuilder> builderFunction,
       Function<TaskComment, T> retriever)
       throws Exception {
     TaskCommentBuilder builder = newTaskComment().taskId(task.getId());
 
-    builderfunction.apply(builder, value);
-    builderfunction.apply(builder, null);
+    builderFunction.apply(builder, value);
+    builderFunction.apply(builder, null);
 
     TaskComment classification = builder.buildAndStore(taskService);
     T retrievedValue = retriever.apply(classification);
diff --git a/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketBuilderTest.java b/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketBuilderTest.java
index 77bd9d71c..70f01ab64 100644
--- a/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketBuilderTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketBuilderTest.java
@@ -204,7 +204,7 @@ class WorkbasketBuilderTest {
 
   private <T> void applyBuilderFunctionAndVerifyValue(
       T value,
-      BiFunction<WorkbasketBuilder, T, WorkbasketBuilder> builderfunction,
+      BiFunction<WorkbasketBuilder, T, WorkbasketBuilder> builderFunction,
       Function<Workbasket, T> retriever)
       throws Exception {
     WorkbasketBuilder builder =
@@ -212,9 +212,9 @@ class WorkbasketBuilderTest {
             .domain("DOMAIN_A")
             .name("workbasketName")
             .type(WorkbasketType.PERSONAL)
-            .key("A" + builderfunction.hashCode());
+            .key("A" + builderFunction.hashCode());
 
-    builderfunction.apply(builder, value);
+    builderFunction.apply(builder, value);
     Workbasket classification = builder.buildAndStore(workbasketService);
     T retrievedValue = retriever.apply(classification);
 
@@ -223,7 +223,7 @@ class WorkbasketBuilderTest {
 
   private <T> void applyAndOverrideWithApiDefaultValue(
       T value,
-      BiFunction<WorkbasketBuilder, T, WorkbasketBuilder> builderfunction,
+      BiFunction<WorkbasketBuilder, T, WorkbasketBuilder> builderFunction,
       Function<Workbasket, T> retriever)
       throws Exception {
     WorkbasketBuilder builder =
@@ -231,10 +231,10 @@ class WorkbasketBuilderTest {
             .domain("DOMAIN_A")
             .name("workbasketName")
             .type(WorkbasketType.PERSONAL)
-            .key("B" + builderfunction.hashCode());
+            .key("B" + builderFunction.hashCode());
 
-    builderfunction.apply(builder, value);
-    builderfunction.apply(builder, null);
+    builderFunction.apply(builder, value);
+    builderFunction.apply(builder, null);
 
     Workbasket classification = builder.buildAndStore(workbasketService);
     T retrievedValue = retriever.apply(classification);