diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/EngineConfigurationTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/EngineConfigurationTest.java
index 4e580e07..7f691266 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/EngineConfigurationTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/EngineConfigurationTest.java
@@ -44,7 +44,7 @@ class EngineConfigurationTest {
     /**
      * The unit logger for this instance.
      */
-    private final UnitLogger logger = new UnitLogger(getClass());
+    private static final UnitLogger logger = new UnitLogger(EngineConfigurationTest.class);
     /**
      * The property group for the base engine.
      */
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/MiscellaneousTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/MiscellaneousTest.java
index 3f834044..99c1d632 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/MiscellaneousTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/MiscellaneousTest.java
@@ -78,7 +78,7 @@ public class MiscellaneousTest {
     void testPadNumbers(int number, int length, String expected) {
         logger.testCall("testPadNumbers", number, length, expected);
         String result = Miscellaneous.padNumbers(number, length);
-        assertEquals(result, expected, "Result \"" + result + "\" does not match expected output \"" + expected + "\"");
+        assertEquals(expected, result, "Result \"" + result + "\" does not match expected output \"" + expected + "\"");
     }
 
     /**
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/PlaceholderEngineTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/PlaceholderEngineTest.java
index af6848b6..b5c9c91d 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/PlaceholderEngineTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/PlaceholderEngineTest.java
@@ -44,7 +44,7 @@ class PlaceholderEngineTest {
     /**
      * The {@link UnitLogger} for this instance.
      */
-    private final UnitLogger logger = new UnitLogger(getClass());
+    private static final UnitLogger logger = new UnitLogger(PlaceholderEngineTest.class);
 
     @BeforeEach
     void createInstance() {
@@ -93,6 +93,6 @@ class PlaceholderEngineTest {
 
         text = PlaceholderEngine.getInstance().process(text, placeholders);
 
-        assertEquals(text, expected, "Result \"" + text + "\" does not match expected output \"" + expected + "\"");
+        assertEquals(expected, text, "Result \"" + text + "\" does not match expected output \"" + expected + "\"");
     }
 }
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/PropertyParserTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/PropertyParserTest.java
index 393e1af6..2f722db4 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/PropertyParserTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/PropertyParserTest.java
@@ -30,14 +30,14 @@ import java.util.Properties;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
- * Test the class {@link PropertyParser}.
+ * Tests the class {@link PropertyParser}.
  */
 @DisplayName("PropertyParser")
 class PropertyParserTest {
     /**
      * The {@link UnitLogger} for this instance.
      */
-    private final UnitLogger logger = new UnitLogger(getClass());
+    private static final UnitLogger logger = new UnitLogger(PropertyParserTest.class);
 
     /**
      * Tests the method {@code getString}.