diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9a711c5..4662abe 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -23,10 +23,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Set up JDK 11
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'zulu'
         cache: maven
 
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index f3283b0..346d645 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/README.md b/README.md
index aae0e22..ffa23f2 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,11 @@ A library with common Java types that are mostly immutable value objects.
 [![Coverage Status](https://sonarcloud.io/api/project_badges/measure?project=org.fuin%3Aobjects4j&metric=coverage)](https://sonarcloud.io/dashboard?id=org.fuin%3Aobjects4j)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.fuin/objects4j/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.fuin/objects4j/)
 [![LGPLv3 License](http://img.shields.io/badge/license-LGPLv3-blue.svg)](https://www.gnu.org/licenses/lgpl.html)
-[![Java Development Kit 11](https://img.shields.io/badge/JDK-11-green.svg)](https://openjdk.java.net/projects/jdk/11/)
+[![Java Development Kit 17](https://img.shields.io/badge/JDK-17-green.svg)](https://openjdk.java.net/projects/jdk/17/)
 
 ## Versions
-- 0.8.x (or later) = **Java 11** with new **jakarta** namespace
+- 0.9.x (or later) = **Java 17**
+- 0.8.0 = **Java 11** with new **jakarta** namespace
 - 0.7.x = **Java 11** before namespace change from 'javax' to 'jakarta'
 - 0.6.9 (or previous) = **Java 8**
 
diff --git a/pom.xml b/pom.xml
index 19576fd..9607493 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>org.fuin</groupId>
         <artifactId>pom</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0</version>
     </parent>
 
     <artifactId>objects4j</artifactId>
     <packaging>bundle</packaging>
-    <version>0.8.1-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
 
     <description>A library with common Java types that are mostly immutable value objects.</description>
     <url>http://www.fuin.org/objects4j/</url>
@@ -35,86 +35,86 @@
         <dependency>
             <groupId>org.fuin</groupId>
             <artifactId>utils4j</artifactId>
-            <version>0.12.1-SNAPSHOT</version>
+            <version>0.13.0</version>
         </dependency>
 
 
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>3.0.0</version>
+			<version>4.0.1</version>
 		</dependency>
 
         <dependency>
             <groupId>jakarta.json</groupId>
             <artifactId>jakarta.json-api</artifactId>
-            <version>2.0.1</version>
+            <version>2.1.3</version>
         </dependency>
 
         <dependency>
             <groupId>jakarta.json.bind</groupId>
             <artifactId>jakarta.json.bind-api</artifactId>
-            <version>2.0.0</version>
+            <version>3.0.0</version>
         </dependency>
 
 		<dependency>
 			<groupId>jakarta.validation</groupId>
 			<artifactId>jakarta.validation-api</artifactId>
-			<version>3.0.0</version>
+			<version>3.0.2</version>
 		</dependency>
 
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>3.0.0</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>3.0.0</version>
+            <version>3.1.0</version>
         </dependency>
 
         <dependency>
             <groupId>jakarta.mail</groupId>
             <artifactId>jakarta.mail-api</artifactId>
-            <version>2.0.1</version>
+            <version>2.1.2</version>
         </dependency>
 
         <!-- Test -->
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.10.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.20.2</version>
+            <version>3.24.2</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.fuin</groupId>
             <artifactId>units4j</artifactId>
-            <version>0.10.1-SNAPSHOT</version>
+            <version>0.11.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>4.3</version>
+            <version>5.2.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>jakarta.el</groupId>
             <artifactId>jakarta.el-api</artifactId>
-            <version>4.0.0</version>
+            <version>5.0.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -128,56 +128,56 @@
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-core</artifactId>
-            <version>4.0.2.Final</version>
+            <version>5.1.2.Final</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jandex</artifactId>
-			<version>2.4.0.Final</version>
+			<version>3.1.6</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
+            <version>2.0.9</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.30</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.4.14</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.14</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-			<version>7.0.1.Final</version>
+			<version>8.0.1.Final</version>
             <scope>test</scope>
         </dependency>
 
 		<dependency>
-    		<groupId>org.eclipse.persistence</groupId>
-    		<artifactId>eclipselink</artifactId>
-    		<version>3.0.0</version>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>6.4.1.Final</version>
  			<scope>test</scope>
-		</dependency>
+        </dependency>
 
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.2</version>
             <scope>test</scope>
         </dependency>
 <!-- 
@@ -191,21 +191,21 @@
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
-            <version>3.7.1</version>
+            <version>3.15.5</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.1.1-jre</version>
+            <version>33.0.0-jre</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-core</artifactId>
-            <version>2.8.2</version>
+            <version>2.9.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -219,14 +219,14 @@
 		<dependency>
     		<groupId>org.glassfish.jaxb</groupId>
     		<artifactId>jaxb-runtime</artifactId>
-    		<version>3.0.2</version>
+    		<version>4.0.4</version>
 			<scope>test</scope>
 		</dependency>
 
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>yasson</artifactId>
-            <version>2.0.2</version>
+            <version>3.0.3</version>
             <scope>test</scope>
         </dependency>
 
@@ -278,6 +278,14 @@
                 <artifactId>maven-jdeps-plugin</artifactId>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>--add-opens java.base/java.util=ALL-UNNAMED</argLine>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
diff --git a/src/main/java/org/fuin/objects4j/common/ConstraintViolationException.java b/src/main/java/org/fuin/objects4j/common/ConstraintViolationException.java
index 0f282bf..19e9066 100644
--- a/src/main/java/org/fuin/objects4j/common/ConstraintViolationException.java
+++ b/src/main/java/org/fuin/objects4j/common/ConstraintViolationException.java
@@ -17,11 +17,11 @@
  */
 package org.fuin.objects4j.common;
 
+import jakarta.validation.ConstraintViolation;
+
 import java.util.Collections;
 import java.util.Set;
 
-import jakarta.validation.ConstraintViolation;
-
 /**
  * The contract that was checked is violated.
  */
diff --git a/src/main/java/org/fuin/objects4j/common/Contract.java b/src/main/java/org/fuin/objects4j/common/Contract.java
index 720d464..f6ee8f8 100644
--- a/src/main/java/org/fuin/objects4j/common/Contract.java
+++ b/src/main/java/org/fuin/objects4j/common/Contract.java
@@ -17,18 +17,14 @@
  */
 package org.fuin.objects4j.common;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Validation;
 import jakarta.validation.Validator;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.groups.Default;
 
+import java.util.*;
+
 /**
  * Utility class for assertions on objects.
  */
@@ -214,7 +210,7 @@ public static void requireValid(@NotNull final Validator validator, @NotNull fin
         // CHECKSTYLE:ON
 
         final Set<ConstraintViolation<Object>> constraintViolations = validator.validate(value);
-        if (constraintViolations.size() > 0) {
+        if (!constraintViolations.isEmpty()) {
             final StringBuilder sb = new StringBuilder();
             for (final ConstraintViolation<Object> constraintViolation : constraintViolations) {
                 if (sb.length() > 0) {
diff --git a/src/main/java/org/fuin/objects4j/common/FileExists.java b/src/main/java/org/fuin/objects4j/common/FileExists.java
index 7ab8fe9..8b0c945 100644
--- a/src/main/java/org/fuin/objects4j/common/FileExists.java
+++ b/src/main/java/org/fuin/objects4j/common/FileExists.java
@@ -17,19 +17,15 @@
  */
 package org.fuin.objects4j.common;
 
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * Checks if the file exists.
diff --git a/src/main/java/org/fuin/objects4j/common/FileExistsValidator.java b/src/main/java/org/fuin/objects4j/common/FileExistsValidator.java
index 92eb09c..64f85cf 100644
--- a/src/main/java/org/fuin/objects4j/common/FileExistsValidator.java
+++ b/src/main/java/org/fuin/objects4j/common/FileExistsValidator.java
@@ -17,12 +17,12 @@
  */
 package org.fuin.objects4j.common;
 
-import java.io.File;
-
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.constraints.NotNull;
 
+import java.io.File;
+
 /**
  * Checks if the file exists.
  */
diff --git a/src/main/java/org/fuin/objects4j/common/Immutable.java b/src/main/java/org/fuin/objects4j/common/Immutable.java
index da8b0fb..1789c7c 100644
--- a/src/main/java/org/fuin/objects4j/common/Immutable.java
+++ b/src/main/java/org/fuin/objects4j/common/Immutable.java
@@ -17,11 +17,7 @@
  */
 package org.fuin.objects4j.common;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * The class to which this annotation is applied is immutable. This means that its state cannot be seen to change by callers. Of necessity
diff --git a/src/main/java/org/fuin/objects4j/common/IsDirectory.java b/src/main/java/org/fuin/objects4j/common/IsDirectory.java
index 0ece5c1..d91a665 100644
--- a/src/main/java/org/fuin/objects4j/common/IsDirectory.java
+++ b/src/main/java/org/fuin/objects4j/common/IsDirectory.java
@@ -17,19 +17,15 @@
  */
 package org.fuin.objects4j.common;
 
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * Checks if it's a directory (and not a file).
diff --git a/src/main/java/org/fuin/objects4j/common/IsDirectoryValidator.java b/src/main/java/org/fuin/objects4j/common/IsDirectoryValidator.java
index 586aacd..6682082 100644
--- a/src/main/java/org/fuin/objects4j/common/IsDirectoryValidator.java
+++ b/src/main/java/org/fuin/objects4j/common/IsDirectoryValidator.java
@@ -17,12 +17,12 @@
  */
 package org.fuin.objects4j.common;
 
-import java.io.File;
-
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.constraints.NotNull;
 
+import java.io.File;
+
 /**
  * Checks if a given file is a directory (and not a file).
  */
diff --git a/src/main/java/org/fuin/objects4j/common/IsFile.java b/src/main/java/org/fuin/objects4j/common/IsFile.java
index 28ad1d9..ade1c34 100644
--- a/src/main/java/org/fuin/objects4j/common/IsFile.java
+++ b/src/main/java/org/fuin/objects4j/common/IsFile.java
@@ -17,19 +17,15 @@
  */
 package org.fuin.objects4j.common;
 
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * Checks if it's a file (and not a directory).
diff --git a/src/main/java/org/fuin/objects4j/common/IsFileValidator.java b/src/main/java/org/fuin/objects4j/common/IsFileValidator.java
index 22ed45a..93a7688 100644
--- a/src/main/java/org/fuin/objects4j/common/IsFileValidator.java
+++ b/src/main/java/org/fuin/objects4j/common/IsFileValidator.java
@@ -17,12 +17,12 @@
  */
 package org.fuin.objects4j.common;
 
-import java.io.File;
-
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.constraints.NotNull;
 
+import java.io.File;
+
 /**
  * Checks if a given file is a file (and not a directory).
  */
diff --git a/src/main/java/org/fuin/objects4j/common/NeverEmpty.java b/src/main/java/org/fuin/objects4j/common/NeverEmpty.java
index aa05075..6c14cd7 100644
--- a/src/main/java/org/fuin/objects4j/common/NeverEmpty.java
+++ b/src/main/java/org/fuin/objects4j/common/NeverEmpty.java
@@ -17,13 +17,13 @@
  */
 package org.fuin.objects4j.common;
 
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * Used to express that a method's return value is never <code>null</code> or empty.
  * 
diff --git a/src/main/java/org/fuin/objects4j/common/NeverNull.java b/src/main/java/org/fuin/objects4j/common/NeverNull.java
index 43d6e88..76edf65 100644
--- a/src/main/java/org/fuin/objects4j/common/NeverNull.java
+++ b/src/main/java/org/fuin/objects4j/common/NeverNull.java
@@ -17,13 +17,13 @@
  */
 package org.fuin.objects4j.common;
 
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * Used to express that a method's return value is never <code>null</code>.
  * 
diff --git a/src/main/java/org/fuin/objects4j/common/NotEmpty.java b/src/main/java/org/fuin/objects4j/common/NotEmpty.java
index 7b63b38..8e4f819 100644
--- a/src/main/java/org/fuin/objects4j/common/NotEmpty.java
+++ b/src/main/java/org/fuin/objects4j/common/NotEmpty.java
@@ -17,21 +17,17 @@
  */
 package org.fuin.objects4j.common;
 
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * Checks if the string, collection, map or array is not null or empty.
diff --git a/src/main/java/org/fuin/objects4j/common/NotThreadSafe.java b/src/main/java/org/fuin/objects4j/common/NotThreadSafe.java
index 16653bc..a787c58 100644
--- a/src/main/java/org/fuin/objects4j/common/NotThreadSafe.java
+++ b/src/main/java/org/fuin/objects4j/common/NotThreadSafe.java
@@ -17,11 +17,7 @@
  */
 package org.fuin.objects4j.common;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * The class to which this annotation is applied is not thread-safe. This annotation primarily exists for clarifying the non-thread-safety
diff --git a/src/main/java/org/fuin/objects4j/common/Nullable.java b/src/main/java/org/fuin/objects4j/common/Nullable.java
index 8d4bc58..7acdd8d 100644
--- a/src/main/java/org/fuin/objects4j/common/Nullable.java
+++ b/src/main/java/org/fuin/objects4j/common/Nullable.java
@@ -17,17 +17,13 @@
  */
 package org.fuin.objects4j.common;
 
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * Used to express that a value may be <code>null</code>.
  * 
diff --git a/src/main/java/org/fuin/objects4j/common/ThreadSafe.java b/src/main/java/org/fuin/objects4j/common/ThreadSafe.java
index 6aabcbe..7be36c1 100644
--- a/src/main/java/org/fuin/objects4j/common/ThreadSafe.java
+++ b/src/main/java/org/fuin/objects4j/common/ThreadSafe.java
@@ -17,11 +17,7 @@
  */
 package org.fuin.objects4j.common;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * The class to which this annotation is applied is thread-safe. This means that no sequences of accesses (reads and writes to public
diff --git a/src/main/java/org/fuin/objects4j/ui/AnnotationAnalyzer.java b/src/main/java/org/fuin/objects4j/ui/AnnotationAnalyzer.java
index 4006f26..d3122dc 100644
--- a/src/main/java/org/fuin/objects4j/ui/AnnotationAnalyzer.java
+++ b/src/main/java/org/fuin/objects4j/ui/AnnotationAnalyzer.java
@@ -17,24 +17,17 @@
  */
 package org.fuin.objects4j.ui;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Nullable;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+
 /**
  * Wrapper for a class that has some annotations to perform some actions with.
  */
diff --git a/src/main/java/org/fuin/objects4j/ui/ClassTextInfo.java b/src/main/java/org/fuin/objects4j/ui/ClassTextInfo.java
index deffa9b..84b974d 100644
--- a/src/main/java/org/fuin/objects4j/ui/ClassTextInfo.java
+++ b/src/main/java/org/fuin/objects4j/ui/ClassTextInfo.java
@@ -18,7 +18,6 @@
 package org.fuin.objects4j.ui;
 
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 
diff --git a/src/main/java/org/fuin/objects4j/ui/FieldTextInfo.java b/src/main/java/org/fuin/objects4j/ui/FieldTextInfo.java
index 4ab06dc..4bb606a 100644
--- a/src/main/java/org/fuin/objects4j/ui/FieldTextInfo.java
+++ b/src/main/java/org/fuin/objects4j/ui/FieldTextInfo.java
@@ -17,12 +17,11 @@
  */
 package org.fuin.objects4j.ui;
 
-import java.lang.reflect.Field;
-
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 
+import java.lang.reflect.Field;
+
 /**
  * Stores some text associated with a field.
  */
diff --git a/src/main/java/org/fuin/objects4j/ui/FontSize.java b/src/main/java/org/fuin/objects4j/ui/FontSize.java
index dbb664e..088a3e4 100644
--- a/src/main/java/org/fuin/objects4j/ui/FontSize.java
+++ b/src/main/java/org/fuin/objects4j/ui/FontSize.java
@@ -17,14 +17,13 @@
  */
 package org.fuin.objects4j.ui;
 
-import java.io.Serializable;
-import java.text.DecimalFormat;
-
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 
+import java.io.Serializable;
+import java.text.DecimalFormat;
+
 /**
  * Size of a font including the unit.
  */
diff --git a/src/main/java/org/fuin/objects4j/ui/TableColumnInfo.java b/src/main/java/org/fuin/objects4j/ui/TableColumnInfo.java
index 014870b..81af3aa 100644
--- a/src/main/java/org/fuin/objects4j/ui/TableColumnInfo.java
+++ b/src/main/java/org/fuin/objects4j/ui/TableColumnInfo.java
@@ -17,18 +17,17 @@
  */
 package org.fuin.objects4j.ui;
 
+import jakarta.validation.constraints.NotNull;
+import org.fuin.objects4j.common.Contract;
+import org.fuin.objects4j.common.Immutable;
+import org.fuin.objects4j.common.Nullable;
+
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
-import jakarta.validation.constraints.NotNull;
-
-import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
-import org.fuin.objects4j.common.Nullable;
-
 /**
  * Table column information for a field of a class.
  */
diff --git a/src/main/java/org/fuin/objects4j/ui/TextFieldInfo.java b/src/main/java/org/fuin/objects4j/ui/TextFieldInfo.java
index 612db20..85cf341 100644
--- a/src/main/java/org/fuin/objects4j/ui/TextFieldInfo.java
+++ b/src/main/java/org/fuin/objects4j/ui/TextFieldInfo.java
@@ -17,14 +17,13 @@
  */
 package org.fuin.objects4j.ui;
 
-import java.lang.reflect.Field;
-import java.util.Locale;
-
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 
+import java.lang.reflect.Field;
+import java.util.Locale;
+
 /**
  * Information about a text field.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/CurrencyAmount.java b/src/main/java/org/fuin/objects4j/vo/CurrencyAmount.java
index 0ceecbe..716abff 100644
--- a/src/main/java/org/fuin/objects4j/vo/CurrencyAmount.java
+++ b/src/main/java/org/fuin/objects4j/vo/CurrencyAmount.java
@@ -17,21 +17,20 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Currency;
-
 import jakarta.persistence.Convert;
 import jakarta.persistence.Embeddable;
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 import org.fuin.objects4j.ui.Label;
 import org.fuin.objects4j.ui.ShortLabel;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Currency;
+
 /**
  * Amount of a currency.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/CurrencyAmountConverter.java b/src/main/java/org/fuin/objects4j/vo/CurrencyAmountConverter.java
index d692b08..a527787 100644
--- a/src/main/java/org/fuin/objects4j/vo/CurrencyAmountConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/CurrencyAmountConverter.java
@@ -17,13 +17,12 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.Currency;
-
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
+import java.util.Currency;
+
 /**
  * Converts a {@link CurrencyAmount}.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/CurrencyAmountStr.java b/src/main/java/org/fuin/objects4j/vo/CurrencyAmountStr.java
index 8be32bb..0ceda03 100644
--- a/src/main/java/org/fuin/objects4j/vo/CurrencyAmountStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/CurrencyAmountStr.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 // CHECKSTYLE:OFF
 /**
  * The string is a canonical string representation of a currency amount. <br>
diff --git a/src/main/java/org/fuin/objects4j/vo/CurrencyAmountStrValidator.java b/src/main/java/org/fuin/objects4j/vo/CurrencyAmountStrValidator.java
index 07c97a5..ec2568f 100644
--- a/src/main/java/org/fuin/objects4j/vo/CurrencyAmountStrValidator.java
+++ b/src/main/java/org/fuin/objects4j/vo/CurrencyAmountStrValidator.java
@@ -17,14 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.Currency;
-
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 
+import java.util.Currency;
+
 /**
  * Check that a given string is a well-formed currency amount.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/CurrencyConverter.java b/src/main/java/org/fuin/objects4j/vo/CurrencyConverter.java
index 14fbd90..9307ed4 100644
--- a/src/main/java/org/fuin/objects4j/vo/CurrencyConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/CurrencyConverter.java
@@ -17,15 +17,14 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.Currency;
-
 import jakarta.json.bind.adapter.JsonbAdapter;
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
+import java.util.Currency;
+
 /**
  * Converts a {@link Currency}.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/CurrencyStr.java b/src/main/java/org/fuin/objects4j/vo/CurrencyStr.java
index 124478e..38697df 100644
--- a/src/main/java/org/fuin/objects4j/vo/CurrencyStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/CurrencyStr.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 // CHECKSTYLE:OFF
 /**
  * The string is a canonical string representation of a currency. <br>
diff --git a/src/main/java/org/fuin/objects4j/vo/CurrencyStrValidator.java b/src/main/java/org/fuin/objects4j/vo/CurrencyStrValidator.java
index 410c382..6c6dcc6 100644
--- a/src/main/java/org/fuin/objects4j/vo/CurrencyStrValidator.java
+++ b/src/main/java/org/fuin/objects4j/vo/CurrencyStrValidator.java
@@ -17,15 +17,14 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.Currency;
-import java.util.Set;
-
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 
+import java.util.Currency;
+import java.util.Set;
+
 /**
  * Check that a given string is a well-formed currency.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/DateStr.java b/src/main/java/org/fuin/objects4j/vo/DateStr.java
index f87d647..cd52cfe 100644
--- a/src/main/java/org/fuin/objects4j/vo/DateStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/DateStr.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 // CHECKSTYLE:OFF
 /**
  * The string is a well-formed date/time based on a pattern.
diff --git a/src/main/java/org/fuin/objects4j/vo/DateStrValidator.java b/src/main/java/org/fuin/objects4j/vo/DateStrValidator.java
index 4afe2c6..51d799d 100644
--- a/src/main/java/org/fuin/objects4j/vo/DateStrValidator.java
+++ b/src/main/java/org/fuin/objects4j/vo/DateStrValidator.java
@@ -17,12 +17,12 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
 /**
  * Check that a given string is a well-formed date/time based on a pattern.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/DayOfTheWeek.java b/src/main/java/org/fuin/objects4j/vo/DayOfTheWeek.java
index c053d5a..04727e7 100644
--- a/src/main/java/org/fuin/objects4j/vo/DayOfTheWeek.java
+++ b/src/main/java/org/fuin/objects4j/vo/DayOfTheWeek.java
@@ -17,16 +17,9 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.io.Serializable;
-import java.time.DayOfWeek;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
@@ -36,6 +29,12 @@
 import org.fuin.objects4j.ui.ShortLabel;
 import org.fuin.objects4j.ui.Tooltip;
 
+import java.io.Serializable;
+import java.time.DayOfWeek;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Represents an abbreviated English day of the week name plus public holiday.<br>
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/DayOfTheWeekConverter.java b/src/main/java/org/fuin/objects4j/vo/DayOfTheWeekConverter.java
index 2e650ba..80d9e25 100644
--- a/src/main/java/org/fuin/objects4j/vo/DayOfTheWeekConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/DayOfTheWeekConverter.java
@@ -18,7 +18,6 @@
 package org.fuin.objects4j.vo;
 
 import jakarta.persistence.Converter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/DayOfTheWeekStr.java b/src/main/java/org/fuin/objects4j/vo/DayOfTheWeekStr.java
index ee64174..3398293 100644
--- a/src/main/java/org/fuin/objects4j/vo/DayOfTheWeekStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/DayOfTheWeekStr.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * Verifies the string is a valid abbreviated English day of the week 'Mon'-'Sun'(Monday to Sunday) plus 'PH' (Public Holiday).
diff --git a/src/main/java/org/fuin/objects4j/vo/DayOpeningHours.java b/src/main/java/org/fuin/objects4j/vo/DayOpeningHours.java
index 24d8544..09970df 100644
--- a/src/main/java/org/fuin/objects4j/vo/DayOpeningHours.java
+++ b/src/main/java/org/fuin/objects4j/vo/DayOpeningHours.java
@@ -17,14 +17,9 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
@@ -32,6 +27,10 @@
 import org.fuin.objects4j.ui.Prompt;
 import org.fuin.objects4j.vo.HourRanges.ChangeType;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Represents the opening hours of one day of the week.<br>
  * Equals, HashCode and Comparable are based on the day of the week. <br>
diff --git a/src/main/java/org/fuin/objects4j/vo/DayOpeningHoursConverter.java b/src/main/java/org/fuin/objects4j/vo/DayOpeningHoursConverter.java
index 894a9d8..9075049 100644
--- a/src/main/java/org/fuin/objects4j/vo/DayOpeningHoursConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/DayOpeningHoursConverter.java
@@ -18,7 +18,6 @@
 package org.fuin.objects4j.vo;
 
 import jakarta.persistence.Converter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/DayOpeningHoursStr.java b/src/main/java/org/fuin/objects4j/vo/DayOpeningHoursStr.java
index 9bf442f..6c1bb41 100644
--- a/src/main/java/org/fuin/objects4j/vo/DayOpeningHoursStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/DayOpeningHoursStr.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * Represents the opening hours of one day of the week.<br>
diff --git a/src/main/java/org/fuin/objects4j/vo/EmailAddress.java b/src/main/java/org/fuin/objects4j/vo/EmailAddress.java
index 3814986..8382148 100644
--- a/src/main/java/org/fuin/objects4j/vo/EmailAddress.java
+++ b/src/main/java/org/fuin/objects4j/vo/EmailAddress.java
@@ -21,7 +21,6 @@
 import jakarta.mail.internet.InternetAddress;
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
diff --git a/src/main/java/org/fuin/objects4j/vo/EmailAddressConverter.java b/src/main/java/org/fuin/objects4j/vo/EmailAddressConverter.java
index 16531f1..e302550 100644
--- a/src/main/java/org/fuin/objects4j/vo/EmailAddressConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/EmailAddressConverter.java
@@ -19,7 +19,6 @@
 
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/EmailAddressStr.java b/src/main/java/org/fuin/objects4j/vo/EmailAddressStr.java
index 9952645..495c37e 100644
--- a/src/main/java/org/fuin/objects4j/vo/EmailAddressStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/EmailAddressStr.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 // CHECKSTYLE:OFF
 /**
  * The string has to be a well-formed email address.
diff --git a/src/main/java/org/fuin/objects4j/vo/EmailAddressStrValidator.java b/src/main/java/org/fuin/objects4j/vo/EmailAddressStrValidator.java
index ab353d1..6c93099 100644
--- a/src/main/java/org/fuin/objects4j/vo/EmailAddressStrValidator.java
+++ b/src/main/java/org/fuin/objects4j/vo/EmailAddressStrValidator.java
@@ -22,7 +22,6 @@
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/Hour.java b/src/main/java/org/fuin/objects4j/vo/Hour.java
index ab23cc9..7670632 100644
--- a/src/main/java/org/fuin/objects4j/vo/Hour.java
+++ b/src/main/java/org/fuin/objects4j/vo/Hour.java
@@ -17,12 +17,9 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.regex.Pattern;
-
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
@@ -32,6 +29,8 @@
 import org.fuin.objects4j.ui.ShortLabel;
 import org.fuin.objects4j.ui.Tooltip;
 
+import java.util.regex.Pattern;
+
 /**
  * Represents an hour of a day (24 hours, sometimes called Military Time).<br>
  * <br>
diff --git a/src/main/java/org/fuin/objects4j/vo/HourConverter.java b/src/main/java/org/fuin/objects4j/vo/HourConverter.java
index c66dda2..5256762 100644
--- a/src/main/java/org/fuin/objects4j/vo/HourConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/HourConverter.java
@@ -18,7 +18,6 @@
 package org.fuin.objects4j.vo;
 
 import jakarta.persistence.Converter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/HourRange.java b/src/main/java/org/fuin/objects4j/vo/HourRange.java
index 7decfe5..a75fd6c 100644
--- a/src/main/java/org/fuin/objects4j/vo/HourRange.java
+++ b/src/main/java/org/fuin/objects4j/vo/HourRange.java
@@ -17,14 +17,9 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.List;
-
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
@@ -34,6 +29,10 @@
 import org.fuin.objects4j.ui.ShortLabel;
 import org.fuin.objects4j.ui.Tooltip;
 
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.List;
+
 /**
  * Represents a range of hours of a day (24 hourRanges representation).<br>
  * <br>
diff --git a/src/main/java/org/fuin/objects4j/vo/HourRangeConverter.java b/src/main/java/org/fuin/objects4j/vo/HourRangeConverter.java
index 513d73a..efa64ca 100644
--- a/src/main/java/org/fuin/objects4j/vo/HourRangeConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/HourRangeConverter.java
@@ -18,7 +18,6 @@
 package org.fuin.objects4j.vo;
 
 import jakarta.persistence.Converter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/HourRangeStr.java b/src/main/java/org/fuin/objects4j/vo/HourRangeStr.java
index 050a257..05e8678 100644
--- a/src/main/java/org/fuin/objects4j/vo/HourRangeStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/HourRangeStr.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * Verifies the string is a range of hours of a day (24 hourRanges representation).<br>
diff --git a/src/main/java/org/fuin/objects4j/vo/HourRanges.java b/src/main/java/org/fuin/objects4j/vo/HourRanges.java
index 17522ca..d565387 100644
--- a/src/main/java/org/fuin/objects4j/vo/HourRanges.java
+++ b/src/main/java/org/fuin/objects4j/vo/HourRanges.java
@@ -17,23 +17,17 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 import org.fuin.objects4j.common.Nullable;
 import org.fuin.objects4j.ui.Prompt;
 
+import java.util.*;
+
 /**
  * Represents multiple ranges of hours of a day (24 hour representation) separated by a '+'.<br>
  * Example: '09:00-12:00+13:00-17:00' From 9 am to 12 noon and from 1 pm to 5 pm
diff --git a/src/main/java/org/fuin/objects4j/vo/HourRangesConverter.java b/src/main/java/org/fuin/objects4j/vo/HourRangesConverter.java
index 1ba9fed..54b62ff 100644
--- a/src/main/java/org/fuin/objects4j/vo/HourRangesConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/HourRangesConverter.java
@@ -18,7 +18,6 @@
 package org.fuin.objects4j.vo;
 
 import jakarta.persistence.Converter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/HourRangesStr.java b/src/main/java/org/fuin/objects4j/vo/HourRangesStr.java
index 14872a5..c61d5be 100644
--- a/src/main/java/org/fuin/objects4j/vo/HourRangesStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/HourRangesStr.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * Verifies if this field contains multiple ranges of hours of a day (24 hour representation) separated by a '+'.<br>
diff --git a/src/main/java/org/fuin/objects4j/vo/HourStr.java b/src/main/java/org/fuin/objects4j/vo/HourStr.java
index d0638d5..64ba506 100644
--- a/src/main/java/org/fuin/objects4j/vo/HourStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/HourStr.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * Verifies the string is an hour of a day (24 hours, sometimes called Military Time). Valid examples are:
diff --git a/src/main/java/org/fuin/objects4j/vo/KeyValue.java b/src/main/java/org/fuin/objects4j/vo/KeyValue.java
index 004a884..7d89f49 100644
--- a/src/main/java/org/fuin/objects4j/vo/KeyValue.java
+++ b/src/main/java/org/fuin/objects4j/vo/KeyValue.java
@@ -17,15 +17,14 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Container for a key and a value.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/LocaleConverter.java b/src/main/java/org/fuin/objects4j/vo/LocaleConverter.java
index abfdedd..e3a4c00 100644
--- a/src/main/java/org/fuin/objects4j/vo/LocaleConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/LocaleConverter.java
@@ -17,15 +17,14 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.Locale;
-import java.util.StringTokenizer;
-
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
+import java.util.Locale;
+import java.util.StringTokenizer;
+
 /**
  * Converts a {@link Locale} into a String and back.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/LocaleStr.java b/src/main/java/org/fuin/objects4j/vo/LocaleStr.java
index 469a87c..ea964cf 100644
--- a/src/main/java/org/fuin/objects4j/vo/LocaleStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/LocaleStr.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * The string has to be a valid {@link java.util.Locale}.
diff --git a/src/main/java/org/fuin/objects4j/vo/LocaleStrValidator.java b/src/main/java/org/fuin/objects4j/vo/LocaleStrValidator.java
index 4d2febd..902c00e 100644
--- a/src/main/java/org/fuin/objects4j/vo/LocaleStrValidator.java
+++ b/src/main/java/org/fuin/objects4j/vo/LocaleStrValidator.java
@@ -17,15 +17,14 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.Locale;
-import java.util.StringTokenizer;
-
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 
+import java.util.Locale;
+import java.util.StringTokenizer;
+
 /**
  * Check that a given string is a valid {@link java.util.Locale}.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/MultiDayOfTheWeek.java b/src/main/java/org/fuin/objects4j/vo/MultiDayOfTheWeek.java
index 55ad719..a0d6f12 100644
--- a/src/main/java/org/fuin/objects4j/vo/MultiDayOfTheWeek.java
+++ b/src/main/java/org/fuin/objects4j/vo/MultiDayOfTheWeek.java
@@ -17,22 +17,17 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 import org.fuin.objects4j.common.Nullable;
 import org.fuin.objects4j.ui.Prompt;
 
+import java.util.*;
+
 /**
  * Represents multiple days of the week 'Mon'-'Sun'(from Monday to Sunday) plus 'PH' (Public Holiday).<br>
  * Character '/' between the day names means 'and' while '-' means 'from-to' (including start/end). <br>
diff --git a/src/main/java/org/fuin/objects4j/vo/MultiDayOfTheWeekConverter.java b/src/main/java/org/fuin/objects4j/vo/MultiDayOfTheWeekConverter.java
index 085aa35..dc9813e 100644
--- a/src/main/java/org/fuin/objects4j/vo/MultiDayOfTheWeekConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/MultiDayOfTheWeekConverter.java
@@ -18,7 +18,6 @@
 package org.fuin.objects4j.vo;
 
 import jakarta.persistence.Converter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/MultiDayOfTheWeekStr.java b/src/main/java/org/fuin/objects4j/vo/MultiDayOfTheWeekStr.java
index df0a7b7..dc68a7c 100644
--- a/src/main/java/org/fuin/objects4j/vo/MultiDayOfTheWeekStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/MultiDayOfTheWeekStr.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * Verifies if this field contains multiple ranges of hours of a day (24 hour representation) separated by a '+'.<br>
diff --git a/src/main/java/org/fuin/objects4j/vo/Password.java b/src/main/java/org/fuin/objects4j/vo/Password.java
index 9f04872..ddc4694 100644
--- a/src/main/java/org/fuin/objects4j/vo/Password.java
+++ b/src/main/java/org/fuin/objects4j/vo/Password.java
@@ -19,7 +19,6 @@
 
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 import org.fuin.objects4j.ui.Label;
diff --git a/src/main/java/org/fuin/objects4j/vo/PasswordConverter.java b/src/main/java/org/fuin/objects4j/vo/PasswordConverter.java
index af7e270..de416fc 100644
--- a/src/main/java/org/fuin/objects4j/vo/PasswordConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/PasswordConverter.java
@@ -19,7 +19,6 @@
 
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/PasswordSha512.java b/src/main/java/org/fuin/objects4j/vo/PasswordSha512.java
index 56d32e0..36df1b3 100644
--- a/src/main/java/org/fuin/objects4j/vo/PasswordSha512.java
+++ b/src/main/java/org/fuin/objects4j/vo/PasswordSha512.java
@@ -17,16 +17,15 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
 /**
  * SHA-512 hashed password that is HEX encoded.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/PasswordSha512Converter.java b/src/main/java/org/fuin/objects4j/vo/PasswordSha512Converter.java
index 0340796..da47639 100644
--- a/src/main/java/org/fuin/objects4j/vo/PasswordSha512Converter.java
+++ b/src/main/java/org/fuin/objects4j/vo/PasswordSha512Converter.java
@@ -19,7 +19,6 @@
 
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/PasswordSha512Str.java b/src/main/java/org/fuin/objects4j/vo/PasswordSha512Str.java
index f889792..51f734a 100644
--- a/src/main/java/org/fuin/objects4j/vo/PasswordSha512Str.java
+++ b/src/main/java/org/fuin/objects4j/vo/PasswordSha512Str.java
@@ -17,17 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 import jakarta.validation.ReportAsSingleViolation;
 import jakarta.validation.constraints.Size;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * The string has to be a HEX encoded SHA512 hash with a length of 128 characters.
diff --git a/src/main/java/org/fuin/objects4j/vo/PasswordSha512StrValidator.java b/src/main/java/org/fuin/objects4j/vo/PasswordSha512StrValidator.java
index 4f39204..0c6cf0e 100644
--- a/src/main/java/org/fuin/objects4j/vo/PasswordSha512StrValidator.java
+++ b/src/main/java/org/fuin/objects4j/vo/PasswordSha512StrValidator.java
@@ -17,14 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.regex.Pattern;
-
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 
+import java.util.regex.Pattern;
+
 /**
  * Check that a given string is an allowed HEX encoded SHA512 password.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/PasswordStr.java b/src/main/java/org/fuin/objects4j/vo/PasswordStr.java
index daedbf4..861a679 100644
--- a/src/main/java/org/fuin/objects4j/vo/PasswordStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/PasswordStr.java
@@ -17,17 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 import jakarta.validation.ReportAsSingleViolation;
 import jakarta.validation.constraints.Size;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * The string has to be a password with a length between 8 and 20 characters.
diff --git a/src/main/java/org/fuin/objects4j/vo/PasswordStrValidator.java b/src/main/java/org/fuin/objects4j/vo/PasswordStrValidator.java
index 2281a92..5736aa9 100644
--- a/src/main/java/org/fuin/objects4j/vo/PasswordStrValidator.java
+++ b/src/main/java/org/fuin/objects4j/vo/PasswordStrValidator.java
@@ -20,7 +20,6 @@
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/PropertiesContain.java b/src/main/java/org/fuin/objects4j/vo/PropertiesContain.java
index ffb9087..f1aa085 100644
--- a/src/main/java/org/fuin/objects4j/vo/PropertiesContain.java
+++ b/src/main/java/org/fuin/objects4j/vo/PropertiesContain.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * The properties object contains a number of expected keys.
diff --git a/src/main/java/org/fuin/objects4j/vo/PropertiesContainValidator.java b/src/main/java/org/fuin/objects4j/vo/PropertiesContainValidator.java
index 48aa694..28f803e 100644
--- a/src/main/java/org/fuin/objects4j/vo/PropertiesContainValidator.java
+++ b/src/main/java/org/fuin/objects4j/vo/PropertiesContainValidator.java
@@ -17,14 +17,14 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
-import jakarta.validation.ConstraintValidator;
-import jakarta.validation.ConstraintValidatorContext;
-
 /**
  * Check that a properties object contains a given number of expected keys.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/SecurityToken.java b/src/main/java/org/fuin/objects4j/vo/SecurityToken.java
index 27df745..ace833d 100644
--- a/src/main/java/org/fuin/objects4j/vo/SecurityToken.java
+++ b/src/main/java/org/fuin/objects4j/vo/SecurityToken.java
@@ -17,14 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.validation.constraints.NotNull;
+import org.fuin.objects4j.common.Immutable;
+
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 
-import jakarta.validation.constraints.NotNull;
-
-import org.fuin.objects4j.common.Immutable;
-
 /**
  * Creates a BASE64 encoded string based on a SHA1PRNG {@link SecureRandom}.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/TrimmedNotEmpty.java b/src/main/java/org/fuin/objects4j/vo/TrimmedNotEmpty.java
index f2ae152..aa7ee96 100644
--- a/src/main/java/org/fuin/objects4j/vo/TrimmedNotEmpty.java
+++ b/src/main/java/org/fuin/objects4j/vo/TrimmedNotEmpty.java
@@ -17,19 +17,15 @@
  */
 package org.fuin.objects4j.vo;
 
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * The string is not <code>null</code> and the trimmed size is at least one.
diff --git a/src/main/java/org/fuin/objects4j/vo/TrimmedNotEmptyValidator.java b/src/main/java/org/fuin/objects4j/vo/TrimmedNotEmptyValidator.java
index 93ec8cf..c3d8f69 100644
--- a/src/main/java/org/fuin/objects4j/vo/TrimmedNotEmptyValidator.java
+++ b/src/main/java/org/fuin/objects4j/vo/TrimmedNotEmptyValidator.java
@@ -20,7 +20,6 @@
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 
diff --git a/src/main/java/org/fuin/objects4j/vo/UUIDConverter.java b/src/main/java/org/fuin/objects4j/vo/UUIDConverter.java
index 591328c..f72ee3b 100644
--- a/src/main/java/org/fuin/objects4j/vo/UUIDConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/UUIDConverter.java
@@ -17,14 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.UUID;
-
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
+import java.util.UUID;
+
 /**
  * Converts a {@link UUID} into a String and back.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/UUIDStr.java b/src/main/java/org/fuin/objects4j/vo/UUIDStr.java
index cedfa5f..d03a641 100644
--- a/src/main/java/org/fuin/objects4j/vo/UUIDStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/UUIDStr.java
@@ -17,17 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 import jakarta.validation.ReportAsSingleViolation;
 import jakarta.validation.constraints.Size;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * The string has to be a valid {@link java.util.UUID}.
diff --git a/src/main/java/org/fuin/objects4j/vo/UUIDStrValidator.java b/src/main/java/org/fuin/objects4j/vo/UUIDStrValidator.java
index ffc95be..4e6da4a 100644
--- a/src/main/java/org/fuin/objects4j/vo/UUIDStrValidator.java
+++ b/src/main/java/org/fuin/objects4j/vo/UUIDStrValidator.java
@@ -17,14 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.UUID;
-
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 
+import java.util.UUID;
+
 /**
  * Check that a given string is a valid {@link java.util.UUID}.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/UserName.java b/src/main/java/org/fuin/objects4j/vo/UserName.java
index 5855ac8..6ef3fda 100644
--- a/src/main/java/org/fuin/objects4j/vo/UserName.java
+++ b/src/main/java/org/fuin/objects4j/vo/UserName.java
@@ -19,7 +19,6 @@
 
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 import org.fuin.objects4j.ui.Label;
diff --git a/src/main/java/org/fuin/objects4j/vo/UserNameConverter.java b/src/main/java/org/fuin/objects4j/vo/UserNameConverter.java
index 3b93f4a..0506df8 100644
--- a/src/main/java/org/fuin/objects4j/vo/UserNameConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/UserNameConverter.java
@@ -19,7 +19,6 @@
 
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/UserNameStr.java b/src/main/java/org/fuin/objects4j/vo/UserNameStr.java
index ea1a3f0..8aed2a5 100644
--- a/src/main/java/org/fuin/objects4j/vo/UserNameStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/UserNameStr.java
@@ -17,17 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 import jakarta.validation.ReportAsSingleViolation;
 import jakarta.validation.constraints.Size;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * The string has to be a valid user ID:
diff --git a/src/main/java/org/fuin/objects4j/vo/UserNameStrValidator.java b/src/main/java/org/fuin/objects4j/vo/UserNameStrValidator.java
index 11de774..c10b62d 100644
--- a/src/main/java/org/fuin/objects4j/vo/UserNameStrValidator.java
+++ b/src/main/java/org/fuin/objects4j/vo/UserNameStrValidator.java
@@ -17,14 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.regex.Pattern;
-
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 
+import java.util.regex.Pattern;
+
 /**
  * Check that a given string is a well-formed user id.
  */
diff --git a/src/main/java/org/fuin/objects4j/vo/ValueObjectStringConverter.java b/src/main/java/org/fuin/objects4j/vo/ValueObjectStringConverter.java
index 0767236..5b72007 100644
--- a/src/main/java/org/fuin/objects4j/vo/ValueObjectStringConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/ValueObjectStringConverter.java
@@ -21,7 +21,6 @@
 import jakarta.persistence.AttributeConverter;
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-
 import org.fuin.objects4j.common.Contract;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/WeeklyOpeningHours.java b/src/main/java/org/fuin/objects4j/vo/WeeklyOpeningHours.java
index d102be2..b560664 100644
--- a/src/main/java/org/fuin/objects4j/vo/WeeklyOpeningHours.java
+++ b/src/main/java/org/fuin/objects4j/vo/WeeklyOpeningHours.java
@@ -17,18 +17,9 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
@@ -36,6 +27,8 @@
 import org.fuin.objects4j.ui.Prompt;
 import org.fuin.objects4j.vo.DayOpeningHours.Change;
 
+import java.util.*;
+
 /**
  * Represents weekly opening hours separated by a comma ','.<br>
  * Example: 'Mon-Fri 09:00-12:00+13:00-17:00,Sat/Sun 09:-12:00'.<br>
diff --git a/src/main/java/org/fuin/objects4j/vo/WeeklyOpeningHoursConverter.java b/src/main/java/org/fuin/objects4j/vo/WeeklyOpeningHoursConverter.java
index d1a99e1..90b12e9 100644
--- a/src/main/java/org/fuin/objects4j/vo/WeeklyOpeningHoursConverter.java
+++ b/src/main/java/org/fuin/objects4j/vo/WeeklyOpeningHoursConverter.java
@@ -18,7 +18,6 @@
 package org.fuin.objects4j.vo;
 
 import jakarta.persistence.Converter;
-
 import org.fuin.objects4j.common.ThreadSafe;
 
 /**
diff --git a/src/main/java/org/fuin/objects4j/vo/WeeklyOpeningHoursStr.java b/src/main/java/org/fuin/objects4j/vo/WeeklyOpeningHoursStr.java
index 2f9b80a..af6c66e 100644
--- a/src/main/java/org/fuin/objects4j/vo/WeeklyOpeningHoursStr.java
+++ b/src/main/java/org/fuin/objects4j/vo/WeeklyOpeningHoursStr.java
@@ -17,15 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
+import java.lang.annotation.*;
+
 //CHECKSTYLE:OFF
 /**
  * Verifies if this represents weekly opening hours separated by a comma ','.<br>
diff --git a/src/main/java/org/fuin/objects4j/vo/package-info.java b/src/main/java/org/fuin/objects4j/vo/package-info.java
index f8c15fe..a81c819 100644
--- a/src/main/java/org/fuin/objects4j/vo/package-info.java
+++ b/src/main/java/org/fuin/objects4j/vo/package-info.java
@@ -25,9 +25,9 @@
         @XmlJavaTypeAdapter(value = LocaleConverter.class, type = Locale.class) })
 package org.fuin.objects4j.vo;
 
-import java.util.Locale;
-import java.util.UUID;
-
 import jakarta.enterprise.inject.Vetoed;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
+
+import java.util.Locale;
+import java.util.UUID;
diff --git a/src/test/java/my/test/MyClass.java b/src/test/java/my/test/MyClass.java
index 865e148..ca96dcb 100644
--- a/src/test/java/my/test/MyClass.java
+++ b/src/test/java/my/test/MyClass.java
@@ -1,15 +1,9 @@
 // CHECKSTYLE:OFF
 package my.test;
 
-import java.util.Date;
+import org.fuin.objects4j.ui.*;
 
-import org.fuin.objects4j.ui.Examples;
-import org.fuin.objects4j.ui.FontSizeUnit;
-import org.fuin.objects4j.ui.Label;
-import org.fuin.objects4j.ui.Mappings;
-import org.fuin.objects4j.ui.ShortLabel;
-import org.fuin.objects4j.ui.TableColumn;
-import org.fuin.objects4j.ui.TextField;
+import java.util.Date;
 
 /**
  * Test class with fields annotated with label and table column.
diff --git a/src/test/java/my/test/MyPasswordContainer.java b/src/test/java/my/test/MyPasswordContainer.java
index 118f026..97f1413 100644
--- a/src/test/java/my/test/MyPasswordContainer.java
+++ b/src/test/java/my/test/MyPasswordContainer.java
@@ -4,7 +4,6 @@
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.ui.Label;
 import org.fuin.objects4j.ui.TextField;
 import org.fuin.objects4j.vo.PasswordStr;
diff --git a/src/test/java/org/fuin/objects4j/BaseTest.java b/src/test/java/org/fuin/objects4j/BaseTest.java
index a2a89d7..2bfb889 100644
--- a/src/test/java/org/fuin/objects4j/BaseTest.java
+++ b/src/test/java/org/fuin/objects4j/BaseTest.java
@@ -17,11 +17,11 @@
  */
 package org.fuin.objects4j;
 
-import java.io.File;
-
 import org.fuin.units4j.AssertCoverage;
 import org.fuin.units4j.AssertDependencies;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
 
 //TESTCODE:BEGIN
 public class BaseTest {
diff --git a/src/test/java/org/fuin/objects4j/common/ConstraintViolationExceptionTest.java b/src/test/java/org/fuin/objects4j/common/ConstraintViolationExceptionTest.java
index b2cadde..10e98ed 100644
--- a/src/test/java/org/fuin/objects4j/common/ConstraintViolationExceptionTest.java
+++ b/src/test/java/org/fuin/objects4j/common/ConstraintViolationExceptionTest.java
@@ -17,15 +17,14 @@
  */
 package org.fuin.objects4j.common;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.Set;
-
 import jakarta.validation.ConstraintViolation;
-import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import org.junit.jupiter.api.Test;
+
+import java.util.Set;
 
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class ConstraintViolationExceptionTest {
diff --git a/src/test/java/org/fuin/objects4j/common/ContractTest.java b/src/test/java/org/fuin/objects4j/common/ContractTest.java
index 525bc63..19dd4f9 100644
--- a/src/test/java/org/fuin/objects4j/common/ContractTest.java
+++ b/src/test/java/org/fuin/objects4j/common/ContractTest.java
@@ -17,22 +17,21 @@
  */
 package org.fuin.objects4j.common;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Valid;
 import jakarta.validation.Validation;
 import jakarta.validation.constraints.NotNull;
-
+import org.assertj.core.api.Assertions;
 import org.fuin.objects4j.vo.EmailAddressStr;
 import org.fuin.objects4j.vo.PasswordStr;
 import org.fuin.objects4j.vo.UserNameStr;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public class ContractTest {
@@ -80,7 +79,7 @@ public final void testValidateWithValidator() {
         final Set<ConstraintViolation<Child>> violations = Contract.validate(Validation.buildDefaultValidatorFactory().getValidator(),
                 child);
         assertThat(violations).isNotNull();
-        assertThat(violations.size()).isGreaterThan(0);
+        assertThat(violations).isNotEmpty();
         assertThat(violations.iterator().next().getMessageTemplate()).isEqualTo("{jakarta.validation.constraints.NotNull.message}");
 
     }
@@ -91,7 +90,7 @@ public final void testValidateWithDefaultValidator() {
         final Child child = new Child();
         final Set<ConstraintViolation<Child>> violations = Contract.validate(child);
         assertThat(violations).isNotNull();
-        assertThat(violations.size()).isGreaterThan(0);
+        assertThat(violations).isNotEmpty();
         assertThat(violations.iterator().next().getMessageTemplate()).isEqualTo("{jakarta.validation.constraints.NotNull.message}");
 
     }
@@ -102,7 +101,7 @@ public final void testRequireValidWithValidator() {
         try {
             final Child child = new Child();
             Contract.requireValid(Validation.buildDefaultValidatorFactory().getValidator(), child);
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).contains("[password]");
             assertThat(ex.getMessage()).contains("{null}");
@@ -117,7 +116,7 @@ public final void testRequireValidWithOneInvalidField() {
         try {
             final Child child = new Child();
             Contract.requireValid(child);
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).contains("[password]");
             assertThat(ex.getMessage()).contains("{null}");
@@ -133,7 +132,7 @@ public final void testRequireValidWithTwoInvalidFields() {
             final Child child = new Child();
             child.userName = "";
             Contract.requireValid(child);
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).contains("[password]");
             assertThat(ex.getMessage()).contains("{null}");
@@ -151,7 +150,7 @@ public final void testRequireValidWithInvalidChild() {
             parent.email = "abc@";
             parent.child = new Child();
             Contract.requireValid(parent);
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).contains("[email]");
             assertThat(ex.getMessage()).contains("{abc@}");
@@ -170,7 +169,7 @@ public final void testRequireValidWithValidChild() {
             parent.child = new Child();
             parent.child.password = "verysecret";
             Contract.requireValid(parent);
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).contains("[email]");
             assertThat(ex.getMessage()).contains("{abc@}");
@@ -240,9 +239,9 @@ public void testRequireArgMin() {
         // TEST
         Contract.requireArgMin("name1", 5, 4);
         Contract.requireArgMin("name3", 4, 4);
-        Contract.requireArgMin("name3", Integer.valueOf(5), Integer.valueOf(4));
+        Contract.requireArgMin("name3", 5, 4);
         Contract.requireArgMin("name4", 5L, 4L);
-        Contract.requireArgMin("name5", Long.valueOf(5), Long.valueOf(4));
+        Contract.requireArgMin("name5", 5L, 4L);
         try {
             Contract.requireArgMin("name6", 3, 4);
         } catch (final ConstraintViolationException ex) {
diff --git a/src/test/java/org/fuin/objects4j/common/FileExistsValidatorTest.java b/src/test/java/org/fuin/objects4j/common/FileExistsValidatorTest.java
index cff8812..14d2537 100644
--- a/src/test/java/org/fuin/objects4j/common/FileExistsValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/common/FileExistsValidatorTest.java
@@ -17,18 +17,18 @@
  */
 package org.fuin.objects4j.common;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.Utils4J;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.fuin.utils4j.Utils4J;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class FileExistsValidatorTest {
@@ -39,7 +39,7 @@ public final class FileExistsValidatorTest {
     private File existingDir;
     private File notExisting;
 
-    @Before
+    @BeforeEach
     public final void setUp() throws IOException {
         testee = new FileExistsValidator();
         existingFile = new File(Utils4J.getTempDir(), "FileExistsValidatorTest_File");
@@ -54,7 +54,7 @@ public final void setUp() throws IOException {
         notExisting = new File(Utils4J.getTempDir(), "FileExistsValidatorTest_DoesNotExist");
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
         existingFile.delete();
@@ -111,7 +111,7 @@ public final void testRequireArgValidFALSE() {
         // TEST & VERIFY
         try {
             FileExistsValidator.requireArgValid("x", notExisting);
-            fail("Expected exception");
+            Assertions.fail("Expected exception");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).startsWith("The argument 'x' is not an existing file:");
         }
diff --git a/src/test/java/org/fuin/objects4j/common/IsDirectoryValidatorTest.java b/src/test/java/org/fuin/objects4j/common/IsDirectoryValidatorTest.java
index 000aa2b..a37240d 100644
--- a/src/test/java/org/fuin/objects4j/common/IsDirectoryValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/common/IsDirectoryValidatorTest.java
@@ -17,18 +17,18 @@
  */
 package org.fuin.objects4j.common;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.Utils4J;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.fuin.utils4j.Utils4J;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class IsDirectoryValidatorTest {
@@ -38,7 +38,7 @@ public final class IsDirectoryValidatorTest {
     private File existingFile;
     private File existingDir;
 
-    @Before
+    @BeforeEach
     public final void setUp() throws IOException {
         testee = new IsDirectoryValidator();
         existingFile = new File(Utils4J.getTempDir(), "IsDirectoryValidatorTest_File");
@@ -52,7 +52,7 @@ public final void setUp() throws IOException {
         existingDir.mkdir();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
         existingFile.delete();
@@ -108,7 +108,7 @@ public final void testRequireArgValidFALSE() {
         // TEST & VERIFY
         try {
             IsDirectoryValidator.requireArgValid("x", existingFile);
-            fail("Expected exception");
+            Assertions.fail("Expected exception");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).startsWith("The argument 'x' is not a directory:");
         }
diff --git a/src/test/java/org/fuin/objects4j/common/IsFileValidatorTest.java b/src/test/java/org/fuin/objects4j/common/IsFileValidatorTest.java
index afbab23..8748be7 100644
--- a/src/test/java/org/fuin/objects4j/common/IsFileValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/common/IsFileValidatorTest.java
@@ -17,18 +17,18 @@
  */
 package org.fuin.objects4j.common;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.Utils4J;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.fuin.utils4j.Utils4J;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class IsFileValidatorTest {
@@ -38,7 +38,7 @@ public final class IsFileValidatorTest {
     private File existingFile;
     private File existingDir;
 
-    @Before
+    @BeforeEach
     public final void setUp() throws IOException {
         testee = new IsFileValidator();
         existingFile = new File(Utils4J.getTempDir(), "IsFileValidatorTest_File");
@@ -52,7 +52,7 @@ public final void setUp() throws IOException {
         existingDir.mkdir();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
         existingFile.delete();
@@ -108,7 +108,7 @@ public final void testRequireArgValidFALSE() {
         // TEST & VERIFY
         try {
             IsFileValidator.requireArgValid("x", existingDir);
-            fail("Expected exception");
+            Assertions.fail("Expected exception");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).startsWith("The argument 'x' is not a file:");
         }
diff --git a/src/test/java/org/fuin/objects4j/common/UniquelyNumberedExceptionTest.java b/src/test/java/org/fuin/objects4j/common/UniquelyNumberedExceptionTest.java
index 751b032..ffacf2d 100644
--- a/src/test/java/org/fuin/objects4j/common/UniquelyNumberedExceptionTest.java
+++ b/src/test/java/org/fuin/objects4j/common/UniquelyNumberedExceptionTest.java
@@ -17,9 +17,9 @@
  */
 package org.fuin.objects4j.common;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class UniquelyNumberedExceptionTest {
diff --git a/src/test/java/org/fuin/objects4j/ui/AnnotationAnalyzerTest.java b/src/test/java/org/fuin/objects4j/ui/AnnotationAnalyzerTest.java
index fc3f8c4..e91f321 100644
--- a/src/test/java/org/fuin/objects4j/ui/AnnotationAnalyzerTest.java
+++ b/src/test/java/org/fuin/objects4j/ui/AnnotationAnalyzerTest.java
@@ -17,9 +17,9 @@
  */
 package org.fuin.objects4j.ui;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test for {@link AnnotationAnalyzer}.
diff --git a/src/test/java/org/fuin/objects4j/ui/ClassTextInfoTest.java b/src/test/java/org/fuin/objects4j/ui/ClassTextInfoTest.java
index 4c6cca0..e7b3639 100644
--- a/src/test/java/org/fuin/objects4j/ui/ClassTextInfoTest.java
+++ b/src/test/java/org/fuin/objects4j/ui/ClassTextInfoTest.java
@@ -17,15 +17,14 @@
  */
 package org.fuin.objects4j.ui;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.Locale;
-
 import my.test.MyClass;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Test;
+import java.util.Locale;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class ClassTextInfoTest {
diff --git a/src/test/java/org/fuin/objects4j/ui/FieldTextInfoTest.java b/src/test/java/org/fuin/objects4j/ui/FieldTextInfoTest.java
index 6537d74..3f177bd 100644
--- a/src/test/java/org/fuin/objects4j/ui/FieldTextInfoTest.java
+++ b/src/test/java/org/fuin/objects4j/ui/FieldTextInfoTest.java
@@ -17,28 +17,16 @@
  */
 package org.fuin.objects4j.ui;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import my.test.*;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Locale;
 
-import my.test.A;
-import my.test.AbstractA;
-import my.test.AbstractB;
-import my.test.B;
-import my.test.C;
-import my.test.D;
-import my.test.E;
-import my.test.F;
-import my.test.G;
-import my.test.H;
-import my.test.I;
-import my.test.MyClass;
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
-
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class FieldTextInfoTest {
@@ -67,7 +55,7 @@ public final void testCreateClassLocale() throws Exception {
         final FieldTextInfo infoPermanent = new FieldTextInfo(MyClass.class.getDeclaredField("permanentEmployee"), "Permanent employee");
 
         assertThat(list).isNotNull();
-        assertThat(list.size()).isEqualTo(4);
+        assertThat(list).hasSize(4);
         assertThat(list).contains(infoFirstName, infoLastName, infoBirthday, infoPermanent);
         assertEquals(infoFirstName, list.get(list.indexOf(infoFirstName)), "infoFirstName");
         assertEquals(infoLastName, list.get(list.indexOf(infoLastName)), "infoLastName");
@@ -106,7 +94,7 @@ public final void testNoValues() throws Exception {
         final FieldTextInfo infoY = new FieldTextInfo(A.class.getDeclaredField("y"), null);
 
         assertThat(list).isNotNull();
-        assertThat(list.size()).isEqualTo(2);
+        assertThat(list).hasSize(2);
         assertThat(list).contains(infoX, infoY);
         assertEquals(infoX, list.get(list.indexOf(infoX)), "infoX");
         assertEquals(infoY, list.get(list.indexOf(infoY)), "infoY");
@@ -121,7 +109,7 @@ public final void testNoValuesWithProperties() throws Exception {
         final FieldTextInfo infoY = new FieldTextInfo(B.class.getDeclaredField("y"), "B_en y.Label");
 
         assertThat(list).isNotNull();
-        assertThat(list.size()).isEqualTo(2);
+        assertThat(list).hasSize(2);
         assertThat(list).contains(infoX, infoY);
         assertThat(list.get(list.indexOf(infoX)).getText()).isEqualTo(infoX.getText());
         assertThat(list.get(list.indexOf(infoY)).getText()).isEqualTo(infoY.getText());
@@ -134,7 +122,7 @@ public final void testDefaultValue() throws Exception {
         final List<FieldTextInfo> list = new AnnotationAnalyzer().createFieldInfos(C.class, Locale.ENGLISH, Label.class);
         final FieldTextInfo info = new FieldTextInfo(C.class.getDeclaredField("c"), "Ccc");
         assertThat(list).isNotNull();
-        assertThat(list.size()).isEqualTo(1);
+        assertThat(list).hasSize(1);
         assertThat(list).contains(info);
         assertEquals(info, list.get(list.indexOf(info)), "info");
 
@@ -146,7 +134,7 @@ public final void testDefaultValueWithProperties() throws Exception {
         final List<FieldTextInfo> list = new AnnotationAnalyzer().createFieldInfos(D.class, Locale.ENGLISH, Label.class);
         final FieldTextInfo info = new FieldTextInfo(D.class.getDeclaredField("d2"), "DEFAULT D.d2");
         assertThat(list).isNotNull();
-        assertThat(list.size()).isEqualTo(2);
+        assertThat(list).hasSize(2);
         assertThat(list).contains(info);
         assertThat(list.get(list.indexOf(info)).getText()).isEqualTo(info.getText());
 
@@ -158,7 +146,7 @@ public final void testDefaultValueAndKey() throws Exception {
         final List<FieldTextInfo> list = new AnnotationAnalyzer().createFieldInfos(E.class, Locale.ENGLISH, Label.class);
         final FieldTextInfo info = new FieldTextInfo(E.class.getDeclaredField("e"), "Eee");
         assertThat(list).isNotNull();
-        assertThat(list.size()).isEqualTo(1);
+        assertThat(list).hasSize(1);
         assertThat(list).contains(info);
         assertEquals(info, list.get(list.indexOf(info)), "info");
 
@@ -170,7 +158,7 @@ public final void testDefaultValueAndKeyWithProperties() throws Exception {
         final List<FieldTextInfo> list = new AnnotationAnalyzer().createFieldInfos(F.class, Locale.ENGLISH, Label.class);
         final FieldTextInfo info = new FieldTextInfo(F.class.getDeclaredField("f"), "Fff");
         assertThat(list).isNotNull();
-        assertThat(list.size()).isEqualTo(1);
+        assertThat(list).hasSize(1);
         assertThat(list).contains(info);
         assertEquals(info, list.get(list.indexOf(info)), "info");
 
@@ -182,7 +170,7 @@ public final void testShortTextAndKey() throws Exception {
         final List<FieldTextInfo> list = new AnnotationAnalyzer().createFieldInfos(G.class, Locale.ENGLISH, ShortLabel.class);
         final FieldTextInfo info = new FieldTextInfo(G.class.getDeclaredField("g"), "Ggg");
         assertThat(list).isNotNull();
-        assertThat(list.size()).isEqualTo(1);
+        assertThat(list).hasSize(1);
         assertThat(list).contains(info);
         assertEquals(info, list.get(list.indexOf(info)), "info");
 
@@ -194,7 +182,7 @@ public final void testShortTextAndKeyWithProperties() throws Exception {
         final List<FieldTextInfo> list = new AnnotationAnalyzer().createFieldInfos(H.class, Locale.ENGLISH, ShortLabel.class);
         final FieldTextInfo info = new FieldTextInfo(H.class.getDeclaredField("h"), "H_en hh_short");
         assertThat(list).isNotNull();
-        assertThat(list.size()).isEqualTo(1);
+        assertThat(list).hasSize(1);
         assertThat(list).contains(info);
         assertEquals(info, list.get(list.indexOf(info)), "info");
 
@@ -206,7 +194,7 @@ public final void testShortWithProperties() throws Exception {
         final List<FieldTextInfo> list = new AnnotationAnalyzer().createFieldInfos(I.class, Locale.ENGLISH, ShortLabel.class);
         final FieldTextInfo info = new FieldTextInfo(I.class.getDeclaredField("i"), "I_en i.ShortLabel");
         assertThat(list).isNotNull();
-        assertThat(list.size()).isEqualTo(1);
+        assertThat(list).hasSize(1);
         assertThat(list).contains(info);
         assertEquals(info, list.get(list.indexOf(info)), "info");
 
@@ -222,7 +210,7 @@ private void assertEquals(final FieldTextInfo expected, final FieldTextInfo actu
     public void testEqualsHashCode() throws Exception {
         EqualsVerifier.forClass(FieldTextInfo.class)
                 .withPrefabValues(Field.class, C.class.getDeclaredField("c"), D.class.getDeclaredField("d2"))
-                .suppress(Warning.NULL_FIELDS, Warning.ALL_FIELDS_SHOULD_BE_USED).verify();
+                .suppress(Warning.NULL_FIELDS, Warning.ALL_FIELDS_SHOULD_BE_USED, Warning.REFERENCE_EQUALITY).verify();
     }
 
 }
diff --git a/src/test/java/org/fuin/objects4j/ui/FontSizeTest.java b/src/test/java/org/fuin/objects4j/ui/FontSizeTest.java
index 32e396a..43f6b4d 100644
--- a/src/test/java/org/fuin/objects4j/ui/FontSizeTest.java
+++ b/src/test/java/org/fuin/objects4j/ui/FontSizeTest.java
@@ -17,11 +17,11 @@
  */
 package org.fuin.objects4j.ui;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.data.Offset.offset;
 import nl.jqno.equalsverifier.EqualsVerifier;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.data.Offset.offset;
 
 //TESTCODE:BEGIN
 public final class FontSizeTest {
diff --git a/src/test/java/org/fuin/objects4j/ui/TableColumnInfoTest.java b/src/test/java/org/fuin/objects4j/ui/TableColumnInfoTest.java
index 52f9d40..4b1c42a 100644
--- a/src/test/java/org/fuin/objects4j/ui/TableColumnInfoTest.java
+++ b/src/test/java/org/fuin/objects4j/ui/TableColumnInfoTest.java
@@ -17,19 +17,18 @@
  */
 package org.fuin.objects4j.ui;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Locale;
-
-import org.junit.Test;
-
 import my.test.C;
 import my.test.D;
 import my.test.MyClass;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Locale;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class TableColumnInfoTest {
@@ -63,7 +62,7 @@ public final void testCreateClassLocaleENGLISH() throws Exception {
         final List<TableColumnInfo> list = TableColumnInfo.create(MyClass.class, Locale.ENGLISH);
 
         assertThat(list).isNotNull();
-        assertThat(list.size()).isEqualTo(4);
+        assertThat(list).hasSize(4);
 
         final TableColumnInfo tcFirstName = new TableColumnInfo(MyClass.class.getDeclaredField("firstName"), "First name", null, 0,
                 new FontSize(80, FontSizeUnit.PIXEL), "getFirstName");
@@ -89,7 +88,7 @@ public final void testCreateClassLocaleGERMAN() throws Exception {
         final List<TableColumnInfo> list = TableColumnInfo.create(MyClass.class, Locale.GERMAN);
 
         assertThat(list).isNotNull();
-        assertThat(list.size()).isEqualTo(4);
+        assertThat(list).hasSize(4);
 
         final TableColumnInfo tcFirstName = new TableColumnInfo(MyClass.class.getDeclaredField("firstName"), "First name", null, 0,
                 new FontSize(80, FontSizeUnit.PIXEL), "getFirstName");
@@ -149,7 +148,7 @@ public void testEqualsHashCode() throws Exception {
         EqualsVerifier.forClass(TableColumnInfo.class)
                 .withPrefabValues(Field.class, C.class.getDeclaredField("c"), D.class.getDeclaredField("d2"))
                 .withPrefabValues(FontSize.class, new FontSize(40, FontSizeUnit.PIXEL), new FontSize(100, FontSizeUnit.POINT))
-                .suppress(Warning.NULL_FIELDS, Warning.ALL_FIELDS_SHOULD_BE_USED).verify();
+                .suppress(Warning.NULL_FIELDS, Warning.ALL_FIELDS_SHOULD_BE_USED, Warning.REFERENCE_EQUALITY).verify();
     }
 
 }
diff --git a/src/test/java/org/fuin/objects4j/ui/TextFieldInfoTest.java b/src/test/java/org/fuin/objects4j/ui/TextFieldInfoTest.java
index 064daab..aafb368 100644
--- a/src/test/java/org/fuin/objects4j/ui/TextFieldInfoTest.java
+++ b/src/test/java/org/fuin/objects4j/ui/TextFieldInfoTest.java
@@ -17,14 +17,13 @@
  */
 package org.fuin.objects4j.ui;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import my.test.MyClass;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Field;
 import java.util.Locale;
 
-import my.test.MyClass;
-
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public class TextFieldInfoTest {
diff --git a/src/test/java/org/fuin/objects4j/ui/UsageExamples.java b/src/test/java/org/fuin/objects4j/ui/UsageExamples.java
index a857e1d..8922228 100644
--- a/src/test/java/org/fuin/objects4j/ui/UsageExamples.java
+++ b/src/test/java/org/fuin/objects4j/ui/UsageExamples.java
@@ -17,13 +17,13 @@
  */
 package org.fuin.objects4j.ui;
 
+import my.test.MyClass;
+
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
-import my.test.MyClass;
-
 /**
  * Usage examples.
  */
diff --git a/src/test/java/org/fuin/objects4j/vo/AbstractIntegerValueObjectTest.java b/src/test/java/org/fuin/objects4j/vo/AbstractIntegerValueObjectTest.java
index 6644233..249a98b 100644
--- a/src/test/java/org/fuin/objects4j/vo/AbstractIntegerValueObjectTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/AbstractIntegerValueObjectTest.java
@@ -19,8 +19,7 @@
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 //CHECKSTYLE:OFF
 public class AbstractIntegerValueObjectTest {
diff --git a/src/test/java/org/fuin/objects4j/vo/AbstractLongValueObjectTest.java b/src/test/java/org/fuin/objects4j/vo/AbstractLongValueObjectTest.java
index 5621240..6a51158 100644
--- a/src/test/java/org/fuin/objects4j/vo/AbstractLongValueObjectTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/AbstractLongValueObjectTest.java
@@ -19,8 +19,7 @@
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 //CHECKSTYLE:OFF
 public class AbstractLongValueObjectTest {
diff --git a/src/test/java/org/fuin/objects4j/vo/AbstractStringValueObjectTest.java b/src/test/java/org/fuin/objects4j/vo/AbstractStringValueObjectTest.java
index 9fbfdc9..b2f062c 100644
--- a/src/test/java/org/fuin/objects4j/vo/AbstractStringValueObjectTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/AbstractStringValueObjectTest.java
@@ -19,8 +19,7 @@
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 //CHECKSTYLE:OFF
 public class AbstractStringValueObjectTest {
diff --git a/src/test/java/org/fuin/objects4j/vo/AbstractUuidValueObjectTest.java b/src/test/java/org/fuin/objects4j/vo/AbstractUuidValueObjectTest.java
index b04dd86..d0e9687 100644
--- a/src/test/java/org/fuin/objects4j/vo/AbstractUuidValueObjectTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/AbstractUuidValueObjectTest.java
@@ -17,12 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.UUID;
-
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Test;
+import java.util.UUID;
 
 //CHECKSTYLE:OFF
 public class AbstractUuidValueObjectTest {
diff --git a/src/test/java/org/fuin/objects4j/vo/AnyStr.java b/src/test/java/org/fuin/objects4j/vo/AnyStr.java
index d1d0689..912c1cd 100644
--- a/src/test/java/org/fuin/objects4j/vo/AnyStr.java
+++ b/src/test/java/org/fuin/objects4j/vo/AnyStr.java
@@ -1,8 +1,7 @@
 package org.fuin.objects4j.vo;
 
-import org.fuin.objects4j.common.Contract;
-
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.fuin.objects4j.common.Contract;
 
 /**
  * Test implementation for a {@link AbstractStringValueObject}.
diff --git a/src/test/java/org/fuin/objects4j/vo/CurrencyAmountConverterTest.java b/src/test/java/org/fuin/objects4j/vo/CurrencyAmountConverterTest.java
index f0acad5..aa23e38 100644
--- a/src/test/java/org/fuin/objects4j/vo/CurrencyAmountConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/CurrencyAmountConverterTest.java
@@ -1,41 +1,39 @@
 /**
  * Copyright (C) 2013 Future Invent Informationsmanagement GmbH. All rights
  * reserved. <http://www.fuin.org/>
- *
+ * <p>
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation; either version 3 of the License, or (at your option) any
  * later version.
- *
+ * <p>
  * This library is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
- *
+ * <p>
  * You should have received a copy of the GNU Lesser General Public License
  * along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
-import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
-import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
-import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
-import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Currency;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.xml.bind.JAXBException;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
+import static org.fuin.objects4j.vo.JsonbHelper.toJson;
+import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
+import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
+import static org.fuin.utils4j.jaxb.JaxbUtils.*;
 
 // CHECKSTYLE:OFF
 public class CurrencyAmountConverterTest {
@@ -46,12 +44,12 @@ public class CurrencyAmountConverterTest {
 
     private ValueObjectConverter<String, CurrencyAmount> testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new CurrencyAmountConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -64,7 +62,7 @@ public final void testFactoryInjectable() {
     @Test
     public final void testtoVO() {
         assertThat(testee.toVO("1234.56 EUR"))
-                .isEqualTo(new CurrencyAmount(new BigDecimal(1234.56).setScale(2, RoundingMode.HALF_UP), Currency.getInstance("EUR")));
+                .isEqualTo(new CurrencyAmount(new BigDecimal("1234.56").setScale(2, RoundingMode.HALF_UP), Currency.getInstance("EUR")));
     }
 
     @Test
@@ -93,7 +91,7 @@ public final void testMarshalJaxb() throws JAXBException {
     @Test
     public final void testMarshalUnmarshalJaxb() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.currencyAmount).isEqualTo(new CurrencyAmount("1234.56", "EUR"));
 
     }
@@ -103,8 +101,8 @@ public final void testUnmarshalErrorJaxb() {
 
         final String invalidXmlData = XML_PREFIX + "<data ca=\"1234.56\"/>";
         try {
-            unmarshal(invalidXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseCauseMessage(ex, "No space character found in '1234.56'");
         }
@@ -134,7 +132,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"ca\":\"1234.56\"}";
         try {
             fromJson(invalidJsonData, Data.class, new CurrencyAmountConverter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseMessage(ex, "No space character found in '1234.56'");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/CurrencyAmountParentEntity.java b/src/test/java/org/fuin/objects4j/vo/CurrencyAmountParentEntity.java
index eae67b5..0ea984c 100644
--- a/src/test/java/org/fuin/objects4j/vo/CurrencyAmountParentEntity.java
+++ b/src/test/java/org/fuin/objects4j/vo/CurrencyAmountParentEntity.java
@@ -17,14 +17,7 @@
  */
 package org.fuin.objects4j.vo;
 
-import jakarta.persistence.AttributeOverride;
-import jakarta.persistence.AttributeOverrides;
-import jakarta.persistence.Basic;
-import jakarta.persistence.Column;
-import jakarta.persistence.Convert;
-import jakarta.persistence.Embedded;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 
 // CHECKSTYLE:OFF
 @Entity(name = "CURRENCY_AMOUNT_PARENT")
diff --git a/src/test/java/org/fuin/objects4j/vo/CurrencyAmountStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/CurrencyAmountStrValidatorTest.java
index bb46bd5..05308e1 100644
--- a/src/test/java/org/fuin/objects4j/vo/CurrencyAmountStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/CurrencyAmountStrValidatorTest.java
@@ -17,23 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 // CHECKSTYLE:OFF
 public final class CurrencyAmountStrValidatorTest {
 
     private CurrencyAmountStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new CurrencyAmountStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/CurrencyAmountTest.java b/src/test/java/org/fuin/objects4j/vo/CurrencyAmountTest.java
index c34cafc..27ee549 100644
--- a/src/test/java/org/fuin/objects4j/vo/CurrencyAmountTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/CurrencyAmountTest.java
@@ -17,20 +17,19 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.fuin.utils4j.Utils4J.deserialize;
-import static org.fuin.utils4j.Utils4J.serialize;
+import jakarta.persistence.Query;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
+import org.fuin.units4j.AbstractPersistenceTest;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Currency;
 
-import nl.jqno.equalsverifier.EqualsVerifier;
-
-import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
-
-import jakarta.persistence.Query;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.fuin.utils4j.Utils4J.deserialize;
+import static org.fuin.utils4j.Utils4J.serialize;
 
 /**
  * Tests the {@link CurrencyAmount} class.
@@ -40,7 +39,9 @@ public class CurrencyAmountTest extends AbstractPersistenceTest {
 
     @Test
     public void testEqualsHashCode() {
-        EqualsVerifier.forClass(CurrencyAmount.class).withPrefabValues(Currency.class, cu("EUR"), cu("USD")).verify();
+        EqualsVerifier.forClass(CurrencyAmount.class)
+                .suppress(Warning.BIGDECIMAL_EQUALITY)
+                .withPrefabValues(Currency.class, cu("EUR"), cu("USD")).verify();
     }
 
     @Test
diff --git a/src/test/java/org/fuin/objects4j/vo/CurrencyConverterTest.java b/src/test/java/org/fuin/objects4j/vo/CurrencyConverterTest.java
index fb06309..1f76ef5 100644
--- a/src/test/java/org/fuin/objects4j/vo/CurrencyConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/CurrencyConverterTest.java
@@ -17,21 +17,19 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
-import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
-import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
-import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Currency;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.xml.bind.JAXBException;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
+import static org.fuin.objects4j.vo.JsonbHelper.toJson;
+import static org.fuin.utils4j.jaxb.JaxbUtils.*;
 
 // CHECKSTYLE:OFF
 public class CurrencyConverterTest {
@@ -42,12 +40,12 @@ public class CurrencyConverterTest {
 
     private CurrencyConverter testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new CurrencyConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -87,7 +85,7 @@ public final void testMarshalJaxb() throws JAXBException {
     @Test
     public final void testMarshalUnmarshalJaxb() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.currency).isEqualTo(Currency.getInstance("EUR"));
 
     }
@@ -97,8 +95,8 @@ public final void testUnmarshalErrorJaxb() {
 
         final String invalidXmlData = XML_PREFIX + "<data c=\"ABCD\"/>";
         try {
-            unmarshal(invalidXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertThat(ex.getMessage()).contains("Error unmarshalling");
         }
@@ -128,7 +126,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"c\":\"ABCD\"}";
         try {
             fromJson(invalidJsonData, Data.class, new CurrencyConverter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertThat(ex.getMessage()).contains("Unable to deserialize property 'c'");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/CurrencyParentEntity.java b/src/test/java/org/fuin/objects4j/vo/CurrencyParentEntity.java
index 160e390..669e3bd 100644
--- a/src/test/java/org/fuin/objects4j/vo/CurrencyParentEntity.java
+++ b/src/test/java/org/fuin/objects4j/vo/CurrencyParentEntity.java
@@ -17,13 +17,9 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.Currency;
+import jakarta.persistence.*;
 
-import jakarta.persistence.Basic;
-import jakarta.persistence.Column;
-import jakarta.persistence.Convert;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
+import java.util.Currency;
 
 // CHECKSTYLE:OFF
 @Entity(name = "CURRENCY_PARENT")
diff --git a/src/test/java/org/fuin/objects4j/vo/CurrencyStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/CurrencyStrValidatorTest.java
index c5cd1ea..dac1cd9 100644
--- a/src/test/java/org/fuin/objects4j/vo/CurrencyStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/CurrencyStrValidatorTest.java
@@ -17,23 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 // CHECKSTYLE:OFF
 public final class CurrencyStrValidatorTest {
 
     private CurrencyStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new CurrencyStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/CurrencyTest.java b/src/test/java/org/fuin/objects4j/vo/CurrencyTest.java
index 58e2090..a1f9213 100644
--- a/src/test/java/org/fuin/objects4j/vo/CurrencyTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/CurrencyTest.java
@@ -17,14 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import jakarta.persistence.Query;
+import org.fuin.units4j.AbstractPersistenceTest;
+import org.junit.jupiter.api.Test;
 
 import java.util.Currency;
 
-import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
-
-import jakarta.persistence.Query;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests the {@link Currency} class.
diff --git a/src/test/java/org/fuin/objects4j/vo/Data.java b/src/test/java/org/fuin/objects4j/vo/Data.java
index c5ce9bd..3f690a3 100644
--- a/src/test/java/org/fuin/objects4j/vo/Data.java
+++ b/src/test/java/org/fuin/objects4j/vo/Data.java
@@ -17,15 +17,15 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.Currency;
-import java.util.UUID;
-
 import jakarta.json.bind.annotation.JsonbProperty;
 import jakarta.validation.Valid;
 import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import java.util.Currency;
+import java.util.UUID;
+
 /**
  * XML/JSON container used for tests.
  */
diff --git a/src/test/java/org/fuin/objects4j/vo/DateStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/DateStrValidatorTest.java
index 8381360..18db41a 100644
--- a/src/test/java/org/fuin/objects4j/vo/DateStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/DateStrValidatorTest.java
@@ -17,14 +17,12 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.easymock.EasyMock.*;
 
 //TESTCODE:BEGIN
 public final class DateStrValidatorTest {
@@ -33,7 +31,7 @@ public final class DateStrValidatorTest {
 
     private DateStr constraintAnnotation;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new DateStrValidator();
         constraintAnnotation = createMock(DateStr.class);
@@ -42,7 +40,7 @@ public final void setUp() {
         testee.initialize(constraintAnnotation);
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/DayOfTheWeekConverterTest.java b/src/test/java/org/fuin/objects4j/vo/DayOfTheWeekConverterTest.java
index 83860b0..7f3a139 100644
--- a/src/test/java/org/fuin/objects4j/vo/DayOfTheWeekConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/DayOfTheWeekConverterTest.java
@@ -17,21 +17,19 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
 import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
 import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
-import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
-import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
-import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.xml.bind.JAXBException;
+import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
+import static org.fuin.utils4j.jaxb.JaxbUtils.*;
 
 // CHECKSTYLE:OFF
 public class DayOfTheWeekConverterTest {
@@ -42,12 +40,12 @@ public class DayOfTheWeekConverterTest {
 
     private DayOfTheWeekConverter testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new DayOfTheWeekConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -69,7 +67,7 @@ public final void testMarshal() throws JAXBException {
     @Test
     public final void testMarshalUnmarshal() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.dayOfTheWeek).isEqualTo(DayOfTheWeek.FRI);
 
     }
@@ -79,8 +77,8 @@ public final void testUnmarshalError() {
 
         final String invalidEmailInXmlData = XML_PREFIX + "<data dayOfTheWeek=\"Monday\"/>";
         try {
-            unmarshal(invalidEmailInXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidEmailInXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseCauseMessage(ex, "Unknown day of week: 'Monday'");
         }
@@ -110,7 +108,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"dayOfTheWeek\":\"Monday\"}";
         try {
             fromJson(invalidJsonData, Data.class, new DayOfTheWeekConverter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseMessage(ex, "Unknown day of week: 'Monday'");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/DayOfTheWeekStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/DayOfTheWeekStrValidatorTest.java
index 0fde5e9..9b3db0c 100644
--- a/src/test/java/org/fuin/objects4j/vo/DayOfTheWeekStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/DayOfTheWeekStrValidatorTest.java
@@ -17,23 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class DayOfTheWeekStrValidatorTest {
 
     private DayOfTheWeekStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new DayOfTheWeekStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/DayOfTheWeekTest.java b/src/test/java/org/fuin/objects4j/vo/DayOfTheWeekTest.java
index 43581c3..fc3b158 100644
--- a/src/test/java/org/fuin/objects4j/vo/DayOfTheWeekTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/DayOfTheWeekTest.java
@@ -17,17 +17,16 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-
-import java.time.DayOfWeek;
-
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
-
+import org.assertj.core.api.Assertions;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.time.DayOfWeek;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 // CHECKSTYLE:OFF
 public class DayOfTheWeekTest extends AbstractPersistenceTest {
@@ -115,7 +114,7 @@ public final void testRequireArgValid() {
 
         try {
             DayOfTheWeek.requireArgValid("a", "");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo(
                     "The argument 'a' does not represent a valid day of the week like 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun' or 'PH': ''");
@@ -123,7 +122,7 @@ public final void testRequireArgValid() {
 
         try {
             DayOfTheWeek.requireArgValid("b", "Friday");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo(
                     "The argument 'b' does not represent a valid day of the week like 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun' or 'PH': 'Friday'");
diff --git a/src/test/java/org/fuin/objects4j/vo/DayOpeningHoursConverterTest.java b/src/test/java/org/fuin/objects4j/vo/DayOpeningHoursConverterTest.java
index 35f6606..4d067a6 100644
--- a/src/test/java/org/fuin/objects4j/vo/DayOpeningHoursConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/DayOpeningHoursConverterTest.java
@@ -17,21 +17,19 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
 import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
 import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
-import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
-import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
-import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.xml.bind.JAXBException;
+import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
+import static org.fuin.utils4j.jaxb.JaxbUtils.*;
 
 // CHECKSTYLE:OFF
 public class DayOpeningHoursConverterTest {
@@ -42,12 +40,12 @@ public class DayOpeningHoursConverterTest {
 
     private DayOpeningHoursConverter testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new DayOpeningHoursConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -69,7 +67,7 @@ public final void testMarshal() throws JAXBException {
     @Test
     public final void testMarshalUnmarshal() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.dayOpeningHours).isEqualTo(new DayOpeningHours("MON 00:00-24:00"));
 
     }
@@ -79,8 +77,8 @@ public final void testUnmarshalError() {
 
         final String invalidEmailInXmlData = XML_PREFIX + "<data dayOpeningHours=\"17-18\"/>";
         try {
-            unmarshal(invalidEmailInXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidEmailInXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseCauseMessage(ex,
                     "The argument 'dayOpeningHours' does not represent a valid hour range like 'Mon 09:00-12:00+13:00-17:00': '17-18'");
@@ -111,7 +109,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"dayOpeningHours\":\"17-18\"}";
         try {
             fromJson(invalidJsonData, Data.class, new DayOpeningHoursConverter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseMessage(ex,
                     "The argument 'dayOpeningHours' does not represent a valid hour range like 'Mon 09:00-12:00+13:00-17:00': '17-18'");
diff --git a/src/test/java/org/fuin/objects4j/vo/DayOpeningHoursStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/DayOpeningHoursStrValidatorTest.java
index 7e0ec30..3a2b52e 100644
--- a/src/test/java/org/fuin/objects4j/vo/DayOpeningHoursStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/DayOpeningHoursStrValidatorTest.java
@@ -17,23 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class DayOpeningHoursStrValidatorTest {
 
     private DayOpeningHoursStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new DayOpeningHoursStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/DayOpeningHoursTest.java b/src/test/java/org/fuin/objects4j/vo/DayOpeningHoursTest.java
index b6eb96f..1140b85 100644
--- a/src/test/java/org/fuin/objects4j/vo/DayOpeningHoursTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/DayOpeningHoursTest.java
@@ -17,21 +17,18 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.fuin.objects4j.vo.DayOfTheWeek.FRI;
-import static org.fuin.objects4j.vo.DayOfTheWeek.MON;
-import static org.fuin.objects4j.vo.DayOfTheWeek.SAT;
-import static org.fuin.objects4j.vo.HourRanges.ChangeType.ADDED;
-import static org.fuin.objects4j.vo.HourRanges.ChangeType.REMOVED;
-import static org.junit.Assert.fail;
-
 import nl.jqno.equalsverifier.EqualsVerifier;
-
+import org.assertj.core.api.Assertions;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.vo.DayOpeningHours.Change;
 import org.fuin.objects4j.vo.HourRanges.ChangeType;
 import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.fuin.objects4j.vo.DayOfTheWeek.*;
+import static org.fuin.objects4j.vo.HourRanges.ChangeType.ADDED;
+import static org.fuin.objects4j.vo.HourRanges.ChangeType.REMOVED;
 
 // CHECKSTYLE:OFF
 public class DayOpeningHoursTest extends AbstractPersistenceTest {
@@ -51,7 +48,7 @@ public final void testConstruct() {
 
         try {
             new DayOpeningHours("Monday 13-14:00");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo(
                     "The argument 'dayOpeningHours' does not represent a valid hour range like 'Mon 09:00-12:00+13:00-17:00': 'Monday 13-14:00'");
@@ -95,7 +92,7 @@ public final void testRequireArgValid() {
 
         try {
             DayOpeningHours.requireArgValid("a", "");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage())
                     .isEqualTo("The argument 'a' does not represent a valid hour range like 'Mon 09:00-12:00+13:00-17:00': ''");
@@ -103,7 +100,7 @@ public final void testRequireArgValid() {
 
         try {
             DayOpeningHours.requireArgValid("b", "Monday 17-18");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage())
                     .isEqualTo("The argument 'b' does not represent a valid hour range like 'Mon 09:00-12:00+13:00-17:00': 'Monday 17-18'");
@@ -167,7 +164,7 @@ public void testDiffDifferentDays() {
 
         try {
             d("MON 00:00-24:00").diff(d("TUE 00:00-24:00"));
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("Expected same day (MON) for argument 'toOther', but was: TUE");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/EmailAddressConverterTest.java b/src/test/java/org/fuin/objects4j/vo/EmailAddressConverterTest.java
index 25acc8b..e7cc5ca 100644
--- a/src/test/java/org/fuin/objects4j/vo/EmailAddressConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/EmailAddressConverterTest.java
@@ -17,21 +17,19 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
 import static org.fuin.objects4j.vo.JsonbHelper.toJson;
 import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
 import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
-import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
-import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
-import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.xml.bind.JAXBException;
+import static org.fuin.utils4j.jaxb.JaxbUtils.*;
 
 // CHECKSTYLE:OFF
 public class EmailAddressConverterTest {
@@ -42,12 +40,12 @@ public class EmailAddressConverterTest {
 
     private ValueObjectConverter<String, EmailAddress> testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new EmailAddressConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -86,7 +84,7 @@ public final void testMarshal() throws JAXBException {
     @Test
     public final void testMarshalUnmarshal() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.email).isEqualTo(new EmailAddress("a@b.c"));
 
     }
@@ -96,8 +94,8 @@ public final void testUnmarshalError() {
 
         final String invalidEmailInXmlData = XML_PREFIX + "<data email=\"abc@\"/>";
         try {
-            unmarshal(invalidEmailInXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidEmailInXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseCauseMessage(ex, "The argument 'emailAddress' is not valid: 'abc@'");
         }
@@ -127,7 +125,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"email\":\"abc@\"}";
         try {
             fromJson(invalidJsonData, Data.class, new EmailAddressConverter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseMessage(ex, "The argument 'emailAddress' is not valid: 'abc@'");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/EmailAddressStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/EmailAddressStrValidatorTest.java
index f7ebfe6..4e0ebc3 100644
--- a/src/test/java/org/fuin/objects4j/vo/EmailAddressStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/EmailAddressStrValidatorTest.java
@@ -17,25 +17,25 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-
+import org.assertj.core.api.Assertions;
 import org.fuin.objects4j.common.ConstraintViolationException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class EmailAddressStrValidatorTest {
 
     private EmailAddressStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new EmailAddressStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
@@ -65,14 +65,14 @@ public final void testRequireArgValid() {
 
         try {
             EmailAddressStrValidator.requireArgValid("a", "");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'a' is not valid: ''");
         }
 
         try {
             EmailAddressStrValidator.requireArgValid("a", "abc@");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'a' is not valid: 'abc@'");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/EmailAddressTest.java b/src/test/java/org/fuin/objects4j/vo/EmailAddressTest.java
index 7effa49..c21dbec 100644
--- a/src/test/java/org/fuin/objects4j/vo/EmailAddressTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/EmailAddressTest.java
@@ -17,14 +17,15 @@
  */
 package org.fuin.objects4j.vo;
 
+import org.fuin.objects4j.common.ConstraintViolationException;
+import org.fuin.units4j.AbstractPersistenceTest;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.fuin.utils4j.Utils4J.deserialize;
 import static org.fuin.utils4j.Utils4J.serialize;
 
-import org.fuin.objects4j.common.ConstraintViolationException;
-import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
-
 //TESTCODE:BEGIN
 public final class EmailAddressTest extends AbstractPersistenceTest {
 
@@ -43,14 +44,18 @@ public final void testConstructValid() {
         assertThat(new EmailAddress(emailAddress).length()).isEqualTo(emailAddress.length());
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testConstructEmpty() {
-        new EmailAddress("");
+        assertThatThrownBy(() -> {
+            new EmailAddress("");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testConstructIllegal() {
-        new EmailAddress("abc@");
+        assertThatThrownBy(() -> {
+            new EmailAddress("abc@");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
     @Test
diff --git a/src/test/java/org/fuin/objects4j/vo/HourConverterTest.java b/src/test/java/org/fuin/objects4j/vo/HourConverterTest.java
index e4a8f25..e09b9de 100644
--- a/src/test/java/org/fuin/objects4j/vo/HourConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/HourConverterTest.java
@@ -17,21 +17,19 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
 import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
 import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
-import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
-import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
-import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.xml.bind.JAXBException;
+import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
+import static org.fuin.utils4j.jaxb.JaxbUtils.*;
 
 // CHECKSTYLE:OFF
 public class HourConverterTest {
@@ -42,12 +40,12 @@ public class HourConverterTest {
 
     private HourConverter testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new HourConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -69,7 +67,7 @@ public final void testMarshal() throws JAXBException {
     @Test
     public final void testMarshalUnmarshal() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.hour).isEqualTo(new Hour("23:59"));
 
     }
@@ -79,8 +77,8 @@ public final void testUnmarshalError() {
 
         final String invalidEmailInXmlData = XML_PREFIX + "<data hour=\"23:\"/>";
         try {
-            unmarshal(invalidEmailInXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidEmailInXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseCauseMessage(ex, "The argument 'hour' does not represent a valid hour like '00:00' or '23:59' or '24:00': '23:'");
         }
@@ -110,7 +108,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"hour\":\"23:\"}";
         try {
             fromJson(invalidJsonData, Data.class, new HourConverter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseMessage(ex, "The argument 'hour' does not represent a valid hour like '00:00' or '23:59' or '24:00': '23:'");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/HourRangeConverterTest.java b/src/test/java/org/fuin/objects4j/vo/HourRangeConverterTest.java
index 7ca2e9a..bbbd64b 100644
--- a/src/test/java/org/fuin/objects4j/vo/HourRangeConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/HourRangeConverterTest.java
@@ -17,21 +17,19 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
 import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
 import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
-import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
-import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
-import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.xml.bind.JAXBException;
+import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
+import static org.fuin.utils4j.jaxb.JaxbUtils.*;
 
 // CHECKSTYLE:OFF
 public class HourRangeConverterTest {
@@ -42,12 +40,12 @@ public class HourRangeConverterTest {
 
     private HourRangeConverter testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new HourRangeConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -69,7 +67,7 @@ public final void testMarshal() throws JAXBException {
     @Test
     public final void testMarshalUnmarshal() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.hourRange).isEqualTo(new HourRange("00:00-24:00"));
 
     }
@@ -79,8 +77,8 @@ public final void testUnmarshalError() {
 
         final String invalidEmailInXmlData = XML_PREFIX + "<data hourRange=\"17-18\"/>";
         try {
-            unmarshal(invalidEmailInXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidEmailInXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseCauseMessage(ex,
                     "The argument 'hourRange' does not represent a valid hour range like '00:00-24:00' or '06:00-21:00': '17-18'");
@@ -111,7 +109,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"hourRange\":\"17-18\"}";
         try {
             fromJson(invalidJsonData, Data.class, new HourRangeConverter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseMessage(ex,
                     "The argument 'hourRange' does not represent a valid hour range like '00:00-24:00' or '06:00-21:00': '17-18'");
diff --git a/src/test/java/org/fuin/objects4j/vo/HourRangeStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/HourRangeStrValidatorTest.java
index 095a9fd..609c32b 100644
--- a/src/test/java/org/fuin/objects4j/vo/HourRangeStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/HourRangeStrValidatorTest.java
@@ -17,23 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class HourRangeStrValidatorTest {
 
     private HourRangeStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new HourRangeStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/HourRangeTest.java b/src/test/java/org/fuin/objects4j/vo/HourRangeTest.java
index 3293c8c..e7063ed 100644
--- a/src/test/java/org/fuin/objects4j/vo/HourRangeTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/HourRangeTest.java
@@ -17,15 +17,14 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.junit.Assert.fail;
-
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
-
+import org.assertj.core.api.Assertions;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 // CHECKSTYLE:OFF
 public class HourRangeTest extends AbstractPersistenceTest {
@@ -43,7 +42,7 @@ public final void testConstruct() {
 
         try {
             new HourRange("13-14:00");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo(
                     "The argument 'hourRange' does not represent a valid hour range like '00:00-24:00' or '06:00-21:00': '13-14:00'");
@@ -51,14 +50,14 @@ public final void testConstruct() {
 
         try {
             new HourRange(null, new Hour("12:00"));
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'from' cannot be null");
         }
 
         try {
             new HourRange(new Hour("12:00"), null);
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'to' cannot be null");
         }
@@ -144,7 +143,7 @@ public final void testRequireArgValid() {
 
         try {
             HourRange.requireArgValid("a", "");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage())
                     .isEqualTo("The argument 'a' does not represent a valid hour range like '00:00-24:00' or '06:00-21:00': ''");
@@ -152,7 +151,7 @@ public final void testRequireArgValid() {
 
         try {
             HourRange.requireArgValid("b", "17-18");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage())
                     .isEqualTo("The argument 'b' does not represent a valid hour range like '00:00-24:00' or '06:00-21:00': '17-18'");
@@ -190,7 +189,7 @@ public void testToMinutesMultipleDays() {
 
         try {
             new HourRange("18:00-03:00").toMinutes();
-            fail();
+            Assertions.fail("");
         } catch (final IllegalArgumentException ex) {
             assertThat(ex.getMessage()).contains("[18:00-24:00, 00:00-03:00]");
         }
@@ -213,21 +212,21 @@ public void testJoinWithNextDayFails() {
 
         try {
             new HourRange("18:00-23:00").joinWithNextDay(new HourRange("00:00-03:00"));
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The 'to' hour value of this instance is not '24:00', but was: '23:00'");
         }
 
         try {
             new HourRange("18:00-24:00").joinWithNextDay(new HourRange("01:00-03:00"));
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The 'from' hour value of the other instance is not '00:00', but was: '01:00'");
         }
 
         try {
             new HourRange("00:00-24:00").joinWithNextDay(new HourRange("00:00-03:00"));
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo(
                     "The hour range of the other instance cannot be greater than hours not used by this instance: this='00:00-24:00', other='00:00-03:00'");
@@ -235,7 +234,7 @@ public void testJoinWithNextDayFails() {
 
         try {
             new HourRange("00:01-24:00").joinWithNextDay(new HourRange("00:00-00:02"));
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo(
                     "The hour range of the other instance cannot be greater than hours not used by this instance: this='00:01-24:00', other='00:00-00:02'");
diff --git a/src/test/java/org/fuin/objects4j/vo/HourRangesConverterTest.java b/src/test/java/org/fuin/objects4j/vo/HourRangesConverterTest.java
index ebdb332..e385c67 100644
--- a/src/test/java/org/fuin/objects4j/vo/HourRangesConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/HourRangesConverterTest.java
@@ -17,21 +17,19 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
 import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
 import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
-import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
-import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
-import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.xml.bind.JAXBException;
+import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
+import static org.fuin.utils4j.jaxb.JaxbUtils.*;
 
 // CHECKSTYLE:OFF
 public class HourRangesConverterTest {
@@ -42,12 +40,12 @@ public class HourRangesConverterTest {
 
     private HourRangesConverter testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new HourRangesConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -69,7 +67,7 @@ public final void testMarshal() throws JAXBException {
     @Test
     public final void testMarshalUnmarshal() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.hourRanges).isEqualTo(new HourRanges("09:00-12:00+13:00-17:00"));
 
     }
@@ -79,8 +77,8 @@ public final void testUnmarshalError() {
 
         final String invalidEmailInXmlData = XML_PREFIX + "<data hourRanges=\"17-18+19-20\"/>";
         try {
-            unmarshal(invalidEmailInXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidEmailInXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseCauseMessage(ex,
                     "The argument 'ranges' does not represent a valid hour range like '09:00-12:00+13:00-17:00': '17-18+19-20'");
@@ -111,7 +109,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"hourRanges\":\"17-18+19-20\"}";
         try {
             fromJson(invalidJsonData, Data.class, new HourRangesConverter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseMessage(ex,
                     "The argument 'ranges' does not represent a valid hour range like '09:00-12:00+13:00-17:00': '17-18+19-20'");
diff --git a/src/test/java/org/fuin/objects4j/vo/HourRangesStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/HourRangesStrValidatorTest.java
index c049246..99532a7 100644
--- a/src/test/java/org/fuin/objects4j/vo/HourRangesStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/HourRangesStrValidatorTest.java
@@ -17,23 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class HourRangesStrValidatorTest {
 
     private HourRangesStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new HourRangesStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/HourRangesTest.java b/src/test/java/org/fuin/objects4j/vo/HourRangesTest.java
index 73438d4..42956bc 100644
--- a/src/test/java/org/fuin/objects4j/vo/HourRangesTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/HourRangesTest.java
@@ -17,21 +17,20 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.fuin.objects4j.vo.HourRanges.ChangeType.ADDED;
-import static org.fuin.objects4j.vo.HourRanges.ChangeType.REMOVED;
-import static org.junit.Assert.fail;
-
-import java.util.Iterator;
-
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
-
+import org.assertj.core.api.Assertions;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.vo.HourRanges.Change;
 import org.fuin.objects4j.vo.HourRanges.ChangeType;
 import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.Iterator;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.fuin.objects4j.vo.HourRanges.ChangeType.ADDED;
+import static org.fuin.objects4j.vo.HourRanges.ChangeType.REMOVED;
 
 // CHECKSTYLE:OFF
 public class HourRangesTest extends AbstractPersistenceTest {
@@ -67,7 +66,7 @@ public final void testConstruct() {
 
         try {
             new HourRanges("13:00-14:00*17:00-19:00");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo(
                     "The argument 'ranges' does not represent a valid hour range like '09:00-12:00+13:00-17:00': '13:00-14:00*17:00-19:00'");
@@ -127,7 +126,7 @@ public final void testToMinutesTwoDays() {
 
         try {
             new HourRanges("18:00-03:00").toMinutes();
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).contains("two days");
         }
@@ -149,7 +148,7 @@ public final void testRequireArgValid() {
 
         try {
             HourRanges.requireArgValid("a", "");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage())
                     .isEqualTo("The argument 'a' does not represent a valid hour range like '09:00-12:00+13:00-17:00': ''");
@@ -157,7 +156,7 @@ public final void testRequireArgValid() {
 
         try {
             HourRanges.requireArgValid("b", "17-18+19-20");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage())
                     .isEqualTo("The argument 'b' does not represent a valid hour range like '09:00-12:00+13:00-17:00': '17-18+19-20'");
@@ -234,14 +233,14 @@ public void testDiffTwoDays() {
 
         try {
             h("18:00-03:00").diff(h("18:00-23:00"));
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).contains("from=18:00-03:00");
         }
 
         try {
             h("18:00-23:00").diff(h("18:00-03:00"));
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).contains("to=18:00-03:00");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/HourStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/HourStrValidatorTest.java
index a6fbb97..14ca9d3 100644
--- a/src/test/java/org/fuin/objects4j/vo/HourStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/HourStrValidatorTest.java
@@ -17,23 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class HourStrValidatorTest {
 
     private HourStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new HourStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/HourTest.java b/src/test/java/org/fuin/objects4j/vo/HourTest.java
index 526dcbd..f9f1c7c 100644
--- a/src/test/java/org/fuin/objects4j/vo/HourTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/HourTest.java
@@ -17,14 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-
 import nl.jqno.equalsverifier.EqualsVerifier;
-
+import org.assertj.core.api.Assertions;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 // CHECKSTYLE:OFF
 public class HourTest extends AbstractPersistenceTest {
@@ -43,7 +42,7 @@ public final void testConstruct() {
 
         try {
             new Hour("23:");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage())
                     .isEqualTo("The argument 'hour' does not represent a valid hour like '00:00' or '23:59' or '24:00': '23:'");
@@ -51,21 +50,21 @@ public final void testConstruct() {
 
         try {
             new Hour(-1, 0);
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'hour' is not a valid hour (0-24): '-1'");
         }
 
         try {
             new Hour(0, -1);
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'minute' is not a valid minute (0-59): '-1'");
         }
 
         try {
             new Hour(24, 59);
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'minute' must be '0' if the hour is '24': '59'");
         }
@@ -143,7 +142,7 @@ public final void testRequireArgValid() {
 
         try {
             Hour.requireArgValid("a", "");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage())
                     .isEqualTo("The argument 'a' does not represent a valid hour like '00:00' or '23:59' or '24:00': ''");
@@ -151,7 +150,7 @@ public final void testRequireArgValid() {
 
         try {
             Hour.requireArgValid("b", "23:");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage())
                     .isEqualTo("The argument 'b' does not represent a valid hour like '00:00' or '23:59' or '24:00': '23:'");
diff --git a/src/test/java/org/fuin/objects4j/vo/JsonbHelper.java b/src/test/java/org/fuin/objects4j/vo/JsonbHelper.java
index b1740aa..eb64a0f 100644
--- a/src/test/java/org/fuin/objects4j/vo/JsonbHelper.java
+++ b/src/test/java/org/fuin/objects4j/vo/JsonbHelper.java
@@ -17,12 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import org.eclipse.yasson.FieldAccessStrategy;
-
 import jakarta.json.bind.Jsonb;
 import jakarta.json.bind.JsonbBuilder;
 import jakarta.json.bind.JsonbConfig;
 import jakarta.json.bind.adapter.JsonbAdapter;
+import org.eclipse.yasson.FieldAccessStrategy;
 
 /**
  * Utility class for this package.
diff --git a/src/test/java/org/fuin/objects4j/vo/KeyValueTest.java b/src/test/java/org/fuin/objects4j/vo/KeyValueTest.java
index a6ee6f3..9010661 100644
--- a/src/test/java/org/fuin/objects4j/vo/KeyValueTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/KeyValueTest.java
@@ -17,13 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.fuin.objects4j.common.ConstraintViolationException;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.fuin.objects4j.common.ConstraintViolationException;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 // CHECKSTYLE:OFF
 public final class KeyValueTest {
diff --git a/src/test/java/org/fuin/objects4j/vo/LocaleConverterTest.java b/src/test/java/org/fuin/objects4j/vo/LocaleConverterTest.java
index f8be46f..e579012 100644
--- a/src/test/java/org/fuin/objects4j/vo/LocaleConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/LocaleConverterTest.java
@@ -17,12 +17,12 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.fuin.units4j.AbstractPersistenceTest;
+import org.junit.jupiter.api.Test;
 
 import java.util.Locale;
 
-import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public class LocaleConverterTest extends AbstractPersistenceTest {
diff --git a/src/test/java/org/fuin/objects4j/vo/LocaleParentEntity.java b/src/test/java/org/fuin/objects4j/vo/LocaleParentEntity.java
index 3524165..b9055aa 100644
--- a/src/test/java/org/fuin/objects4j/vo/LocaleParentEntity.java
+++ b/src/test/java/org/fuin/objects4j/vo/LocaleParentEntity.java
@@ -17,12 +17,12 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.Locale;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
+import java.util.Locale;
+
 // CHECKSTYLE:OFF
 @Entity(name = "LOCALE_PARENT")
 public class LocaleParentEntity {
diff --git a/src/test/java/org/fuin/objects4j/vo/LocaleStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/LocaleStrValidatorTest.java
index f98fb34..0ab5f58 100644
--- a/src/test/java/org/fuin/objects4j/vo/LocaleStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/LocaleStrValidatorTest.java
@@ -17,17 +17,16 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
+import jakarta.validation.ConstraintValidatorContext;
+import org.assertj.core.api.Assertions;
+import org.fuin.objects4j.common.ConstraintViolationException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Locale;
 
-import org.fuin.objects4j.common.ConstraintViolationException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.validation.ConstraintValidatorContext;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //CHECKSTYLE:OFF
 public final class LocaleStrValidatorTest {
@@ -36,12 +35,12 @@ public final class LocaleStrValidatorTest {
 
     private LocaleStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new LocaleStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
@@ -71,7 +70,7 @@ public final void testInvalidEmpty() {
         assertThat(testee.isValid("", CONTEXT)).isFalse();
         try {
             LocaleStrValidator.parseArg("a", "");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'a' is not valid: ''");
         }
@@ -84,7 +83,7 @@ public final void testInvalid() {
         assertThat(testee.isValid("d", CONTEXT)).isFalse();
         try {
             LocaleStrValidator.parseArg("a", "d");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'a' is not valid: 'd'");
         }
@@ -92,7 +91,7 @@ public final void testInvalid() {
         assertThat(testee.isValid("xx_XX", CONTEXT)).isFalse();
         try {
             LocaleStrValidator.parseArg("a", "xx_XX");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'a' is not valid: 'xx_XX'");
         }
@@ -100,7 +99,7 @@ public final void testInvalid() {
         assertThat(testee.isValid("xx_YY_zz", CONTEXT)).isFalse();
         try {
             LocaleStrValidator.parseArg("a", "xx_YY_zz");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'a' is not valid: 'xx_YY_zz'");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/MinutesBitSetBuilder.java b/src/test/java/org/fuin/objects4j/vo/MinutesBitSetBuilder.java
index 7ccaac0..d088bd3 100644
--- a/src/test/java/org/fuin/objects4j/vo/MinutesBitSetBuilder.java
+++ b/src/test/java/org/fuin/objects4j/vo/MinutesBitSetBuilder.java
@@ -17,11 +17,11 @@
  */
 package org.fuin.objects4j.vo;
 
-import java.util.BitSet;
-
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 
+import java.util.BitSet;
+
 /**
  * Helps building a bit set for hour/minutes.
  */
diff --git a/src/test/java/org/fuin/objects4j/vo/MultiDayOfTheWeekConverterTest.java b/src/test/java/org/fuin/objects4j/vo/MultiDayOfTheWeekConverterTest.java
index b0198bf..95d7e51 100644
--- a/src/test/java/org/fuin/objects4j/vo/MultiDayOfTheWeekConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/MultiDayOfTheWeekConverterTest.java
@@ -17,21 +17,19 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
 import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
 import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
-import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
-import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
-import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.xml.bind.JAXBException;
+import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
+import static org.fuin.utils4j.jaxb.JaxbUtils.*;
 
 // CHECKSTYLE:OFF
 public class MultiDayOfTheWeekConverterTest {
@@ -42,12 +40,12 @@ public class MultiDayOfTheWeekConverterTest {
 
     private MultiDayOfTheWeekConverter testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new MultiDayOfTheWeekConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -69,7 +67,7 @@ public final void testMarshal() throws JAXBException {
     @Test
     public final void testMarshalUnmarshal() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.multiDayOfTheWeek).isEqualTo(new MultiDayOfTheWeek("Mon/Tue"));
 
     }
@@ -79,8 +77,8 @@ public final void testUnmarshalError() {
 
         final String invalidEmailInXmlData = XML_PREFIX + "<data multiDayOfTheWeek=\"Mon+Tue\"/>";
         try {
-            unmarshal(invalidEmailInXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidEmailInXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseCauseMessage(ex,
                     "The argument 'multipleDayOfTheWeek' does not represent valid days of the week like 'Mon/Tue/Wed-Fri': 'Mon+Tue'");
@@ -111,7 +109,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"multiDayOfTheWeek\":\"Mon+Tue\"}";
         try {
             fromJson(invalidJsonData, Data.class, new MultiDayOfTheWeekConverter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseMessage(ex,
                     "The argument 'multipleDayOfTheWeek' does not represent valid days of the week like 'Mon/Tue/Wed-Fri': 'Mon+Tue'");
diff --git a/src/test/java/org/fuin/objects4j/vo/MultiDayOfTheWeekStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/MultiDayOfTheWeekStrValidatorTest.java
index 8f1eacd..52172f7 100644
--- a/src/test/java/org/fuin/objects4j/vo/MultiDayOfTheWeekStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/MultiDayOfTheWeekStrValidatorTest.java
@@ -17,23 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class MultiDayOfTheWeekStrValidatorTest {
 
     private MultiDayOfTheWeekStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new MultiDayOfTheWeekStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/MultiDayOfTheWeekTest.java b/src/test/java/org/fuin/objects4j/vo/MultiDayOfTheWeekTest.java
index f43497a..bfae1cd 100644
--- a/src/test/java/org/fuin/objects4j/vo/MultiDayOfTheWeekTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/MultiDayOfTheWeekTest.java
@@ -17,17 +17,16 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.junit.Assert.fail;
-
-import java.util.Iterator;
-
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
-
+import org.assertj.core.api.Assertions;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.Iterator;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 // CHECKSTYLE:OFF
 public class MultiDayOfTheWeekTest extends AbstractPersistenceTest {
@@ -46,7 +45,7 @@ public final void testConstruct() {
 
         try {
             m("MON+TUE");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo(
                     "The argument 'multipleDayOfTheWeek' does not represent valid days of the week like 'Mon/Tue/Wed-Fri': 'MON+TUE'");
@@ -142,14 +141,14 @@ public final void testRequireArgValid() {
 
         try {
             MultiDayOfTheWeek.requireArgValid("a", "");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'a' does not represent valid days of the week like 'Mon/Tue/Wed-Fri': ''");
         }
 
         try {
             MultiDayOfTheWeek.requireArgValid("b", "Mon+Tue");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage())
                     .isEqualTo("The argument 'b' does not represent valid days of the week like 'Mon/Tue/Wed-Fri': 'Mon+Tue'");
diff --git a/src/test/java/org/fuin/objects4j/vo/PasswordConverterTest.java b/src/test/java/org/fuin/objects4j/vo/PasswordConverterTest.java
index 308a22c..1830921 100644
--- a/src/test/java/org/fuin/objects4j/vo/PasswordConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/PasswordConverterTest.java
@@ -17,26 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.validation.ConstraintViolation;
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Set;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
 import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
-import static org.fuin.units4j.Units4JUtils.setPrivateField;
-import static org.fuin.units4j.Units4JUtils.validate;
+import static org.fuin.units4j.Units4JUtils.*;
 import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
 import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
 import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
-
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.validation.ConstraintViolation;
-import jakarta.xml.bind.JAXBException;
 
 // CHECKSTYLE:OFF
 public class PasswordConverterTest {
@@ -47,12 +44,12 @@ public class PasswordConverterTest {
 
     private ValueObjectConverter<String, Password> testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new PasswordConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -94,7 +91,7 @@ public final void testMarshal() throws JAXBException {
     @Test
     public final void testMarshalUnmarshal() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.password).isNotNull();
         assertThat(data.password).isEqualTo(new Password("abcd1234"));
 
@@ -105,8 +102,8 @@ public final void testUnmarshalError() {
 
         final String invalidPasswordInXmlData = XML_PREFIX + "<data password=\"abcd123\"/>";
         try {
-            unmarshal(invalidPasswordInXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidPasswordInXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseCauseMessage(ex, "The argument 'password' is not valid: 'abcd123'");
         }
@@ -150,7 +147,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"password\":\"abcd123\"}";
         try {
             fromJson(invalidJsonData, Data.class, new PasswordConverter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseMessage(ex, "The argument 'password' is not valid: 'abcd123'");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/PasswordSha512ConverterTest.java b/src/test/java/org/fuin/objects4j/vo/PasswordSha512ConverterTest.java
index 8e27446..8ef62f3 100644
--- a/src/test/java/org/fuin/objects4j/vo/PasswordSha512ConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/PasswordSha512ConverterTest.java
@@ -17,26 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.validation.ConstraintViolation;
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Set;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
 import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
-import static org.fuin.units4j.Units4JUtils.setPrivateField;
-import static org.fuin.units4j.Units4JUtils.validate;
+import static org.fuin.units4j.Units4JUtils.*;
 import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
 import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
 import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
-
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.validation.ConstraintViolation;
-import jakarta.xml.bind.JAXBException;
 
 //CHECKSTYLE:OFF
 public class PasswordSha512ConverterTest {
@@ -49,12 +46,12 @@ public class PasswordSha512ConverterTest {
 
     private ValueObjectConverter<String, PasswordSha512> testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new PasswordSha512Converter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -94,7 +91,7 @@ public final void testMarshal() throws JAXBException {
     @Test
     public final void testMarshalUnmarshal() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.passwordSha512).isEqualTo(new PasswordSha512(HASH));
 
     }
@@ -104,8 +101,8 @@ public final void testUnmarshalError() {
 
         final String invalidHashInXmlData = XML_PREFIX + "<data passwordSha512=\"1\"/>";
         try {
-            unmarshal(invalidHashInXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidHashInXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseCauseMessage(ex, "The argument 'hexEncodedHash' is not valid");
         }
@@ -149,7 +146,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"passwordSha512\":\"1\"}";
         try {
             fromJson(invalidJsonData, Data.class, new PasswordSha512Converter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseMessage(ex, "The argument 'hexEncodedHash' is not valid");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/PasswordSha512StrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/PasswordSha512StrValidatorTest.java
index 23bddea..e4353ec 100644
--- a/src/test/java/org/fuin/objects4j/vo/PasswordSha512StrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/PasswordSha512StrValidatorTest.java
@@ -17,23 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class PasswordSha512StrValidatorTest {
 
     private PasswordSha512StrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new PasswordSha512StrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/PasswordSha512Test.java b/src/test/java/org/fuin/objects4j/vo/PasswordSha512Test.java
index b14ecf6..c5a0afe 100644
--- a/src/test/java/org/fuin/objects4j/vo/PasswordSha512Test.java
+++ b/src/test/java/org/fuin/objects4j/vo/PasswordSha512Test.java
@@ -17,14 +17,15 @@
  */
 package org.fuin.objects4j.vo;
 
+import org.fuin.objects4j.common.ConstraintViolationException;
+import org.fuin.units4j.AbstractPersistenceTest;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.fuin.utils4j.Utils4J.deserialize;
 import static org.fuin.utils4j.Utils4J.serialize;
 
-import org.fuin.objects4j.common.ConstraintViolationException;
-import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
-
 //TESTCODE:BEGIN
 public final class PasswordSha512Test extends AbstractPersistenceTest {
 
@@ -50,21 +51,27 @@ public final void testCreateWithStringValid() {
         assertThat(new PasswordSha512(verySecret)).isNotEqualTo(new PasswordSha512(verySecret2));
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateEmpty() {
-        new PasswordSha512("");
+        assertThatThrownBy(() -> {
+            new PasswordSha512("");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateTooShort() {
-        new PasswordSha512("b4d4b13a02230f9672c92fd45aa44fd202bdba7de3fda640ac84ee5d54c"
-                + "57fde293b4bbddce1b9a56d63d674b47c4dd7e6d89536a1e126ebf0cd662e76e8be");
+        assertThatThrownBy(() -> {
+            new PasswordSha512("b4d4b13a02230f9672c92fd45aa44fd202bdba7de3fda640ac84ee5d54c"
+                    + "57fde293b4bbddce1b9a56d63d674b47c4dd7e6d89536a1e126ebf0cd662e76e8be");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateTooLong() {
-        new PasswordSha512("b4d4b13a02230f9672c92fd45aa44fd202bdba7de3fda640ac84ee5d54c"
-                + "57fde293b4bbddce1b9a56d63d674b47c4dd7e6d89536a1e126ebf0cd662e76e8bec3b4");
+        assertThatThrownBy(() -> {
+            new PasswordSha512("b4d4b13a02230f9672c92fd45aa44fd202bdba7de3fda640ac84ee5d54c"
+                    + "57fde293b4bbddce1b9a56d63d674b47c4dd7e6d89536a1e126ebf0cd662e76e8bec3b4");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
     @Test
diff --git a/src/test/java/org/fuin/objects4j/vo/PasswordStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/PasswordStrValidatorTest.java
index 78fbbd5..c2218df 100644
--- a/src/test/java/org/fuin/objects4j/vo/PasswordStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/PasswordStrValidatorTest.java
@@ -17,23 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class PasswordStrValidatorTest {
 
     private PasswordStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new PasswordStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/PasswordTest.java b/src/test/java/org/fuin/objects4j/vo/PasswordTest.java
index 605ba5c..e4e30bc 100644
--- a/src/test/java/org/fuin/objects4j/vo/PasswordTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/PasswordTest.java
@@ -17,14 +17,15 @@
  */
 package org.fuin.objects4j.vo;
 
+import org.fuin.objects4j.common.ConstraintViolationException;
+import org.fuin.units4j.AbstractPersistenceTest;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.fuin.utils4j.Utils4J.deserialize;
 import static org.fuin.utils4j.Utils4J.serialize;
 
-import org.fuin.objects4j.common.ConstraintViolationException;
-import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
-
 //TESTCODE:BEGIN
 public final class PasswordTest extends AbstractPersistenceTest {
 
@@ -43,19 +44,25 @@ public final void testCreateValid() {
         assertThat(new Password(password).length()).isEqualTo(password.length());
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateEmpty() {
-        new Password("");
+        assertThatThrownBy(() -> {
+            new Password("");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateTooShort() {
-        new Password("abc");
+        assertThatThrownBy(() -> {
+            new Password("abc");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateTooLong() {
-        new Password("123456789012345678901");
+        assertThatThrownBy(() -> {
+            new Password("123456789012345678901");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
     @Test
diff --git a/src/test/java/org/fuin/objects4j/vo/PropertiesContainValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/PropertiesContainValidatorTest.java
index 85bb6b1..81deb91 100644
--- a/src/test/java/org/fuin/objects4j/vo/PropertiesContainValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/PropertiesContainValidatorTest.java
@@ -17,17 +17,15 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.easymock.EasyMock.*;
 
 //TESTCODE:BEGIN
 public final class PropertiesContainValidatorTest {
@@ -36,7 +34,7 @@ public final class PropertiesContainValidatorTest {
 
     private PropertiesContain constraintAnnotation;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new PropertiesContainValidator();
         final String[] expected = new String[] { "b", "c" };
@@ -46,7 +44,7 @@ public final void setUp() {
         testee.initialize(constraintAnnotation);
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
         constraintAnnotation = null;
diff --git a/src/test/java/org/fuin/objects4j/vo/SecurityTokenTest.java b/src/test/java/org/fuin/objects4j/vo/SecurityTokenTest.java
index 1ee5bb2..ddd0c29 100644
--- a/src/test/java/org/fuin/objects4j/vo/SecurityTokenTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/SecurityTokenTest.java
@@ -17,12 +17,12 @@
  */
 package org.fuin.objects4j.vo;
 
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.fuin.utils4j.Utils4J.deserialize;
 import static org.fuin.utils4j.Utils4J.serialize;
 
-import org.junit.Test;
-
 //TESTCODE:BEGIN
 public class SecurityTokenTest {
 
diff --git a/src/test/java/org/fuin/objects4j/vo/TrimmedNotEmptyValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/TrimmedNotEmptyValidatorTest.java
index 9e3839b..8d775d4 100644
--- a/src/test/java/org/fuin/objects4j/vo/TrimmedNotEmptyValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/TrimmedNotEmptyValidatorTest.java
@@ -17,13 +17,13 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-
+import org.assertj.core.api.Assertions;
 import org.fuin.objects4j.common.ConstraintViolationException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test for the {@link TrimmedNotEmptyValidator} class.
@@ -33,12 +33,12 @@ public class TrimmedNotEmptyValidatorTest {
 
     private TrimmedNotEmptyValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new TrimmedNotEmptyValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
@@ -59,14 +59,14 @@ public final void testRequireArgValid() {
 
         try {
             TrimmedNotEmptyValidator.requireArgValid("a", "");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'a' cannot be empty");
         }
 
         try {
             TrimmedNotEmptyValidator.requireArgValid("a", " ");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'a' cannot be empty");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/UUIDConverterTest.java b/src/test/java/org/fuin/objects4j/vo/UUIDConverterTest.java
index ec1f0fc..9adb4c8 100644
--- a/src/test/java/org/fuin/objects4j/vo/UUIDConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/UUIDConverterTest.java
@@ -17,12 +17,12 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.fuin.units4j.AbstractPersistenceTest;
+import org.junit.jupiter.api.Test;
 
 import java.util.UUID;
 
-import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public class UUIDConverterTest extends AbstractPersistenceTest {
diff --git a/src/test/java/org/fuin/objects4j/vo/UUIDParentEntity.java b/src/test/java/org/fuin/objects4j/vo/UUIDParentEntity.java
index 81a67d0..6115a57 100644
--- a/src/test/java/org/fuin/objects4j/vo/UUIDParentEntity.java
+++ b/src/test/java/org/fuin/objects4j/vo/UUIDParentEntity.java
@@ -1,28 +1,29 @@
 /**
  * Copyright (C) 2013 Future Invent Informationsmanagement GmbH. All rights
  * reserved. <http://www.fuin.org/>
- *
+ * <p>
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation; either version 3 of the License, or (at your option) any
  * later version.
- *
+ * <p>
  * This library is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
- *
+ * <p>
  * You should have received a copy of the GNU Lesser General Public License
  * along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 package org.fuin.objects4j.vo;
 
-import java.util.UUID;
-
 import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
+import java.util.UUID;
+
 // CHECKSTYLE:OFF
 @Entity(name = "UUID_PARENT")
 public class UUIDParentEntity {
@@ -31,6 +32,7 @@ public class UUIDParentEntity {
     @Column(name = "ID")
     private long id;
 
+    @Convert(converter = UUIDConverter.class)
     @Column(name = "UUID", nullable = true)
     private UUID uuid;
 
diff --git a/src/test/java/org/fuin/objects4j/vo/UUIDStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/UUIDStrValidatorTest.java
index 632842b..cbf20e4 100644
--- a/src/test/java/org/fuin/objects4j/vo/UUIDStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/UUIDStrValidatorTest.java
@@ -17,27 +17,27 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
+import org.assertj.core.api.Assertions;
+import org.fuin.objects4j.common.ConstraintViolationException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.UUID;
 
-import org.fuin.objects4j.common.ConstraintViolationException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //CHECKSTYLE:OFF
 public final class UUIDStrValidatorTest {
 
     private UUIDStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new UUIDStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
@@ -81,7 +81,7 @@ public final void testInvalidEmpty() {
 
         try {
             UUIDStrValidator.parseArg("a", "");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'a' is not valid: ''");
         }
@@ -95,7 +95,7 @@ public final void testInvalidSingleNumber() {
 
         try {
             UUIDStrValidator.parseArg("a", "1");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'a' is not valid: '1'");
         }
@@ -110,7 +110,7 @@ public final void testInvalidSpecialCharacters() {
 
         try {
             UUIDStrValidator.parseArg("a", value);
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo("The argument 'a' is not valid: '" + value + "'");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/UserNameConverterTest.java b/src/test/java/org/fuin/objects4j/vo/UserNameConverterTest.java
index a3881c5..f20f755 100644
--- a/src/test/java/org/fuin/objects4j/vo/UserNameConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/UserNameConverterTest.java
@@ -17,26 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.validation.ConstraintViolation;
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Set;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
 import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
-import static org.fuin.units4j.Units4JUtils.setPrivateField;
-import static org.fuin.units4j.Units4JUtils.validate;
+import static org.fuin.units4j.Units4JUtils.*;
 import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
 import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
 import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
-
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.validation.ConstraintViolation;
-import jakarta.xml.bind.JAXBException;
 
 //CHECKSTYLE:OFF
 public class UserNameConverterTest {
@@ -49,12 +46,12 @@ public class UserNameConverterTest {
 
     private ValueObjectConverter<String, UserName> testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new UserNameConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -94,7 +91,7 @@ public final void testMarshal() throws JAXBException {
     @Test
     public final void testMarshalUnmarshal() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.userName).isEqualTo(new UserName(USER_NAME));
 
     }
@@ -104,8 +101,8 @@ public final void testUnmarshalError() {
 
         final String invalidUsernameInXmlData = XML_PREFIX + "<data userName=\"x\"/>";
         try {
-            unmarshal(invalidUsernameInXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidUsernameInXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseCauseMessage(ex, "The argument 'userName' is not valid: 'x'");
         }
@@ -149,7 +146,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"userName\":\"x\"}";
         try {
             fromJson(invalidJsonData, Data.class, new UserNameConverter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseMessage(ex, "The argument 'userName' is not valid: 'x'");
         }
diff --git a/src/test/java/org/fuin/objects4j/vo/UserNameStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/UserNameStrValidatorTest.java
index 030e41c..2be20e9 100644
--- a/src/test/java/org/fuin/objects4j/vo/UserNameStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/UserNameStrValidatorTest.java
@@ -17,23 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 // CHECKSTYLE:OFF
 public final class UserNameStrValidatorTest {
 
     private UserNameStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new UserNameStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/UserNameTest.java b/src/test/java/org/fuin/objects4j/vo/UserNameTest.java
index d41850a..5ae4315 100644
--- a/src/test/java/org/fuin/objects4j/vo/UserNameTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/UserNameTest.java
@@ -17,14 +17,15 @@
  */
 package org.fuin.objects4j.vo;
 
+import org.fuin.objects4j.common.ConstraintViolationException;
+import org.fuin.units4j.AbstractPersistenceTest;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.fuin.utils4j.Utils4J.deserialize;
 import static org.fuin.utils4j.Utils4J.serialize;
 
-import org.fuin.objects4j.common.ConstraintViolationException;
-import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
-
 //TESTCODE:BEGIN
 public final class UserNameTest extends AbstractPersistenceTest {
 
@@ -55,44 +56,60 @@ public final void testEqualsLowerUpperCase() {
         assertThat(new UserName("abc-1_B")).isEqualTo(new UserName("AbC-1_b"));
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateEmpty() {
-        new UserName("");
+        assertThatThrownBy(() -> {
+            new UserName("");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateTooShort() {
-        new UserName("ab");
+        assertThatThrownBy(() -> {
+            new UserName("ab");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateTooLong() {
-        new UserName("a12345678901234567890");
+        assertThatThrownBy(() -> {
+            new UserName("a12345678901234567890");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateStartsWithNumber() {
-        new UserName("1abc");
+        assertThatThrownBy(() -> {
+            new UserName("1abc");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateStartsWithUnderscore() {
-        new UserName("_abc");
+        assertThatThrownBy(() -> {
+            new UserName("_abc");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateStartsWithHyphen() {
-        new UserName("-abc");
+        assertThatThrownBy(() -> {
+            new UserName("-abc");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateContainsIllegalDoubleCross() {
-        new UserName("abc#1");
+        assertThatThrownBy(() -> {
+            new UserName("abc#1");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public final void testCreateContainsIllegalAtAndDot() {
-        new UserName("abc@def.com");
+        assertThatThrownBy(() -> {
+            new UserName("abc@def.com");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
     @Test
diff --git a/src/test/java/org/fuin/objects4j/vo/ValueObjectStringConverterTest.java b/src/test/java/org/fuin/objects4j/vo/ValueObjectStringConverterTest.java
index 340957a..e5f4e19 100644
--- a/src/test/java/org/fuin/objects4j/vo/ValueObjectStringConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/ValueObjectStringConverterTest.java
@@ -17,19 +17,17 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.xml.bind.JAXBException;
+import org.fuin.units4j.AbstractPersistenceTest;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
 import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
-import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
-import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-
-import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.xml.bind.JAXBException;
+import static org.fuin.utils4j.jaxb.JaxbUtils.*;
 
 // CHECKSTYLE:OFF
 public class ValueObjectStringConverterTest extends AbstractPersistenceTest {
@@ -40,12 +38,12 @@ public class ValueObjectStringConverterTest extends AbstractPersistenceTest {
 
     private ValueObjectStringConverter<AnyStr> testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new AnyStrConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -67,7 +65,7 @@ public final void testMarshal() throws JAXBException {
     @Test
     public final void testMarshalUnmarshal() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.anyStr).isNotNull();
         assertThat(data.anyStr).isEqualTo(new AnyStr("abcd1234"));
 
diff --git a/src/test/java/org/fuin/objects4j/vo/WeeklyOpeningHoursConverterTest.java b/src/test/java/org/fuin/objects4j/vo/WeeklyOpeningHoursConverterTest.java
index f8f5ad0..875fd92 100644
--- a/src/test/java/org/fuin/objects4j/vo/WeeklyOpeningHoursConverterTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/WeeklyOpeningHoursConverterTest.java
@@ -17,21 +17,19 @@
  */
 package org.fuin.objects4j.vo;
 
+import jakarta.xml.bind.JAXBException;
+import org.assertj.core.api.Assertions;
+import org.fuin.utils4j.jaxb.UnmarshallerBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.fuin.objects4j.vo.JsonbHelper.fromJson;
 import static org.fuin.objects4j.vo.JsonbHelper.toJson;
-import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
 import static org.fuin.units4j.Units4JUtils.assertCauseCauseCauseMessage;
-import static org.fuin.utils4j.jaxb.JaxbUtils.XML_PREFIX;
-import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
-import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
-import static org.junit.Assert.fail;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import jakarta.xml.bind.JAXBException;
+import static org.fuin.units4j.Units4JUtils.assertCauseCauseMessage;
+import static org.fuin.utils4j.jaxb.JaxbUtils.*;
 
 // CHECKSTYLE:OFF
 public class WeeklyOpeningHoursConverterTest {
@@ -44,12 +42,12 @@ public class WeeklyOpeningHoursConverterTest {
 
     private WeeklyOpeningHoursConverter testee;
 
-    @Before
+    @BeforeEach
     public void setup() {
         testee = new WeeklyOpeningHoursConverter();
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         testee = null;
     }
@@ -71,7 +69,7 @@ public final void testMarshal() throws JAXBException {
     @Test
     public final void testMarshalUnmarshal() throws JAXBException {
 
-        final Data data = unmarshal(XML, Data.class);
+        final Data data = unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), XML);
         assertThat(data.weeklyOpeningHours).isEqualTo(new WeeklyOpeningHours(HOURS));
 
     }
@@ -81,8 +79,8 @@ public final void testUnmarshalError() {
 
         final String invalidEmailInXmlData = XML_PREFIX + "<data weeklyOpeningHours=\"17-18+19-20\"/>";
         try {
-            unmarshal(invalidEmailInXmlData, Data.class);
-            fail("Expected an exception");
+            unmarshal(new UnmarshallerBuilder().addClassesToBeBound(Data.class).withHandler(event -> false).build(), invalidEmailInXmlData);
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseCauseMessage(ex,
                     "The argument 'weeklyOpeningHours' does not represent valid weekly opening hours like 'Mon-Fri 09:00-12:00+13:00-17:00,Sat/Sun 09:-12:00': '17-18+19-20'");
@@ -113,7 +111,7 @@ public final void testUnmarshalErrorJsonb() {
         final String invalidJsonData = "{\"weeklyOpeningHours\":\"17-18+19-20\"}";
         try {
             fromJson(invalidJsonData, Data.class, new WeeklyOpeningHoursConverter());
-            fail("Expected an exception");
+            Assertions.fail("Expected an exception");
         } catch (final RuntimeException ex) {
             assertCauseCauseMessage(ex,
                     "The argument 'weeklyOpeningHours' does not represent valid weekly opening hours like 'Mon-Fri 09:00-12:00+13:00-17:00,Sat/Sun 09:-12:00': '17-18+19-20'");
diff --git a/src/test/java/org/fuin/objects4j/vo/WeeklyOpeningHoursStrValidatorTest.java b/src/test/java/org/fuin/objects4j/vo/WeeklyOpeningHoursStrValidatorTest.java
index a885600..c8282ee 100644
--- a/src/test/java/org/fuin/objects4j/vo/WeeklyOpeningHoursStrValidatorTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/WeeklyOpeningHoursStrValidatorTest.java
@@ -17,23 +17,23 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 //TESTCODE:BEGIN
 public final class WeeklyOpeningHoursStrValidatorTest {
 
     private WeeklyOpeningHoursStrValidator testee;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         testee = new WeeklyOpeningHoursStrValidator();
     }
 
-    @After
+    @AfterEach
     public final void tearDown() {
         testee = null;
     }
diff --git a/src/test/java/org/fuin/objects4j/vo/WeeklyOpeningHoursTest.java b/src/test/java/org/fuin/objects4j/vo/WeeklyOpeningHoursTest.java
index a320cf4..fbe232f 100644
--- a/src/test/java/org/fuin/objects4j/vo/WeeklyOpeningHoursTest.java
+++ b/src/test/java/org/fuin/objects4j/vo/WeeklyOpeningHoursTest.java
@@ -17,24 +17,18 @@
  */
 package org.fuin.objects4j.vo;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.fuin.objects4j.vo.DayOfTheWeek.FRI;
-import static org.fuin.objects4j.vo.DayOfTheWeek.MON;
-import static org.fuin.objects4j.vo.DayOfTheWeek.SAT;
-import static org.fuin.objects4j.vo.DayOfTheWeek.THU;
-import static org.fuin.objects4j.vo.DayOfTheWeek.TUE;
-import static org.fuin.objects4j.vo.DayOfTheWeek.WED;
-import static org.fuin.objects4j.vo.HourRanges.ChangeType.ADDED;
-import static org.fuin.objects4j.vo.HourRanges.ChangeType.REMOVED;
-import static org.junit.Assert.fail;
-
 import nl.jqno.equalsverifier.EqualsVerifier;
-
+import org.assertj.core.api.Assertions;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.vo.DayOpeningHours.Change;
 import org.fuin.objects4j.vo.HourRanges.ChangeType;
 import org.fuin.units4j.AbstractPersistenceTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.fuin.objects4j.vo.DayOfTheWeek.*;
+import static org.fuin.objects4j.vo.HourRanges.ChangeType.ADDED;
+import static org.fuin.objects4j.vo.HourRanges.ChangeType.REMOVED;
 
 // CHECKSTYLE:OFF
 public class WeeklyOpeningHoursTest extends AbstractPersistenceTest {
@@ -51,7 +45,7 @@ public final void testConstruct() {
 
         try {
             w("Mon+Tue 13:00-14:00*17:00-19:00");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo(
                     "The argument 'weeklyOpeningHours' does not represent valid weekly opening hours like 'Mon-Fri 09:00-12:00+13:00-17:00,Sat/Sun 09:-12:00': 'Mon+Tue 13:00-14:00*17:00-19:00'");
@@ -113,7 +107,7 @@ public final void testRequireArgValid() {
 
         try {
             WeeklyOpeningHours.requireArgValid("a", "");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo(
                     "The argument 'a' does not represent valid weekly opening hours like 'Mon-Fri 09:00-12:00+13:00-17:00,Sat/Sun 09:-12:00': ''");
@@ -121,7 +115,7 @@ public final void testRequireArgValid() {
 
         try {
             WeeklyOpeningHours.requireArgValid("b", "Mon 17-18,Tue 19-20");
-            fail();
+            Assertions.fail("");
         } catch (final ConstraintViolationException ex) {
             assertThat(ex.getMessage()).isEqualTo(
                     "The argument 'b' does not represent valid weekly opening hours like 'Mon-Fri 09:00-12:00+13:00-17:00,Sat/Sun 09:-12:00': 'Mon 17-18,Tue 19-20'");
diff --git a/src/test/resources/META-INF/persistence.xml b/src/test/resources/META-INF/persistence.xml
index fa6fb7b..52cfd28 100644
--- a/src/test/resources/META-INF/persistence.xml
+++ b/src/test/resources/META-INF/persistence.xml
@@ -6,7 +6,10 @@
 
 	<persistence-unit name="testPU"	transaction-type="RESOURCE_LOCAL">
 
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<!--
 		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+		-->
 
 		<class>org.fuin.objects4j.vo.CurrencyAmountParentEntity</class>
 		<class>org.fuin.objects4j.vo.CurrencyAmountConverter</class>
@@ -64,16 +67,18 @@
 			<property name="jakarta.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
 			<property name="jakarta.persistence.jdbc.user" value="sa" />
 			<property name="jakarta.persistence.jdbc.password" value="" />
-			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+			<property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create" />
 			<property name="eclipselink.target-database" value="HSQL"/>
-			
+			<property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+
 			<!--
             <property name="jakarta.persistence.jdbc.driver" value="org.postgresql.Driver" />
             <property name="jakarta.persistence.jdbc.url" value="jdbc:postgresql://localhost:5432/postgres" />
-			<property name="eclipselink.target-database" value="PostgreSQL"/>
 			<property name="jakarta.persistence.jdbc.user" value="postgres" />
 			<property name="jakarta.persistence.jdbc.password" value="abc" />
-			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+			<property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create" />
+			<property name="eclipselink.target-database" value="PostgreSQL"/>
+			<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
              -->
              
 			<!-- Necessary for shutdown of HSQL in tests -->