diff --git a/.github/scripts/build b/.github/scripts/build
index 1c6fdea57a..2299372714 100755
--- a/.github/scripts/build
+++ b/.github/scripts/build
@@ -1,3 +1,6 @@
 #!/bin/bash
 set -e
-./gradlew assemble shadowJar dokkaJavadoc orchidBuild --parallel --scan --stacktrace
+./gradlew assemble shadowJar dokkaJavadoc --parallel --scan --stacktrace
+if $REFERENCE; then
+    ./gradlew orchidBuild --parallel --scan --stacktrace
+fi
diff --git a/.github/scripts/deploy b/.github/scripts/deploy
index 2531570305..f118c2d4bb 100755
--- a/.github/scripts/deploy
+++ b/.github/scripts/deploy
@@ -5,9 +5,9 @@ if [ $GITHUB_REPOSITORY = 'AlchemistSimulator/Alchemist' ]
     ./gradlew publishKotlinMavenPublicationToCentralS01Repository
     # Publish on GitHub. Fails due to overwritings, so it's ok to give up
     ./gradlew publishKotlinMavenPublicationToGithubRepository --continue || true
-    ./gradlew orchidDeploy
     if [ -n "$TAG" ] || [ "$BRANCH" = 'develop' ]
     then
+        ./gradlew orchidDeploy
         echo Installing surge
         sudo npm install --global surge
         echo Deploying ${STABILITY_MARKER}javadoc on surge
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 4447883461..e9e58d47d5 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [windows, macos, ubuntu]
-        jvm_version: [8, 11, 15]
+        jvm_version: [8, 11, 15, 16]
     runs-on: ${{ matrix.os }}-latest
     env:
       JAVA_VERSION: ${{ matrix.jvm_version }}
diff --git a/.gitignore b/.gitignore
index e3112ec440..0d7e57383b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ buildProfile/
 .idea/codeStyleSettings.xml
 .idea/inspectionProfiles/profiles_settings.xml
 .idea/jarRepositories.xml
+.idea/dataSources.local.xml
 
 # MacOS
 .DS_Store
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 5c69890cf5..6587bbfd90 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -12,7 +12,7 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000..eb973056b9
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,6 @@
+# 11.3.0
+
+Maintenance release. This release only includes dependency updates and tweaks to allow the simulator to run and build under Java 16.
+
+* Updated Protelis to 15.0.0. This allows the simulator to run Protelis on Java 16.
+* The legacy swing effects serialization has been updated to be able to work with Java 16
diff --git a/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/cognitiveagents/impact/cognitive/BeliefDanger.kt b/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/cognitiveagents/impact/cognitive/BeliefDanger.kt
index 2a4abca846..195aa4ced2 100644
--- a/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/cognitiveagents/impact/cognitive/BeliefDanger.kt
+++ b/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/cognitiveagents/impact/cognitive/BeliefDanger.kt
@@ -27,7 +27,5 @@ class BeliefDanger(
     )
 
     private fun List<CognitiveAgent>.aggregateDangerBeliefs() =
-        if (size > 0) {
-            this.sumByDouble { it.cognitive.dangerBelief() } / size
-        } else 0.0
+        if (isEmpty()) 0.0 else sumOf { it.cognitive.dangerBelief() } / size
 }
diff --git a/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/cognitiveagents/impact/cognitive/Fear.kt b/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/cognitiveagents/impact/cognitive/Fear.kt
index df9785a460..b68f689b44 100644
--- a/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/cognitiveagents/impact/cognitive/Fear.kt
+++ b/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/cognitiveagents/impact/cognitive/Fear.kt
@@ -31,7 +31,5 @@ class Fear(
     )
 
     private fun List<CognitiveAgent>.aggregateFears() =
-        if (size > 0) {
-            this.sumByDouble { it.cognitive.fear() } / this.size
-        } else 0.0
+        if (isEmpty()) 0.0 else sumOf { it.cognitive.fear() } / this.size
 }
diff --git a/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/implementations/nodes/CognitiveOrientingPedestrian2D.kt b/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/implementations/nodes/CognitiveOrientingPedestrian2D.kt
index e91df01a5c..535a70d06a 100644
--- a/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/implementations/nodes/CognitiveOrientingPedestrian2D.kt
+++ b/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/implementations/nodes/CognitiveOrientingPedestrian2D.kt
@@ -37,11 +37,11 @@ class CognitiveOrientingPedestrian2D<T, N : ConvexPolygon, E> @JvmOverloads cons
     private val consciousness: CognitivePedestrian2D<T> =
         CognitivePedestrian2D(environment, randomGenerator, age, gender, danger, group)
 ) : HomogeneousOrientingPedestrian2D<T, N, E>(
-        environment,
-        randomGenerator,
-        knowledgeDegree = knowledgeDegree,
-        group = group
-    ),
+    environment,
+    randomGenerator,
+    knowledgeDegree = knowledgeDegree,
+    group = group
+),
     CognitiveAgent by consciousness {
 
     override fun speed() = consciousness.speed()
diff --git a/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/implementations/nodes/HomogeneousOrientingPedestrian2D.kt b/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/implementations/nodes/HomogeneousOrientingPedestrian2D.kt
index 2dc61f6b14..f80bdc1823 100644
--- a/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/implementations/nodes/HomogeneousOrientingPedestrian2D.kt
+++ b/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/implementations/nodes/HomogeneousOrientingPedestrian2D.kt
@@ -47,11 +47,11 @@ open class HomogeneousOrientingPedestrian2D<T, N : ConvexPolygon, E> @JvmOverloa
     private val maxSide: Double = 60.0,
     group: PedestrianGroup2D<T>? = null
 ) : AbstractOrientingPedestrian2D<T, Ellipse, N, E>(
-        knowledgeDegree,
-        randomGenerator,
-        environment,
-        group
-    ),
+    knowledgeDegree,
+    randomGenerator,
+    environment,
+    group
+),
     Pedestrian2D<T> {
 
     override val shape by lazy { super.shape }
diff --git a/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/interfaces/Pedestrian2D.kt b/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/interfaces/Pedestrian2D.kt
index 8f1bb344ad..e253e2c0ad 100644
--- a/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/interfaces/Pedestrian2D.kt
+++ b/alchemist-cognitive-agents/src/main/kotlin/it/unibo/alchemist/model/interfaces/Pedestrian2D.kt
@@ -20,14 +20,12 @@ interface Pedestrian2D<T> : Pedestrian<T, Euclidean2DPosition, Euclidean2DTransf
      * The shape of any pedestrian in the Euclidean world.
      * Implementors should override this property to prevent the continuous creation of new [Euclidean2DShape]s.
      */
-    @JvmDefault
     override val shape: Euclidean2DShape get() = environment.shapeFactory.circle(defaultRadius)
 
     /**
      * The field of view of a pedestrian in the Euclidean world.
      * Implementors should override this property to prevent the continuous creation of new [FieldOfView2D]s.
      */
-    @JvmDefault
     val fieldOfView: FieldOfView2D<T> get() =
         FieldOfView2D(environment, this, defaultFieldOfViewDepth, defaultFieldOfViewAperture)
 
diff --git a/alchemist-cognitive-agents/src/test/kotlin/it/unibo/alchemist/test/TestFeelsTransmission.kt b/alchemist-cognitive-agents/src/test/kotlin/it/unibo/alchemist/test/TestFeelsTransmission.kt
index 19ed708d78..f5e0b5cedf 100644
--- a/alchemist-cognitive-agents/src/test/kotlin/it/unibo/alchemist/test/TestFeelsTransmission.kt
+++ b/alchemist-cognitive-agents/src/test/kotlin/it/unibo/alchemist/test/TestFeelsTransmission.kt
@@ -20,7 +20,7 @@ class TestFeelsTransmission<T, P> : StringSpec({
 
     "danger layer affects cognitive pedestrians" {
         fun Environment<T, P>.perceivedDanger() = nodes.filterIsInstance<CognitiveAgent>()
-            .sumByDouble { it.cognitive.dangerBelief() }
+            .sumOf { it.cognitive.dangerBelief() }
         fun EuclideanEnvironment<T, P>.dangerIsLoaded() = this.also {
             nodes.filterIsInstance<AbstractCognitivePedestrian<*, *, *, *>>().forEach {
                 it.danger shouldNotBe null
diff --git a/alchemist-engine/src/test/java/it/unibo/alchemist/core/tests/TestConcurrency.java b/alchemist-engine/src/test/java/it/unibo/alchemist/core/tests/TestConcurrency.java
index 0a7e749df7..5f22ae7559 100644
--- a/alchemist-engine/src/test/java/it/unibo/alchemist/core/tests/TestConcurrency.java
+++ b/alchemist-engine/src/test/java/it/unibo/alchemist/core/tests/TestConcurrency.java
@@ -42,7 +42,7 @@
 /**
  * This class tests some basic Commands, like pause and start.
  */
-public class TestConcurrency {
+class TestConcurrency {
 
     private Environment<Object, Euclidean2DPosition> env;
 
@@ -72,7 +72,7 @@ public void setUp() {
             value = "RV_RETURN_VALUE_IGNORED_BAD_PRACTICE",
             justification = "We don't need the status of the Runnable"
     )
-    public void testCommandInterleaving() throws InterruptedException, ExecutionException {
+    void testCommandInterleaving() throws InterruptedException, ExecutionException {
         final int inWaitCount = 100;
         final Simulation<?, ?> sim = new Engine<>(env, 10);
         sim.pause();
diff --git a/alchemist-euclidean-geometry/src/main/kotlin/it/unibo/alchemist/model/interfaces/environments/Euclidean2DEnvironment.kt b/alchemist-euclidean-geometry/src/main/kotlin/it/unibo/alchemist/model/interfaces/environments/Euclidean2DEnvironment.kt
index 4d5a47f906..6ac69a2cf9 100644
--- a/alchemist-euclidean-geometry/src/main/kotlin/it/unibo/alchemist/model/interfaces/environments/Euclidean2DEnvironment.kt
+++ b/alchemist-euclidean-geometry/src/main/kotlin/it/unibo/alchemist/model/interfaces/environments/Euclidean2DEnvironment.kt
@@ -17,19 +17,16 @@ import it.unibo.alchemist.model.interfaces.EuclideanEnvironment
  */
 interface Euclidean2DEnvironment<T> : EuclideanEnvironment<T, Euclidean2DPosition> {
 
-    @JvmDefault
     override val origin: Euclidean2DPosition get() = Companion.origin
 
     /**
      * Creates a new [Euclidean2DPosition].
      */
-    @JvmDefault
     fun makePosition(x: Double, y: Double): Euclidean2DPosition = Euclidean2DPosition(x, y)
 
     /**
      * Creates a new [Euclidean2DPosition].
      */
-    @JvmDefault
     override fun makePosition(vararg coordinates: Double): Euclidean2DPosition =
         if (coordinates.size == 2) makePosition(coordinates[0], coordinates[1])
         else throw IllegalArgumentException("Illegal coordinates (required 2): ${coordinates.contentToString()}")
diff --git a/alchemist-euclidean-geometry/src/main/kotlin/it/unibo/alchemist/model/interfaces/geometry/euclidean2d/Segment2D.kt b/alchemist-euclidean-geometry/src/main/kotlin/it/unibo/alchemist/model/interfaces/geometry/euclidean2d/Segment2D.kt
index d3afbdaadd..fca8bc1b77 100644
--- a/alchemist-euclidean-geometry/src/main/kotlin/it/unibo/alchemist/model/interfaces/geometry/euclidean2d/Segment2D.kt
+++ b/alchemist-euclidean-geometry/src/main/kotlin/it/unibo/alchemist/model/interfaces/geometry/euclidean2d/Segment2D.kt
@@ -25,44 +25,37 @@ interface Segment2D<P : Vector2D<P>> {
     /**
      * The length of the segment.
      */
-    @JvmDefault
     val length: Double get() = toVector.magnitude
 
     /**
      * Indicates if the two endpoints coincide (= segment has zero length).
      */
-    @JvmDefault
     val isDegenerate: Boolean get() = fuzzyEquals(first, second)
 
     /**
      * Indicates if the segment is aligned to the x-axis, this is true if [isDegenerate].
      */
-    @JvmDefault
     val isHorizontal: Boolean get() = fuzzyEquals(first.y, second.y)
 
     /**
      * Indicates if the segment is aligned to the y-axis, this is true if [isDegenerate].
      */
-    @JvmDefault
     val isVertical: Boolean get() = fuzzyEquals(first.x, second.x)
 
     /**
      * The medium point of the segment.
      */
-    @JvmDefault
     val midPoint: P get() = first.newFrom((first.x + second.x) / 2, (first.y + second.y) / 2)
 
     /**
      * The vector representing the movement from [first] to [second].
      */
-    @JvmDefault
     val toVector: P get() = second - first
 
     /**
      * @returns the [Line2D] passing through [first] and [second]. Throws an [UnsupportedOperationException] if the
      * segment [isDegenerate].
      */
-    @JvmDefault
     fun toLine(): Line2D<P> = when {
         isDegenerate -> throw UnsupportedOperationException("degenerate segment can't be converted to line")
         else -> SlopeInterceptLine2D.fromSegment(this)
@@ -76,7 +69,6 @@ interface Segment2D<P : Vector2D<P>> {
     /**
      * Checks if the segment contains a [point].
      */
-    @JvmDefault
     fun contains(point: P): Boolean = isCollinearWith(point) &&
         point.x fuzzyIn rangeFromUnordered(first.x, second.x) &&
         point.y fuzzyIn rangeFromUnordered(first.y, second.y)
@@ -84,7 +76,6 @@ interface Segment2D<P : Vector2D<P>> {
     /**
      * Finds the point of the segment which is closest to the provided [point].
      */
-    @JvmDefault
     fun closestPointTo(point: P): P = when {
         isDegenerate -> first
         contains(point) -> point
@@ -108,13 +99,11 @@ interface Segment2D<P : Vector2D<P>> {
     /**
      * Computes the shortest distance between the segment and the given [point].
      */
-    @JvmDefault
     fun distanceTo(point: P): Double = closestPointTo(point).distanceTo(point)
 
     /**
      * Computes the shortest distance between two segments (= the shortest distance between any two of their points).
      */
-    @JvmDefault
     fun distanceTo(other: Segment2D<P>): Double = when {
         intersect(other) !is Intersection2D.None -> 0.0
         else -> listOf(
@@ -129,7 +118,6 @@ interface Segment2D<P : Vector2D<P>> {
      * Checks if two segments are parallel. Throws an [UnsupportedOperationException] if any of the two segment
      * [isDegenerate].
      */
-    @JvmDefault
     fun isParallelTo(other: Segment2D<P>): Boolean = when {
         isDegenerate || other.isDegenerate ->
             throw UnsupportedOperationException("parallelism check is meaningless for degenerate segments")
@@ -139,13 +127,11 @@ interface Segment2D<P : Vector2D<P>> {
     /**
      * Checks if [first], [second] and [point] lie on a single line.
      */
-    @JvmDefault
     fun isCollinearWith(point: P): Boolean = isDegenerate || toLine().contains(point)
 
     /**
      * Checks if two segments lie on a single line.
      */
-    @JvmDefault
     fun isCollinearWith(other: Segment2D<P>): Boolean = when {
         isDegenerate -> other.isCollinearWith(first)
         else -> isCollinearWith(other.first) && isCollinearWith(other.second)
@@ -154,14 +140,12 @@ interface Segment2D<P : Vector2D<P>> {
     /**
      * Checks if two segments overlap (= are collinear and share one or more points).
      */
-    @JvmDefault
     fun overlapsWith(other: Segment2D<P>): Boolean = isCollinearWith(other) &&
         (contains(other.first) || contains(other.second) || other.contains(first) || other.contains(second))
 
     /**
      * Intersects two segments.
      */
-    @JvmDefault
     fun intersect(other: Segment2D<P>): Intersection2D<P> = when {
         isDegenerate ->
             Intersection2D.None.takeUnless { other.contains(first) } ?: Intersection2D.SinglePoint(first)
@@ -184,7 +168,6 @@ interface Segment2D<P : Vector2D<P>> {
     /**
      * Intersects a segment and a circle.
      */
-    @JvmDefault
     fun intersectCircle(center: P, radius: Double): Intersection2D<P> = when {
         isDegenerate ->
             Intersection2D.None
@@ -198,7 +181,6 @@ interface Segment2D<P : Vector2D<P>> {
      * @returns a shrunk version of the segment, [factor] is a percentage in [0, 0.5] indicating how much
      * the segment should be reduced on each size.
      */
-    @JvmDefault
     fun shrunk(factor: Double): Segment2D<P> = when (factor) {
         !in 0.0..0.5 -> throw IllegalArgumentException("$factor not in [0, 0.5]")
         else -> copyWith(
@@ -211,7 +193,6 @@ interface Segment2D<P : Vector2D<P>> {
      * Checks if this segment is inside a rectangular region described by an [origin], [width] and
      * [height] (must be positive).
      */
-    @JvmDefault
     fun isInRectangle(origin: Vector2D<*>, width: Double, height: Double) =
         first.isInRectangle(origin, width, height) && second.isInRectangle(origin, width, height)
 
@@ -222,7 +203,6 @@ interface Segment2D<P : Vector2D<P>> {
      * This can be useful e.g. to represent portions of axis-aligned segments without creating
      * new ones.
      */
-    @JvmDefault
     fun toRange(getXCoords: Boolean = this.isHorizontal): ClosedRange<Double> = when {
         getXCoords -> rangeFromUnordered(first.x, second.x)
         else -> rangeFromUnordered(first.y, second.y)
diff --git a/alchemist-euclidean-geometry/src/main/kotlin/it/unibo/alchemist/model/interfaces/nodes/NodeWithShape.kt b/alchemist-euclidean-geometry/src/main/kotlin/it/unibo/alchemist/model/interfaces/nodes/NodeWithShape.kt
index 396e552a7c..9aed086383 100644
--- a/alchemist-euclidean-geometry/src/main/kotlin/it/unibo/alchemist/model/interfaces/nodes/NodeWithShape.kt
+++ b/alchemist-euclidean-geometry/src/main/kotlin/it/unibo/alchemist/model/interfaces/nodes/NodeWithShape.kt
@@ -21,6 +21,5 @@ interface NodeWithShape<T, S : Vector<S>, A : GeometricTransformation<S>> : Node
     /**
      * The shape of the node.
      */
-    @JvmDefault
     val shape: GeometricShape<S, A>
 }
diff --git a/alchemist-euclidean-geometry/src/test/java/it/unibo/alchemist/test/TestContinuous2DEnvironment.java b/alchemist-euclidean-geometry/src/test/java/it/unibo/alchemist/test/TestContinuous2DEnvironment.java
index 782a5b0dc1..7db0909ef5 100644
--- a/alchemist-euclidean-geometry/src/test/java/it/unibo/alchemist/test/TestContinuous2DEnvironment.java
+++ b/alchemist-euclidean-geometry/src/test/java/it/unibo/alchemist/test/TestContinuous2DEnvironment.java
@@ -28,7 +28,7 @@
 /**
  *
  */
-public final class TestContinuous2DEnvironment {
+final class TestContinuous2DEnvironment {
 
     private static final double [] ZEROS = {0, 0};
     private static final double [] P2_3 = {2, 3};
@@ -51,7 +51,7 @@ public void setUp() {
      * Test size initialization and change.
      */
     @Test
-    public void testEnvironmentSize() {
+    void testEnvironmentSize() {
         assertEquals(0, environment.getNodeCount());
         assertArrayEquals(ZEROS, environment.getSize(), TOLERANCE);
         environment.addNode(new IntNode(environment), new Euclidean2DPosition(P2_3));
@@ -66,7 +66,7 @@ public void testEnvironmentSize() {
      * Test environment offset.
      */
     @Test
-    public void testEnvironmentOffset() {
+    void testEnvironmentOffset() {
         assertEquals(0, environment.getNodeCount());
         assertTrue(Double.isNaN(environment.getOffset()[0]));
         assertTrue(Double.isNaN(environment.getOffset()[1]));
@@ -82,7 +82,7 @@ public void testEnvironmentOffset() {
      * Test failure on wrong queries.
      */
     @Test
-    public void testNegativeRangeQuery() {
+    void testNegativeRangeQuery() {
         assertEquals(0, environment.getNodeCount());
         final Node<Integer> dummy = new IntNode(environment);
         environment.addNode(dummy, new Euclidean2DPosition(ZEROS));
@@ -98,7 +98,7 @@ public void testNegativeRangeQuery() {
      * Test failure on wrong queries.
      */
     @Test
-    public void testZeroRangeQuery() {
+    void testZeroRangeQuery() {
         assertEquals(0, environment.getNodeCount());
         final Node<Integer> dummy = new IntNode(environment);
         final Node<Integer> dummy2 = new IntNode(environment);
diff --git a/alchemist-euclidean-geometry/src/test/java/it/unibo/alchemist/test/TestContinuous2DObstacle.java b/alchemist-euclidean-geometry/src/test/java/it/unibo/alchemist/test/TestContinuous2DObstacle.java
index 2e8f57ff76..ba9f54f776 100644
--- a/alchemist-euclidean-geometry/src/test/java/it/unibo/alchemist/test/TestContinuous2DObstacle.java
+++ b/alchemist-euclidean-geometry/src/test/java/it/unibo/alchemist/test/TestContinuous2DObstacle.java
@@ -20,7 +20,7 @@
 
 /**
  */
-public class TestContinuous2DObstacle {
+class TestContinuous2DObstacle {
 
     private static final RectObstacle2D<Euclidean2DPosition> R1021 = new RectObstacle2D<>(1, 0, 1, 1);
     private static final RectObstacle2D<Euclidean2DPosition> R0527 = new RectObstacle2D<>(0, 5, 2, -2);
@@ -29,7 +29,7 @@ public class TestContinuous2DObstacle {
      * 
      */
     @Test
-    public void test() {
+    void test() {
         final var incarnation = SupportedIncarnations.<Integer, Euclidean2DPosition>get("protelis").orElseThrow();
         final Continuous2DObstacles<Integer> env = new Continuous2DObstacles<>(incarnation);
         env.setLinkingRule(new NoLinks<>());
diff --git a/alchemist-fxui/src/main/java/it/unibo/alchemist/boundary/gui/effects/json/EffectSerializer.java b/alchemist-fxui/src/main/java/it/unibo/alchemist/boundary/gui/effects/json/EffectSerializer.java
index d0d95004d7..affea5d05f 100644
--- a/alchemist-fxui/src/main/java/it/unibo/alchemist/boundary/gui/effects/json/EffectSerializer.java
+++ b/alchemist-fxui/src/main/java/it/unibo/alchemist/boundary/gui/effects/json/EffectSerializer.java
@@ -144,7 +144,7 @@ private static <T> void registerTypeAdaptersFor(
         classes.stream()
                 .filter(c -> Arrays.stream(c.getMethods())
                         .filter(m -> Modifier.isStatic(m.getModifiers()))
-                        .anyMatch(m -> m.getName().equals(TARGET_METHOD_NAME)))
+                        .anyMatch(m -> TARGET_METHOD_NAME.equals(m.getName())))
                 .forEach(c -> {
                     try {
                         builder.registerTypeAdapter(c, c.getMethod(TARGET_METHOD_NAME).invoke(null));
diff --git a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/AbstractEffectTest.java b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/AbstractEffectTest.java
index 5c06d206cf..c43ec49f6f 100644
--- a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/AbstractEffectTest.java
+++ b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/AbstractEffectTest.java
@@ -11,14 +11,14 @@
 /**
  * Test class for {@link AbstractEffect} static comparison methods.
  */
-public class AbstractEffectTest {
+class AbstractEffectTest {
     private static final String TEST_NAME = "Test";
 
     /**
      * Test method to test {@link AbstractEffect#checkBasicProperties(AbstractEffect, Object)} method.
      */
     @Test
-    public void testCheckBasicProperties() {
+    void testCheckBasicProperties() {
         final var dot1 = new DrawDot<>();
         final var dot2 = new DrawDot<>(TEST_NAME);
         final var dot3 = new DrawDot<>();
@@ -50,7 +50,7 @@ public void testCheckBasicProperties() {
      * method.
      */
     @Test
-    public void testCheckEqualsProperties() {
+    void testCheckEqualsProperties() {
         final SerializableStringProperty string1 = new SerializableStringProperty(TEST_NAME, TEST_NAME);
         final SerializableStringProperty string2 = new SerializableStringProperty();
         final SerializableStringProperty string3 = new SerializableStringProperty();
diff --git a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/DrawColoredDotSerializationTest.java b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/DrawColoredDotSerializationTest.java
index 74ce797acf..0ac6fd323b 100644
--- a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/DrawColoredDotSerializationTest.java
+++ b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/DrawColoredDotSerializationTest.java
@@ -14,14 +14,13 @@
 /**
  * JUnit test for {@link DrawColoredDot} effect serialization.
  */
-public final class DrawColoredDotSerializationTest extends AbstractEffectSerializationTest<DrawColoredDot<?>> {
+final class DrawColoredDotSerializationTest extends AbstractEffectSerializationTest<DrawColoredDot<?>> {
     private static final String TEST_NAME = "TestDot";
     private static final double TEST_SIZE = 25.0;
     private static final Color TEST_COLOR = Color.CYAN;
 
     @Test
-    @Override
-    public void testJavaSerialization() throws IOException, ClassNotFoundException {
+    void testJavaSerialization() throws IOException, ClassNotFoundException {
         final var effect = new DrawColoredDot<>(TEST_NAME);
         effect.setSize(TEST_SIZE);
         effect.setColor(TEST_COLOR);
@@ -29,8 +28,7 @@ public void testJavaSerialization() throws IOException, ClassNotFoundException {
     }
 
     @Test
-    @Override
-    public void testGsonSerialization() throws IOException {
+    void testGsonSerialization() throws IOException {
         final File file = TemporaryFile.create();
         final var effect = new DrawColoredDot<>(TEST_NAME);
         effect.setSize(TEST_SIZE);
diff --git a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/DrawDotSerializationTest.java b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/DrawDotSerializationTest.java
index 28bedccee5..1dbd1351ce 100644
--- a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/DrawDotSerializationTest.java
+++ b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/DrawDotSerializationTest.java
@@ -13,21 +13,19 @@
 /**
  * JUint test for {@link DrawDot} effect serialization.
  */
-public final class DrawDotSerializationTest extends AbstractEffectSerializationTest<DrawDot<?>> {
+final class DrawDotSerializationTest extends AbstractEffectSerializationTest<DrawDot<?>> {
     private static final String TEST_NAME = "TestDot";
     private static final double TEST_SIZE = 22.0;
 
     @Test
-    @Override
-    public void testJavaSerialization() throws IOException, ClassNotFoundException {
+    void testJavaSerialization() throws IOException, ClassNotFoundException {
         final var effect = new DrawDot<>(TEST_NAME);
         effect.setSize(TEST_SIZE);
         testSerializationOf(effect);
     }
 
     @Test
-    @Override
-    public void testGsonSerialization() throws IOException {
+    void testGsonSerialization() throws IOException {
         final File file = TemporaryFile.create();
         final var effect = new DrawDot<>(TEST_NAME);
         effect.setSize(TEST_SIZE);
diff --git a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/DrawLinksSerializationTest.java b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/DrawLinksSerializationTest.java
index 57a0f909a5..c0856e7f1c 100644
--- a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/DrawLinksSerializationTest.java
+++ b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/DrawLinksSerializationTest.java
@@ -14,21 +14,19 @@
 /**
  * JUnit test for {@link DrawLinks} effect serialization.
  */
-public final class DrawLinksSerializationTest extends AbstractEffectSerializationTest<DrawLinks<?>> {
+final class DrawLinksSerializationTest extends AbstractEffectSerializationTest<DrawLinks<?>> {
     private static final String TEST_NAME = "TestLinks";
     private static final double TEST_SIZE = 12.0;
 
     @Test
-    @Override
-    public void testJavaSerialization() throws IOException, ClassNotFoundException {
+    void testJavaSerialization() throws IOException, ClassNotFoundException {
         final var effect = new DrawLinks<>(TEST_NAME);
         effect.setSize(TEST_SIZE);
         testSerializationOf(effect);
     }
 
     @Test
-    @Override
-    public void testGsonSerialization() throws IOException {
+    void testGsonSerialization() throws IOException {
         final File file = TemporaryFile.create();
         final DrawLinks<Position2D<? extends Position2D<?>>> effect = new DrawLinks<>(TEST_NAME);
         effect.setSize(TEST_SIZE);
diff --git a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/EffectGroupSerializationTest.java b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/EffectGroupSerializationTest.java
index d595687ce1..939d56b0b2 100644
--- a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/EffectGroupSerializationTest.java
+++ b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/EffectGroupSerializationTest.java
@@ -16,7 +16,7 @@
 /**
  * JUnit test for {@link EffectGroup} and {@link EffectStack} serialization.
  */
-public class EffectGroupSerializationTest {
+class EffectGroupSerializationTest {
     private static final double TEST_DOT_SIZE = 22.0;
     private static final double TEST_COLORED_DOT_SIZE = 25.0;
 
@@ -27,7 +27,7 @@ public class EffectGroupSerializationTest {
      *             if something goes wrong
      */
     @Test
-    public void testJavaSerialization() throws Exception {
+    void testJavaSerialization() throws Exception {
         final File file = File.createTempFile("testJavaSerialization", null);
         final var effects = this.setupEffectGroup();
         try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(file))) {
@@ -46,7 +46,7 @@ public void testJavaSerialization() throws Exception {
      *             if something goes wrong
      */
     @Test
-    public void testGsonSerialization() throws Exception {
+    void testGsonSerialization() throws Exception {
         final File file = File.createTempFile("testGsonSerialization", null);
         final var effect = this.setupEffectGroup();
         EffectSerializer.effectsToFile(file, effect);
diff --git a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/json/AbstractEffectSerializationTest.java b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/json/AbstractEffectSerializationTest.java
index 1f22061c07..7f6fcc8685 100644
--- a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/json/AbstractEffectSerializationTest.java
+++ b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/json/AbstractEffectSerializationTest.java
@@ -2,7 +2,6 @@
 
 import it.unibo.alchemist.boundary.gui.effects.EffectFX;
 import it.unibo.alchemist.test.TemporaryFile;
-import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,25 +19,7 @@
  * @param <T>
  *            the type of effect
  */
-public abstract class AbstractEffectSerializationTest<T extends EffectFX<?>> {
-
-    /**
-     * Tests (de)serialization with default Java serialization engine.
-     * 
-     * @throws Exception
-     *             if something goes wrong
-     */
-    @Test
-    public abstract void testJavaSerialization() throws Exception;
-
-    /**
-     * Tests (de)serialization with Google Gson serialization engine.
-     * 
-     * @throws Exception
-     *             if something goes wrong
-     */
-    @Test
-    public abstract void testGsonSerialization() throws Exception;
+public class AbstractEffectSerializationTest<T extends EffectFX<?>> {
 
     /**
      * Method that generate {@link org.junit.jupiter.api.Assertions#assertTrue(boolean)}
diff --git a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/json/AbstractPropertySerializationTest.java b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/json/AbstractPropertySerializationTest.java
index b7ee996334..6ed1710e04 100644
--- a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/json/AbstractPropertySerializationTest.java
+++ b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/json/AbstractPropertySerializationTest.java
@@ -2,7 +2,6 @@
 
 import com.google.gson.Gson;
 import javafx.beans.property.Property;
-import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Type;
 
@@ -15,24 +14,6 @@ public abstract class AbstractPropertySerializationTest {
     /** The {@link Gson} object used for serialization. */
     protected static final Gson GSON = EffectSerializer.getGSON();
 
-    /**
-     * Tests (de)serialization with default Java serialization engine.
-     * 
-     * @throws Exception
-     *             if something goes wrong
-     */
-    @Test
-    public abstract void testJavaSerialization() throws Exception;
-
-    /**
-     * Tests (de)serialization with Google Gson serialization engine.
-     * 
-     * @throws Exception
-     *             if something goes wrong
-     */
-    @Test
-    public abstract void testGsonSerialization() throws Exception;
-
     /**
      * Method that generate {@link org.junit.jupiter.api.Assertions#assertTrue(boolean)} messages.
      * 
diff --git a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/json/EffectSerializerTest.java b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/json/EffectSerializerTest.java
index 9f8fea45e3..1aee6341c6 100644
--- a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/json/EffectSerializerTest.java
+++ b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/effects/json/EffectSerializerTest.java
@@ -27,7 +27,7 @@
 /**
  * JUnit test for EffectSerializer class.
  */
-public class EffectSerializerTest {
+class EffectSerializerTest {
     private static final String TEST_EFFECTS = "it/unibo/alchemist/gui/effects/json/TestEffects.json";
     private static final double TEST_SIZE = 6.0;
     private static final double TEST_SIZE_LIST = 7.0;
@@ -39,7 +39,7 @@ public class EffectSerializerTest {
      * @throws IOException if something goes wrong
      */
     @Test
-    public void testMultipleEffectGroupsSerialization() throws IOException {
+    void testMultipleEffectGroupsSerialization() throws IOException {
         final File file = TemporaryFile.create();
         final List<EffectGroup<Position2D<? extends Position2D<?>>>> groups = initList();
         EffectSerializer.effectGroupsToFile(file, groups);
@@ -53,7 +53,7 @@ public void testMultipleEffectGroupsSerialization() throws IOException {
      * @throws IOException if something goes wrong
      */
     @Test
-    public void testListOfEffectSerialization() throws IOException {
+    void testListOfEffectSerialization() throws IOException {
         final File file = TemporaryFile.create();
         final Type type = new TypeToken<List<EffectFX<Position2D<? extends Position2D<?>>>>>() {
         }.getType();
@@ -104,7 +104,7 @@ private List<EffectGroup<Position2D<? extends Position2D<?>>>> initList() {
      * @throws IOException if something goes wrong
      */
     @Test
-    public void testResourceSerialization() throws IOException {
+    void testResourceSerialization() throws IOException {
         final EffectGroup<Position2D<? extends Position2D<?>>> group = new EffectStack<>("Default Effects");
         final DrawDot<Position2D<? extends Position2D<?>>> effect = new DrawDot<>("Draw the dots");
         effect.setSize(TEST_SIZE);
diff --git a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/view/property/SerializableEnumPropertyTest.java b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/view/property/SerializableEnumPropertyTest.java
index bd41004591..aa87a2e71f 100644
--- a/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/view/property/SerializableEnumPropertyTest.java
+++ b/alchemist-fxui/src/test/java/it/unibo/alchemist/boundary/gui/view/property/SerializableEnumPropertyTest.java
@@ -9,13 +9,13 @@
 /**
  * JUnit test for custom {@link javafx.beans.property.Property} serialization.
  */
-public class SerializableEnumPropertyTest {
+class SerializableEnumPropertyTest {
     /**
      * Tests if {@link SerializableEnumProperty#values()} method works
      * correctly.
      */
     @Test
-    public void testValues() {
+    void testValues() {
         final SerializableEnumProperty<TestEnum> serializableEnumProperty = new SerializableEnumProperty<>("Test", TestEnum.FOO);
         assertArrayEquals(serializableEnumProperty.values(), TestEnum.values());
         final SerializableEnumProperty<TestEnum> enumProperty2 = new SerializableEnumProperty<>();
diff --git a/alchemist-grid/src/test/java/it/unibo/alchemist/test/TestConfig.java b/alchemist-grid/src/test/java/it/unibo/alchemist/test/TestConfig.java
index 7c2269b7ce..a3a3b4bf90 100644
--- a/alchemist-grid/src/test/java/it/unibo/alchemist/test/TestConfig.java
+++ b/alchemist-grid/src/test/java/it/unibo/alchemist/test/TestConfig.java
@@ -26,16 +26,15 @@
 
 /**
  */
-public class TestConfig {
+class TestConfig {
     private static final String DEPENDENCY_FILE = "config/dependencies_test.txt";
 
-
     /**
      * @throws URISyntaxException indicates failure
      * @throws IOException if an I/O error occurs
      */
     @Test
-    public void testGeneralSimulationConfig() throws URISyntaxException, IOException {
+    void testGeneralSimulationConfig() throws URISyntaxException, IOException {
         final String resource = "config/00-dependencies.yml";
         final var yaml = ResourceLoader.getResource(resource);
         Assertions.assertNotNull(yaml);
@@ -52,7 +51,7 @@ public void testGeneralSimulationConfig() throws URISyntaxException, IOException
      * @throws IOException if an I/O error occurs
      */
     @Test
-    public void testWorkingDirectory() throws IOException {
+    void testWorkingDirectory() throws IOException {
         final String resource = "config/00-dependencies.yml";
         final var yaml = ResourceLoader.getResource(resource);
         Assertions.assertNotNull(yaml);
@@ -75,7 +74,6 @@ public void testWorkingDirectory() throws IOException {
         Assertions.assertFalse(test.exists());
     }
 
-
     private Loader getLoader(final URL yaml) {
         return LoadAlchemist.from(yaml);
     }
diff --git a/alchemist-implementationbase/src/main/java/it/unibo/alchemist/model/math/RealDistributionUtil.java b/alchemist-implementationbase/src/main/java/it/unibo/alchemist/model/math/RealDistributionUtil.java
index 7f4243c58d..0359d774c2 100644
--- a/alchemist-implementationbase/src/main/java/it/unibo/alchemist/model/math/RealDistributionUtil.java
+++ b/alchemist-implementationbase/src/main/java/it/unibo/alchemist/model/math/RealDistributionUtil.java
@@ -51,7 +51,7 @@ public static RealDistribution makeRealDistribution(
             final double... arguments
     ) {
         final String name = shortname + (
-                shortname.endsWith("distribution") || shortname.endsWith("Distribution") ? "" : "distribution"
+            shortname.endsWith("distribution") || shortname.endsWith("Distribution") ? "" : "distribution"
         );
         final var result = REAL_DISTRIBUTIONS.stream()
             .filter(stat -> stat.getSimpleName().equalsIgnoreCase(requireNonNull(name)))
@@ -65,19 +65,20 @@ public static RealDistribution makeRealDistribution(
             .findAny()
             .map(c -> {
                 final Object[] actualArguments = Stream.concat(
-                        Stream.of(randomGenerator),
-                        Arrays.stream(arguments).boxed()
+                    Stream.of(randomGenerator),
+                    Arrays.stream(arguments).boxed()
                 ).toArray();
                 try {
                     return c.newInstance(actualArguments);
                 } catch (
-                        IllegalAccessException
-                        | InstantiationException
-                        | IllegalArgumentException
-                        | InvocationTargetException e
+                    IllegalAccessException
+                    | InstantiationException
+                    | IllegalArgumentException
+                    | InvocationTargetException e
                 ) {
                     throw new IllegalArgumentException(
-                        "Could not initialize " + name + " with " + c + " and arguments " + Arrays.toString(arguments), e
+                        "Could not initialize " + name + " with " + c + " and arguments " + Arrays.toString(arguments),
+                        e
                     );
                 }
             })
diff --git a/alchemist-implementationbase/src/test/java/it/unibo/alchemist/test/TestDoubleTime.java b/alchemist-implementationbase/src/test/java/it/unibo/alchemist/test/TestDoubleTime.java
index a170ad57bd..795f325dfc 100644
--- a/alchemist-implementationbase/src/test/java/it/unibo/alchemist/test/TestDoubleTime.java
+++ b/alchemist-implementationbase/src/test/java/it/unibo/alchemist/test/TestDoubleTime.java
@@ -17,13 +17,13 @@
 
 /**
  */
-public class TestDoubleTime {
+class TestDoubleTime {
 
     /**
      * 
      */
     @Test
-    public void testDoubleTime() {
+    void testDoubleTime() {
         final Time t = new DoubleTime(1);
         assertNotNull(t);
         assertEquals(new DoubleTime(1), t);
diff --git a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestBioRect2DEnvironmentNoOverlap.java b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestBioRect2DEnvironmentNoOverlap.java
index 0798021978..1232e8f6e7 100644
--- a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestBioRect2DEnvironmentNoOverlap.java
+++ b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestBioRect2DEnvironmentNoOverlap.java
@@ -46,7 +46,7 @@
  *
  */
 @SuppressWarnings("PMD.UseUnderscoresInNumericLiterals")
-public class TestBioRect2DEnvironmentNoOverlap {
+class TestBioRect2DEnvironmentNoOverlap {
 
     /**
      * The test seems to work for values of delta up to 2*10^(-8)
@@ -120,7 +120,7 @@ public class TestBioRect2DEnvironmentNoOverlap {
      *
      */
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         env = new BioRect2DEnvironmentNoOverlap();
         env.setLinkingRule(new NoLinks<>());
         ng1 = new CellNodeImpl<>(env, BIG_CELL_DIAMETER);
@@ -137,7 +137,7 @@ public void setUp() {
      * Testing if the node are correctly added, given their dimension in space.
      */
     @Test
-    public void testAddNode() {
+    void testAddNode() {
         final CellWithCircularArea<Euclidean2DPosition> n1 = new CellNodeImpl<>(env, LITTLE_CELL_DIAMETER);
         final CellWithCircularArea<Euclidean2DPosition> n2 = new CellNodeImpl<>(env, LITTLE_CELL_DIAMETER);
         final CellWithCircularArea<Euclidean2DPosition> n3 = new CellNodeImpl<>(env, LITTLE_CELL_DIAMETER);
@@ -206,7 +206,7 @@ private void verifyAdded(final Node<Double> node, final Position<?> expected) {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode1() {
+    void testMoveNode1() {
         final CellWithCircularArea<Euclidean2DPosition> cellToMove1 = new CellNodeImpl<>(env, LITTLE_CELL_DIAMETER);
         env.addNode(cellToMove1, originalPos);
         final Euclidean2DPosition p1 = new Euclidean2DPosition(40, 0);
@@ -226,7 +226,7 @@ public void testMoveNode1() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode2() {
+    void testMoveNode2() {
         final CellWithCircularArea<Euclidean2DPosition> cellToMove2 = new CellNodeImpl<>(env, LITTLE_CELL_DIAMETER);
         env.addNode(cellToMove2, originalPos);
         final Euclidean2DPosition p2 = new Euclidean2DPosition(40, 5);
@@ -250,7 +250,7 @@ public void testMoveNode2() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode3() {
+    void testMoveNode3() {
         final CellWithCircularArea<Euclidean2DPosition> cellToMove3 = new CellNodeImpl<>(env, LITTLE_CELL_DIAMETER);
         env.addNode(cellToMove3, originalPos);
         final Euclidean2DPosition p4 = new Euclidean2DPosition(10, 0);
@@ -270,7 +270,7 @@ public void testMoveNode3() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode4() {
+    void testMoveNode4() {
         final CellWithCircularArea<Euclidean2DPosition> cellToMove4 = new CellNodeImpl<>(env, LITTLE_CELL_DIAMETER);
         env.addNode(cellToMove4, originalPos);
         final Euclidean2DPosition p5 = new Euclidean2DPosition(
@@ -293,7 +293,7 @@ public void testMoveNode4() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode5() {
+    void testMoveNode5() {
         final CellWithCircularArea<Euclidean2DPosition> cellToMove5 = new CellNodeImpl<>(env, LITTLE_CELL_DIAMETER);
         env.addNode(cellToMove5, originalPos);
         final Euclidean2DPosition p6 = new Euclidean2DPosition(20, 10);
@@ -313,7 +313,7 @@ public void testMoveNode5() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode6() {
+    void testMoveNode6() {
         final CellWithCircularArea<Euclidean2DPosition> cellToMove6 = new CellNodeImpl<>(env, LITTLE_CELL_DIAMETER);
         env.addNode(cellToMove6, originalPos);
         final Euclidean2DPosition p7 = new Euclidean2DPosition(-40, 0);
@@ -333,7 +333,7 @@ public void testMoveNode6() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode7() {
+    void testMoveNode7() {
         final CellWithCircularArea<Euclidean2DPosition> cellToMove7 = new CellNodeImpl<>(env, LITTLE_CELL_DIAMETER);
         env.addNode(cellToMove7, originalPos);
         final Euclidean2DPosition p8 = new Euclidean2DPosition(40, 40);
@@ -341,7 +341,7 @@ public void testMoveNode7() {
         env.addNode(c8, p8);
         env.moveNode(cellToMove7, POSITION_TO_MOVE7);
         assertTrueJUnit4("cellToMove7 is in position: " + env.getPosition(cellToMove7).toString(),
-                env.getPosition(cellToMove7).equals(EXPECTED_POS7));
+                EXPECTED_POS7.equals(env.getPosition(cellToMove7)));
         env.removeNode(cellToMove7);
         env.removeNode(c8);
     }
@@ -350,7 +350,7 @@ public void testMoveNode7() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode8() {
+    void testMoveNode8() {
         final CellWithCircularArea<Euclidean2DPosition> cellToMove8 = new CellNodeImpl<>(env, LITTLE_CELL_DIAMETER);
         env.addNode(cellToMove8, originalPos);
         final Euclidean2DPosition p9 = new Euclidean2DPosition(-40, -40);
@@ -358,7 +358,7 @@ public void testMoveNode8() {
         env.addNode(c9, p9);
         env.moveNode(cellToMove8, POSITION_TO_MOVE8);
         assertTrueJUnit4("cellToMove8 is in position: " + env.getPosition(cellToMove8).toString(),
-                env.getPosition(cellToMove8).equals(EXPECTED_POS8));
+                EXPECTED_POS8.equals(env.getPosition(cellToMove8)));
         env.removeNode(cellToMove8);
         env.removeNode(c9);
     }
@@ -371,7 +371,7 @@ public void testMoveNode8() {
      * Testing if the node are correctly added, given their dimension in space.
      */
     @Test
-    public void testAddDifferentDiam1() {
+    void testAddDifferentDiam1() {
         env.addNode(ng1, originalPos);
 
         final Euclidean2DPosition p1 = new Euclidean2DPosition(10, 0);
@@ -392,7 +392,7 @@ public void testAddDifferentDiam1() {
      * Testing if the node are correctly added, given their dimension in space.
      */
     @Test
-    public void testAddDifferentDiam2() {
+    void testAddDifferentDiam2() {
         env.addNode(np1, originalPos);
         final Euclidean2DPosition p1 = new Euclidean2DPosition(10, 0);
         final Euclidean2DPosition p2 = new Euclidean2DPosition(20, 0);
@@ -416,7 +416,7 @@ public void testAddDifferentDiam2() {
      * Testing if the node are correctly added, given their dimension in space.
      */
     @Test
-    public void testAddDifferentDiam3() {
+    void testAddDifferentDiam3() {
         env.addNode(np1, originalPos);
         final Euclidean2DPosition p1 = new Euclidean2DPosition(20, 0);
         final Euclidean2DPosition p2 = new Euclidean2DPosition(0, 15);
@@ -439,7 +439,7 @@ public void testAddDifferentDiam3() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveDifferentDiam1() {
+    void testMoveDifferentDiam1() {
         final CellWithCircularArea<Euclidean2DPosition> cellToMove1 = np1;
         env.addNode(cellToMove1, originalPos);
         final Euclidean2DPosition pd = new Euclidean2DPosition(50, 0);
@@ -455,7 +455,7 @@ public void testMoveDifferentDiam1() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveDifferentDiam2() {
+    void testMoveDifferentDiam2() {
         final Euclidean2DPosition pd = new Euclidean2DPosition(50, 0);
         final CellWithCircularArea<Euclidean2DPosition> cellToMove2 = np2;
         env.addNode(cellToMove2, originalPos);
@@ -471,7 +471,7 @@ public void testMoveDifferentDiam2() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveDifferentDiam3() {
+    void testMoveDifferentDiam3() {
         final Euclidean2DPosition pd = new Euclidean2DPosition(50, 0);
         final CellWithCircularArea<Euclidean2DPosition> cellToMove3 = np3;
         env.addNode(cellToMove3, originalPos);
@@ -479,20 +479,24 @@ public void testMoveDifferentDiam3() {
         final Euclidean2DPosition p1 = new Euclidean2DPosition(25, 0);
         env.addNode(ng1, p1);
         env.moveNode(cellToMove3, pd);
-        assertTrueJUnit4("cellToMove3 is in position: " + env.getPosition(cellToMove3),
-                env.getPosition(cellToMove3).equals(EXPECTED_POS_DIFFDIAM3_1));
+        assertTrueJUnit4(
+            "cellToMove3 is in position: " + env.getPosition(cellToMove3),
+            EXPECTED_POS_DIFFDIAM3_1.equals(env.getPosition(cellToMove3))
+        );
         env.removeNode(ng1);
         env.addNode(nm1, p1);
         env.moveNode(cellToMove3, pd);
-        assertTrueJUnit4("cellToMove3 is in position: " + env.getPosition(cellToMove3),
-                env.getPosition(cellToMove3).equals(EXPECTED_POS_DIFFDIAM3_2));
+        assertTrueJUnit4(
+            "cellToMove3 is in position: " + env.getPosition(cellToMove3),
+            EXPECTED_POS_DIFFDIAM3_2.equals(env.getPosition(cellToMove3))
+        );
     }
 
     /**
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveDifferentDiam4() {
+    void testMoveDifferentDiam4() {
         final Euclidean2DPosition pd = new Euclidean2DPosition(-50, 0);
         final CellWithCircularArea<Euclidean2DPosition> cellToMove4 = np3;
         env.addNode(cellToMove4, originalPos);
@@ -500,20 +504,24 @@ public void testMoveDifferentDiam4() {
         final Euclidean2DPosition p1 = new Euclidean2DPosition(-25, 0);
         env.addNode(ng1, p1);
         env.moveNode(cellToMove4, pd);
-        assertTrueJUnit4("cellToMove4 is in position: " + env.getPosition(cellToMove4),
-                env.getPosition(cellToMove4).equals(EXPECTED_POS_DIFFDIAM4_1));
+        assertTrueJUnit4(
+            "cellToMove4 is in position: " + env.getPosition(cellToMove4),
+            EXPECTED_POS_DIFFDIAM4_1.equals(env.getPosition(cellToMove4))
+        );
         env.removeNode(ng1);
         env.addNode(nm1, p1);
         env.moveNode(cellToMove4, pd);
-        assertTrueJUnit4("cellToMove4 is in position: " + env.getPosition(cellToMove4),
-                env.getPosition(cellToMove4).equals(EXPECTED_POS_DIFFDIAM4_2));
+        assertTrueJUnit4(
+            "cellToMove4 is in position: " + env.getPosition(cellToMove4),
+            EXPECTED_POS_DIFFDIAM4_2.equals(env.getPosition(cellToMove4))
+        );
     }
 
     /**
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveDifferentDiam5() {
+    void testMoveDifferentDiam5() {
         final Euclidean2DPosition pd = new Euclidean2DPosition(50, 50);
         final CellWithCircularArea<Euclidean2DPosition> cellToMove5 = np3;
         env.addNode(cellToMove5, originalPos);
@@ -540,7 +548,7 @@ public void testMoveDifferentDiam5() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveDifferentDiam6() {
+    void testMoveDifferentDiam6() {
         final CellWithCircularArea<Euclidean2DPosition> cellToMove6 = np1;
         env.addNode(cellToMove6, originalPos);
         final Euclidean2DPosition pd = new Euclidean2DPosition(50, 0);
@@ -560,7 +568,7 @@ public void testMoveDifferentDiam6() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveDifferentDiam7() {
+    void testMoveDifferentDiam7() {
         final CellWithCircularArea<Euclidean2DPosition> cellToMove7 = np1;
         env.addNode(cellToMove7, originalPos);
         final Euclidean2DPosition pd = new Euclidean2DPosition(50, 0);
@@ -578,7 +586,7 @@ public void testMoveDifferentDiam7() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveDifferentDiam8() {
+    void testMoveDifferentDiam8() {
         final CellWithCircularArea<Euclidean2DPosition> cellToMove8 = np1;
         env.addNode(cellToMove8, originalPos);
         final Euclidean2DPosition pd = new Euclidean2DPosition(50, 0);
@@ -597,7 +605,7 @@ public void testMoveDifferentDiam8() {
      * correctly updated.
      */
     @Test
-    public void testMoveInTwoSteps1() {
+    void testMoveInTwoSteps1() {
         final CellWithCircularArea<Euclidean2DPosition> c1 = np1;
         env.addNode(c1, originalPos);
         final Euclidean2DPosition pd1 = new Euclidean2DPosition(50, 0);
@@ -616,7 +624,7 @@ public void testMoveInTwoSteps1() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode9() {
+    void testMoveNode9() {
         final CellWithCircularArea<Euclidean2DPosition> c1 = new CellNodeImpl<>(env, 1);
         final CellWithCircularArea<Euclidean2DPosition> c2 = new CellNodeImpl<>(env, 1);
         env.addNode(c2, NODE_POS9);
@@ -630,7 +638,7 @@ public void testMoveNode9() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode10() {
+    void testMoveNode10() {
         final CellWithCircularArea<Euclidean2DPosition> c1 = new CellNodeImpl<>(env, 1);
         final CellWithCircularArea<Euclidean2DPosition> c2 = new CellNodeImpl<>(env, 1);
         env.addNode(c2, NODE_POS10);
@@ -644,7 +652,7 @@ public void testMoveNode10() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode11() {
+    void testMoveNode11() {
         final double diameter = 1;
         final CellWithCircularArea<Euclidean2DPosition> c1 = new CellNodeImpl<>(env, diameter);
         final CellWithCircularArea<Euclidean2DPosition> c2 = new CellNodeImpl<>(env, diameter);
@@ -667,7 +675,7 @@ public void testMoveNode11() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode12() {
+    void testMoveNode12() {
         final double diameter = 1;
         final CellWithCircularArea<Euclidean2DPosition> c1 = new CellNodeImpl<>(env, diameter);
         final CellWithCircularArea<Euclidean2DPosition> c2 = new CellNodeImpl<>(env, diameter);
@@ -690,7 +698,7 @@ public void testMoveNode12() {
      * Testing if node moves respecting dimension of all the others.
      */
     @Test
-    public void testMoveNode13() {
+    void testMoveNode13() {
         final double diameter = 1;
         final CellWithCircularArea<Euclidean2DPosition> c1 = new CellNodeImpl<>(env, diameter);
         final CellWithCircularArea<Euclidean2DPosition> c2 = new CellNodeImpl<>(env, diameter);
@@ -716,7 +724,7 @@ public void testMoveNode13() {
      * Test in a simulation if there's no overlapping between cells.
      */
     @Test
-    public void testNoOverlapInSimulation1() {
+    void testNoOverlapInSimulation1() {
         testLoading("provaBCReaction.yml");
     }
 
@@ -724,7 +732,7 @@ public void testNoOverlapInSimulation1() {
      * Test in a simulation if there's no overlapping between cells.
      */
     @Test
-    public void testNoOverlapInSimulation2() {
+    void testNoOverlapInSimulation2() {
         testLoading("provaBCReaction2.yml");
     }
 
diff --git a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestBiomolLayer.java b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestBiomolLayer.java
index 52a156b6c7..87b1cdebd0 100644
--- a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestBiomolLayer.java
+++ b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestBiomolLayer.java
@@ -34,7 +34,7 @@
  * 
  *
  */
-public class TestBiomolLayer {
+class TestBiomolLayer {
 
     private static final Incarnation<Double, Euclidean2DPosition> INCARNATION = new BiochemistryIncarnation<>();
 
@@ -42,7 +42,7 @@ public class TestBiomolLayer {
      * Test if cell status is correctly updated in movement.
      */
     @Test
-    public void testBiomolStepLayer() {
+    void testBiomolStepLayer() {
         final Environment<Double, Euclidean2DPosition> env = new BioRect2DEnvironment();
         final Biomolecule b = new Biomolecule("B");
         final Layer<Double, Euclidean2DPosition> bLayer = new StepLayer<>(10_000.0, 0d);
diff --git a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestChemotaxis.java b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestChemotaxis.java
index 56247a5cbc..821597a781 100644
--- a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestChemotaxis.java
+++ b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestChemotaxis.java
@@ -33,7 +33,7 @@
  * 
  */
 @SuppressWarnings("CPD-START")
-public class TestChemotaxis {
+class TestChemotaxis {
 
     private static final double CONCENTRATION1 = 5;
     private static final double CONCENTRATION2 = 10;
@@ -73,7 +73,7 @@ public void setUp() {
      * Testing if cell is polarized correctly.
      */
     @Test
-    public void testChemotacticPolarization1() {
+    void testChemotacticPolarization1() {
         final Euclidean2DPosition p1 =  new Euclidean2DPosition(0, 0);
         final Euclidean2DPosition p2 = new Euclidean2DPosition(1, 0);
         final Euclidean2DPosition p3 =  new Euclidean2DPosition(0, 1);
@@ -103,7 +103,7 @@ public void testChemotacticPolarization1() {
      * Testing if cell is polarized correctly.
      */
     @Test
-    public void testChemotacticPolarization2() {
+    void testChemotacticPolarization2() {
         final Euclidean2DPosition p1 =  new Euclidean2DPosition(0, 0);
         final Euclidean2DPosition p2 = new Euclidean2DPosition(1, 0);
         final Euclidean2DPosition p3 =  new Euclidean2DPosition(0, 1);
@@ -133,7 +133,7 @@ public void testChemotacticPolarization2() {
      * Testing if cell is polarized correctly.
      */
     @Test
-    public void testChemotacticPolarization3() {
+    void testChemotacticPolarization3() {
         final Euclidean2DPosition p1 =  new Euclidean2DPosition(0, 0);
         final Euclidean2DPosition p2 = new Euclidean2DPosition(1, 0);
         final Euclidean2DPosition p3 =  new Euclidean2DPosition(0, 1);
@@ -160,7 +160,7 @@ public void testChemotacticPolarization3() {
      * Testing if cell is polarized correctly.
      */
     @Test
-    public void testChemotacticPolarization4() {
+    void testChemotacticPolarization4() {
         final Euclidean2DPosition p1 = new Euclidean2DPosition(0.5, 0.5);
         env.addNode(cellNode1, p1);
         final Reaction<Double> r = inc.createReaction(rand, env, cellNode1, time, CHEMIOTACTIC_POLARIZATION_REACTION);
@@ -179,7 +179,7 @@ public void testChemotacticPolarization4() {
      * Testing if cell is polarized correctly.
      */
     @Test
-    public void testChemotacticPolarization5() {
+    void testChemotacticPolarization5() {
         final Euclidean2DPosition p1 = new Euclidean2DPosition(0, 0);
         final Euclidean2DPosition p2 = new Euclidean2DPosition(1, 0);
         final Euclidean2DPosition p3 = new Euclidean2DPosition(-1, 0);
@@ -208,7 +208,7 @@ public void testChemotacticPolarization5() {
      * Testing if cell moves according to the given polarization.
      */
     @Test
-    public void testChemotacticMove1() {
+    void testChemotacticMove1() {
         final Euclidean2DPosition p1 = new Euclidean2DPosition(0, 0);
         final Euclidean2DPosition p2 = new Euclidean2DPosition(1, 0);
         final Euclidean2DPosition p3 = new Euclidean2DPosition(0, 1);
@@ -234,7 +234,7 @@ public void testChemotacticMove1() {
      * Testing if cell moves according to the given polarization.
      */
     @Test
-    public void testChemotacticMove2() {
+    void testChemotacticMove2() {
         final Euclidean2DPosition p1 = new Euclidean2DPosition(0, 0);
         final Euclidean2DPosition p2 = new Euclidean2DPosition(1, 0);
         final Euclidean2DPosition p3 = new Euclidean2DPosition(0, 1);
@@ -267,7 +267,7 @@ public void testChemotacticMove2() {
      * Testing if cell moves according to the given polarization.
      */
     @Test
-    public void testChemotacticMove3() {
+    void testChemotacticMove3() {
         final Euclidean2DPosition p1 = new Euclidean2DPosition(0, 0);
         final Euclidean2DPosition p2 = new Euclidean2DPosition(1, 0);
         final Euclidean2DPosition p3 = new Euclidean2DPosition(0, 1);
diff --git a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestDSL.java b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestDSL.java
index 5d8fc6c45d..102310acb0 100644
--- a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestDSL.java
+++ b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestDSL.java
@@ -28,7 +28,7 @@
 /**
  * Tests for domain specific language of the incarnation.
  */
-public class TestDSL {
+class TestDSL {
 
     private static BiochemistrydslParser getParser(final String reaction) {
         final CharStream in = CharStreams.fromString(reaction);
@@ -91,7 +91,7 @@ private void testInvalidReaction(final String reaction) {
      * Tests.
      */
     @Test
-    public void test() { // NOPMD on NCSS line count
+    void test() { // NOPMD on NCSS line count
         /* ********* Valid reactions **********/
         testValidReaction("[] --> []");
         testValidReaction("[a] --> []");
diff --git a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestDeformableCell.java b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestDeformableCell.java
index 6a2b72fa91..d5bb00f302 100644
--- a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestDeformableCell.java
+++ b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestDeformableCell.java
@@ -36,7 +36,7 @@
  * 
  *
  */
-public class TestDeformableCell {
+class TestDeformableCell {
 
     private static final double PRECISION = 1e-13;
     private static final double XMIN = -10;
@@ -99,7 +99,7 @@ public void setUp() {
      * Testing if CircularDeformableCells are added correctly.
      */
     @Test
-    public void testAddNode1() {
+    void testAddNode1() {
         env.addNode(cellNode1, CELL_POS1_1);
         env.addNode(cellNode2, CELL_POS1_2);
         env.addNode(cellNode3, CELL_POS1_3);
@@ -114,7 +114,7 @@ public void testAddNode1() {
      * Testing if Environment updates correctly after node's remotion.
      */
     @Test
-    public void testAddAndRemoveNode() {
+    void testAddAndRemoveNode() {
         env.addNode(cellNode1, CELL_POS2_1);
         env.addNode(cellNode2, CELL_POS2_2);
         env.addNode(cellNode3, CELL_POS2_3);
@@ -139,7 +139,7 @@ public void testAddAndRemoveNode() {
      */
     @Test
     @SuppressWarnings("CPD-START")
-    public void testTensionPresent1() {
+    void testTensionPresent1() {
         env.addNode(cellNode1, CELL_POS_TENSPRES1_1);
         env.addNode(cellNode2, CELL_POS_TENSPRES1_2);
         cellNode1.addReaction(inc.createReaction(rand, env, cellNode1, time, "[] --> [A] if TensionPresent()"));
@@ -169,7 +169,7 @@ public void testTensionPresent1() {
      * Testing {@link TensionPresent}.
      */
     @Test
-    public void testTensionPresent2() {
+    void testTensionPresent2() {
         env.addNode(cellNode1, new Euclidean2DPosition(0, 0));
         env.addNode(cellNode3, new Euclidean2DPosition(0, 1));
         cellNode1.addReaction(inc.createReaction(rand, env, cellNode1, time, "[] --> [A] if TensionPresent()"));
@@ -209,7 +209,7 @@ public void testTensionPresent2() {
      * Testing {@link CellTensionPolarization}.
      */
     @Test
-    public void testTensionPolarization1() {
+    void testTensionPolarization1() {
         env.addNode(cellNode1, new Euclidean2DPosition(0, 0));
         env.addNode(cellNode3, new Euclidean2DPosition(0, 1));
         cellNode1.addReaction(inc.createReaction(rand, env, cellNode1, time, CELL_TENSION_POLARIZATION)); 
@@ -236,7 +236,7 @@ public void testTensionPolarization1() {
      * Testing {@link CellTensionPolarization}.
      */
     @Test
-    public void testTensionPolarization2() {
+    void testTensionPolarization2() {
         env.addNode(cellNode1, new Euclidean2DPosition(0, 0)); 
         env.addNode(cellNode3, new Euclidean2DPosition(0, 1)); 
         env.addNode(cellNode2, MOVE_TO_POS_TENSPOL2_3);
@@ -262,7 +262,7 @@ public void testTensionPolarization2() {
      * Testing {@link CellTensionPolarization}.
      */
     @Test
-    public void testTensionPolarization3() {
+    void testTensionPolarization3() {
         env.addNode(cellNode1, new Euclidean2DPosition(0, 0));
         env.addNode(cellNode3, new Euclidean2DPosition(-1, 1));
         env.addNode(cellNode5, new Euclidean2DPosition(-1, -1));
@@ -299,7 +299,7 @@ public void testTensionPolarization3() {
      * Testing {@link CellTensionPolarization}.
      */
     @Test
-    public void testTensionPolarization4() {
+    void testTensionPolarization4() {
         env.addNode(cellNode3, new Euclidean2DPosition(0, 0));
         env.addNode(cellNode5, new Euclidean2DPosition(-1, 0));
         env.addNode(cellNode2, CELL_POS_TENSPOL4_1);
@@ -315,7 +315,7 @@ public void testTensionPolarization4() {
      * Testing {@link CellTensionPolarization}.
      */
     @Test
-    public void testTensionPolarization5() {
+    void testTensionPolarization5() {
         env.addNode(cellNode3, new Euclidean2DPosition(0, 0));
         env.addNode(cellNode5, new Euclidean2DPosition(-1, 0));
         env.addNode(cellNode2, CELL_POS_TENSPOL5_1);
@@ -331,7 +331,7 @@ public void testTensionPolarization5() {
      * Testing {@link CellTensionPolarization}.
      */
     @Test
-    public void testTensionPolarization6() {
+    void testTensionPolarization6() {
         env.addNode(cellNode3, new Euclidean2DPosition(0, 0));
         env.addNode(cellNode4, CELL_POS_TENSPOL6_1);
         env.addNode(cellNode2, CELL_POS_TENSPOL6_2);
@@ -347,7 +347,7 @@ public void testTensionPolarization6() {
      * Test if cell, in motion, stops when meets another cell.
      */
     @Test
-    public void testMoveNode1() {
+    void testMoveNode1() {
         env.addNode(cellNode1, new Euclidean2DPosition(0, 0));
         env.addNode(cellNode2, CELL_POS_MOV1);
         env.moveNodeToPosition(cellNode1, new Euclidean2DPosition(0, 10));
diff --git a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestEnvironmentNodes.java b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestEnvironmentNodes.java
index c63fef0758..cfe60f7f6a 100644
--- a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestEnvironmentNodes.java
+++ b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestEnvironmentNodes.java
@@ -46,7 +46,7 @@
  */
 
 @SuppressWarnings("ALL")
-public final class TestEnvironmentNodes {
+final class TestEnvironmentNodes {
 
     private static final double PRECISION = 1e-12;
     private static final Incarnation<Double, Euclidean2DPosition> INCARNATION = new BiochemistryIncarnation<>();
@@ -78,7 +78,7 @@ public void setUp() {
      * test a simple reaction "[A] --> [A in env]".
      */
     @Test
-    public void test1() {
+    void test1() {
         final CellNode<Euclidean2DPosition> cellNode = new CellNodeImpl<>(env);
         final EnvironmentNode envNode = new EnvironmentNodeImpl(env);
         final Molecule a = new Biomolecule("A");
@@ -97,7 +97,7 @@ public void test1() {
      * test a simple reaction "[A] --> [A in env]".
      */
     @Test
-    public void test2() {
+    void test2() {
         final EnvironmentNode envNode1 = new EnvironmentNodeImpl(env);
         final EnvironmentNode envNode2 = new EnvironmentNodeImpl(env);
         final Molecule a = new Biomolecule("A");
@@ -147,7 +147,7 @@ private void testDiffusion(final Node<Double> center) {
      * Test if env nodes are selected randomly.
      */
     @Test
-    public void testDiffusionWithEnvironmentNodes() {
+    void testDiffusionWithEnvironmentNodes() {
         testDiffusion(new EnvironmentNodeImpl(env));
     }
 
@@ -155,7 +155,7 @@ public void testDiffusionWithEnvironmentNodes() {
      * Test if env nodes with same concentration are selected randomly.
      */
     @Test
-    public void testDiffusionWithCellNodes() {
+    void testDiffusionWithCellNodes() {
         testDiffusion(new CellNodeImpl<>(env));
     }
  
@@ -163,7 +163,7 @@ public void testDiffusionWithCellNodes() {
      * Test if env nodes with same concentration are selected randomly.
      */
     @Test
-    public void test5() {
+    void test5() {
         final CellNode<Euclidean2DPosition> cellNode = new CellNodeImpl<>(env);
         final EnvironmentNode envNode1 = new EnvironmentNodeImpl(env);
         final EnvironmentNode envNode2 = new EnvironmentNodeImpl(env);
@@ -197,7 +197,7 @@ public void test5() {
      * test a simple reaction "[A] --> [A in env]".
      */
     @Test
-    public void test6() {
+    void test6() {
         final CellNode<Euclidean2DPosition> cellNode = new CellNodeImpl<>(env);
         final Molecule a = new Biomolecule("A");
         injectAInEnvReaction(cellNode, 1);
@@ -215,7 +215,7 @@ public void test6() {
      * Test transport of a molecule from cell to env.
      */
     @Test
-    public void testEnv1() {
+    void testEnv1() {
         final var environment = testNoVar("testEnv1.yml");
         final double conA = (double) environment.getNodes().stream()
                 .filter(n -> n.getClass().equals(EnvironmentNodeImpl.class))
@@ -229,7 +229,7 @@ public void testEnv1() {
      * Simple interaction between a CellNode and 4 EnviromentalNodes.
      */
     @Test
-    public void testEnv2() {
+    void testEnv2() {
         final Environment<Double, Euclidean2DPosition> env = testNoVar("testEnv2.yml");
         final Node<Double> center = env.getNodes().stream()
                 .parallel()
@@ -252,7 +252,7 @@ public void testEnv2() {
      * Test transport of a molecule from env to cell.
      */
     @Test
-    public void testEnv3() {
+    void testEnv3() {
         final double conAInCell = (double) testNoVar("testEnv3.yml").getNodes().stream()
                 .parallel()
                 .filter(n -> n.getClass().equals(CellNodeImpl.class))
@@ -274,7 +274,7 @@ public void testEnv3() {
      * So there's no A in env and in cell both.
      */
     @Test
-    public void testEnv4() {
+    void testEnv4() {
         final double conAInCell = (double) testNoVar("testEnv4.yml").getNodes().stream()
                 .parallel()
                 .filter(n -> n.getClass().equals(CellNodeImpl.class))
@@ -294,7 +294,7 @@ public void testEnv4() {
      * test programming an environment node.
      */
     @Test
-    public void testEnv5() {
+    void testEnv5() {
         final Environment<Double, Euclidean2DPosition> env = testNoVar("testEnv5.yml");
         final double conAInEnv1 = (double) env.getNodes().stream()
                 .parallel()
@@ -316,7 +316,7 @@ public void testEnv5() {
      * Now this will throw an UnsupportedOperationException
      */
     @Test
-    public void testEnv6() {
+    void testEnv6() {
         assertThrows(UnsupportedOperationException.class, () -> testNoVar("testEnv6.yml"));
     }
 
@@ -324,7 +324,7 @@ public void testEnv6() {
      * test if neighbors are selected correctly.
      */
     @Test
-    public void testEnv7() {
+    void testEnv7() {
         final Environment<Double, Euclidean2DPosition> env = testNoVar("testEnv7.yml");
         final double conAInCell = (double) env.getNodes().stream()
                 .parallel()
@@ -346,7 +346,7 @@ public void testEnv7() {
      * test if neighbors are selected correctly.
      */
     @Test
-    public void testEnv8() {
+    void testEnv8() {
         final Environment<Double, Euclidean2DPosition> env = testNoVar("testEnv8.yml");
         final double conAInCell = (double) env.getNodes().stream()
                 .parallel()
diff --git a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestIncarnation.java b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestIncarnation.java
index 5440a25531..f8352bc241 100644
--- a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestIncarnation.java
+++ b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestIncarnation.java
@@ -47,7 +47,7 @@
 /**
  * Test for biochemistry incarnation.
  */
-public class TestIncarnation {
+class TestIncarnation {
 
     private static final BiochemistryIncarnation<Euclidean2DPosition> INCARNATION = new BiochemistryIncarnation<>();
     private CellNode<Euclidean2DPosition> node;
@@ -74,7 +74,7 @@ public void setUp() {
     /**
      */
     @Test
-    public void testCreateMolecule() {
+    void testCreateMolecule() {
         makeMol("C");
         makeMol("H");
         makeMol("OH");
@@ -132,7 +132,7 @@ private void testNoR(final String param) { // used for cases like [A] + [B in ne
      * Test various flavors of reaction creation.
      */
     @Test
-    public void testCreateReaction() {
+    void testCreateReaction() {
         //CHECKSTYLE: MagicNumber OFF
         testR("[] --> []", 0, 0, 0, 0, 0, 0, 0, 0);
         testR("[] + [] --> [] + []", 0, 0, 0, 0, 0, 0, 0, 0);
@@ -194,7 +194,7 @@ public void testCreateReaction() {
      * 
      */
     @Test
-    public void testCreateNode() {
+    void testCreateNode() {
         assertThrows(IllegalArgumentException.class, () -> INCARNATION.createNode(rand, env, "foo"));
     }
 
diff --git a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestJunction.java b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestJunction.java
index fe0f3d4354..2546ade004 100644
--- a/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestJunction.java
+++ b/alchemist-incarnation-biochemistry/src/test/java/it/unibo/alchemist/test/TestJunction.java
@@ -29,7 +29,7 @@
 /**
  */
 @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR")
-public class TestJunction {
+class TestJunction {
 
     private CellNode<Euclidean2DPosition> node1;
     private CellNode<Euclidean2DPosition> node2;
@@ -49,7 +49,7 @@ public void setUp() {
      * Various test cases for junctions management.
      */
     @Test
-    public void test() {
+    void test() {
         final Map<Biomolecule, Double> map1 = new HashMap<>(1);
         final Map<Biomolecule, Double> map2 = new HashMap<>(1);
         map1.put(new Biomolecule("A"), 1d);
diff --git a/alchemist-incarnation-protelis/src/main/java/it/unibo/alchemist/protelis/AlchemistExecutionContext.java b/alchemist-incarnation-protelis/src/main/java/it/unibo/alchemist/protelis/AlchemistExecutionContext.java
index 6752cdfc2e..b14a191dc5 100644
--- a/alchemist-incarnation-protelis/src/main/java/it/unibo/alchemist/protelis/AlchemistExecutionContext.java
+++ b/alchemist-incarnation-protelis/src/main/java/it/unibo/alchemist/protelis/AlchemistExecutionContext.java
@@ -133,7 +133,7 @@ public double distanceTo(final DeviceUID target) {
      * @return the distance
      */
     public double distanceTo(final int target) {
-        return distanceTo((ProtelisNode) environment.getNodeByID(target));
+        return distanceTo((ProtelisNode<?>) environment.getNodeByID(target));
     }
 
     @Override
@@ -211,12 +211,12 @@ protected AlchemistExecutionContext<P> instance() {
      * @return The same behavior of MIT Proto's nbrdelay (forward view).
      */
     @Override
-    public Field nbrDelay() {
+    public Field<Number> nbrDelay() {
         return buildField(Function.identity(), getDeltaTime());
     }
 
     @Override
-    public Field nbrLag() {
+    public Field<Double> nbrLag() {
         return buildField(time -> getCurrentTime().doubleValue() - time, getCurrentTime().doubleValue());
     }
 
diff --git a/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestInSimulator.java b/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestInSimulator.java
index 1ffee97d1e..f945991a3d 100644
--- a/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestInSimulator.java
+++ b/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestInSimulator.java
@@ -35,13 +35,13 @@
 /**
  * A series of tests checking that our Yaml Loader is working as expected.
  */
-public class TestInSimulator {
+class TestInSimulator {
 
     /**
      * Basic loading capabilities.
      */
     @Test
-    public void testBase() {
+    void testBase() {
         testNoVar("testbase.yml");
     }
 
@@ -49,7 +49,7 @@ public void testBase() {
      * Tests loading custom nodes.
      */
     @Test
-    public void testCustomNodes() {
+    void testCustomNodes() {
         testNoVar("customnodes.yml");
     }
 
@@ -57,7 +57,7 @@ public void testCustomNodes() {
      * Test the ability to load a Protelis module from classpath.
      */
     @Test
-    public void testLoadProtelisModule() {
+    void testLoadProtelisModule() {
         testNoVar("test00.yml");
     }
 
@@ -70,7 +70,7 @@ public void testLoadProtelisModule() {
      * @throws InterruptedException causes failure
      */
     @Test
-    public void testThreadDependentLoadModule() throws IOException, URISyntaxException, ExecutionException, InterruptedException {
+    void testThreadDependentLoadModule() throws IOException, URISyntaxException, ExecutionException, InterruptedException {
         final Callable<Void> c = () -> {
             testNoVar("18-export.yml");
             return null;
@@ -108,7 +108,7 @@ private File createDependenciesDirectory() throws IOException, URISyntaxExceptio
      * Test the ability to inject variables.
      */
     @Test
-    public void testLoadWithVariable() {
+    void testLoadWithVariable() {
         final Map<String, Double> map = Maps.newLinkedHashMap();
         map.put("testVar", 10d);
         testLoading("test00.yml", map);
diff --git a/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestIncarnation.java b/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestIncarnation.java
index ea3d8bbb75..7d9550f42e 100644
--- a/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestIncarnation.java
+++ b/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestIncarnation.java
@@ -35,7 +35,7 @@
 
 /**
  */
-public class TestIncarnation {
+class TestIncarnation {
 
     private static final ProtelisIncarnation<Euclidean2DPosition> INCARNATION = new ProtelisIncarnation<>();
 
@@ -44,7 +44,7 @@ public class TestIncarnation {
      * Alchemist entities for running Protelis.
      */
     @Test
-    public void testBuild() {
+    void testBuild() {
         final RandomGenerator rng = new MersenneTwister(0);
         final Environment<Object, Euclidean2DPosition> env = new Continuous2DEnvironment<>(INCARNATION);
         final Node<Object> node = INCARNATION.createNode(rng, env, null);
@@ -112,7 +112,7 @@ private static void testIsSendToNeighbor(final Reaction<Object> program) {
      * Verifies that the incarnation can properly init new concentrations.
      */
     @Test
-    public void testCreateConcentration() {
+    void testCreateConcentration() {
         assertEquals("aString", INCARNATION.createConcentration("aString"));
         assertEquals(1.0, INCARNATION.createConcentration("1"));
         assertEquals("foo", INCARNATION.createConcentration("let a = \"foo\"; a"));
diff --git a/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestNodeCloning.java b/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestNodeCloning.java
index 3ce8255e4f..85826b3d54 100644
--- a/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestNodeCloning.java
+++ b/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestNodeCloning.java
@@ -38,7 +38,7 @@
  */
 @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR")
 @SuppressWarnings("PMD.UseUnderscoresInNumericLiterals")
-public class TestNodeCloning<P extends Position<P>> {
+class TestNodeCloning<P extends Position<P>> {
 
     private static final Molecule SOURCEMOL = new SimpleMolecule("source");
     private static final Molecule ENABLEDMOL = new SimpleMolecule("enabled");
@@ -73,7 +73,7 @@ private void makeNode(final double x, final double y, final boolean enabled, fin
      * @throws Throwable in case of simulation errors
      */
     @Test
-    public void test() throws Throwable {
+    void test() throws Throwable {
         // CHECKSTYLE: MagicNumber OFF - values are taken from a real experiment causing the bug.
         simulation.schedule(() -> {
             final Node<Object> node0 = environment.getNodeByID(0);
diff --git a/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestTOMACS.java b/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestTOMACS.java
index 13520c8703..68c9159304 100644
--- a/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestTOMACS.java
+++ b/alchemist-incarnation-protelis/src/test/java/it/unibo/alchemist/test/TestTOMACS.java
@@ -24,13 +24,13 @@
  * Tests that the TOMACS setup could be successfully loaded (in particular,
  * Protelis rounds with personalized message retaining time).
  */
-public class TestTOMACS {
+class TestTOMACS {
 
     /**
      * 
      */
     @Test
-    public void testCustomRetainTimeLoading() {
+    void testCustomRetainTimeLoading() {
         final Loader loader = LoadAlchemist.from(ResourceLoader.getResource("tomacs.yml"));
         Assertions.assertTrue(StreamSupport.stream(loader.getDefault().getEnvironment().spliterator(), false)
             .map(n -> (ProtelisNode<?>) n)
diff --git a/alchemist-incarnation-sapere/src/test/java/it/unibo/alchemist/test/TestIncarnation.java b/alchemist-incarnation-sapere/src/test/java/it/unibo/alchemist/test/TestIncarnation.java
index f2f0fdeefe..675213f8c0 100644
--- a/alchemist-incarnation-sapere/src/test/java/it/unibo/alchemist/test/TestIncarnation.java
+++ b/alchemist-incarnation-sapere/src/test/java/it/unibo/alchemist/test/TestIncarnation.java
@@ -67,7 +67,7 @@ public void setUp() {
      * Test molecule creation.
      */
     @Test
-    public void testCreateMolecule() {
+    void testCreateMolecule() {
         mkMol("  source, Distance  ", 2, false);
         mkMol("gradient,   Distance, #O", 3, false);
         mkMol("gradient, Distance, Dest", 3, false);
@@ -93,7 +93,7 @@ private void testTD(final String param, final double rate, final double occurren
      * Test the creation of various time distributions.
      */
     @Test
-    public void testCreateTimeDistribution() {
+    void testCreateTimeDistribution() {
         testTD(null, Double.POSITIVE_INFINITY, 0);
         testTD("", Double.POSITIVE_INFINITY, 0);
         testTD("Infinity", Double.POSITIVE_INFINITY, 0);
@@ -137,7 +137,7 @@ private void testNoR(final String param) {
      * Test various flavors of reaction creation.
      */
     @Test
-    public void testCreateReaction() {
+    void testCreateReaction() {
         testR(null, 0, 0, 0, 0, 0);
         testR("", 0, 0, 0, 0, 0);
         testR("-->", 0, 0, 0, 0, 0);
diff --git a/alchemist-incarnation-sapere/src/test/java/it/unibo/alchemist/test/TestLsaMolecule.java b/alchemist-incarnation-sapere/src/test/java/it/unibo/alchemist/test/TestLsaMolecule.java
index 38f4cc5e31..c2a5dc5882 100644
--- a/alchemist-incarnation-sapere/src/test/java/it/unibo/alchemist/test/TestLsaMolecule.java
+++ b/alchemist-incarnation-sapere/src/test/java/it/unibo/alchemist/test/TestLsaMolecule.java
@@ -27,7 +27,7 @@ public class TestLsaMolecule {
      * 
      */
     @Test
-    public void test() {
+    void test() {
         final ILsaMolecule empty = new LsaMolecule();
         assertNotNull(empty);
         final ILsaMolecule parsedGround = new LsaMolecule("a,b,c,[a;b;c;],d");
diff --git a/alchemist-incarnation-scafi/build.gradle.kts b/alchemist-incarnation-scafi/build.gradle.kts
index 3f7eb4a91a..c2a4e17476 100644
--- a/alchemist-incarnation-scafi/build.gradle.kts
+++ b/alchemist-incarnation-scafi/build.gradle.kts
@@ -5,8 +5,6 @@
  * GNU General Public License) with a linking exception)
  * as described in the file LICENSE in the Alchemist distribution"s top directory.
  */
-import java.time.Duration
-
 plugins {
     scala
     id("com.github.maiflai.scalatest")
@@ -27,7 +25,6 @@ dependencies {
     testImplementation(project(":alchemist-loading"))
     testImplementation("org.scalatest:scalatest_2.13:_")
     testImplementation("org.scalatestplus:scalatestplus-junit_2.13:_")
-    testRuntimeOnly("com.vladsch.flexmark:flexmark-profile-pegdown:_")
 }
 
 tasks.withType<ScalaCompile> {
@@ -49,5 +46,7 @@ publishing.publications {
 }
 
 tasks.withType<Test> {
-    timeout.set(Duration.ofMinutes(3))
+    reports {
+        html.required.set(false)
+    }
 }
diff --git a/alchemist-interfaces/src/main/java/it/unibo/alchemist/model/interfaces/Dependency.java b/alchemist-interfaces/src/main/java/it/unibo/alchemist/model/interfaces/Dependency.java
index fa83c4d9a7..5e7d4c2bd5 100644
--- a/alchemist-interfaces/src/main/java/it/unibo/alchemist/model/interfaces/Dependency.java
+++ b/alchemist-interfaces/src/main/java/it/unibo/alchemist/model/interfaces/Dependency.java
@@ -62,7 +62,7 @@ public String toString() {
      *            the dependency
      * @return true if this dependency generates a dependency with the provided one
      */
-    default boolean dependsOn(Dependency dependency) {
+    default boolean dependsOn(final Dependency dependency) {
         return equals(dependency);
     }
 
@@ -74,7 +74,7 @@ default boolean dependsOn(Dependency dependency) {
      *            the dependency
      * @return true if this dependency generates a dependency with the provided one
      */
-    default boolean makesDependent(Dependency dependency) {
+    default boolean makesDependent(final Dependency dependency) {
         return dependsOn(dependency);
     }
 
diff --git a/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/EuclideanEnvironment.kt b/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/EuclideanEnvironment.kt
index 656d6a8bdb..2070e64013 100644
--- a/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/EuclideanEnvironment.kt
+++ b/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/EuclideanEnvironment.kt
@@ -15,8 +15,7 @@ import it.unibo.alchemist.model.interfaces.geometry.Vector
  * An Euclidean space, where [Position]s [P] are valid [Vector]s,
  * supporting any concentration type [T].
  */
-interface EuclideanEnvironment<T, P> : Environment<T, P>
-where P : Position<P>, P : Vector<P> {
+interface EuclideanEnvironment<T, P> : Environment<T, P> where P : Position<P>, P : Vector<P> {
 
     /**
      * This method moves a [node] in the environment toward some [direction]. If
@@ -34,12 +33,10 @@ where P : Position<P>, P : Vector<P> {
     /**
      * Creates a [Position] compatible with this environment given its [coordinates].
      */
-    @JvmDefault
     fun makePosition(vararg coordinates: Double): P
 
     /**
      * Create a position corresponding to the origin of this environment.
      */
-    @JvmDefault
     val origin: P get() = makePosition(*DoubleArray(dimensions).toTypedArray())
 }
diff --git a/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/Position.kt b/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/Position.kt
index 14cdbed17c..6d2de3d3d0 100644
--- a/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/Position.kt
+++ b/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/Position.kt
@@ -60,11 +60,11 @@ interface Position<P : Position<P>> : Serializable {
      * Computes the distance between this position and another compatible
      * position.
      *
-     * @param p
+     * @param otherPosition
      *            the position you want to know the distance to
      * @return the distance between this and p
      */
-    fun distanceTo(p: P): Double
+    fun distanceTo(otherPosition: P): Double
 
     /**
      * Considers both positions as vectors, and sums them.
diff --git a/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/geometry/Vector.kt b/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/geometry/Vector.kt
index 645ea91e05..f31a56d0f9 100644
--- a/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/geometry/Vector.kt
+++ b/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/geometry/Vector.kt
@@ -56,19 +56,16 @@ interface Vector<S : Vector<S>> {
      * Division by a Double.
      * @return the resulting vector, the operation is not performed in-place.
      */
-    @JvmDefault
     operator fun div(other: Double): S = times(1 / other)
 
     /**
      * Finds the magnitude of a vector.
      */
-    @JvmDefault
     val magnitude get() = sqrt(coordinates.map { it * it }.sum())
 
     /**
      * Computes the dot product between two vectors.
      */
-    @JvmDefault
     fun dot(other: S): Double = coordinates
         .zip(other.coordinates)
         .map { (a, b) -> a * b }
@@ -77,7 +74,6 @@ interface Vector<S : Vector<S>> {
     /**
      * Computes the angle in radians between two vectors.
      */
-    @JvmDefault
     fun angleBetween(other: S): Double = acos(dot(other) / (magnitude * other.magnitude))
 
     /**
@@ -90,7 +86,6 @@ interface Vector<S : Vector<S>> {
      * @return a resized version of the vector, whose magnitude is equal to [newLen].
      * Direction and verse of the original vector are preserved.
      */
-    @JvmDefault
     fun resized(newLen: Double): S = normalized().times(newLen)
 
     /**
@@ -108,7 +103,6 @@ interface Vector<S : Vector<S>> {
      * @return this vector if its [magnitude] is smaller than or equal to [maximumMagnitude] or a resized version
      * of [maximumMagnitude] otherwise.
      */
-    @JvmDefault
     fun coerceAtMost(maximumMagnitude: Double): S =
         resizedIf(magnitude > maximumMagnitude, maximumMagnitude)
 
@@ -116,14 +110,12 @@ interface Vector<S : Vector<S>> {
      * @return this vector if its [magnitude] is greater than or equal to [minimumMagnitude] or a resized version
      * of [minimumMagnitude] otherwise.
      */
-    @JvmDefault
     fun coerceAtLeast(minimumMagnitude: Double): S =
         resizedIf(magnitude < minimumMagnitude, minimumMagnitude)
 
     /**
      * Performs a coercion at least and at most.
      */
-    @JvmDefault
     fun coerceIn(minimumMagnitude: Double, maximumMagnitude: Double): S =
         coerceAtLeast(minimumMagnitude).coerceAtMost(maximumMagnitude)
 
diff --git a/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/geometry/Vector2D.kt b/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/geometry/Vector2D.kt
index 6962605397..c57d3c7b85 100644
--- a/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/geometry/Vector2D.kt
+++ b/alchemist-interfaces/src/main/kotlin/it/unibo/alchemist/model/interfaces/geometry/Vector2D.kt
@@ -21,13 +21,11 @@ interface Vector2D<P : Vector2D<P>> : Vector<P> {
     /**
      * x coordinate.
      */
-    @JvmDefault
     val x get() = this[0]
 
     /**
      * y coordinate.
      */
-    @JvmDefault
     val y get() = this[1]
 
     /**
@@ -35,20 +33,17 @@ interface Vector2D<P : Vector2D<P>> : Vector<P> {
      *
      * @return atan2(y, x) (in radians)
      */
-    @JvmDefault
     val asAngle: Double get() = atan2(y, x)
 
     /**
      * Dot product between bidimensional vectors.
      */
-    @JvmDefault
     override fun dot(other: P) = x * other.x + y * other.y
 
     /**
      * Checks whether the given point is inside a rectangular region described by an [origin]
      * point and [width] and [height] values (only positive).
      */
-    @JvmDefault
     fun isInRectangle(origin: Vector2D<*>, width: Double, height: Double): Boolean =
         x >= origin.x && y >= origin.y && x <= origin.x + width && y <= origin.y + height
 
@@ -60,25 +55,21 @@ interface Vector2D<P : Vector2D<P>> : Vector<P> {
     /**
      * Allows subtraction with a [Pair].
      */
-    @JvmDefault
     operator fun minus(other: Pair<Double, Double>) = newFrom(x - other.first, y - other.second)
 
     /**
      * Normalizes the vector.
      */
-    @JvmDefault
     override fun normalized(): P = times(1.0 / sqrt(x * x + y * y))
 
     /**
      * Allows summaction with a [Pair].
      */
-    @JvmDefault
     operator fun plus(other: Pair<Double, Double>) = newFrom(x + other.first, y + other.second)
 
     /**
      * Computes a point which is at a certain [distance] and [angle] (in radians) from this one.
      */
-    @JvmDefault
     fun surroundingPointAt(angle: Double, distance: Double) =
         newFrom(x + cos(angle) * distance, y + sin(angle) * distance)
 
@@ -86,7 +77,6 @@ interface Vector2D<P : Vector2D<P>> : Vector<P> {
      * Computes a point which is at a certain [distance] and angle (expressed as a [versor] centered in this node)
      * from this one.
      */
-    @JvmDefault
     fun surroundingPointAt(versor: P, distance: Double) = surroundingPointAt(versor.asAngle, distance)
 
     /**
@@ -97,7 +87,6 @@ interface Vector2D<P : Vector2D<P>> : Vector<P> {
      * @param count
      *          the number of positions to generate.
      */
-    @JvmDefault
     // @JvmOverloads disabled due to https://youtrack.jetbrains.com/issue/KT-12224
     fun surrounding(radius: Double, count: Int = 12): List<P> = (1..count)
         .map {
diff --git a/alchemist-interfaces/src/test/java/it/unibo/alchemist/test/TestContext.java b/alchemist-interfaces/src/test/java/it/unibo/alchemist/test/TestContext.java
index 78ee14350b..8c586ca56b 100644
--- a/alchemist-interfaces/src/test/java/it/unibo/alchemist/test/TestContext.java
+++ b/alchemist-interfaces/src/test/java/it/unibo/alchemist/test/TestContext.java
@@ -18,13 +18,13 @@
 
 /**
  */
-public class TestContext {
+class TestContext {
 
     /**
      * 
      */
     @Test
-    public final void test() {
+    final void test() {
         assertEquals(LOCAL, getWider(LOCAL, LOCAL));
         assertEquals(NEIGHBORHOOD, getWider(LOCAL, NEIGHBORHOOD));
         assertEquals(GLOBAL, getWider(LOCAL, GLOBAL));
diff --git a/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/GraphStreamSupport.kt b/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/GraphStreamSupport.kt
index c5c32dd922..735d75aaf5 100644
--- a/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/GraphStreamSupport.kt
+++ b/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/GraphStreamSupport.kt
@@ -40,8 +40,7 @@ class GraphStreamSupport<T, P : Position<out P>>(
 ) {
     companion object {
 
-        private val generators = ClassPathScanner
-            .subTypesOf<BaseGenerator>("org.graphstream")
+        private val generators = ClassPathScanner.subTypesOf<BaseGenerator>("org.graphstream")
 
         private val factory: Factory = FactoryBuilder()
             .withAutoBoxing<Int>()
@@ -104,7 +103,7 @@ class GraphStreamSupport<T, P : Position<out P>>(
          * and possibly a flag to decide whether or not to compute z-dimensions [is3D].
          */
         @JvmOverloads
-        fun <T, P : Position<out P>> generateGraphStream(
+        fun <T, P : Position<P>> generateGraphStream(
             environment: Environment<T, P>,
             nodeCount: Int,
             offsetX: Double = 0.0,
@@ -131,7 +130,6 @@ class GraphStreamSupport<T, P : Position<out P>>(
             with(generator) {
                 addNodeLabels(false)
                 setRandomSeed(randomGenerator.nextLong())
-//                addSink(graph)
                 addSink(layout)
                 begin()
                 // One node is inserted by GraphStream automatically
diff --git a/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/deployments/GraphStreamDeployment.kt b/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/deployments/GraphStreamDeployment.kt
index fc2b05100a..5992e709d6 100644
--- a/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/deployments/GraphStreamDeployment.kt
+++ b/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/deployments/GraphStreamDeployment.kt
@@ -18,11 +18,11 @@ import org.apache.commons.math3.random.RandomGenerator
 /**
  * A deployment based on a [GraphStream](https://graphstream-project.org/) graph.
  */
-class GraphStreamDeployment<T, P>(
+class GraphStreamDeployment<P>(
     private val createLinks: Boolean,
-    private val graphStreamSupport: GraphStreamSupport<T, P>,
+    private val graphStreamSupport: GraphStreamSupport<*, P>,
 ) : Deployment<P> by graphStreamSupport.deployment
-    where P : Position<out P> {
+    where P : Position<P> {
 
     /**
      * Builds a new GraphStream-based deployment, given the [nodeCount],
@@ -31,7 +31,7 @@ class GraphStreamDeployment<T, P>(
      * and its [parameters].
      */
     @JvmOverloads constructor(
-        environment: Environment<T, P>,
+        environment: Environment<*, P>,
         randomGenerator: RandomGenerator,
         nodeCount: Int,
         offsetX: Double = 0.0,
diff --git a/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/m2m/SimulationModel.kt b/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/m2m/SimulationModel.kt
index 2a39d970df..c7bdba488d 100644
--- a/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/m2m/SimulationModel.kt
+++ b/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/m2m/SimulationModel.kt
@@ -277,7 +277,7 @@ internal object SimulationModel {
             if (root.containsKey(DocumentRoot.DependentVariable.formula)) {
                 val formula = root[DocumentRoot.DependentVariable.formula]
                 if (formula is String) {
-                    val language = root[DocumentRoot.DependentVariable.language]?.toString()?.toLowerCase() ?: "groovy"
+                    val language = root[DocumentRoot.DependentVariable.language]?.toString()?.lowercase() ?: "groovy"
                     Result.success(JSR223Variable<Any>(language, formula))
                 } else {
                     Result.success(Constant(formula))
diff --git a/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/m2m/Syntax.kt b/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/m2m/Syntax.kt
index e3058b91ef..9865affd55 100644
--- a/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/m2m/Syntax.kt
+++ b/alchemist-loading/src/main/kotlin/it/unibo/alchemist/loader/m2m/Syntax.kt
@@ -226,5 +226,5 @@ internal object DocumentRoot : SyntaxElement {
 }
 
 internal class OwnName {
-    operator fun getValue(thisRef: Any?, property: KProperty<*>): String = property.name.toLowerCase()
+    operator fun getValue(thisRef: Any?, property: KProperty<*>): String = property.name.lowercase()
 }
diff --git a/alchemist-loading/src/test/java/it/unibo/alchemist/test/PreventRegressions.java b/alchemist-loading/src/test/java/it/unibo/alchemist/test/PreventRegressions.java
index fe41964839..c7002c2a73 100644
--- a/alchemist-loading/src/test/java/it/unibo/alchemist/test/PreventRegressions.java
+++ b/alchemist-loading/src/test/java/it/unibo/alchemist/test/PreventRegressions.java
@@ -24,13 +24,13 @@
 /**
  * Tests loading of a custom {@link it.unibo.alchemist.loader.export.Exporter}.
  */
-public class PreventRegressions {
+class PreventRegressions {
 
     /**
      * Test the ability to inject variables.
      */
     @Test
-    public void testLoadCustomExport() {
+    void testLoadCustomExport() {
         final List<Extractor> extractors = LoadAlchemist.from(ResourceLoader.getResource("testCustomExport.yml"))
             .getDefault()
             .getDataExtractors();
@@ -42,7 +42,7 @@ public void testLoadCustomExport() {
      * Test environment serialization and incarnation restoration.
      */
     @Test
-    public void testLoadAndSerialize() {
+    void testLoadAndSerialize() {
         final Environment<?, ?> env = LoadAlchemist
             .from(ResourceLoader.getResource("testCustomExport.yml"))
             .getDefault()
diff --git a/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestCircle.java b/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestCircle.java
index bcfcccbaf4..01d386d1ff 100644
--- a/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestCircle.java
+++ b/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestCircle.java
@@ -19,7 +19,7 @@
 /**
  *
  */
-public class TestCircle {
+class TestCircle {
 
     private final Shape<GeoPosition> s = new Circle<>(0, 0, 1);
 
@@ -27,7 +27,7 @@ public class TestCircle {
      * 
      */
     @Test
-    public void test() {
+    void test() {
         assertTrue(check(0, 0));
         assertTrue(check(0.5, 0.5));
         assertTrue(check(-0.5, 0.5));
diff --git a/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestGrid.java b/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestGrid.java
index 9bd05bdddb..eaaf845967 100644
--- a/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestGrid.java
+++ b/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestGrid.java
@@ -19,7 +19,7 @@
 /**
  *
  */
-public class TestGrid {
+class TestGrid {
 
     private static Continuous2DEnvironment env() {
         return new Continuous2DEnvironment<Object>(SupportedIncarnations.<Object, Euclidean2DPosition>get("protelis").get());
@@ -34,7 +34,7 @@ private static MersenneTwister rand() {
      * 
      */
     @Test
-    public void testVerticalLine() {
+    void testVerticalLine() {
         test(9, 1, 9.9);
         assertEquals(10L, new Grid(env(), rand(), 0, 0, 1, 10, 1, 1, 0, 0).stream().count());
     }
@@ -43,7 +43,7 @@ public void testVerticalLine() {
      * 
      */
     @Test
-    public void testHorizontalLine() {
+    void testHorizontalLine() {
         test(10, 10, 1);
     }
 
@@ -51,7 +51,7 @@ public void testHorizontalLine() {
      * 
      */
     @Test
-    public void testEmpty() {
+    void testEmpty() {
         test(0, 0, 0);
     }
 
@@ -59,7 +59,7 @@ public void testEmpty() {
      * 
      */
     @Test
-    public void test1x1() {
+    void test1x1() {
         test(1, 1, 1);
     }
 
@@ -67,7 +67,7 @@ public void test1x1() {
      * 
      */
     @Test
-    public void test10x10() {
+    void test10x10() {
         test(100, 10, 10);
     }
 
@@ -75,7 +75,7 @@ public void test10x10() {
      *
      */
     @Test
-    public void testbug73() {
+    void testbug73() {
         assertEquals(20L * 20, new Grid(env(), rand(), 0, 0, 20, 20, 1, 1, 0.8, 0.8).stream().distinct().count());
     }
 
@@ -83,7 +83,7 @@ public void testbug73() {
      * 
      */
     @Test
-    public void test10x10negative() {
+    void test10x10negative() {
         test(100, -10, -10);
     }
 
diff --git a/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestLoadGPSTrace.java b/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestLoadGPSTrace.java
index 9c1373b803..b1174f5801 100755
--- a/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestLoadGPSTrace.java
+++ b/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestLoadGPSTrace.java
@@ -35,7 +35,7 @@
  * A series of tests checking that our Yaml Loader is working as expected.
  */
 @SuppressWarnings("PMD.UseUnderscoresInNumericLiterals")
-public class TestLoadGPSTrace {
+class TestLoadGPSTrace {
 
     private static final Map<LatLongPosition, LatLongPosition> START_ARRIVE_POSITION = new HashMap<>();
     private static final Map<Node<?>, LatLongPosition> NODE_START_POSITION = new HashMap<>();
@@ -72,7 +72,7 @@ public class TestLoadGPSTrace {
      * @param <T> Used for internal consistency
      */
     @Test
-    public <T> void testLoadGPSTrace() {
+    <T> void testLoadGPSTrace() {
         final var res = ResourceLoader.getResource("testgps.yml");
         assertNotNull(res, "Missing test resource " + "testgps.yml");
         final Environment<T, GeoPosition> env = LoadAlchemist.from(res).<T, GeoPosition>getDefault().getEnvironment();
diff --git a/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestRectangle.java b/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestRectangle.java
index 94a22f5180..8cc44174d4 100644
--- a/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestRectangle.java
+++ b/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestRectangle.java
@@ -19,13 +19,13 @@
 /**
  *
  */
-public class TestRectangle {
+class TestRectangle {
 
     /**
      * 
      */
     @Test
-    public void test() {
+    void test() {
         final Shape<GeoPosition> s = new Rectangle<>(12, 44, 1, 1);
         // CHECKSTYLE: MagicNumber OFF
         assertTrue(s.contains(new LatLongPosition(44.132300, 12.233000))); // NOPMD
@@ -36,7 +36,7 @@ public void test() {
      *
      */
     @Test
-    public void rectangleWithNegativeDimension() {
+    void rectangleWithNegativeDimension() {
         /*
          * In this rectangle the x should go from 10 to 15 and the y from 45 to 35
          */
diff --git a/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestYAMLLoader.java b/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestYAMLLoader.java
index 9e2f06265f..ccc54d7c11 100644
--- a/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestYAMLLoader.java
+++ b/alchemist-loading/src/test/java/it/unibo/alchemist/test/TestYAMLLoader.java
@@ -40,7 +40,7 @@
 /**
  * A series of tests checking that our Yaml Loader is working as expected.
  */
-public class TestYAMLLoader {
+class TestYAMLLoader {
 
     /*
      * To run a single test, just change from "any two digits" to the exact test
@@ -52,7 +52,7 @@ public class TestYAMLLoader {
      * Tests building a custom implementation of time distribution.
      */
     @Test
-    public void testAnyRealDistribution() {
+    void testAnyRealDistribution() {
         final Environment<?, ?> env = testNoVar("synthetic/anyrealdistribution.yml");
         env.forEach(n -> n.forEach(r -> {
             assertTrue(r.getTimeDistribution() instanceof AnyRealDistribution);
@@ -63,7 +63,7 @@ public void testAnyRealDistribution() {
      * Test loading a custom node class.
      */
     @Test
-    public void testCustomNodes() {
+    void testCustomNodes() {
         testNoVar("synthetic/customnode.yml")
         .forEach(n -> assertTrue(n instanceof TestNode,
                 "Node are not instances of " + TestNode.class.getName()
@@ -77,7 +77,7 @@ public void testCustomNodes() {
      * Useful as regression test.
      */
     @Test
-    public void testISAC2016Lab() {
+    void testISAC2016Lab() {
         ClassPathScanner.resourcesMatchingAsStream(ISAC_REGEX, "isac")
             .forEach(TestYAMLLoader::testNoVar);
     }
@@ -88,7 +88,7 @@ public void testISAC2016Lab() {
      * @param <P> Used for internal consistency
      */
     @Test
-    public <P extends Position<P>> void testLayers() {
+    <P extends Position<P>> void testLayers() {
         @SuppressWarnings("unchecked")
         final Environment<Object, P> env = (Environment<Object, P>) testNoVar("synthetic/testlayer.yml");
         final Set<Layer<Object, P>> layers = env.getLayers();
@@ -111,7 +111,7 @@ public <P extends Position<P>> void testLayers() {
      * Test loading layer classes.
      */
     @Test
-    public void testLoadVariablesInLists() {
+    void testLoadVariablesInLists() {
         assertNotNull(testNoVar("synthetic/testlist.yml"));
     }
 
@@ -119,7 +119,7 @@ public void testLoadVariablesInLists() {
      * Tests injecting multiple molecules in the same shape.
      */
     @Test
-    public void testMultipleMolecules() {
+    void testMultipleMolecules() {
         final Environment<?, ?> env = testNoVar("synthetic/multiplemolecule.yml");
         env.forEach(n -> assertEquals(4, n.getMoleculeCount()));
     }
@@ -128,7 +128,7 @@ public void testMultipleMolecules() {
      * Test loading layer classes.
      */
     @Test
-    public void testSingleValuedGeometricVar() {
+    void testSingleValuedGeometricVar() {
         assertNotNull(testNoVar("synthetic/singleValuedGeometricVar.yml"));
     }
 
@@ -136,7 +136,7 @@ public void testSingleValuedGeometricVar() {
      * Test variables with same structure but different names.
      */
     @Test
-    public void testVariableContentClash() {
+    void testVariableContentClash() {
         assertNotNull(testNoVar("synthetic/varcontentclash.yml"));
     }
 
@@ -144,7 +144,7 @@ public void testVariableContentClash() {
      * Test variables with same structure but different names.
      */
     @Test
-    public void testScalaVar() {
+    void testScalaVar() {
         final Environment<Object, ?> env = testNoVar("synthetic/scalavar.yml");
         assertNotNull(env);
         assertEquals(env.makePosition(3, 10), env.getPosition(env.getNodeByID(0)));
@@ -154,7 +154,7 @@ public void testScalaVar() {
      * Test dependencies section.
      */
     @Test
-    public void testDependencies() {
+    void testDependencies() {
         final var is = ResourceLoader.getResource("isac/16-dependencies.yaml");
         assertNotNull(is);
         final Loader loader = LoadAlchemist.from(is);
diff --git a/alchemist-loading/src/test/kotlin/it/unibo/alchemist/test/RegressionTestOnRealCases.kt b/alchemist-loading/src/test/kotlin/it/unibo/alchemist/test/RegressionTestOnRealCases.kt
index 0abe5059a0..d44e6f3e4c 100644
--- a/alchemist-loading/src/test/kotlin/it/unibo/alchemist/test/RegressionTestOnRealCases.kt
+++ b/alchemist-loading/src/test/kotlin/it/unibo/alchemist/test/RegressionTestOnRealCases.kt
@@ -11,7 +11,7 @@ package it.unibo.alchemist.test
 
 import io.kotest.core.spec.style.FreeSpec
 import io.kotest.matchers.collections.shouldContain
-import io.kotest.matchers.longs.shouldBeExactly
+import io.kotest.matchers.ints.shouldBeExactly
 import io.kotest.matchers.maps.haveSize
 import io.kotest.matchers.should
 import io.kotest.matchers.shouldNotBe
@@ -25,7 +25,7 @@ class RegressionTestOnRealCases : FreeSpec(
             loader.getDefault<Nothing, Nothing>() shouldNotBe null
             loader.variables should haveSize(3)
             loader.variables.keys shouldContain "algorithm"
-            loader.variables["algorithm"]!!.stream().count() shouldBeExactly 4 * 7 + 1
+            loader.variables["algorithm"]!!.stream().count().toInt() shouldBeExactly 4 * 7 + 1
         }
     }
 )
diff --git a/alchemist-maps/src/main/java/it/unibo/alchemist/model/implementations/positions/GPSPointImpl.java b/alchemist-maps/src/main/java/it/unibo/alchemist/model/implementations/positions/GPSPointImpl.java
index fe5e6803d5..674d228972 100755
--- a/alchemist-maps/src/main/java/it/unibo/alchemist/model/implementations/positions/GPSPointImpl.java
+++ b/alchemist-maps/src/main/java/it/unibo/alchemist/model/implementations/positions/GPSPointImpl.java
@@ -113,11 +113,11 @@ public int getDimensions() {
     }
 
     @Override
-    public double distanceTo(final GeoPosition p) {
-        if (p instanceof GPSPointImpl) {
-            return repr.distanceTo(((GPSPointImpl) p).repr);
+    public double distanceTo(final GeoPosition otherPosition) {
+        if (otherPosition instanceof GPSPointImpl) {
+            return repr.distanceTo(((GPSPointImpl) otherPosition).repr);
         }
-        return repr.distanceTo(p);
+        return repr.distanceTo(otherPosition);
     }
 
     @Override
diff --git a/alchemist-maps/src/main/java/it/unibo/alchemist/model/implementations/positions/LatLongPosition.java b/alchemist-maps/src/main/java/it/unibo/alchemist/model/implementations/positions/LatLongPosition.java
index 6a1b7e8055..ff3bcaa8af 100644
--- a/alchemist-maps/src/main/java/it/unibo/alchemist/model/implementations/positions/LatLongPosition.java
+++ b/alchemist-maps/src/main/java/it/unibo/alchemist/model/implementations/positions/LatLongPosition.java
@@ -181,11 +181,11 @@ public int getDimensions() {
     }
 
     @Override
-    public double distanceTo(@NotNull final GeoPosition p) {
-        if (p instanceof LatLongPosition) {
-            return distance(latlng, ((LatLongPosition) p).latlng, df);
+    public double distanceTo(@NotNull final GeoPosition otherPosition) {
+        if (otherPosition instanceof LatLongPosition) {
+            return distance(latlng, ((LatLongPosition) otherPosition).latlng, df);
         }
-        return distance(latlng, new LatLng(p.getLatitude(), p.getLongitude()), df);
+        return distance(latlng, new LatLng(otherPosition.getLatitude(), otherPosition.getLongitude()), df);
     }
 
     /**
diff --git a/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestGPSLoader.java b/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestGPSLoader.java
index 41dc6f6084..46e35678b5 100755
--- a/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestGPSLoader.java
+++ b/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestGPSLoader.java
@@ -33,7 +33,7 @@
 /**
  * 
  */
-public class TestGPSLoader {
+class TestGPSLoader {
 
     private static final String BASE_DIR = "trace/";
     private static final String BASE_OK_TEST = BASE_DIR + "ok/";
@@ -86,7 +86,7 @@ public void setUp() {
      * @throws IOException causes failure
      */
     @Test
-    public void testAlignment() throws IOException {
+    void testAlignment() throws IOException {
         for (final String normalizer : CLASS_ALIGNMENT_NO_ARG) {
             assertEquals(3, new TraceLoader(DIRECTORY_WITH_FILES, normalizer).size().orElseThrow(unexpectedCyclicTrace()));
         }
@@ -111,7 +111,7 @@ public void testAlignment() throws IOException {
      * @throws IOException causes failure
      */
     @Test
-    public void testError() throws IOException {
+    void testError() throws IOException {
         for (final String error : ERRORS) {
             try {
                 fail("Expected error during object creation for " + error + ", got: "
diff --git a/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestGPSTraceImpl.java b/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestGPSTraceImpl.java
index 9b040b2823..7f17c36ca3 100644
--- a/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestGPSTraceImpl.java
+++ b/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestGPSTraceImpl.java
@@ -18,13 +18,13 @@
 /**
  *
  */
-public class TestGPSTraceImpl {
+class TestGPSTraceImpl {
 
     /**
      * 
      */
     @Test
-    public void testConstructionWithList() {
+    void testConstructionWithList() {
         assertNotNull(new GPSTraceImpl(ImmutableList.of(
                 new GPSPointImpl(0d,  0d, Time.ZERO))));
     }
diff --git a/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestLatLongPosition.java b/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestLatLongPositionJava.java
similarity index 95%
rename from alchemist-maps/src/test/java/it/unibo/alchemist/test/TestLatLongPosition.java
rename to alchemist-maps/src/test/java/it/unibo/alchemist/test/TestLatLongPositionJava.java
index 3f86a6f612..244c61c7c9 100644
--- a/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestLatLongPosition.java
+++ b/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestLatLongPositionJava.java
@@ -18,7 +18,7 @@
 /**
  *
  */
-public class TestLatLongPosition {
+class TestLatLongPositionJava {
 
     private static final LatLng NORTH_CAPE = new LatLng(71.172_5, 25.784_444);
     private static final LatLng INVERCAGILL = new LatLng(-46.412_652, 168.368_963);
@@ -27,7 +27,7 @@ public class TestLatLongPosition {
      * 
      */
     @Test
-    public void testDistance() {
+    void testDistance() {
         for (final DistanceFormula df1 : DistanceFormula.values()) {
             final double dist = LatLongPosition.distance(NORTH_CAPE, INVERCAGILL, df1);
             final double dist2 = LatLongPosition.distance(INVERCAGILL, NORTH_CAPE, df1);
diff --git a/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestNormalizer.java b/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestNormalizer.java
index 21bde881c3..20e136878c 100755
--- a/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestNormalizer.java
+++ b/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestNormalizer.java
@@ -32,7 +32,7 @@
 /**
  * Test time normalizer.
  */
-public class TestNormalizer {
+class TestNormalizer {
 
     private static final GPSPoint TRACE_1_POINT_1 = new GPSPointImpl(1.0, 2.0, new DoubleTime(3.0));
     private static final GPSPoint TRACE_1_POINT_2 = new GPSPointImpl(1.0, 2.0, new DoubleTime(5.0));
@@ -61,7 +61,7 @@ public class TestNormalizer {
      * 
      */
     @Test
-    public void testNoAlignment() {
+    void testNoAlignment() {
         final ImmutableList<GPSTrace> traces = new NoAlignment().alignTime(TRACES);
         /*
          * Test start time
@@ -84,7 +84,7 @@ public void testNoAlignment() {
      * 
      */
     @Test
-    public void testAlignToFirstTrace() {
+    void testAlignToFirstTrace() {
         final ImmutableList<GPSTrace> traces = new AlignToFirstTrace().alignTime(TRACES);
         /*
          * Test start time
@@ -113,7 +113,7 @@ public void testAlignToFirstTrace() {
      * 
      */
     @Test
-    public void testAlignToSimulationTime() {
+    void testAlignToSimulationTime() {
         final ImmutableList<GPSTrace> traces = new AlignToSimulationTime().alignTime(TRACES);
         /*
          * Test start time
@@ -139,7 +139,7 @@ public void testAlignToSimulationTime() {
      * 
      */
     @Test
-    public void testAlignToTimeRetainSinglePoint() {
+    void testAlignToTimeRetainSinglePoint() {
         final Time time = new DoubleTime(2.0);
         final ImmutableList<GPSTrace> traces = new AlignToTime(time, false, false).alignTime(TRACES);
         /*
@@ -175,7 +175,7 @@ public void testAlignToTimeRetainSinglePoint() {
      * 
      */
     @Test
-    public void testAlignToTimeDiscardSinglePoint() {
+    void testAlignToTimeDiscardSinglePoint() {
         final Time time = new DoubleTime(4.0);
         final ImmutableList<GPSTrace> traces = new AlignToTime(time, true, false).alignTime(TRACES);
         /*
@@ -210,7 +210,7 @@ public void testAlignToTimeDiscardSinglePoint() {
      * 
      */
     @Test
-    public void testAlignToTimeThrowExceptionOnSinglePoint() {
+    void testAlignToTimeThrowExceptionOnSinglePoint() {
         final Time time = new DoubleTime(4.0);
         try {
             new AlignToTime(time, true, true).alignTime(TRACES);
@@ -224,7 +224,7 @@ public void testAlignToTimeThrowExceptionOnSinglePoint() {
      * 
      */
     @Test
-    public void testAlignToTimeNegativeTime() {
+    void testAlignToTimeNegativeTime() {
         final Time time = new DoubleTime(-4.0);
         try {
             new AlignToTime(time, true, true);
@@ -238,7 +238,7 @@ public void testAlignToTimeNegativeTime() {
      * 
      */
     @Test
-    public void testAlignToTimeWrongPolicy() {
+    void testAlignToTimeWrongPolicy() {
         final Time time = new DoubleTime(4.0);
         try {
             new AlignToTime(time, false, true).alignTime(TRACES);
diff --git a/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestOSMEnvironment.java b/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestOSMEnvironment.java
index 0c27c4fd56..5aaed3364a 100644
--- a/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestOSMEnvironment.java
+++ b/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestOSMEnvironment.java
@@ -24,7 +24,7 @@
 /**
  *
  */
-public class TestOSMEnvironment {
+class TestOSMEnvironment {
 
     /**
      * Tests for parallel creation of {@link OSMEnvironment}.
@@ -32,7 +32,7 @@ public class TestOSMEnvironment {
      * @throws Throwable if any exception occurs, it gets re-thrown, making the test fail.
      */
     @Test
-    public void testConcurrentInit() throws Throwable {
+    void testConcurrentInit() throws Throwable {
         final ExecutorService executor = Executors.newFixedThreadPool(100);
         final Incarnation<Object, GeoPosition> incarnation =
                 SupportedIncarnations.<Object, GeoPosition>get("protelis").orElseThrow();
diff --git a/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestTargetWalker.java b/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestTargetWalker.java
index 3047d1b97b..cb305f4b98 100644
--- a/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestTargetWalker.java
+++ b/alchemist-maps/src/test/java/it/unibo/alchemist/test/TestTargetWalker.java
@@ -38,7 +38,7 @@
 
 /**
  */
-public class TestTargetWalker {
+class TestTargetWalker {
 
     private static final Incarnation<Object, GeoPosition> INCARNATION =
             SupportedIncarnations.<Object, GeoPosition>get("protelis").orElseThrow();
@@ -101,7 +101,7 @@ private void run() {
      * 
      */
     @Test
-    public void testNoPosition() {
+    void testNoPosition() {
         final GeoPosition start = env.getPosition(node);
         /*
          * Should not be more than 10 meters afar the suggested start
@@ -118,7 +118,7 @@ public void testNoPosition() {
      * 
      */
     @Test
-    public void testPosition() {
+    void testPosition() {
         final GeoPosition start = env.getPosition(node);
         /*
          * Should not be more than 10 meters afar the suggested start
@@ -136,7 +136,7 @@ public void testPosition() {
      * 
      */
     @Test
-    public void testIterableDouble() {
+    void testIterableDouble() {
         final GeoPosition start = env.getPosition(node);
         /*
          * Should not be more than 10 meters afar the suggested start
@@ -154,7 +154,7 @@ public void testIterableDouble() {
      * 
      */
     @Test
-    public void testIterableStrings() {
+    void testIterableStrings() {
         final GeoPosition start = env.getPosition(node);
         assertNotNull(start);
         /*
@@ -173,7 +173,7 @@ public void testIterableStrings() {
      * 
      */
     @Test
-    public void testStrings01() {
+    void testStrings01() {
         final GeoPosition start = env.getPosition(node);
         /*
          * Should not be more than 10 meters afar the suggested start
@@ -191,7 +191,7 @@ public void testStrings01() {
      * 
      */
     @Test
-    public void testStrings02() {
+    void testStrings02() {
         final GeoPosition start = env.getPosition(node);
         /*
          * Should not be more than 10 meters afar the suggested start
@@ -209,7 +209,7 @@ public void testStrings02() {
      * 
      */
     @Test
-    public void testStrings03() {
+    void testStrings03() {
         final GeoPosition start = env.getPosition(node);
         /*
          * Should not be more than 10 meters afar the suggested start
@@ -227,7 +227,7 @@ public void testStrings03() {
      * 
      */
     @Test
-    public void testStrings04() {
+    void testStrings04() {
         final GeoPosition start = env.getPosition(node);
         /*
          * Should not be more than 10 meters afar the suggested start
diff --git a/alchemist-sapere-mathexp/src/test/java/it/unibo/alchemist/test/TestExpression.java b/alchemist-sapere-mathexp/src/test/java/it/unibo/alchemist/test/TestExpression.java
index ae5d948852..3e9154dc24 100644
--- a/alchemist-sapere-mathexp/src/test/java/it/unibo/alchemist/test/TestExpression.java
+++ b/alchemist-sapere-mathexp/src/test/java/it/unibo/alchemist/test/TestExpression.java
@@ -42,7 +42,7 @@ public class TestExpression {
      * 
      */
     @Test
-    public void testBuildVars() {
+    void testBuildVars() {
         for (final String s : VAR) {
             final Expression e = new Expression(s);
             assertNotNull(e);
@@ -54,7 +54,7 @@ public void testBuildVars() {
      * 
      */
     @Test
-    public void testBuildConst() {
+    void testBuildConst() {
         for (final String s : CONST) {
             final Expression e = new Expression(s);
             assertNotNull(e);
@@ -66,7 +66,7 @@ public void testBuildConst() {
      * 
      */
     @Test
-    public void testBuildOperator() {
+    void testBuildOperator() {
         for (final String s : OPERATOR) {
             final Expression e = new Expression(s);
             assertNotNull(e);
@@ -78,7 +78,7 @@ public void testBuildOperator() {
      * 
      */
     @Test
-    public void testBuildList() {
+    void testBuildList() {
         for (final String s : LIST) {
             final Expression e = new Expression(s);
             assertNotNull(e);
@@ -90,7 +90,7 @@ public void testBuildList() {
      * 
      */
     @Test
-    public void testBuildComparator() {
+    void testBuildComparator() {
         for (final String s : COMPARATOR) {
             final Expression e = new Expression(s);
             assertNotNull(e);
@@ -102,7 +102,7 @@ public void testBuildComparator() {
      * 
      */
     @Test
-    public void testListComparator() {
+    void testListComparator() {
         final Expression le = new Expression("def: A has [a;]");
         assertFalse(le.matches(new Expression("A"), null));
         assertFalse(le.matches(new Expression("B"), null));
@@ -122,7 +122,7 @@ public void testListComparator() {
      * 
      */
     @Test
-    public void testList() {
+    void testList() {
         final Expression empty = new Expression("[]");
         final Expression le = new Expression("[a;b;c;]");
         assertTrue(le.matches(new Expression("A"), null));
diff --git a/alchemist-swingui/src/main/java/it/unibo/alchemist/boundary/gui/effects/Effect.java b/alchemist-swingui/src/main/java/it/unibo/alchemist/boundary/gui/effects/Effect.java
index 5a9d7ed86d..1923790ef7 100644
--- a/alchemist-swingui/src/main/java/it/unibo/alchemist/boundary/gui/effects/Effect.java
+++ b/alchemist-swingui/src/main/java/it/unibo/alchemist/boundary/gui/effects/Effect.java
@@ -37,7 +37,7 @@ public interface Effect extends Serializable {
      * @deprecated use {@link #apply(Graphics2D, Node, Environment, Wormhole2D)} instead.
      */
     @Deprecated
-    default void apply(Graphics2D graphic, Node<?> node, int x, int y) {
+    default void apply(final Graphics2D graphic, final Node<?> node, final int x, final int y) {
         // deprecated, defaults to nothing.
     }
 
@@ -53,10 +53,10 @@ default void apply(Graphics2D graphic, Node<?> node, int x, int y) {
      */
     @SuppressWarnings("deprecation")
     default <T, P extends Position2D<P>> void apply(
-            Graphics2D g,
-            Node<T> n,
-            Environment<T, P> env,
-            Wormhole2D<P> wormhole
+            final Graphics2D g,
+            final Node<T> n,
+            final Environment<T, P> env,
+            final Wormhole2D<P> wormhole
     ) {
         final Point viewPoint = wormhole.getViewPoint(env.getPosition(n));
         apply(g, n, viewPoint.x, viewPoint.y); // preserve backward compatibility
diff --git a/alchemist-swingui/src/main/java/it/unibo/alchemist/boundary/gui/effects/EffectSerializationFactory.java b/alchemist-swingui/src/main/java/it/unibo/alchemist/boundary/gui/effects/EffectSerializationFactory.java
index e7618cc6d7..35cbe98fc6 100644
--- a/alchemist-swingui/src/main/java/it/unibo/alchemist/boundary/gui/effects/EffectSerializationFactory.java
+++ b/alchemist-swingui/src/main/java/it/unibo/alchemist/boundary/gui/effects/EffectSerializationFactory.java
@@ -13,12 +13,16 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.google.gson.typeadapters.RuntimeTypeAdapterFactory;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import it.unibo.alchemist.ClassPathScanner;
 import it.unibo.alchemist.SupportedIncarnations;
+import org.danilopianini.lang.CollectionWithCurrentElement;
+import org.danilopianini.lang.ImmutableCollectionWithCurrentElement;
 
+import java.awt.Color;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -27,11 +31,7 @@
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
-import java.util.ArrayList;
 import java.util.List;
-import org.danilopianini.io.FileUtilities;
-import org.danilopianini.lang.CollectionWithCurrentElement;
-import org.danilopianini.lang.ImmutableCollectionWithCurrentElement;
 
 /**
  * Serialize Alchemist effects from/to file in human readable format.
@@ -39,6 +39,7 @@
  */
 @Deprecated
 public final class EffectSerializationFactory {
+
     private static final RuntimeTypeAdapterFactory<Effect> RUNTIME_TYPE_ADAPTER_FACTORY =
             RuntimeTypeAdapterFactory.of(Effect.class);
 
@@ -48,20 +49,44 @@ public final class EffectSerializationFactory {
     }
 
     private static final Gson GSON = new GsonBuilder().registerTypeAdapterFactory(RUNTIME_TYPE_ADAPTER_FACTORY)
-            .registerTypeHierarchyAdapter(CollectionWithCurrentElement.class,
-                    new TypeAdapter<ImmutableCollectionWithCurrentElement<?>>() {
-                        @Override
-                        public void write(final JsonWriter out, final ImmutableCollectionWithCurrentElement<?> value)
-                                throws IOException {
-                            out.value(value.getCurrent().toString());
-                        }
-
-                        @Override
-                        public ImmutableCollectionWithCurrentElement<?> read(final JsonReader in) throws IOException {
-                            return new ImmutableCollectionWithCurrentElement<>(
-                                    SupportedIncarnations.getAvailableIncarnations(), in.nextString());
+            .registerTypeHierarchyAdapter(
+                CollectionWithCurrentElement.class,
+                new TypeAdapter<ImmutableCollectionWithCurrentElement<?>>() {
+                    @Override
+                    public void write(final JsonWriter out, final ImmutableCollectionWithCurrentElement<?> value)
+                            throws IOException {
+                        out.value(value.getCurrent().toString());
+                    }
+                    @Override
+                    public ImmutableCollectionWithCurrentElement<?> read(final JsonReader in) throws IOException {
+                        return new ImmutableCollectionWithCurrentElement<>(
+                                SupportedIncarnations.getAvailableIncarnations(), in.nextString());
+                    }
+                }
+            )
+            .registerTypeHierarchyAdapter(
+                Color.class,
+                new TypeAdapter<Color>() {
+                    @Override
+                    public void write(final JsonWriter out, final Color value) throws IOException {
+                        out.beginObject();
+                        out.name("value");
+                        out.value(value.getRGB());
+                        out.endObject();
+                    }
+                    @Override
+                    public Color read(final JsonReader in) throws IOException {
+                        in.beginObject();
+                        in.nextName();
+                        final int value = in.nextInt();
+                        while (in.peek() != JsonToken.END_OBJECT) {
+                            in.skipValue();
                         }
-                    })
+                        in.endObject();
+                        return new Color(value);
+                    }
+                }
+            )
             .setPrettyPrinting().create();
 
     private EffectSerializationFactory() {
@@ -83,23 +108,8 @@ private EffectSerializationFactory() {
     @SuppressWarnings("unchecked")
     @SuppressFBWarnings(value = "REC_CATCH_EXCEPTION", justification = "RuntimeException is willingly caught")
     public static List<Effect> effectsFromFile(final File effectFile) throws IOException, ClassNotFoundException {
-        // Try to deserialize a JSON file at first
-        final Reader fr = new InputStreamReader(new FileInputStream(effectFile), Charsets.UTF_8);
-        try {
-            final List<Effect> effects = GSON.fromJson(fr, new TypeToken<List<Effect>>() {
-            }.getType());
-            fr.close();
-            return effects;
-        } catch (final Exception e) { // NOPMD
-            fr.close();
-            final Object res = FileUtilities.fileToObject(effectFile);
-            if (res instanceof Effect) {
-                final List<Effect> effects = new ArrayList<>();
-                effects.add((Effect) res);
-                return effects;
-            }
-            // Backward compatibility: try to deserialize a binary file
-            return (List<Effect>) FileUtilities.fileToObject(effectFile);
+        try (Reader fr = new InputStreamReader(new FileInputStream(effectFile), Charsets.UTF_8)) {
+            return GSON.fromJson(fr, new TypeToken<List<Effect>>() { }.getType());
         }
     }
 
@@ -114,9 +124,7 @@ public static List<Effect> effectsFromFile(final File effectFile) throws IOExcep
      *             Exception in handling the file
      */
     public static void effectToFile(final File effectFile, final Effect effect) throws IOException {
-        final List<Effect> effects = new ArrayList<>();
-        effects.add(effect);
-        effectsToFile(effectFile, effects);
+        effectsToFile(effectFile, List.of(effect));
     }
 
     /**
diff --git a/alchemist-swingui/src/test/java/it/unibo/alchemist/test/TestEffectSerialization.java b/alchemist-swingui/src/test/java/it/unibo/alchemist/test/TestEffectSerialization.java
index 49dde73a29..c2f7d951ff 100644
--- a/alchemist-swingui/src/test/java/it/unibo/alchemist/test/TestEffectSerialization.java
+++ b/alchemist-swingui/src/test/java/it/unibo/alchemist/test/TestEffectSerialization.java
@@ -7,6 +7,7 @@
  */
 package it.unibo.alchemist.test;
 
+import it.unibo.alchemist.ClassPathScanner;
 import it.unibo.alchemist.boundary.gui.effects.Effect;
 import it.unibo.alchemist.boundary.gui.effects.EffectFactory;
 import it.unibo.alchemist.boundary.gui.effects.EffectSerializationFactory;
@@ -15,18 +16,30 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import java.nio.file.Files;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
- * Test for bugs in {@link it.unibo.alchemist.boundary.wormhole.implementation.Wormhole2D}.
+ * Test effect serialization.
  */
-public class TestEffectSerialization {
+class TestEffectSerialization {
 
-    private static final String FILEPATH = "test.aes";
-    private static final File FILE = new File(FILEPATH);
+    private static final String FILEPATH;
     private static final Effect E = EffectFactory.buildDefaultEffect();
 
+    static {
+        try {
+            FILEPATH = Files.createTempDirectory("alchemist").toAbsolutePath() + File.separator + "test.aes";
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    private static final File FILE = new File(FILEPATH);
+
     /**
      * Make sure that effects can be (de) serialized with Gson.
      * 
@@ -36,7 +49,7 @@ public class TestEffectSerialization {
      *             if some very serious bug happen
      */
     @Test
-    public void testGsonEffectSerialization() throws IOException, ClassNotFoundException {
+    void testGsonEffectSerialization() throws IOException, ClassNotFoundException {
         EffectSerializationFactory.effectToFile(FILE, E);
         EffectSerializationFactory.effectsFromFile(FILE);
     }
@@ -50,40 +63,18 @@ public void testGsonEffectSerialization() throws IOException, ClassNotFoundExcep
      *             if some very serious bug happen
      */
     @Test
-    public void testDefaultEffectSerialization() throws IOException, ClassNotFoundException {
+    void testDefaultEffectSerialization() throws IOException, ClassNotFoundException {
         FileUtilities.objectToFile(E, FILEPATH, false);
         FileUtilities.fileToObject(FILEPATH);
     }
 
-    /**
-     * Make sure that effects can be (de) serialized even if they are binary
-     * file.
-     * 
-     * @throws IOException
-     *             in case of errors
-     * @throws ClassNotFoundException
-     *             if some very serious bug happen
-     */
     @Test
-    public void testBackwardCompatibilitySingleEffect() throws IOException, ClassNotFoundException {
-        FileUtilities.objectToFile(E, FILEPATH, false);
-        EffectSerializationFactory.effectsFromFile(FILE);
+    void loadExisting() throws IOException, ClassNotFoundException {
+        final var resources = ClassPathScanner.resourcesMatching(".*sample-effect.json");
+        assertEquals(1, resources.size());
+        final var file = new File(resources.get(0).getFile());
+        assertTrue(file.exists());
+        assertNotNull(EffectSerializationFactory.effectsFromFile(file));
     }
 
-    /**
-     * Make sure that effects can be (de) serialized even if they are binary
-     * file.
-     * 
-     * @throws IOException
-     *             in case of errors
-     * @throws ClassNotFoundException
-     *             if some very serious bug happen
-     */
-    @Test
-    public void testBackwardCompatibilityEffects() throws IOException, ClassNotFoundException {
-        final List<Effect> effects = new ArrayList<>();
-        effects.add(E);
-        FileUtilities.objectToFile(effects, FILE, false);
-        EffectSerializationFactory.effectsFromFile(FILE);
-    }
 }
diff --git a/alchemist-swingui/src/test/resources/it/unibo/alchemist/gui/effects/json/sample-effect.json b/alchemist-swingui/src/test/resources/it/unibo/alchemist/gui/effects/json/sample-effect.json
new file mode 100644
index 0000000000..7af7a8abe3
--- /dev/null
+++ b/alchemist-swingui/src/test/resources/it/unibo/alchemist/gui/effects/json/sample-effect.json
@@ -0,0 +1,185 @@
+[
+  {
+    "type": "class it.unibo.alchemist.boundary.gui.effects.DrawShape",
+    "curIncarnation": "protelis",
+    "mode": "FILL_ELLIPSE",
+    "red": {
+      "max": 255,
+      "min": 0,
+      "val": 0
+    },
+    "blue": {
+      "max": 255,
+      "min": 0,
+      "val": 0
+    },
+    "green": {
+      "max": 255,
+      "min": 0,
+      "val": 0
+    },
+    "alpha": {
+      "max": 255,
+      "min": 0,
+      "val": 255
+    },
+    "scaleFactor": {
+      "max": 100,
+      "min": 0,
+      "val": 50
+    },
+    "size": {
+      "max": 100,
+      "min": 0,
+      "val": 15
+    },
+    "molFilter": false,
+    "molString": "",
+    "molPropertyFilter": false,
+    "property": "",
+    "writingPropertyValue": false,
+    "c": "ALPHA",
+    "reverse": false,
+    "propoom": {
+      "max": 10,
+      "min": -10,
+      "val": 0
+    },
+    "minprop": {
+      "max": 10,
+      "min": -10,
+      "val": 0
+    },
+    "maxprop": {
+      "max": 10,
+      "min": -10,
+      "val": 10
+    },
+    "colorCache": {
+      "value": -16777216,
+      "falpha": 0.0
+    }
+  },
+  {
+    "type": "class it.unibo.alchemist.boundary.gui.effects.DrawShape",
+    "curIncarnation": "protelis",
+    "mode": "FILL_ELLIPSE",
+    "red": {
+      "max": 255,
+      "min": 0,
+      "val": 255
+    },
+    "blue": {
+      "max": 255,
+      "min": 0,
+      "val": 0
+    },
+    "green": {
+      "max": 255,
+      "min": 0,
+      "val": 0
+    },
+    "alpha": {
+      "max": 255,
+      "min": 0,
+      "val": 255
+    },
+    "scaleFactor": {
+      "max": 100,
+      "min": 0,
+      "val": 50
+    },
+    "size": {
+      "max": 100,
+      "min": 0,
+      "val": 13
+    },
+    "molFilter": true,
+    "molString": "org:protelis:tutorial:distanceTo",
+    "molPropertyFilter": true,
+    "property": "",
+    "writingPropertyValue": false,
+    "c": "HUE",
+    "reverse": false,
+    "propoom": {
+      "max": 10,
+      "min": -10,
+      "val": 1
+    },
+    "minprop": {
+      "max": 10,
+      "min": -10,
+      "val": 0
+    },
+    "maxprop": {
+      "max": 10,
+      "min": -10,
+      "val": 2
+    },
+    "colorCache": {
+      "value": -65536,
+      "falpha": 0.0
+    }
+  },
+  {
+    "type": "class it.unibo.alchemist.boundary.gui.effects.DrawShape",
+    "curIncarnation": "protelis",
+    "mode": "FILL_ELLIPSE",
+    "red": {
+      "max": 255,
+      "min": 0,
+      "val": 0
+    },
+    "blue": {
+      "max": 255,
+      "min": 0,
+      "val": 0
+    },
+    "green": {
+      "max": 255,
+      "min": 0,
+      "val": 0
+    },
+    "alpha": {
+      "max": 255,
+      "min": 0,
+      "val": 255
+    },
+    "scaleFactor": {
+      "max": 100,
+      "min": 0,
+      "val": 50
+    },
+    "size": {
+      "max": 100,
+      "min": 0,
+      "val": 14
+    },
+    "molFilter": true,
+    "molString": "source",
+    "molPropertyFilter": false,
+    "property": "",
+    "writingPropertyValue": false,
+    "c": "ALPHA",
+    "reverse": false,
+    "propoom": {
+      "max": 10,
+      "min": -10,
+      "val": 0
+    },
+    "minprop": {
+      "max": 10,
+      "min": -10,
+      "val": 0
+    },
+    "maxprop": {
+      "max": 10,
+      "min": -10,
+      "val": 10
+    },
+    "colorCache": {
+      "value": -16777216,
+      "falpha": 0.0
+    }
+  }
+]
\ No newline at end of file
diff --git a/alchemist-swingui/test.aes b/alchemist-swingui/test.aes
deleted file mode 100644
index e1289c48fc..0000000000
Binary files a/alchemist-swingui/test.aes and /dev/null differ
diff --git a/alchemist-ui-tooling/src/test/java/it/unibo/alchemist/test/TestWormhole2D.java b/alchemist-ui-tooling/src/test/java/it/unibo/alchemist/test/TestWormhole2D.java
index 8f47b944f8..bf346af36d 100644
--- a/alchemist-ui-tooling/src/test/java/it/unibo/alchemist/test/TestWormhole2D.java
+++ b/alchemist-ui-tooling/src/test/java/it/unibo/alchemist/test/TestWormhole2D.java
@@ -20,14 +20,14 @@
 /**
  * Test for bugs in {@link AbstractWormhole2D}.
  */
-public class TestWormhole2D {
+class TestWormhole2D {
 
     /**
      * Ensure that no exception is thrown when a zero-sized environment is
      * requested.
      */
     @Test
-    public void testZeroSizeEnvironment() {
+    void testZeroSizeEnvironment() {
         final var incarnation = SupportedIncarnations.<Object, Euclidean2DPosition>get("protelis").orElseThrow();
         final Environment<Object, Euclidean2DPosition> env = new Continuous2DEnvironment<>(incarnation);
         final AbstractWormhole2D<Euclidean2DPosition> worm = new TestPurposeWormhole<>(env);
diff --git a/build.gradle.kts b/build.gradle.kts
index ae4de14651..4714235a34 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,8 +10,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.danilopianini.gradle.mavencentral.mavenCentral
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.net.URL
 import java.io.ByteArrayOutputStream
+import java.net.URL
+import org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION as KOTLIN_VERSION
 
 plugins {
     id("org.danilopianini.git-sensitive-semantic-versioning")
@@ -36,6 +37,11 @@ plugins {
 
 apply(plugin = "com.eden.orchidPlugin")
 
+val additionalTools: Configuration by configurations.creating
+dependencies {
+    additionalTools("org.jacoco:org.jacoco.core:_")
+}
+
 allprojects {
 
     apply(plugin = "org.danilopianini.git-sensitive-semantic-versioning")
@@ -65,7 +71,6 @@ allprojects {
         jcenter {
             content {
                 onlyForConfigurations(
-                    "detekt",
                     "orchidCompileClasspath",
                     "orchidRuntimeClasspath"
                 )
@@ -112,6 +117,16 @@ allprojects {
         pmd(pmdModule("kotlin"))
     }
 
+    // Enforce Kotlin version coherence
+    configurations.all {
+        resolutionStrategy.eachDependency {
+            if (requested.group == "org.jetbrains.kotlin" && requested.name.startsWith("kotlin")) {
+                useVersion(KOTLIN_VERSION)
+                because("All Kotlin modules should use the same version, and compiler uses $KOTLIN_VERSION")
+            }
+        }
+    }
+
     // COMPILE
 
     tasks.withType<JavaCompile> {
@@ -121,12 +136,12 @@ allprojects {
     tasks.withType<KotlinCompile> {
         kotlinOptions {
             jvmTarget = "1.8"
-            freeCompilerArgs = listOf("-Xjvm-default=enable") // Enable default methods in Kt interfaces
+            freeCompilerArgs = listOf("-Xjvm-default=all") // Enable default methods in Kt interfaces
             allWarningsAsErrors = true
         }
     }
 
-    // TEST
+    // TEST AND COVERAGE
 
     tasks.withType<Test> {
         testLogging {
@@ -136,6 +151,13 @@ allprojects {
         useJUnitPlatform()
     }
 
+    jacoco {
+        toolVersion = additionalTools.resolvedConfiguration.resolvedArtifacts
+            .find { "jacoco" in it.moduleVersion.id.name }
+            ?.moduleVersion?.id?.version
+            ?: toolVersion
+    }
+
     tasks.jacocoTestReport {
         reports {
             xml.isEnabled = true
@@ -147,7 +169,7 @@ allprojects {
     spotbugs {
         setEffort("max")
         setReportLevel("low")
-        showProgress.set(true)
+        showProgress.set(false)
         val excludeFile = File("${project.rootProject.projectDir}/config/spotbugs/excludes.xml")
         if (excludeFile.exists()) {
             excludeFilter.set(excludeFile)
@@ -177,7 +199,7 @@ allprojects {
     }
 
     detekt {
-        failFast = true
+        allRules = true
         buildUponDefaultConfig = true
         config = files("${rootProject.projectDir}/config/detekt/detekt.yml")
         reports {
diff --git a/config/pmd b/config/pmd
index b1c9259b92..d7ab96b628 160000
--- a/config/pmd
+++ b/config/pmd
@@ -1 +1 @@
-Subproject commit b1c9259b928da4da802a37b281f4cc6d72a7cfa1
+Subproject commit d7ab96b6282675472b4cf42dc7a7bae6dd03b6f6
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf516..05679dc3c1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/versions.properties b/versions.properties
index 3221195b3b..fa71478f75 100644
--- a/versions.properties
+++ b/versions.properties
@@ -7,7 +7,7 @@
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
 
-plugin.com.dorongold.task-tree=1.5
+plugin.com.dorongold.task-tree=2.1.0
 
 plugin.com.eden.orchidPlugin=version.orchid
 
@@ -23,11 +23,11 @@ plugin.io.gitlab.arturbosch.detekt=version.io.gitlab.arturbosch.detekt..detekt-f
 
 plugin.org.danilopianini.git-sensitive-semantic-versioning=0.2.3
 
-plugin.org.danilopianini.publish-on-central=0.4.4
+plugin.org.danilopianini.publish-on-central=0.5.0
 
 plugin.org.jetbrains.dokka=1.4.32
 
-plugin.org.jlleitschuh.gradle.ktlint=10.0.0
+plugin.org.jlleitschuh.gradle.ktlint=10.1.0
 
 version..konf=1.1.2
 
@@ -37,7 +37,7 @@ version.apache.ignite=2.10.0
 
 version.ch.qos.logback..logback-classic=1.2.3
 
-version.com.github.ben-manes.caffeine..caffeine=3.0.2
+version.com.github.ben-manes.caffeine..caffeine=3.0.3
 
 version.com.github.davidmoten..rtree=0.8.7
 
@@ -45,9 +45,9 @@ version.com.github.jiconfont..jiconfont-google_material_design_icons=2.2.0.2
 
 version.com.github.jiconfont..jiconfont-javafx=1.0.0
 
-version.com.github.spotbugs..spotbugs-annotations=4.2.3
+version.com.github.spotbugs..spotbugs-annotations=4.3.0
 
-version.com.google.code.gson..gson=2.8.6
+version.com.google.code.gson..gson=2.8.7
 
 version.com.google.guava..guava=30.1.1-jre
 
@@ -61,13 +61,11 @@ version.com.miglayout..miglayout-swing=11.0
 
 version.com.nhaarman.mockitokotlin2..mockito-kotlin=2.2.0
 
-version.com.vladsch.flexmark..flexmark-profile-pegdown=0.36.8
-
 version.commons-cli..commons-cli=1.4
 
 version.commons-codec..commons-codec=1.15
 
-version.commons-io..commons-io=2.8.0
+version.commons-io..commons-io=2.10.0
 
 version.de.codecentric.centerdevice..javafxsvg=1.3.0
 
@@ -75,9 +73,9 @@ version.graphhopper=2.4
 
 version.io.arrow-kt..arrow-core=0.13.2
 
-version.io.github.classgraph..classgraph=4.8.105
+version.io.github.classgraph..classgraph=4.8.109
 
-version.io.gitlab.arturbosch.detekt..detekt-formatting=1.17.0
+version.io.gitlab.arturbosch.detekt..detekt-formatting=1.17.1
 
 version.io.jenetics..jpx=2.2.0
 
@@ -87,17 +85,17 @@ version.it.unimi.dsi..dsiutils=2.6.17
 
 version.junit-jupiter=5.7.2
 
-version.kotest=4.5.0
+version.kotest=4.6.0
 
-version.kotlin=1.4.32
+version.kotlin=1.5.20
 
-version.mockito=3.10.0
+version.mockito=3.11.2
 
 version.net.anwiba.commons.swing.icons..org.oxygen.oxygen-icons=4.13.0-1.0.185
 
 version.net.sf.trove4j..trove4j=3.0.3
 
-version.net.sourceforge.pmd..pmd-core=6.34.0
+version.net.sourceforge.pmd..pmd-core=6.36.0
 
 version.net.sourceforge.pmd..pmd-java=version.net.sourceforge.pmd..pmd-core
 
@@ -141,13 +139,15 @@ version.org.graphstream..gs-algo=version.org.graphstream..gs-core
 
 version.org.graphstream..gs-core=2.0
 
-version.org.jetbrains..annotations=20.1.0
+version.org.jacoco..org.jacoco.core=0.8.7
+
+version.org.jetbrains..annotations=21.0.1
 
 version.org.jgrapht..jgrapht-core=1.5.1
 
 version.org.jooq..jool=0.9.14
 
-version.org.mapsforge..mapsforge-map-awt=0.15.0
+version.org.mapsforge..mapsforge-map-awt=0.16.0
 
 version.org.mockito..mockito-core=3.10.0
 
@@ -155,11 +155,11 @@ version.org.scalatest..scalatest_2.13=3.3.0-SNAP2
 
 version.org.scalatestplus..scalatestplus-junit_2.13=1.0.0-M2
 
-version.org.slf4j..slf4j-api=1.7.30
+version.org.slf4j..slf4j-api=1.7.31
 
-version.org.yaml..snakeyaml=1.28
+version.org.yaml..snakeyaml=1.29
 
-version.protelis=14.1.9
+version.protelis=15.0.0
 
 version.scala=2.13.6