You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by ya...@apache.org on 2025/05/23 12:19:44 UTC

(incubator-kie-drools) branch main updated: kie-issues#1678: Adapt Test Scenario Runner to JUnit 5 Test Engine (#6338)

This is an automated email from the ASF dual-hosted git repository.

yamer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git


The following commit(s) were added to refs/heads/main by this push:
     new 8a61b8434a kie-issues#1678: Adapt Test Scenario Runner to JUnit 5 Test Engine (#6338)
8a61b8434a is described below

commit 8a61b8434a3990d11462de5076c03db6980baef9
Author: Yeser Amer <ye...@ibm.com>
AuthorDate: Fri May 23 14:19:40 2025 +0200

    kie-issues#1678: Adapt Test Scenario Runner to JUnit 5 Test Engine (#6338)
    
    * Integration Tests improved
    
    * pom
    
    * Revert last commit
    
    * WIP
    
    * Change Request
    
    * drools-scenario-simulation tests moved to JUnit5
    
    * drools-scenario-simulation tests moved to JUnit5
    
    * WIP
    
    * WIP
    
    * WIP
    
    * WIP
    
    * WIP
    
    * WIP
    
    * WIP
    
    * Fix Tests
    
    * Fix Tests
    
    * Fix Tests
    
    * Fix Tests
    
    * Pom updated
    
    * Pom updated
    
    * Test
    
    * Test
    
    * Tests
    
    * Tests
    
    * Tests
    
    * Tests
    
    * WIP
    
    * WIP
    
    * WIP
    
    * Minor
    
    * Minor
    
    * Tests
    
    * Minor
    
    * Minor
    
    * Minor
    
    * Tests
    
    * Revert change
    
    * Minor changes
    
    * Minor changes
    
    * Minor changes
    
    * Minor changes
    
    * Minor changes
    
    * Revert "Minor changes"
    
    This reverts commit 80b2cc94da9f0284fc55151259d213e88c62807a.
    
    * Minor changes
    
    * Minor changes
    
    * Integration Tests fixed
    
    * Path fixed
    
    * Fix headers
---
 build-parent/pom.xml                               |  55 ++---
 .../drools-scenario-simulation-api/pom.xml         |   5 +-
 .../api/model/AbstractScesimModelTest.java         |  52 +++--
 .../api/model/BackgroundDataTest.java              |  40 ++--
 .../api/model/BackgroundTest.java                  |  33 +--
 .../api/model/FactIdentifierTest.java              |  20 +-
 .../api/model/FactMappingTest.java                 |  16 +-
 .../api/model/FactMappingValueTest.java            |  22 +-
 .../scenariosimulation/api/model/ScenarioTest.java |  44 ++--
 .../api/model/ScesimModelDescriptorTest.java       |  41 ++--
 .../scenariosimulation/api/model/SettingsTest.java |  18 +-
 .../api/model/SimulationTest.java                  |  26 +--
 .../utils/ScenarioSimulationSharedUtilsTest.java   |  16 +-
 .../Developer_Guide.md                             |   9 +-
 .../drools-scenario-simulation-backend/pom.xml     |  65 +++++-
 .../backend/runner/AbstractScenarioRunner.java     |   7 +-
 .../backend/runner/DMNScenarioRunner.java          |   7 +-
 .../backend/runner/RuleScenarioRunner.java         |   7 +-
 .../backend/runner/ScenarioJunitActivator.java     |  20 +-
 .../backend/runner/ScenarioRunnerProvider.java     |   7 +-
 ...nerProvider.java => TestScenarioActivator.java} |  20 +-
 .../backend/runner/TestScenarioEngine.java         | 222 +++++++++++++++++++++
 .../backend/runner/TestScenarioTestDescriptor.java |  54 +++++
 .../runner/TestScenarioTestSuiteDescriptor.java    |  59 ++++++
 .../services/org.junit.platform.engine.TestEngine  |  19 ++
 .../scenariosimulation/backend/TestUtils.java      |  18 +-
 .../AbstractExpressionEvaluatorTest.java           |  71 ++++---
 .../expression/BaseExpressionEvaluatorTest.java    |  60 +++---
 .../expression/BaseExpressionOperatorTest.java     |  28 +--
 .../expression/DMNFeelExpressionEvaluatorTest.java |  79 ++++----
 .../expression/ExpressionEvaluatorFactoryTest.java |  12 +-
 .../expression/FakeExpressionEvaluator.java        |   3 +-
 .../expression/MVELExpressionEvaluatorTest.java    |  30 +--
 .../ParameterizedBaseExpressionEvaluatorTest.java  |  61 +++---
 .../backend/fluent/AbstractRuleCoverageTest.java   |   2 +-
 .../backend/fluent/ConditionFilterTest.java        |  14 +-
 .../backend/fluent/CoverageAgendaListenerTest.java |  14 +-
 .../fluent/DMNScenarioExecutableBuilderTest.java   |  20 +-
 .../fluent/RuleScenarioExecutableBuilderTest.java  |  10 +-
 .../RuleStatefulScenarioExecutableBuilderTest.java |  26 +--
 ...RuleStatelessScenarioExecutableBuilderTest.java |  22 +-
 .../backend/fluent/ValidateFactCommandTest.java    |  22 +-
 .../scenariosimulation/backend/model/Dispute.java  |   2 +-
 .../backend/model/ListMapClass.java                |   2 +-
 .../backend/model/NotEmptyConstructor.java         |   2 +-
 .../scenariosimulation/backend/model/Person.java   |   2 +-
 .../backend/model/SubPerson.java                   |   2 +-
 .../backend/runner/AbstractRunnerHelperTest.java   |  14 +-
 .../backend/runner/AbstractScenarioRunnerTest.java |  37 ++--
 .../runner/DMNScenarioRunnerHelperTest.java        |  77 +++----
 .../runner/RuleScenarioRunnerHelperTest.java       |  73 ++++---
 .../backend/runner/ScenarioJunitActivatorTest.java |  37 ++--
 .../runner/SimulationRunMetadataBuilderTest.java   |   8 +-
 .../backend/runner/TestScenarioEngineTest.java     | 125 ++++++++++++
 .../runner/model/ScenarioResultMetadataTest.java   |  20 +-
 .../backend/runner/model/ValueWrapperTest.java     |   5 +-
 .../backend/util/DMNSimulationUtilsTest.java       |  14 +-
 .../backend/util/DOMParserUtilTest.java            | 103 ++++------
 .../backend/util/JsonUtilsTest.java                |   8 +-
 .../backend/util/ScenarioBeanUtilTest.java         |  95 +++++----
 .../util/ScenarioSimulationServerMessagesTest.java |  27 ++-
 .../util/ScenarioSimulationXMLPersistenceTest.java |  70 +++----
 .../backend/util/model/EnumTest.java               |   2 +-
 .../pom.xml                                        |  22 +-
 .../java/org/drools/scesim/Hello.java}             |  41 ++--
 .../{test => main}/resources/META-INF/kmodule.xml  |   0
 .../resources/dmnPmml/KiePMMLRegression.dmn        |   0
 .../resources/dmnPmml/KiePMMLTree.dmn              |   0
 .../resources/dmnPmml/test_regression.pmml         |   0
 .../resources/dmnPmml/test_tree.pmml               |   0
 .../resources/importedDMN/GeneralRules.dmn         |   0
 .../resources/importedDMN/TrafficViolation.dmn     |   0
 .../Traffic Violation.dmn                          |   0
 .../importedDMNInputsDecisions/Using Imported.dmn  |   0
 .../resources/org.drools.scesim/HelloRule.drl}     |  21 +-
 .../trafficViolation}/Traffic Violation.dmn        |   0
 .../integrationtest/TestScenarioTest.java}         |  15 +-
 .../resources/dmnPmml/KiePMMLRegressionTest.scesim |   2 +-
 .../test/resources/dmnPmml/KiePMMLTreeTest.scesim  |   2 +-
 .../importedDMN/TrafficViolationTest.scesim        |   2 +-
 .../Using Imported.scesim                          |   2 +-
 .../{META-INF/kmodule.xml => logback-test.xml}     |  20 +-
 .../HelloScesim.scesim}                            | 131 ++++++------
 .../Traffic Violation.scesim}                      |   2 +-
 drools-scenario-simulation/pom.xml                 |   1 -
 .../src/test/java/ScenarioJunitActivatorTest.java  |   4 +-
 .../java/it/pkg/ScenarioJunitActivatorTest.java    |   4 +-
 87 files changed, 1478 insertions(+), 892 deletions(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index fb772033a3..c97ea38f06 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -33,7 +33,6 @@
   <name>Drools :: Build Parent</name>
   <packaging>pom</packaging>
 
-
   <properties>
     <maven.compiler.release>17</maven.compiler.release>
     <maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
@@ -78,7 +77,7 @@
     <version.io.netty>4.1.118.Final</version.io.netty>
     <version.io.smallrye.openapi.core>3.10.0</version.io.smallrye.openapi.core>
     <version.it.unimi.dsi.fastutil>8.5.11</version.it.unimi.dsi.fastutil>
-    <version.junit>4.13.1</version.junit>
+    <version.junit>4.13.2</version.junit>
     <version.net.java.dev.glazedlists>1.8.0</version.net.java.dev.glazedlists>
     <version.antlr>2.7.7</version.antlr>
     <version.org.antlr>3.5.2</version.org.antlr>
@@ -93,7 +92,7 @@
     <version.org.apache.pdfbox>2.0.28</version.org.apache.pdfbox>
     <version.org.apache.poi>5.4.1</version.org.apache.poi>
     <version.org.apache.tomcat.tomcat-dbcp>10.1.7</version.org.apache.tomcat.tomcat-dbcp>
-    <version.org.assertj>3.24.2</version.org.assertj>
+    <version.org.assertj>3.27.3</version.org.assertj>
     <version.org.eclipse.jdt>3.33.0</version.org.eclipse.jdt>
     <version.org.freemarker>2.3.32</version.org.freemarker>
     <version.org.glassfish.jaxb>4.0.4</version.org.glassfish.jaxb>
@@ -121,9 +120,10 @@
     <version.jakarta.json-api>2.1.3</version.jakarta.json-api>
     <version.org.apache.openjpa>4.0.0</version.org.apache.openjpa>
     <version.org.jpmml.model>1.6.4</version.org.jpmml.model> <!-- jpmml-model BSD 3C license - ATTENTION 1.5.1 intentional, because 1.5.1 evaluators works with 1.5.1 -->
-    <version.org.junit>5.10.2</version.org.junit>
+    <version.org.junit.jupiter>5.12.2</version.org.junit.jupiter>
+    <version.org.junit.platform>1.12.2</version.org.junit.platform> <!-- Keep synchronized with junit-jupiter (middle and minor should be the same) -->
     <version.org.mvel>2.5.2.Final</version.org.mvel>
-    <version.org.powermock>2.0.7</version.org.powermock>
+    <version.org.powermock>2.0.9</version.org.powermock>
     <version.org.slf4j>2.0.6</version.org.slf4j>
     <!-- simple-jndi is a small library that helps us avoid JNDI error messages during testing -->
     <version.simple-jndi>0.11.4.1</version.simple-jndi>
@@ -146,7 +146,7 @@
     <version.org.asciidoctor.asciidoctorj>2.2.0</version.org.asciidoctor.asciidoctorj>
     <version.org.asciidoctor.asciidoctorj-pdf>1.5.0</version.org.asciidoctor.asciidoctorj-pdf>
     <version.org.w3c.dom>2.3.0-jaxb-1.0.6</version.org.w3c.dom>
-    <version.org.mockito>5.2.0</version.org.mockito>
+    <version.org.mockito>5.17.0</version.org.mockito>
     <!-- Version of JMH -->
     <version.org.openjdk.jmh>1.21</version.org.openjdk.jmh>
 
@@ -156,10 +156,6 @@
          being used by different plugins to make sure the module/bundle names are consistent. -->
     <java.module.name/>
 
-    <!-- Plugin version overrides.
-         IMPORTANT: always explain the reason for overriding the plugin version! -->
-    <!-- Surefire version 2.19.1 coming from parent is buggy and kie-osgi tests in droolsjbpm-integration are failing because of that. -->
-    <version.surefire.plugin>2.22.1</version.surefire.plugin>
     <!-- Add for kie-maven-plugin -->
     <version.plugin.plugin>3.6.4</version.plugin.plugin>
     <version.plugin.annotations>3.7.1</version.plugin.annotations>
@@ -211,7 +207,7 @@
 
     <version.org.awaitility>4.2.0</version.org.awaitility>
 
-    <!-- DROOLS-7140 Drools 8 enforce JDK and Maven versions as a rule --> 
+    <!-- DROOLS-7140 Drools 8 enforce JDK and Maven versions as a rule -->
     <version.jdk>${maven.compiler.release}</version.jdk>
     <version.maven>${version.org.apache.maven}</version.maven>
 
@@ -319,7 +315,7 @@
         <artifactId>netty-common</artifactId>
         <version>${version.io.netty}</version>
       </dependency>
-  
+
       <dependency>
         <groupId>com.github.victools</groupId>
         <artifactId>jsonschema-generator</artifactId>
@@ -497,28 +493,42 @@
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-api</artifactId>
-        <version>${version.org.junit}</version>
+        <version>${version.org.junit.jupiter}</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter</artifactId>
-        <version>${version.org.junit}</version>
+        <version>${version.org.junit.jupiter}</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>
-        <version>${version.org.junit}</version>
+        <version>${version.org.junit.jupiter}</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-params</artifactId>
-        <version>${version.org.junit}</version>
+        <version>${version.org.junit.jupiter}</version>
       </dependency>
-  
       <dependency>
         <groupId>org.junit.vintage</groupId>
         <artifactId>junit-vintage-engine</artifactId>
-        <version>${version.org.junit}</version>
+        <version>${version.org.junit.jupiter}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-commons</artifactId>
+        <version>${version.org.junit.platform}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-engine</artifactId>
+        <version>${version.org.junit.platform}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-launcher</artifactId>
+        <version>${version.org.junit.platform}</version>
       </dependency>
 
       <dependency>
@@ -750,7 +760,7 @@
         <artifactId>ecj</artifactId>
         <version>${version.org.eclipse.jdt}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.freemarker</groupId>
         <artifactId>freemarker</artifactId>
@@ -813,12 +823,12 @@
         <artifactId>mockito-inline</artifactId>
         <version>${version.org.mockito}</version>
       </dependency>
-      
+
       <dependency>
 	      <groupId>org.mockito</groupId>
 	      <artifactId>mockito-junit-jupiter</artifactId>
           <version>${version.org.mockito}</version>
-	    </dependency>    
+	    </dependency>
 
       <dependency>
         <groupId>org.mvel</groupId>
@@ -1442,7 +1452,7 @@
                   <module name="Checker">
  <module name="BeforeExecutionExclusionFileFilter">
     <property name="fileNamePattern" value="${drools.exclude.checkstyle}"/>
-  </module>                  
+  </module>
                     <!-- Checks for whitespace. -->
                     <module name="FileTabCharacter">
                       <property name="severity" value="error"/>
@@ -1530,7 +1540,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>${version.maven-surefire}</version>
           <executions>
             <execution>
               <goals>
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml
index 39f16b938f..d735ff2ff5 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml
@@ -43,14 +43,15 @@
       <artifactId>xstream</artifactId>
     </dependency>
 
+    <!-- Test Dependencies -->
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/AbstractScesimModelTest.java b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/AbstractScesimModelTest.java
index eace021c3c..b00ac3899f 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/AbstractScesimModelTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/AbstractScesimModelTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,29 +18,27 @@
  */
 package org.drools.scenariosimulation.api.model;
 
-import java.util.stream.IntStream;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Before;
-import org.junit.Test;
+import java.util.stream.IntStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+class AbstractScesimModelTest {
 
-public class AbstractScesimModelTest {
-
-    private final static int SCENARIO_DATA = 5;
-    private final static int FACT_MAPPINGS = 3;
+    private static final int SCENARIO_DATA = 5;
+    private static final int FACT_MAPPINGS = 3;
     private AbstractScesimModel<Scenario> model;
 
-    @Before
-    public void init() {
+    @BeforeEach
+    void init() {
         model = spy(new AbstractScesimModel<Scenario>() {
 
             @Override
@@ -58,17 +56,17 @@ public class AbstractScesimModelTest {
     }
 
     @Test
-    public void getUnmodifiableData() {
+    void getUnmodifiableData() {
         assertThat(model.getUnmodifiableData()).isNotNull().hasSize(SCENARIO_DATA);
     }
 
     @Test
-    public void getUnmodifiableData_isUnmodifiable() {
+    void getUnmodifiableData_isUnmodifiable() {
         assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> model.getUnmodifiableData().add(new Scenario()));
     }
 
     @Test
-    public void getDataByIndex() {
+    void getDataByIndex() {
         final Scenario dataByIndex = model.getDataByIndex(3);
          
         assertThat(dataByIndex).isNotNull();
@@ -76,7 +74,7 @@ public class AbstractScesimModelTest {
     }
     
     @Test
-    public void removeDataByIndex() {
+    void removeDataByIndex() {
         final Scenario dataByIndex = model.getDataByIndex(3);
         
         model.removeDataByIndex(3);
@@ -85,7 +83,7 @@ public class AbstractScesimModelTest {
     }
 
     @Test
-    public void removeData() {
+    void removeData() {
         final Scenario dataByIndex = model.getDataByIndex(3);
         
         model.removeData(dataByIndex);
@@ -94,7 +92,7 @@ public class AbstractScesimModelTest {
     }
 
     @Test
-    public void replaceData() {
+    void replaceData() {
         final Scenario replaced = model.getDataByIndex(3);
         final Scenario replacement = new Scenario();
         
@@ -105,7 +103,7 @@ public class AbstractScesimModelTest {
     }
     
     @Test
-    public void cloneData() {
+    void cloneData() {
         final Scenario cloned = model.getDataByIndex(3);
         final Scenario clone = model.cloneData(3, 4);
         
@@ -115,54 +113,54 @@ public class AbstractScesimModelTest {
     }
 
     @Test
-    public void clear() {
+    void clear() {
         model.clear();
         
         verify(model, times(1)).clearDatas();
     }
 
     @Test
-    public void clearDatas() {
+    void clearDatas() {
         model.clearDatas();
         
         assertThat(model.scesimData).isEmpty();
     }
 
     @Test
-    public void resetErrors() {
+    void resetErrors() {
         model.resetErrors();
         
         model.scesimData.forEach(scesimData -> verify(scesimData, times(1)).resetErrors());
     }
 
     @Test
-    public void removeFactMappingByIndex() {
+    void removeFactMappingByIndex() {
         final FactMapping factMappingByIndex = model.scesimModelDescriptor.getFactMappingByIndex(2);
         
         model.removeFactMappingByIndex(2);
         
-        verify(model, times(1)).clearDatas(eq(factMappingByIndex));
+        verify(model, times(1)).clearDatas(factMappingByIndex);
         assertThat(model.scesimModelDescriptor.getFactMappings()).hasSize(FACT_MAPPINGS - 1).doesNotContain(factMappingByIndex);
     }
 
     @Test
-    public void removeFactMapping() {
+    void removeFactMapping() {
         final FactMapping factMappingByIndex = model.scesimModelDescriptor.getFactMappingByIndex(2);
         
         model.removeFactMapping(factMappingByIndex);
         
-        verify(model, times(1)).clearDatas(eq(factMappingByIndex));
+        verify(model, times(1)).clearDatas(factMappingByIndex);
         assertThat(model.scesimModelDescriptor.getFactMappings()).hasSize(FACT_MAPPINGS - 1).doesNotContain(factMappingByIndex);
     }
 
     @Test
-    public void clearDatasByFactMapping() {
+    void clearDatasByFactMapping() {
         final FactMapping factMappingByIndex = model.scesimModelDescriptor.getFactMappingByIndex(2);
         model.clearDatas(factMappingByIndex);
         final FactIdentifier factIdentifier = factMappingByIndex.getFactIdentifier();
         final ExpressionIdentifier expressionIdentifier = factMappingByIndex.getExpressionIdentifier();
 
-        model.scesimData.forEach(scesimData -> verify(scesimData, times(1)).removeFactMappingValueByIdentifiers(eq(factIdentifier), eq(expressionIdentifier)));
+        model.scesimData.forEach(scesimData -> verify(scesimData, times(1)).removeFactMappingValueByIdentifiers(factIdentifier, expressionIdentifier));
     }
 
     private Scenario getSpyScenario(int index) {
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/BackgroundDataTest.java b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/BackgroundDataTest.java
index b10f51ffd5..c884fec64a 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/BackgroundDataTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/BackgroundDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,13 +20,13 @@ package org.drools.scenariosimulation.api.model;
 
 import java.util.Optional;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
-public class BackgroundDataTest {
+class BackgroundDataTest {
 
     private ScesimModelDescriptor scesimModelDescriptor;
     private BackgroundData backgroundData;
@@ -34,8 +34,8 @@ public class BackgroundDataTest {
     private ExpressionIdentifier expressionIdentifier;
     private Background background;
 
-    @Before
-    public void init() {
+    @BeforeEach
+    void init() {
         background = new Background();
         scesimModelDescriptor = background.getScesimModelDescriptor();
         backgroundData = background.addData();
@@ -44,7 +44,7 @@ public class BackgroundDataTest {
     }
 
     @Test
-    public void removeFactMappingValueByIdentifiersTest() {
+    void removeFactMappingValueByIdentifiersTest() {
         backgroundData.addMappingValue(factIdentifier, expressionIdentifier, "test value");
         
         backgroundData.removeFactMappingValueByIdentifiers(factIdentifier, expressionIdentifier);
@@ -53,7 +53,7 @@ public class BackgroundDataTest {
     }
 
     @Test
-    public void removeFactMappingValue() {
+    void removeFactMappingValue() {
         backgroundData.addMappingValue(factIdentifier, expressionIdentifier, "test value");
 
         Optional<FactMappingValue> retrieved = backgroundData.getFactMappingValue(factIdentifier, expressionIdentifier);
@@ -63,7 +63,7 @@ public class BackgroundDataTest {
     }
 
     @Test
-    public void addOMappingValue() {
+    void addOMappingValue() {
         FactMappingValue factMappingValue = backgroundData.addMappingValue(factIdentifier, expressionIdentifier, "test value");
         
         assertThat((Object) "test value").isEqualTo(factMappingValue.getRawValue());
@@ -72,54 +72,54 @@ public class BackgroundDataTest {
 
     
     @Test
-    public void addMappingValue_multipleInvocationsFail() {
+    void addMappingValue_multipleInvocationsFail() {
         backgroundData.addMappingValue(factIdentifier, expressionIdentifier, "test value");
 
         assertThatIllegalArgumentException().isThrownBy(() -> backgroundData.addMappingValue(factIdentifier, expressionIdentifier, "test value"));
     }
     
     @Test
-    public void addMappingValue_singleInvocationSucceed() {
+    void addMappingValue_singleInvocationSucceed() {
         backgroundData.addMappingValue(factIdentifier, expressionIdentifier, "test value");
         
         assertThat(backgroundData.getFactMappingValue(factIdentifier, expressionIdentifier)).isPresent();
     }
 
     @Test
-    public void getDescription_initialEmptyDescription() {
-        assertThat(backgroundData.getDescription()).isEqualTo("");
+    void getDescription_initialEmptyDescription() {
+        assertThat(backgroundData.getDescription()).isEmpty();
     }
 
     @Test
-    public void getDescription_descriptionSetToNullValue() {
+    void getDescription_descriptionSetToNullValue() {
         backgroundData.addMappingValue(FactIdentifier.DESCRIPTION, ExpressionIdentifier.DESCRIPTION, null);
         
-        assertThat(backgroundData.getDescription()).isEqualTo("");
+        assertThat(backgroundData.getDescription()).isEmpty();
     }
 
     @Test
-    public void getDescription_descriptionSetToNonNullValue() {
+    void getDescription_descriptionSetToNonNullValue() {
         backgroundData.addMappingValue(FactIdentifier.DESCRIPTION, ExpressionIdentifier.DESCRIPTION, "Test Description");
         
         assertThat(backgroundData.getDescription()).isEqualTo("Test Description");
     }
     
     @Test
-    public void setDescription_nullValue() {
+    void setDescription_nullValue() {
         backgroundData.setDescription(null);
         
-        assertThat(backgroundData.getDescription()).isEqualTo("");
+        assertThat(backgroundData.getDescription()).isEmpty();
     }
     
     @Test
-    public void setDescription_nonNullValue() {
+    void setDescription_nonNullValue() {
         backgroundData.setDescription("Test Description");
         
         assertThat(backgroundData.getDescription()).isEqualTo("Test Description");
     }
     
     @Test
-    public void addOrUpdateMappingValue() {
+    void addOrUpdateMappingValue() {
         FactMappingValue oldMappingValue = backgroundData.addMappingValue(factIdentifier, expressionIdentifier, "Test 1");
         
         FactMappingValue newMappingValue = backgroundData.addOrUpdateMappingValue(factIdentifier, expressionIdentifier, "Test 2");
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/BackgroundTest.java b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/BackgroundTest.java
index 8237a15867..57fb731343 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/BackgroundTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/BackgroundTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,21 +18,22 @@
  */
 package org.drools.scenariosimulation.api.model;
 
+import java.util.Comparator;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class BackgroundTest {
+class BackgroundTest {
 
     private Background background;
     private BackgroundData originalBackgroundData;
 
-    @Before
-    public void setup() {
+    @BeforeEach
+    void setup() {
         background = new Background();
         FactIdentifier factIdentifier = FactIdentifier.create("Test", String.class.getCanonicalName());
         ExpressionIdentifier expressionIdentifier = ExpressionIdentifier.create("Test", FactMappingType.GIVEN);
@@ -44,7 +45,7 @@ public class BackgroundTest {
     }
 
     @Test
-    public void addData() {
+    void addData() {
         background.addData(1);
 
         assertThatThrownBy(() -> background.addData(-1)).isInstanceOf(IndexOutOfBoundsException.class);
@@ -53,7 +54,7 @@ public class BackgroundTest {
     }
 
     @Test
-    public void cloneModel() {
+    void cloneModel() {
         final Background cloned = background.cloneModel();
         
         assertThat(cloned).isNotNull();
@@ -64,11 +65,11 @@ public class BackgroundTest {
         assertThat(clonedDescriptor.getUnmodifiableFactMappings()).hasSameSizeAs(originalDescriptor.getUnmodifiableFactMappings());
         assertThat(clonedDescriptor.getUnmodifiableFactMappings()).isEqualTo(originalDescriptor.getUnmodifiableFactMappings());
         assertThat(cloned.getUnmodifiableData()).hasSameSizeAs(background.getUnmodifiableData());
-        assertThat(cloned.getUnmodifiableData()).usingElementComparator((x, y) -> x.getDescription().compareTo(y.getDescription())).isEqualTo(background.getUnmodifiableData());
+        assertThat(cloned.getUnmodifiableData()).usingElementComparator(Comparator.comparing(AbstractScesimData::getDescription)).isEqualTo(background.getUnmodifiableData());
     }
 
     @Test
-    public void cloneData() {
+    void cloneData() {
         BackgroundData clonedBackgroundData = background.cloneData(0, 1);
 
         assertThat(clonedBackgroundData.getDescription()).isEqualTo(originalBackgroundData.getDescription());
@@ -80,7 +81,7 @@ public class BackgroundTest {
     }
 
     @Test
-    public void cloneScesimDataFail() {
+    void cloneScesimDataFail() {
 
         assertThatThrownBy(() -> background.cloneData(-1, 1)).isInstanceOf(IndexOutOfBoundsException.class);
 
@@ -92,23 +93,23 @@ public class BackgroundTest {
     }
 
     @Test
-    public void removeFactMappingByIndex() {
+    void removeFactMappingByIndex() {
         background.removeFactMappingByIndex(0);
         
         assertThat(background.getUnmodifiableData().get(0).getUnmodifiableFactMappingValues()).hasSize(1);
-        assertThat(background.getScesimModelDescriptor().getUnmodifiableFactMappings()).hasSize(0);
+        assertThat(background.getScesimModelDescriptor().getUnmodifiableFactMappings()).isEmpty();
     }
 
     @Test
-    public void removeFactMapping() {
+    void removeFactMapping() {
         background.removeFactMapping(background.getScesimModelDescriptor().getFactMappingByIndex(0));
         
         assertThat(background.getUnmodifiableData().get(0).getUnmodifiableFactMappingValues()).hasSize(1);
-        assertThat(background.getScesimModelDescriptor().getUnmodifiableFactMappings()).hasSize(0);
+        assertThat(background.getScesimModelDescriptor().getUnmodifiableFactMappings()).isEmpty();
     }
 
     @Test
-    public void getBackgroundDataWithIndex() {
+    void getBackgroundDataWithIndex() {
         List<BackgroundDataWithIndex> backgroundDatas = background.getBackgroundDataWithIndex();
         
         assertThat(backgroundDatas).hasSameSizeAs(background.getUnmodifiableData());
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/FactIdentifierTest.java b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/FactIdentifierTest.java
index 1fbfcbd61f..2fa20be6c8 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/FactIdentifierTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/FactIdentifierTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,15 +18,15 @@
  */
 package org.drools.scenariosimulation.api.model;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.drools.scenariosimulation.api.utils.ConstantsHolder.IMPORTED_PREFIX;
 
-public class FactIdentifierTest {
+class FactIdentifierTest {
 
     @Test
-    public void importedFactIdentifierTest() {
+    void importedFactIdentifierTest() {
         String importedBookName = IMPORTED_PREFIX + "." + "Book";
         FactIdentifier factIdentifier = FactIdentifier.create(importedBookName, importedBookName, IMPORTED_PREFIX);
         assertThat(factIdentifier.getName()).isEqualTo(importedBookName);
@@ -35,33 +35,33 @@ public class FactIdentifierTest {
     }
 
     @Test
-    public void getClassNameWithoutPackage() {
+    void getClassNameWithoutPackage() {
         commonGetClassNameWithoutPackage("test", "com.Test", "Test");
     }
 
     @Test
-    public void getClassNameWithoutPackage_LongPackage() {
+    void getClassNameWithoutPackage_LongPackage() {
         commonGetClassNameWithoutPackage("test", "com.project.Test", "Test");
     }
 
     @Test
-    public void getClassNameWithoutPackage_NoPackage() {
+    void getClassNameWithoutPackage_NoPackage() {
         commonGetClassNameWithoutPackage("test", "Test", "Test");
     }
 
 
     @Test
-    public void getPackageWithoutClassName() {
+    void getPackageWithoutClassName() {
         commonGetPackageWithoutClassName("test", "com.Test", "com");
     }
 
     @Test
-    public void getPackageWithoutClassName_LongPackage() {
+    void getPackageWithoutClassName_LongPackage() {
         commonGetPackageWithoutClassName("test", "com.project.Test", "com.project");
     }
 
     @Test
-    public void getPackageWithoutClassName_NoPackage() {
+    void getPackageWithoutClassName_NoPackage() {
         commonGetPackageWithoutClassName("test", "Test", "");
     }
 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/FactMappingTest.java b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/FactMappingTest.java
index 22614d2cf5..193a4dd6b1 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/FactMappingTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/FactMappingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,18 +20,18 @@ package org.drools.scenariosimulation.api.model;
 
 import java.util.ArrayList;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.drools.scenariosimulation.api.model.FactMappingType.GIVEN;
 
-public class FactMappingTest {
+class FactMappingTest {
 
     private FactMapping original;
 
     @Test
-    public void cloneFactMapping() {
+    void cloneFactMapping() {
         original = new FactMapping("FACT_ALIAS", FactIdentifier.create("FI_TEST", "com.test.Foo"), new ExpressionIdentifier("EI_TEST", GIVEN));
         original.addExpressionElement("FIRST_STEP", String.class.getName());
         original.setExpressionAlias("EA_TEST");
@@ -41,22 +41,22 @@ public class FactMappingTest {
     }
 
     @Test
-    public void getExpressionElementsWithoutClass_missingExpression() {
+    void getExpressionElementsWithoutClass_missingExpression() {
         original = new FactMapping("FACT_ALIAS", FactIdentifier.create("FI_TEST", "com.test.Foo"), new ExpressionIdentifier("EI_TEST", GIVEN));
         
         assertThatThrownBy(original::getExpressionElementsWithoutClass)
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("ExpressionElements malformed");
-        assertThat(original.getExpressionElements()).hasSize(0);
+        assertThat(original.getExpressionElements()).isEmpty();
 
     }
     
     @Test
-    public void getExpressionElementsWithoutClass_properlyFormed() {
+    void getExpressionElementsWithoutClass_properlyFormed() {
         original = new FactMapping("FACT_ALIAS", FactIdentifier.create("FI_TEST", "com.test.Foo"), new ExpressionIdentifier("EI_TEST", GIVEN));
         original.addExpressionElement("STEP", String.class.getCanonicalName());
 
-        assertThat(original.getExpressionElementsWithoutClass()).hasSize(0);
+        assertThat(original.getExpressionElementsWithoutClass()).isEmpty();
         assertThat(original.getExpressionElements()).hasSize(1);
     }
 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/FactMappingValueTest.java b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/FactMappingValueTest.java
index bda2fe2e7d..c67ffcb654 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/FactMappingValueTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/FactMappingValueTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,24 +21,24 @@ package org.drools.scenariosimulation.api.model;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
 
-public class FactMappingValueTest {
+class FactMappingValueTest {
 
     private FactMappingValue value;
     
-    @Before
-    public void setUp() throws Exception {
+    @BeforeEach
+    void setUp() {
         value = new FactMappingValue();
     }
 
     @Test
-    public void emptyFactMappingValue() {
+    void emptyFactMappingValue() {
         assertThatThrownBy(() -> new FactMappingValue(null, ExpressionIdentifier.DESCRIPTION, null))
                 .isInstanceOf(NullPointerException.class)
                 .hasMessage("FactIdentifier has to be not null");
@@ -49,7 +49,7 @@ public class FactMappingValueTest {
     }
 
     @Test
-    public void resetStatus() {
+    void resetStatus() {
         value.resetStatus();
         
         assertThat(value.getStatus()).isEqualTo(FactMappingValueStatus.SUCCESS);
@@ -59,7 +59,7 @@ public class FactMappingValueTest {
     }
 
     @Test
-    public void setErrorValue() {
+    void setErrorValue() {
         value.setErrorValue(VALUE);
         
         assertThat(value.getStatus()).isEqualTo(FactMappingValueStatus.FAILED_WITH_ERROR);
@@ -69,7 +69,7 @@ public class FactMappingValueTest {
     }
 
     @Test
-    public void setExceptionMessage() {
+    void setExceptionMessage() {
         String exceptionValue = "Exception";
         
         value.setExceptionMessage(exceptionValue);
@@ -81,7 +81,7 @@ public class FactMappingValueTest {
     }
 
     @Test
-    public void setPathToValue() {
+    void setPathToValue() {
         List<String> path = Arrays.asList("Step1", "Step2");
         
         value.setCollectionPathToValue(path);
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/ScenarioTest.java b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/ScenarioTest.java
index a61bb22dbb..4beb37739d 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/ScenarioTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/ScenarioTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,12 +20,13 @@ package org.drools.scenariosimulation.api.model;
 
 import java.util.Optional;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class ScenarioTest {
+class ScenarioTest {
 
     private ScesimModelDescriptor scesimModelDescriptor;
     private Scenario scenario;
@@ -33,8 +34,8 @@ public class ScenarioTest {
     private ExpressionIdentifier expressionIdentifier;
     private Simulation simulation;
 
-    @Before
-    public void init() {
+    @BeforeEach
+    void init() {
         simulation = new Simulation();
         scesimModelDescriptor = simulation.getScesimModelDescriptor();
         scenario = simulation.addData();
@@ -43,7 +44,7 @@ public class ScenarioTest {
     }
     
     @Test
-    public void addFactMappingValue() {
+    void addFactMappingValue() {
         FactMappingValue factMappingValue = scenario.addMappingValue(factIdentifier, expressionIdentifier, "test value");
         
         Optional<FactMappingValue> retrieved = scenario.getFactMappingValue(factIdentifier, expressionIdentifier);
@@ -52,7 +53,7 @@ public class ScenarioTest {
     }
 
     @Test
-    public void removeFactMappingValueByIdentifiers() {
+    void removeFactMappingValueByIdentifiers() {
         scenario.addMappingValue(factIdentifier, expressionIdentifier, "test value");
 
         scenario.removeFactMappingValueByIdentifiers(factIdentifier, expressionIdentifier);
@@ -61,7 +62,7 @@ public class ScenarioTest {
     }
 
     @Test
-    public void removeFactMappingValue() {
+    void removeFactMappingValue() {
         scenario.addMappingValue(factIdentifier, expressionIdentifier, "test value");
         Optional<FactMappingValue> retrieved = scenario.getFactMappingValue(factIdentifier, expressionIdentifier);
 
@@ -70,28 +71,29 @@ public class ScenarioTest {
         assertThat(scenario.getFactMappingValue(factIdentifier, expressionIdentifier)).isNotPresent();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void addMappingValueTest() {
+    @Test
+    void addMappingValueTest() {
         scenario.addMappingValue(factIdentifier, expressionIdentifier, "test value");
         // Should fail
-        scenario.addMappingValue(factIdentifier, expressionIdentifier, "test value");
+        assertThatThrownBy(() -> scenario.addMappingValue(factIdentifier, expressionIdentifier, "test value")
+        ).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void getDescription_initialDescriptionIsEmpty() {
-        assertThat(scenario.getDescription()).isEqualTo("");
+    void getDescription_initialDescriptionIsEmpty() {
+        assertThat(scenario.getDescription()).isEmpty();
     }
 
     @Test
-    public void getDescription_descriptionIsSetToNullValue() {
+    void getDescription_descriptionIsSetToNullValue() {
         String description = null;
         scenario.addMappingValue(FactIdentifier.DESCRIPTION, ExpressionIdentifier.DESCRIPTION, description);
         
-        assertThat(scenario.getDescription()).isEqualTo("");
+        assertThat(scenario.getDescription()).isEmpty();
     }
     
     @Test
-    public void getDescription_descriptionIsSetToNonNullValue() {
+    void getDescription_descriptionIsSetToNonNullValue() {
         String description = "Test Description";
         scenario.addMappingValue(FactIdentifier.DESCRIPTION, ExpressionIdentifier.DESCRIPTION, description);
         
@@ -99,16 +101,16 @@ public class ScenarioTest {
     }
 
     @Test
-    public void setDescription_nullValue() {
+    void setDescription_nullValue() {
         Scenario scenarioWithDescriptionNull = simulation.addData();
 
         scenarioWithDescriptionNull.setDescription(null);
         
-        assertThat(scenarioWithDescriptionNull.getDescription()).isEqualTo("");
+        assertThat(scenarioWithDescriptionNull.getDescription()).isEmpty();
     }
 
     @Test
-    public void getDescription3() {
+    void getDescription3() {
         Scenario scenarioWithDescriptionNull = simulation.addData();
 
         scenarioWithDescriptionNull.setDescription("Test Description");
@@ -117,7 +119,7 @@ public class ScenarioTest {
     }
     
     @Test
-    public void addOrUpdateMappingValue() {
+    void addOrUpdateMappingValue() {
         Object value2 = "Test 2";
         FactMappingValue factMappingValue = scenario.addMappingValue(factIdentifier, expressionIdentifier, "Test 1");
 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/ScesimModelDescriptorTest.java b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/ScesimModelDescriptorTest.java
index 2c9149f18b..69a20d3b42 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/ScesimModelDescriptorTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/ScesimModelDescriptorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,8 +20,8 @@ package org.drools.scenariosimulation.api.model;
 
 import java.util.stream.Stream;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -29,17 +29,16 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 import static org.drools.scenariosimulation.api.model.FactMappingType.EXPECT;
 import static org.drools.scenariosimulation.api.model.FactMappingType.GIVEN;
 
-public class ScesimModelDescriptorTest {
-
-
+class ScesimModelDescriptorTest {
+    
     private ScesimModelDescriptor modelDescriptor;
     private FactIdentifier factIdentifier;
     private ExpressionIdentifier expressionIdentifier;
     private FactIdentifier factIdentifier2;
     private ExpressionIdentifier expressionIdentifier2;
 
-    @Before
-    public void init() {
+    @BeforeEach
+    void init() {
         modelDescriptor = new ScesimModelDescriptor();
         factIdentifier = FactIdentifier.create("test fact", String.class.getCanonicalName());
         expressionIdentifier = ExpressionIdentifier.create("test expression", EXPECT);
@@ -48,14 +47,14 @@ public class ScesimModelDescriptorTest {
     }
 
     @Test
-    public void getFactIdentifiers() {
+    void getFactIdentifiers() {
         modelDescriptor.addFactMapping(factIdentifier, expressionIdentifier);
         
         assertThat(modelDescriptor.getFactIdentifiers()).isNotNull().hasSize(1).containsExactly(factIdentifier);
     }
 
     @Test
-    public void addFactMapping_byIndexAndFactMapping() {
+    void addFactMapping_byIndexAndFactMapping() {
         FactMapping toClone = new FactMapping();
         toClone.setFactAlias("ALIAS");
         toClone.setExpressionAlias("EXPRESSION_ALIAS");
@@ -67,7 +66,7 @@ public class ScesimModelDescriptorTest {
     }
 
     @Test
-    public void addFactMapping_byFactIdentifierAndExpressionIdentifier() {
+    void addFactMapping_byFactIdentifierAndExpressionIdentifier() {
         modelDescriptor.addFactMapping(factIdentifier, expressionIdentifier);
         modelDescriptor.addFactMapping(factIdentifier2, expressionIdentifier2);
         
@@ -80,14 +79,14 @@ public class ScesimModelDescriptorTest {
     }
 
     @Test
-    public void addFactMapping_byFactIdentifierAndExpressionIdentifier_fail() {
+    void addFactMapping_byFactIdentifierAndExpressionIdentifier_fail() {
         modelDescriptor.addFactMapping(factIdentifier, expressionIdentifier);
 
         assertThatIllegalArgumentException().isThrownBy(() -> modelDescriptor.addFactMapping(factIdentifier, expressionIdentifier));
     }
 
     @Test
-    public void addFactMapping_byIndexAndFactIdentifierAndExpressionIdentifier() {
+    void addFactMapping_byIndexAndFactIdentifierAndExpressionIdentifier() {
         modelDescriptor.addFactMapping(0, factIdentifier, expressionIdentifier);
         modelDescriptor.addFactMapping(0, factIdentifier2, expressionIdentifier2);
         
@@ -100,12 +99,12 @@ public class ScesimModelDescriptorTest {
     }
 
     @Test
-    public void addFactMappingByIndexAndFactIdentifierAndExpressionIdentifierFail() {
+    void addFactMappingByIndexAndFactIdentifierAndExpressionIdentifierFail() {
         assertThatIllegalArgumentException().isThrownBy(() -> modelDescriptor.addFactMapping(1, factIdentifier, expressionIdentifier));
     }
 
     @Test
-    public void removeFactMappingByIndex() {
+    void removeFactMappingByIndex() {
         modelDescriptor.addFactMapping(factIdentifier, expressionIdentifier);
         
         modelDescriptor.removeFactMappingByIndex(0);
@@ -114,7 +113,7 @@ public class ScesimModelDescriptorTest {
     }
 
     @Test
-    public void removeFactMapping() {
+    void removeFactMapping() {
         FactMapping retrieved = modelDescriptor.addFactMapping(factIdentifier, expressionIdentifier);
         
         modelDescriptor.removeFactMapping(retrieved);
@@ -123,7 +122,7 @@ public class ScesimModelDescriptorTest {
     }
 
     @Test
-    public void getIndexByIdentifierTest() {
+    void getIndexByIdentifierTest() {
         FactMapping factMapping0 = modelDescriptor.addFactMapping(factIdentifier, expressionIdentifier);
         FactMapping factMapping1 = modelDescriptor.addFactMapping(factIdentifier2, expressionIdentifier);
         int indexToCheck = 0;
@@ -138,14 +137,14 @@ public class ScesimModelDescriptorTest {
     }
 
     @Test
-    public void getIndexByIdentifierTestFail() {
+    void getIndexByIdentifierTestFail() {
         FactIdentifier notExisting = new FactIdentifier();
         
         assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> modelDescriptor.getIndexByIdentifier(notExisting, expressionIdentifier));
     }
 
     @Test
-    public void getFactMappingsByFactName() {
+    void getFactMappingsByFactName() {
         modelDescriptor.addFactMapping(FactIdentifier.create("test", String.class.getCanonicalName()), ExpressionIdentifier.create("test expression 0", EXPECT));
         modelDescriptor.addFactMapping(FactIdentifier.create("test", String.class.getCanonicalName()), ExpressionIdentifier.create("test expression 1", EXPECT));
         modelDescriptor.addFactMapping(FactIdentifier.create("TEST", String.class.getCanonicalName()), ExpressionIdentifier.create("test expression 2", EXPECT));
@@ -158,7 +157,7 @@ public class ScesimModelDescriptorTest {
     }
 
     @Test
-    public void moveFactMappingTest() {
+    void moveFactMappingTest() {
         ExpressionIdentifier expressionIdentifier2 = ExpressionIdentifier.create("Test expression 2", GIVEN);
         ExpressionIdentifier expressionIdentifier3 = ExpressionIdentifier.create("Test expression 3", GIVEN);
         FactMapping factMapping1 = modelDescriptor.addFactMapping(factIdentifier, expressionIdentifier);
@@ -173,7 +172,7 @@ public class ScesimModelDescriptorTest {
     }
 
     @Test
-    public void moveFactMapping_failsOutsideBoundaries() {
+    void moveFactMapping_failsOutsideBoundaries() {
         ExpressionIdentifier expressionIdentifier2 = ExpressionIdentifier.create("Test expression 2", GIVEN);
         modelDescriptor.addFactMapping(factIdentifier, expressionIdentifier);
         modelDescriptor.addFactMapping(factIdentifier, expressionIdentifier2);
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/SettingsTest.java b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/SettingsTest.java
index 58ad23bfde..f2a1d5c4b3 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/SettingsTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/SettingsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,12 +18,12 @@
  */
 package org.drools.scenariosimulation.api.model;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SettingsTest {
+class SettingsTest {
 
     private static final String DMO_SESSION = "dmoSession";
     private static final String DMN_PATH = "dmnfile.dmn";
@@ -36,8 +36,8 @@ public class SettingsTest {
 
     private Settings settings;
 
-    @Before
-    public void setup() {
+    @BeforeEach
+    void setup() {
         settings = new Settings();
         settings.setDmoSession(DMO_SESSION);
         settings.setDmnFilePath(DMN_PATH);
@@ -53,7 +53,7 @@ public class SettingsTest {
     }
 
     @Test
-    public void cloneEmptySettings() {
+    void cloneEmptySettings() {
         final Settings cloneSettings = new Settings().cloneSettings();
         
         assertThat(cloneSettings.getDmoSession()).isNull();
@@ -70,7 +70,7 @@ public class SettingsTest {
     }
 
     @Test
-    public void cloneSettings() {
+    void cloneSettings() {
         final Settings cloneSettings = settings.cloneSettings();
         assertThat(cloneSettings.getDmoSession()).isEqualTo(DMO_SESSION);
         assertThat(cloneSettings.getDmnFilePath()).isEqualTo(DMN_PATH);
@@ -86,7 +86,7 @@ public class SettingsTest {
     }
 
     @Test
-    public void cloneSettingsAndModifyIt() {
+    void cloneSettingsAndModifyIt() {
         final Settings cloneSettings = settings.cloneSettings();
         cloneSettings.setDmoSession(DMO_SESSION + "cl");
         settings.setDmnFilePath("src/" + DMN_PATH);
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/SimulationTest.java b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/SimulationTest.java
index f7633d2e07..2c439e6950 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/SimulationTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/model/SimulationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,19 +20,19 @@ package org.drools.scenariosimulation.api.model;
 
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class SimulationTest {
+class SimulationTest {
 
     private Simulation simulation;
     private Scenario originalScenario;
 
-    @Before
-    public void setup() {
+    @BeforeEach
+    void setup() {
         simulation = new Simulation();
         FactIdentifier factIdentifier = FactIdentifier.create("Test", String.class.getCanonicalName());
         ExpressionIdentifier expressionIdentifier = ExpressionIdentifier.create("Test", FactMappingType.GIVEN);
@@ -44,7 +44,7 @@ public class SimulationTest {
     }
 
     @Test
-    public void addData_failsOutsideBoundaries() {
+    void addData_failsOutsideBoundaries() {
         simulation.addData(1);
 
         assertThatThrownBy(() -> simulation.addData(-1)).isInstanceOf(IndexOutOfBoundsException.class);
@@ -53,7 +53,7 @@ public class SimulationTest {
     }
 
     @Test
-    public void cloneModel() {
+    void cloneModel() {
         final Simulation cloned = simulation.cloneModel();
         
         assertThat(cloned).isNotNull();
@@ -68,7 +68,7 @@ public class SimulationTest {
     }
 
     @Test
-    public void cloneData() {
+    void cloneData() {
         Scenario clonedScenario = simulation.cloneData(0, 1);
 
         assertThat(clonedScenario.getDescription()).isEqualTo(originalScenario.getDescription());
@@ -81,7 +81,7 @@ public class SimulationTest {
     }
 
     @Test
-    public void cloneData_failOutsideBoundaries() {
+    void cloneData_failOutsideBoundaries() {
 
         assertThatThrownBy(() -> simulation.cloneData(-1, 1)).isInstanceOf(IndexOutOfBoundsException.class);
 
@@ -93,7 +93,7 @@ public class SimulationTest {
     }
 
     @Test
-    public void removeFactMappingByIndex() {
+    void removeFactMappingByIndex() {
         simulation.removeFactMappingByIndex(0);
         
         assertThat(simulation.getUnmodifiableData().get(0).getUnmodifiableFactMappingValues()).hasSize(1);
@@ -101,7 +101,7 @@ public class SimulationTest {
     }
 
     @Test
-    public void removeFactMapping() {
+    void removeFactMapping() {
         simulation.removeFactMapping(simulation.getScesimModelDescriptor().getFactMappingByIndex(0));
         
         assertThat(simulation.getUnmodifiableData().get(0).getUnmodifiableFactMappingValues()).hasSize(1);
@@ -109,7 +109,7 @@ public class SimulationTest {
     }
 
     @Test
-    public void getScenarioWithIndex() {
+    void getScenarioWithIndex() {
         List<ScenarioWithIndex> scenarios = simulation.getScenarioWithIndex();
         
         assertThat(scenarios).hasSameSizeAs(simulation.getUnmodifiableData());
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/utils/ScenarioSimulationSharedUtilsTest.java b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/utils/ScenarioSimulationSharedUtilsTest.java
index 4e40e30ef2..46352e1c31 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/utils/ScenarioSimulationSharedUtilsTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/src/test/java/org/drools/scenariosimulation/api/utils/ScenarioSimulationSharedUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -28,11 +28,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ScenarioSimulationSharedUtilsTest {
+class ScenarioSimulationSharedUtilsTest {
 
     List<String> listValues = Arrays.asList(List.class.getCanonicalName(),
                                             ArrayList.class.getCanonicalName(),
@@ -44,33 +44,33 @@ public class ScenarioSimulationSharedUtilsTest {
                                            TreeMap.class.getCanonicalName());
 
     @Test
-    public void isCollectionOrMap() {
+    void isCollectionOrMap() {
         assertThat(listValues).allMatch(ScenarioSimulationSharedUtils::isCollectionOrMap);
         assertThat(mapValues).allMatch(ScenarioSimulationSharedUtils::isCollectionOrMap);
         assertThat(ScenarioSimulationSharedUtils.isCollectionOrMap(Collection.class.getCanonicalName())).isTrue();
     }
 
     @Test
-    public void isCollection() {
+    void isCollection() {
         assertThat(listValues).allMatch(ScenarioSimulationSharedUtils::isCollection);
         assertThat(mapValues).noneMatch(ScenarioSimulationSharedUtils::isCollection);
         assertThat(ScenarioSimulationSharedUtils.isCollectionOrMap(Collection.class.getCanonicalName())).isTrue();
     }
 
     @Test
-    public void isList() {
+    void isList() {
         assertThat(listValues).allMatch(ScenarioSimulationSharedUtils::isList);
         assertThat(mapValues).noneMatch(ScenarioSimulationSharedUtils::isList);
         assertThat(ScenarioSimulationSharedUtils.isList(Collection.class.getCanonicalName())).isFalse();
     }
 
     @Test
-    public void isMap() {
+    void isMap() {
         assertThat(mapValues).allMatch(ScenarioSimulationSharedUtils::isMap);
     }
 
     @Test
-    public void isEnumCanonicalName() {
+    void isEnumCanonicalName() {
         assertThat(ScenarioSimulationSharedUtils.isEnumCanonicalName(Enum.class.getCanonicalName())).isTrue();
         assertThat(ScenarioSimulationSharedUtils.isEnumCanonicalName(Enum.class.getSimpleName())).isFalse();
     }
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/Developer_Guide.md b/drools-scenario-simulation/drools-scenario-simulation-backend/Developer_Guide.md
index aa3ebb80ae..8706570f01 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/Developer_Guide.md
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/Developer_Guide.md
@@ -18,10 +18,10 @@
   -->
 # SCESIM BACKEND
 
-Currently, SCESIM engine is based on JUnit 4, and it is fired annotating a test class with
+The Test Scenario engine is based on JUnit 5 Test Engine, and it is fired annotating a test class with
 
 ```java
-@org.junit.runner.RunWith(ScenarioJunitActivator.class)
+@TestScenarioActivator
 ```
 
 It provides two runners, one for Decision engine and one for Rules engine.
@@ -37,8 +37,3 @@ Scope of the `RunnerHelper`s is to
 
 For `ExecutableBuilder` instantiation, the `RuleScenarioRunnerHelper` uses the tradition approach, based on KieContainer and related APIs.
 `DMNScenarioRunnerHelper`, on the other side, features the Efesto APIs, thus not requiring the KieContainer instantiation and usage.
-
-
-
-
-
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml
index 2b679d27e8..94d83ae050 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml
@@ -48,12 +48,24 @@
       <groupId>org.kie</groupId>
       <artifactId>kie-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-dmn-model</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.kie</groupId>
       <artifactId>kie-internal</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-util-xml</artifactId>
+    </dependency>
 
     <!-- JSON/XML utils -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -63,10 +75,25 @@
       <artifactId>xstream</artifactId>
     </dependency>
 
-    <!-- MVEL support -->
+    <!-- JUnit Platform internally used by the Test Scenario Engine -->
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-commons</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-engine</artifactId>
+    </dependency>
+    <!-- To be deleted when removing the old Test Scenario based on JUnit4 -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+
+    <!-- Drools dependencies -->
     <dependency>
       <groupId>org.drools</groupId>
-      <artifactId>drools-core</artifactId>
+      <artifactId>drools-base</artifactId>
     </dependency>
     <dependency>
       <groupId>org.drools</groupId>
@@ -76,12 +103,20 @@
       <groupId>org.drools</groupId>
       <artifactId>drools-mvel</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-xml-support</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.mvel</groupId>
       <artifactId>mvel2</artifactId>
     </dependency>
 
-    <!-- DMN dependencies -->
+    <!-- DMN & PMML dependencies -->
     <dependency>
       <groupId>org.kie</groupId>
       <artifactId>kie-dmn-feel</artifactId>
@@ -102,17 +137,29 @@
       <groupId>org.kie</groupId>
       <artifactId>kie-dmn-efesto-runtime</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-pmml-compiler-core</artifactId>
+    </dependency>
 
-    <!-- Test dependencies -->
+    <!-- Logs -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- For unit test logging: configure in src/test/resources/logback.xml -->
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
@@ -124,10 +171,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie</groupId>
-      <artifactId>kie-pmml-compiler-core</artifactId>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <dependencyManagement>
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/AbstractScenarioRunner.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/AbstractScenarioRunner.java
index 1ffb9826fd..307f402b3e 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/AbstractScenarioRunner.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/AbstractScenarioRunner.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -38,6 +38,11 @@ import org.kie.api.runtime.KieContainer;
 
 import static org.drools.scenariosimulation.api.model.ScenarioSimulationModel.Type;
 
+/**
+ * @deprecated This is the JUnit 4 implementation of Test Scenario, based on
+ * {@link org.junit.runner.Runner} JUnit 4 API. Replaced by {@link TestScenarioEngine}
+ */
+@Deprecated(since = "10.2.0", forRemoval = true)
 public abstract class AbstractScenarioRunner extends Runner {
 
     protected final ClassLoader classLoader;
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/DMNScenarioRunner.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/DMNScenarioRunner.java
index b177292837..b2a5bf6843 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/DMNScenarioRunner.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/DMNScenarioRunner.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -22,6 +22,11 @@ import org.drools.scenariosimulation.backend.expression.ExpressionEvaluatorFacto
 import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerDTO;
 import org.kie.api.runtime.KieContainer;
 
+/**
+ * @deprecated This is the JUnit 4 implementation of Test Scenario, based on
+ * {@link org.junit.runner.Runner} JUnit 4 API. Replaced by {@link TestScenarioEngine}
+ */
+@Deprecated(since = "10.2.0", forRemoval = true)
 public class DMNScenarioRunner extends AbstractScenarioRunner {
 
     public DMNScenarioRunner(KieContainer kieContainer, ScenarioRunnerDTO scenarioRunnerDTO) {
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/RuleScenarioRunner.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/RuleScenarioRunner.java
index d6e575ad7d..7f0a072097 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/RuleScenarioRunner.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/RuleScenarioRunner.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -22,6 +22,11 @@ import org.drools.scenariosimulation.backend.expression.ExpressionEvaluatorFacto
 import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerDTO;
 import org.kie.api.runtime.KieContainer;
 
+/**
+ * @deprecated This is the JUnit 4 implementation of Test Scenario, based on
+ * {@link org.junit.runner.Runner} JUnit 4 API. Replaced by {@link TestScenarioEngine}
+ */
+@Deprecated(since = "10.2.0", forRemoval = true)
 public class RuleScenarioRunner extends AbstractScenarioRunner {
 
     public RuleScenarioRunner(KieContainer kieContainer, ScenarioRunnerDTO scenarioRunnerDTO) {
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/ScenarioJunitActivator.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/ScenarioJunitActivator.java
index 0df4d9e023..3349210091 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/ScenarioJunitActivator.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/ScenarioJunitActivator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -23,7 +23,6 @@ import java.io.FileNotFoundException;
 import java.util.List;
 import java.util.Optional;
 import java.util.Scanner;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -32,7 +31,6 @@ import org.drools.scenariosimulation.api.model.Settings;
 import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerDTO;
 import org.drools.scenariosimulation.backend.util.ScenarioSimulationXMLPersistence;
 import org.junit.runner.Description;
-import org.junit.runner.RunWith;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.ParentRunner;
 import org.junit.runners.model.InitializationError;
@@ -42,17 +40,15 @@ import org.kie.api.runtime.KieContainer;
 import static org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils.FILE_EXTENSION;
 import static org.drools.util.ResourceHelper.getResourcesByExtension;
 
+/**
+ * @deprecated This is the JUnit 4 implementation of Test Scenario, based on
+ * {@link org.junit.runner.Runner} JUnit 4 API. Replaced by {@link TestScenarioActivator}
+ * Please replace {@code @org.junit.runner.RunWith(ScenarioJunitActivator.class)} with
+ * {@code @TestScenarioActivator}
+ */
+@Deprecated(since = "10.2.0", forRemoval = true)
 public class ScenarioJunitActivator extends ParentRunner<ScenarioRunnerDTO> {
 
-    public static final String ACTIVATOR_CLASS_NAME = "ScenarioJunitActivatorTest";
-
-    public static final Function<String, String> ACTIVATOR_CLASS_CODE = modulePackage ->
-            String.format("package %s;\n/**\n* Do not remove this file\n*/\n@%s(%s.class)\npublic class %s {\n}",
-                          modulePackage,
-                          RunWith.class.getCanonicalName(),
-                          ScenarioJunitActivator.class.getCanonicalName(),
-                          ScenarioJunitActivator.ACTIVATOR_CLASS_NAME);
-
     public ScenarioJunitActivator(Class<?> testClass) throws InitializationError {
         super(testClass);
     }
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/ScenarioRunnerProvider.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/ScenarioRunnerProvider.java
index 59f35ea668..3e5387a5eb 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/ScenarioRunnerProvider.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/ScenarioRunnerProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,6 +21,11 @@ package org.drools.scenariosimulation.backend.runner;
 import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerDTO;
 import org.kie.api.runtime.KieContainer;
 
+/**
+ * @deprecated This is the JUnit 4 implementation of Test Scenario, based on
+ * {@link org.junit.runner.Runner} JUnit 4 API. Replaced by {@link TestScenarioEngine}
+ */
+@Deprecated
 @FunctionalInterface
 public interface ScenarioRunnerProvider {
 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/ScenarioRunnerProvider.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/TestScenarioActivator.java
similarity index 68%
copy from drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/ScenarioRunnerProvider.java
copy to drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/TestScenarioActivator.java
index 59f35ea668..f1edbd3107 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/ScenarioRunnerProvider.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/TestScenarioActivator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,12 +18,18 @@
  */
 package org.drools.scenariosimulation.backend.runner;
 
-import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerDTO;
-import org.kie.api.runtime.KieContainer;
+import org.junit.platform.commons.annotation.Testable;
 
-@FunctionalInterface
-public interface ScenarioRunnerProvider {
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
-    AbstractScenarioRunner create(KieContainer kieContainer,
-                                  ScenarioRunnerDTO scenarioRunnerDTO);
+/**
+ * Annotation to be added in a Java Class under the test/java project directory
+ * to enable the Test Scenario execution.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Testable
+public @interface TestScenarioActivator {
 }
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/TestScenarioEngine.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/TestScenarioEngine.java
new file mode 100644
index 0000000000..b152dd1622
--- /dev/null
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/TestScenarioEngine.java
@@ -0,0 +1,222 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.drools.scenariosimulation.backend.runner;
+
+import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
+import org.drools.scenariosimulation.api.utils.ConstantsHolder;
+import org.drools.scenariosimulation.backend.expression.ExpressionEvaluatorFactory;
+import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerDTO;
+import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerData;
+import org.drools.scenariosimulation.backend.util.ScenarioSimulationXMLPersistence;
+import org.junit.platform.commons.support.AnnotationSupport;
+
+import org.junit.platform.engine.EngineDiscoveryRequest;
+import org.junit.platform.engine.EngineExecutionListener;
+import org.junit.platform.engine.ExecutionRequest;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestEngine;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.support.descriptor.EngineDescriptor;
+import org.kie.api.KieServices;
+import org.kie.api.runtime.KieContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.Scanner;
+import java.util.stream.Stream;
+
+/**
+ * It implements a TestEngine that discovers and executes Test Scenario files that live in the final
+ * user project. A Java Class in the src/test/java directory with the {@link TestScenarioActivator} annotation
+ * must be present to enable the scesim tests execution.
+ */
+public class TestScenarioEngine implements TestEngine {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestScenarioEngine.class);
+    private static final String TEST_ENGINE_ID = "kie-test-scenario";
+    private static final String TEST_ENGINE_DESCRIPTION = "Apache KIE Test Scenario engine";
+    private static final ScenarioSimulationXMLPersistence XML_READER = ScenarioSimulationXMLPersistence.getInstance();
+
+    @Override
+    public String getId() {
+        return TEST_ENGINE_ID;
+    }
+
+    @Override
+    public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
+        LOGGER.debug("Discovering scesim files for {}", TEST_ENGINE_DESCRIPTION);
+
+        EngineDescriptor engineDescriptor = new EngineDescriptor(uniqueId, TEST_ENGINE_DESCRIPTION);
+
+        discoveryRequest.getSelectorsByType(ClassSelector.class).forEach(selector ->
+            appendTestSuites(selector.getJavaClass(), engineDescriptor)
+        );
+
+        LOGGER.debug("Discovered {} scesim files", engineDescriptor.getChildren().size());
+        return engineDescriptor;
+    }
+
+    @Override
+    public void execute(ExecutionRequest executionRequest) {
+        LOGGER.debug("Executing {} Test Scenarios", executionRequest.getRootTestDescriptor().getChildren().size());
+
+        EngineExecutionListener listener = executionRequest.getEngineExecutionListener();
+        executionRequest.getRootTestDescriptor().getChildren().stream()
+                .map(TestScenarioTestSuiteDescriptor.class::cast)
+                .forEach(testSuiteDescriptor -> {
+                    LOGGER.debug("Executing {} Test Scenario which contains {} scenarios", testSuiteDescriptor.getDisplayName(),
+                            testSuiteDescriptor.getChildren().size());
+                    ScenarioRunnerDTO scenarioRunnerDTO = testSuiteDescriptor.getScenarioRunnerDTO();
+                    if (scenarioRunnerDTO.getSettings().isSkipFromBuild()) {
+                        LOGGER.debug("Skipping {} scenario", testSuiteDescriptor.getDisplayName());
+                        listener.executionSkipped(testSuiteDescriptor, testSuiteDescriptor.getDisplayName() + " skipped from the build");
+                        return;
+                    }
+                    listener.executionStarted(testSuiteDescriptor);
+                    AbstractRunnerHelper runnerHelper = getRunnerHelper(testSuiteDescriptor.getTestScenarioType());
+
+                    testSuiteDescriptor.getChildren().stream()
+                            .map(TestScenarioTestDescriptor.class::cast)
+                            .forEach(testDescriptor -> {
+                                LOGGER.debug("Executing {} scenario", testSuiteDescriptor.getDisplayName());
+                                listener.executionStarted(testDescriptor);
+
+                                KieContainer kieContainer = KieServices.get().getKieClasspathContainer();
+                                ExpressionEvaluatorFactory expressionEvaluatorFactory = ExpressionEvaluatorFactory.create(
+                                        kieContainer.getClassLoader(),
+                                        scenarioRunnerDTO.getSettings().getType());
+
+                                try {
+                                    runnerHelper.run(kieContainer,
+                                            scenarioRunnerDTO.getSimulationModelDescriptor(),
+                                            testDescriptor.getScenarioWithIndex(),
+                                            expressionEvaluatorFactory,
+                                            kieContainer.getClassLoader(),
+                                            new ScenarioRunnerData(),
+                                            scenarioRunnerDTO.getSettings(),
+                                            scenarioRunnerDTO.getBackground());
+
+                                    LOGGER.debug("{} scenario successful", testSuiteDescriptor.getDisplayName());
+                                    listener.executionFinished(testDescriptor, TestExecutionResult.successful());
+                                } catch (Exception e) {
+                                    LOGGER.debug("{} scenario failed", testSuiteDescriptor.getDisplayName());
+                                    listener.executionFinished(testDescriptor,
+                                            TestExecutionResult.failed(defineFailureException(e,
+                                                    testDescriptor.getScenarioWithIndex().getIndex(),
+                                                    testDescriptor.getScenarioWithIndex().getScesimData().getDescription(),
+                                                    testSuiteDescriptor.getDisplayName())));
+                                }
+                            });
+                    LOGGER.debug("{} Test Scenario suite executed", testSuiteDescriptor.getDisplayName());
+                    listener.executionFinished(testSuiteDescriptor, TestExecutionResult.successful());
+                });
+    }
+
+    static void appendTestSuites(Class<?> javaClass, TestDescriptor engineDescriptor) {
+        if (AnnotationSupport.isAnnotated(javaClass, TestScenarioActivator.class)) {
+            LOGGER.debug("A class with @TestScenarioActivator annotation found: {}", javaClass.getCanonicalName());
+
+            getScesimFileAbsolutePaths().stream().map(TestScenarioEngine::parseFile).forEach(scenarioRunnerDTO -> {
+                String fileName = getScesimFileName(scenarioRunnerDTO.getFileName());
+                TestScenarioTestSuiteDescriptor suite = new TestScenarioTestSuiteDescriptor(engineDescriptor, javaClass, fileName, scenarioRunnerDTO);
+                engineDescriptor.addChild(suite);
+                scenarioRunnerDTO.getScenarioWithIndices().forEach(scenarioWithIndex ->
+                        suite.addChild(new TestScenarioTestDescriptor(suite, javaClass, fileName, scenarioWithIndex))
+                );
+            });
+        }
+    }
+
+    static List<String> getScesimFileAbsolutePaths() {
+        try (Stream<Path> fileStream = Files.walk(Paths.get("."))) {
+            LOGGER.debug("Scanning Test Scenario (*.scesim) files");
+            List<String> scesimFileAbsolutePaths = fileStream.filter(TestScenarioEngine::filterResource)
+                    .map(Path::normalize)
+                    .map(Path::toFile)
+                    .map(File::getAbsolutePath)
+                    .toList();
+
+            LOGGER.debug("Found Test Scenario (*.scesim) {} files", scesimFileAbsolutePaths.size());
+            scesimFileAbsolutePaths.forEach(LOGGER::debug);
+
+            return scesimFileAbsolutePaths;
+        } catch (IOException e) {
+            LOGGER.error("Error scanning Test Scenario (*.scesim)", e);
+            return Collections.emptyList();
+        }
+    }
+
+    static String getScesimFileName(String fileFullPath) {
+        int idx = fileFullPath.replace("\\", "/").lastIndexOf('/');
+        String fileName = idx >= 0 ? fileFullPath.substring(idx + 1) : fileFullPath;
+        return fileName.endsWith(ConstantsHolder.SCESIM_EXTENSION) ?
+                fileName.substring(0, fileName.lastIndexOf(ConstantsHolder.SCESIM_EXTENSION)) :
+                fileName;
+    }
+
+    static boolean filterResource(Path path) {
+        return path.toString().endsWith(".scesim") &&
+                !path.toAbsolutePath().toString().replace("\\", "/").contains("/target/") &&
+                Files.isRegularFile(path);
+    }
+
+    static ScenarioRunnerDTO parseFile(String path) {
+        try (final Scanner scanner = new Scanner(new File(path))) {
+            String rawFile = scanner.useDelimiter("\\Z").next();
+            ScenarioSimulationModel scenarioSimulationModel = XML_READER.unmarshal(rawFile);
+            return new ScenarioRunnerDTO(scenarioSimulationModel, path);
+        } catch (FileNotFoundException e) {
+            throw new ScenarioException("File not found, this should not happen: " + path, e);
+        } catch (Exception e) {
+            throw new ScenarioException("Issue on parsing file: " + path, e);
+        }
+    }
+
+    static AbstractRunnerHelper getRunnerHelper(ScenarioSimulationModel.Type type) {
+        if (ScenarioSimulationModel.Type.RULE.equals(type)) {
+            return new RuleScenarioRunnerHelper();
+        } else if (ScenarioSimulationModel.Type.DMN.equals(type)) {
+            return new DMNScenarioRunnerHelper();
+        } else {
+            throw new IllegalArgumentException("Impossible to run simulation of type " + type);
+        }
+    }
+
+    /**
+     * This is required to differentiate tests FAILURES with test ERRORS. In case of a Test failure, an
+     * AssertionError should be thrown, in case of a Test Error, an Exception should be thrown.
+     */
+    static Throwable defineFailureException(Exception e, int index, String scenarioName, String fileName) {
+        if (e instanceof ScenarioException scenarioException && scenarioException.isFailedAssertion()) {
+            return new IndexedScenarioAssertionError(index, scenarioName, fileName, e);
+        } else {
+            return new IndexedScenarioException(index, scenarioName, fileName, e);
+        }
+    }
+}
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/TestScenarioTestDescriptor.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/TestScenarioTestDescriptor.java
new file mode 100644
index 0000000000..50a28ba96b
--- /dev/null
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/TestScenarioTestDescriptor.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.drools.scenariosimulation.backend.runner;
+
+import org.drools.scenariosimulation.api.model.ScenarioWithIndex;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
+import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestScenarioTestDescriptor extends AbstractTestDescriptor {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestScenarioTestDescriptor.class);
+
+    private final ScenarioWithIndex scenarioWithIndex;
+
+    public TestScenarioTestDescriptor(TestDescriptor testSuiteDescriptor,
+                                      Class<?> javaClass,
+                                      String fileName,
+                                      ScenarioWithIndex scenarioWithIndex) {
+        super(testSuiteDescriptor.getUniqueId().append("scenario", String.valueOf(scenarioWithIndex.getIndex())),
+                String.format("#%d: %s", scenarioWithIndex.getIndex(), scenarioWithIndex.getScesimData().getDescription()),
+                ClassSource.from(javaClass));
+        this.scenarioWithIndex = scenarioWithIndex;
+        setParent(testSuiteDescriptor);
+        LOGGER.debug("TestScenarioTestDescriptor created scenario index: {}, fileName: {}", scenarioWithIndex.getIndex(), fileName);
+    }
+
+    @Override
+    public Type getType() {
+        return Type.TEST;
+    }
+
+    public ScenarioWithIndex getScenarioWithIndex() {
+        return scenarioWithIndex;
+    }
+}
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/TestScenarioTestSuiteDescriptor.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/TestScenarioTestSuiteDescriptor.java
new file mode 100644
index 0000000000..7c1cded4f0
--- /dev/null
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/runner/TestScenarioTestSuiteDescriptor.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.drools.scenariosimulation.backend.runner;
+
+import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
+import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerDTO;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
+import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestScenarioTestSuiteDescriptor extends AbstractTestDescriptor {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestScenarioTestSuiteDescriptor.class);
+
+    private final ScenarioRunnerDTO scenarioRunnerDTO;
+
+    public TestScenarioTestSuiteDescriptor(TestDescriptor engineDescriptor,
+                                           Class<?> activatorJavaClass,
+                                           String fileName,
+                                           ScenarioRunnerDTO scenarioRunnerDTO) {
+        super(engineDescriptor.getUniqueId().append("scesim", fileName),
+                fileName,
+                ClassSource.from(activatorJavaClass));
+        setParent(engineDescriptor);
+        this.scenarioRunnerDTO = scenarioRunnerDTO;
+        LOGGER.debug("TestScenarioSuite created fileName: {} and added in {}", fileName, engineDescriptor.getDisplayName());
+    }
+
+    @Override
+    public Type getType() {
+        return Type.CONTAINER;
+    }
+
+    public ScenarioRunnerDTO getScenarioRunnerDTO() {
+        return scenarioRunnerDTO;
+    }
+
+    public ScenarioSimulationModel.Type getTestScenarioType() {
+        return scenarioRunnerDTO.getSettings().getType();
+    }
+}
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine
new file mode 100644
index 0000000000..1656e5a3f9
--- /dev/null
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+org.drools.scenariosimulation.backend.runner.TestScenarioEngine
\ No newline at end of file
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/TestUtils.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/TestUtils.java
index 4c136994e0..6b3bf035c6 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/TestUtils.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/TestUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.Random;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import org.drools.scenariosimulation.api.model.AuditLogLine;
@@ -56,11 +55,23 @@ public class TestUtils {
         return new String(Files.readAllBytes(sourceFile.toPath()));
     }
 
+    public static String getFilePath(String fileName) {
+        String extension = fileName.substring(fileName.lastIndexOf(".") + 1);
+        String filePath = ResourceHelper.getResourcesByExtension(extension)
+                .stream()
+                .filter(path -> path.endsWith(fileName))
+                .findFirst()
+                .orElse(null);
+        assertThat(filePath).isNotNull();
+
+        return filePath;
+    }
+
     public static List<DMNMessage> getRandomlyGeneratedDMNMessageList() {
         return IntStream.range(0, 5).mapToObj(index -> {
             Message.Level level = Message.Level.values()[new Random().nextInt(Message.Level.values().length)];
             return createDMNMessageMock("dmnMessage-" + index, level);
-        }).collect(Collectors.toList());
+        }).toList();
     }
 
     public static void commonCheckAuditLogLine(AuditLogLine toCheck, String expectedDecisionOrRuleName, String expectedResult, String expectedMessage) {
@@ -76,7 +87,6 @@ public class TestUtils {
         assertThat(toCheck.getResult()).isEqualTo(expectedResult);
         assertThat(toCheck.getMessage()).isNotPresent();
     }
-    
 
     private static DMNMessage createDMNMessageMock(String text, Message.Level level) {
         DMNMessage dmnMessageMock = mock(DMNMessage.class);
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/AbstractExpressionEvaluatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/AbstractExpressionEvaluatorTest.java
index 90e63353bb..88486d271e 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/AbstractExpressionEvaluatorTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/AbstractExpressionEvaluatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -33,14 +33,14 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 
 import org.assertj.core.api.Condition;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
 
-public class AbstractExpressionEvaluatorTest {
+class AbstractExpressionEvaluatorTest {
 
     private static final JsonNodeFactory factory = JsonNodeFactory.instance;
     private AbstractExpressionEvaluator expressionEvaluator;
@@ -48,27 +48,27 @@ public class AbstractExpressionEvaluatorTest {
 	private Condition<ExpressionEvaluatorResult> successful= new Condition<>(x -> x.isSuccessful(), "isSuccessful");
 	private Condition<ExpressionEvaluatorResult> notSuccessful= new Condition<>(x -> !x.isSuccessful(), "isSuccessful");
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         expressionEvaluator = new FakeExpressionEvaluator();
     }
     
     @Test
-    public void evaluateLiteralExpression() {
+    void evaluateLiteralExpression() {
         assertThat(expressionEvaluator.evaluateLiteralExpression(null, String.class.getCanonicalName(), null)).isNull();
         assertThat(expressionEvaluator.evaluateLiteralExpression(null, List.class.getCanonicalName(), null)).isNull();
         assertThat(expressionEvaluator.evaluateLiteralExpression(null, Map.class.getCanonicalName(), null)).isNull();
     }
 
     @Test
-    public void evaluateUnaryExpression() {
+    void evaluateUnaryExpression() {
         assertThat(expressionEvaluator.evaluateUnaryExpression(null, null, String.class)).is(successful);
         assertThat(expressionEvaluator.evaluateUnaryExpression(null, null, Map.class)).is(successful);
         assertThat(expressionEvaluator.evaluateUnaryExpression(null, null, List.class)).is(successful);
     }
 
     @Test
-    public void convertList() {
+    void convertList() {
         ArrayNode jsonNodes = new ArrayNode(factory);
         ObjectNode objectNode = new ObjectNode(factory);
         objectNode.put(VALUE, "data");
@@ -80,7 +80,7 @@ public class AbstractExpressionEvaluatorTest {
     }
 
     @Test
-    public void convertObject_simpleList() {
+    void convertObject_simpleList() {
         ObjectNode objectNode = new ObjectNode(factory);
         objectNode.put("key1", "Polissena");
         objectNode.put("key2", "Antonia");
@@ -93,9 +93,8 @@ public class AbstractExpressionEvaluatorTest {
         assertThat(resultMap).hasSize(2).containsEntry("key1", "Polissena").containsEntry("key2", "Antonia");
     }
 
-    
     @Test
-    public void convertObject_singleLevel() {
+    void convertObject_singleLevel() {
         ObjectNode objectNode = new ObjectNode(factory);
         objectNode.put("age", "1");
         objectNode.put("name", "FS");
@@ -109,7 +108,7 @@ public class AbstractExpressionEvaluatorTest {
     }
     
     @Test
-    public void convertObject_nestedObject() {
+    void convertObject_nestedObject() {
         ObjectNode objectNode = new ObjectNode(factory);
         ObjectNode nestedObject = new ObjectNode(factory);
         objectNode.set("nested", nestedObject);
@@ -127,7 +126,7 @@ public class AbstractExpressionEvaluatorTest {
     }
     
     @Test
-    public void convertObject_nestedList() {
+    void convertObject_nestedList() {
         ObjectNode objectNode = new ObjectNode(factory);
         ArrayNode jsonNodes = new ArrayNode(factory);
         objectNode.set("listField", jsonNodes);
@@ -148,12 +147,12 @@ public class AbstractExpressionEvaluatorTest {
     }
 
     @Test
-    public void isSimpleTypeNode_emptyNode() {
+    void isSimpleTypeNode_emptyNode() {
         assertThat(expressionEvaluator.isSimpleTypeNode(new ArrayNode(factory))).isFalse();
     }
     
     @Test
-    public void isSimpleTypeNode_nodeWithValueField() {
+    void isSimpleTypeNode_nodeWithValueField() {
         ObjectNode jsonNode = new ObjectNode(factory);
         jsonNode.set(VALUE, new TextNode("test"));
 
@@ -161,7 +160,7 @@ public class AbstractExpressionEvaluatorTest {
     }
 
     @Test
-    public void isSimpleTypeNode_nodeWithValueFieldAndOtherField() {
+    void isSimpleTypeNode_nodeWithValueFieldAndOtherField() {
         ObjectNode jsonNode = new ObjectNode(factory);
         jsonNode.set(VALUE, new TextNode("test"));
 
@@ -169,7 +168,7 @@ public class AbstractExpressionEvaluatorTest {
     }
 
     @Test
-    public void isSimpleTypeNode_nodeWithOtherField() {
+    void isSimpleTypeNode_nodeWithOtherField() {
         ObjectNode jsonNode = new ObjectNode(factory);
         jsonNode.set("otherField", new TextNode("testValue"));
         jsonNode.set(VALUE, new TextNode("test"));
@@ -178,14 +177,14 @@ public class AbstractExpressionEvaluatorTest {
     }
     
     @Test
-    public void getSimpleTypeNodeTextValue_noSimpleTypeCausesException() {
+    void getSimpleTypeNodeTextValue_noSimpleTypeCausesException() {
         assertThatThrownBy(() -> expressionEvaluator.getSimpleTypeNodeTextValue(new ArrayNode(factory)))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("Parameter does not contains a simple type");
     }
 
     @Test
-    public void getSimpleTypeNodeTextValue_textNode() {
+    void getSimpleTypeNodeTextValue_textNode() {
         ObjectNode jsonNode = new ObjectNode(factory);
         jsonNode.set(VALUE, new TextNode("testValue"));
 
@@ -193,7 +192,7 @@ public class AbstractExpressionEvaluatorTest {
     }
     
     @Test
-    public void getSimpleTypeNodeTextValue_intNode() {
+    void getSimpleTypeNodeTextValue_intNode() {
         ObjectNode jsonNode = new ObjectNode(factory);
         jsonNode.set(VALUE, new IntNode(10));
 
@@ -201,21 +200,21 @@ public class AbstractExpressionEvaluatorTest {
     }
     
     @Test
-    public void isNodeEmpty_objectNode() {
+    void isNodeEmpty_objectNode() {
         ObjectNode objectNode = new ObjectNode(factory);
         
         assertThat(expressionEvaluator.isNodeEmpty(objectNode)).isTrue();
     }
 
     @Test
-    public void isNodeEmpty_arrayNode() {
+    void isNodeEmpty_arrayNode() {
         ArrayNode arrayNode = new ArrayNode(factory);
 
         assertThat(expressionEvaluator.isNodeEmpty(arrayNode)).isTrue();
     }
 
     @Test
-    public void isNodeEmpty_objectNodeWithArrayNode() {
+    void isNodeEmpty_objectNodeWithArrayNode() {
         ObjectNode objectNode = new ObjectNode(factory);
         objectNode.set("empty array", new ArrayNode(factory));
 
@@ -223,7 +222,7 @@ public class AbstractExpressionEvaluatorTest {
     }
 
     @Test
-    public void isNodeEmpty_objectNodeWithTextNode() {
+    void isNodeEmpty_objectNodeWithTextNode() {
         ObjectNode objectNode = new ObjectNode(factory);
         objectNode.set("key", new TextNode(VALUE));
 
@@ -232,7 +231,7 @@ public class AbstractExpressionEvaluatorTest {
     
 
     @Test
-    public void isNodeEmpty_arrayNodeWithTextNode() {
+    void isNodeEmpty_arrayNodeWithTextNode() {
         ArrayNode arrayNode = new ArrayNode(factory);
         arrayNode.add(new TextNode(VALUE));
         
@@ -240,7 +239,7 @@ public class AbstractExpressionEvaluatorTest {
     }
     
     @Test
-    public void isNodeEmpty_textNode() {
+    void isNodeEmpty_textNode() {
         assertThat(expressionEvaluator.isNodeEmpty(new TextNode(""))).isTrue();
         assertThat(expressionEvaluator.isNodeEmpty(new TextNode(null))).isTrue();
         assertThat(expressionEvaluator.isNodeEmpty(new TextNode(VALUE))).isFalse();
@@ -248,14 +247,14 @@ public class AbstractExpressionEvaluatorTest {
     
     
     @Test
-    public void isListEmpty_noNode() {
+    void isListEmpty_noNode() {
         ArrayNode json = new ArrayNode(factory);
         
         assertThat(expressionEvaluator.isListEmpty(json)).isTrue();
     }
 
     @Test
-    public void isListEmpty_emptyNode() {
+    void isListEmpty_emptyNode() {
         ArrayNode json = new ArrayNode(factory);
         ObjectNode nestedNode = new ObjectNode(factory);
         json.add(nestedNode);
@@ -265,7 +264,7 @@ public class AbstractExpressionEvaluatorTest {
 
     
     @Test
-    public void isListEmpty_nodeWithEmptyField() {
+    void isListEmpty_nodeWithEmptyField() {
         ArrayNode json = new ArrayNode(factory);
         ObjectNode nestedNode = new ObjectNode(factory);
         json.add(nestedNode);
@@ -275,7 +274,7 @@ public class AbstractExpressionEvaluatorTest {
     }
     
     @Test
-    public void isListEmpty_nodeWithNonEmptyField() {
+    void isListEmpty_nodeWithNonEmptyField() {
         ArrayNode json = new ArrayNode(factory);
         ObjectNode nestedNode = new ObjectNode(factory);
         json.add(nestedNode);
@@ -286,14 +285,14 @@ public class AbstractExpressionEvaluatorTest {
     
 
     @Test
-    public void isObjectEmpty_nodeWithNoField() {
+    void isObjectEmpty_nodeWithNoField() {
         ObjectNode json = new ObjectNode(factory);
 
         assertThat(expressionEvaluator.isObjectEmpty(json)).isTrue();
     }
     
     @Test
-    public void isObjectEmpty_nodeWithEmptyField() {
+    void isObjectEmpty_nodeWithEmptyField() {
         ObjectNode json = new ObjectNode(factory);
         ObjectNode nestedNode = new ObjectNode(factory);
         json.set("emptyField", nestedNode);
@@ -302,7 +301,7 @@ public class AbstractExpressionEvaluatorTest {
     }
     
     @Test
-    public void isObjectEmpty_nodeWithNonEmptyField() {
+    void isObjectEmpty_nodeWithNonEmptyField() {
         ObjectNode json = new ObjectNode(factory);
         ObjectNode nestedNode = new ObjectNode(factory);
         json.set("emptyField", nestedNode);
@@ -313,14 +312,14 @@ public class AbstractExpressionEvaluatorTest {
 
 
     @Test
-    public void isEmptyText() {
+    void isEmptyText() {
         assertThat(expressionEvaluator.isEmptyText(new TextNode(""))).isTrue();
         assertThat(expressionEvaluator.isEmptyText(new TextNode(VALUE))).isFalse();
         assertThat(expressionEvaluator.isEmptyText(new ObjectNode(factory))).isTrue();
     }
 
     @Test
-    public void isStructuredInput() {
+    void isStructuredInput() {
         assertThat(expressionEvaluator.isStructuredInput(List.class.getCanonicalName())).isTrue();
         assertThat(expressionEvaluator.isStructuredInput(ArrayList.class.getCanonicalName())).isTrue();
         assertThat(expressionEvaluator.isStructuredInput(LinkedList.class.getCanonicalName())).isTrue();
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionEvaluatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionEvaluatorTest.java
index 1119fd76bd..a7caf301d7 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionEvaluatorTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionEvaluatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -26,29 +26,29 @@ import java.util.Map;
 
 import com.fasterxml.jackson.databind.node.TextNode;
 import org.drools.scenariosimulation.backend.model.ListMapClass;
-import org.junit.Before;
-import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import org.assertj.core.api.Condition;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-public class BaseExpressionEvaluatorTest {
+class BaseExpressionEvaluatorTest {
 	
-	private Condition<ExpressionEvaluatorResult> successful= new Condition<>(x -> x.isSuccessful(), "isSuccessful");
-	private Condition<ExpressionEvaluatorResult> notSuccessful= new Condition<>(x -> !x.isSuccessful(), "isNotSuccessful");
+	private final Condition<ExpressionEvaluatorResult> successful = new Condition<>(x -> x.isSuccessful(), "isSuccessful");
+	private final Condition<ExpressionEvaluatorResult> notSuccessful = new Condition<>(x -> !x.isSuccessful(), "isNotSuccessful");
 
-    private final static ClassLoader classLoader = BaseExpressionEvaluatorTest.class.getClassLoader();
+    private static final ClassLoader classLoader = BaseExpressionEvaluatorTest.class.getClassLoader();
     private AbstractExpressionEvaluator expressionEvaluator;
     
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
     	expressionEvaluator = new BaseExpressionEvaluator(classLoader);
     }
 
     @Test
-    public void evaluateLiteralExpression() {
+    void evaluateLiteralExpression() {
         assertThat(expressionEvaluator.evaluateLiteralExpression("", Object.class.getCanonicalName(), List.of())).isEqualTo("");
 
         assertThat(expressionEvaluator.evaluateLiteralExpression("SimpleString", String.class.getCanonicalName(), List.of())).isEqualTo("SimpleString");
@@ -59,7 +59,7 @@ public class BaseExpressionEvaluatorTest {
     }
 
     @Test
-    public void createObject() {
+    void createObject() {
         assertThat(expressionEvaluator.createObject(String.class.getCanonicalName(), List.of())).isNotNull();
         assertThat(expressionEvaluator.createObject(Map.class.getCanonicalName(), List.of(String.class.getCanonicalName(), String.class.getCanonicalName()))).isInstanceOf(Map.class);
 
@@ -68,13 +68,13 @@ public class BaseExpressionEvaluatorTest {
     }
 
     @Test
-    public void verifyNullTest() {
+    void verifyNullTest() {
         assertThat(expressionEvaluator.verifyResult("[]", null, null)).is(successful);
         assertThat(expressionEvaluator.verifyResult("[{\"value\" : \"result\"}]", null, null)).is(notSuccessful);
     }
 
     @Test
-    public void nullResultTest() {
+    void nullResultTest() {
         assertThat(expressionEvaluator.evaluateUnaryExpression("> 1", null, null)).is(notSuccessful);
         assertThat(expressionEvaluator.evaluateUnaryExpression("", null, null)).is(successful);
         assertThat(expressionEvaluator.evaluateUnaryExpression(null, null, null)).is(successful);
@@ -86,7 +86,7 @@ public class BaseExpressionEvaluatorTest {
         assertThat(expressionEvaluator.evaluateUnaryExpression(mapOfListJson, Map.of(), Map.class)).is(notSuccessful);
     }
     
-    public void convertResult_list() {
+    void convertResult_list() {
         String listJsonString = "[{\"value\" : \"10\"}, {\"value\" : \"12\"}]";
 
         List<Integer> result = (List<Integer>) expressionEvaluator.convertResult(listJsonString, List.class.getCanonicalName(), List.of(Integer.class.getCanonicalName()));
@@ -96,7 +96,7 @@ public class BaseExpressionEvaluatorTest {
     }
     
     @Test
-    public void convertResult_mapOfStringToString() {
+    void convertResult_mapOfStringToString() {
         List<String> genericClasses = List.of(String.class.getCanonicalName(), String.class.getCanonicalName());
         String givenWorkbenchMapString = "{ \"Home\": { \"value\": \"123 Any Street\" } }";
 
@@ -106,7 +106,7 @@ public class BaseExpressionEvaluatorTest {
     }
     
     @Test
-    public void evaluateUnaryExpression_mapOfStringToString() {
+    void evaluateUnaryExpression_mapOfStringToString() {
         String stringToString = "{\"key1\" : {\"value\" : \"value1\"}, \"key2\" : {\"value\" : \"value2\"}}";
 
         assertThat(expressionEvaluator.evaluateUnaryExpression(stringToString, Map.of("key1", "value1"), Map.class)).is(notSuccessful);
@@ -114,7 +114,7 @@ public class BaseExpressionEvaluatorTest {
     }
     
     @Test
-    public void evaluateUnaryExpression_mapOfStringToString_empty() {
+    void evaluateUnaryExpression_mapOfStringToString_empty() {
         String mapOfStringJson1 = "{\"key1\" : {\"value\" : \"\"}}";
 
         assertThat(expressionEvaluator.evaluateUnaryExpression(mapOfStringJson1, Map.of(), Map.class)).is(successful);
@@ -123,7 +123,7 @@ public class BaseExpressionEvaluatorTest {
 
     
     @Test
-    public void convertResult_mapOfStringToInteger() {
+    void convertResult_mapOfStringToInteger() {
         List<String> genericClasses = List.of(String.class.getCanonicalName(), Integer.class.getCanonicalName());
         String givenWorkbenchMapInteger = "{ \"Home\": { \"value\": \"100\" } }";
 
@@ -136,7 +136,7 @@ public class BaseExpressionEvaluatorTest {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void convertResult_listMapToString() {
+    void convertResult_listMapToString() {
         String mapJsonString = "{\"first\": {\"name\": \"John\"}}";
 
         Map<String, ListMapClass> parsedMap = (Map<String, ListMapClass>) expressionEvaluator.convertResult(mapJsonString, Map.class.getCanonicalName(),
@@ -148,7 +148,7 @@ public class BaseExpressionEvaluatorTest {
     
     @SuppressWarnings("unchecked")
     @Test
-    public void convertResult_listMapToList() {
+    void convertResult_listMapToList() {
         String mapJsonString = "{\"first\": {\"siblings\": [{\"name\" : \"John\"}]}}";
         
         Map<String, ListMapClass> parsedMap = (Map<String, ListMapClass>) expressionEvaluator.convertResult(mapJsonString, Map.class.getCanonicalName(),
@@ -160,7 +160,7 @@ public class BaseExpressionEvaluatorTest {
     
     @SuppressWarnings("unchecked")
     @Test
-    public void convertResult_listMapToListMap() {
+    void convertResult_listMapToListMap() {
         String mapJsonString = "{\"first\": {\"phones\": {\"number\" : \"1\"}}}";
 
         Map<String, ListMapClass> parsedMap = (Map<String, ListMapClass>) expressionEvaluator.convertResult(mapJsonString, Map.class.getCanonicalName(),
@@ -172,7 +172,7 @@ public class BaseExpressionEvaluatorTest {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void convertResult_listOfComplexTypes() {
+    void convertResult_listOfComplexTypes() {
 
         String listJsonString = "[{\"name\": \"John\"}, " +
                 "{\"name\": \"John\", \"names\" : [{\"value\": \"Anna\"}, {\"value\": \"Mario\"}]}]";
@@ -185,7 +185,7 @@ public class BaseExpressionEvaluatorTest {
     }
     
     @Test
-    public void verifyResult_mapOfMapsofMaps_successful() {
+    void verifyResult_mapOfMapsofMaps_successful() {
         String mapJsonString = "{\"first\": {\"phones\": {\"number\" : \"> 1\"}}}";
 
         Map<String, ListMapClass> toCheck = new HashMap<>();
@@ -199,7 +199,7 @@ public class BaseExpressionEvaluatorTest {
     }
 
     @Test
-    public void verifyResult_mapOfMapsofMaps_notSuccessful() {
+    void verifyResult_mapOfMapsofMaps_notSuccessful() {
         String mapJsonString = "{\"first\": {\"phones\": {\"number\" : \"> 1\"}}}";
 
         Map<String, ListMapClass> toCheck = new HashMap<>();
@@ -215,7 +215,7 @@ public class BaseExpressionEvaluatorTest {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void verifyResult_listOfComplexTypeTest_success() {
+    void verifyResult_listOfComplexTypeTest_success() {
 
         String listJsonString = "[{\"name\": \"John\"}, " +
                 "{\"name\": \"John\", \"names\" : [{\"value\": \"Anna\"}, {\"value\": \"Mario\"}]}]";
@@ -228,7 +228,7 @@ public class BaseExpressionEvaluatorTest {
     
     @SuppressWarnings("unchecked")
     @Test
-    public void verifyResult_listOfComplexTypeTest_failure() {
+    void verifyResult_listOfComplexTypeTest_failure() {
         String listJsonString = "[{\"name\": \"John\"}, " +
                 "{\"name\": \"John\", \"names\" : [{\"value\": \"Anna\"}, {\"value\": \"Mario\"}]}]";
 
@@ -240,7 +240,7 @@ public class BaseExpressionEvaluatorTest {
     }
     
     @Test
-    public void verifyResult_mapOfStringToInteger() {
+    void verifyResult_mapOfStringToInteger() {
         String expectWorkbenchMapInteger = "{ \"Home\": { \"value\": \"> 100\" } }";
 
         assertThat(expressionEvaluator.verifyResult(expectWorkbenchMapInteger, Map.of("Home", 120), null)).is(successful);
@@ -248,7 +248,7 @@ public class BaseExpressionEvaluatorTest {
     }    
     
     @Test
-    public void listOfSimpleTypeTest() {
+    void listOfSimpleTypeTest() {
         assertThat(expressionEvaluator.verifyResult("[{\"value\" : \"> 10\"}]", List.of(13), null)).is(successful);
 
         assertThat(expressionEvaluator.verifyResult("[{\"value\" : \"> 100\"}]", List.of(13), null)).is(notSuccessful);
@@ -257,7 +257,7 @@ public class BaseExpressionEvaluatorTest {
     }
 
     @Test
-    public void expressionListVerifyResultTest() {
+    void expressionListVerifyResultTest() {
         String expressionCollectionJsonString = new TextNode("10").toString();
         List<BigDecimal> contextValue = List.of(BigDecimal.valueOf(10));
         
@@ -265,7 +265,7 @@ public class BaseExpressionEvaluatorTest {
     }
 
     @Test
-    public void expressionMapVerifyResultTest() {
+    void expressionMapVerifyResultTest() {
         String expressionCollectionJsonString = new TextNode("{key_a : 1}").toString();
         Map<String, BigDecimal> contextValue = Map.of("key_a", BigDecimal.valueOf(1));
         
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionOperatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionOperatorTest.java
index 0007577ef1..b311d927b6 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionOperatorTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionOperatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,7 +21,7 @@ package org.drools.scenariosimulation.backend.expression;
 import java.time.LocalDate;
 import java.util.Arrays;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -32,20 +32,20 @@ import static org.drools.scenariosimulation.backend.expression.BaseExpressionOpe
 import static org.drools.scenariosimulation.backend.expression.BaseExpressionOperator.RANGE;
 import static org.drools.scenariosimulation.backend.expression.BaseExpressionOperator.values;
 
-public class BaseExpressionOperatorTest {
+class BaseExpressionOperatorTest {
 
     private static final ClassLoader classLoader = BaseExpressionOperatorTest.class.getClassLoader();
 
     @Test
-    public void evaluateLiteralExpression() {
+    void evaluateLiteralExpression() {
         Arrays.stream(values())
                 .filter(e -> !EQUALS.equals(e))
-                .forEach(operator -> {
+                .forEach(operator ->
                     assertThatThrownBy(
                             () -> operator.evaluateLiteralExpression(String.class.getCanonicalName(), " Test ", classLoader))
                             .isInstanceOf(IllegalStateException.class)
-                            .hasMessageEndingWith(" operator cannot be used in a GIVEN clause");
-                });
+                            .hasMessageEndingWith(" operator cannot be used in a GIVEN clause")
+                );
 
         assertThat(EQUALS.evaluateLiteralExpression(String.class.getName(), "= Test", classLoader)).isEqualTo("Test");
         assertThat(EQUALS.evaluateLiteralExpression(String.class.getName(), "= ", classLoader)).isEqualTo("");
@@ -61,7 +61,7 @@ public class BaseExpressionOperatorTest {
     }
 
     @Test
-    public void findOperator() {
+    void findOperator() {
         assertThat(BaseExpressionOperator.findOperator("Test")).isEqualTo(EQUALS);
         assertThat(BaseExpressionOperator.findOperator(" Test ")).isEqualTo(EQUALS);
         assertThat(BaseExpressionOperator.findOperator("= Test ")).isEqualTo(EQUALS);
@@ -69,7 +69,7 @@ public class BaseExpressionOperatorTest {
     }
 
     @Test
-    public void equalsTest() {
+    void equalsTest() {
         String test1 = "2019-12-02";
         LocalDate test2 = LocalDate.of(2019, 12, 2);
 
@@ -82,7 +82,7 @@ public class BaseExpressionOperatorTest {
     }
 
     @Test
-    public void notEqualsTest() {
+    void notEqualsTest() {
         String test1 = "2019-12-02";
         LocalDate test2 = LocalDate.of(2019, 12, 2);
 
@@ -99,14 +99,14 @@ public class BaseExpressionOperatorTest {
     }
 
     @Test
-    public void rangeTest() {
+    void rangeTest() {
         assertThat(RANGE.eval("", "test", String.class, classLoader)).isFalse();
 
         assertThat(RANGE.eval(">2", 3, int.class, classLoader)).isTrue();
     }
 
     @Test
-    public void listOfValuesTest() {
+    void listOfValuesTest() {
         assertThat(LIST_OF_VALUES.eval("", "test", String.class, classLoader)).isFalse();
 
         assertThatThrownBy(() -> LIST_OF_VALUES.eval("[ 2", "", String.class, classLoader))
@@ -117,7 +117,7 @@ public class BaseExpressionOperatorTest {
     }
 
     @Test
-    public void listOfConditionsTest() {
+    void listOfConditionsTest() {
         assertThat(LIST_OF_CONDITION.eval("", "test", String.class, classLoader)).isFalse();
 
         assertThat(LIST_OF_CONDITION.eval("=1; ![2, 3]; <10", 1, int.class, classLoader)).isTrue();
@@ -131,7 +131,7 @@ public class BaseExpressionOperatorTest {
     }
 
     private static class OuterClass {
-        public enum InnerEnum {
+        enum InnerEnum {
             INNER_1,
             INNER_2
         }
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/DMNFeelExpressionEvaluatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/DMNFeelExpressionEvaluatorTest.java
index 08ef48a7c3..e5a5f97c81 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/DMNFeelExpressionEvaluatorTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/DMNFeelExpressionEvaluatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -33,8 +33,8 @@ import java.util.concurrent.atomic.AtomicReference;
 import com.fasterxml.jackson.databind.node.TextNode;
 
 import org.assertj.core.api.Condition;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.kie.dmn.api.feel.runtime.events.FEELEvent;
 import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity;
 import org.kie.dmn.feel.FEEL;
@@ -46,20 +46,20 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.entry;
 
-public class DMNFeelExpressionEvaluatorTest {
+class DMNFeelExpressionEvaluatorTest {
 	
-	private Condition<ExpressionEvaluatorResult> successful= new Condition<>(x -> x.isSuccessful(), "isSuccessful");
-	private Condition<ExpressionEvaluatorResult> notSuccessful= new Condition<>(x -> !x.isSuccessful(), "isNotSuccessful");
+	private final Condition<ExpressionEvaluatorResult> successful = new Condition<>(x -> x.isSuccessful(), "isSuccessful");
+	private final Condition<ExpressionEvaluatorResult> notSuccessful = new Condition<>(x -> !x.isSuccessful(), "isNotSuccessful");
 
     private DMNFeelExpressionEvaluator expressionEvaluator;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
     	expressionEvaluator = new DMNFeelExpressionEvaluator(this.getClass().getClassLoader());
     }
     
     @Test
-    public void evaluateUnaryExpression_simpleResult() {
+    void evaluateUnaryExpression_simpleResult() {
         assertThat(expressionEvaluator.evaluateUnaryExpression("not( true )", false, boolean.class)).is(successful);
         
         assertThat(expressionEvaluator.evaluateUnaryExpression(">2, >5", BigDecimal.valueOf(6), BigDecimal.class)).is(successful);
@@ -80,7 +80,7 @@ public class DMNFeelExpressionEvaluatorTest {
     }
     
     @Test
-    public void evaluateUnaryExpression_structuredResult_map() {
+    void evaluateUnaryExpression_structuredResult_map() {
         Map<String, BigDecimal> contextValue = Map.of("key_a", BigDecimal.valueOf(1));
         
         assertThat(expressionEvaluator.evaluateUnaryExpression("{key_a : 1}", contextValue, Map.class)).is(successful);
@@ -88,7 +88,7 @@ public class DMNFeelExpressionEvaluatorTest {
     }
     
     @Test
-    public void evaluateUnaryExpression_structuredResult_list() {
+    void evaluateUnaryExpression_structuredResult_list() {
         List<BigDecimal> contextListValue = List.of(BigDecimal.valueOf(23));
         
         assertThat(expressionEvaluator.evaluateUnaryExpression(new TextNode("23").toString(), contextListValue, List.class)).is(successful);
@@ -108,7 +108,7 @@ public class DMNFeelExpressionEvaluatorTest {
     }
     
     @Test
-    public void evaluateUnaryExpression_structuredResult_listOfMaps() {
+    void evaluateUnaryExpression_structuredResult_listOfMaps() {
         Map<String, Object> firstMap = Map.of("Price", new BigDecimal(2000), "Name", "PC");
         Map<String, Object> secondMap = Map.of("Price", new BigDecimal(3300), "Name", "CAR");
         List<Map<String, Object>> context = List.of(firstMap, secondMap);
@@ -131,7 +131,7 @@ public class DMNFeelExpressionEvaluatorTest {
     }
     
     @Test
-    public void evaluateUnaryExpression_exceptions() {
+    void evaluateUnaryExpression_exceptions() {
         assertThatThrownBy(() -> expressionEvaluator.evaluateUnaryExpression("variable", null, null))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessageStartingWith("Error during evaluation:");
@@ -145,13 +145,13 @@ public class DMNFeelExpressionEvaluatorTest {
     }
 
     @Test
-    public void evaluateLiteralExpression_arithmeticExpression() {
+    void evaluateLiteralExpression_arithmeticExpression() {
         assertThat(expressionEvaluator.evaluateLiteralExpression("2 + 3", BigDecimal.class.getCanonicalName(), null)).isEqualTo(BigDecimal.valueOf(5));
     }
 
     @SuppressWarnings("unchecked")
     @Test
-    public void evaluateLiteralExpression_listExpression() {
+    void evaluateLiteralExpression_listExpression() {
         List<BigDecimal> parsedValueListExpression = (List<BigDecimal>) expressionEvaluator.evaluateLiteralExpression(new TextNode("[10, 12]").toString(), List.class.getCanonicalName(), List.of());
         
         assertThat(parsedValueListExpression).hasSize(2).containsExactly(BigDecimal.valueOf(10), BigDecimal.valueOf(12));
@@ -159,7 +159,7 @@ public class DMNFeelExpressionEvaluatorTest {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void evaluateLiteralExpression_mapExpression() {
+    void evaluateLiteralExpression_mapExpression() {
         assertThat(expressionEvaluator.evaluateLiteralExpression("2 + 3", BigDecimal.class.getCanonicalName(), null)).isEqualTo(BigDecimal.valueOf(5));
         
         Map<String, Object> parsedValue = (Map<String, Object>) expressionEvaluator.evaluateLiteralExpression("{key_a : 1}", Map.class.getCanonicalName(), List.of());
@@ -168,7 +168,7 @@ public class DMNFeelExpressionEvaluatorTest {
     }
     
     @Test
-    public void evaluateLiteralExpression_exceptions() {
+    void evaluateLiteralExpression_exceptions() {
         assertThatThrownBy(() -> expressionEvaluator
                 .evaluateLiteralExpression("SPEED", String.class.getCanonicalName(), null))
                 .isInstanceOf(IllegalArgumentException.class)
@@ -181,7 +181,7 @@ public class DMNFeelExpressionEvaluatorTest {
     }
     
     @Test
-    public void evaluateLiteralExpression_now() {
+    void evaluateLiteralExpression_now() {
     // DROOLS-6337 today() and now() functions not evaluated correctly in Test Scenarios
         ZonedDateTime now = (ZonedDateTime) expressionEvaluator.evaluateLiteralExpression("now()", ZonedDateTime.class.getCanonicalName(), List.of()); 
         
@@ -190,7 +190,7 @@ public class DMNFeelExpressionEvaluatorTest {
     }
 
     @Test
-    public void evaluateLiteralExpression_today() {
+    void evaluateLiteralExpression_today() {
     // DROOLS-6337 today() and now() functions not evaluated correctly in Test Scenarios
         LocalDate today = (LocalDate) expressionEvaluator.evaluateLiteralExpression("today()", LocalDate.class.getCanonicalName(), List.of());
 
@@ -201,7 +201,7 @@ public class DMNFeelExpressionEvaluatorTest {
 
     @Test
     @SuppressWarnings("unchecked")
-    public void convertResult_list() {
+    void convertResult_list() {
         String listJsonString = new TextNode("[ 1, 10 ]").toString();
         List<BigDecimal> result = (List<BigDecimal>) expressionEvaluator.convertResult(listJsonString, List.class.getCanonicalName(), List.of());
         
@@ -209,24 +209,23 @@ public class DMNFeelExpressionEvaluatorTest {
     }
 
     @Test
-    public void convertResult_map() {
+    void convertResult_map() {
         String expressionCollectionJsonString = new TextNode("{ x : 5, y : 3 }").toString();
         Map<String, BigDecimal> result = (Map<String, BigDecimal>) expressionEvaluator.convertResult(expressionCollectionJsonString, Map.class.getCanonicalName(), List.of());
         
         assertThat(result).hasSize(2).containsEntry("x", BigDecimal.valueOf(5)).containsEntry("y", BigDecimal.valueOf(3));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void convertResult_map_fail() {
+    @Test
+    void convertResult_map_fail() {
         String expressionCollectionJsonString = new TextNode(": 5 y : 3 }").toString();
-        expressionEvaluator.convertResult(expressionCollectionJsonString, Map.class.getCanonicalName(), List.of());
+        assertThatThrownBy(() -> expressionEvaluator.convertResult(expressionCollectionJsonString, Map.class.getCanonicalName(), List.of())
+        ).isInstanceOf(IllegalArgumentException.class);
     }
-
-
     
     @SuppressWarnings("unchecked")
     @Test
-    public void convertResult_listOfMaps() {
+    void convertResult_listOfMaps() {
         String listOfMapsJsonString = new TextNode("[{age:10},{name:\"John\"}]").toString();
         List<Map<String, Object>> result =
                 (List<Map<String, Object>>) expressionEvaluator.convertResult(listOfMapsJsonString,
@@ -240,7 +239,7 @@ public class DMNFeelExpressionEvaluatorTest {
     
     @SuppressWarnings("unchecked")
     @Test
-    public void convertResult_listOfMaps_complexValues() {
+    void convertResult_listOfMaps_complexValues() {
         String listJsonString = "[{\"name\": \"\\\"John\\\"\"}, " +
                 "{\"name\": \"\\\"John\\\"\", \"names\" : [{\"value\": \"\\\"Anna\\\"\"}, {\"value\": \"\\\"Mario\\\"\"}]}]";
 
@@ -254,7 +253,7 @@ public class DMNFeelExpressionEvaluatorTest {
     
     @SuppressWarnings("unchecked")
     @Test
-    public void convertResult_mapOfMaps() {
+    void convertResult_mapOfMaps() {
         String mapJsonString = "{\"first\": {\"name\": \"\\\"John\\\"\"}}";
         Map<String, Map<String, Object>> parsedMap = (Map<String, Map<String, Object>>) expressionEvaluator
                 .convertResult(mapJsonString, Map.class.getCanonicalName(),
@@ -266,7 +265,7 @@ public class DMNFeelExpressionEvaluatorTest {
     
     @SuppressWarnings("unchecked")
     @Test
-    public void convertResult_mapOfMapsWithListOfMaps() {
+    void convertResult_mapOfMapsWithListOfMaps() {
     	String mapJsonString = "{\"first\": {\"siblings\": [{\"name\" : \"\\\"John\\\"\"}]}}";
     	Map<String, Map<String, Object>> parsedMap = (Map<String, Map<String, Object>>) expressionEvaluator
                 .convertResult(mapJsonString, Map.class.getCanonicalName(),
@@ -278,7 +277,7 @@ public class DMNFeelExpressionEvaluatorTest {
     
     @SuppressWarnings("unchecked")
     @Test
-    public void convertResult_mapOfMapsOfMaps() {
+    void convertResult_mapOfMapsOfMaps() {
     	String mapJsonString = "{\"first\": {\"phones\": {\"number\" : \"1\"}}}";
     	Map<String, Map<String, Object>> parsedMap = (Map<String, Map<String, Object>>) expressionEvaluator
                 .convertResult(mapJsonString, Map.class.getCanonicalName(),
@@ -289,14 +288,14 @@ public class DMNFeelExpressionEvaluatorTest {
     }
 
     @Test
-    public void convertResult_list_fail() {
+    void convertResult_list_fail() {
         String expressionCollectionJsonString = new TextNode("[ 1 : 234").toString();
         assertThatIllegalArgumentException().isThrownBy(() -> expressionEvaluator.convertResult(expressionCollectionJsonString, List.class.getCanonicalName(), List.of()));
     }
     
 
     @Test
-    public void fromObjectToExpression() {
+    void fromObjectToExpression() {
         assertThat(expressionEvaluator.fromObjectToExpression("Test")).isEqualTo("\"Test\"");
         assertThat(expressionEvaluator.fromObjectToExpression(false)).isEqualTo("false");
         assertThat(expressionEvaluator.fromObjectToExpression(BigDecimal.valueOf(1))).isEqualTo("1");
@@ -305,7 +304,7 @@ public class DMNFeelExpressionEvaluatorTest {
     }
 
     @Test
-    public void listener_notError() {
+    void listener_notError() {
         FEELEvent notError = new FEELEventBase(Severity.INFO, "info", null);
         AtomicReference<FEELEvent> error = new AtomicReference<>();
         FEEL feel = expressionEvaluator.newFeelEvaluator(error);
@@ -316,7 +315,7 @@ public class DMNFeelExpressionEvaluatorTest {
     }
     
     @Test
-    public void listener_singleSyntaxError() {
+    void listener_singleSyntaxError() {
         FEELEvent syntaxErrorEvent = new SyntaxErrorEvent(Severity.ERROR, "test", null, 0, 0, null);
         AtomicReference<FEELEvent> error = new AtomicReference<>();
         FEEL feel = expressionEvaluator.newFeelEvaluator(error);
@@ -327,7 +326,7 @@ public class DMNFeelExpressionEvaluatorTest {
     }   
     
     @Test
-    public void listener_sintaxErrorAsFirst() {
+    void listener_sintaxErrorAsFirst() {
         FEELEvent syntaxErrorEvent = new SyntaxErrorEvent(Severity.ERROR, "test", null, 0, 0, null);
         FEELEvent genericError = new FEELEventBase(Severity.ERROR, "error", null);
         AtomicReference<FEELEvent> error = new AtomicReference<>();
@@ -340,7 +339,7 @@ public class DMNFeelExpressionEvaluatorTest {
 
 
     @Test
-    public void listener_syntaxErrorAsSecond() {
+    void listener_syntaxErrorAsSecond() {
         FEELEvent syntaxErrorEvent = new SyntaxErrorEvent(Severity.ERROR, "test", null, 0, 0, null);
         FEELEvent genericError = new FEELEventBase(Severity.ERROR, "error", null);
         AtomicReference<FEELEvent> error = new AtomicReference<>();
@@ -359,7 +358,7 @@ public class DMNFeelExpressionEvaluatorTest {
 
 
     @Test
-    public void verifyResult_listResult() {
+    void verifyResult_listResult() {
         String expressionCollectionJsonString = new TextNode("10").toString();
         List<BigDecimal> contextValue = List.of(BigDecimal.valueOf(10));
         
@@ -367,7 +366,7 @@ public class DMNFeelExpressionEvaluatorTest {
     }
 
     @Test
-    public void verifyResult_mapResult() {
+    void verifyResult_mapResult() {
         String expressionCollectionJsonString = new TextNode("{key_a : 1}").toString();
         Map<String, BigDecimal> contextValue = Map.of("key_a", BigDecimal.valueOf(1));
         
@@ -375,7 +374,7 @@ public class DMNFeelExpressionEvaluatorTest {
     }
 
     @Test
-    public void isStructuredInput() {
+    void isStructuredInput() {
         assertThat(expressionEvaluator.isStructuredInput(List.class.getCanonicalName())).isTrue();
         assertThat(expressionEvaluator.isStructuredInput(ArrayList.class.getCanonicalName())).isTrue();
         assertThat(expressionEvaluator.isStructuredInput(LinkedList.class.getCanonicalName())).isTrue();
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/ExpressionEvaluatorFactoryTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/ExpressionEvaluatorFactoryTest.java
index d05c99337a..8f14ecda42 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/ExpressionEvaluatorFactoryTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/ExpressionEvaluatorFactoryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -23,22 +23,22 @@ import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
 import org.drools.scenariosimulation.api.model.FactIdentifier;
 import org.drools.scenariosimulation.api.model.FactMappingValue;
 import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.drools.scenariosimulation.api.utils.ConstantsHolder.MVEL_ESCAPE_SYMBOL;
 
-public class ExpressionEvaluatorFactoryTest {
+class ExpressionEvaluatorFactoryTest {
 
     ClassLoader classLoader = ExpressionEvaluatorFactoryTest.class.getClassLoader();
 
     @Test
-    public void create() {
+    void create() {
         assertThat(ExpressionEvaluatorFactory.create(classLoader, ScenarioSimulationModel.Type.RULE)).isNotNull();
     }
 
     @Test
-    public void getOrCreate() {
+    void getOrCreate() {
         FactMappingValue simpleFMV = new FactMappingValue(FactIdentifier.INDEX, ExpressionIdentifier.INDEX, "10");
         FactMappingValue objectFMV = new FactMappingValue(FactIdentifier.INDEX, ExpressionIdentifier.INDEX, "10");
         FactMappingValue mvelFMV = new FactMappingValue(FactIdentifier.INDEX, ExpressionIdentifier.INDEX, MVEL_ESCAPE_SYMBOL + " 10");
@@ -68,7 +68,7 @@ public class ExpressionEvaluatorFactoryTest {
     }
 
     @Test
-    public void isAnMVELExpression() {
+    void isAnMVELExpression() {
         ExpressionEvaluatorFactory ruleEvaluatorFactory = ExpressionEvaluatorFactory.create(classLoader, ScenarioSimulationModel.Type.RULE);
         assertThat(ruleEvaluatorFactory.isAnMVELExpression("10")).isFalse();
         assertThat(ruleEvaluatorFactory.isAnMVELExpression(MVEL_ESCAPE_SYMBOL + "10")).isTrue();
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/FakeExpressionEvaluator.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/FakeExpressionEvaluator.java
index d286f55da1..b7bfe62e32 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/FakeExpressionEvaluator.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/FakeExpressionEvaluator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,7 +18,6 @@
  */
 package org.drools.scenariosimulation.backend.expression;
 
-
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.List;
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/MVELExpressionEvaluatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/MVELExpressionEvaluatorTest.java
index 7d880d9765..beccdf63ab 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/MVELExpressionEvaluatorTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/MVELExpressionEvaluatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -27,9 +27,9 @@ import java.util.Map;
 import com.fasterxml.jackson.databind.node.TextNode;
 
 import org.assertj.core.api.Condition;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.mvel2.CompileException;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -37,20 +37,20 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.drools.scenariosimulation.api.utils.ConstantsHolder.ACTUAL_VALUE_IDENTIFIER;
 import static org.drools.scenariosimulation.api.utils.ConstantsHolder.MVEL_ESCAPE_SYMBOL;
 
-public class MVELExpressionEvaluatorTest {
+class MVELExpressionEvaluatorTest {
 	
-	private Condition<ExpressionEvaluatorResult> successful= new Condition<>(x -> x.isSuccessful(), "isSuccessful");
-	private Condition<ExpressionEvaluatorResult> notSuccessful= new Condition<>(x -> !x.isSuccessful(), "isSuccessful");
+	private final Condition<ExpressionEvaluatorResult> successful = new Condition<>(x -> x.isSuccessful(), "isSuccessful");
+	private final Condition<ExpressionEvaluatorResult> notSuccessful = new Condition<>(x -> !x.isSuccessful(), "isSuccessful");
 
     private MVELExpressionEvaluator evaluator;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         evaluator = new MVELExpressionEvaluator(MVELExpressionEvaluatorTest.class.getClassLoader());
     }
     
     @Test
-    public void evaluateUnaryExpression() {
+    void evaluateUnaryExpression() {
         assertThat(evaluator.evaluateUnaryExpression(mvelExpression("java.util.Objects.equals(" + ACTUAL_VALUE_IDENTIFIER + ", \"Test\")"), "Test", String.class)).is(successful);
         assertThat(evaluator.evaluateUnaryExpression(mvelExpression("java.util.Objects.equals(" + ACTUAL_VALUE_IDENTIFIER + ", " + "\"Test\")"), "Test1", String.class)).is(notSuccessful);
         assertThat(evaluator.evaluateUnaryExpression(mvelExpression("1"), 1, Integer.class)).is(successful);
@@ -76,7 +76,7 @@ public class MVELExpressionEvaluatorTest {
     }
 
     @Test
-    public void evaluateLiteralExpression_many() {
+    void evaluateLiteralExpression_many() {
         assertThat(evaluateLiteralExpression("1", Integer.class)).isEqualTo(1);
 
         assertThat(evaluateLiteralExpression("\"Value\"", String.class)).isEqualTo("Value");
@@ -141,9 +141,9 @@ public class MVELExpressionEvaluatorTest {
                 .hasMessageStartingWith("Cannot assign a 'java.lang.Integer");
     }
 
-    @Ignore("https://issues.redhat.com/browse/DROOLS-4649")
+    @Disabled("https://issues.redhat.com/browse/DROOLS-4649")
     @Test
-    public void evaluateLiteralExpression_Array() {
+    void evaluateLiteralExpression_Array() {
         assertThat(evaluateLiteralExpression("{\"Jim\", \"Michael\"}", Object[].class)).isEqualTo(new String[]{"Jim", "Michael"});
 
         assertThat(evaluateLiteralExpression("{ }", Object[].class)).isEqualTo(new String[]{});
@@ -154,14 +154,14 @@ public class MVELExpressionEvaluatorTest {
     }
 
     @Test
-    public void fromObjectToExpression() {
+    void fromObjectToExpression() {
         assertThatThrownBy(() -> evaluator.fromObjectToExpression(null))
                 .isInstanceOf(UnsupportedOperationException.class)
                 .hasMessage("The condition has not been satisfied");
     }
 
     @Test
-    public void cleanExpression() {
+    void cleanExpression() {
         assertThat(evaluator.cleanExpression(MVEL_ESCAPE_SYMBOL + "test")).isEqualTo("test");
         assertThat(evaluator.cleanExpression(MVEL_ESCAPE_SYMBOL + " test")).isEqualTo(" test");
         assertThat(evaluator.cleanExpression(MVEL_ESCAPE_SYMBOL + " " + MVEL_ESCAPE_SYMBOL + " test")).isEqualTo(" " + MVEL_ESCAPE_SYMBOL + " test");
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/ParameterizedBaseExpressionEvaluatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/ParameterizedBaseExpressionEvaluatorTest.java
index ccb16d1b5f..a5774944f7 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/ParameterizedBaseExpressionEvaluatorTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/ParameterizedBaseExpressionEvaluatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,21 +21,36 @@ package org.drools.scenariosimulation.backend.expression;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-@RunWith(Parameterized.class)
-public class ParameterizedBaseExpressionEvaluatorTest {
+@ExtendWith(MockitoExtension.class)
+class ParameterizedBaseExpressionEvaluatorTest {
 
-    private final static ClassLoader classLoader = ParameterizedBaseExpressionEvaluatorTest.class.getClassLoader();
-    private final static BaseExpressionEvaluator baseExpressionEvaluator = new BaseExpressionEvaluator(classLoader);
+    private static final ClassLoader classLoader = ParameterizedBaseExpressionEvaluatorTest.class.getClassLoader();
+    private static final BaseExpressionEvaluator baseExpressionEvaluator = new BaseExpressionEvaluator(classLoader);
 
-    @Parameterized.Parameters(name = "{index}: Expr \"{0} {1}\" should be true")
-    public static Collection<Object[]> data() {
+    @ParameterizedTest
+    @MethodSource("evaluateUnaryExpressionData")
+    void evaluateUnaryExpression(ExpressionEvaluatorResult expectedResult, Object resultValue, String exprToTest, Class<?> clazz) {
+        if (!(resultValue instanceof Class)) {
+            assertThat(baseExpressionEvaluator.evaluateUnaryExpression(exprToTest, resultValue, clazz).isSuccessful())
+                    .isEqualTo(expectedResult.isSuccessful());
+        } else {
+            try {
+                baseExpressionEvaluator.evaluateUnaryExpression(exprToTest, true, clazz);
+                fail("Should have failed");
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    static Collection<Object[]> evaluateUnaryExpressionData() {
         return Arrays.asList(new Object[][]{
                 {ExpressionEvaluatorResult.ofSuccessful(), 1, "1", int.class},
                 {ExpressionEvaluatorResult.ofSuccessful(), 2, "!= 1", int.class},
@@ -91,30 +106,4 @@ public class ParameterizedBaseExpressionEvaluatorTest {
                 {ExpressionEvaluatorResult.ofSuccessful(), Error.class, "< - 1 1", int.class}
         });
     }
-
-    @Parameterized.Parameter(0)
-    public ExpressionEvaluatorResult expectedResult;
-
-    @Parameterized.Parameter(1)
-    public Object resultValue;
-
-    @Parameterized.Parameter(2)
-    public String exprToTest;
-
-    @Parameterized.Parameter(3)
-    public Class<?> clazz;
-
-    @Test
-    public void evaluateUnaryExpression() {
-
-        if (!(resultValue instanceof Class)) {
-            assertThat(baseExpressionEvaluator.evaluateUnaryExpression(exprToTest, resultValue, clazz).isSuccessful()).isEqualTo(expectedResult.isSuccessful());
-        } else {
-            try {
-                baseExpressionEvaluator.evaluateUnaryExpression(exprToTest, true, clazz);
-                fail("Should have failed");
-            } catch (Exception ignored) {
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/AbstractRuleCoverageTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/AbstractRuleCoverageTest.java
index cba99fd0fe..fff8eca212 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/AbstractRuleCoverageTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/AbstractRuleCoverageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/ConditionFilterTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/ConditionFilterTest.java
index c072faf59d..c89b1acec5 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/ConditionFilterTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/ConditionFilterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -26,24 +26,22 @@ import org.drools.scenariosimulation.api.model.FactIdentifier;
 import org.drools.scenariosimulation.api.model.FactMappingValue;
 import org.drools.scenariosimulation.backend.runner.model.ScenarioResult;
 import org.drools.scenariosimulation.backend.runner.model.ValueWrapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ConditionFilterTest {
-
-	
+class ConditionFilterTest {
+    
     @Test
-    public void accept() {
+    void accept() {
         ConditionFilter conditionFilter = createConditionFilter(ValueWrapper::of);
 
         assertThat(conditionFilter.accept(1)).isFalse();
         assertThat(conditionFilter.accept("String")).isTrue();
     }
-
     
     @Test
-    public void acceptWithFailure() {
+    void acceptWithFailure() {
         ConditionFilter conditionFilterFail = createConditionFilter(object -> ValueWrapper.errorWithValidValue(null, null));
         
         assertThat(conditionFilterFail.accept("String")).isFalse();
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/CoverageAgendaListenerTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/CoverageAgendaListenerTest.java
index c9f825f380..c03aac09c1 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/CoverageAgendaListenerTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/CoverageAgendaListenerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,26 +18,24 @@
  */
 package org.drools.scenariosimulation.backend.fluent;
 
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.kie.api.event.rule.BeforeMatchFiredEvent;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CoverageAgendaListenerTest extends AbstractRuleCoverageTest {
-
-    private final static String RULE_NAME = "rule1";
+class CoverageAgendaListenerTest extends AbstractRuleCoverageTest {
 
+    private static final String RULE_NAME = "rule1";
     
     @Test
-    public void constructor() {
+    void constructor() {
         CoverageAgendaListener coverageAgendaListener = new CoverageAgendaListener();
 
         assertThat(coverageAgendaListener.getRuleExecuted()).isEmpty();
         assertThat(coverageAgendaListener.getAuditsMessages()).isEmpty();
     }
     @Test
-    public void beforeMatchFired() {
+    void beforeMatchFired() {
         CoverageAgendaListener coverageAgendaListener = new CoverageAgendaListener();
         
         BeforeMatchFiredEvent beforeMatchFiredEvent = createBeforeMatchFiredEventMock(RULE_NAME);
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/DMNScenarioExecutableBuilderTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/DMNScenarioExecutableBuilderTest.java
index 861fd30ed9..2ee7f1624b 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/DMNScenarioExecutableBuilderTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/DMNScenarioExecutableBuilderTest.java
@@ -25,8 +25,8 @@ import java.util.HashMap;
 import java.util.Map;
 import org.drools.scenariosimulation.backend.util.DMNSimulationUtils;
 import org.drools.util.ResourceHelper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.dmn.api.core.DMNModel;
 import org.kie.dmn.api.identifiers.DmnIdFactory;
 import org.kie.dmn.api.identifiers.KieDmnComponentRoot;
@@ -36,7 +36,7 @@ import org.kie.efesto.common.api.model.GeneratedModelResource;
 import org.kie.efesto.common.api.model.GeneratedResources;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,14 +46,14 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 @SuppressWarnings("rawtypes")
-public class DMNScenarioExecutableBuilderTest {
+class DMNScenarioExecutableBuilderTest {
 
-    public static final Logger LOG = LoggerFactory.getLogger(DMNScenarioExecutableBuilderTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DMNScenarioExecutableBuilderTest.class);
 
     @Test
-    public void testCreateBuilderNoException() {
+    void testCreateBuilderNoException() {
         Map<String, GeneratedResources> generatedResourcesMap = new HashMap<>();
         Collection<File> dmnFiles = new ArrayList<>();
         Collection<File> pmmlFiles = new ArrayList<>();
@@ -80,7 +80,7 @@ public class DMNScenarioExecutableBuilderTest {
     }
 
     @Test
-    public void testCreateBuilderException() {
+    void testCreateBuilderException() {
         Collection<File> dmnFiles = new ArrayList<>();
         Collection<File> pmmlFiles = new ArrayList<>();
         try (MockedStatic<DMNSimulationUtils> mockDMNSimulationUtils = Mockito.mockStatic(DMNSimulationUtils.class);
@@ -101,7 +101,7 @@ public class DMNScenarioExecutableBuilderTest {
     }
 
     @Test
-    public void testSetActiveModelNoException() {
+    void testSetActiveModelNoException() {
         String fileName = "/this/is/filename";
         String modelName = "modelName";
         ModelLocalUriId modelLocalUriId = new EfestoAppRoot()
@@ -132,7 +132,7 @@ public class DMNScenarioExecutableBuilderTest {
     }
 
     @Test
-    public void testSetActiveModelException() {
+    void testSetActiveModelException() {
         String fileName = "/this/is/filename";
         String modelName = "modelName";
         ModelLocalUriId modelLocalUriId = new EfestoAppRoot()
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/RuleScenarioExecutableBuilderTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/RuleScenarioExecutableBuilderTest.java
index 3c8b8667cb..8ff4826fa5 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/RuleScenarioExecutableBuilderTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/RuleScenarioExecutableBuilderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -25,7 +25,7 @@ import java.util.Set;
 
 import org.drools.base.definitions.rule.impl.RuleImpl;
 import org.drools.base.definitions.rule.impl.QueryImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.kie.api.KieBase;
 import org.kie.api.definition.KiePackage;
 import org.kie.api.definition.rule.Rule;
@@ -34,10 +34,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class RuleScenarioExecutableBuilderTest {
+class RuleScenarioExecutableBuilderTest {
 
     @Test
-    public void createBuilder() {
+    void createBuilder() {
         RuleScenarioExecutableBuilder statelessBuilder = RuleScenarioExecutableBuilder.createBuilder(null, null, true);
         assertThat(statelessBuilder).isInstanceOf(RuleStatelessScenarioExecutableBuilder.class);;
 
@@ -49,7 +49,7 @@ public class RuleScenarioExecutableBuilderTest {
     }
 
     @Test
-    public void getAvailableRules() {
+    void getAvailableRules() {
         Map<String, List<String>> packagesToRules = Map.of("package1", List.of("rule1", "rule2", "rule3"), "package2", List.of("rule4", "rule5", "rule6"));
         Map<String, List<String>> queryToRules = Map.of("package1", List.of("query1", "query2"), "package2", List.of());
         Map<String, String> ruleToAgendaGroup = Map.of("rule1", "agenda1", "rule2", "agenda1", "rule3", "agenda1", "rule4", "agenda2");
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/RuleStatefulScenarioExecutableBuilderTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/RuleStatefulScenarioExecutableBuilderTest.java
index 50e28d94ed..de8e4fdb1f 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/RuleStatefulScenarioExecutableBuilderTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/RuleStatefulScenarioExecutableBuilderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -27,8 +27,9 @@ import org.drools.scenariosimulation.api.model.FactIdentifier;
 import org.drools.scenariosimulation.api.model.FactMappingValue;
 import org.drools.scenariosimulation.backend.runner.ScenarioException;
 import org.drools.scenariosimulation.backend.runner.model.ScenarioResult;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.api.command.ExecutableCommand;
 import org.kie.api.runtime.Executable;
 import org.kie.api.runtime.ExecutableRunner;
@@ -42,22 +43,21 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.drools.scenariosimulation.backend.fluent.RuleScenarioExecutableBuilder.RULES_AVAILABLE;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
-public class RuleStatefulScenarioExecutableBuilderTest {
+@ExtendWith(MockitoExtension.class)
+class RuleStatefulScenarioExecutableBuilderTest {
 
     @Mock
     private ExecutableBuilder executableBuilderMock;
@@ -78,7 +78,7 @@ public class RuleStatefulScenarioExecutableBuilderTest {
     private ArgumentCaptor<ExecutableCommand<?>> commandArgumentCaptor;
 
     @Test
-    public void testPseudoClock() {
+    void testPseudoClock() {
         KieContainer kieContainerMock = mock(KieContainer.class);
         assertThatThrownBy(() -> RuleStatefulScenarioExecutableBuilder.forcePseudoClock.apply(null, kieContainerMock))
                 .isInstanceOf(ScenarioException.class);
@@ -88,7 +88,7 @@ public class RuleStatefulScenarioExecutableBuilderTest {
     }
 
     @Test
-    public void testBuilder() {
+    void testBuilder() {
         when(executableBuilderMock.newApplicationContext(anyString())).thenReturn(executableBuilderMock);
         when(executableBuilderMock.setKieContainer(any())).thenReturn(kieContainerFluent);
         when(kieContainerFluent.newSessionCustomized(any(), any())).thenReturn(kieSessionFluentMock);
@@ -119,15 +119,15 @@ public class RuleStatefulScenarioExecutableBuilderTest {
                 null);
 
         builder.setActiveAgendaGroup(agendaGroup);
-        verify(kieSessionFluentMock, times(1)).setActiveAgendaGroup(eq(agendaGroup));
+        verify(kieSessionFluentMock, times(1)).setActiveAgendaGroup(agendaGroup);
         reset(kieContainerFluent);
 
         builder.setActiveRuleFlowGroup(ruleFlowGroup);
-        verify(kieSessionFluentMock, times(1)).setActiveAgendaGroup(eq(agendaGroup));
+        verify(kieSessionFluentMock, times(1)).setActiveAgendaGroup(agendaGroup);
         reset(kieContainerFluent);
 
         builder.insert(toInsert);
-        verify(kieSessionFluentMock, times(1)).insert(eq(toInsert));
+        verify(kieSessionFluentMock, times(1)).insert(toInsert);
         reset(kieContainerFluent);
 
         builder.addInternalCondition(String.class, obj -> null, new ScenarioResult(indexFMV, null));
@@ -139,6 +139,6 @@ public class RuleStatefulScenarioExecutableBuilderTest {
         List<ExecutableCommand<?>> allAddCommands = commandArgumentCaptor.getAllValues();
         assertThat(allAddCommands).anyMatch(x ->x instanceof ValidateFactCommand).anyMatch(x ->x instanceof AddCoverageListenerCommand);
         assertThat(result).containsKey(RuleScenarioExecutableBuilder.COVERAGE_LISTENER);
-        verify(kieSessionFluentMock, times(1)).out(eq(RULES_AVAILABLE));
+        verify(kieSessionFluentMock, times(1)).out(RULES_AVAILABLE);
     }
 }
\ No newline at end of file
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/RuleStatelessScenarioExecutableBuilderTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/RuleStatelessScenarioExecutableBuilderTest.java
index 9366474ace..85fe8cbf90 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/RuleStatelessScenarioExecutableBuilderTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/RuleStatelessScenarioExecutableBuilderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -29,15 +29,15 @@ import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
 import org.drools.scenariosimulation.api.model.FactIdentifier;
 import org.drools.scenariosimulation.api.model.FactMappingValue;
 import org.drools.scenariosimulation.backend.runner.model.ScenarioResult;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.api.KieBase;
 import org.kie.api.command.Command;
 import org.kie.api.runtime.ExecutionResults;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.StatelessKieSession;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -46,8 +46,8 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
-public class RuleStatelessScenarioExecutableBuilderTest {
+@ExtendWith(MockitoExtension.class)
+class RuleStatelessScenarioExecutableBuilderTest {
 
     @Mock
     private KieContainer kieContainerMock;
@@ -59,7 +59,7 @@ public class RuleStatelessScenarioExecutableBuilderTest {
     private KieBase kieBaseMock;
 
     @Test
-    public void testBuilder() {
+     void testBuilder() {
         when(kieContainerMock.newStatelessKieSession(anyString())).thenReturn(statelessKieSessionMock);
         when(statelessKieSessionMock.getKieBase()).thenReturn(kieBaseMock);
         when(kieBaseMock.getKiePackages()).thenReturn(List.of());
@@ -73,7 +73,7 @@ public class RuleStatelessScenarioExecutableBuilderTest {
     }
 
     @Test
-    public void generateCommands_twoCommands() {
+     void generateCommands_twoCommands() {
         RuleStatelessScenarioExecutableBuilder builder = new RuleStatelessScenarioExecutableBuilder(null, null);
 
         Command<ExecutionResults> batchCommand = builder.generateCommands(null);
@@ -85,7 +85,7 @@ public class RuleStatelessScenarioExecutableBuilderTest {
     }
 
     @Test
-    public void generateCommands_threeCommands() {
+     void generateCommands_threeCommands() {
         RuleStatelessScenarioExecutableBuilder builder = new RuleStatelessScenarioExecutableBuilder(null, null);
         builder.setActiveAgendaGroup("test");
 
@@ -99,7 +99,7 @@ public class RuleStatelessScenarioExecutableBuilderTest {
     }
 
     @Test
-    public void generateCommands_fourCommands() {
+     void generateCommands_fourCommands() {
         RuleStatelessScenarioExecutableBuilder builder = new RuleStatelessScenarioExecutableBuilder(null, null);
         builder.setActiveAgendaGroup("test");
         builder.insert(new Object());
@@ -116,7 +116,7 @@ public class RuleStatelessScenarioExecutableBuilderTest {
     
     
     @Test
-    public void generateCommands_fiveCommands() {
+    void generateCommands_fiveCommands() {
         RuleStatelessScenarioExecutableBuilder builder = new RuleStatelessScenarioExecutableBuilder(null, null);
         builder.setActiveAgendaGroup("test");
         builder.insert(new Object());
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/ValidateFactCommandTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/ValidateFactCommandTest.java
index 5a06858c47..3fa8badacc 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/ValidateFactCommandTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/fluent/ValidateFactCommandTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -25,14 +25,14 @@ import java.util.function.Function;
 import org.drools.scenariosimulation.api.model.FactMappingValue;
 import org.drools.scenariosimulation.backend.runner.model.ValueWrapper;
 import org.drools.scenariosimulation.backend.runner.model.ScenarioResult;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.api.runtime.KieSession;
 import org.kie.api.runtime.ObjectFilter;
 import org.kie.internal.command.RegistryContext;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyBoolean;
@@ -40,8 +40,8 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
-public class ValidateFactCommandTest {
+@ExtendWith(MockitoExtension.class)
+class ValidateFactCommandTest {
 
     @Mock
     private KieSession kieSession;
@@ -57,8 +57,8 @@ public class ValidateFactCommandTest {
 
 	private ValidateFactCommand validateFactCommand;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         when(registryContext.lookup(KieSession.class)).thenReturn(kieSession);
         Function<Object, ValueWrapper> alwaysMatchFunction = ValueWrapper::of;
 
@@ -66,7 +66,7 @@ public class ValidateFactCommandTest {
     }
     
     @Test
-    public void execute_setResultIsCalled() {
+    void execute_setResultIsCalled() {
         when(kieSession.getObjects(any(ObjectFilter.class))).thenReturn(Collections.singleton(null));
 
         validateFactCommand.execute(registryContext);
@@ -75,7 +75,7 @@ public class ValidateFactCommandTest {
     }
     
     @Test
-    public void execute_setResultIsNotCalled() {
+    void execute_setResultIsNotCalled() {
         when(kieSession.getObjects(any(ObjectFilter.class))).thenReturn(List.of());
         when(scenarioResult.getFactMappingValue()).thenReturn(factMappingValue);
 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/Dispute.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/Dispute.java
index d6dbe5f383..bce533d994 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/Dispute.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/Dispute.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/ListMapClass.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/ListMapClass.java
index 2c0b867f85..9a0ca322dd 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/ListMapClass.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/ListMapClass.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/NotEmptyConstructor.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/NotEmptyConstructor.java
index 9b5dcc2b9c..81ea165807 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/NotEmptyConstructor.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/NotEmptyConstructor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/Person.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/Person.java
index 8b607058f7..d72e173fec 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/Person.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/Person.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/SubPerson.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/SubPerson.java
index fd4ae06b93..740a5de4aa 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/SubPerson.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/SubPerson.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/AbstractRunnerHelperTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/AbstractRunnerHelperTest.java
index a69e79c11f..455cf244fc 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/AbstractRunnerHelperTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/AbstractRunnerHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -37,7 +37,7 @@ import org.drools.scenariosimulation.backend.expression.ExpressionEvaluatorResul
 import org.drools.scenariosimulation.backend.runner.model.ScenarioResultMetadata;
 import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerData;
 import org.drools.scenariosimulation.backend.runner.model.ValueWrapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.kie.api.runtime.KieContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -50,7 +50,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class AbstractRunnerHelperTest {
+class AbstractRunnerHelperTest {
 
     AbstractRunnerHelper abstractRunnerHelper = new AbstractRunnerHelper() {
         @Override
@@ -75,7 +75,7 @@ public class AbstractRunnerHelperTest {
     };
 
     @Test
-    public void isFactMappingValueToSkip() {
+    void isFactMappingValueToSkip() {
         FactIdentifier factIdentifier = FactIdentifier.create("MyInstance", String.class.getCanonicalName());
         ExpressionIdentifier expressionIdentifier = ExpressionIdentifier.create("MyProperty", FactMappingType.GIVEN);
 
@@ -87,7 +87,7 @@ public class AbstractRunnerHelperTest {
     }
 
     @Test
-    public void fillResult() {
+    void fillResult() {
         FactIdentifier factIdentifier = FactIdentifier.create("MyInstance", String.class.getCanonicalName());
         ExpressionIdentifier expressionIdentifier = ExpressionIdentifier.create("MyProperty", FactMappingType.GIVEN);
         FactMappingValue expectedResultSpy = spy(new FactMappingValue(factIdentifier, expressionIdentifier, VALUE));
@@ -132,7 +132,7 @@ public class AbstractRunnerHelperTest {
     }
     
 	@Test
-    public void getResultWrapper() {
+    void getResultWrapper() {
         ExpressionEvaluator expressionEvaluatorMock = mock(ExpressionEvaluator.class);
         Object resultRaw = "test";
         Object expectedResultRaw = "";
@@ -197,7 +197,7 @@ public class AbstractRunnerHelperTest {
         when(expressionEvaluatorMock.evaluateUnaryExpression(any(), any(), any(Class.class))).thenThrow(new IllegalArgumentException(genericErrorMessage));
         FactMappingValue expectedResult5 = new FactMappingValue();
         valueWrapper = abstractRunnerHelper.getResultWrapper(Map.class.getCanonicalName(), expectedResult5, expressionEvaluatorMock, expectedResultRaw, resultRaw, Map.class);
-        assertThat(valueWrapper.getErrorMessage().get()).isEqualTo(genericErrorMessage);
+        assertThat(valueWrapper.getErrorMessage()).contains(genericErrorMessage);
         assertThat(expectedResult5.getExceptionMessage()).isEqualTo(genericErrorMessage);
     }
 }
\ No newline at end of file
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/AbstractScenarioRunnerTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/AbstractScenarioRunnerTest.java
index 27d8dfa857..043562ba5d 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/AbstractScenarioRunnerTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/AbstractScenarioRunnerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -30,18 +30,19 @@ import org.drools.scenariosimulation.backend.expression.ExpressionEvaluatorFacto
 import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerDTO;
 import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerData;
 import org.drools.scenariosimulation.backend.util.ScenarioSimulationServerMessages;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.runner.Description;
-import org.junit.runner.RunWith;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunNotifier;
 import org.kie.api.runtime.KieContainer;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isA;
@@ -50,8 +51,9 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@RunWith(MockitoJUnitRunner.class)
-public class AbstractScenarioRunnerTest {
+@ExtendWith(MockitoExtension.class)
+@Deprecated
+class AbstractScenarioRunnerTest {
 
     private final static int SCENARIO_DATA = 5;
 
@@ -62,8 +64,8 @@ public class AbstractScenarioRunnerTest {
     protected Settings settingsLocal;
     private ScenarioRunnerDTO scenarioRunnerDTOLocal;
 
-    @Before
-    public void setup() {
+    @BeforeEach
+    void setup() {
         settingsLocal = new Settings();
         scenarioRunnerDTOLocal = getScenarioRunnerDTO();
         abstractScenarioRunnerLocal = spy(
@@ -80,7 +82,7 @@ public class AbstractScenarioRunnerTest {
     }
 
     @Test
-    public void getDescriptionForSimulationByClassNameAndSimulation() {
+    void getDescriptionForSimulationByClassNameAndSimulation() {
         Description retrieved = AbstractScenarioRunner.getDescriptionForSimulation(Optional.empty(), scenarioRunnerDTOLocal.getScenarioWithIndices());
         commonVerifyDescriptionForSimulation(retrieved, AbstractScenarioRunner.class.getSimpleName());
         retrieved = AbstractScenarioRunner.getDescriptionForSimulation(Optional.of("src/test/Test.scesim"), scenarioRunnerDTOLocal.getScenarioWithIndices());
@@ -88,7 +90,7 @@ public class AbstractScenarioRunnerTest {
     }
 
     @Test
-    public void getDescriptionForScenario() {
+    void getDescriptionForScenario() {
         final Scenario scenario = scenarioRunnerDTOLocal.getScenarioWithIndices().get(2).getScesimData();
         Description retrieved = AbstractScenarioRunner.getDescriptionForScenario(Optional.empty(), 1, scenario.getDescription());
         
@@ -100,19 +102,20 @@ public class AbstractScenarioRunnerTest {
     }
 
     @Test
-    public void getSpecificRunnerProvider() {
+    void getSpecificRunnerProvider() {
         // all existing types should have a dedicated runner
     	assertThat(ScenarioSimulationModel.Type.values()).extracting(x -> AbstractScenarioRunner.getSpecificRunnerProvider(x)).isNotNull();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void getSpecificRunnerProviderNullType() {
+    @Test
+    void getSpecificRunnerProviderNullType() {
         settingsLocal.setType(null);
-        AbstractScenarioRunner.getSpecificRunnerProvider(null);
+        assertThatThrownBy(() -> AbstractScenarioRunner.getSpecificRunnerProvider(null)
+        ).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void testRun() {
+     void testRun() {
         ArgumentCaptor<Failure> failureArgumentCaptor = ArgumentCaptor.forClass(Failure.class);
 
         doThrow(new ScenarioException("Failed assertion", true))
@@ -153,7 +156,7 @@ public class AbstractScenarioRunnerTest {
     }
 
     @Test
-    public void getScesimFileName() {
+    void getScesimFileName() {
         assertThat(AbstractScenarioRunner.getScesimFileName("src/test/Test.scesim")).isEqualTo("Test");
         assertThat(AbstractScenarioRunner.getScesimFileName("Test.scesim")).isEqualTo("Test");
         assertThat(AbstractScenarioRunner.getScesimFileName("Test")).isEqualTo("Test");
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/DMNScenarioRunnerHelperTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/DMNScenarioRunnerHelperTest.java
index 42de179213..ca98ba47f4 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/DMNScenarioRunnerHelperTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/DMNScenarioRunnerHelperTest.java
@@ -49,9 +49,9 @@ import org.drools.scenariosimulation.backend.runner.model.ScenarioExpect;
 import org.drools.scenariosimulation.backend.runner.model.ScenarioResultMetadata;
 import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerData;
 import org.drools.scenariosimulation.backend.runner.model.ValueWrapper;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.RequestContext;
 import org.kie.dmn.api.core.DMNDecisionResult;
@@ -65,7 +65,8 @@ import org.kie.dmn.core.impl.DMNMessageImpl;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -82,8 +83,8 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
-public class DMNScenarioRunnerHelperTest {
+@ExtendWith(MockitoExtension.class)
+class DMNScenarioRunnerHelperTest {
 
     private static final String NAME = "NAME";
     private static final String FEEL_EXPRESSION_NAME = "\"" + NAME + "\"";
@@ -135,10 +136,8 @@ public class DMNScenarioRunnerHelperTest {
     private FactMappingValue amountNameExpectedFactMappingValue;
     private FactMappingValue firstNameExpectedValue;
 
-    @Before
-    public void init() {
-        when(dmnScenarioExecutableBuilderMock.run()).thenReturn(mock(RequestContext.class));
-
+    @BeforeEach
+    void init() {
         simulation = new Simulation();
         settings = new Settings();
         settings.setType(ScenarioSimulationModel.Type.DMN);
@@ -178,46 +177,46 @@ public class DMNScenarioRunnerHelperTest {
         scenario2.addMappingValue(personFactIdentifier, firstNameExpectedExpressionIdentifier, FEEL_EXPRESSION_NAME);
         scenario2.addMappingValue(disputeFactIdentifier, amountGivenExpressionIdentifier, AMOUNT);
         amountNameExpectedFactMappingValue = scenario2.addMappingValue(disputeFactIdentifier, amountExpectedExpressionIdentifier, AMOUNT);
-
-        when(requestContextMock.get(DMNScenarioExecutableBuilder.DMN_RESULT)).thenReturn(dmnResultMock);
-        when(requestContextMock.get(DMNScenarioExecutableBuilder.DMN_MODEL)).thenReturn(dmnModelMock);
     }
 
     @Test
-    public void verifyConditions_noDecisionGeneratedForSpecificName() {
+    void verifyConditions_noDecisionGeneratedForSpecificName() {
         // test 1 - no decision generated for specific decisionName
         ScenarioRunnerData scenarioRunnerData = new ScenarioRunnerData();
         scenarioRunnerData.addExpect(new ScenarioExpect(personFactIdentifier, List.of(firstNameExpectedValue)));
 
+        when(requestContextMock.get(DMNScenarioExecutableBuilder.DMN_RESULT)).thenReturn(dmnResultMock);
+
         assertThatThrownBy(() -> runnerHelper.verifyConditions(simulation.getScesimModelDescriptor(), scenarioRunnerData, expressionEvaluatorFactory, requestContextMock))
                 .isInstanceOf(ScenarioException.class)
                 .hasMessage("DMN execution has not generated a decision result with name Fact 1");
     }
     
     @Test
-    public void verifyConditions_decisionResultContainsANull() {
+    void verifyConditions_decisionResultContainsANull() {
         // test 2 - when decisionResult contains a null value skip the steps and just do the comparison (that should be false in this case)
         ScenarioRunnerData scenarioRunnerData = new ScenarioRunnerData();
         scenarioRunnerData.addExpect(new ScenarioExpect(personFactIdentifier, List.of(firstNameExpectedValue)));
 
         when(dmnResultMock.getDecisionResultByName(anyString())).thenReturn(dmnDecisionResultMock);
         when(dmnDecisionResultMock.getEvaluationStatus()).thenReturn(DecisionEvaluationStatus.SUCCEEDED);
+        when(requestContextMock.get(DMNScenarioExecutableBuilder.DMN_RESULT)).thenReturn(dmnResultMock);
 
         runnerHelper.verifyConditions(simulation.getScesimModelDescriptor(), scenarioRunnerData, expressionEvaluatorFactory, requestContextMock);
 
         assertThat(scenarioRunnerData.getResults()).hasSize(1);
         assertThat(scenarioRunnerData.getResults().get(0).getResult()).isFalse();
-
     }
     
     @Test
-    public void verifyConditions_decisionResultIsNotNullButMalformed() {
+    void verifyConditions_decisionResultIsNotNullButMalformed() {
         // test 3 - now result is not null but data structure is wrong (expected steps but data is a simple string)
         ScenarioRunnerData scenarioRunnerData = new ScenarioRunnerData();
         scenarioRunnerData.addExpect(new ScenarioExpect(personFactIdentifier, List.of(firstNameExpectedValue)));
         when(dmnResultMock.getDecisionResultByName(anyString())).thenReturn(dmnDecisionResultMock);
         when(dmnDecisionResultMock.getEvaluationStatus()).thenReturn(DecisionEvaluationStatus.SUCCEEDED);
         when(dmnDecisionResultMock.getResult()).thenReturn("");
+        when(requestContextMock.get(DMNScenarioExecutableBuilder.DMN_RESULT)).thenReturn(dmnResultMock);
 
         assertThatThrownBy(() -> runnerHelper.verifyConditions(simulation.getScesimModelDescriptor(), scenarioRunnerData, expressionEvaluatorFactory, requestContextMock))
                 .isInstanceOf(ScenarioException.class)
@@ -225,7 +224,7 @@ public class DMNScenarioRunnerHelperTest {
     }
 
     @Test
-    public void verifyConditions_checksArePerformed_fail() {
+    void verifyConditions_checksArePerformed_fail() {
         // test 4 - check are performed (but fail)
         ScenarioRunnerData scenarioRunnerData = new ScenarioRunnerData();
         scenarioRunnerData.addExpect(new ScenarioExpect(personFactIdentifier, List.of(firstNameExpectedValue)));
@@ -235,7 +234,7 @@ public class DMNScenarioRunnerHelperTest {
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("firstName", "WrongValue");
         when(dmnDecisionResultMock.getResult()).thenReturn(resultMap);
-
+        when(requestContextMock.get(DMNScenarioExecutableBuilder.DMN_RESULT)).thenReturn(dmnResultMock);
 
         runnerHelper.verifyConditions(simulation.getScesimModelDescriptor(), scenarioRunnerData, expressionEvaluatorFactory, requestContextMock);
 
@@ -244,7 +243,7 @@ public class DMNScenarioRunnerHelperTest {
     }
     
     @Test
-    public void verifyConditions_checksArePerformed_success() {
+    void verifyConditions_checksArePerformed_success() {
         // test 5 - check are performed (but success)
         ScenarioRunnerData scenarioRunnerData = new ScenarioRunnerData();
         scenarioRunnerData.addExpect(new ScenarioExpect(personFactIdentifier, List.of(firstNameExpectedValue)));
@@ -256,7 +255,7 @@ public class DMNScenarioRunnerHelperTest {
         resultMap.put("firstName", NAME);
 
         when(dmnDecisionResultMock.getResult()).thenReturn(resultMap);
-
+        when(requestContextMock.get(DMNScenarioExecutableBuilder.DMN_RESULT)).thenReturn(dmnResultMock);
 
         runnerHelper.verifyConditions(simulation.getScesimModelDescriptor(), scenarioRunnerData, expressionEvaluatorFactory, requestContextMock);
 
@@ -266,7 +265,7 @@ public class DMNScenarioRunnerHelperTest {
     
     
     @Test
-    public void verifyConditions_errorsAreReported() {
+    void verifyConditions_errorsAreReported() {
         // test 6 - verify that when expression evaluation fails the corresponding expression is marked as error
         ScenarioRunnerData scenarioRunnerData = new ScenarioRunnerData();
         scenarioRunnerData.addExpect(new ScenarioExpect(personFactIdentifier, List.of(firstNameExpectedValue)));
@@ -276,6 +275,7 @@ public class DMNScenarioRunnerHelperTest {
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("firstName", NAME);
 
+        when(requestContextMock.get(DMNScenarioExecutableBuilder.DMN_RESULT)).thenReturn(dmnResultMock);
         when(dmnDecisionResultMock.getResult()).thenReturn(resultMap);
 
         ExpressionEvaluatorFactory expressionEvaluatorFactoryMock = mock(ExpressionEvaluatorFactory.class);
@@ -291,7 +291,7 @@ public class DMNScenarioRunnerHelperTest {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void createObject() {
+    void createObject() {
         Map<List<String>, Object> params = new HashMap<>();
         params.put(List.of("creator", "name"), "TestName");
         params.put(List.of("creator", "surname"), "TestSurname");
@@ -311,7 +311,7 @@ public class DMNScenarioRunnerHelperTest {
     }
 
     @Test
-    public void createObject_directMappingSimpleType() {
+    void createObject_directMappingSimpleType() {
         Map<List<String>, Object> params = new HashMap<>();
         String directMappingSimpleTypeValue = "TestName";
         params.put(List.of(), directMappingSimpleTypeValue);
@@ -323,7 +323,7 @@ public class DMNScenarioRunnerHelperTest {
     }
 
     @Test
-    public void createObject_directMappingSimpleTypeNull() {
+    void createObject_directMappingSimpleTypeNull() {
         Map<List<String>, Object> params = new HashMap<>();
         params.put(List.of(), null);
         ValueWrapper<Object> initialInstance = runnerHelper.getDirectMapping(params);
@@ -335,7 +335,7 @@ public class DMNScenarioRunnerHelperTest {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void createObject_directMappingComplexType() {
+    void createObject_directMappingComplexType() {
         Map<List<String>, Object> params = new HashMap<>();
         Map<String, Object> directMappingComplexTypeValue = new HashMap<>();
         directMappingComplexTypeValue.put("key1", "value1");
@@ -354,18 +354,18 @@ public class DMNScenarioRunnerHelperTest {
     }
 
     @Test
-    public void extractResultMetadata_noDecisionResultMessages() {
+    void extractResultMetadata_noDecisionResultMessages() {
         commonExtractResultMetadata();
     }
 
     @Test
-    public void extractResultMetadata_decisionResultMessages() {
+    void extractResultMetadata_decisionResultMessages() {
         List<DMNMessage> messages = getRandomlyGeneratedDMNMessageList();
         commonExtractResultMetadata(messages);
     }
 
     @Test
-    public void getSingleFactValueResult_failDecision() {
+    void getSingleFactValueResult_failDecision() {
         DMNDecisionResult failedDecision = createDecisionResultMock("Test", false, new ArrayList<>());
         
         ValueWrapper<?> failedResult = runnerHelper.getSingleFactValueResult(null,
@@ -381,7 +381,7 @@ public class DMNScenarioRunnerHelperTest {
     }
 
     @Test
-    public void getSingleFactValueResult_failDecisionWithMessages() {
+    void getSingleFactValueResult_failDecisionWithMessages() {
         DMNMessage errorMessage = new DMNMessageImpl(ERROR, "DMN Internal Error", DMNMessageType.FEEL_EVALUATION_ERROR, null);
         DMNMessage warnMessage = new DMNMessageImpl(WARN, "DMN Internal Warn", DMNMessageType.FEEL_EVALUATION_ERROR, null);
 
@@ -399,7 +399,10 @@ public class DMNScenarioRunnerHelperTest {
     }
 
     @Test
-    public void executeScenario() {
+    void executeScenario() {
+        when(dmnScenarioExecutableBuilderMock.run()).thenReturn(mock(RequestContext.class));
+
+
         FactIdentifier bookFactIdentifier = FactIdentifier.create("Book", "Book");
         FactIdentifier importedPersonFactIdentifier = FactIdentifier.create(IMPORTED_PREFIX + ".Person", IMPORTED_PREFIX + ".Person", IMPORTED_PREFIX);
         FactIdentifier importedDisputeFactIdentifier = FactIdentifier.create(IMPORTED_PREFIX + ".Dispute", IMPORTED_PREFIX + ".Dispute", IMPORTED_PREFIX);
@@ -485,7 +488,7 @@ public class DMNScenarioRunnerHelperTest {
     }
 
     @Test
-    public void validateScenario_wrongImportPrefix() {
+    void validateScenario_wrongImportPrefix() {
         String wrongPrefix = "WrongPrefix";
         FactIdentifier importedPersonFactIdentifier = FactIdentifier.create(IMPORTED_PREFIX + ".Person", IMPORTED_PREFIX + ".Person", wrongPrefix);
 
@@ -506,7 +509,9 @@ public class DMNScenarioRunnerHelperTest {
     /* If a malicious user injects a regex as a prefix in both importPrefix and as a part of fact name, the injected
        regex shouldn't be applied, but it should be used as a plain string */
     @Test
-    public void validateUnSecureImportPrefix() {
+    void validateUnSecureImportPrefix() {
+        when(dmnScenarioExecutableBuilderMock.run()).thenReturn(mock(RequestContext.class));
+
         String injectedPrefix = "/.(a+)+$/";
         FactIdentifier importedPersonFactIdentifier = FactIdentifier.create(injectedPrefix + ".Person", injectedPrefix + ".Person", injectedPrefix);
 
@@ -546,6 +551,8 @@ public class DMNScenarioRunnerHelperTest {
         decisionResults.add(createDecisionResultMock("decision3", false, messages));
 
         when(dmnResultMock.getDecisionResults()).thenReturn(decisionResults);
+        when(requestContextMock.get(DMNScenarioExecutableBuilder.DMN_RESULT)).thenReturn(dmnResultMock);
+        when(requestContextMock.get(DMNScenarioExecutableBuilder.DMN_MODEL)).thenReturn(dmnModelMock);
 
         ScenarioWithIndex scenarioWithIndex = new ScenarioWithIndex(1, scenario1);
         ScenarioResultMetadata scenarioResultMetadata = runnerHelper.extractResultMetadata(requestContextMock, scenarioWithIndex);
@@ -579,6 +586,8 @@ public class DMNScenarioRunnerHelperTest {
         decisionResults.add(createDecisionResultMock("decision3", false, null));
 
         when(dmnResultMock.getDecisionResults()).thenReturn(decisionResults);
+        when(requestContextMock.get(DMNScenarioExecutableBuilder.DMN_RESULT)).thenReturn(dmnResultMock);
+        when(requestContextMock.get(DMNScenarioExecutableBuilder.DMN_MODEL)).thenReturn(dmnModelMock);
 
         ScenarioWithIndex scenarioWithIndex = new ScenarioWithIndex(1, scenario1);
         ScenarioResultMetadata scenarioResultMetadata = runnerHelper.extractResultMetadata(requestContextMock, scenarioWithIndex);
@@ -608,7 +617,7 @@ public class DMNScenarioRunnerHelperTest {
                 .thenReturn(success ? DecisionEvaluationStatus.SUCCEEDED :
                                     DecisionEvaluationStatus.FAILED);
         if (messages != null) {
-            when(decisionResultMock.getMessages()).thenReturn(messages);
+            Mockito.lenient().when(decisionResultMock.getMessages()).thenReturn(messages);
         }
         return decisionResultMock;
     }
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/RuleScenarioRunnerHelperTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/RuleScenarioRunnerHelperTest.java
index 8af58f750a..45ac28898f 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/RuleScenarioRunnerHelperTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/RuleScenarioRunnerHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -58,13 +58,14 @@ import org.drools.scenariosimulation.backend.runner.model.ScenarioResultMetadata
 import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerData;
 import org.drools.scenariosimulation.backend.runner.model.ValueWrapper;
 import org.drools.scenariosimulation.backend.util.ScenarioSimulationServerMessages;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.api.runtime.KieContainer;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -84,7 +85,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
 
     @Mock
@@ -129,9 +130,8 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     private FactMapping disputeExpressionGivenFactMapping;
     private ExpressionIdentifier expressionGivenExpressionIdentifier;
 
-    @Before
-    public void setup() {
-        when(kieContainerMock.getClassLoader()).thenReturn(classLoader);
+    @BeforeEach
+    void setup() {
 
         simulation = new Simulation();
         background = new Background();
@@ -192,7 +192,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
     
     @Test
-    public void extractGivenValues_scenario1() {
+    void extractGivenValues_scenario1() {
         List<InstanceGiven> scenario1Inputs = extractGivenValuesForScenario1();
         
         assertThat(scenario1Inputs).hasSize(1);
@@ -200,15 +200,14 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
 
     @Test
-    public void extractGivenValues_scenario2() {
+    void extractGivenValues_scenario2() {
         List<InstanceGiven> scenario2Inputs = extractGivenValuesForScenario2();
         
         assertThat(scenario2Inputs).hasSize(2);
-
     }
     
     @Test
-    public void extractGivenValues_scenario2_addOrUpdateMappingValue() {
+    void extractGivenValues_scenario2_addOrUpdateMappingValue() {
         // add expression
         scenario2.addOrUpdateMappingValue(disputeFactIdentifier, expressionGivenExpressionIdentifier, "# new org.drools.scenariosimulation.backend.model.Dispute(\"dispute description\", 10)");
 
@@ -224,7 +223,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
     
     @Test
-    public void extractGivenValues_scenario2_addOrUpdateMappingValue_wrongValue() {
+    void extractGivenValues_scenario2_addOrUpdateMappingValue_wrongValue() {
         scenario2.addOrUpdateMappingValue(disputeFactIdentifier, amountGivenExpressionIdentifier, "WrongValue");
 
         assertThatThrownBy(() -> extractGivenValuesForScenario2())
@@ -232,16 +231,15 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
                 .hasMessage("Error in GIVEN data");
     }    
 
-
     @Test
-    public void extractExpectedValues_scenario1() {
+    void extractExpectedValues_scenario1() {
         List<ScenarioExpect> scenario1Outputs = runnerHelper.extractExpectedValues(scenario1.getUnmodifiableFactMappingValues());
 
         assertThat(scenario1Outputs).hasSize(1);
     }
     
     @Test
-    public void extractExpectedValues_scenario2_addOrUpdateMappingValue() {
+    void extractExpectedValues_scenario2_addOrUpdateMappingValue() {
         scenario2.addOrUpdateMappingValue(FactIdentifier.create("TEST", String.class.getCanonicalName()),
                                           ExpressionIdentifier.create("TEST", FactMappingType.EXPECT),
                                           "TEST");
@@ -253,7 +251,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }    
     
     @Test
-    public void extractExpectedValues_scenario2_addOrUpdateMappingValue_givenAndExpect() {
+    void extractExpectedValues_scenario2_addOrUpdateMappingValue_givenAndExpect() {
         /* A Given "TEST" fact with null rawValue should works as the previous case, i.e. to not consider the GIVEN fact with empty data */
         scenario2.addOrUpdateMappingValue(FactIdentifier.create("TEST", String.class.getCanonicalName()),
                                           ExpressionIdentifier.create("TEST", FactMappingType.EXPECT),
@@ -269,7 +267,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
 
     @Test
-    public void verifyConditions_scenario1() {
+    void verifyConditions_scenario1() {
         List<InstanceGiven> scenario1Inputs = extractGivenValuesForScenario1();
         List<ScenarioExpect> scenario1Outputs = runnerHelper.extractExpectedValues(scenario1.getUnmodifiableFactMappingValues());
 
@@ -285,7 +283,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
     
     @Test
-    public void verifyConditions_scenario2() {
+    void verifyConditions_scenario2() {
         List<InstanceGiven> scenario2Inputs = extractGivenValuesForScenario2();
         List<ScenarioExpect> scenario2Outputs = runnerHelper.extractExpectedValues(scenario2.getUnmodifiableFactMappingValues());
 
@@ -302,7 +300,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
 
     @Test
-    public void getScenarioResultsTest() {
+    void getScenarioResultsTest() {
         List<InstanceGiven> scenario1Inputs = extractGivenValuesForScenario1();
         List<ScenarioExpect> scenario1Outputs = runnerHelper.extractExpectedValues(scenario1.getUnmodifiableFactMappingValues());
 
@@ -347,7 +345,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
  
     @Test
-    public void validateAssertionTest() {
+    void validateAssertionTest() {
         List<ScenarioResult> scenarioFailResult = new ArrayList<>();
         scenarioFailResult.add(new ScenarioResult(amountNameExpectedFactMappingValue, "SOMETHING_ELSE"));
         try {
@@ -402,7 +400,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
 
     @Test
-    public void groupByFactIdentifierAndFilterTest() {
+    void groupByFactIdentifierAndFilterTest() {
         Map<FactIdentifier, List<FactMappingValue>> scenario1Given = runnerHelper.groupByFactIdentifierAndFilter(scenario1.getUnmodifiableFactMappingValues(), FactMappingType.GIVEN);
         assertThat(scenario1Given).hasSize(1);
         assertThat(scenario1Given.get(personFactIdentifier)).hasSize(1);
@@ -424,17 +422,18 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
         assertThat(runnerHelper.groupByFactIdentifierAndFilter(scenario.getUnmodifiableFactMappingValues(), FactMappingType.GIVEN)).hasSize(0);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void groupByFactIdentifierAndFilterFailTest() {
+    @Test
+    void groupByFactIdentifierAndFilterFailTest() {
         List<FactMappingValue> fail = new ArrayList<>();
         FactMappingValue factMappingValue = new FactMappingValue();
         factMappingValue.setRawValue("TEST");
         fail.add(factMappingValue);
-        runnerHelper.groupByFactIdentifierAndFilter(fail, FactMappingType.GIVEN);
+        assertThatThrownBy(() -> runnerHelper.groupByFactIdentifierAndFilter(fail, FactMappingType.GIVEN))
+                .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void createExtractorFunction() {
+    void createExtractorFunction() {
         String personName = "Test";
         FactMappingValue factMappingValue = new FactMappingValue(personFactIdentifier, firstNameGivenExpressionIdentifier, personName);
         Function<Object, ValueWrapper> extractorFunction = runnerHelper.createExtractorFunction(expressionEvaluator, factMappingValue, simulation.getScesimModelDescriptor());
@@ -457,7 +456,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
 
     @Test
-    public void getParamsForBean() {
+    void getParamsForBean() {
         List<FactMappingValue> factMappingValues = new ArrayList<>();
         FactMappingValue factMappingValue1 = spy(new FactMappingValue(disputeFactIdentifier, amountGivenExpressionIdentifier, "NOT PARSABLE"));
         FactMappingValue factMappingValue2 = spy(new FactMappingValue(disputeFactIdentifier, amountGivenExpressionIdentifier, "NOT PARSABLE"));
@@ -476,7 +475,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
 
     @Test
-    public void getDirectMapping() {
+    void getDirectMapping() {
         assertThat(runnerHelper.getDirectMapping(Map.of(List.of(), 1)).getValue()).isEqualTo(1);
 
         Map<List<String>, Object> paramsToSet = new HashMap<>();
@@ -490,7 +489,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
 
     @Test
-    public void createObject() {
+    void createObject() {
         Map<List<String>, Object> params = new HashMap<>();
         params.put(List.of("firstName"), "TestName");
         params.put(List.of("age"), 10);
@@ -505,7 +504,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
 
     @Test
-    public void createObjectDirectMappingSimpleType() {
+    void createObjectDirectMappingSimpleType() {
         Map<List<String>, Object> params = new HashMap<>();
         String directMappingSimpleTypeValue = "TestName";
         params.put(List.of(), directMappingSimpleTypeValue);
@@ -517,7 +516,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
 
     @Test
-    public void createObjectDirectMappingSimpleTypeNull() {
+    void createObjectDirectMappingSimpleTypeNull() {
         Map<List<String>, Object> params = new HashMap<>();
         params.put(List.of(), null);
 
@@ -528,7 +527,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
     
     @Test
-    public void createObjectDirectMappingComplexType() {
+    void createObjectDirectMappingComplexType() {
         Map<List<String>, Object> params = new HashMap<>();
         Person directMappingComplexTypeValue = new Person();
         directMappingComplexTypeValue.setFirstName("TestName");
@@ -546,7 +545,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
 
     @Test
-    public void extractResultMetadata() {
+    void extractResultMetadata() {
         Map<String, Integer> coverageData = new LinkedHashMap<>();
         coverageData.put("rule1", 2);
         coverageData.put("rule2", 2);
@@ -578,7 +577,7 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
 
     @Test
-    public void extractBackgroundValues() {
+    void extractBackgroundValues() {
         // TEST 0 - empty background
         Background emptyBackground = new Background();
         List<InstanceGiven> emptyBackgroundGivens = runnerHelper.extractBackgroundValues(emptyBackground,
@@ -630,8 +629,9 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     }
 
     @Test
-    public void executeScenario() {
+    void executeScenario() {
         ArgumentCaptor<Object> insertCaptor = ArgumentCaptor.forClass(Object.class);
+        when(kieContainerMock.getClassLoader()).thenReturn(classLoader);
 
         ScenarioRunnerData scenarioRunnerData = new ScenarioRunnerData();
         scenarioRunnerData.addBackground(new InstanceGiven(personFactIdentifier, new Person()));
@@ -670,7 +670,6 @@ public class RuleScenarioRunnerHelperTest extends AbstractRuleCoverageTest {
     private void commonAddMessageString(List<String> ruleNames, List<String> expectedMessages) {
         ruleNames.forEach(ruleName -> IntStream.range(1, 3).forEach(index -> expectedMessages.add(ruleName)));
     }
-    
 
 	private List<InstanceGiven> extractGivenValuesForScenario1() {
 		return runnerHelper.extractGivenValues(simulation.getScesimModelDescriptor(),
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/ScenarioJunitActivatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/ScenarioJunitActivatorTest.java
index 17761e50e1..7bf2a4463d 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/ScenarioJunitActivatorTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/ScenarioJunitActivatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -26,23 +26,21 @@ import org.drools.scenariosimulation.api.model.Simulation;
 import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerDTO;
 import org.drools.util.ResourceHelper;
 import org.drools.scenariosimulation.backend.util.ScenarioSimulationXMLPersistence;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.model.InitializationError;
 import org.kie.api.runtime.KieContainer;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
-@RunWith(MockitoJUnitRunner.class)
-public class ScenarioJunitActivatorTest {
+@ExtendWith(MockitoExtension.class)
+@Deprecated
+class ScenarioJunitActivatorTest {
 
     @Mock
     private ScenarioSimulationXMLPersistence xmlReaderMock;
@@ -62,22 +60,17 @@ public class ScenarioJunitActivatorTest {
     @Mock
     private RunNotifier runNotifierMock;
 
-    private Simulation simulationLocal;
-    private Settings settingsLocal;
-
-    @Before
-    public void setup() throws Exception {
-        simulationLocal = new Simulation();
-        settingsLocal = new Settings();
+    @Test
+    void getChildrenTest() throws Exception {
+        Simulation simulationLocal = new Simulation();
+        Settings settingsLocal = new Settings();
         settingsLocal.setSkipFromBuild(true);
+
         when(xmlReaderMock.unmarshal(any())).thenReturn(scenarioSimulationModelMock);
         when(scenarioSimulationModelMock.getSimulation()).thenReturn(simulationLocal);
         when(scenarioSimulationModelMock.getSettings()).thenReturn(settingsLocal);
-    }
 
-    @Test
-    public void getChildrenTest() throws InitializationError {
-        assertThat(getScenarioJunitActivator().getChildren()).hasSize(0);
+        assertThat(getScenarioJunitActivator().getChildren()).isEmpty();
 
         settingsLocal.setSkipFromBuild(false);
 
@@ -85,7 +78,7 @@ public class ScenarioJunitActivatorTest {
     }
 
     @Test
-    public void runChildTest() throws InitializationError {
+    void runChildTest() throws InitializationError {
         getScenarioJunitActivator().runChild(scenarioRunnerDTOMock, runNotifierMock);
         verify(runnerMock, times(1)).run(runNotifierMock);
     }
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/SimulationRunMetadataBuilderTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/SimulationRunMetadataBuilderTest.java
index f73cafc4d6..c183a1427f 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/SimulationRunMetadataBuilderTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/SimulationRunMetadataBuilderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -31,7 +31,7 @@ import org.drools.scenariosimulation.api.model.Scenario;
 import org.drools.scenariosimulation.api.model.ScenarioWithIndex;
 import org.drools.scenariosimulation.api.model.SimulationRunMetadata;
 import org.drools.scenariosimulation.backend.runner.model.ScenarioResultMetadata;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.kie.dmn.api.core.DMNDecisionResult;
 import org.kie.dmn.api.core.DMNMessage;
 
@@ -40,10 +40,10 @@ import static org.assertj.core.api.Assertions.within;
 import static org.drools.scenariosimulation.backend.TestUtils.commonCheckAuditLogLine;
 import static org.drools.scenariosimulation.backend.TestUtils.getRandomlyGeneratedDMNMessageList;
 
-public class SimulationRunMetadataBuilderTest {
+class SimulationRunMetadataBuilderTest {
 
     @Test
-    public void build() {
+    void build() {
         ScenarioWithIndex scenarioWithIndex1 = new ScenarioWithIndex(1, new Scenario());
 
         ScenarioResultMetadata result1 = new ScenarioResultMetadata(scenarioWithIndex1);
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/TestScenarioEngineTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/TestScenarioEngineTest.java
new file mode 100644
index 0000000000..f6de9a3857
--- /dev/null
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/TestScenarioEngineTest.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.drools.scenariosimulation.backend.runner;
+
+import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
+import org.drools.scenariosimulation.backend.TestUtils;
+import org.drools.scenariosimulation.backend.runner.model.ScenarioRunnerDTO;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class TestScenarioEngineTest {
+
+    @ParameterizedTest
+    @MethodSource("getScesimFileNameData")
+    void getScesimFileName(String path, String expectedFileName, Class<?> expectedException) {
+        if (expectedException != null) {
+            assertThatThrownBy(() ->
+                TestScenarioEngine.getScesimFileName(path)
+            ).isInstanceOf(expectedException);
+        } else {
+            assertThat(TestScenarioEngine.getScesimFileName(path)).isEqualTo(expectedFileName);
+        }
+    }
+
+    private static Object[][] getScesimFileNameData() {
+        return new Object[][]{
+                {"src/test/Test.scesim", "Test", null},
+                {"src\\test\\Test.scesim", "Test", null},
+                {"Test.scesim", "Test", null},
+                {"src/test/Test.1.scesim", "Test.1", null},
+                {"src\\test\\Test.1.scesim", "Test.1", null},
+                {"Test", "Test", null},
+                {null, null, NullPointerException.class},
+        };
+    }
+
+    @Test
+    void parseFile_DMN() {
+        ScenarioRunnerDTO scenarioRunnerDTO = TestScenarioEngine.parseFile(TestUtils.getFilePath("scesim-dmn.scesim"));
+
+        assertThat(scenarioRunnerDTO).isNotNull();
+        assertThat(scenarioRunnerDTO.getSettings().getType()).isEqualTo(ScenarioSimulationModel.Type.DMN);
+        assertThat(scenarioRunnerDTO.getSimulationModelDescriptor().getFactMappings()).isNotNull().isNotEmpty();
+        assertThat(scenarioRunnerDTO.getScenarioWithIndices()).isNotNull().isNotEmpty();
+    }
+
+    @Test
+    void parseFile_RULE() {
+        ScenarioRunnerDTO scenarioRunnerDTO = TestScenarioEngine.parseFile(TestUtils.getFilePath("scesim-rule.scesim"));
+
+        assertThat(scenarioRunnerDTO).isNotNull();
+        assertThat(scenarioRunnerDTO.getSettings().getType()).isEqualTo(ScenarioSimulationModel.Type.RULE);
+        assertThat(scenarioRunnerDTO.getSimulationModelDescriptor().getFactMappings()).isNotNull().isNotEmpty();
+        assertThat(scenarioRunnerDTO.getScenarioWithIndices()).isNotNull().isNotEmpty();
+    }
+
+    @Test
+    void parseFile_MissingFile() {
+        assertThatThrownBy(() -> TestScenarioEngine.parseFile("NotExisting.scesim"))
+                .isInstanceOf(ScenarioException.class)
+                .hasMessage("File not found, this should not happen: NotExisting.scesim");
+    }
+
+    @Test
+    void getRunnerHelper_DMN() {
+        AbstractRunnerHelper runnerHelper = TestScenarioEngine.getRunnerHelper(ScenarioSimulationModel.Type.DMN);
+
+        assertThat(runnerHelper).isNotNull().isInstanceOf(DMNScenarioRunnerHelper.class);
+    }
+
+    @Test
+    void getRunnerHelper_RULE() {
+        AbstractRunnerHelper runnerHelper = TestScenarioEngine.getRunnerHelper(ScenarioSimulationModel.Type.RULE);
+
+        assertThat(runnerHelper).isNotNull().isInstanceOf(RuleScenarioRunnerHelper.class);
+    }
+
+    @Test
+    void testDefineFailureException_FailedAssertion() {
+        ScenarioException scenarioException = new ScenarioException("Test failure", true);
+        Throwable result = TestScenarioEngine.defineFailureException(scenarioException, 1, "TestScenario", "TestScenario.scesim");
+
+        assertThat(result).isNotNull().isInstanceOf(IndexedScenarioAssertionError.class);
+        assertThat(result.getMessage()).isEqualTo("#1 TestScenario: Test failure (TestScenario.scesim)");
+    }
+
+    @Test
+    void testDefineFailureException_FailedException() {
+        ScenarioException scenarioException = new ScenarioException("Test failure", false);
+        Throwable result = TestScenarioEngine.defineFailureException(scenarioException, 12, "MyTestScenario", "MyTestScenario.scesim");
+
+        assertThat(result).isNotNull().isInstanceOf(IndexedScenarioException.class);
+        assertThat(result.getMessage()).isEqualTo("#12 MyTestScenario: Test failure (MyTestScenario.scesim)");
+    }
+
+    @Test
+    void testDefineFailureException_GenericException() {
+        Exception genericException = new RuntimeException("GenericEx");
+        Throwable result = TestScenarioEngine.defineFailureException(genericException, 122, "ATestScenario", "ATestScenario.scesim");
+
+        assertThat(result).isNotNull().isInstanceOf(IndexedScenarioException.class);
+        assertThat(result.getMessage()).isEqualTo("#122 ATestScenario: GenericEx (ATestScenario.scesim)");
+    }
+
+}
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/model/ScenarioResultMetadataTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/model/ScenarioResultMetadataTest.java
index a9a2464c23..a2d0231574 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/model/ScenarioResultMetadataTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/model/ScenarioResultMetadataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,8 +20,9 @@ package org.drools.scenariosimulation.backend.runner.model;
 
 import org.drools.scenariosimulation.api.model.Scenario;
 import org.drools.scenariosimulation.api.model.ScenarioWithIndex;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.drools.scenariosimulation.backend.TestUtils.commonCheckAuditLogLine;
@@ -29,28 +30,27 @@ import static org.mockito.Mockito.mock;
 import static org.kie.dmn.api.core.DMNDecisionResult.DecisionEvaluationStatus.FAILED;
 import static org.kie.dmn.api.core.DMNDecisionResult.DecisionEvaluationStatus.SUCCEEDED;
 
-public class ScenarioResultMetadataTest {
+class ScenarioResultMetadataTest {
 
     private ScenarioResultMetadata scenarioResultMetadata;
     private ScenarioWithIndex scenarioWithIndex;
     private Scenario scenarioMock;
     private int SCENARIO_INDEX = 0;
 
-    @Before
-    public void setup() {
+    @BeforeEach
+    void setup() {
         scenarioMock = mock(Scenario.class);
         scenarioWithIndex = new ScenarioWithIndex(SCENARIO_INDEX, scenarioMock);
         scenarioResultMetadata = new ScenarioResultMetadata(scenarioWithIndex);
     }
 
     @Test
-    public void noLogLinesAtTheStart() {
+    void noLogLinesAtTheStart() {
         assertThat(scenarioResultMetadata.getAuditLogLines()).isEmpty();
     }
-
     
     @Test
-    public void addAuditMessage() {
+    void addAuditMessage() {
         scenarioResultMetadata.addAuditMessage(1, "decisionName", SUCCEEDED.toString());
         
         assertThat(scenarioResultMetadata.getAuditLogLines()).hasSize(1);
@@ -58,7 +58,7 @@ public class ScenarioResultMetadataTest {
     }
 
     @Test
-    public void addAuditMessageWithErrorMessage() {
+    void addAuditMessageWithErrorMessage() {
         scenarioResultMetadata.addAuditMessage(1, "decisionName", FAILED.toString(), "Message");
         
         assertThat(scenarioResultMetadata.getAuditLogLines()).hasSize(1);
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/model/ValueWrapperTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/model/ValueWrapperTest.java
index a565a41fe8..47c3b004c1 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/model/ValueWrapperTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/runner/model/ValueWrapperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,7 +18,8 @@
  */
 package org.drools.scenariosimulation.backend.runner.model;
 
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DMNSimulationUtilsTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DMNSimulationUtilsTest.java
index 6056bd5d7d..8e20fc3a85 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DMNSimulationUtilsTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DMNSimulationUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,21 +20,21 @@ package org.drools.scenariosimulation.backend.util;
 
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.api.io.Resource;
 import org.kie.dmn.api.core.DMNModel;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
-public class DMNSimulationUtilsTest {
+@ExtendWith(MockitoExtension.class)
+class DMNSimulationUtilsTest {
 
     @Test
-    public void findDMNModel() {
+    void findDMNModel() {
         List<String> pathToFind = List.of(new StringBuilder("to/find").reverse().toString().split("/"));
 
         List<DMNModel> models = List.of(createDMNModelMock("this/should/not/match"), createDMNModelMock("find"), 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DOMParserUtilTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DOMParserUtilTest.java
index af10939d33..434ecb2ef0 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DOMParserUtilTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DOMParserUtilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -26,14 +26,14 @@ import java.util.stream.Stream;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DOMParserUtilTest {
+class DOMParserUtilTest {
 
     private static final String MAIN_NODE = "Main";
     private static final String MAIN_ATTRIBUTE_NAME = "mainattribute";
@@ -70,12 +70,11 @@ public class DOMParserUtilTest {
             "</" + MAIN_NODE + ">";
 
     @Test
-    public void cleanupNodesString() throws Exception {
+    void cleanupNodesString() throws Exception {
         String retrieved = DOMParserUtil.cleanupNodes(XML, CHILD_NODE, TEST_NODE);
         assertThat(retrieved).isNotNull();
         Map<Node, List<Node>> childrenNodes = DOMParserUtil.getChildrenNodesMap(retrieved, MAIN_NODE, TEST_NODE);
-        assertThat(childrenNodes).isNotNull();
-        assertThat(childrenNodes).hasSize(1);
+        assertThat(childrenNodes).isNotNull().hasSize(1);
         Node keyNode = childrenNodes.keySet().iterator().next();
         assertThat(keyNode.getNodeName()).isEqualTo(MAIN_NODE);
         List<Node> valueNodes = childrenNodes.get(keyNode);
@@ -101,13 +100,12 @@ public class DOMParserUtilTest {
     }
 
     @Test
-    public void cleanupNodesDocument() throws Exception {
+    void cleanupNodesDocument() throws Exception {
         Document document = DOMParserUtil.getDocument(XML);
         DOMParserUtil.cleanupNodes(document, CHILD_NODE, TEST_NODE);
         assertThat(document).isNotNull();
         Map<Node, List<Node>> childrenNodes = DOMParserUtil.getChildrenNodesMap(document, MAIN_NODE, TEST_NODE);
-        assertThat(childrenNodes).isNotNull();
-        assertThat(childrenNodes).hasSize(1);
+        assertThat(childrenNodes).isNotNull().hasSize(1);
         Node keyNode = childrenNodes.keySet().iterator().next();
         assertThat(keyNode.getNodeName()).isEqualTo(MAIN_NODE);
         List<Node> valueNodes = childrenNodes.get(keyNode);
@@ -132,77 +130,67 @@ public class DOMParserUtilTest {
     }
 
     @Test
-    public void replaceNodeText() throws Exception {
+    void replaceNodeText() throws Exception {
         final String replacement = "replacement";
         Document document = DOMParserUtil.getDocument(XML);
         DOMParserUtil.replaceNodeText(document, MAIN_NODE, TEST_NODE, TEST_NODE_CONTENT, replacement);
         final Map<Node, List<Node>> retrieved = DOMParserUtil.getChildrenNodesMap(document, MAIN_NODE, TEST_NODE);
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).hasSize(1);
+        assertThat(retrieved).isNotNull().hasSize(1);
         List<Node> testNodes = retrieved.values().iterator().next();
-        assertThat(testNodes).isNotNull();
-        assertThat(testNodes).hasSize(1);
+        assertThat(testNodes).isNotNull().hasSize(1);
         assertThat(testNodes.get(0).getTextContent()).isEqualTo(replacement);
     }
 
     @Test
-    public void replaceNodeName() throws Exception {
+    void replaceNodeName() throws Exception {
         final String replacement = "replacement";
         Document document = DOMParserUtil.getDocument(XML);
         
         DOMParserUtil.replaceNodeName(document, MAIN_NODE, TEST_NODE, replacement);
         
         final Map<Node, List<Node>> retrieved = DOMParserUtil.getChildrenNodesMap(document, MAIN_NODE, replacement);
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).hasSize(1);
+        assertThat(retrieved).isNotNull().hasSize(1);
         
         List<Node> testNodes = retrieved.values().iterator().next();
-        assertThat(testNodes).isNotNull();
-        assertThat(testNodes).hasSize(1);
+        assertThat(testNodes).isNotNull().hasSize(1);
         assertThat(testNodes.get(0).getNodeName()).isEqualTo("replacement");
     }
 
     @Test
-    public void getAttributeValuesByNode() throws Exception {
+    void getAttributeValuesByNode() throws Exception {
         Document document = DOMParserUtil.getDocument(XML);
 
         Map<Node, String> retrieved = DOMParserUtil.getAttributeValues(document, MAIN_NODE, MAIN_ATTRIBUTE_NAME);
         
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).hasSize(1);
+        assertThat(retrieved).isNotNull().hasSize(1);
         assertThat(retrieved.values().toArray()[0]).isEqualTo(ATTRIBUTE_VALUE);
         
         retrieved = DOMParserUtil.getAttributeValues(document, MAIN_NODE, NOT_EXISTING);
         
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).isEmpty();
+        assertThat(retrieved).isNotNull().isEmpty();
         
         retrieved = DOMParserUtil.getAttributeValues(document, CHILD_NODE, CHILD_ATTRIBUTE_NAME);
         
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).hasSize(2);
+        assertThat(retrieved).isNotNull().hasSize(2);
         retrieved.values().forEach(attributeValue -> assertThat(attributeValue).isEqualTo(ATTRIBUTE_VALUE));
         
         retrieved = DOMParserUtil.getAttributeValues(document, CHILD_NODE, NOT_EXISTING);
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).isEmpty();
+        assertThat(retrieved).isNotNull().isEmpty();
     }
 
     @Test
-    public void getAllAttributeValues() throws Exception {
+    void getAllAttributeValues() throws Exception {
         Document document = DOMParserUtil.getDocument(XML);
         Map<Node, String> retrieved = DOMParserUtil.getAttributeValues(document, MAIN_ATTRIBUTE_NAME);
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).hasSize(1);
+        assertThat(retrieved).isNotNull().hasSize(1);
         assertThat(retrieved.values().toArray()[0]).isEqualTo(ATTRIBUTE_VALUE);
         retrieved = DOMParserUtil.getAttributeValues(document, CHILD_ATTRIBUTE_NAME);
-        assertThat(retrieved).isNotNull();
         assertThat(retrieved).hasSize(2);
         retrieved.values().forEach(attributeValue -> assertThat(attributeValue).isEqualTo(ATTRIBUTE_VALUE));
     }
 
     @Test
-    public void setAttributeValue() throws Exception {
+    void setAttributeValue() throws Exception {
         final String newValue = "NEW_VALUE";
         Document document = DOMParserUtil.getDocument(XML);
         DOMParserUtil.setAttributeValue(document, MAIN_NODE, MAIN_ATTRIBUTE_NAME, newValue);
@@ -218,7 +206,7 @@ public class DOMParserUtilTest {
     }
 
     @Test
-    public void createNodes() throws Exception {
+    void createNodes() throws Exception {
         final String newNodeName = "NEW_NODE_NAME";
         final String newNodeValue = "NEW_NODE_VALUE";
         Document document = DOMParserUtil.getDocument(XML);
@@ -252,7 +240,7 @@ public class DOMParserUtilTest {
     }
 
     @Test
-    public void createNestedNodes() throws Exception {
+    void createNestedNodes() throws Exception {
         final String newNodeName = "NEW_NODE_NAME";
         final String newNodeValue = "NEW_NODE_VALUE";
         Document document = DOMParserUtil.getDocument(XML);
@@ -286,7 +274,7 @@ public class DOMParserUtilTest {
     }
 
     @Test
-    public void createNodeAtPosition() throws Exception {
+    void createNodeAtPosition() throws Exception {
         String newNodeName = "NEW_NODE_NAME_0";
         String newNodeValue = "NEW_NODE_VALUE_=";
         Document document = DOMParserUtil.getDocument(XML);
@@ -319,7 +307,7 @@ public class DOMParserUtilTest {
     }
 
     @Test
-    public void createNodeAndAppend() throws Exception {
+    void createNodeAndAppend() throws Exception {
         String newNodeName0 = "NEW_NODE_NAME_0";
         String newNodeValue0 = "NEW_NODE_VALUE_=";
         Document document = DOMParserUtil.getDocument(XML);
@@ -365,11 +353,10 @@ public class DOMParserUtilTest {
     }
 
     @Test
-    public void getChildrenNodesFromDocument() throws Exception {
+    void getChildrenNodesFromDocument() throws Exception {
         Document document = DOMParserUtil.getDocument(XML);
         Map<Node, List<Node>> retrieved = DOMParserUtil.getChildrenNodesMap(document, MAIN_NODE, TEST_NODE);
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).hasSize(1);
+        assertThat(retrieved).isNotNull().hasSize(1);
         Node keyNode = retrieved.keySet().iterator().next();
         assertThat(keyNode).isNotNull();
         assertThat(keyNode.getNodeName()).isEqualTo(MAIN_NODE);
@@ -378,19 +365,17 @@ public class DOMParserUtilTest {
         assertThat(valueNodes.get(0).getNodeName()).isEqualTo(TEST_NODE);
         
         retrieved = DOMParserUtil.getChildrenNodesMap(document, MAIN_NODE, NOT_EXISTING);
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).hasSize(1);
+        assertThat(retrieved).isNotNull().hasSize(1);
         assertThat(retrieved.values().iterator().next()).isEmpty();
         
         retrieved = DOMParserUtil.getChildrenNodesMap(document, MAIN_NODE, CHILD_NODE);
-        assertThat(retrieved).isNotNull();
         assertThat(retrieved).hasSize(1);
         keyNode = retrieved.keySet().iterator().next();
         assertThat(keyNode).isNotNull();
         assertThat(keyNode.getNodeName()).isEqualTo(MAIN_NODE);
         valueNodes = retrieved.get(keyNode);
         assertThat(valueNodes).isNotNull().hasSize(2);
-        assertThat(valueNodes).extracting(x -> x.getNodeName()).containsExactly(CHILD_NODE, CHILD_NODE);
+        assertThat(valueNodes).extracting(Node::getNodeName).containsExactly(CHILD_NODE, CHILD_NODE);
         
         List<String> nodeToTest = List.of(TEST_NODE, OTHER_NODE);
         for (String childNodeName : nodeToTest) {
@@ -407,12 +392,11 @@ public class DOMParserUtilTest {
     }
 
     @Test
-    public void getChildrenNodesFromNode() throws Exception {
+    void getChildrenNodesFromNode() throws Exception {
         Document document = DOMParserUtil.getDocument(XML);
         Map<Node, List<Node>> retrieved = DOMParserUtil.getChildrenNodesMap(document, MAIN_NODE, CHILD_NODE);
         
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).hasSize(1);
+        assertThat(retrieved).isNotNull().hasSize(1);
         
         Node mainNode = (Node) retrieved.keySet().toArray()[0];
         
@@ -422,33 +406,29 @@ public class DOMParserUtilTest {
         nodes.forEach(childNode -> assertThat(childNode.getNodeName()).isEqualTo(CHILD_NODE));
         retrieved = DOMParserUtil.getChildrenNodesMap(nodes.get(0), NESTING_NODE, NESTED_NODE);
 
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).hasSize(1);
+        assertThat(retrieved).isNotNull().hasSize(1);
         
         Node childNode = (Node) retrieved.keySet().toArray()[0];
         
         assertThat(childNode.getNodeName()).isEqualTo(NESTING_NODE);
         
         nodes = retrieved.get(childNode);
-        assertThat(nodes).isNotNull();
-        assertThat(nodes).hasSize(1);
+        assertThat(nodes).isNotNull().hasSize(1);
         assertThat(nodes.get(0).getNodeName()).isEqualTo(NESTED_NODE);
     }
 
     @Test
-    public void getNestedChildrenNodesMap() throws Exception {
+    void getNestedChildrenNodesMap() throws Exception {
         Document document = DOMParserUtil.getDocument(XML);
         Map<Node, List<Node>> retrieved = DOMParserUtil.getNestedChildrenNodesMap(document, MAIN_NODE, CHILD_NODE, TEST_NODE);
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).hasSize(2);
+        assertThat(retrieved).isNotNull().hasSize(2);
         retrieved.forEach((childNode, testNodes) -> {
             assertThat(childNode.getNodeName()).isEqualTo(CHILD_NODE);
             assertThat(testNodes).hasSize(1);
             assertThat(testNodes.get(0).getNodeName()).isEqualTo(TEST_NODE);
         });
         retrieved = DOMParserUtil.getNestedChildrenNodesMap(document, CHILD_NODE, NESTING_NODE, NESTED_NODE);
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).hasSize(2);
+        assertThat(retrieved).isNotNull().hasSize(2);
         retrieved.forEach((nestingNode, nestedNodes) -> {
         	assertThat(nestingNode.getNodeName()).isEqualTo(NESTING_NODE);
         	assertThat(nestedNodes).hasSize(1);
@@ -457,12 +437,11 @@ public class DOMParserUtilTest {
     }
 
     @Test
-    public void getNestedChildrenNodesList() throws Exception {
+    void getNestedChildrenNodesList() throws Exception {
         Document document = DOMParserUtil.getDocument(XML);
         List<Node> retrieved = DOMParserUtil.getNestedChildrenNodesList(document, MAIN_NODE, CHILD_NODE, TEST_NODE);
         
-        assertThat(retrieved).isNotNull();
-        assertThat(retrieved).hasSize(2);
+        assertThat(retrieved).isNotNull().hasSize(2);
 
         retrieved.forEach(testNode -> assertThat(testNode.getNodeName()).isEqualTo(TEST_NODE));
         retrieved = DOMParserUtil.getNestedChildrenNodesList(document, CHILD_NODE, NESTING_NODE, NESTED_NODE);
@@ -472,14 +451,14 @@ public class DOMParserUtilTest {
     }
 
     @Test
-    public void getDocument() throws Exception {
+    void getDocument() throws Exception {
         Document retrieved = DOMParserUtil.getDocument(XML);
         
         assertThat(retrieved).isNotNull();
     }
 
     @Test
-    public void getString() throws Exception {
+    void getString() throws Exception {
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         DocumentBuilder builder = dbf.newDocumentBuilder();
         Document document = builder.newDocument();
@@ -490,7 +469,7 @@ public class DOMParserUtilTest {
     }
 
     @Test
-    public void asStream() throws Exception {
+    void asStream() throws Exception {
         Document document = DOMParserUtil.getDocument(XML);
         final NodeList mainNodeList = document.getElementsByTagName("Main");
         commonCheckNodeStream(mainNodeList);
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/JsonUtilsTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/JsonUtilsTest.java
index 115e3f743a..a80ec0aaf7 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/JsonUtilsTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/JsonUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,15 +18,15 @@
  */
 package org.drools.scenariosimulation.backend.util;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.drools.scenariosimulation.backend.util.JsonUtils.convertFromStringToJSONNode;
 
-public class JsonUtilsTest {
+class JsonUtilsTest {
 
     @Test
-    public void convertFromStringToJSONNode_manyCases() {
+    void convertFromStringToJSONNode_manyCases() {
         assertThat(convertFromStringToJSONNode(null)).isNotPresent();
         assertThat(convertFromStringToJSONNode("Not json")).isNotPresent();
         assertThat(convertFromStringToJSONNode("\"Not json")).isNotPresent();
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioBeanUtilTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioBeanUtilTest.java
index 14ab3fec74..769c91f5a9 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioBeanUtilTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioBeanUtilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -35,7 +35,7 @@ import org.drools.scenariosimulation.backend.model.SubPerson;
 import org.drools.scenariosimulation.backend.runner.RuleScenarioRunnerHelperTest;
 import org.drools.scenariosimulation.backend.runner.ScenarioException;
 import org.drools.scenariosimulation.backend.util.model.EnumTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -46,14 +46,14 @@ import static org.drools.scenariosimulation.backend.util.ScenarioBeanUtil.getFie
 import static org.drools.scenariosimulation.backend.util.ScenarioBeanUtil.loadClass;
 import static org.drools.scenariosimulation.backend.util.ScenarioBeanUtil.revertValue;
 
-public class ScenarioBeanUtilTest {
+class ScenarioBeanUtilTest {
 
-    private static String FIRST_NAME = "firstNameToSet";
-    private static int AGE = 10;
-    private static ClassLoader classLoader = ScenarioBeanUtilTest.class.getClassLoader();
+    private static final String FIRST_NAME = "firstNameToSet";
+    private static final int AGE = 10;
+    private static final ClassLoader classLoader = ScenarioBeanUtilTest.class.getClassLoader();
 
     @Test
-    public void fillBeanTest() {
+    void fillBeanTest() {
         Map<List<String>, Object> paramsToSet = Map.of(List.of("creator", "firstName"), FIRST_NAME, List.of("creator", "age"), AGE);
 
         Object result = ScenarioBeanUtil.fillBean(errorEmptyMessage(), Dispute.class.getCanonicalName(), paramsToSet, classLoader);
@@ -66,59 +66,68 @@ public class ScenarioBeanUtilTest {
     }
 
     @Test
-    public void fillBeanTestWithInitialInstanceTest() {
+    void fillBeanTestWithInitialInstanceTest() {
         Dispute dispute = new Dispute();
 
         Map<List<String>, Object> paramsToSet = Map.of(List.of("creator", "firstName"), FIRST_NAME, List.of("creator", "age"), AGE);
 
         Object result = ScenarioBeanUtil.fillBean(of(dispute), Dispute.class.getCanonicalName(), paramsToSet, classLoader);
 
-        assertThat(result).isInstanceOf(Dispute.class);
-        assertThat(result).isSameAs(dispute);
+        assertThat(result).isInstanceOf(Dispute.class).isSameAs(dispute);
 
-        assertThat(FIRST_NAME).isEqualTo(dispute.getCreator().getFirstName());
-        assertThat(AGE).isEqualTo(dispute.getCreator().getAge());
+        assertThat(dispute.getCreator().getFirstName()).isEqualTo(FIRST_NAME);
+        assertThat(dispute.getCreator().getAge()).isEqualTo(AGE);
     }
 
-    @Test(expected = ScenarioException.class)
-    public void fillBeanLoadClassTest() {
-        ScenarioBeanUtil.fillBean(errorEmptyMessage(), "FakeCanonicalName", new HashMap<>(), classLoader);
+    @Test
+    void fillBeanLoadClassTest() {
+        assertThatThrownBy(() ->
+                ScenarioBeanUtil.fillBean(errorEmptyMessage(), "FakeCanonicalName", new HashMap<>(), classLoader))
+                .isInstanceOf(ScenarioException.class);
     }
 
-    @Test(expected = ScenarioException.class)
-    public void fillBeanFailNotEmptyConstructorTest() {
+    @Test
+    void fillBeanFailNotEmptyConstructorTest() {
         Map<List<String>, Object> paramsToSet = new HashMap<>();
         paramsToSet.put(List.of("name"), null);
 
-        ScenarioBeanUtil.fillBean(errorEmptyMessage(), NotEmptyConstructor.class.getCanonicalName(), paramsToSet, classLoader);
+        assertThatThrownBy(() ->
+                ScenarioBeanUtil.fillBean(errorEmptyMessage(), NotEmptyConstructor.class.getCanonicalName(), paramsToSet, classLoader))
+                .isInstanceOf(ScenarioException.class);
     }
 
-    @Test(expected = ScenarioException.class)
-    public void fillBeanFailTest() {
+    @Test
+    void fillBeanFailTest() {
         Map<List<String>, Object> paramsToSet = new HashMap<>();
         paramsToSet.put(List.of("fakeField"), null);
 
-        ScenarioBeanUtil.fillBean(errorEmptyMessage(), Dispute.class.getCanonicalName(), paramsToSet, classLoader);
+        assertThatThrownBy(() ->
+                ScenarioBeanUtil.fillBean(errorEmptyMessage(), Dispute.class.getCanonicalName(), paramsToSet, classLoader))
+                .isInstanceOf(ScenarioException.class);
     }
 
-    @Test(expected = ScenarioException.class)
-    public void fillBeanFailNullClassTest() {
+    @Test
+    void fillBeanFailNullClassTest() {
         Map<List<String>, Object> paramsToSet = new HashMap<>();
         paramsToSet.put(List.of("fakeField"), null);
 
-        ScenarioBeanUtil.fillBean(errorEmptyMessage(), null, paramsToSet, classLoader);
+        assertThatThrownBy(() ->
+                ScenarioBeanUtil.fillBean(errorEmptyMessage(), null, paramsToSet, classLoader))
+                .isInstanceOf(ScenarioException.class);
     }
 
-    @Test(expected = ScenarioException.class)
-    public void fillBeanFailWrongTypeTest() {
+    @Test
+    void fillBeanFailWrongTypeTest() {
         Map<List<String>, Object> paramsToSet = new HashMap<>();
         paramsToSet.put(List.of("description"), new ArrayList<>());
 
-        ScenarioBeanUtil.fillBean(errorEmptyMessage(), Dispute.class.getCanonicalName(), paramsToSet, classLoader);
+        assertThatThrownBy(() ->
+                ScenarioBeanUtil.fillBean(errorEmptyMessage(), Dispute.class.getCanonicalName(), paramsToSet, classLoader))
+                .isInstanceOf(ScenarioException.class);
     }
 
     @Test
-    public void fillBeanEmptyValueTest() {
+    void fillBeanEmptyValueTest() {
         Map<List<String>, Object> paramsToSet = new HashMap<>();
         paramsToSet.put(List.of(), null);
 
@@ -126,7 +135,7 @@ public class ScenarioBeanUtilTest {
     }
 
     @Test
-    public void navigateToObjectTest() {
+    void navigateToObjectTest() {
         Dispute dispute = new Dispute();
         Person creator = new Person();
         creator.setFirstName(FIRST_NAME);
@@ -142,7 +151,7 @@ public class ScenarioBeanUtilTest {
     }
 
     @Test
-    public void navigateToObjectFakeFieldTest() {
+    void navigateToObjectFakeFieldTest() {
         Dispute dispute = new Dispute();
         List<String> pathToProperty = List.of("fakeField");
 
@@ -153,7 +162,7 @@ public class ScenarioBeanUtilTest {
     }
 
     @Test
-    public void navigateToObjectNoStepCreationTest() {
+    void navigateToObjectNoStepCreationTest() {
         Dispute dispute = new Dispute();
         List<String> pathToProperty = List.of("creator", "firstName");
 
@@ -164,7 +173,7 @@ public class ScenarioBeanUtilTest {
     }
 
     @Test
-    public void convertValue_manyCases() {
+    void convertValue_manyCases() {
         assertThat(convertValue(String.class.getCanonicalName(), "Test", classLoader)).isEqualTo("Test");
         assertThat(convertValue(BigDecimal.class.getCanonicalName(), "13.33", classLoader)).isEqualTo(BigDecimal.valueOf(13.33));
         assertThat(convertValue(BigDecimal.class.getCanonicalName(), "13", classLoader)).isEqualTo(BigDecimal.valueOf(13));
@@ -216,7 +225,7 @@ public class ScenarioBeanUtilTest {
     }
 
     @Test
-    public void revertValue_manyCases() {
+    void revertValue_manyCases() {
         assertThat(revertValue("Test")).isEqualTo("Test");
         assertThat(revertValue(BigDecimal.valueOf(10000.83))).isEqualTo("10000.83");
         assertThat(revertValue(BigDecimal.valueOf(10000))).isEqualTo("10000");
@@ -253,7 +262,7 @@ public class ScenarioBeanUtilTest {
     }
 
     @Test
-    public void convertAndRevertValue() {
+    void convertAndRevertValue() {
         assertThat(revertValue(convertValue(String.class.getCanonicalName(), "Test", classLoader))).isEqualTo("Test");
         assertThat(revertValue(convertValue(boolean.class.getCanonicalName(), "false", classLoader))).isEqualTo("false");
         assertThat(revertValue(convertValue(Boolean.class.getCanonicalName(), "true", classLoader))).isEqualTo("true");
@@ -307,7 +316,7 @@ public class ScenarioBeanUtilTest {
     }
 
     @Test
-    public void revertAndConvertValueTest() {
+    void revertAndConvertValueTest() {
         assertThat(convertValue(String.class.getCanonicalName(), revertValue("Test"), classLoader)).isEqualTo("Test");
         assertThat(convertValue(boolean.class.getCanonicalName(), revertValue(false), classLoader)).isEqualTo(false);
         assertThat(convertValue(Boolean.class.getCanonicalName(), revertValue(Boolean.TRUE), classLoader)).isEqualTo(Boolean.TRUE);
@@ -352,35 +361,35 @@ public class ScenarioBeanUtilTest {
     }
 
     @Test
-    public void convertValueFailLoadClassTest() {
+    void convertValueFailLoadClassTest() {
         assertThatThrownBy(() -> convertValue("my.NotExistingClass", "Test", classLoader))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessageStartingWith("Impossible to load ");
     }
 
     @Test
-    public void convertValueFailUnsupportedTest() {
+    void convertValueFailUnsupportedTest() {
         assertThatThrownBy(() -> convertValue(RuleScenarioRunnerHelperTest.class.getCanonicalName(), "Test", classLoader))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessageEndingWith("Please use an MVEL expression to use it.");
     }
 
     @Test
-    public void convertValueFailPrimitiveNullTest() {
+    void convertValueFailPrimitiveNullTest() {
         assertThatThrownBy(() -> convertValue("int", null, classLoader))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessageContaining(" is not a String or an instance of");
     }
 
     @Test
-    public void convertValueFailNotStringOrTypeTest() {
+    void convertValueFailNotStringOrTypeTest() {
         assertThatThrownBy(() -> convertValue(RuleScenarioRunnerHelperTest.class.getCanonicalName(), 1, classLoader))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessageStartingWith("Object 1 is not a String or an instance of");
     }
 
     @Test
-    public void convertValueFailParsing() {
+    void convertValueFailParsing() {
         String integerCanonicalName = Integer.class.getCanonicalName();
         assertThatThrownBy(() -> convertValue(integerCanonicalName, "wrongValue", classLoader))
                 .isInstanceOf(IllegalArgumentException.class)
@@ -388,7 +397,7 @@ public class ScenarioBeanUtilTest {
     }
 
     @Test
-    public void convertValueEnumWrongValue() {
+    void convertValueEnumWrongValue() {
         String enumTestCanonicalName = EnumTest.class.getCanonicalName();
         assertThatThrownBy(() -> convertValue(EnumTest.class.getCanonicalName(), "FIRS", classLoader))
                 .isInstanceOf(IllegalArgumentException.class)
@@ -396,7 +405,7 @@ public class ScenarioBeanUtilTest {
     }
 
     @Test
-    public void loadClassTest() {
+    void loadClassTest() {
         assertThat(loadClass(String.class.getCanonicalName(), classLoader)).isEqualTo(String.class);
         assertThat(loadClass(int.class.getCanonicalName(), classLoader)).isEqualTo(int.class);
         assertThat(loadClass(RuleScenarioRunnerHelperTest.class.getCanonicalName(), classLoader)).isEqualTo(RuleScenarioRunnerHelperTest.class);
@@ -412,7 +421,7 @@ public class ScenarioBeanUtilTest {
     }
 
     @Test
-    public void getFieldTest() {
+    void getFieldTest() {
         assertThat(getField(Person.class, "firstName")).isNotNull();
         assertThat(getField(SubPerson.class, "firstName")).isNotNull();
         assertThat(getField(SubPerson.class, "additionalField")).isNotNull();
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationServerMessagesTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationServerMessagesTest.java
index af254a667d..b754bd44df 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationServerMessagesTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationServerMessagesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,7 +20,7 @@ package org.drools.scenariosimulation.backend.util;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.drools.scenariosimulation.backend.util.ScenarioSimulationServerMessages.getCollectionFactExceptionMessage;
@@ -29,45 +29,44 @@ import static org.drools.scenariosimulation.backend.util.ScenarioSimulationServe
 import static org.drools.scenariosimulation.backend.util.ScenarioSimulationServerMessages.getIndexedScenarioMessage;
 import static org.drools.scenariosimulation.backend.util.ScenarioSimulationServerMessages.NULL;
 
-public class ScenarioSimulationServerMessagesTest {
+class ScenarioSimulationServerMessagesTest {
 
     @Test
-    public void getFactWithWrongValueExceptionMessage_manyCases() {
+    void getFactWithWrongValueExceptionMessage_manyCases() {
         String factName = "Fact.name";
-        
+
         String testResult = getFactWithWrongValueExceptionMessage(factName, null, null);
         assertThat(testResult).isEqualTo("Failed in \"Fact.name\": The expected value is \"" + NULL + "\" but the actual one is \"" + NULL + "\"");
-        
+
         testResult = getFactWithWrongValueExceptionMessage(factName, 1, null);
         assertThat(testResult).isEqualTo("Failed in \"Fact.name\": The expected value is \"" + 1 + "\" but the actual one is \"" + NULL + "\"");
-        
+
         testResult = getFactWithWrongValueExceptionMessage(factName, null, "value");
         assertThat(testResult).isEqualTo("Failed in \"Fact.name\": The expected value is \"" + NULL + "\" but the actual one is \"value\"");
     }
 
     @Test
-    public void getGenericScenarioExceptionMessage_simpleCase() {
+    void getGenericScenarioExceptionMessage_simpleCase() {
         assertThat(getGenericScenarioExceptionMessage("An exception message")).isEqualTo("Failure reason: An exception message");
     }
 
     @Test
-    public void getCollectionFactExceptionMessage_manyCases() {
+    void getCollectionFactExceptionMessage_manyCases() {
         String factName = "Fact.name";
         String wrongValue = "value";
-        
+
         String testResult = getCollectionFactExceptionMessage(factName, List.of(), wrongValue);
         assertThat(testResult).isEqualTo("Failed in \"Fact.name\": Impossible to find elements in the collection to satisfy the conditions.");
-        
+
         testResult = getCollectionFactExceptionMessage(factName, List.of("Item #2"), wrongValue);
         assertThat(testResult).isEqualTo("Failed in \"Fact.name\": Value \"value\" is wrong in \"Item #2\"");
-        
+
         testResult = getCollectionFactExceptionMessage(factName, List.of("Item #2"), null);
         assertThat(testResult).isEqualTo("Failed in \"Fact.name\": Wrong in \"Item #2\"");
-
     }
 
     @Test
-    public void getIndexedScenarioMessage_manyCases() {
+    void getIndexedScenarioMessage_manyCases() {
         String failureMessage = "Failure message";
         String scenarioDescription = "First Case";
         String fileName = "ScesimTest";
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java
index 63ece9eb29..5efb18fcbc 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -24,7 +24,7 @@ import java.util.Map;
 
 import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
 import org.drools.scenariosimulation.api.model.imports.Import;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
@@ -51,14 +51,14 @@ import static org.drools.scenariosimulation.backend.util.DOMParserUtil.getNested
 import static org.drools.scenariosimulation.backend.util.DOMParserUtil.getNestedChildrenNodesMap;
 import static org.drools.scenariosimulation.backend.util.ScenarioSimulationXMLPersistence.getColumnWidth;
 
-public class ScenarioSimulationXMLPersistenceTest {
+class ScenarioSimulationXMLPersistenceTest {
 
     protected ScenarioSimulationXMLPersistence instance = ScenarioSimulationXMLPersistence.getInstance();
     protected String currentVersion = new ScenarioSimulationModel().getVersion();
     protected MigrationStrategy migrationInstance = new InMemoryMigrationStrategy();
 
     @Test
-    public void noFQCNUsed() {
+    void noFQCNUsed() {
         final ScenarioSimulationModel simulationModel = new ScenarioSimulationModel();
         simulationModel.getImports().addImport(new Import("org.test.Test"));
 
@@ -68,14 +68,14 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void versionAttributeExists() {
+    void versionAttributeExists() {
         final String xml = instance.marshal(new ScenarioSimulationModel());
         
         assertThat(xml).startsWith("<ScenarioSimulationModel version=\"" + ScenarioSimulationXMLPersistence.getCurrentVersion() + "\">");
     }
 
     @Test
-    public void migrateIfNecessary_1_0_to_1_1() throws Exception {
+    void migrateIfNecessary_1_0_to_1_1() throws Exception {
         String toMigrate = getFileContent("scesim-1-0.scesim");
         Document document = DOMParserUtil.getDocument(toMigrate);
         
@@ -92,7 +92,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void migrateIfNecessary_1_1_to_1_2() throws Exception {
+    void migrateIfNecessary_1_1_to_1_2() throws Exception {
         String toMigrate = getFileContent("scesim-1-1.scesim");
         Document document = DOMParserUtil.getDocument(toMigrate);
         
@@ -108,7 +108,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void migrateIfNecessary_1_2_to_1_3() throws Exception {
+    void migrateIfNecessary_1_2_to_1_3() throws Exception {
         String toMigrate = getFileContent("scesim-1-2.scesim");
         Document document = DOMParserUtil.getDocument(toMigrate);
         
@@ -128,7 +128,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void migrateIfNecessary_1_3_to_1_4() throws Exception {
+    void migrateIfNecessary_1_3_to_1_4() throws Exception {
         String toMigrate = getFileContent("scesim-1-3-rule.scesim");
         Document document = DOMParserUtil.getDocument(toMigrate);
         
@@ -193,7 +193,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void migrateIfNecessary_1_4_to_1_5() throws Exception {
+    void migrateIfNecessary_1_4_to_1_5() throws Exception {
         String toMigrate = getFileContent("scesim-1-4-rule.scesim");
         Document document = DOMParserUtil.getDocument(toMigrate);
         
@@ -205,7 +205,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void migrateIfNecessary_1_5_to_1_6() throws Exception {
+    void migrateIfNecessary_1_5_to_1_6() throws Exception {
         String toMigrate = getFileContent("scesim-1-5-dmn.scesim");
         Document document = DOMParserUtil.getDocument(toMigrate);
         
@@ -217,7 +217,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void migrateIfNecessary_1_6_to_1_7() throws Exception {
+    void migrateIfNecessary_1_6_to_1_7() throws Exception {
         String toMigrate = getFileContent("scesim-1-6-rule.scesim");
         Document document = DOMParserUtil.getDocument(toMigrate);
         
@@ -269,7 +269,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void migrateIfNecessary_1_7_to_1_8() throws Exception {
+    void migrateIfNecessary_1_7_to_1_8() throws Exception {
         String toMigrate = getFileContent("scesim-1-7-dmn.scesim");
         Document document = DOMParserUtil.getDocument(toMigrate);
         
@@ -340,7 +340,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void migrateIfNecessary() throws Exception {
+    void migrateIfNecessary() throws Exception {
         assertThatThrownBy(() -> instance.migrateIfNecessary("<ScenarioSimulationModel version=\"9999999999.99999999999\" />"))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("Version 9999999999.99999999999 of the file is not supported. Current version is " + ScenarioSimulationXMLPersistence.getCurrentVersion());
@@ -353,19 +353,19 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void extractVersionNullDocument() {
+    void extractVersionNullDocument() {
         assertThatThrownBy(() -> instance.extractVersion(null))
                 .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void extractVersionMissingAttribute() {
+    void extractVersionMissingAttribute() {
         assertThatThrownBy(() -> instance.extractVersion(DOMParserUtil.getDocument("<ScenarioSimulationModel />")))
                 .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void extractVersionMissingVersionAttribute_prolog() {
+    void extractVersionMissingVersionAttribute_prolog() {
         assertThatThrownBy(() -> instance.extractVersion(DOMParserUtil.getDocument(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<ScenarioSimulationModel />")))
@@ -373,7 +373,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void extractVersionMissingVersionAttribute_prolog_attribute() {
+    void extractVersionMissingVersionAttribute_prolog_attribute() {
         assertThatThrownBy(() -> instance.extractVersion(DOMParserUtil.getDocument(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                         "<ScenarioSimulationModel xmlns=\"whatever\" />")))
@@ -381,14 +381,14 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void extractVersionWithVersionAttribute() throws ParserConfigurationException, IOException, SAXException {
+    void extractVersionWithVersionAttribute() throws ParserConfigurationException, IOException, SAXException {
         String version = instance.extractVersion(DOMParserUtil.getDocument(
                 "<ScenarioSimulationModel version=\"1.1\" />"));
         assertThat(version).isEqualTo("1.1");
     }
 
     @Test
-    public void extractVersionWithVersionAttribute_prolog() throws ParserConfigurationException, IOException, SAXException {
+    void extractVersionWithVersionAttribute_prolog() throws ParserConfigurationException, IOException, SAXException {
         String version = instance.extractVersion(DOMParserUtil.getDocument(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<ScenarioSimulationModel version=\"1.2\" />"));
@@ -396,7 +396,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void extractVersionWithVersionAttribute_prolog_attributeRight() throws ParserConfigurationException, IOException, SAXException {
+    void extractVersionWithVersionAttribute_prolog_attributeRight() throws ParserConfigurationException, IOException, SAXException {
         String version = instance.extractVersion(DOMParserUtil.getDocument(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                         "<ScenarioSimulationModel version=\"1.4\" xmlns=\"whatever\" />"));
@@ -404,7 +404,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void extractVersionWithVersionAttribute_prolog_attributeLeft() throws ParserConfigurationException, IOException, SAXException {
+    void extractVersionWithVersionAttribute_prolog_attributeLeft() throws ParserConfigurationException, IOException, SAXException {
         String version = instance.extractVersion(DOMParserUtil.getDocument(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                         "<ScenarioSimulationModel xmlns=\"whatever\" version=\"1.5\" />"));
@@ -412,7 +412,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void extractVersionWithVersionAttribute_prolog_attributesMiddle() throws ParserConfigurationException, IOException, SAXException {
+    void extractVersionWithVersionAttribute_prolog_attributesMiddle() throws ParserConfigurationException, IOException, SAXException {
         String version = instance.extractVersion(DOMParserUtil.getDocument(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                         "<ScenarioSimulationModel attribute2=\"whatever\" version=\"1.6\" attribute1=\"whatever\" />"));
@@ -420,7 +420,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void extractVersionWithVersionAttribute_prolog_attributesRight() throws ParserConfigurationException, IOException, SAXException {
+    void extractVersionWithVersionAttribute_prolog_attributesRight() throws ParserConfigurationException, IOException, SAXException {
         String version = instance.extractVersion(DOMParserUtil.getDocument(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                         "<ScenarioSimulationModel attribute2=\"whatever\" attribute1=\"whatever\" version=\"1.7\" />"));
@@ -428,7 +428,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void extractVersionWithVersionAttribute_prolog_attributesLeft() throws ParserConfigurationException, IOException, SAXException {
+    void extractVersionWithVersionAttribute_prolog_attributesLeft() throws ParserConfigurationException, IOException, SAXException {
         String version = instance.extractVersion(DOMParserUtil.getDocument(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                         "<ScenarioSimulationModel version=\"1.8\" attribute2=\"whatever\" attribute1=\"whatever\" />"));
@@ -437,7 +437,7 @@ public class ScenarioSimulationXMLPersistenceTest {
 
 
     @Test
-    public void extractVersionWhenMoreVersionAttributesArePresent() throws ParserConfigurationException, IOException, SAXException {
+    void extractVersionWhenMoreVersionAttributesArePresent() throws ParserConfigurationException, IOException, SAXException {
         String version = instance.extractVersion(DOMParserUtil.getDocument("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<ScenarioSimulationModel version=\"1.2\">\n" +
                 "<someTag version=\"1.1\"/>\n" +
@@ -445,18 +445,20 @@ public class ScenarioSimulationXMLPersistenceTest {
         assertThat(version).isEqualTo("1.2");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void unmarshalEmptyContent() throws Exception {
-        ScenarioSimulationXMLPersistence.getInstance().unmarshal("");
+    @Test
+    void unmarshalEmptyContent() {
+        assertThatThrownBy(() -> ScenarioSimulationXMLPersistence.getInstance().unmarshal("")
+        ).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void unmarshalNullContent() throws Exception {
-        ScenarioSimulationXMLPersistence.getInstance().unmarshal(null);
+    @Test
+    void unmarshalNullContent() {
+        assertThatThrownBy(() -> ScenarioSimulationXMLPersistence.getInstance().unmarshal(null)
+        ).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void unmarshalRULE() throws Exception {
+    void unmarshalRULE() throws Exception {
         String toUnmarshal = getFileContent("scesim-rule.scesim");
         final ScenarioSimulationModel retrieved = ScenarioSimulationXMLPersistence.getInstance().unmarshal(toUnmarshal);
         assertThat(retrieved.getSettings().getType()).isEqualTo(ScenarioSimulationModel.Type.RULE);
@@ -464,7 +466,7 @@ public class ScenarioSimulationXMLPersistenceTest {
     }
 
     @Test
-    public void unmarshalDMN() throws Exception {
+    void unmarshalDMN() throws Exception {
         String toUnmarshal = getFileContent("scesim-dmn.scesim");
         final ScenarioSimulationModel retrieved = ScenarioSimulationXMLPersistence.getInstance().unmarshal(toUnmarshal);
         assertThat(retrieved.getSettings().getType()).isEqualTo(ScenarioSimulationModel.Type.DMN);
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/model/EnumTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/model/EnumTest.java
index eca25a68d0..835e2e9afb 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/model/EnumTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/model/EnumTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml
index b7dae34ec5..e6a571b67e 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml
@@ -66,10 +66,7 @@
     <dependency>
       <groupId>org.drools</groupId>
       <artifactId>drools-scenario-simulation-backend</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-xml-support</artifactId>
+      <scope>test</scope>
     </dependency>
     <!-- DMN EFESTO -->
     <dependency>
@@ -163,10 +160,23 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <!-- This module runs sceim Tests only. If no test is executed, there's something wrong -->
+          <failIfNoTests>true</failIfNoTests>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/java/org/drools/scenariosimulation/integrationtest/ScenarioTest.java b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/java/org/drools/scesim/Hello.java
similarity index 55%
rename from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/java/org/drools/scenariosimulation/integrationtest/ScenarioTest.java
rename to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/java/org/drools/scesim/Hello.java
index d59913ee8f..e2883bf2ed 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/java/org/drools/scenariosimulation/integrationtest/ScenarioTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/java/org/drools/scesim/Hello.java
@@ -16,24 +16,37 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.drools.scenariosimulation.integrationtest;
+package org.drools.scesim;
 
-import org.drools.scenariosimulation.backend.runner.ScenarioJunitActivator;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+public class Hello implements java.io.Serializable {
 
-import static org.kie.efesto.common.api.constants.Constants.INDEXFILE_DIRECTORY_PROPERTY;
+    static final long serialVersionUID = 1L;
 
-@org.junit.runner.RunWith(ScenarioJunitActivator.class)
-public class ScenarioTest {
+    private String greeting;
+    private Boolean approved;
 
-    @BeforeClass
-    public static void setSystemProperties() {
-        System.setProperty(INDEXFILE_DIRECTORY_PROPERTY, "./target/test-classes");
+    public Hello() {
     }
 
-    @AfterClass
-    public static void clearSystemProperties() {
-        System.clearProperty(INDEXFILE_DIRECTORY_PROPERTY);
+    public Hello(String greeting, Boolean approved) {
+        this.greeting = greeting;
+        this.approved = approved;
     }
-}
+
+    public String getGreeting() {
+        return this.greeting;
+    }
+
+    public void setGreeting(String greeting) {
+        this.greeting = greeting;
+    }
+
+    public Boolean getApproved() {
+        return this.approved;
+    }
+
+    public void setApproved(Boolean approved) {
+        this.approved = approved;
+    }
+
+}
\ No newline at end of file
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/META-INF/kmodule.xml b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/META-INF/kmodule.xml
similarity index 100%
copy from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/META-INF/kmodule.xml
copy to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/META-INF/kmodule.xml
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLRegression.dmn b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/dmnPmml/KiePMMLRegression.dmn
similarity index 100%
rename from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLRegression.dmn
rename to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/dmnPmml/KiePMMLRegression.dmn
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLTree.dmn b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/dmnPmml/KiePMMLTree.dmn
similarity index 100%
rename from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLTree.dmn
rename to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/dmnPmml/KiePMMLTree.dmn
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/test_regression.pmml b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/dmnPmml/test_regression.pmml
similarity index 100%
rename from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/test_regression.pmml
rename to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/dmnPmml/test_regression.pmml
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/test_tree.pmml b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/dmnPmml/test_tree.pmml
similarity index 100%
rename from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/test_tree.pmml
rename to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/dmnPmml/test_tree.pmml
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMN/GeneralRules.dmn b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/importedDMN/GeneralRules.dmn
similarity index 100%
rename from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMN/GeneralRules.dmn
rename to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/importedDMN/GeneralRules.dmn
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMN/TrafficViolation.dmn b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/importedDMN/TrafficViolation.dmn
similarity index 100%
rename from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMN/TrafficViolation.dmn
rename to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/importedDMN/TrafficViolation.dmn
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMNInputsDecisions/Traffic Violation.dmn b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/importedDMNInputsDecisions/Traffic Violation.dmn
similarity index 100%
rename from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMNInputsDecisions/Traffic Violation.dmn
rename to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/importedDMNInputsDecisions/Traffic Violation.dmn
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMNInputsDecisions/Using Imported.dmn b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/importedDMNInputsDecisions/Using Imported.dmn
similarity index 100%
rename from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMNInputsDecisions/Using Imported.dmn
rename to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/importedDMNInputsDecisions/Using Imported.dmn
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/NotEmptyConstructor.java b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/org.drools.scesim/HelloRule.drl
similarity index 74%
copy from drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/NotEmptyConstructor.java
copy to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/org.drools.scesim/HelloRule.drl
index 9b5dcc2b9c..d2dc58bc8b 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/model/NotEmptyConstructor.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/org.drools.scesim/HelloRule.drl
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,13 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.drools.scenariosimulation.backend.model;
+package org.drools.scesim;
 
-public class NotEmptyConstructor {
+import org.drools.scesim.Hello;
 
-    private final String name;
+rule HelloApprove when
+    $l: Hello( greeting.equals("foo") )
+then
+    modify($l) { setApproved(true) };
+end
 
-    public NotEmptyConstructor(String name) {
-        this.name = name;
-    }
-}
+rule HelloDeny when
+    $l: Hello( greeting != "foo" )
+then
+    modify($l) { setApproved(false) };
+end
\ No newline at end of file
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/sampleTest/Traffic Violation.dmn b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/trafficViolation/Traffic Violation.dmn
similarity index 100%
rename from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/sampleTest/Traffic Violation.dmn
rename to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/main/resources/trafficViolation/Traffic Violation.dmn
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/model/EnumTest.java b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/java/org/drools/scenariosimulation/integrationtest/TestScenarioTest.java
similarity index 80%
copy from drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/model/EnumTest.java
copy to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/java/org/drools/scenariosimulation/integrationtest/TestScenarioTest.java
index eca25a68d0..5e4ad09c8e 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/model/EnumTest.java
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/java/org/drools/scenariosimulation/integrationtest/TestScenarioTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.drools.scenariosimulation.backend.util.model;
+package org.drools.scenariosimulation.integrationtest;
+
+import org.drools.scenariosimulation.backend.runner.TestScenarioActivator;
+
+@TestScenarioActivator
+public class TestScenarioTest {
 
-/**
- * Example of <code>enum</code> to be used during Enum managing tests.
- */
-public enum EnumTest {
-    FIRST,
-    SECOND
 }
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLRegressionTest.scesim b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLRegressionTest.scesim
index 4777a7cafa..cb01e45770 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLRegressionTest.scesim
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLRegressionTest.scesim
@@ -248,7 +248,7 @@
     </scesimData>
   </background>
   <settings>
-    <dmnFilePath>src/test/resources/dmnPmml/KiePMMLRegression.dmn</dmnFilePath>
+    <dmnFilePath>../../../main/resources/dmnPmml/KiePMMLRegression.dmn</dmnFilePath>
     <type>DMN</type>
     <dmnNamespace>https://kiegroup.org/dmn/_51A1FD67-8A67-4332-9889-B718BE8B7456</dmnNamespace>
     <dmnName>TestRegressionDMN</dmnName>
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLTreeTest.scesim b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLTreeTest.scesim
index c0a578deb2..0fdccde94b 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLTreeTest.scesim
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLTreeTest.scesim
@@ -274,7 +274,7 @@
     </scesimData>
   </background>
   <settings>
-    <dmnFilePath>src/main/resources/dmnPmml/KiePMMLTree.dmn</dmnFilePath>
+    <dmnFilePath>../../../main/resources/dmnPmml/KiePMMLTree.dmn</dmnFilePath>
     <type>DMN</type>
     <dmnNamespace>https://kiegroup.org/dmn/_FAA4232D-9D61-4089-BB05-5F5D7C1AECE1</dmnNamespace>
     <dmnName>TestTreeDMN</dmnName>
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMN/TrafficViolationTest.scesim b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMN/TrafficViolationTest.scesim
index 3ad061db91..4c3a61e276 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMN/TrafficViolationTest.scesim
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMN/TrafficViolationTest.scesim
@@ -1308,7 +1308,7 @@
     </scesimData>
   </background>
   <settings>
-    <dmnFilePath>src/test/resources/importedDMN/TrafficViolation.dmn</dmnFilePath>
+    <dmnFilePath>../../../main/resources/importedDMN/TrafficViolation.dmn</dmnFilePath>
     <type>DMN</type>
     <dmnNamespace>https://kiegroup.org/dmn/_F4681E8D-C4A7-4EEB-915D-3B23B5E0A547</dmnNamespace>
     <dmnName>Traffic Violation</dmnName>
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMNInputsDecisions/Using Imported.scesim b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMNInputsDecisions/Using Imported.scesim
index c7cad7a18a..6015036436 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMNInputsDecisions/Using Imported.scesim	
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/importedDMNInputsDecisions/Using Imported.scesim	
@@ -802,7 +802,7 @@
     </scesimData>
   </background>
   <settings>
-    <dmnFilePath>src/test/resources/importedDMNInputsDecisions/Using Imported.dmn</dmnFilePath>
+    <dmnFilePath>../../../main/resources/importedDMNInputsDecisions/Using Imported.dmn</dmnFilePath>
     <type>DMN</type>
     <dmnNamespace>https://kiegroup.org/dmn/_7120AA2F-BEB6-4CB1-BCC7-427A17AEF71D</dmnNamespace>
     <dmnName>Using Imported</dmnName>
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/META-INF/kmodule.xml b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/logback-test.xml
similarity index 64%
rename from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/META-INF/kmodule.xml
rename to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/logback-test.xml
index efef3d776f..0a647ac625 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/META-INF/kmodule.xml
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/logback-test.xml
@@ -19,5 +19,21 @@
     under the License.
 
 -->
-<kmodule xmlns="http://www.drools.org/xsd/kmodule">
-</kmodule>
+
+<configuration>
+
+  <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} [%thread] %-5level %class{36}.%method:%line - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.kie" level="warn"/>
+  <logger name="org.drools" level="warn"/>
+  <logger name="org.drools.scenariosimulation" level="warn"/>
+
+  <root level="warn">
+    <appender-ref ref="consoleAppender" />
+  </root>
+
+</configuration>
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLTreeTest.scesim b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/org.drools.scesim/HelloScesim.scesim
similarity index 77%
copy from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLTreeTest.scesim
copy to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/org.drools.scesim/HelloScesim.scesim
index c0a578deb2..b2128ce717 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/dmnPmml/KiePMMLTreeTest.scesim
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/org.drools.scesim/HelloScesim.scesim
@@ -54,7 +54,10 @@
         <FactMapping>
           <expressionElements>
             <ExpressionElement>
-              <step>humidity</step>
+              <step>Hello</step>
+            </ExpressionElement>
+            <ExpressionElement>
+              <step>greeting</step>
             </ExpressionElement>
           </expressionElements>
           <expressionIdentifier>
@@ -62,55 +65,58 @@
             <type>GIVEN</type>
           </expressionIdentifier>
           <factIdentifier>
-            <name>humidity</name>
-            <className>humidity</className>
+            <name>1|1</name>
+            <className>org.drools.scesim.Hello</className>
           </factIdentifier>
-          <className>Any</className>
-          <factAlias>humidity</factAlias>
-          <expressionAlias>value</expressionAlias>
-          <genericTypes/>
+          <className>java.lang.String</className>
+          <factAlias>Hello</factAlias>
+          <expressionAlias>greeting</expressionAlias>
           <factMappingValueType>NOT_EXPRESSION</factMappingValueType>
           <columnWidth>337.66666666666663</columnWidth>
         </FactMapping>
         <FactMapping>
           <expressionElements>
             <ExpressionElement>
-              <step>temperature</step>
+              <step>Hello</step>
+            </ExpressionElement>
+            <ExpressionElement>
+              <step>greeting</step>
             </ExpressionElement>
           </expressionElements>
           <expressionIdentifier>
             <name>1|2</name>
-            <type>GIVEN</type>
+            <type>EXPECT</type>
           </expressionIdentifier>
           <factIdentifier>
-            <name>temperature</name>
-            <className>temperature</className>
+            <name>1|1</name>
+            <className>org.drools.scesim.Hello</className>
           </factIdentifier>
-          <className>Any</className>
-          <factAlias>temperature</factAlias>
-          <expressionAlias>value</expressionAlias>
-          <genericTypes/>
+          <className>java.lang.String</className>
+          <factAlias>Hello</factAlias>
+          <expressionAlias>greeting</expressionAlias>
           <factMappingValueType>NOT_EXPRESSION</factMappingValueType>
           <columnWidth>337.66666666666663</columnWidth>
         </FactMapping>
         <FactMapping>
           <expressionElements>
             <ExpressionElement>
-              <step>Decision</step>
+              <step>Hello</step>
+            </ExpressionElement>
+            <ExpressionElement>
+              <step>approved</step>
             </ExpressionElement>
           </expressionElements>
           <expressionIdentifier>
-            <name>1|3</name>
+            <name>1715763614877</name>
             <type>EXPECT</type>
           </expressionIdentifier>
           <factIdentifier>
-            <name>Decision</name>
-            <className>Decision</className>
+            <name>1|1</name>
+            <className>org.drools.scesim.Hello</className>
           </factIdentifier>
-          <className>Any</className>
-          <factAlias>Decision</factAlias>
-          <expressionAlias>value</expressionAlias>
-          <genericTypes/>
+          <className>java.lang.Boolean</className>
+          <factAlias>Hello</factAlias>
+          <expressionAlias>approved</expressionAlias>
           <factMappingValueType>NOT_EXPRESSION</factMappingValueType>
           <columnWidth>337.66666666666663</columnWidth>
         </FactMapping>
@@ -128,50 +134,51 @@
               <name>Description</name>
               <type>OTHER</type>
             </expressionIdentifier>
+            <rawValue class="string">Approved</rawValue>
           </FactMappingValue>
           <FactMappingValue>
             <factIdentifier>
-              <name>humidity</name>
-              <className>humidity</className>
+              <name>#</name>
+              <className>java.lang.Integer</className>
             </factIdentifier>
             <expressionIdentifier>
-              <name>1|1</name>
-              <type>GIVEN</type>
+              <name>Index</name>
+              <type>OTHER</type>
             </expressionIdentifier>
-            <rawValue class="string">40</rawValue>
+            <rawValue class="string">1</rawValue>
           </FactMappingValue>
           <FactMappingValue>
             <factIdentifier>
-              <name>temperature</name>
-              <className>temperature</className>
+              <name>1|1</name>
+              <className>org.drools.scesim.Hello</className>
             </factIdentifier>
             <expressionIdentifier>
-              <name>1|2</name>
+              <name>1|1</name>
               <type>GIVEN</type>
             </expressionIdentifier>
-            <rawValue class="string">30</rawValue>
+            <rawValue class="string">foo</rawValue>
           </FactMappingValue>
           <FactMappingValue>
             <factIdentifier>
-              <name>Decision</name>
-              <className>Decision</className>
+              <name>1|1</name>
+              <className>org.drools.scesim.Hello</className>
             </factIdentifier>
             <expressionIdentifier>
-              <name>1|3</name>
+              <name>1|2</name>
               <type>EXPECT</type>
             </expressionIdentifier>
-            <rawValue class="string">&quot;nothing&quot;</rawValue>
+            <rawValue class="string">foo</rawValue>
           </FactMappingValue>
           <FactMappingValue>
             <factIdentifier>
-              <name>#</name>
-              <className>java.lang.Integer</className>
+              <name>1|1</name>
+              <className>org.drools.scesim.Hello</className>
             </factIdentifier>
             <expressionIdentifier>
-              <name>Index</name>
-              <type>OTHER</type>
+              <name>1715763614877</name>
+              <type>EXPECT</type>
             </expressionIdentifier>
-            <rawValue class="string">1</rawValue>
+            <rawValue class="string">true</rawValue>
           </FactMappingValue>
         </factMappingValues>
       </Scenario>
@@ -186,50 +193,51 @@
               <name>Description</name>
               <type>OTHER</type>
             </expressionIdentifier>
+            <rawValue class="string">Denied</rawValue>
           </FactMappingValue>
           <FactMappingValue>
             <factIdentifier>
-              <name>humidity</name>
-              <className>humidity</className>
+              <name>#</name>
+              <className>java.lang.Integer</className>
             </factIdentifier>
             <expressionIdentifier>
-              <name>1|1</name>
-              <type>GIVEN</type>
+              <name>Index</name>
+              <type>OTHER</type>
             </expressionIdentifier>
-            <rawValue class="string">78</rawValue>
+            <rawValue class="string">2</rawValue>
           </FactMappingValue>
           <FactMappingValue>
             <factIdentifier>
-              <name>temperature</name>
-              <className>temperature</className>
+              <name>1|1</name>
+              <className>org.drools.scesim.Hello</className>
             </factIdentifier>
             <expressionIdentifier>
-              <name>1|2</name>
+              <name>1|1</name>
               <type>GIVEN</type>
             </expressionIdentifier>
-            <rawValue class="string">25</rawValue>
+            <rawValue class="string">bar</rawValue>
           </FactMappingValue>
           <FactMappingValue>
             <factIdentifier>
-              <name>Decision</name>
-              <className>Decision</className>
+              <name>1|1</name>
+              <className>org.drools.scesim.Hello</className>
             </factIdentifier>
             <expressionIdentifier>
-              <name>1|3</name>
+              <name>1|2</name>
               <type>EXPECT</type>
             </expressionIdentifier>
-            <rawValue class="string">&quot;umbrella&quot;</rawValue>
+            <rawValue class="string">bar</rawValue>
           </FactMappingValue>
           <FactMappingValue>
             <factIdentifier>
-              <name>#</name>
-              <className>java.lang.Integer</className>
+              <name>1|1</name>
+              <className>org.drools.scesim.Hello</className>
             </factIdentifier>
             <expressionIdentifier>
-              <name>Index</name>
-              <type>OTHER</type>
+              <name>1715763614877</name>
+              <type>EXPECT</type>
             </expressionIdentifier>
-            <rawValue class="string">2</rawValue>
+            <rawValue class="string">false</rawValue>
           </FactMappingValue>
         </factMappingValues>
       </Scenario>
@@ -274,10 +282,7 @@
     </scesimData>
   </background>
   <settings>
-    <dmnFilePath>src/main/resources/dmnPmml/KiePMMLTree.dmn</dmnFilePath>
-    <type>DMN</type>
-    <dmnNamespace>https://kiegroup.org/dmn/_FAA4232D-9D61-4089-BB05-5F5D7C1AECE1</dmnNamespace>
-    <dmnName>TestTreeDMN</dmnName>
+    <type>RULE</type>
     <skipFromBuild>false</skipFromBuild>
     <stateless>false</stateless>
   </settings>
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/sampleTest/Violation Scenarios.scesim b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/trafficViolation/Traffic Violation.scesim
similarity index 99%
rename from drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/sampleTest/Violation Scenarios.scesim
rename to drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/trafficViolation/Traffic Violation.scesim
index 30859f05b5..663847238f 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/sampleTest/Violation Scenarios.scesim	
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/src/test/resources/trafficViolation/Traffic Violation.scesim	
@@ -771,7 +771,7 @@
     </scesimData>
   </background>
   <settings>
-    <dmnFilePath>src/test/resources/sampleTest/Traffic Violation.dmn</dmnFilePath>
+    <dmnFilePath>../../../main/resources/trafficViolation/Traffic Violation.dmn</dmnFilePath>
     <type>DMN</type>
     <dmnNamespace>https://github.com/kiegroup/drools/kie-dmn/_A4BCA8B8-CF08-433F-93B2-A2598F19ECFF</dmnNamespace>
     <dmnName>Traffic Violation</dmnName>
diff --git a/drools-scenario-simulation/pom.xml b/drools-scenario-simulation/pom.xml
index d1b98256a5..84d0d272ef 100644
--- a/drools-scenario-simulation/pom.xml
+++ b/drools-scenario-simulation/pom.xml
@@ -41,5 +41,4 @@
     <module>drools-scenario-simulation-integrationtest</module>
   </modules>
 
-
 </project>
\ No newline at end of file
diff --git a/kie-archetypes/kie-drools-dmn-archetype/src/main/resources/archetype-resources/src/test/java/ScenarioJunitActivatorTest.java b/kie-archetypes/kie-drools-dmn-archetype/src/main/resources/archetype-resources/src/test/java/ScenarioJunitActivatorTest.java
index c46aaeed78..dc6607cb63 100644
--- a/kie-archetypes/kie-drools-dmn-archetype/src/main/resources/archetype-resources/src/test/java/ScenarioJunitActivatorTest.java
+++ b/kie-archetypes/kie-drools-dmn-archetype/src/main/resources/archetype-resources/src/test/java/ScenarioJunitActivatorTest.java
@@ -39,14 +39,14 @@
 #set( $symbol_escape = '\' )
 package ${package};
 
-import org.drools.scenariosimulation.backend.runner.ScenarioJunitActivator;
+import org.drools.scenariosimulation.backend.runner.TestScenarioActivator;
 
 /**
  * ScenarioJunitActivator is a custom JUnit runner that enables the execution of Test Scenario files (*.scesim).
  * This activator class, when executed, will load all scesim files available in the project and run them.
  * Each row of the scenario will generate a test JUnit result.
  */
-@org.junit.runner.RunWith(ScenarioJunitActivator.class)
+@TestScenarioActivator
 public class ScenarioJunitActivatorTest {
 
 }
\ No newline at end of file
diff --git a/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/reference/src/test/java/it/pkg/ScenarioJunitActivatorTest.java b/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/reference/src/test/java/it/pkg/ScenarioJunitActivatorTest.java
index eee899510d..82357ddae8 100644
--- a/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/reference/src/test/java/it/pkg/ScenarioJunitActivatorTest.java
+++ b/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/reference/src/test/java/it/pkg/ScenarioJunitActivatorTest.java
@@ -19,14 +19,14 @@
 
 package it.pkg;
 
-import org.drools.scenariosimulation.backend.runner.ScenarioJunitActivator;
+import org.drools.scenariosimulation.backend.runner.TestScenarioActivator;
 
 /**
  * ScenarioJunitActivator is a custom JUnit runner that enables the execution of Test Scenario files (*.scesim).
  * This activator class, when executed, will load all scesim files available in the project and run them.
  * Each row of the scenario will generate a test JUnit result.
  */
-@org.junit.runner.RunWith(ScenarioJunitActivator.class)
+@TestScenarioActivator
 public class ScenarioJunitActivatorTest {
 
 }
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org