diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 8c9376d5..66013201 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -16,10 +16,10 @@ jobs:
   call-workflow:
     strategy:
       matrix:
-        josm-revision: ["", "r17903"]
+        josm-revision: ["", "r18877"]
     uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v2
     with:
       josm-revision: ${{ matrix.josm-revision }}
-      perform-revision-tagging: ${{ github.repository == 'JOSM/pt_assistant' && github.ref_type == 'branch' && github.ref_name == 'master' && github.event_name != 'schedule' && github.event_name != 'pull_request' && matrix.josm-revision == 'r17903' }}
+      perform-revision-tagging: ${{ github.repository == 'JOSM/pt_assistant' && github.ref_type == 'branch' && github.ref_name == 'master' && github.event_name != 'pull_request' && matrix.josm-revision == 'r18877' }}
     secrets: inherit
 
diff --git a/build.gradle.kts b/build.gradle.kts
index bc2d53fd..d94242cd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,8 +8,8 @@ plugins {
 }
 
 object Versions {
-  const val jacoco = "0.8.8"
-  const val junit = "5.9.2"
+  const val jacoco = "0.8.11"
+  const val junit = "5.10.1"
 }
 
 repositories {
@@ -19,6 +19,7 @@ dependencies {
   testImplementation("org.openstreetmap.josm:josm-unittest:SNAPSHOT"){isChanging=true}
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Versions.junit}")
   testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.junit}")
+  testImplementation("org.junit.jupiter:junit-jupiter-params:${Versions.junit}")
 }
 
 tasks.withType(JavaCompile::class) {
@@ -75,9 +76,8 @@ jacoco {
 
 tasks.jacocoTestReport {
   reports {
-    xml.isEnabled = true
     html.isEnabled = true
+    xml.isEnabled = true
   }
-  dependsOn(tasks.test)
-  tasks.check.get().dependsOn(this)
 }
+
diff --git a/gradle.properties b/gradle.properties
index 3165ecca..d300eb66 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,6 +10,6 @@ plugin.canloadatruntime=true
 plugin.icon=images/bus.svg
 
 # Minimum JOSM version (any numeric version)
-plugin.main.version=18494
+plugin.main.version=18877
 # JOSM version to compile against (any numeric version available for download, or the special values "tested" or "latest")
-plugin.compile.version=18495
+plugin.compile.version=18877
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c053..41d9927a 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 5c51a4ac..ed98caaf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionSha256Sum=740c2e472ee4326c33bf75a5c9f5cd1e69ecf3f9b580f6e236c86d1f3d98cfac
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c515..1b6c7873 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/master/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_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # 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,95 @@ 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*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        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 \
+        "$@"
+
+# 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 a9f778a7..ac1b06f9 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SortPTRouteMembersActionTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SortPTRouteMembersActionTest.java
index f05916b1..67ff2185 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SortPTRouteMembersActionTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SortPTRouteMembersActionTest.java
@@ -10,7 +10,6 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -22,7 +21,7 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.plugins.pt_assistant.TestFiles;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.Projection;
 
 /**
  * Unit tests for class {@link SortPTRouteMembersAction}.
@@ -30,11 +29,8 @@
  * @author giack
  *
  */
+@Projection
 class SortPTRouteMembersActionTest {
-
-    @RegisterExtension
-    public static JOSMTestRules rules = new JOSMTestRules().projection();
-
     private DataSet ds;
 
     @BeforeEach
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutTest.java
index 4f132491..44c0e18e 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutTest.java
@@ -4,7 +4,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import java.io.FileNotFoundException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -12,7 +11,6 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.command.SplitWayCommand;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -26,16 +24,11 @@
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.plugins.pt_assistant.TestFiles;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.PTProperties;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 /**
  * Unit tests of {@link SplitRoundaboutAction}.
  */
 class SplitRoundaboutTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
-
     private DataSet ds, ds1, ds2;
     private OsmDataLayer layer;
     private SplitRoundaboutAction action;
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/PTStopTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/PTStopTest.java
index a360497d..5d4a8d26 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/PTStopTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/PTStopTest.java
@@ -10,7 +10,6 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -23,16 +22,11 @@
 import org.openstreetmap.josm.plugins.pt_assistant.TestFiles;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.StopToWayAssigner;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.StopUtils;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 /**
 * Unit tests of {@link StopToWayAssigner}.
 */
 class PTStopTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
-
     private DataSet ds;
 
     @BeforeEach
@@ -66,8 +60,7 @@ public PTStop CheckItIsPTStopOrNot(Node stop) {
             if (referredPrimitive.getType().equals(OsmPrimitiveType.RELATION)) {
                 Relation referredRelation = (Relation) referredPrimitive;
                 if (checkRelationContainsStop(referredRelation, stop) != null) {
-                    PTStop pts = new PTStop(checkRelationContainsStop(referredRelation, stop));
-                    return pts;
+                    return new PTStop(checkRelationContainsStop(referredRelation, stop));
                 }
             }
         }
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/RouteRepresentationTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/RouteRepresentationTest.java
index 3716fe3b..6e93000f 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/RouteRepresentationTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/RouteRepresentationTest.java
@@ -6,12 +6,10 @@
 import java.util.ArrayList;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 /**
  * Tests if the representation of a route relation is created correctly in the
@@ -21,10 +19,6 @@
  *
  */
 class RouteRepresentationTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
-
     @Test
     void testCorrectRoute() {
 
@@ -102,8 +96,8 @@ void testCorrectRoute() {
 
         PTRouteDataManager manager = new PTRouteDataManager(route);
 
-        assertEquals(manager.getPTStopCount(), 5);
-        assertEquals(manager.getPTWayCount(), 4);
+        assertEquals(5, manager.getPTStopCount());
+        assertEquals(4, manager.getPTWayCount());
 
     }
 
@@ -172,8 +166,8 @@ void testNestedRelation() {
 
         PTRouteDataManager manager = new PTRouteDataManager(route);
 
-        assertEquals(manager.getFailedMembers().size(), 1);
-        assertEquals(manager.getPTStopCount(), 5);
-        assertEquals(manager.getPTWayCount(), 3);
+        assertEquals(1, manager.getFailedMembers().size());
+        assertEquals(5, manager.getPTStopCount());
+        assertEquals(3, manager.getPTWayCount());
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/StopToWayAssignerTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/StopToWayAssignerTest.java
index c1658046..d211678f 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/StopToWayAssignerTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/StopToWayAssignerTest.java
@@ -4,22 +4,16 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.plugins.pt_assistant.TestFiles;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.StopToWayAssigner;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 /**
  * Unit tests of {@link StopToWayAssigner}.
  */
 class StopToWayAssignerTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
-
     @Test
     void testOnewayBadMemberSorting() {
 
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/utils/UtilityClassesTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/utils/UtilityClassesTest.java
index 644d8553..89ba394c 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/utils/UtilityClassesTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/utils/UtilityClassesTest.java
@@ -1,15 +1,9 @@
 package org.openstreetmap.josm.plugins.pt_assistant.utils;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.plugins.pt_assistant.TestUtil;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 class UtilityClassesTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
-
     @Test
     void testAllUtilityClasses() {
         TestUtil.testUtilityClass(BoundsUtils.class);
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/utils/WayUtilsTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/utils/WayUtilsTest.java
index 71a4dc04..3ad8484f 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/utils/WayUtilsTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/utils/WayUtilsTest.java
@@ -11,20 +11,14 @@
 import java.util.stream.LongStream;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.plugins.pt_assistant.TestUtil;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 class WayUtilsTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
-
     private final Map<Long, Node> NODES = new HashMap<>();
 
 
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/AdjacentWaysTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/AdjacentWaysTest.java
index 4d0a1fcc..522f7df1 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/AdjacentWaysTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/AdjacentWaysTest.java
@@ -6,7 +6,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -15,13 +14,8 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.plugins.pt_assistant.TestFiles;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 class AdjacentWaysTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
-
     @ParameterizedTest
     @ValueSource(ints = {1, 2})
     void testAdjacentOneways(int oneWayTestSize) {
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java
index 18d8c4ad..fd44beb6 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java
@@ -9,19 +9,13 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.plugins.pt_assistant.TestFiles;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 class DirecionTestTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
-
     @Test
     void testOnewayTrue() {
 
@@ -37,7 +31,7 @@ void testOnewayTrue() {
             errors.addAll(wayChecker.getErrors());
         }
 
-        assertEquals(errors.size(), 2);
+        assertEquals(2, errors.size());
         int onewayErrorCaught = 0;
         for (TestError e : errors) {
             if (e.getCode() == PTAssistantValidatorTest.ERROR_CODE_DIRECTION) {
@@ -45,7 +39,7 @@ void testOnewayTrue() {
             }
         }
 
-        assertEquals(onewayErrorCaught, 2);
+        assertEquals(2, onewayErrorCaught);
 
         boolean detectedErrorsAreCorrect = true;
         for (TestError e : errors) {
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformAsWayTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformAsWayTest.java
index 4f0214f7..b1ff49d9 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformAsWayTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformAsWayTest.java
@@ -7,20 +7,14 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.plugins.pt_assistant.TestFiles;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-public class PlatformAsWayTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
 
+class PlatformAsWayTest {
     @Test
-    void sortingTest() {
+    void testSorting() {
         DataSet ds = TestFiles.importOsmFile(TestFiles.PLATFORM_AS_WAY(), "testLayer");
 
         PTAssistantValidatorTest test = new PTAssistantValidatorTest();
@@ -37,6 +31,6 @@ void sortingTest() {
             errors.addAll(routeChecker.getErrors());
         }
 
-        assertEquals(errors.size(), 0);
+        assertEquals(0, errors.size());
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java
index a1d339b9..6064009d 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java
@@ -8,37 +8,31 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.plugins.pt_assistant.TestFiles;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-public class RoadTypeTestTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
 
+class RoadTypeTestTest {
     @Test
-    public void test() {
+    void testRoadTypeErrors() {
 
         DataSet ds = TestFiles.importOsmFile(TestFiles.ROAD_TYPE_ERROR(), "testLayer");
 
         PTAssistantValidatorTest test = new PTAssistantValidatorTest();
         List<TestError> errors = new ArrayList<>();
 
-        for (Relation r: ds.getRelations()) {
+        for (Relation r : ds.getRelations()) {
             WayChecker wayChecker = new WayChecker(r, test);
             wayChecker.performRoadTypeTest();
             errors.addAll(wayChecker.getErrors());
         }
 
-        assertEquals(errors.size(), 2);
+        assertEquals(2, errors.size());
 
-        for (TestError e: errors) {
-            assertEquals(e.getCode(), PTAssistantValidatorTest.ERROR_CODE_ROAD_TYPE);
+        for (TestError e : errors) {
+            assertEquals(PTAssistantValidatorTest.ERROR_CODE_ROAD_TYPE, e.getCode());
             Way way = (Way) e.getHighlighted().iterator().next();
             assertTrue(way.getId() == 8169083 || way.getId() == 8034569);
         }
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentCheckerTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentCheckerTest.java
index e18b0244..f109350c 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentCheckerTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentCheckerTest.java
@@ -4,20 +4,14 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.plugins.pt_assistant.TestFiles;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteDataManager;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.StopToWayAssigner;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 class SegmentCheckerTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
-
     @Test
     void testBasics() {
         DataSet ds = TestFiles.importOsmFile(TestFiles.SEGMENT_TEST(), "testLayer");
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SolitaryStopPositionTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SolitaryStopPositionTest.java
index 796cd29a..fd72f687 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SolitaryStopPositionTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SolitaryStopPositionTest.java
@@ -4,17 +4,11 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.plugins.pt_assistant.TestFiles;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 class SolitaryStopPositionTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
-
     @Test
     void testSolitaryStopPosition() {
 
@@ -34,15 +28,15 @@ void testSolitaryStopPosition() {
 
         NodeChecker checkerPlatform = new NodeChecker(platform, test);
         checkerPlatform.performPlatformPartOfWayTest();
-        assertEquals(checkerPlatform.getErrors().size(), 1);
-        assertEquals(checkerPlatform.getErrors().get(0).getCode(),
-                PTAssistantValidatorTest.ERROR_CODE_PLATFORM_PART_OF_HIGHWAY);
+        assertEquals(1, checkerPlatform.getErrors().size());
+        assertEquals(PTAssistantValidatorTest.ERROR_CODE_PLATFORM_PART_OF_HIGHWAY,
+                checkerPlatform.getErrors().get(0).getCode());
 
         NodeChecker checkerStopPosition = new NodeChecker(stopPosition, test);
         checkerStopPosition.performSolitaryStopPositionTest();
-        assertEquals(checkerStopPosition.getErrors().size(), 1);
-        assertEquals(checkerStopPosition.getErrors().get(0).getCode(),
-                PTAssistantValidatorTest.ERROR_CODE_SOLITARY_STOP_POSITION);
+        assertEquals(1, checkerStopPosition.getErrors().size());
+        assertEquals(PTAssistantValidatorTest.ERROR_CODE_SOLITARY_STOP_POSITION,
+                checkerStopPosition.getErrors().get(0).getCode());
 
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SortingTestTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SortingTestTest.java
index 9fbb929c..b274cc53 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SortingTestTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SortingTestTest.java
@@ -8,18 +8,12 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.plugins.pt_assistant.TestFiles;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 class SortingTestTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
-
     @Test
     void testSortingBeforeFile() {
         DataSet ds = TestFiles.importOsmFile(TestFiles.DL131_BEFORE(), "testLayer");
@@ -35,9 +29,9 @@ void testSortingBeforeFile() {
 
         }
 
-        assertEquals(errors.size(), 1);
-        assertEquals(errors.iterator().next().getCode(), PTAssistantValidatorTest.ERROR_CODE_SORTING);
-        assertEquals(errors.iterator().next().getTester().getClass().getName(), PTAssistantValidatorTest.class.getName());
+        assertEquals(1, errors.size());
+        assertEquals(PTAssistantValidatorTest.ERROR_CODE_SORTING, errors.iterator().next().getCode());
+        assertEquals(PTAssistantValidatorTest.class.getName(), errors.iterator().next().getTester().getClass().getName());
     }
 
     @Test
@@ -56,7 +50,7 @@ void testSortingAfterFile() {
         }
 
 
-        assertEquals(errors.size(), 0);
+        assertEquals(0, errors.size());
     }
 
     // TODO: this test will only pass after the functionality for recognizing
@@ -92,6 +86,6 @@ void testOvershootAfterFile() {
             errors.addAll(routeChecker.getErrors());
         }
 
-        assertEquals(errors.size(), 0);
+        assertEquals(0, errors.size());
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/StopCheckerTest.java b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/StopCheckerTest.java
index d51c5b02..eabeeaaf 100644
--- a/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/StopCheckerTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/StopCheckerTest.java
@@ -4,18 +4,12 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.plugins.pt_assistant.TestFiles;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 class StopCheckerTest {
-
-    @RegisterExtension
-    static JOSMTestRules rules = new JOSMTestRules();
-
     @Test
     void testNodePartOfStopArea() {
 
@@ -33,9 +27,9 @@ void testNodePartOfStopArea() {
 
         NodeChecker nodeChecker = new NodeChecker(node, test);
         nodeChecker.performNodePartOfStopAreaTest();
-        assertEquals(nodeChecker.getErrors().size(), 1);
-        assertEquals(nodeChecker.getErrors().get(0).getCode(),
-                PTAssistantValidatorTest.ERROR_CODE_NOT_PART_OF_STOP_AREA);
+        assertEquals(1, nodeChecker.getErrors().size());
+        assertEquals(PTAssistantValidatorTest.ERROR_CODE_NOT_PART_OF_STOP_AREA,
+            nodeChecker.getErrors().get(0).getCode());
     }
 
     @Test
@@ -55,9 +49,9 @@ void testStopAreaRelations() {
 
         StopChecker stopChecker = new StopChecker(stopArea, test);
         stopChecker.performStopAreaRelationsTest();
-        assertEquals(stopChecker.getErrors().size(), 1);
-        assertEquals(stopChecker.getErrors().get(0).getCode(),
-                PTAssistantValidatorTest.ERROR_CODE_STOP_AREA_COMPARE_RELATIONS);
+        assertEquals(1, stopChecker.getErrors().size());
+        assertEquals(PTAssistantValidatorTest.ERROR_CODE_STOP_AREA_COMPARE_RELATIONS,
+            stopChecker.getErrors().get(0).getCode());
     }
 
     @Test
@@ -76,9 +70,9 @@ void testStopAreaStopPosition() {
 
         StopChecker stopChecker = new StopChecker(stopArea, test);
         stopChecker.performStopAreaStopPositionTest();
-        assertEquals(stopChecker.getErrors().size(), 1);
-        assertEquals(stopChecker.getErrors().get(0).getCode(),
-                PTAssistantValidatorTest.ERROR_CODE_STOP_AREA_NO_STOPS);
+        assertEquals(1, stopChecker.getErrors().size());
+        assertEquals(PTAssistantValidatorTest.ERROR_CODE_STOP_AREA_NO_STOPS,
+            stopChecker.getErrors().get(0).getCode());
     }
 
     @Test
@@ -97,9 +91,9 @@ void testStopAreaPlatform() {
 
         StopChecker stopChecker = new StopChecker(stopArea, test);
         stopChecker.performStopAreaPlatformTest();
-        assertEquals(stopChecker.getErrors().size(), 1);
-        assertEquals(stopChecker.getErrors().get(0).getCode(),
-                PTAssistantValidatorTest.ERROR_CODE_STOP_AREA_NO_PLATFORM);
+        assertEquals(1, stopChecker.getErrors().size());
+        assertEquals(PTAssistantValidatorTest.ERROR_CODE_STOP_AREA_NO_PLATFORM,
+            stopChecker.getErrors().get(0).getCode());
 
     }
 }