diff --git a/build.gradle b/build.gradle
index 1db41463..d7269f86 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,14 +3,14 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath "io.freefair.gradle:aspectj-plugin:3.8.4"
+        classpath "io.freefair.gradle:aspectj-plugin:6.4.3"
     }
 }
 
 plugins {
-    id 'org.springframework.boot' version '2.3.4.RELEASE'
-    id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-    id "io.freefair.aspectj.post-compile-weaving" version "4.1.4"
+    id 'org.springframework.boot' version '2.7.17'
+    id 'io.spring.dependency-management' version '1.1.3'
+    id 'io.freefair.aspectj.post-compile-weaving' version '8.4'
     id 'java'
     id 'war'
 }
@@ -19,8 +19,8 @@ group = 'cz.cvut.kbss.analysis'
 version = '0.0.1-SNAPSHOT'
 
 compileJava {
-    sourceCompatibility = '1.8'
-    targetCompatibility = '1.8'
+    sourceCompatibility = '11'
+    targetCompatibility = '11'
 }
 
 repositories {
@@ -34,11 +34,11 @@ war {
 sourceSets.main.java.srcDirs += "src/main/generated"
 
 dependencies {
-    def jopaVersion = '0.14.7'
+    def jopaVersion = '1.1.4'
     implementation "cz.cvut.kbss.jopa:jopa-impl:$jopaVersion"
-    implementation "cz.cvut.kbss.jopa:ontodriver-sesame:$jopaVersion"
-    implementation 'cz.cvut.kbss.jsonld:jb4jsonld-jackson:0.5.1'
-    implementation 'com.github.ledsoft:jopa-spring-transaction:0.0.7'
+    implementation "cz.cvut.kbss.jopa:ontodriver-rdf4j:$jopaVersion"
+    implementation 'cz.cvut.kbss.jsonld:jb4jsonld-jackson:0.13.2'
+    implementation 'com.github.ledsoft:jopa-spring-transaction:0.2.0'
 
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-security'
@@ -53,7 +53,7 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok:1.18.12'
     providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
 
-    aspect 'cz.cvut.kbss.jopa:jopa-impl:0.14.4'
+    aspect 'cz.cvut.kbss.jopa:jopa-impl:1.1.4'
 
     testImplementation('org.springframework.boot:spring-boot-starter-test') {
         exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c0..afba1092 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 42e5d81a..744c64d1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Sep 20 16:24:26 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c..65dcd68d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f9..6689b85b 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/src/main/java/cz/cvut/kbss/analysis/persistence/MainPersistenceFactory.java b/src/main/java/cz/cvut/kbss/analysis/persistence/MainPersistenceFactory.java
index 54608a96..d3e6c329 100755
--- a/src/main/java/cz/cvut/kbss/analysis/persistence/MainPersistenceFactory.java
+++ b/src/main/java/cz/cvut/kbss/analysis/persistence/MainPersistenceFactory.java
@@ -5,7 +5,7 @@
 import cz.cvut.kbss.jopa.Persistence;
 import cz.cvut.kbss.jopa.model.EntityManagerFactory;
 import cz.cvut.kbss.jopa.model.JOPAPersistenceProvider;
-import cz.cvut.kbss.ontodriver.sesame.config.SesameOntoDriverProperties;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -19,6 +19,7 @@
 import static cz.cvut.kbss.jopa.model.JOPAPersistenceProperties.*;
 import static cz.cvut.kbss.jopa.model.PersistenceProperties.JPA_PERSISTENCE_PROVIDER;
 import static cz.cvut.kbss.ontodriver.config.OntoDriverProperties.*;
+import static cz.cvut.kbss.ontodriver.rdf4j.config.Rdf4jOntoDriverProperties.*;
 
 /**
  * Sets up persistence and provides {@link EntityManagerFactory} as Spring bean.
@@ -73,7 +74,7 @@ private void init() {
         }
         // OPTIMIZATION: Always use statement retrieval with unbound property. Should spare
         // repository queries
-        properties.put(SesameOntoDriverProperties.SESAME_LOAD_ALL_THRESHOLD, "1");
+        properties.put(LOAD_ALL_THRESHOLD, "1");
         this.emf = Persistence.createEntityManagerFactory("fta-fmea", properties);
     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5db13969..de5fb2f4 100755
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -6,7 +6,7 @@ repository:
 
 
 persistence:
-  driver: cz.cvut.kbss.ontodriver.sesame.SesameDataSource
+  driver: cz.cvut.kbss.ontodriver.rdf4j.Rdf4jDataSource
   language: cs
 
 security:
diff --git a/src/test/java/cz/cvut/kbss/analysis/dao/BaseDaoTestRunner.java b/src/test/java/cz/cvut/kbss/analysis/dao/BaseDaoTestRunner.java
index 2f475e92..8dd0af1d 100755
--- a/src/test/java/cz/cvut/kbss/analysis/dao/BaseDaoTestRunner.java
+++ b/src/test/java/cz/cvut/kbss/analysis/dao/BaseDaoTestRunner.java
@@ -5,14 +5,14 @@
 import cz.cvut.kbss.analysis.environment.TransactionalTestRunner;
 import cz.cvut.kbss.analysis.environment.config.TestPersistenceConfig;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer;
+import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration(initializers = ConfigFileApplicationContextInitializer.class, classes = {
+@ContextConfiguration(initializers = ConfigDataApplicationContextInitializer.class, classes = {
         TestPersistenceConfig.class,
         PersistenceConf.class,
         RepositoryConf.class,
diff --git a/src/test/java/cz/cvut/kbss/analysis/dao/FaultEventDaoTest.java b/src/test/java/cz/cvut/kbss/analysis/dao/FaultEventDaoTest.java
index a0214492..ce82a7bb 100755
--- a/src/test/java/cz/cvut/kbss/analysis/dao/FaultEventDaoTest.java
+++ b/src/test/java/cz/cvut/kbss/analysis/dao/FaultEventDaoTest.java
@@ -5,7 +5,7 @@
 import cz.cvut.kbss.analysis.model.util.EventType;
 import cz.cvut.kbss.analysis.model.util.GateType;
 import cz.cvut.kbss.jopa.model.EntityManager;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -40,7 +40,7 @@ public void isChild_isChild_shouldReturnTrue() {
 
         boolean result = faultEventDao.isChild(child.getUri());
 
-        Assert.assertTrue(result);
+        Assertions.assertTrue(result);
     }
 
     @Test
@@ -55,7 +55,7 @@ public void isChild_isNot_shouldReturnFalse() {
 
         boolean result = faultEventDao.isChild(notChild.getUri());
 
-        Assert.assertFalse(result);
+        Assertions.assertFalse(result);
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/cz/cvut/kbss/analysis/dao/FaultTreeDaoTest.java b/src/test/java/cz/cvut/kbss/analysis/dao/FaultTreeDaoTest.java
index 6de0ec5a..d65b7eac 100755
--- a/src/test/java/cz/cvut/kbss/analysis/dao/FaultTreeDaoTest.java
+++ b/src/test/java/cz/cvut/kbss/analysis/dao/FaultTreeDaoTest.java
@@ -6,7 +6,7 @@
 import cz.cvut.kbss.analysis.model.util.EventType;
 import cz.cvut.kbss.analysis.model.util.GateType;
 import cz.cvut.kbss.jopa.model.EntityManager;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -45,7 +45,7 @@ public void isRootEvent_isRoot_shouldReturnTrue() {
 
         boolean result = faultTreeDao.isRootEvent(rootEvent.getUri());
 
-        Assert.assertTrue(result);
+        Assertions.assertTrue(result);
     }
 
     @Test
@@ -74,7 +74,7 @@ public void isRootEvent_isNot_shouldReturnFalse() {
 
         boolean result = faultTreeDao.isRootEvent(child.getUri());
 
-        Assert.assertFalse(result);
+        Assertions.assertFalse(result);
     }
 
     @Test // simulation of symmetric branches not queried in the application
@@ -116,26 +116,26 @@ public void symmetricBranches_shouldQueryAll() {
         transactional(() -> faultTreeDao.update(tree)); // probabilities propagation update (simulation)
 
         Optional<FaultTree> optionalTree = faultTreeDao.find(tree.getUri());
-        if(!optionalTree.isPresent()) Assert.fail("Tree was not queried");
+        if(!optionalTree.isPresent()) Assertions.fail("Tree was not queried");
 
         FaultTree queriedTree = optionalTree.get();
         FaultEvent manifestingEvent = queriedTree.getManifestingEvent();
-        Assert.assertNotNull(manifestingEvent);
+        Assertions.assertNotNull(manifestingEvent);
 
         Set<FaultEvent> rootChildren = manifestingEvent.getChildren();
-        Assert.assertFalse(rootChildren.isEmpty());
+        Assertions.assertFalse(rootChildren.isEmpty());
 
         rootChildren.forEach(child -> {
-            Assert.assertEquals(1, child.getChildren().size());
+            Assertions.assertEquals(1, child.getChildren().size());
             FaultEvent childX = child.getChildren().iterator().next();
-            Assert.assertEquals("X", childX.getName());
+            Assertions.assertEquals("X", childX.getName());
 
             Set<FaultEvent> xChildren = childX.getChildren();
-            Assert.assertFalse(xChildren.isEmpty());
+            Assertions.assertFalse(xChildren.isEmpty());
 
             Set<String> xChildrenNames = xChildren.stream().map(FaultEvent::getName).collect(Collectors.toSet());
-            Assert.assertTrue(xChildrenNames.contains("Y"));
-            Assert.assertTrue(xChildrenNames.contains("Z"));
+            Assertions.assertTrue(xChildrenNames.contains("Y"));
+            Assertions.assertTrue(xChildrenNames.contains("Z"));
         });
     }
 
diff --git a/src/test/java/cz/cvut/kbss/analysis/dao/UserDaoTest.java b/src/test/java/cz/cvut/kbss/analysis/dao/UserDaoTest.java
index ebc99ca9..336519e8 100755
--- a/src/test/java/cz/cvut/kbss/analysis/dao/UserDaoTest.java
+++ b/src/test/java/cz/cvut/kbss/analysis/dao/UserDaoTest.java
@@ -2,7 +2,7 @@
 
 import cz.cvut.kbss.analysis.model.User;
 import cz.cvut.kbss.jopa.model.EntityManager;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -23,7 +23,7 @@ class UserDaoTest extends BaseDaoTestRunner {
     public void findByUsername_userNotExists_shouldReturnNull() {
         String username = "unknownUsername";
         Optional<User> result = userDao.findByUsername(username);
-        Assert.assertFalse(result.isPresent());
+        Assertions.assertFalse(result.isPresent());
     }
 
     @Test
@@ -35,15 +35,15 @@ public void findByUsername_userExists_shouldFindUser() {
         transactional(() -> em.persist(user));
 
         Optional<User> result = userDao.findByUsername(user.getUsername());
-        Assert.assertTrue(result.isPresent());
-        Assert.assertEquals(user.getUsername(), result.get().getUsername());
+        Assertions.assertTrue(result.isPresent());
+        Assertions.assertEquals(user.getUsername(), result.get().getUsername());
     }
 
     @Test
     public void existsWithUsername_userNotExists_shouldReturnFalse() {
         String username = "unknownUsername";
         boolean result = userDao.existsWithUsername(username);
-        Assert.assertFalse(result);
+        Assertions.assertFalse(result);
     }
 
     @Test
@@ -55,7 +55,7 @@ public void existsWithUsername_userExists_shouldReturnTrue() {
         transactional(() -> em.persist(user));
 
         boolean result = userDao.existsWithUsername(user.getUsername());
-        Assert.assertTrue(result);
+        Assertions.assertTrue(result);
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/cz/cvut/kbss/analysis/environment/TestPersistenceFactory.java b/src/test/java/cz/cvut/kbss/analysis/environment/TestPersistenceFactory.java
index c5b0be6a..4f051436 100755
--- a/src/test/java/cz/cvut/kbss/analysis/environment/TestPersistenceFactory.java
+++ b/src/test/java/cz/cvut/kbss/analysis/environment/TestPersistenceFactory.java
@@ -5,9 +5,9 @@
 import cz.cvut.kbss.jopa.Persistence;
 import cz.cvut.kbss.jopa.model.EntityManagerFactory;
 import cz.cvut.kbss.jopa.model.JOPAPersistenceProvider;
-import cz.cvut.kbss.ontodriver.sesame.config.SesameOntoDriverProperties;
+import cz.cvut.kbss.ontodriver.rdf4j.config.Rdf4jOntoDriverProperties;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer;
+import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
@@ -22,7 +22,7 @@
 import static cz.cvut.kbss.jopa.model.JOPAPersistenceProperties.*;
 
 @TestConfiguration
-@ContextConfiguration(initializers = ConfigFileApplicationContextInitializer.class, classes = {PersistenceConf.class, RepositoryConf.class})
+@ContextConfiguration(initializers = ConfigDataApplicationContextInitializer.class, classes = {PersistenceConf.class, RepositoryConf.class})
 @ActiveProfiles("test")
 public class TestPersistenceFactory {
 
@@ -62,14 +62,14 @@ public static Map<String, String> defaultParams() {
     private void init() {
         final Map<String, String> properties = defaultParams();
         properties.put(ONTOLOGY_PHYSICAL_URI_KEY, repositoryConf.getUrl());
-        properties.put(SesameOntoDriverProperties.SESAME_USE_VOLATILE_STORAGE, Boolean.TRUE.toString());
+        properties.put(Rdf4jOntoDriverProperties.USE_VOLATILE_STORAGE, Boolean.TRUE.toString());
         properties.put(DATA_SOURCE_CLASS, persistenceConf.getDriver());
         properties.put(LANG, persistenceConf.getLanguage());
         properties.put(CACHE_ENABLED, "false");
 
         // OPTIMIZATION: Always use statement retrieval with unbound property. Should spare
         // repository queries
-        properties.put(SesameOntoDriverProperties.SESAME_LOAD_ALL_THRESHOLD, "1");
+        properties.put(Rdf4jOntoDriverProperties.LOAD_ALL_THRESHOLD, "1");
         this.emf = Persistence.createEntityManagerFactory("fta-fmea-test", properties);
     }
 
diff --git a/src/test/java/cz/cvut/kbss/analysis/service/ComponentRepositoryServiceTest.java b/src/test/java/cz/cvut/kbss/analysis/service/ComponentRepositoryServiceTest.java
index 2b3c49f8..8a0b5468 100755
--- a/src/test/java/cz/cvut/kbss/analysis/service/ComponentRepositoryServiceTest.java
+++ b/src/test/java/cz/cvut/kbss/analysis/service/ComponentRepositoryServiceTest.java
@@ -7,7 +7,7 @@
 import cz.cvut.kbss.analysis.model.Component;
 import cz.cvut.kbss.analysis.model.Function;
 import cz.cvut.kbss.analysis.service.validation.ComponentValidator;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mapdb.Fun;
@@ -64,8 +64,8 @@ void updateByDTO_shouldFind_shouldCopyData_shouldCallUpdate() {
         Component result = repositoryService.updateByDTO(updateDTO);
 
         Mockito.verify(componentDao).update(component);
-        Assert.assertEquals(component.getUri(), result.getUri());
-        Assert.assertEquals(updateDTO.getName(), result.getName());
+        Assertions.assertEquals(component.getUri(), result.getUri());
+        Assertions.assertEquals(updateDTO.getName(), result.getName());
     }
 
     @Test
@@ -86,7 +86,7 @@ void addFunction_shouldAddFunction_shouldCallUpdate() {
         Mockito.verify(componentDao).update(componentCaptor.capture());
 
         Component componentToUpdate = componentCaptor.getValue();
-        Assert.assertTrue(componentToUpdate.getFunctions().contains(function));
+        Assertions.assertTrue(componentToUpdate.getFunctions().contains(function));
     }
 
     @Test
@@ -106,7 +106,7 @@ void deleteFunction_shouldRemoveFromFunctions_shouldCallUpdate() {
         repositoryService.deleteFunction(component.getUri(), function.getUri());
 
         Mockito.verify(componentDao).update(component);
-        Assert.assertFalse(component.getFunctions().contains(function));
+        Assertions.assertFalse(component.getFunctions().contains(function));
     }
 
     @Test
@@ -127,7 +127,7 @@ void linkComponents_shouldFindComponents_shouldSetParentComponent_shouldCallUpda
         repositoryService.linkComponents(component.getUri(), linkComponent.getUri());
 
         Mockito.verify(componentDao).update(component);
-        Assert.assertEquals(linkComponent.getUri(), component.getParentComponent());
+        Assertions.assertEquals(linkComponent.getUri(), component.getParentComponent());
     }
 
     @Test
@@ -145,7 +145,7 @@ void linkComponents_shouldFindComponent_shouldSetParentNull_shouldCallUpdate() {
         repositoryService.unlinkComponents(component.getUri());
 
         Mockito.verify(componentDao).update(component);
-        Assert.assertNull(component.getParentComponent());
+        Assertions.assertNull(component.getParentComponent());
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/cz/cvut/kbss/analysis/service/FailureModesRowRepositoryServiceTest.java b/src/test/java/cz/cvut/kbss/analysis/service/FailureModesRowRepositoryServiceTest.java
index 6f7742cb..6c6074c1 100755
--- a/src/test/java/cz/cvut/kbss/analysis/service/FailureModesRowRepositoryServiceTest.java
+++ b/src/test/java/cz/cvut/kbss/analysis/service/FailureModesRowRepositoryServiceTest.java
@@ -4,7 +4,7 @@
 import cz.cvut.kbss.analysis.dto.update.FailureModesRowRpnUpdateDTO;
 import cz.cvut.kbss.analysis.environment.Generator;
 import cz.cvut.kbss.analysis.model.FailureModesRow;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -50,9 +50,9 @@ void updateByDTO_shouldFind_shouldCopyData_shouldCallUpdate() {
         repositoryService.updateByDTO(updateDTO);
 
         Mockito.verify(failureModesRowDao).update(row);
-        Assert.assertEquals(updateDTO.getSeverity(), row.getRiskPriorityNumber().getSeverity());
-        Assert.assertEquals(updateDTO.getOccurrence(), row.getRiskPriorityNumber().getOccurrence());
-        Assert.assertEquals(updateDTO.getDetection(), row.getRiskPriorityNumber().getDetection());
+        Assertions.assertEquals(updateDTO.getSeverity(), row.getRiskPriorityNumber().getSeverity());
+        Assertions.assertEquals(updateDTO.getOccurrence(), row.getRiskPriorityNumber().getOccurrence());
+        Assertions.assertEquals(updateDTO.getDetection(), row.getRiskPriorityNumber().getDetection());
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/cz/cvut/kbss/analysis/service/FailureModesTableRepositoryServiceTest.java b/src/test/java/cz/cvut/kbss/analysis/service/FailureModesTableRepositoryServiceTest.java
index 7584a965..6e2e11ef 100755
--- a/src/test/java/cz/cvut/kbss/analysis/service/FailureModesTableRepositoryServiceTest.java
+++ b/src/test/java/cz/cvut/kbss/analysis/service/FailureModesTableRepositoryServiceTest.java
@@ -4,7 +4,7 @@
 import cz.cvut.kbss.analysis.dto.update.FailureModesTableUpdateDTO;
 import cz.cvut.kbss.analysis.environment.Generator;
 import cz.cvut.kbss.analysis.model.FailureModesTable;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -50,7 +50,7 @@ void updateByDTO_shouldFind_shouldCopyData_shouldCallUpdate() {
         repositoryService.updateByDTO(updateDTO);
 
         Mockito.verify(failureModesTableDao).update(table);
-        Assert.assertEquals(updateDTO.getName(), table.getName());
+        Assertions.assertEquals(updateDTO.getName(), table.getName());
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/cz/cvut/kbss/analysis/service/FaultEventRepositoryServiceTest.java b/src/test/java/cz/cvut/kbss/analysis/service/FaultEventRepositoryServiceTest.java
index 7a4c454c..552d5992 100755
--- a/src/test/java/cz/cvut/kbss/analysis/service/FaultEventRepositoryServiceTest.java
+++ b/src/test/java/cz/cvut/kbss/analysis/service/FaultEventRepositoryServiceTest.java
@@ -8,7 +8,7 @@
 import cz.cvut.kbss.analysis.model.FailureMode;
 import cz.cvut.kbss.analysis.model.FaultEvent;
 import cz.cvut.kbss.analysis.service.validation.FaultEventValidator;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -105,7 +105,7 @@ void propagateProbability_nonIntermediate_justReturnValue() {
 
         Double result = repositoryService.propagateProbability(event);
 
-        Assert.assertEquals(event.getProbability(), result);
+        Assertions.assertEquals(event.getProbability(), result);
     }
 
     @Test
@@ -119,7 +119,7 @@ void getFailureMode_shouldFindEvent_shouldReturnItsFailureMode() {
         Mockito.when(faultEventDao.find(eq(event.getUri()))).thenReturn(Optional.of(event));
 
         FailureMode result = repositoryService.getFailureMode(event.getUri());
-        Assert.assertEquals(event.getFailureMode(), result);
+        Assertions.assertEquals(event.getFailureMode(), result);
     }
 
     @Test
@@ -143,9 +143,9 @@ void addFailureMode_shouldSetData_shouldUpdateEvent() {
 
         Mockito.verify(faultEventDao, times(1)).update(event);
 
-        Assert.assertEquals(failureMode, result);
-        Assert.assertTrue(component.getFailureModes().contains(failureMode));
-        Assert.assertTrue(failureMode.getManifestations().contains(event));
+        Assertions.assertEquals(failureMode, result);
+        Assertions.assertTrue(component.getFailureModes().contains(failureMode));
+        Assertions.assertTrue(failureMode.getManifestations().contains(event));
     }
 
     @Test
diff --git a/src/test/java/cz/cvut/kbss/analysis/service/FaultTreeRepositoryServiceTest.java b/src/test/java/cz/cvut/kbss/analysis/service/FaultTreeRepositoryServiceTest.java
index 5f582e93..88ec1d54 100755
--- a/src/test/java/cz/cvut/kbss/analysis/service/FaultTreeRepositoryServiceTest.java
+++ b/src/test/java/cz/cvut/kbss/analysis/service/FaultTreeRepositoryServiceTest.java
@@ -4,7 +4,7 @@
 import cz.cvut.kbss.analysis.environment.Generator;
 import cz.cvut.kbss.analysis.model.FaultEvent;
 import cz.cvut.kbss.analysis.model.FaultTree;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -114,8 +114,8 @@ void getReusableEvents_shouldOmitTreeEvents() {
         List<FaultEvent> result = repositoryService.getReusableEvents(tree.getUri());
 
         Mockito.verify(faultEventRepositoryService).findAll();
-        Assert.assertEquals(1, result.size());
-        Assert.assertTrue(result.contains(nonTreeEvent));
+        Assertions.assertEquals(1, result.size());
+        Assertions.assertTrue(result.contains(nonTreeEvent));
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/cz/cvut/kbss/analysis/service/SystemRepositoryServiceTest.java b/src/test/java/cz/cvut/kbss/analysis/service/SystemRepositoryServiceTest.java
index 6f798993..63eba711 100755
--- a/src/test/java/cz/cvut/kbss/analysis/service/SystemRepositoryServiceTest.java
+++ b/src/test/java/cz/cvut/kbss/analysis/service/SystemRepositoryServiceTest.java
@@ -6,7 +6,7 @@
 import cz.cvut.kbss.analysis.model.Component;
 import cz.cvut.kbss.analysis.model.FailureModesTable;
 import cz.cvut.kbss.analysis.model.System;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -55,7 +55,7 @@ void rename_shouldFind_shouldCopyData_shouldCallUpdate() {
         repositoryService.rename(systemRename);
 
         Mockito.verify(systemDao).update(system);
-        Assert.assertEquals(systemRename.getName(), system.getName());
+        Assertions.assertEquals(systemRename.getName(), system.getName());
     }
 
     @Test
@@ -75,7 +75,7 @@ void addComponent_shouldFindSystem_shouldFindComponent_shouldCallUpdate() {
         repositoryService.addComponent(system.getUri(), component.getUri());
 
         Mockito.verify(systemDao).update(system);
-        Assert.assertTrue(system.getComponents().contains(component));
+        Assertions.assertTrue(system.getComponents().contains(component));
     }
 
     @Test
@@ -96,7 +96,7 @@ void removeComponent_shouldFindSystem_shouldFindComponent_shouldCallUpdate() {
         repositoryService.removeComponent(system.getUri(), component.getUri());
 
         Mockito.verify(systemDao).update(system);
-        Assert.assertFalse(system.getComponents().contains(component));
+        Assertions.assertFalse(system.getComponents().contains(component));
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/cz/cvut/kbss/analysis/service/validation/ComponentValidatorTest.java b/src/test/java/cz/cvut/kbss/analysis/service/validation/ComponentValidatorTest.java
index a50cf3ba..4b1d1de9 100755
--- a/src/test/java/cz/cvut/kbss/analysis/service/validation/ComponentValidatorTest.java
+++ b/src/test/java/cz/cvut/kbss/analysis/service/validation/ComponentValidatorTest.java
@@ -5,7 +5,7 @@
 import cz.cvut.kbss.analysis.exception.ValidationException;
 import cz.cvut.kbss.analysis.model.Component;
 import cz.cvut.kbss.analysis.util.Vocabulary;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -42,8 +42,8 @@ void validateDuplicates_duplicateExists_shouldThrowException() {
         BindingResult bindingResult = ValidationTestUtils.createBinding(component, componentValidator);
         componentValidator.validate(component, bindingResult);
 
-        Assert.assertTrue(bindingResult.hasErrors());
-        Assert.assertNotNull(bindingResult.getFieldError("name"));
+        Assertions.assertTrue(bindingResult.hasErrors());
+        Assertions.assertNotNull(bindingResult.getFieldError("name"));
     }
 
     @Test
@@ -56,7 +56,7 @@ void validateDuplicates_noDuplicate_shouldJustRun() {
         BindingResult bindingResult = ValidationTestUtils.createBinding(component, componentValidator);
         componentValidator.validate(component, bindingResult);
 
-        Assert.assertFalse(bindingResult.hasErrors());
+        Assertions.assertFalse(bindingResult.hasErrors());
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/cz/cvut/kbss/analysis/service/validation/FaultEventValidatorTest.java b/src/test/java/cz/cvut/kbss/analysis/service/validation/FaultEventValidatorTest.java
index bc7b9a1e..ee201ecd 100755
--- a/src/test/java/cz/cvut/kbss/analysis/service/validation/FaultEventValidatorTest.java
+++ b/src/test/java/cz/cvut/kbss/analysis/service/validation/FaultEventValidatorTest.java
@@ -7,7 +7,7 @@
 import cz.cvut.kbss.analysis.model.util.EventType;
 import cz.cvut.kbss.analysis.model.util.GateType;
 import cz.cvut.kbss.analysis.util.Vocabulary;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -45,8 +45,8 @@ void validateDuplicates_duplicateExists_shouldReturnError() {
         BindingResult bindingResult = ValidationTestUtils.createBinding(event, faultEventValidator);
         faultEventValidator.validate(event, bindingResult);
 
-        Assert.assertTrue(bindingResult.hasErrors());
-        Assert.assertNotNull(bindingResult.getFieldError("name"));
+        Assertions.assertTrue(bindingResult.hasErrors());
+        Assertions.assertNotNull(bindingResult.getFieldError("name"));
     }
 
     @Test
@@ -61,7 +61,7 @@ void validateDuplicates_noDuplicate_shouldJustRun() {
         BindingResult bindingResult = ValidationTestUtils.createBinding(event, faultEventValidator);
         faultEventValidator.validate(event, bindingResult);
 
-        Assert.assertFalse(bindingResult.hasErrors());
+        Assertions.assertFalse(bindingResult.hasErrors());
     }
 
     @Test
@@ -73,8 +73,8 @@ void validateTypes_intermediate_nullGate_shouldReturnError() {
         BindingResult bindingResult = ValidationTestUtils.createBinding(event, faultEventValidator);
         faultEventValidator.validate(event, bindingResult);
 
-        Assert.assertTrue(bindingResult.hasErrors());
-        Assert.assertNotNull(bindingResult.getFieldError("gateType"));
+        Assertions.assertTrue(bindingResult.hasErrors());
+        Assertions.assertNotNull(bindingResult.getFieldError("gateType"));
     }
 
     @Test
@@ -87,8 +87,8 @@ void validateTypes_intermediate_unusedGate_shouldReturnError() {
         BindingResult bindingResult = ValidationTestUtils.createBinding(event, faultEventValidator);
         faultEventValidator.validate(event, bindingResult);
 
-        Assert.assertTrue(bindingResult.hasErrors());
-        Assert.assertNotNull(bindingResult.getFieldError("gateType"));
+        Assertions.assertTrue(bindingResult.hasErrors());
+        Assertions.assertNotNull(bindingResult.getFieldError("gateType"));
     }
 
     @Test
@@ -101,8 +101,8 @@ void validateTypes_nonIntermediate_gateNotUnused_shouldReturnError() {
         BindingResult bindingResult = ValidationTestUtils.createBinding(event, faultEventValidator);
         faultEventValidator.validate(event, bindingResult);
 
-        Assert.assertTrue(bindingResult.hasErrors());
-        Assert.assertNotNull(bindingResult.getFieldError("gateType"));
+        Assertions.assertTrue(bindingResult.hasErrors());
+        Assertions.assertNotNull(bindingResult.getFieldError("gateType"));
     }
 
 }
\ No newline at end of file