Remove
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9f6b7f7..2cffc90 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,10 +2,6 @@
 
 packages/stunner-editors/docs/ @yesamer @jomarko
 
-packages/stunner-editors/drools-wb-bom/ @yesamer
-
-packages/stunner-editors/drools-wb-screens/ @yesamer
-
 packages/stunner-editors/kie-wb-common-bom/ @yesamer @romartin
 
 packages/stunner-editors/kie-wb-common-dmn/ @yesamer
diff --git a/.rat-excludes b/.rat-excludes
index e81b579..db92bfc 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -1092,16 +1092,6 @@
 stunner-editors-parent.iml
 # packages/kogito-db-migrator-tool/kogito-db-migrator-tool.iml
 kogito-db-migrator-tool.iml
-# packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/META-INF/beans.xml
-beans.xml
-# packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/java/.gitkeep
-.gitkeep
-# packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/bindings.xjb
-bindings.xjb
-# packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/scesim.xsd
-scesim.xsd
-# packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/js/SCESIMMainJs.js
-SCESIMMainJs.js
 # packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/client/util/Base64Util.java
 Base64Util.java
 # packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/client/util/TimeUnit.java
diff --git a/devbox.lock b/devbox.lock
index c14675d..9596712 100644
--- a/devbox.lock
+++ b/devbox.lock
@@ -1,6 +1,10 @@
 {
   "lockfile_version": "1",
   "packages": {
+    "github:NixOS/nixpkgs/nixpkgs-unstable": {
+      "last_modified": "2025-05-04T22:22:57Z",
+      "resolved": "github:NixOS/nixpkgs/ed30f8aba41605e3ab46421e3dcb4510ec560ff8?lastModified=1746397377&narHash=sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX%2BGGtN9f%2Fn4lU%3D"
+    },
     "gnumake@4.4.1": {
       "last_modified": "2024-10-13T23:44:06Z",
       "resolved": "github:NixOS/nixpkgs/d4f247e89f6e10120f911e2e2d2254a050d0f732#gnumake",
diff --git a/packages/stunner-editors/drools-wb-bom/pom.xml b/packages/stunner-editors/drools-wb-bom/pom.xml
deleted file mode 100644
index 3b91209..0000000
--- a/packages/stunner-editors/drools-wb-bom/pom.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.kie.kogito.stunner.editors</groupId>
-  <artifactId>drools-wb-bom</artifactId>
-  <version>${revision}</version>
-  <packaging>pom</packaging>
-
-  <name>Drools-wb BOM</name>
-  <description>Drools-wb BOM</description>
-
-  <url>http://kogito.kie.org</url>
-  <inceptionYear>2021</inceptionYear>
-  <organization>
-    <name>JBoss by Red Hat</name>
-    <url>http://www.jboss.org/</url>
-  </organization>
-
-  <licenses>
-    <license>
-      <name>Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <connection>scm:git:git@github.com:apache/incubator-kie-tools.git</connection>
-    <developerConnection>scm:git:git@github.com:apache/incubator-kie-tools.git</developerConnection>
-    <url>scm:git:git@github.com:apache/incubator-kie-tools.git</url>
-  </scm>
-
-  <issueManagement>
-    <system>github-issues</system>
-    <url>https://github.com/apache/incubator-kie-issues/issues</url>
-  </issueManagement>
-
-  <properties>
-    <version.com.google.elemental2>1.1.0</version.com.google.elemental2>
-    <sonar.skip>true</sonar.skip>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- drools-wb internal modules -->
-      <dependency>
-        <groupId>org.kie.kogito.stunner.editors</groupId>
-        <artifactId>drools-wb-screens</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.kogito.stunner.editors</groupId>
-        <artifactId>drools-wb-scenario-simulation-editor</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.kogito.stunner.editors</groupId>
-        <artifactId>drools-wb-scenario-simulation-editor-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.kogito.stunner.editors</groupId>
-        <artifactId>drools-wb-scenario-simulation-editor-client</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.kogito.stunner.editors</groupId>
-        <artifactId>drools-wb-scenario-simulation-editor-kogito-client</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.kogito.stunner.editors</groupId>
-        <artifactId>drools-wb-scenario-simulation-editor-kogito-marshaller</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.kogito.stunner.editors</groupId>
-        <artifactId>drools-wb-scenario-simulation-editor-kogito-runtime</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.kogito.stunner.editors</groupId>
-        <artifactId>drools-wb-scenario-simulation-editor-kogito-testing</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <!-- 3rd-party dependencies -->
-      <dependency>
-        <groupId>com.google.elemental2</groupId>
-        <artifactId>elemental2-webstorage</artifactId>
-        <version>${version.com.google.elemental2}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/pom.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/pom.xml
deleted file mode 100644
index 0bd835f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
->
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.kie.kogito.stunner.editors</groupId>
-    <artifactId>drools-wb-scenario-simulation-editor</artifactId>
-    <version>${revision}</version>
-  </parent>
-
-  <artifactId>drools-wb-scenario-simulation-editor-api</artifactId>
-  <packaging>jar</packaging>
-
-  <name>Drools Workbench - Scenario Simulation Editor - API</name>
-  <description>Drools Workbench - Scenario Simulation Editor - API</description>
-
-  <properties>
-    <java.module.name>org.drools.wb.scenariosimulation.editor.api</java.module.name>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-common</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-scenario-simulation-api</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/DMNMetadata.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/DMNMetadata.java
deleted file mode 100644
index f039c15..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/DMNMetadata.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.model;
-
-import org.jboss.errai.common.client.api.annotations.Portable;
-
-@Portable
-public class DMNMetadata {
-
-    private String dmnName;
-    private String dmnNamespace;
-
-    public DMNMetadata() {
-        // Required by Marshaller
-    }
-
-    public DMNMetadata(final String dmnName, final String dmnNamespace) {
-        this.dmnName = dmnName;
-        this.dmnNamespace = dmnNamespace;
-    }
-
-    public void setDmnName(String dmnName) {
-        this.dmnName = dmnName;
-    }
-
-    public void setDmnNamespace(String dmnNamespace) {
-        this.dmnNamespace = dmnNamespace;
-    }
-
-    public String getDmnName() {
-        return dmnName;
-    }
-
-    public String getDmnNamespace() {
-        return dmnNamespace;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/FactMappingValidationError.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/FactMappingValidationError.java
deleted file mode 100644
index c0ea8f2..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/FactMappingValidationError.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.model;
-
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.workbench.screens.scenariosimulation.utils.ScenarioSimulationI18nServerMessage;
-import org.jboss.errai.common.client.api.annotations.Portable;
-
-/**
- * Transport object that contains validation errors
- */
-@Portable
-public class FactMappingValidationError {
-
-    private String errorId;
-    private String errorMessage;
-    private ScenarioSimulationI18nServerMessage serverMessage;
-    private String[] parameters;
-
-    public static FactMappingValidationError createFieldChangedError(FactMapping factMapping, String newType) {
-        return new FactMappingValidationError(extractFactMappingId(factMapping),
-                                              ScenarioSimulationI18nServerMessage.SCENARIO_VALIDATION_FIELD_CHANGED_ERROR,
-                                              factMapping.getClassName(),
-                                              newType);
-    }
-
-    public static FactMappingValidationError createNodeChangedError(FactMapping factMapping, String newType) {
-        return new FactMappingValidationError(extractFactMappingId(factMapping),
-                                              ScenarioSimulationI18nServerMessage.SCENARIO_VALIDATION_NODE_CHANGED_ERROR,
-                                              factMapping.getFactIdentifier().getClassName(),
-                                              newType);
-    }
-
-    public static FactMappingValidationError createFieldAddedConstraintError(FactMapping factMapping) {
-        return new FactMappingValidationError(extractFactMappingId(factMapping),
-                                              ScenarioSimulationI18nServerMessage.SCENARIO_VALIDATION_FIELD_ADDED_CONSTRAINT_ERROR);
-    }
-
-    public static FactMappingValidationError createFieldRemovedConstraintError(FactMapping factMapping) {
-        return new FactMappingValidationError(extractFactMappingId(factMapping),
-                                              ScenarioSimulationI18nServerMessage.SCENARIO_VALIDATION_FIELD_REMOVED_CONSTRAINT_ERROR);
-    }
-
-    public static FactMappingValidationError createGenericError(FactMapping factMapping, String genericError) {
-        return new FactMappingValidationError(extractFactMappingId(factMapping), genericError);
-    }
-
-    private static String extractFactMappingId(FactMapping factMapping) {
-        return factMapping.getFactAlias() + "." + factMapping.getExpressionAlias();
-    }
-
-    public FactMappingValidationError() {
-        // CDI
-    }
-
-    public FactMappingValidationError(String errorId, String errorMessage) {
-        this.errorId = errorId;
-        this.errorMessage = errorMessage;
-    }
-
-    public FactMappingValidationError(String errorId,
-                                      ScenarioSimulationI18nServerMessage serverMessage,
-                                      String ... parameters) {
-        this.errorId = errorId;
-        this.serverMessage = serverMessage;
-        this.parameters = parameters;
-    }
-
-    public String getErrorId() {
-        return errorId;
-    }
-
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    public ScenarioSimulationI18nServerMessage getServerMessage() {
-        return serverMessage;
-    }
-
-    public String[] getParameters() {
-        return parameters;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/SimulationRunResult.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/SimulationRunResult.java
deleted file mode 100644
index f8de3c1..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/SimulationRunResult.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.model;
-
-import java.util.List;
-
-import org.drools.scenariosimulation.api.model.BackgroundDataWithIndex;
-import org.drools.scenariosimulation.api.model.ScenarioWithIndex;
-import org.drools.scenariosimulation.api.model.SimulationRunMetadata;
-import org.guvnor.common.services.shared.test.TestResultMessage;
-import org.jboss.errai.common.client.api.annotations.Portable;
-
-/**
- * Transport object that contains run result data and report
- */
-@Portable
-public class SimulationRunResult {
-
-    protected List<ScenarioWithIndex> scenarioWithIndex;
-
-    protected List<BackgroundDataWithIndex> backgroundDataWithIndex;
-
-    protected SimulationRunMetadata simulationRunMetadata;
-
-    private TestResultMessage testResultMessage;
-
-    public SimulationRunResult() {
-        // CDI
-    }
-
-    public SimulationRunResult(List<ScenarioWithIndex> scenarioWithIndex,
-                               List<BackgroundDataWithIndex> backgroundDataWithIndex,
-                               SimulationRunMetadata simulationRunMetadata,
-                               TestResultMessage testResultMessage) {
-        this.scenarioWithIndex = scenarioWithIndex;
-        this.backgroundDataWithIndex = backgroundDataWithIndex;
-        this.simulationRunMetadata = simulationRunMetadata;
-        this.testResultMessage = testResultMessage;
-    }
-
-    public List<ScenarioWithIndex> getScenarioWithIndex() {
-        return scenarioWithIndex;
-    }
-
-    public List<BackgroundDataWithIndex> getBackgroundDataWithIndex() {
-        return backgroundDataWithIndex;
-    }
-
-    public SimulationRunMetadata getSimulationRunMetadata() {
-        return simulationRunMetadata;
-    }
-
-    public TestResultMessage getTestResultMessage() {
-        return testResultMessage;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/dmo/FieldAccessorsAndMutators.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/dmo/FieldAccessorsAndMutators.java
deleted file mode 100644
index 38f1478..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/dmo/FieldAccessorsAndMutators.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.model.dmo;
-
-public enum FieldAccessorsAndMutators {
-
-    MUTATOR,
-    ACCESSOR,
-    BOTH;
-
-    public static boolean compare( final FieldAccessorsAndMutators field1,
-                                   final FieldAccessorsAndMutators field2 ) {
-
-        if ( field1 == field2 ) {
-            return true;
-        } else if ( field1 == BOTH || field2 == BOTH ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/dmo/ModelField.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/dmo/ModelField.java
deleted file mode 100644
index d4fb0a3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/dmo/ModelField.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.model.dmo;
-
-public class ModelField {
-
-    public static enum FIELD_CLASS_TYPE {
-        REGULAR_CLASS,
-        TYPE_DECLARATION_CLASS
-    }
-
-    public static enum FIELD_ORIGIN {
-        SELF,
-        DECLARED,
-        DELEGATED,
-        INHERITED
-    }
-
-    private String name;
-    private String className;
-    private FieldAccessorsAndMutators accessorsAndMutators;
-
-    /**
-     * parametrized type of clazz
-     */
-    private String type;
-
-    private ModelField.FIELD_CLASS_TYPE classType;
-
-    private ModelField.FIELD_ORIGIN fieldOrigin;
-
-    public ModelField() {
-    }
-
-    /**
-     * Creates a new ModelField instance
-     * @param name field's name
-     * @param clazz the class of the field. For fields defined as a type declaration
-     * @param fieldClassType tells if this is a field for a regular POJO class or for a object type declaration
-     * this clazz should be null.
-     * @param fieldOrigin gives info about this field's origin
-     * @param accessorsAndMutators Whether the field has an Accessor, Mutator or both
-     * @param type the type of the clazz.
-     */
-    public ModelField( final String name,
-                       final String clazz,
-                       final ModelField.FIELD_CLASS_TYPE fieldClassType,
-                       final ModelField.FIELD_ORIGIN fieldOrigin,
-                       final FieldAccessorsAndMutators accessorsAndMutators,
-                       final String type ) {
-        this.name = name;
-        this.classType = fieldClassType;
-        this.fieldOrigin = fieldOrigin;
-        this.className = clazz;
-        this.accessorsAndMutators = accessorsAndMutators;
-        this.type = type;
-    }
-
-    public String getClassName() {
-        return this.className;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public ModelField.FIELD_CLASS_TYPE getClassType() {
-        return classType;
-    }
-
-    public ModelField.FIELD_ORIGIN getOrigin() {
-        return fieldOrigin;
-    }
-
-    public FieldAccessorsAndMutators getAccessorsAndMutators() {
-        return accessorsAndMutators;
-    }
-
-    @Override
-    public String toString() {
-        return "ModelField [classType=" + classType
-                + ", name=" + name
-                + ", type=" + type
-                + ", className=" + className
-                + ", origin=" + fieldOrigin
-                + ", accessorsAndMutators=" + accessorsAndMutators
-                + "]";
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/typedescriptor/FactModelTree.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/typedescriptor/FactModelTree.java
deleted file mode 100644
index 555802d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/typedescriptor/FactModelTree.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.model.typedescriptor;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.jboss.errai.common.client.api.annotations.Portable;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-import static org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils.isCollectionOrMap;
-import static org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils.isMap;
-
-/**
- * Class used to recursively represent a given fact with its ModelFields eventually expanded
- */
-@Portable
-public class FactModelTree {
-
-    public enum Type {
-        INPUT,
-        DECISION,
-        UNDEFINED
-    }
-
-    private String factName;  // The name of the asset
-    private String fullPackage;  // The package of the asset
-    private String typeName; // The type of the asset. In rule case, it's the class name. In dmn it's the full fact name (eg. with prefix)
-    private boolean isSimple = false;
-    /**
-     * Map of the simple properties: key = property name, value = property' type name
-     */
-    private Map<String, PropertyTypeName> simpleProperties;
-    /**
-     * Map of the collection' properties generic-type: key = property name (ex "books"), value = list of property' generic types (ex "com.Book")
-     */
-    private Map<String, List<String>> genericTypesMap;
-    /**
-     * Map of the expandable properties: key = property name, value = property' expandable/complex type
-     */
-    private Map<String, String> expandableProperties = new HashMap<>();
-    private Type type;
-    /**
-     * The import prefix used in case of DMN imported nodes.
-     */
-    private String importPrefix;
-
-    /**
-     * Static factory method to be used in DMO (Rule) context.
-     * @param factName
-     * @param fullPackage
-     * @param simpleProperties
-     * @param genericTypesMap
-     * @param typeName
-     * @return
-     */
-    public static FactModelTree ofDMO(String factName, String fullPackage, Map<String, PropertyTypeName> simpleProperties, Map<String, List<String>> genericTypesMap, String typeName) {
-        return new FactModelTree(factName, fullPackage, simpleProperties, genericTypesMap, Type.UNDEFINED, typeName, null);
-    }
-
-    /**
-     * Static factory method to be used in DMO (Rule) context, to create a Simple Type FactModelTree.
-     * @param factName
-     * @param fullPackage
-     * @param simplePropertyFullClass
-     * @param typeName
-     * @return
-     */
-    public static FactModelTree ofSimpleDMO(String factName, String fullPackage, String simplePropertyFullClass, String typeName) {
-        Map<String, FactModelTree.PropertyTypeName> simpleProperties = new HashMap<>();
-        simpleProperties.put(VALUE, new FactModelTree.PropertyTypeName(simplePropertyFullClass));
-        FactModelTree toReturn = new FactModelTree(factName, fullPackage, simpleProperties, retrieveSimpleGenericTypesMap(simplePropertyFullClass), Type.UNDEFINED, typeName, null);
-        toReturn.setSimple(true);
-        return toReturn;
-    }
-
-    private static Map<String, List<String>> retrieveSimpleGenericTypesMap(String simplePropertyFullClass) {
-        Map<String, List<String>> genericTypesMap = new HashMap<>();
-        if (isCollectionOrMap(simplePropertyFullClass)) {
-            List<String> generics = new ArrayList<>();
-            generics.add(Object.class.getCanonicalName());
-            if (isMap(simplePropertyFullClass)) {
-                generics.add(Object.class.getCanonicalName());
-            }
-            genericTypesMap.put(VALUE, generics);
-        }
-        return genericTypesMap;
-    }
-
-    /**
-     * Static factory method to be used in DMN context.
-     * @param factName
-     * @param simpleProperties
-     * @param genericTypesMap
-     * @param typeName
-     * @param type
-     * @return
-     */
-    public static FactModelTree ofDMN(String factName, String importPrefix, Map<String, PropertyTypeName> simpleProperties, Map<String, List<String>> genericTypesMap, String typeName, Type type) {
-        return new FactModelTree(factName, "", simpleProperties, genericTypesMap, type, typeName, importPrefix);
-    }
-
-    /**
-     * Static factory method to be used in DMN context, to create a Simple Type FactModelTree.
-     * @param factName
-     * @param simplePropertyType
-     * @param genericTypeInfoMap
-     * @param typeName
-     * @param type
-     * @return
-     */
-    public static FactModelTree ofSimpleDMN(String factName, String importPrefix, String simplePropertyType, Map<String, List<String>> genericTypeInfoMap, String typeName, Type type) {
-        Map<String, FactModelTree.PropertyTypeName> simpleProperties = new HashMap<>();
-        simpleProperties.put(VALUE, new FactModelTree.PropertyTypeName(simplePropertyType));
-        FactModelTree toReturn = new FactModelTree(factName, "", simpleProperties, genericTypeInfoMap, type, typeName, importPrefix);
-        toReturn.setSimple(true);
-        return toReturn;
-    }
-
-    public FactModelTree() {
-        // CDI
-    }
-
-    /**
-     * Call this constructor to have a <code>FactModelTree</code> with <b>UNDEFINED</b> <code>Type</code>. RULE Test Scenario specific.
-     * @param factName
-     * @param fullPackage
-     * @param simpleProperties
-     * @param genericTypesMap the <b>generic type</b> info, in the format {collection_class_name}#{generic_type}: ex "java.util.List#com.Book"
-     */
-    public FactModelTree(String factName, String fullPackage, Map<String, PropertyTypeName> simpleProperties, Map<String, List<String>> genericTypesMap) {
-        this(factName, fullPackage, simpleProperties, genericTypesMap, Type.UNDEFINED);
-    }
-
-    /**
-     * Call this constructor to have a <code>FactModelTree</code> with <b>UNDEFINED</b> <code>Type</code> and the type (eg. ClassName)
-     * differs from the factName (A case is for nested classes eg Class.Nested as FactName and Class$Nested as className. RULE Test Scenario specific.
-     * @param factName
-     * @param fullPackage
-     * @param simpleProperties
-     * @param genericTypesMap the <b>generic type</b> info, in the format {collection_class_name}#{generic_type}: ex "java.util.List#com.Book"
-     * @param typeName The typeName of the fact (the className)
-     */
-    public FactModelTree(String factName, String fullPackage, Map<String, PropertyTypeName> simpleProperties, Map<String, List<String>> genericTypesMap, String typeName) {
-        this(factName, fullPackage, simpleProperties, genericTypesMap, Type.UNDEFINED, typeName, "");
-    }
-
-    /**
-     * Call this constructor to specify the <code>FactModelTree</code>' <code>Type</code>. DMN Test Scenario specific.
-     * @param factName
-     * @param fullPackage
-     * @param simpleProperties
-     * @param genericTypesMap the <b>generic type</b> info, in the format {collection_class_name}#{generic_type}: ex "java.util.List#com.Book"
-     * @param type
-     */
-    public FactModelTree(String factName, String fullPackage, Map<String, PropertyTypeName> simpleProperties, Map<String, List<String>> genericTypesMap, Type type) {
-        this(factName, fullPackage, simpleProperties, genericTypesMap, type, null, "");
-    }
-
-    private FactModelTree(String factName, String fullPackage, Map<String, PropertyTypeName> simpleProperties, Map<String, List<String>> genericTypesMap, Type type, String typeName, String importedPrefix) {
-        this.factName = factName;
-        this.fullPackage = fullPackage;
-        this.simpleProperties = simpleProperties;
-        this.genericTypesMap = genericTypesMap;
-        this.type = type;
-        this.typeName = typeName;
-        this.importPrefix = importedPrefix;
-    }
-
-    public String getFactName() {
-        return factName;
-    }
-
-    public String getFullPackage() {
-        return fullPackage;
-    }
-
-    public Map<String, PropertyTypeName> getSimpleProperties() {
-        return simpleProperties;
-    }
-
-    public Map<String, String> getExpandableProperties() {
-        return expandableProperties;
-    }
-
-    public Map<String, List<String>> getGenericTypesMap() {
-        return genericTypesMap;
-    }
-
-    public void addSimpleProperty(String propertyName, PropertyTypeName propertyTypeName) {
-        simpleProperties.put(propertyName, propertyTypeName);
-    }
-
-    public void addExpandableProperty(String propertyName, String propertyType) {
-        expandableProperties.put(propertyName, propertyType);
-    }
-
-    /**
-     * Returns the <b>generic type</b> info of the given <b>property</b>
-     * @param propertyName
-     * @return the <code>List</code> of <b>generic type</b>s, or an <b>empty</b> one
-     */
-    public List<String> getGenericTypeInfo(String propertyName) {
-        return genericTypesMap.getOrDefault(propertyName, new ArrayList<>());
-    }
-
-    public void removeSimpleProperty(String propertyName) {
-        simpleProperties.remove(propertyName);
-    }
-
-    public boolean isSimple() {
-        return isSimple;
-    }
-
-    public void setSimple(boolean simple) {
-        isSimple = simple;
-    }
-
-    public Type getType() {
-        return type;
-    }
-
-    public String getTypeName() {
-        return typeName != null ? typeName : factName;
-    }
-
-    public String getFullTypeName() {
-        return (fullPackage == null || fullPackage.isEmpty()) ? getTypeName() : fullPackage + "." + getTypeName();
-    }
-
-    public String getImportPrefix() {
-        return importPrefix;
-    }
-
-    public FactModelTree cloneFactModelTree() {
-        Map<String, PropertyTypeName> clonedSimpleProperties = new HashMap<>(simpleProperties);
-        Map<String, List<String>> clonedGenericTypesMap =
-                genericTypesMap.entrySet()
-                        .stream()
-                        .collect(Collectors.toMap(
-                                Map.Entry::getKey,
-                                e -> {
-                                    List<String> toReturn =  new ArrayList<>();
-                                    toReturn.addAll(e.getValue());
-                                    return toReturn;
-                                }
-
-                        ));
-        FactModelTree toReturn = new FactModelTree(factName, fullPackage, clonedSimpleProperties, clonedGenericTypesMap, type, typeName, importPrefix);
-        toReturn.expandableProperties = new HashMap<>(expandableProperties);
-        toReturn.isSimple = isSimple;
-        return toReturn;
-    }
-
-    @Override
-    public String toString() {
-        return "FactModelTree{" +
-                "factName='" + factName + '\'' +
-                "typeName='" + typeName + '\'' +
-                ", simpleProperties=" + simpleProperties +
-                ", expandableProperties=" + expandableProperties +
-                '}';
-    }
-
-    /**
-     * Nested DTO which holds a Property name. This is required in case of DMN Type scenario, where, if a DMNType
-     * contains a baseType, it takes the type name from its baseType.
-     * This is to manage DMN Simple Types and Anonymous inner types (please refer to DMN documentation for further info)
-     * For all other cases, typeName is the name to use and show.
-     * - typeName: It is the real type name;
-     * - baseTypeName: Optional, it represents the baseType of a DMNType. If is present, this should be shown in UI but
-     *                 ignored on all other steps.
-     */
-    public static class PropertyTypeName {
-
-        private String typeName;
-        private Optional<String> baseTypeName;
-
-        public PropertyTypeName() {
-            typeName = null;
-            baseTypeName = Optional.empty();
-        }
-
-        public PropertyTypeName(String typeName) {
-            this.typeName = typeName;
-            this.baseTypeName = Optional.empty();
-        }
-
-        public PropertyTypeName(String typeName, String baseTypeName) {
-            this.typeName = typeName;
-            this.baseTypeName = Optional.ofNullable(baseTypeName);
-        }
-
-        public String getTypeName() {
-            return typeName;
-        }
-
-        public Optional<String> getBaseTypeName() {
-            return baseTypeName;
-        }
-
-        public void setTypeName(String typeName) {
-            this.typeName = typeName;
-        }
-
-        public void setBaseTypeName(String baseTypeName) {
-            this.baseTypeName = Optional.ofNullable(baseTypeName);
-        }
-
-        /**
-         * This method returns the correct <b>type</b> name of the property to be visualized in UI. In case of nested
-         * objects, '$' character is substituted with `.`/
-         * @return
-         */
-        public String getPropertyTypeNameToVisualize() {
-            return baseTypeName.orElse(typeName.replace('$', '.'));
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/typedescriptor/FactModelTuple.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/typedescriptor/FactModelTuple.java
deleted file mode 100644
index b0c9e42..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/model/typedescriptor/FactModelTuple.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.model.typedescriptor;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.SortedMap;
-
-import org.jboss.errai.common.client.api.annotations.Portable;
-
-/**
- * Class used to recursively represent a given fact with its ModelFields eventually expanded
- */
-@Portable
-public class FactModelTuple {
-
-    private SortedMap<String, FactModelTree> visibleFacts;
-    private SortedMap<String, FactModelTree> hiddenFacts;
-    private List<String> multipleNestedCollectionError = new ArrayList<>();
-    private List<String> multipleNestedObjectError = new ArrayList<>();
-
-    public FactModelTuple() {
-        // CDI
-    }
-
-    public FactModelTuple(SortedMap<String, FactModelTree> visibleFacts, SortedMap<String, FactModelTree> hiddenFacts) {
-        this.visibleFacts = visibleFacts;
-        this.hiddenFacts = hiddenFacts;
-    }
-
-    public SortedMap<String, FactModelTree> getVisibleFacts() {
-        return visibleFacts;
-    }
-
-    public SortedMap<String, FactModelTree> getHiddenFacts() {
-        return hiddenFacts;
-    }
-
-    public void addMultipleNestedCollectionError(String error) {
-        this.multipleNestedCollectionError.add(error);
-    }
-
-    public void addMultipleNestedObjectError(String error) {
-        this.multipleNestedObjectError.add(error);
-    }
-
-    public List<String> getMultipleNestedCollectionError() {
-        return multipleNestedCollectionError;
-    }
-
-    public List<String> getMultipleNestedObjectError() {
-        return multipleNestedObjectError;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/service/DMNTypeService.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/service/DMNTypeService.java
deleted file mode 100644
index 9ca59a5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/service/DMNTypeService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.service;
-
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.workbench.screens.scenariosimulation.model.DMNMetadata;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-import org.uberfire.backend.vfs.Path;
-
-public interface DMNTypeService {
-
-    /**
-     * Retrieves a <code>FactModelTuple</code> representing the given <b>dmn</b> file
-     * @param path
-     * @param dmnPath
-     * @return
-     * @throws Exception
-     */
-    FactModelTuple retrieveFactModelTuple(Path path, String dmnPath);
-
-    /**
-     * Extract name and namespace from DMN model (dmnPath) and update settings
-     * @param settings to update
-     * @param path to project
-     * @param dmnPath to dmn file
-     */
-    void initializeNameAndNamespace(Settings settings, Path path, String dmnPath);
-
-    /**
-     * It returns the DMN name and namespace given a dmnPath
-     * @param path to project
-     * @param dmnPath to dmn file
-     */
-    DMNMetadata getDMNMetadata(Path path, String dmnPath);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/service/ImportExportService.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/service/ImportExportService.java
deleted file mode 100644
index 98c9326..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/service/ImportExportService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.service;
-
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-
-/**
- * This interface define the service to export and import data from a <code>AbstractScesimModel</code>
- */
-public interface ImportExportService {
-
-    /**
-     * This method export the given <code>AbstractScesimModel</code> to the requested type
-     * @param type
-     * @param scesimModel
-     * @return
-     */
-    Object exportScesimModel(ImportExportType type, AbstractScesimModel<? extends AbstractScesimData> scesimModel);
-
-    /**
-     * This method parse the raw value and return a new <code>AbstractScesimModel</code>. The <b>originalSimulation</b> can be used to retrieve
-     * some metadata not available in the export (i.e. FactMapping)
-     * @param type
-     * @param raw
-     * @param originalScesimModel
-     * @return
-     */
-    <T extends AbstractScesimData> AbstractScesimModel<T> importScesimModel(ImportExportType type, Object raw, AbstractScesimModel<T> originalScesimModel);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/service/ImportExportType.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/service/ImportExportType.java
deleted file mode 100644
index b093a73..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/service/ImportExportType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.service;
-
-import org.jboss.errai.common.client.api.annotations.Portable;
-
-@Portable
-public enum ImportExportType {
-
-    CSV();
-
-    private final String extension;
-
-    ImportExportType() {
-        this.extension = "." + name().toLowerCase();
-    }
-
-    public String getExtension() {
-        return extension;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/service/RunnerReportService.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/service/RunnerReportService.java
deleted file mode 100644
index 7edffeb..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/service/RunnerReportService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.service;
-
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.SimulationRunMetadata;
-
-/**
- * This interface define the service to download a report with the <b>audit messages</b> of a given <code>Simulation</code>
- */
-public interface RunnerReportService {
-
-    /**
-     * This method returns the report of the given <code>SimulationRunMetadata</code>
-     *
-     * @param scenarioRunMetadata
-     * @param modelType
-     * @return
-     */
-    String getReport(SimulationRunMetadata scenarioRunMetadata, ScenarioSimulationModel.Type modelType);
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/type/ScenarioSimulationResourceTypeDefinition.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/type/ScenarioSimulationResourceTypeDefinition.java
deleted file mode 100644
index cb570e0..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/type/ScenarioSimulationResourceTypeDefinition.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.type;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-import org.guvnor.common.services.project.categories.Decision;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.workbench.annotations.VisibleAsset;
-import org.uberfire.workbench.category.Category;
-import org.uberfire.workbench.type.ResourceTypeDefinition;
-
-import static org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils.FILE_EXTENSION;
-
-@Default
-@VisibleAsset
-@ApplicationScoped
-public class ScenarioSimulationResourceTypeDefinition implements ResourceTypeDefinition {
-
-    private Category category;
-
-    public ScenarioSimulationResourceTypeDefinition() {
-    }
-
-    @Inject
-    public ScenarioSimulationResourceTypeDefinition(final Decision category) {
-        this.category = category;
-    }
-
-    @Override
-    public Category getCategory() {
-        return this.category;
-    }
-
-    @Override
-    public String getShortName() {
-        return FILE_EXTENSION;
-    }
-
-    @Override
-    public String getDescription() {
-        return "Test Scenarios";
-    }
-
-    @Override
-    public String getPrefix() {
-        return "";
-    }
-
-    @Override
-    public String getSuffix() {
-        return FILE_EXTENSION;
-    }
-
-    @Override
-    public int getPriority() {
-        return 0;
-    }
-
-    @Override
-    public String getSimpleWildcardPattern() {
-        return "*." + getSuffix();
-    }
-
-    @Override
-    public boolean accept(final Path path) {
-        return path.getFileName().endsWith("." + getSuffix());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/utils/ScenarioSimulationI18nServerMessage.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/utils/ScenarioSimulationI18nServerMessage.java
deleted file mode 100644
index 812ecc0..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/drools/workbench/screens/scenariosimulation/utils/ScenarioSimulationI18nServerMessage.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.utils;
-
-public enum ScenarioSimulationI18nServerMessage {
-
-    SCENARIO_VALIDATION_NODE_CHANGED_ERROR,
-    SCENARIO_VALIDATION_FIELD_CHANGED_ERROR,
-    SCENARIO_VALIDATION_FIELD_ADDED_CONSTRAINT_ERROR,
-    SCENARIO_VALIDATION_FIELD_REMOVED_CONSTRAINT_ERROR;
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/guvnor/common/services/project/categories/Decision.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/guvnor/common/services/project/categories/Decision.java
deleted file mode 100644
index 6f15777..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/guvnor/common/services/project/categories/Decision.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.guvnor.common.services.project.categories;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import org.uberfire.workbench.category.Category;
-
-@ApplicationScoped
-public class Decision extends Category {
-
-    private static final String CATEGORY_NAME = "DECISION";
-
-    @Override
-    public String getName() {
-        return CATEGORY_NAME;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/guvnor/common/services/shared/test/Failure.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/guvnor/common/services/shared/test/Failure.java
deleted file mode 100644
index 6c3ae6e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/guvnor/common/services/shared/test/Failure.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.guvnor.common.services.shared.test;
-
-import org.jboss.errai.common.client.api.annotations.Portable;
-import org.uberfire.backend.vfs.Path;
-
-@Portable
-public class Failure {
-
-    private String message;
-    private Path path;
-    private String displayName;
-
-    public Failure() {
-
-    }
-
-    public Failure(String displayName,
-                   String message) {
-        this(displayName,
-             message,
-             null);
-    }
-
-    public Failure(String displayName,
-                   String message,
-                   Path path) {
-        this.displayName = displayName;
-        this.message = message;
-        this.path = path;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public Path getPath() {
-        return path;
-    }
-
-    @Override
-    public String toString() {
-        return "Failure{" +
-                "message='" + message + '\'' +
-                ", displayName='" + displayName + '\'' +
-                ", path='" + path + '\'' +
-                '}';
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/guvnor/common/services/shared/test/TestResultMessage.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/guvnor/common/services/shared/test/TestResultMessage.java
deleted file mode 100644
index 7714218..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/guvnor/common/services/shared/test/TestResultMessage.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.guvnor.common.services.shared.test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.errai.common.client.api.annotations.Portable;
-
-@Portable
-public class TestResultMessage {
-
-    private String identifier;
-    private int runCount;
-    private Long runTime;
-    private List<Failure> failures = new ArrayList<Failure>();
-
-    public TestResultMessage() {
-    }
-
-    public TestResultMessage(String identifier,
-                             int runCount,
-                             long runTime,
-                             List<Failure> failures) {
-        this.identifier = identifier;
-        this.runCount = runCount;
-        this.runTime = runTime;
-        this.failures = failures;
-    }
-
-    public boolean wasSuccessful() {
-        return failures.isEmpty();
-    }
-
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    public int getRunCount() {
-        return runCount;
-    }
-
-    public long getRunTime() {
-        return runTime;
-    }
-
-    public List<Failure> getFailures() {
-        return failures;
-    }
-
-    public List<String> getResultStrings() {
-        List<String> result = new ArrayList<String>(3 + (failures == null ? 0 : failures.size()));
-        result.add("RunCount: " + this.runCount);
-        if (this.failures != null) {
-            for (Failure failure : this.failures) {
-                result.add("Failure: " + failure.getMessage());
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "TestResultMessage{" +
-                "identifier=" + identifier +
-                ", runCount=" + runCount +
-                ", failures=" + failures +
-                '}';
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/uberfire/backend/vfs/DirectoryStream.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/uberfire/backend/vfs/DirectoryStream.java
deleted file mode 100644
index d09ef24..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/uberfire/backend/vfs/DirectoryStream.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.uberfire.backend.vfs;
-
-public interface DirectoryStream<T> extends Iterable<T> {
-
-    interface Filter<T> {
-
-        boolean accept(T entry);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/uberfire/backend/vfs/VFSService.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/uberfire/backend/vfs/VFSService.java
deleted file mode 100644
index cacd5a7..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/uberfire/backend/vfs/VFSService.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.uberfire.backend.vfs;
-
-import java.util.Map;
-
-public interface VFSService {
-
-    Path get(String uri);
-
-    DirectoryStream<Path> newDirectoryStream(final Path dir)
-            throws IllegalArgumentException;
-
-    DirectoryStream<Path> newDirectoryStream(final Path dir,
-                                             final DirectoryStream.Filter<Path> filter)
-            throws IllegalArgumentException;
-
-    Path createDirectory(final Path dir)
-            throws IllegalArgumentException, UnsupportedOperationException;
-
-    Path createDirectories(final Path dir)
-            throws UnsupportedOperationException;
-
-    Path createDirectory(final Path dir,
-                         final Map<String, ?> attrs)
-            throws IllegalArgumentException, UnsupportedOperationException;
-
-    Path createDirectories(final Path dir,
-                           final Map<String, ?> attrs)
-            throws UnsupportedOperationException;
-
-    Map<String, Object> readAttributes(final Path path)
-            throws UnsupportedOperationException, IllegalArgumentException;
-
-    void setAttributes(final Path path,
-                       final Map<String, Object> attrs)
-            throws IllegalArgumentException;
-
-    void delete(final Path path)
-            throws IllegalArgumentException;
-
-    boolean deleteIfExists(final Path path)
-            throws IllegalArgumentException;
-
-    Path copy(final Path source,
-              final Path target)
-            throws UnsupportedOperationException;
-
-    Path move(final Path source,
-              final Path target)
-            throws UnsupportedOperationException;
-
-    String readAllString(final Path path)
-            throws IllegalArgumentException;
-
-    Path write(final Path path,
-               final String content)
-            throws IllegalArgumentException;
-
-    Path write(final Path path,
-               final String content,
-               final Map<String, ?> attrs)
-            throws IllegalArgumentException;
-
-    boolean isRegularFile(final String uri);
-
-    boolean isRegularFile(final Path path);
-
-    boolean isDirectory(final String uri);
-
-    boolean isDirectory(final Path path);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/uberfire/backend/vfs/impl/DirectoryStreamImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/uberfire/backend/vfs/impl/DirectoryStreamImpl.java
deleted file mode 100644
index aa7328c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/java/org/uberfire/backend/vfs/impl/DirectoryStreamImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.uberfire.backend.vfs.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.jboss.errai.common.client.api.annotations.MapsTo;
-import org.jboss.errai.common.client.api.annotations.Portable;
-import org.uberfire.backend.vfs.DirectoryStream;
-import org.uberfire.backend.vfs.Path;
-
-@Portable
-public class DirectoryStreamImpl implements DirectoryStream<Path> {
-
-    private List<Path> content;
-
-    public DirectoryStreamImpl(@MapsTo("content") final List<Path> content) {
-        this.content = new ArrayList<>(content);
-    }
-
-    @Override
-    public Iterator<Path> iterator() {
-        return new Iterator<Path>() {
-            private int i = 0;
-
-            @Override
-            public boolean hasNext() {
-                return i < content.size();
-            }
-
-            @Override
-            public Path next() {
-                if (i < content.size()) {
-                    final Path result = content.get(i);
-                    i++;
-                    return result;
-                } else {
-                    throw new NoSuchElementException();
-                }
-            }
-
-            @Override
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
-        };
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/META-INF/ErraiApp.properties b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/META-INF/ErraiApp.properties
deleted file mode 100644
index ac3b5ed..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/META-INF/ErraiApp.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# 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. 
-#
-
-# ErraiApp.properties
-#
-# Do not remove, even if empty!
-#
-
-# This is a marker file. When it is detected inside a JAR or at the
-# top of any classpath, the subdirectories are scanned for deployable
-# components. As such, all Errai application modules in a project
-# should contain an ErraiApp.properties at the root of all classpaths
-# that you wish to be scanned.
-#
-# There are also some configuration options that can be set in this
-# file, although it is rarely necessary. See the documentation at
-# https://docs.jboss.org/author/display/ERRAI/ErraiApp.properties
-# for details.
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/META-INF/beans.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index e69de29..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/META-INF/beans.xml
+++ /dev/null
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/org/drools/workbench/screens/scenariosimulation/DroolsWorkbenchScenarioSimulationEditorAPI.gwt.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/org/drools/workbench/screens/scenariosimulation/DroolsWorkbenchScenarioSimulationEditorAPI.gwt.xml
deleted file mode 100644
index b850884..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/org/drools/workbench/screens/scenariosimulation/DroolsWorkbenchScenarioSimulationEditorAPI.gwt.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  ~ 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.      
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN"
-  "http://www.gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-  <inherits name="org.drools.scenariosimulation.ScenarioSimulationAPI" />
-
-  <source path="model" />
-  <source path="type" />
-  <source path="service" />
-  <source path="utils" />
-</module>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/org/guvnor/common/services/GuvnorCommonServices.gwt.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/org/guvnor/common/services/GuvnorCommonServices.gwt.xml
deleted file mode 100644
index 372e464..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/main/resources/org/guvnor/common/services/GuvnorCommonServices.gwt.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  ~ 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.      
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN"
-  "http://www.gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-  <source path="backend" />
-  <source path="project" />
-  <source path="shared" />
-</module>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/test/java/org/drools/workbench/screens/scenariosimulation/model/FactMappingValidationErrorTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/test/java/org/drools/workbench/screens/scenariosimulation/model/FactMappingValidationErrorTest.java
deleted file mode 100644
index 9a87469..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/test/java/org/drools/workbench/screens/scenariosimulation/model/FactMappingValidationErrorTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.model;
-
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.workbench.screens.scenariosimulation.utils.ScenarioSimulationI18nServerMessage;
-import org.junit.Before;
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertEquals;
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-import static org.junit.Assert.assertNull;
-
-public class FactMappingValidationErrorTest {
-
-    private FactMapping factMapping;
-
-    @Before
-    public void setup() {
-        factMapping = new FactMapping(FactIdentifier.create("myType", "tMYTYPE"),
-                                      ExpressionIdentifier.create(VALUE, FactMappingType.GIVEN));
-        factMapping.setFactAlias("FactAlias");
-        factMapping.setExpressionAlias("ExpressionAlias");
-    }
-
-    @Test
-    public void createFieldChangedError() {
-        FactMappingValidationError error = FactMappingValidationError.createFieldChangedError(factMapping, "tNEWTYPE");
-        assertEquals("FactAlias.ExpressionAlias", error.getErrorId());
-        assertEquals(ScenarioSimulationI18nServerMessage.SCENARIO_VALIDATION_FIELD_CHANGED_ERROR, error.getServerMessage());
-        assertEquals(2, error.getParameters().length);
-        assertEquals("tMYTYPE", error.getParameters()[0]);
-        assertEquals("tNEWTYPE", error.getParameters()[1]);
-        assertNull(error.getErrorMessage());
-    }
-
-    @Test
-    public void createFieldAddedConstraintError() {
-        FactMappingValidationError error = FactMappingValidationError.createFieldAddedConstraintError(factMapping);
-        assertEquals("FactAlias.ExpressionAlias", error.getErrorId());
-        assertEquals(ScenarioSimulationI18nServerMessage.SCENARIO_VALIDATION_FIELD_ADDED_CONSTRAINT_ERROR, error.getServerMessage());
-        assertEquals(0, error.getParameters().length);
-        assertNull(error.getErrorMessage());
-    }
-
-    @Test
-    public void createFieldRemovedConstraintError() {
-        FactMappingValidationError error = FactMappingValidationError.createFieldRemovedConstraintError(factMapping);
-        assertEquals("FactAlias.ExpressionAlias", error.getErrorId());
-        assertEquals(ScenarioSimulationI18nServerMessage.SCENARIO_VALIDATION_FIELD_REMOVED_CONSTRAINT_ERROR, error.getServerMessage());
-        assertEquals(0, error.getParameters().length);
-        assertNull(error.getErrorMessage());
-    }
-
-    @Test
-    public void createNodeChangedError() {
-        FactMappingValidationError error = FactMappingValidationError.createNodeChangedError(factMapping, "tNEWTYPE");
-        assertEquals("FactAlias.ExpressionAlias", error.getErrorId());
-        assertEquals(ScenarioSimulationI18nServerMessage.SCENARIO_VALIDATION_NODE_CHANGED_ERROR, error.getServerMessage());
-        assertEquals(2, error.getParameters().length);
-        assertEquals("tMYTYPE", error.getParameters()[0]);
-        assertEquals("tNEWTYPE", error.getParameters()[1]);
-        assertNull(error.getErrorMessage());
-    }
-
-    @Test
-    public void createGenericError() {
-        FactMappingValidationError error = FactMappingValidationError.createGenericError(factMapping, "err");
-        assertEquals("FactAlias.ExpressionAlias", error.getErrorId());
-        assertNull(error.getServerMessage());
-        assertEquals("err", error.getErrorMessage());
-        assertNull(error.getParameters());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/test/java/org/drools/workbench/screens/scenariosimulation/model/typedescriptor/FactModelTreeTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/test/java/org/drools/workbench/screens/scenariosimulation/model/typedescriptor/FactModelTreeTest.java
deleted file mode 100644
index e3267d6..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/test/java/org/drools/workbench/screens/scenariosimulation/model/typedescriptor/FactModelTreeTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.model.typedescriptor;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.drools.scenariosimulation.api.utils.ConstantsHolder;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-public class FactModelTreeTest {
-
-    private final static String FACT_NAME = "FactName";
-    private final static String PACKAGE = "com";
-    private final static String FACT_TYPE = "FactType";
-    private final static String SIMPLE_PROPERTY_TYPE = "numeric";
-    private final static String LIST_PROPERTY_TYPE = List.class.getCanonicalName();
-    private final static String MAP_PROPERTY_TYPE = Map.class.getCanonicalName();
-    private final static String IMPORT_PREFIX = "imp";
-
-    @Test
-    public void ofDMOConstructorNoTypeName() {
-        FactModelTree factModelTree = FactModelTree.ofDMO(FACT_NAME, PACKAGE, Collections.emptyMap(), Collections.emptyMap(), null);
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(FACT_NAME, factModelTree.getTypeName());
-        assertEquals(PACKAGE, factModelTree.getFullPackage());
-        assertEquals(PACKAGE + "." + FACT_NAME, factModelTree.getFullTypeName());
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(0, factModelTree.getSimpleProperties().size());
-        assertEquals(0, factModelTree.getGenericTypesMap().size());
-        assertEquals(FactModelTree.Type.UNDEFINED, factModelTree.getType());
-        assertFalse(factModelTree.isSimple());
-        assertNull(factModelTree.getImportPrefix());
-    }
-
-    @Test
-    public void ofDMOConstructorFactNameEqualsToTypeName() {
-        FactModelTree factModelTree = FactModelTree.ofDMO(FACT_NAME, PACKAGE, Collections.emptyMap(), Collections.emptyMap(), FACT_NAME);
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(FACT_NAME, factModelTree.getTypeName());
-        assertEquals(PACKAGE, factModelTree.getFullPackage());
-        assertEquals(PACKAGE + "." + FACT_NAME, factModelTree.getFullTypeName());
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(0, factModelTree.getSimpleProperties().size());
-        assertEquals(0, factModelTree.getGenericTypesMap().size());
-        assertEquals(FactModelTree.Type.UNDEFINED, factModelTree.getType());
-        assertFalse(factModelTree.isSimple());
-        assertNull(factModelTree.getImportPrefix());
-    }
-
-    @Test
-    public void ofDMOConstructorFactNameNotEqualsToTypeName() {
-        FactModelTree factModelTree = FactModelTree.ofDMO(FACT_NAME, PACKAGE, Collections.emptyMap(), Collections.emptyMap(), FACT_TYPE);
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(FACT_TYPE, factModelTree.getTypeName());
-        assertEquals(PACKAGE, factModelTree.getFullPackage());
-        assertEquals(PACKAGE + "." + FACT_TYPE, factModelTree.getFullTypeName());
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(0, factModelTree.getSimpleProperties().size());
-        assertEquals(0, factModelTree.getGenericTypesMap().size());
-        assertEquals(FactModelTree.Type.UNDEFINED, factModelTree.getType());
-        assertFalse(factModelTree.isSimple());
-        assertNull(factModelTree.getImportPrefix());
-    }
-
-    @Test
-    public void ofSimpleDMO() {
-        FactModelTree factModelTree = FactModelTree.ofSimpleDMO(FACT_NAME, PACKAGE, SIMPLE_PROPERTY_TYPE, FACT_TYPE);
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(FACT_TYPE, factModelTree.getTypeName());
-        assertEquals(PACKAGE, factModelTree.getFullPackage());
-        assertEquals(PACKAGE + "." + FACT_TYPE, factModelTree.getFullTypeName());
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(1, factModelTree.getSimpleProperties().size());
-        assertEquals(SIMPLE_PROPERTY_TYPE, factModelTree.getSimpleProperties().get(ConstantsHolder.VALUE).getTypeName());
-        assertEquals(0, factModelTree.getGenericTypesMap().size());
-        assertEquals(FactModelTree.Type.UNDEFINED, factModelTree.getType());
-        assertTrue(factModelTree.isSimple());
-        assertNull(factModelTree.getImportPrefix());
-    }
-
-    @Test
-    public void ofSimpleCollectionDMO() {
-        FactModelTree factModelTree = FactModelTree.ofSimpleDMO(FACT_NAME, PACKAGE, LIST_PROPERTY_TYPE, FACT_TYPE);
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(FACT_TYPE, factModelTree.getTypeName());
-        assertEquals(PACKAGE, factModelTree.getFullPackage());
-        assertEquals(PACKAGE + "." + FACT_TYPE, factModelTree.getFullTypeName());
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(1, factModelTree.getSimpleProperties().size());
-        assertEquals(LIST_PROPERTY_TYPE, factModelTree.getSimpleProperties().get(ConstantsHolder.VALUE).getTypeName());
-        assertEquals(1, factModelTree.getGenericTypesMap().size());
-        assertEquals(1, factModelTree.getGenericTypesMap().get(ConstantsHolder.VALUE).size());
-        assertEquals(Object.class.getCanonicalName(), factModelTree.getGenericTypesMap().get(ConstantsHolder.VALUE).get(0));
-        assertEquals(FactModelTree.Type.UNDEFINED, factModelTree.getType());
-        assertTrue(factModelTree.isSimple());
-        assertNull(factModelTree.getImportPrefix());
-    }
-
-    @Test
-    public void ofSimpleMapDMO() {
-        FactModelTree factModelTree = FactModelTree.ofSimpleDMO(FACT_NAME, PACKAGE, MAP_PROPERTY_TYPE, FACT_TYPE);
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(FACT_TYPE, factModelTree.getTypeName());
-        assertEquals(PACKAGE, factModelTree.getFullPackage());
-        assertEquals(PACKAGE + "." + FACT_TYPE, factModelTree.getFullTypeName());
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(1, factModelTree.getSimpleProperties().size());
-        assertEquals(MAP_PROPERTY_TYPE, factModelTree.getSimpleProperties().get(ConstantsHolder.VALUE).getTypeName());
-        assertEquals(1, factModelTree.getGenericTypesMap().size());
-        assertEquals(2, factModelTree.getGenericTypesMap().get(ConstantsHolder.VALUE).size());
-        assertEquals(Object.class.getCanonicalName(), factModelTree.getGenericTypesMap().get(ConstantsHolder.VALUE).get(0));
-        assertEquals(Object.class.getCanonicalName(), factModelTree.getGenericTypesMap().get(ConstantsHolder.VALUE).get(1));
-        assertEquals(FactModelTree.Type.UNDEFINED, factModelTree.getType());
-        assertTrue(factModelTree.isSimple());
-        assertNull(factModelTree.getImportPrefix());
-    }
-
-    @Test
-    public void ofDMN() {
-        FactModelTree factModelTree = FactModelTree.ofDMN(FACT_NAME, IMPORT_PREFIX, Collections.emptyMap(), Collections.emptyMap(), FACT_TYPE, FactModelTree.Type.INPUT);
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(FACT_TYPE, factModelTree.getTypeName());
-        assertEquals("", factModelTree.getFullPackage());
-        assertEquals(FACT_TYPE, factModelTree.getFullTypeName());
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(0, factModelTree.getSimpleProperties().size());
-        assertEquals(0, factModelTree.getGenericTypesMap().size());
-        assertEquals(FactModelTree.Type.INPUT, factModelTree.getType());
-        assertFalse(factModelTree.isSimple());
-        assertEquals(IMPORT_PREFIX, factModelTree.getImportPrefix());
-    }
-
-    @Test
-    public void ofSimpleDMN() {
-        FactModelTree factModelTree = FactModelTree.ofSimpleDMN(FACT_NAME, IMPORT_PREFIX, SIMPLE_PROPERTY_TYPE, Collections.emptyMap(), FACT_TYPE, FactModelTree.Type.INPUT);
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(FACT_TYPE, factModelTree.getTypeName());
-        assertEquals("", factModelTree.getFullPackage());
-        assertEquals(FACT_TYPE, factModelTree.getFullTypeName());
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(1, factModelTree.getSimpleProperties().size());
-        assertEquals(SIMPLE_PROPERTY_TYPE, factModelTree.getSimpleProperties().get(ConstantsHolder.VALUE).getTypeName());
-        assertEquals(0, factModelTree.getGenericTypesMap().size());
-        assertEquals(FactModelTree.Type.INPUT, factModelTree.getType());
-        assertTrue(factModelTree.isSimple());
-        assertEquals(IMPORT_PREFIX, factModelTree.getImportPrefix());
-    }
-
-    @Test
-    public void getTypeNameSetToNull() {
-        FactModelTree factModelTree = new FactModelTree(FACT_NAME, PACKAGE, Collections.emptyMap(), Collections.emptyMap());
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(FACT_NAME, factModelTree.getTypeName());
-        assertEquals(PACKAGE, factModelTree.getFullPackage());
-        assertEquals(PACKAGE + "." + FACT_NAME, factModelTree.getFullTypeName());
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(FactModelTree.Type.UNDEFINED, factModelTree.getType());
-    }
-
-    @Test
-    public void getTypeNameSet() {
-        FactModelTree factModelTree = new FactModelTree(FACT_NAME, PACKAGE, Collections.emptyMap(), Collections.emptyMap(), FACT_TYPE);
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(FACT_TYPE, factModelTree.getTypeName());
-        assertEquals(PACKAGE, factModelTree.getFullPackage());
-        assertEquals(PACKAGE + "." + FACT_TYPE, factModelTree.getFullTypeName());
-        assertEquals(FACT_NAME, factModelTree.getFactName());
-        assertEquals(FactModelTree.Type.UNDEFINED, factModelTree.getType());
-    }
-
-    @Test
-    public void getFullTypeName() {
-        FactModelTree factModelTree = FactModelTree.ofDMO(FACT_NAME, PACKAGE, Collections.emptyMap(), Collections.emptyMap(), FACT_TYPE);
-        assertEquals(PACKAGE + "." + FACT_TYPE, factModelTree.getFullTypeName());
-        factModelTree = FactModelTree.ofDMO(FACT_NAME, "", Collections.emptyMap(), Collections.emptyMap(), FACT_TYPE);
-        assertEquals(FACT_TYPE, factModelTree.getFullTypeName());
-        factModelTree = FactModelTree.ofDMO(FACT_NAME, null, Collections.emptyMap(), Collections.emptyMap(), FACT_TYPE);
-        assertEquals(FACT_TYPE, factModelTree.getFullTypeName());
-        factModelTree = FactModelTree.ofDMO(FACT_NAME, "", Collections.emptyMap(), Collections.emptyMap(), FACT_NAME);
-        assertEquals(FACT_NAME, factModelTree.getFullTypeName());
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/test/java/org/drools/workbench/screens/scenariosimulation/model/typedescriptor/PropertyTypeNameTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/test/java/org/drools/workbench/screens/scenariosimulation/model/typedescriptor/PropertyTypeNameTest.java
deleted file mode 100644
index 4a4b40d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-api/src/test/java/org/drools/workbench/screens/scenariosimulation/model/typedescriptor/PropertyTypeNameTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.model.typedescriptor;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-public class PropertyTypeNameTest {
-
-    @Test
-    public void propertyTypeNameEmpty() {
-        String typeName = "typeName";
-        String baseTypeName = "baseTypeName";
-        FactModelTree.PropertyTypeName propertyTypeNameTest = new FactModelTree.PropertyTypeName();
-        assertNull(propertyTypeNameTest.getTypeName());
-        assertFalse(propertyTypeNameTest.getBaseTypeName().isPresent());
-        propertyTypeNameTest.setTypeName(typeName);
-        assertEquals(typeName, propertyTypeNameTest.getPropertyTypeNameToVisualize());
-        propertyTypeNameTest.setBaseTypeName(baseTypeName);
-        assertTrue(propertyTypeNameTest.getBaseTypeName().isPresent());
-        assertEquals(typeName, propertyTypeNameTest.getTypeName());
-        assertEquals(baseTypeName, propertyTypeNameTest.getPropertyTypeNameToVisualize());
-    }
-
-    @Test
-    public void propertyTypeNameNoBaseType() {
-        String typeName = "typeName";
-        FactModelTree.PropertyTypeName propertyTypeNameTest = new FactModelTree.PropertyTypeName(typeName);
-        assertFalse(propertyTypeNameTest.getBaseTypeName().isPresent());
-        assertEquals(typeName, propertyTypeNameTest.getTypeName());
-        assertEquals(typeName, propertyTypeNameTest.getPropertyTypeNameToVisualize());
-    }
-
-    @Test
-    public void propertyTypeNestedNameNoBaseType() {
-        String typeName = "typeName$nested";
-        FactModelTree.PropertyTypeName propertyTypeNameTest = new FactModelTree.PropertyTypeName(typeName);
-        assertFalse(propertyTypeNameTest.getBaseTypeName().isPresent());
-        assertEquals(typeName, propertyTypeNameTest.getTypeName());
-        assertEquals("typeName.nested", propertyTypeNameTest.getPropertyTypeNameToVisualize());
-    }
-
-    @Test
-    public void propertyTypeNameWithBaseType() {
-        String typeName = "typeName";
-        String baseTypeName = "baseTypeName";
-        FactModelTree.PropertyTypeName propertyTypeNameTest = new FactModelTree.PropertyTypeName(typeName, baseTypeName);
-        assertTrue(propertyTypeNameTest.getBaseTypeName().isPresent());
-        assertEquals(typeName, propertyTypeNameTest.getTypeName());
-        assertEquals(baseTypeName, propertyTypeNameTest.getPropertyTypeNameToVisualize());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/Docks.md b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/Docks.md
deleted file mode 100644
index f14adb9..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/Docks.md
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-   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.
--->
-
-# Details on Docks management inside ScenarioSimulationEditor
-
-_Docks_ is the term used to identify the panel to the left/right and bottom of the main view. They are managed by upper framework and are _ApplicationScoped_,
-i.e. there is only one single instance per each browser tab.
-Inside each dock there could be one or more _sub-dock_ (like a multitabbed element).
-In the ScenarioSimulationEditor client correct setup of specific _dock_ (namely, the right one) is delegated to _ScenarioSimulationDocksHandler_.
-There are currently two issues to face:
-
-1. all the dock handling is _ApplicationScoped_ by design, while most of ScenarioSimulation widget's are _DependentScoped_ by design
-2. switching between _sub-docks_ does not fire a change of focus, but a specific event (namely, _UberfireDocksInteractionEvent_).
-
-The solution implemented is two-sided:
-
-a) 1. _ScenarioSimulationEditorPresenter_ listen* for \_UberfireDocksInteractionEvent* 2. depending on the _UberfireDock_ referenced by the above event, the presenter try to retrieve the current instance of the _subdock_ and populate it
-
-The above solution is partial, because since _ScenarioSimulationEditorPresenter_ is _DependentScoped_ there is one instance for each scenario currently opened in the same browser tab;
-that means that each of them will try to populate the given _subdock_, and since this is a sort of _singleton_, data actually shown may not correspond to the scenario shown.
-So, a _sort-of_ mapping has been implemented between ScenarioSimulationEditorPresenter and _subdocks_
-
-b) 1. inside _ScenarioSimulationDocksHandler_ there is a method to set a "scesimpath" parameter to the _PlaceRequest_ bind to each _UberfireDock_ (remember there is only one of each) 2. inside _ScenarioSimulationEditorPresenter.onPlaceGainFocusEvent_ the above method is called, so that whenever a scenario get focus (only one at time for each browser tab) it set its own _path_
-to the _UberfireDocks_ placerequest 3. when the user switch _subdock_ an _UberfireDocksInteractionEvent_ is fired up and intercepted by all the _ScenarioSimulationEditorPresenter_ instances,
-but only the one with the matching _path_ will actually manage it
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/pom.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/pom.xml
deleted file mode 100644
index e28a5fa..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/pom.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
->
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.kie.kogito.stunner.editors</groupId>
-    <artifactId>drools-wb-scenario-simulation-editor</artifactId>
-    <version>${revision}</version>
-  </parent>
-
-  <artifactId>drools-wb-scenario-simulation-editor-client</artifactId>
-  <packaging>jar</packaging>
-
-  <name>Drools Workbench - Scenario Simulation Editor - Client</name>
-  <description>Drools Workbench - Scenario Simulation Editor - Client</description>
-
-  <properties>
-    <java.module.name>org.drools.wb.scenariosimulation.editor.client</java.module.name>
-    <sonar.coverage.exclusions
-    >**/editor/ScenarioSimulationEditorWrapper.java,**/events/**.java</sonar.coverage.exclusions>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>javax.enterprise</groupId>
-      <artifactId>cdi-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-scenario-simulation-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.gwtbootstrap3</groupId>
-      <artifactId>gwtbootstrap3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-widgets-commons</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-client-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-workbench-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-workbench-client-views-patternfly</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-commons-editor-client</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-ioc</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.spec.javax.annotation</groupId>
-          <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-ui</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.kie.kogito.stunner.editors</groupId>
-          <artifactId>errai-javax-enterprise</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>drools-wb-scenario-simulation-editor-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-ui</artifactId>
-    </dependency>
-
-    <!--Wires Grids dependencies-->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-wires-core-grids</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>appformer-client-api</artifactId>
-    </dependency>
-
-    <!-- Lienzo -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>lienzo-core</artifactId>
-    </dependency>
-
-    <!-- GWT and GWT Extensions -->
-    <dependency>
-      <groupId>org.gwtproject</groupId>
-      <artifactId>gwt-user</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.elemental2</groupId>
-      <artifactId>elemental2-dom</artifactId>
-    </dependency>
-
-    <!-- Test scope dependencies -->
-    <dependency>
-      <groupId>com.google.gwt.gwtmockito</groupId>
-      <artifactId>gwtmockito</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>lienzo-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/ScenarioSimulationEditorEntryPoint.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/ScenarioSimulationEditorEntryPoint.java
deleted file mode 100644
index f2eb763..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/ScenarioSimulationEditorEntryPoint.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client;
-
-import javax.annotation.PostConstruct;
-
-import com.ait.lienzo.client.core.config.LienzoCore;
-import org.drools.workbench.screens.scenariosimulation.client.resources.ScenarioSimulationEditorResources;
-import org.jboss.errai.ioc.client.api.EntryPoint;
-
-@EntryPoint
-public class ScenarioSimulationEditorEntryPoint {
-
-    @PostConstruct
-    public void startApp() {
-        ScenarioSimulationEditorResources.INSTANCE.css().ensureInjected();
-        LienzoCore.get().setHidpiEnabled(true);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionEditorUtils.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionEditorUtils.java
deleted file mode 100644
index d753aa1..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionEditorUtils.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.FA_ANGLE_DOWN;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.FA_ANGLE_RIGHT;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.NODE_HIDDEN;
-
-public class CollectionEditorUtils {
-
-
-    public static boolean isShown(SpanElement faAngleRight) {
-        return faAngleRight.getClassName().contains(FA_ANGLE_DOWN);
-    }
-
-    public static  void toggleRowExpansion(SpanElement faAngleRight, boolean toExpand) {
-        if (toExpand) {
-            faAngleRight.addClassName(FA_ANGLE_DOWN);
-            faAngleRight.removeClassName(FA_ANGLE_RIGHT);
-        } else {
-            faAngleRight.addClassName(FA_ANGLE_RIGHT);
-            faAngleRight.removeClassName(FA_ANGLE_DOWN);
-        }
-    }
-
-    public static void toggleRowExpansion(final LIElement liElement, boolean isShown) {
-        if (isShown) {
-            liElement.addClassName(NODE_HIDDEN);
-            liElement.getStyle().setDisplay(Style.Display.NONE);
-        } else {
-            liElement.removeClassName(NODE_HIDDEN);
-            liElement.getStyle().setDisplay(Style.Display.BLOCK);
-        }
-    }
-
-    public static void setSpanAttributeAttributes(String dataI18nKey, String innerText, String dataField, SpanElement spanElement) {
-        spanElement.setInnerText(innerText);
-        spanElement.setAttribute("data-i18n-key", dataI18nKey);
-        spanElement.setAttribute("data-field", dataField);
-    }
-
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenter.java
deleted file mode 100644
index 731ba18..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenter.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.json.client.JSONArray;
-import com.google.gwt.json.client.JSONObject;
-import com.google.gwt.json.client.JSONParser;
-import com.google.gwt.json.client.JSONString;
-import com.google.gwt.json.client.JSONValue;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.editingbox.ItemEditingBoxPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.editingbox.KeyValueEditingBoxPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.ConfirmPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.ScenarioConfirmationPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-
-public class CollectionPresenter implements CollectionView.Presenter {
-
-    @Inject
-    protected ItemElementPresenter listElementPresenter;
-
-    @Inject
-    protected KeyValueElementPresenter mapElementPresenter;
-
-    @Inject
-    protected ViewsProvider viewsProvider;
-
-    @Inject
-    protected ItemEditingBoxPresenter listEditingBoxPresenter;
-
-    @Inject
-    protected KeyValueEditingBoxPresenter mapEditingBoxPresenter;
-
-    @Inject
-    protected ScenarioConfirmationPopupPresenter scenarioConfirmationPopupPresenter;
-
-    @Inject
-    protected ConfirmPopupPresenter confirmPopupPresenter;
-
-    /**
-     * <code>Map</code> used to pair the <code>Map</code> with instance' <b>simple properties</b> classes with a specific <b>key</b> representing the property, i.e Classname#propertyname (e.g Author#books)
-     */
-    protected Map<String, Map<String, String>> simplePropertiesMap = new HashMap<>();
-
-    /**
-     * <code>Map</code> used to pair the <code>Map</code> with instance' <b>expandable properties</b> classes with a specific <b>key</b> representing the property, i.e Classname#propertyname (e.g Author#books)
-     */
-    protected Map<String, Map<String, Map<String, String>>> expandablePropertiesMap = new HashMap<>();
-
-    protected CollectionView collectionView;
-
-    @Override
-    public void initListStructure(String key, Map<String, String> simplePropertiesMap, Map<String, Map<String, String>> expandablePropertiesMap, CollectionView collectionView) {
-        commonInit(key, collectionView);
-        this.simplePropertiesMap.put(key, simplePropertiesMap);
-        this.expandablePropertiesMap.put(key, expandablePropertiesMap);
-        listEditingBoxPresenter.setCollectionEditorPresenter(this);
-        listElementPresenter.setCollectionEditorPresenter(this);
-        listElementPresenter.onToggleRowExpansion(false);
-    }
-
-    @Override
-    public void initMapStructure(String key, Map<String, String> keyPropertyMap, Map<String, String> valuePropertyMap, CollectionView collectionView) {
-        commonInit(key, collectionView);
-        simplePropertiesMap.put(key + "#key", keyPropertyMap);
-        simplePropertiesMap.put(key + "#value", valuePropertyMap);
-        mapEditingBoxPresenter.setCollectionEditorPresenter(this);
-        mapElementPresenter.setCollectionEditorPresenter(this);
-        mapElementPresenter.onToggleRowExpansion(false);
-    }
-
-    @Override
-    public void setValue(String jsonString) {
-        if (jsonString == null || jsonString.isEmpty()) {
-            return;
-        }
-        JSONValue jsonValue = getJSONValue(jsonString);
-        if (jsonValue instanceof JSONString) {
-            populateExpression(jsonValue);
-        } else {
-            populateCreateCollection(jsonValue);
-        }
-    }
-
-    /**
-     * It populates the guided "Create Collection" editor
-     * @param value
-     */
-    protected void populateCreateCollection(JSONValue value) {
-        if (collectionView.isListWidget()) {
-            populateList(value);
-        } else {
-            populateMap(value);
-        }
-    }
-
-    @Override
-    public void showEditingBox() {
-        String key = collectionView.getEditorTitle().getInnerText();
-        LIElement editingBox = collectionView.isListWidget() ?
-                listEditingBoxPresenter.getEditingBox(key, simplePropertiesMap.get(key), expandablePropertiesMap.get(key)) :
-                mapEditingBoxPresenter.getEditingBox(key, simplePropertiesMap.get(key + "#key"), simplePropertiesMap.get(key + "#value"));
-        collectionView.getElementsContainer().appendChild(editingBox);
-        editingBox.scrollIntoView();
-        toggleEditingStatus(true);
-    }
-
-    @Override
-    public void onToggleRowExpansion(boolean isShown) {
-        collectionView.toggleRowExpansion();
-        if (collectionView.isListWidget()) {
-            listElementPresenter.onToggleRowExpansion(isShown);
-        } else {
-            mapElementPresenter.onToggleRowExpansion(isShown);
-        }
-    }
-
-    @Override
-    public void updateRowExpansionStatus(boolean isShown) {
-        collectionView.updateRowExpansionStatus(isShown);
-    }
-
-    @Override
-    public void addListItem(Map<String, String> simplePropertiesValues, Map<String, Map<String, String>> expandablePropertiesValues) {
-        final UListElement elementsContainer = collectionView.getElementsContainer();
-        String itemId = String.valueOf(elementsContainer.getChildCount() - 1);
-        final LIElement itemElement = listElementPresenter.getItemContainer(itemId, simplePropertiesValues, expandablePropertiesValues);
-        elementsContainer.appendChild(itemElement);
-        toggleEditingStatus(false);
-    }
-
-    @Override
-    public void addMapItem(Map<String, String> keyPropertiesValues, Map<String, String> valuePropertiesValues) {
-        final UListElement elementsContainer = collectionView.getElementsContainer();
-        String itemId = String.valueOf(elementsContainer.getChildCount() - 1);
-        final LIElement itemElement = mapElementPresenter.getKeyValueContainer(itemId, keyPropertiesValues, valuePropertiesValues);
-        elementsContainer.appendChild(itemElement);
-        toggleEditingStatus(false);
-    }
-
-    @Override
-    public void save() {
-        try {
-            String updatedValue;
-            if (collectionView.isExpressionWidget()) {
-                updatedValue = getExpressionValue();
-            } else {
-                updatedValue = getValueFromCreateCollection();
-            }
-            collectionView.updateValue(updatedValue);
-        } catch (IllegalStateException e) {
-            confirmPopupPresenter.show(ScenarioSimulationEditorConstants.INSTANCE.collectionError(), e.getMessage());
-        }
-    }
-
-    /**
-     * It gets the guided "Create Collection" editor
-     */
-    protected String getValueFromCreateCollection() {
-        if (collectionView.isListWidget()) {
-            return getListValue();
-        } else {
-            return getMapValue();
-        }
-    }
-
-    @Override
-    public void remove() {
-        org.uberfire.mvp.Command okRemoveCommand = this::okRemoveCommandMethod;
-        scenarioConfirmationPopupPresenter.show(ScenarioSimulationEditorConstants.INSTANCE.removeCollectionMainTitle(),
-                                                ScenarioSimulationEditorConstants.INSTANCE.removeCollectionMainQuestion(),
-                                                ScenarioSimulationEditorConstants.INSTANCE.removeCollectionText1(),
-                                                ScenarioSimulationEditorConstants.INSTANCE.removeCollectionQuestion(),
-                                                ScenarioSimulationEditorConstants.INSTANCE.removeCollectionWarningText(),
-                                                ScenarioSimulationEditorConstants.INSTANCE.remove(),
-                                                okRemoveCommand);
-    }
-
-    @Override
-    public void toggleEditingStatus(boolean editingStatus) {
-        collectionView.enableEditingMode(editingStatus);
-        mapElementPresenter.toggleEditingStatus(editingStatus);
-        listElementPresenter.toggleEditingStatus(editingStatus);
-    }
-
-    // Indirection add for test
-    protected void okRemoveCommandMethod() {
-        if (collectionView.isListWidget()) {
-            listElementPresenter.remove();
-        } else {
-            mapElementPresenter.remove();
-        }
-        collectionView.updateValue(null);
-        collectionView.close();
-    }
-
-    protected void commonInit(String key, CollectionView collectionView) {
-        this.collectionView = collectionView;
-        String propertyName = key.substring(key.lastIndexOf('#') + 1);
-        this.collectionView.getEditorTitle().setInnerText(key);
-        this.collectionView.getPropertyTitle().setInnerText(propertyName);
-    }
-
-    protected void populateList(JSONValue jsonValue) {
-        final JSONArray array = jsonValue.isArray();
-        for (int i = 0; i < array.size(); i++) {
-            final JSONObject jsonObject = array.get(i).isObject();
-            final Map<String, String> propertiesValues = getSimplePropertiesMap(jsonObject);
-            final Map<String, Map<String, String>> expandablePropertiesValues = getExpandablePropertiesValues(jsonObject);
-            addListItem(propertiesValues, expandablePropertiesValues);
-        }
-    }
-
-    protected void populateMap(JSONValue jsonValue) {
-        final JSONObject jsValueObject = jsonValue.isObject();
-        jsValueObject.keySet().forEach(key -> {
-            Map<String, String> keyPropertiesValues = new HashMap<>();
-            Map<String, String> valuePropertiesValues = new HashMap<>();
-            final JSONObject jsonObjectKey = getJSONObject(key);
-            if (jsonObjectKey == null) {
-                keyPropertiesValues.put(VALUE, key);
-            } else {
-                jsonObjectKey.keySet().forEach(propertyName ->
-                                                       keyPropertiesValues.put(propertyName, jsonObjectKey.get(propertyName).isString().stringValue()));
-            }
-            JSONObject jsonObjectValue = jsValueObject.get(key).isObject();
-            if (jsonObjectValue != null) {
-                jsonObjectValue.keySet().forEach(propertyName -> valuePropertiesValues.put(propertyName, jsonObjectValue.get(propertyName).isString().stringValue()));
-            } else {
-                valuePropertiesValues.put(VALUE, jsValueObject.get(key).toString());
-            }
-            addMapItem(keyPropertiesValues, valuePropertiesValues);
-        });
-    }
-
-    protected void populateExpression(JSONValue jsonValue) {
-        final JSONString jsonString = jsonValue.isString();
-        collectionView.setExpression(jsonString.stringValue());
-    }
-
-    protected JSONObject getJSONObject(String jsonString) {
-        try {
-            return getJSONValue(jsonString).isObject();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    protected JSONValue getJSONValue(String jsonString) {
-        try {
-            return JSONParser.parseStrict(jsonString);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    protected String getExpressionValue() {
-        final JSONString jsonString = new JSONString(collectionView.getExpression());
-        return jsonString.toString();
-    }
-
-    protected String getListValue() {
-        Map<String, Map<String, String>> simpleItemsProperties = listElementPresenter.getSimpleItemsProperties();
-        Map<String, Map<String, Map<String, String>>> nestedItemsProperties = listElementPresenter.getExpandableItemsProperties();
-        JSONArray jsonArray = new JSONArray();
-        AtomicInteger counter = new AtomicInteger();
-        simpleItemsProperties.forEach((itemId, simpleProperties) -> {
-            final JSONObject jsonObject = getJSONObject(simpleProperties);
-            Map<String, Map<String, String>> nestedProperties = nestedItemsProperties.get(itemId);
-            if (nestedProperties != null) {
-                nestedProperties.forEach((nestedPropertyName, nestedPropertyValues) -> {
-                    JSONObject nestedJSONObject = getJSONObject(nestedPropertyValues);
-                    jsonObject.put(nestedPropertyName, nestedJSONObject);
-                });
-            }
-            jsonArray.set(counter.getAndIncrement(), jsonObject);
-        });
-        return jsonArray.toString();
-    }
-
-    /**
-     * Translates a <code>Map</code> to a <code>JSONObject</code>
-     * @param properties
-     * @return
-     */
-    protected JSONObject getJSONObject(Map<String, String> properties) {
-        JSONObject toReturn = new JSONObject();
-        properties.forEach((propertyName, propertyValue) -> toReturn.put(propertyName, new JSONString(propertyValue)));
-        return toReturn;
-    }
-
-    /**
-     * @param jsonObject
-     * @return a <code>Map</code> with <b>propertyName/propertyValue</b>
-     */
-    protected Map<String, String> getSimplePropertiesMap(JSONObject jsonObject) {
-        Map<String, String> toReturn = new HashMap<>();
-        jsonObject.keySet().forEach(propertyName -> {
-            final JSONValue jsonValue = jsonObject.get(propertyName);
-            if (jsonValue.isString() != null) {
-                toReturn.put(propertyName, jsonValue.isString().stringValue());
-            }
-        });
-        return toReturn;
-    }
-
-    /**
-     * @param jsonObject
-     * @return a <code>Map</code> where the <b>key</b> is the name of the complex property, and the value is a a <code>Map</code> with
-     * the nested <b>propertyName/propertyValue</b>
-     */
-    protected Map<String, Map<String, String>> getExpandablePropertiesValues(JSONObject jsonObject) {
-        Map<String, Map<String, String>> toReturn = new HashMap<>();
-        jsonObject.keySet().forEach(propertyName -> {
-            final JSONValue jsonValue = jsonObject.get(propertyName);
-            if (jsonValue.isObject() != null) {
-                toReturn.put(propertyName, getSimplePropertiesMap(jsonValue.isObject()));
-            }
-        });
-        return toReturn;
-    }
-
-    /**
-     * @return
-     */
-    protected String getMapValue() {
-        Map<Map<String, String>, Map<String, String>> itemsProperties = mapElementPresenter.getItemsProperties();
-        JSONObject toReturnModel = new JSONObject();
-        itemsProperties.forEach((keyPropertiesValues, valuePropertiesMap) -> {
-            String jsonKey;
-            if (keyPropertiesValues.size() == 1) { // simple object - TO CHECK WRONG ASSUMPTION
-                jsonKey = keyPropertiesValues.values().iterator().next();
-            } else {
-                JSONObject nestedKey = new JSONObject();
-                keyPropertiesValues.forEach((propertyName, propertyValue) -> nestedKey.put(propertyName, new JSONString(propertyValue)));
-                jsonKey = nestedKey.toString();
-            }
-            JSONObject nestedValue = new JSONObject();
-            valuePropertiesMap.forEach((propertyName, propertyValue) -> nestedValue.put(propertyName, new JSONString(propertyValue)));
-            toReturnModel.put(jsonKey, nestedValue);
-        });
-        return toReturnModel.toString();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionView.java
deleted file mode 100644
index 20fc2e5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionView.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.Map;
-
-import com.google.gwt.dom.client.HeadingElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.UListElement;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-
-/**
- * Interface defining the contract for actual implementations
- */
-public interface CollectionView {
-
-    interface Presenter {
-
-        /**
-         * Actual implementations should invoke this method first to retrieve information about the collection
-         * generic type and the structure of such type
-         * @param key The key representing the property, i.e classname#propertyname (e.g Author#books)
-         * @param instancePropertyMap
-         * @param expandablePropertiesMap
-         * @param collectionView
-         */
-        void initListStructure(String key, Map<String, String> instancePropertyMap, Map<String, Map<String, String>> expandablePropertiesMap, CollectionView collectionView);
-
-        /**
-         * Actual implementations should invoke this method first to retrieve information about the collection
-         * generic type and the structure of such type
-         * @param key The key representing the property, i.e classname#propertyname (e.g Author#books)
-         * @param keyPropertyMap
-         * @param valuePropertyMap
-         * @param collectionEditorView
-         */
-        void initMapStructure(String key, Map<String, String> keyPropertyMap, Map<String, String> valuePropertyMap, CollectionView collectionEditorView);
-
-        /**
-         * Actual implementations are meant to transform that json representation to a <code>com.google.gwt.json.client.JSONValue</code> and use that to populate the
-         * current <code>CollectionEditorView</code>
-         *
-         * @param jsonString
-         */
-        void setValue(String jsonString);
-
-        /**
-         * Show the editing box in the current <code>CollectionEditorView</code>
-         *
-         */
-        void showEditingBox();
-
-        /**
-         * Toggle the expansion of the items included in the collection.
-         *
-         * @param isShown the <b>current</b> expansion status of the collection
-         */
-        void onToggleRowExpansion(boolean isShown);
-
-        /**
-         * Updates the <b>expanded</b> status of main collection container to reflect
-         * the status of all contained items, when they have the same <b>expanded</b> status
-         *
-         * @param isShown the <b>current</b> expansion status of the collection
-         */
-        void updateRowExpansionStatus(boolean isShown);
-
-        /**
-         * Creates a new single <b>item</b> element with values taken from given <code>Map</code>
-         *
-         * @param simplePropertiesValues
-         * @param expandablePropertiesValues
-         */
-        void addListItem(Map<String, String> simplePropertiesValues, Map<String, Map<String, String>> expandablePropertiesValues);
-
-        /**
-         * Creates a new <b>key/value</b> <b>item</b> element with values taken from given <code>Map</code>
-         *
-         * @param keyPropertiesValues
-         * @param valuePropertiesValues
-         */
-        void addMapItem(Map<String, String> keyPropertiesValues, Map<String, String> valuePropertiesValues);
-
-        /**
-         * Actual implementations are meant to retrieve the json representation of the content of the
-         * current <code>CollectionEditorView</code> and save it.
-         *
-         */
-        void save();
-
-        /**
-         * Completely remove the given <code>Collection</code>, i.e. set it to <code>null</code>
-         */
-        void remove();
-
-        /**
-         * Toggles the status of the addItem button
-         *
-         * @param toDisable
-         */
-        void toggleEditingStatus(boolean toDisable);
-    }
-
-    /**
-     * Actual implementations are meant to call the <code>Presenter</code> to be populated by this json representation
-     *
-     * @param jsonString
-     */
-    void setValue(String jsonString);
-
-    /**
-     * Actual implementations are meant to call the <code>Presenter</code> to retrieve the json representation of their contents
-     * @return the json representation of the current content
-     */
-    String getValue();
-
-    /**
-     * Returns <code>true</code> if the current instance is managing an user defined expression.
-     */
-    boolean isExpressionWidget();
-
-    /**
-     * Returns <code>true</code> if the current instance will manage a <code>List</code>,
-     * <code>false</code> for a <code>Map</code>.
-     * @return
-     */
-    boolean isListWidget();
-
-    UListElement getElementsContainer();
-
-    HeadingElement getEditorTitle();
-
-    SpanElement getPropertyTitle();
-
-    /**
-     * It enable the view to Editing Mode of the Guided collection editor
-     * @param isEditingMode
-     */
-    void enableEditingMode(boolean isEditingMode);
-
-    String getExpression();
-
-    void setExpression(String expressionValue);
-
-    void toggleRowExpansion();
-
-    /**
-     * Updates the <b>expanded</b> status of main collection container to reflect
-     * the status of all contained items, when they have the same <b>expanded</b> status
-     *
-     * @param isShown the <b>current</b> expansion status of the collection
-     */
-    void updateRowExpansionStatus(boolean isShown);
-
-    /**
-     * Updates the <b>json</b> representation of the values shown by this editor
-     * @param toString
-     */
-    void updateValue(String toString);
-
-    /**
-     * Close the current <code>CollectionView</code>
-     */
-    void close();
-
-    /**
-     * Set the <b>name</b> of the property and the <code>Map</code> to be used to create the skeleton of the current <code>CollectionViewImpl</code> editor
-     * showing a <b>List</b> of elements
-     * @param key The key representing the property, i.e Classname#propertyname (e.g Author#books)
-     * @param simplePropertiesMap
-     * @param expandablePropertiesMap
-     * @param type
-     */
-    void initListStructure(String key, Map<String, String> simplePropertiesMap, Map<String, Map<String, String>> expandablePropertiesMap, ScenarioSimulationModel.Type type);
-
-    /**
-     * Set the <b>name</b> of the property and the <code>Map</code>s to be used to create the skeleton of the current <code>CollectionViewImpl</code> editor
-     * showing a <b>Map</b> of elements
-     * @param key The key representing the property, i.e Classname#propertyname (e.g Author#books)
-     * @param keyPropertyMap
-     * @param valuePropertyMap
-     * @param type
-     */
-    void initMapStructure(String key, Map<String, String> keyPropertyMap, Map<String, String> valuePropertyMap, ScenarioSimulationModel.Type type);
-
-    void setFixedHeight(double value, Style.Unit px);
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.html
deleted file mode 100644
index 0119b39..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<div class="kie-dataTypesList-modal modal-wide" tabindex="-1" role="dialog" id="collectionEditor">
-  <div class="modal-backdrop in"></div>
-  <div class="modal-dialog" style="width: 100%" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button
-          type="button"
-          class="close"
-          data-dismiss="modal"
-          aria-label="Close"
-          data-field="closeCollectionEditorButton"
-        >
-          <span class="pficon pficon-close"></span>
-        </button>
-        <h4 class="modal-title" data-field="editorTitle"><span class="fa fa-list"></span></h4>
-      </div>
-      <div class="modal-body" style="overflow-y: auto" data-field="collectionEditorModalBody">
-        <div class="container-fluid">
-          <div class="row">
-            <div class="form-group col-xs-12">
-              <label data-field="collectionCreationModeLabel"></label>
-              <div class="radio">
-                <label>
-                  <input
-                    type="radio"
-                    data-field="createCollectionRadio"
-                    name="collectionRadio"
-                    id="kie-radio-option-1"
-                    value="option1"
-                    style="margin-top: 0px"
-                    checked=""
-                  />
-                  <span data-field="collectionCreationCreateLabel" style="font-weight: bold"></span>
-                  <span data-field="collectionCreationCreateSpan"></span>
-                </label>
-              </div>
-              <div class="radio">
-                <label>
-                  <input
-                    type="radio"
-                    data-field="defineCollectionRadio"
-                    name="collectionRadio"
-                    id="kie-radio-option-2"
-                    value="option2"
-                    style="margin-top: 0px"
-                  />
-                  <span data-field="collectionCreationDefineLabel" style="font-weight: bold"></span>
-                  <span data-field="collectionCreationDefineSpan"></span>
-                </label>
-              </div>
-            </div>
-          </div>
-          <div class="row">
-            <!-- Data objects -->
-            <div class="col-xs-12 tab-content">
-              <label data-field="createLabel"></label>
-              <!-- Data objects -->
-              <div class="tab-content">
-                <!-- first right side panel -->
-                <div
-                  class="tab-pane active"
-                  data-field="createCollectionContainer"
-                  id="kie-ObjectListItem1"
-                  aria-labelledby="#kie-ObjectListTab1"
-                >
-                  <ul class="list-group list-group kie-object-lis" data-field="elementsContainer">
-                    <li class="list-group-item" style="list-style-type: none">
-                      <span class="fa fa-angle-down kie-object-list__expander" data-field="faAngleRight"></span>
-                      <span class="kie-object-list__field-value" data-field="propertyTitle"></span>
-                    </li>
-                  </ul>
-                </div>
-                <div data-field="defineCollectionContainer">
-                  <textarea class="collection-editor-expression_textarea" data-field="expressionElement"></textarea>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="modal-body collection-editor-add-button-container">
-        <button class="btn btn-link" data-field="addItemButton">
-          <span class="fa fa-plus"></span>
-          <span data-field="addItemButtonLabel"></span>
-        </button>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-primary" data-dismiss="modal" data-field="saveButton">
-          <span class="fa fa-save" style="margin-right: 5px"></span>
-          <span data-field="saveButtonSpanText"></span>
-        </button>
-        <button type="button" class="btn btn-danger" data-dismiss="modal" data-field="removeButton">
-          <span class="fa fa-remove" style="margin-right: 5px"></span>
-          <span data-field="removeButtonSpanText"></span>
-        </button>
-        <button type="button" class="btn btn-default" data-dismiss="modal" data-field="cancelButton"></button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.java
deleted file mode 100644
index 37c715b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.ButtonElement;
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.HeadingElement;
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.LabelElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.TextAreaElement;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.ui.FocusWidget;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.events.CloseCompositeEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SaveEditorEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.CloseCompositeEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.HasCloseCompositeHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.HasSaveEditorHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SaveEditorEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ExpressionUtils;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-import static org.drools.scenariosimulation.api.model.ScenarioSimulationModel.Type.RULE;
-
-/**
- * This class is used as <code>Collection</code> <b>editor</b>
- * <p>
- * The overall architecture is:
- * <p>this widget contains a series of elements</p>
- * <p>if this widget represent a list, each element will show a single item of it, represented by a <code>ListEditorElementViewImpl</code></p>
- * <p>if this widget represent a map, each element will show a single entry (key/value) of it, represented by a <code>MapEditorElementViewImpl</code></p>
- * <p><code>PropertyEditorViewImpl</code> represents a single property (label with name and textbox for value)</p>
- * <p>each item/key/value could be a simple java object or a complex one</p>
- * <p>for complex java object, for each property a <code>PropertyEditorViewImpl</code> will be created</p>
- * <p>the presenter will be responsible to choose which kind of elements are to be populated</p>
- */
-@Templated
-public class CollectionViewImpl extends FocusWidget implements HasCloseCompositeHandler,
-                                                               HasSaveEditorHandler,
-                                                               CollectionView {
-
-    @Inject
-    protected CollectionPresenter presenter;
-
-    @DataField("collectionEditor")
-    protected DivElement collectionEditor = Document.get().createDivElement();
-
-    @DataField("collectionEditorModalBody")
-    protected DivElement collectionEditorModalBody = Document.get().createDivElement();
-
-    @DataField("elementsContainer")
-    protected UListElement elementsContainer = Document.get().createULElement();
-
-    @DataField("closeCollectionEditorButton")
-    protected ButtonElement closeCollectionEditorButton = Document.get().createPushButtonElement();
-
-    @DataField("createCollectionRadio")
-    protected InputElement createCollectionRadio = Document.get().createRadioInputElement("collectionRadio");
-
-    @DataField("defineCollectionRadio")
-    protected InputElement defineCollectionRadio = Document.get().createRadioInputElement("collectionRadio");
-
-    @DataField("cancelButton")
-    protected ButtonElement cancelButton = Document.get().createPushButtonElement();
-
-    @DataField("removeButton")
-    protected ButtonElement removeButton = Document.get().createPushButtonElement();
-
-    @DataField("removeButtonSpanText")
-    protected SpanElement removeButtonSpanText = Document.get().createSpanElement();
-
-    @DataField("saveButton")
-    protected ButtonElement saveButton = Document.get().createPushButtonElement();
-
-    @DataField("saveButtonSpanText")
-    protected SpanElement saveButtonSpanText = Document.get().createSpanElement();
-
-    @DataField("addItemButton")
-    protected ButtonElement addItemButton = Document.get().createPushButtonElement();
-
-    @DataField("editorTitle")
-    protected HeadingElement editorTitle = Document.get().createHElement(4);
-
-    @DataField("faAngleRight")
-    protected SpanElement faAngleRight = Document.get().createSpanElement();
-
-    @DataField("propertyTitle")
-    protected SpanElement propertyTitle = Document.get().createSpanElement();
-
-    @DataField("defineCollectionContainer")
-    protected DivElement defineCollectionContainer = Document.get().createDivElement();
-
-    @DataField("createCollectionContainer")
-    protected DivElement createCollectionContainer = Document.get().createDivElement();
-
-    @DataField("addItemButtonLabel")
-    protected SpanElement addItemButtonLabel = Document.get().createSpanElement();
-
-    @DataField("createLabel")
-    protected LabelElement createLabel = Document.get().createLabelElement();
-
-    @DataField("collectionCreationModeLabel")
-    protected LabelElement collectionCreationModeLabel = Document.get().createLabelElement();
-
-    @DataField("collectionCreationCreateLabel")
-    protected SpanElement collectionCreationCreateLabel = Document.get().createSpanElement();
-
-    @DataField("collectionCreationCreateSpan")
-    protected SpanElement collectionCreationCreateSpan = Document.get().createSpanElement();
-
-    @DataField("collectionCreationDefineLabel")
-    protected SpanElement collectionCreationDefineLabel = Document.get().createSpanElement();
-
-    @DataField("collectionCreationDefineSpan")
-    protected SpanElement collectionCreationDefineSpan = Document.get().createSpanElement();
-
-    @DataField("expressionElement")
-    protected TextAreaElement expressionElement = Document.get().createTextAreaElement();
-
-    /**
-     * Flag to indicate if this <code>CollectionEditorViewImpl</code> will manage a <code>List</code> or a <code>Map</code>.
-     */
-    protected boolean listWidget;
-
-    /**
-     * Flag to indicate if this <code>CollectionEditorViewImpl</code> is opened in DMN or RULE scenario
-     */
-    protected ScenarioSimulationModel.Type scenarioType;
-
-    /**
-     * The <b>json</b> representation of the values of this editor
-     */
-    protected String value;
-
-    public CollectionViewImpl() {
-        setElement(collectionEditor);
-    }
-
-    /**
-     * Set the <b>name</b> of the property and the <code>Map</code> to be used to create the skeleton of the current <code>CollectionViewImpl</code> editor
-     * showing a <b>List</b> of elements
-     * @param key The key representing the property, i.e Classname#propertyname (e.g Author#books)
-     * @param simplePropertiesMap
-     * @param expandablePropertiesMap
-     * @param type
-     */
-    @Override
-    public void initListStructure(String key, Map<String, String> simplePropertiesMap, Map<String, Map<String, String>> expandablePropertiesMap, ScenarioSimulationModel.Type type) {
-        listWidget = true;
-        commonInit(type);
-        createLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelList());
-        collectionCreationModeLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.collectionListCreation());
-        collectionCreationCreateLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelList());
-        collectionCreationCreateSpan.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelListDescription());
-        collectionCreationDefineLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelList());
-        collectionCreationDefineSpan.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelListDescription());
-        addItemButtonLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.addNewListItem());
-        presenter.initListStructure(key, simplePropertiesMap, expandablePropertiesMap, this);
-    }
-
-    /**
-     * Set the <b>name</b> of the property and the <code>Map</code> to be used to create the skeleton of the current <code>CollectionViewImpl</code> editor
-     * showing a <b>Map</b> of elements
-     * @param key The key representing the property, i.e Classname#propertyname (e.g Author#books)
-     * @param keyPropertyMap
-     * @param valuePropertyMap
-     * @param type
-     *
-     */
-    @Override
-    public void initMapStructure(String key, Map<String, String> keyPropertyMap, Map<String, String> valuePropertyMap, ScenarioSimulationModel.Type type) {
-        listWidget = false;
-        commonInit(type);
-        createLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMap());
-        collectionCreationModeLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.collectionMapCreation());
-        collectionCreationCreateLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMap());
-        collectionCreationCreateSpan.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMapDescription());
-        collectionCreationDefineLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelMap());
-        collectionCreationDefineSpan.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelMapDescription());
-        addItemButtonLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.addNewMapItem());
-        presenter.initMapStructure(key, keyPropertyMap, valuePropertyMap, this);
-    }
-
-    protected void commonInit(ScenarioSimulationModel.Type type) {
-        scenarioType = type ;
-        cancelButton.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.cancelButton());
-        saveButtonSpanText.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.saveButton());
-        removeButtonSpanText.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.removeButton());
-        enableCreateCollectionContainer(true);
-        if (RULE.equals(scenarioType)) {
-            initAndRegisterHandlerForExpressionTextArea();
-        }
-    }
-
-    /**
-     * It inits and registers the native "input" , which is not managed by GWT
-     */
-    protected void initAndRegisterHandlerForExpressionTextArea() {
-        ensureExpressionSyntax();
-        DOM.sinkBitlessEvent(expressionElement, ConstantHolder.INPUT);
-        DOM.setEventListener(expressionElement, event -> {
-            if (ConstantHolder.INPUT.contains(event.getType()))  {
-                ensureExpressionSyntax();}
-        });
-    }
-
-    @Override
-    public HandlerRegistration addCloseCompositeEventHandler(CloseCompositeEventHandler handler) {
-        return addDomHandler(handler, CloseCompositeEvent.getType());
-    }
-
-    @Override
-    public HandlerRegistration addSaveEditorEventHandler(SaveEditorEventHandler handler) {
-        return addDomHandler(handler, SaveEditorEvent.getType());
-    }
-
-    @Override
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public void setValue(String jsonString) {
-        presenter.setValue(jsonString);
-    }
-
-    @Override
-    public boolean isExpressionWidget() {
-        return defineCollectionRadio.isChecked();
-    }
-
-    @Override
-    public boolean isListWidget() {
-        return listWidget;
-    }
-
-    @Override
-    public UListElement getElementsContainer() {
-        return elementsContainer;
-    }
-
-    @Override
-    public HeadingElement getEditorTitle() {
-        return editorTitle;
-    }
-
-    @Override
-    public SpanElement getPropertyTitle() {
-        return propertyTitle;
-    }
-
-    @Override
-    public String getExpression() {
-        return expressionElement.getValue();
-    }
-
-    @Override
-    public void setExpression(String expressionValue) {
-        enableCreateCollectionContainer(false);
-        expressionElement.setValue(expressionValue);
-    }
-
-    @EventHandler("createCollectionRadio")
-    public void onCreateCollectionClick(ClickEvent clickEvent) {
-        enableCreateCollectionContainer(true);
-    }
-
-    @EventHandler("defineCollectionRadio")
-    public void onDefineCollectionClick(ClickEvent clickEvent) {
-        enableCreateCollectionContainer(false);
-    }
-
-    protected void enableCreateCollectionContainer(boolean toEnable) {
-        showCreateCollectionContainer(toEnable);
-        showDefineCollectionContainer(!toEnable);
-        showAddItemButton(toEnable);
-        createCollectionRadio.setChecked(toEnable);
-        defineCollectionRadio.setChecked(!toEnable);
-        if (listWidget) {
-            createLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelList());
-        } else {
-            createLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMap());
-        }
-    }
-
-    @EventHandler("closeCollectionEditorButton")
-    public void onCloseCollectionEditorButtonClick(ClickEvent clickEvent) {
-        close();
-    }
-
-    @EventHandler("cancelButton")
-    public void onCancelButtonClick(ClickEvent clickEvent) {
-        close();
-    }
-
-    @EventHandler("removeButton")
-    public void onRemoveButtonClick(ClickEvent clickEvent) {
-        presenter.remove();
-    }
-
-    @EventHandler("saveButton")
-    public void onSaveButtonClick(ClickEvent clickEvent) {
-        presenter.save();
-    }
-
-    @EventHandler("addItemButton")
-    public void onAddItemButton(ClickEvent clickEvent) {
-        presenter.showEditingBox();
-    }
-
-    @EventHandler("faAngleRight")
-    public void onFaAngleRightClick(ClickEvent clickEvent) {
-        presenter.onToggleRowExpansion(isShown());
-    }
-
-    @Override
-    public void toggleRowExpansion() {
-        toggleRowExpansion(!isShown());
-    }
-
-    @Override
-    public void updateRowExpansionStatus(boolean isShown) {
-        toggleRowExpansion(!isShown);
-    }
-
-    @Override
-    public void updateValue(String value) {
-        this.value = value;
-        fireEvent(new SaveEditorEvent());
-    }
-
-    @Override
-    public void close() {
-        fireEvent(new CloseCompositeEvent());
-    }
-
-    @Override
-    public void setFixedHeight(double value, Style.Unit unit) {
-        collectionEditorModalBody.getStyle().setHeight(value, unit);
-    }
-
-    @Override
-    public void enableEditingMode(boolean isEditingMode) {
-        createCollectionRadio.setDisabled(isEditingMode);
-        defineCollectionRadio.setDisabled(isEditingMode);
-        showAddItemButton(!isEditingMode);
-        addItemButton.setDisabled(isEditingMode);
-        cancelButton.setDisabled(isEditingMode);
-        removeButton.setDisabled(isEditingMode);
-        saveButton.setDisabled(isEditingMode);
-    }
-
-    protected boolean isShown() {
-        return CollectionEditorUtils.isShown(faAngleRight);
-    }
-
-    protected void toggleRowExpansion(boolean toExpand) {
-        CollectionEditorUtils.toggleRowExpansion(faAngleRight, toExpand);
-    }
-
-    protected void ensureExpressionSyntax() {
-        if (RULE.equals(scenarioType)) {
-            expressionElement.setValue(ExpressionUtils.ensureExpressionSyntax(expressionElement.getValue()));
-        }
-    }
-
-    protected void showCreateCollectionContainer(boolean show) {
-        if (show) {
-            createCollectionContainer.getStyle().setDisplay(Style.Display.BLOCK);
-        } else {
-            createCollectionContainer.getStyle().setDisplay(Style.Display.NONE);
-        }
-    }
-
-    protected void showDefineCollectionContainer(boolean show) {
-        if (show) {
-            defineCollectionContainer.getStyle().setDisplay(Style.Display.BLOCK);
-        } else {
-            defineCollectionContainer.getStyle().setDisplay(Style.Display.NONE);
-        }
-    }
-
-    protected void showAddItemButton(boolean show) {
-        if (show) {
-            addItemButton.getStyle().setDisplay(Style.Display.BLOCK);
-        } else {
-            addItemButton.getStyle().setDisplay(Style.Display.NONE);
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementPresenter.java
deleted file mode 100644
index be0b2d7..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementPresenter.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-
-public abstract class ElementPresenter<E extends ElementView> implements ElementView.Presenter<E> {
-
-    protected CollectionView.Presenter collectionEditorPresenter;
-
-    @Inject
-    protected PropertyView.Presenter propertyPresenter;
-
-    @Inject
-    protected ViewsProvider viewsProvider;
-
-    /**
-     * <code>List</code> of currently present <code>ElementView</code>s
-     */
-    protected List<E> elementViewList = new ArrayList<>();
-
-    @Override
-    public void setCollectionEditorPresenter(CollectionView.Presenter collectionEditorPresenter) {
-        this.collectionEditorPresenter = collectionEditorPresenter;
-    }
-
-    @Override
-    public void onToggleRowExpansion(boolean isShown) {
-        elementViewList.forEach(elementView -> onToggleRowExpansion(elementView, isShown));
-    }
-
-    @Override
-    public void updateCommonToggleStatus(boolean isShown) {
-        if (elementViewList.stream()
-                .allMatch(elementView ->  !isShown == elementView.isShown())) {
-            collectionEditorPresenter.updateRowExpansionStatus(isShown);
-        }
-    }
-
-    @Override
-    public void remove() {
-        List<E> newList = new ArrayList<>(elementViewList);
-        newList.forEach(this::onDeleteItem);
-    }
-
-    @Override
-    public void toggleEditingStatus(boolean toDisable) {
-        elementViewList.forEach(element -> {
-            element.getEditItemButton().setDisabled(toDisable);
-            element.getDeleteItemButton().setDisabled(toDisable);
-        });
-    }
-
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementView.java
deleted file mode 100644
index aa4bf75..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementView.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import com.google.gwt.dom.client.ButtonElement;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.uberfire.client.mvp.HasPresenter;
-
-public interface ElementView<T extends ElementView.Presenter> extends HasPresenter<T> {
-
-    interface Presenter<E extends ElementView> {
-
-        void setCollectionEditorPresenter(CollectionView.Presenter collectionEditorPresenter);
-
-        /**
-         *
-         * @param isShown The <b>current</b> status of the <code>ElementView</code>
-         */
-        void onToggleRowExpansion(boolean isShown);
-
-        void onToggleRowExpansion(E itemElementView, boolean shown);
-
-        /**
-         * Update the toggle status of the main collection container if all the contained <code>ElementView</code>
-         * have the same one
-         * @param shown
-         */
-        void updateCommonToggleStatus(boolean shown);
-
-        /**
-         * Start editing properties of the given <code>itemElementView</code>
-         * @param itemElementView
-         */
-        void onEditItem(E itemElementView);
-
-        /**
-         * Update the values of the properties shown in the given <code>itemElementView</code>
-         * and stop the editing mode
-         * @param itemElementView
-         */
-        void updateItem(E itemElementView);
-
-        /**
-         * Stop editing properties of the given <code>itemElementView</code>
-         * <b>without</b> updating the properties
-         * @param itemElementView
-         */
-        void onStopEditingItem(E itemElementView);
-
-        /**
-         * Delete the item and its properties shown on the given <code>itemElementView</code>
-         * @param itemElementView
-         */
-        void onDeleteItem(E itemElementView);
-
-        /**
-         * Completely remove the elements of the given <code>Collection</code>
-         */
-        void remove();
-
-        void toggleEditingStatus(boolean toDisable);
-    }
-
-    ButtonElement getEditItemButton();
-
-    ButtonElement getDeleteItemButton();
-
-    boolean isShown();
-
-    void onFaAngleRightClick(ClickEvent clickEvent);
-
-    void onEditItemButtonClick(ClickEvent clickEvent);
-
-    void onDeleteItemButtonClick(ClickEvent clickEvent);
-
-    void onSaveChangeButtonClick(ClickEvent clickEvent);
-
-    void onCancelChangeButton(ClickEvent clickEvent);
-
-    void toggleRowExpansion(boolean toExpand);
-
-    /**
-     * Set the <b>id</b> of the item shown by the current <code><ListEditorElementView/code>
-     * @param itemId
-     */
-    void setItemId(String itemId);
-
-    /**
-     * @return the <b>id</b> of the item shown by the current <code><ListEditorElementView/code>
-     */
-    String getItemId();
-
-    void setItemSeparatorText(String itemSeparatorText);
-
-    /**
-     * @return the <code>LIElement</code> containing all the item properties
-     */
-    LIElement getItemContainer();
-
-    /**
-     * @return the (inner) <code>UListElement</code> containing all the item properties
-     */
-    UListElement getInnerItemContainer();
-
-    /**
-     * @return the <code>LIElement</code> separating each item
-     */
-    LIElement getItemSeparator();
-
-    /**
-     * @return the <code>LIElement</code> with the item' save/cancel buttons
-     */
-    LIElement getSaveChange();
-
-    /**
-     * @return the <code>SpanElement</code> with the angle arrow
-     */
-    SpanElement getFaAngleRight();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementViewImpl.java
deleted file mode 100644
index 2df296d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementViewImpl.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import com.google.gwt.dom.client.ButtonElement;
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-
-/**
- * This class is used to show a single <b>item</b> of a collection
- */
-public abstract class ElementViewImpl<T extends ElementView.Presenter> implements ElementView<T> {
-
-    protected Presenter presenter;
-
-    protected String itemId;
-
-    @DataField("itemContainer")
-    protected LIElement itemContainer = Document.get().createLIElement();
-
-    @DataField("innerItemContainer")
-    protected UListElement innerItemContainer = Document.get().createULElement();
-
-    @DataField("itemSeparator")
-    protected LIElement itemSeparator = Document.get().createLIElement();
-
-    @DataField("itemSeparatorText")
-    protected SpanElement itemSeparatorText = Document.get().createSpanElement();
-
-    @DataField("saveChange")
-    protected LIElement saveChange = Document.get().createLIElement();
-
-    @DataField("faAngleRight")
-    protected SpanElement faAngleRight = Document.get().createSpanElement();
-
-    @DataField("editItemButton")
-    protected ButtonElement editItemButton = Document.get().createPushButtonElement();
-
-    @DataField("deleteItemButton")
-    protected ButtonElement deleteItemButton = Document.get().createPushButtonElement();
-
-    @DataField("saveChangeButton")
-    protected ButtonElement saveChangeButton = Document.get().createPushButtonElement();
-
-    @DataField("saveChangeButtonSpanText")
-    protected SpanElement saveChangeButtonSpanText = Document.get().createSpanElement();
-
-    @DataField("cancelChangeButton")
-    protected ButtonElement cancelChangeButton = Document.get().createPushButtonElement();
-
-    @DataField("cancelButtonSpanText")
-    protected SpanElement cancelButtonSpanText = Document.get().createSpanElement();
-
-    @Override
-    public void init(Presenter presenter) {
-        this.presenter = presenter;
-        itemSeparatorText.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.item());
-        saveChangeButtonSpanText.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.saveButton());
-        cancelButtonSpanText.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.cancelButton());
-    }
-
-    @Override
-    public void setItemId(String itemId) {
-        this.itemId = itemId;
-    }
-
-    @Override
-    public String getItemId() {
-        return itemId;
-    }
-
-    @Override
-    public void setItemSeparatorText(String itemSeparatorText) {
-        this.itemSeparatorText.setInnerText(itemSeparatorText);
-    }
-
-    @Override
-    public LIElement getItemContainer() {
-        return itemContainer;
-    }
-
-    @Override
-    public UListElement getInnerItemContainer() {
-        return innerItemContainer;
-    }
-
-    @Override
-    public LIElement getItemSeparator() {
-        return itemSeparator;
-    }
-
-    @Override
-    public LIElement getSaveChange() {
-        return saveChange;
-    }
-
-    @Override
-    public SpanElement getFaAngleRight() {
-        return faAngleRight;
-    }
-
-    @Override
-    public ButtonElement getEditItemButton() { return editItemButton; }
-
-    @Override
-    public ButtonElement getDeleteItemButton() {
-        return deleteItemButton;
-    }
-
-    @Override
-    public boolean isShown() {
-        return CollectionEditorUtils.isShown(faAngleRight);
-    }
-
-    @Override
-    public void toggleRowExpansion(boolean toExpand) {
-        CollectionEditorUtils.toggleRowExpansion(faAngleRight, toExpand);
-    }
-
-    @EventHandler("itemContainer")
-    public void onItemContainerClick(ClickEvent clickEvent) {
-        clickEvent.stopPropagation();
-    }
-
-    @EventHandler("innerItemContainer")
-    public void onInnerItemContainerClick(ClickEvent clickEvent) {
-        clickEvent.stopPropagation();
-    }
-
-    @EventHandler("itemSeparator")
-    public void onItemSeparatorClick(ClickEvent clickEvent) {
-        clickEvent.stopPropagation();
-    }
-
-    @EventHandler("faAngleRight")
-    public void onFaAngleRightClick(ClickEvent clickEvent) {
-        presenter.onToggleRowExpansion(this, isShown());
-        clickEvent.stopPropagation();
-    }
-
-    @EventHandler("editItemButton")
-    public void onEditItemButtonClick(ClickEvent clickEvent) {
-        presenter.onEditItem(this);
-        clickEvent.stopPropagation();
-    }
-
-    @EventHandler("deleteItemButton")
-    public void onDeleteItemButtonClick(ClickEvent clickEvent) {
-        presenter.onDeleteItem(this);
-        clickEvent.stopPropagation();
-    }
-
-    @EventHandler("saveChange")
-    public void onSaveChangeClick(ClickEvent clickEvent) {
-        clickEvent.stopPropagation();
-    }
-
-    @EventHandler("saveChangeButton")
-    public void onSaveChangeButtonClick(ClickEvent clickEvent) {
-        presenter.updateItem(this);
-        clickEvent.stopPropagation();
-    }
-
-    @EventHandler("cancelChangeButton")
-    public void onCancelChangeButton(ClickEvent clickEvent) {
-        presenter.onStopEditingItem(this);
-        clickEvent.stopPropagation();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementPresenter.java
deleted file mode 100644
index 4c58107..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementPresenter.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.UListElement;
-
-public class ItemElementPresenter extends ElementPresenter<ItemElementView> implements ItemElementView.Presenter {
-
-    /**
-     * This <code>Map</code> is used to map all the <b>expandable</b> properties names of a given itemId
-     */
-    protected Map<String, List<String>> itemIdExpandablePropertiesMap = new HashMap<>();
-
-    @Override
-    public LIElement getItemContainer(String itemId, Map<String, String> simplePropertiesMap, Map<String, Map<String, String>> expandablePropertiesValues) {
-        final ItemElementView itemElementView = viewsProvider.getListEditorElementView();
-        itemElementView.init(this);
-        itemElementView.setItemId(itemId);
-        final UListElement innerItemContainer = itemElementView.getInnerItemContainer();
-        final LIElement saveChange = itemElementView.getSaveChange();
-        simplePropertiesMap.forEach((propertyName, propertyValue) ->
-                                      innerItemContainer.insertBefore(propertyPresenter.getPropertyFields(itemId, propertyName, propertyValue), saveChange));
-        itemIdExpandablePropertiesMap.put(itemId, new ArrayList<>());
-        expandablePropertiesValues.forEach((nestedPropertyName, nestedPropertiesValues) -> {
-            itemIdExpandablePropertiesMap.get(itemId).add(nestedPropertyName);
-            addExpandableItemElementView(itemElementView, nestedPropertiesValues, nestedPropertyName);
-        });
-        elementViewList.add(itemElementView);
-        return itemElementView.getItemContainer();
-    }
-
-    @Override
-    public void onToggleRowExpansion(ItemElementView itemElementView, boolean isShown) {
-        CollectionEditorUtils.toggleRowExpansion(itemElementView.getFaAngleRight(), !isShown);
-        propertyPresenter.onToggleRowExpansion(itemElementView.getItemId(), isShown);
-        if (itemIdExpandablePropertiesMap.containsKey(itemElementView.getItemId())) {
-            itemIdExpandablePropertiesMap.get(itemElementView.getItemId())
-                    .forEach(expandablePropertyName -> propertyPresenter.onToggleRowExpansion(generateExpandableItemElementID(itemElementView,
-                                                                                                                              expandablePropertyName),
-                                                                                              isShown));
-        }
-        updateCommonToggleStatus(isShown);
-    }
-
-    @Override
-    public void onEditItem(ItemElementView itemElementView) {
-        if (!itemElementView.isShown()) {
-            onToggleRowExpansion(itemElementView, false);
-        }
-        propertyPresenter.editProperties(itemElementView.getItemId());
-        itemIdExpandablePropertiesMap.get(itemElementView.getItemId()).forEach(expandablePropertyName -> propertyPresenter.editProperties(generateExpandableItemElementID(itemElementView,
-                                                                                                                                                                          expandablePropertyName)));
-        itemElementView.getSaveChange().getStyle().setDisplay(Style.Display.INLINE);
-        collectionEditorPresenter.toggleEditingStatus(true);
-    }
-
-    @Override
-    public void onStopEditingItem(ItemElementView itemElementView) {
-        propertyPresenter.stopEditProperties(itemElementView.getItemId());
-        itemIdExpandablePropertiesMap.get(itemElementView.getItemId()).forEach(expandablePropertyName -> propertyPresenter.stopEditProperties(generateExpandableItemElementID(itemElementView,
-                                                                                                                                                                              expandablePropertyName)));
-        itemElementView.getSaveChange().getStyle().setDisplay(Style.Display.NONE);
-        collectionEditorPresenter.toggleEditingStatus(false);
-    }
-
-    @Override
-    public void updateItem(ItemElementView itemElementView) {
-        propertyPresenter.updateProperties(itemElementView.getItemId());
-        itemIdExpandablePropertiesMap.get(itemElementView.getItemId()).forEach(expandablePropertyName -> propertyPresenter.updateProperties(generateExpandableItemElementID(itemElementView,
-                                                                                                                                                                            expandablePropertyName)));
-        itemElementView.getSaveChange().getStyle().setDisplay(Style.Display.NONE);
-        collectionEditorPresenter.toggleEditingStatus(false);
-    }
-
-    @Override
-    public void onDeleteItem(ItemElementView itemElementView) {
-        propertyPresenter.deleteProperties(itemElementView.getItemId());
-        itemIdExpandablePropertiesMap.get(itemElementView.getItemId()).forEach(expandablePropertyName -> propertyPresenter.deleteProperties(generateExpandableItemElementID(itemElementView,
-                                                                                                                                                                            expandablePropertyName)));
-        itemElementView.getItemContainer().removeFromParent();
-        elementViewList.remove(itemElementView);
-        collectionEditorPresenter.toggleEditingStatus(false);
-    }
-
-    @Override
-    public Map<String, Map<String, String>> getSimpleItemsProperties() {
-        return elementViewList.stream()
-                .collect(Collectors.toMap(ElementView::getItemId,
-                                          itemElementView -> propertyPresenter.getSimpleProperties(itemElementView.getItemId())));
-    }
-
-    @Override
-    public Map<String, Map<String, Map<String, String>>> getExpandableItemsProperties() {
-        Map<String, Map<String, Map<String, String>>> toReturn = new HashMap<>();
-        elementViewList.forEach(itemElementView -> {
-            final List<String> expandablePropertiesNames = itemIdExpandablePropertiesMap.get(itemElementView.getItemId());
-            Map<String, Map<String, String>> expandableProperties = new HashMap<>();
-            expandablePropertiesNames.forEach(expandablePropertyName -> {
-                final Map<String, String> simpleProperties = propertyPresenter.getSimpleProperties(generateExpandableItemElementID(itemElementView,
-                                                                                                                                   expandablePropertyName));
-                expandableProperties.put(expandablePropertyName, simpleProperties);
-            });
-            toReturn.put(itemElementView.getItemId(), expandableProperties);
-        });
-        return toReturn;
-    }
-
-    protected void addExpandableItemElementView(ItemElementView containerItemElementView, Map<String, String> propertiesMap, String expandablePropertyName) {
-        final ItemElementView itemElementView = viewsProvider.getListEditorElementView();
-        itemElementView.init(this);
-        final UListElement innerItemContainer = itemElementView.getInnerItemContainer();
-        final String expandableItemID = generateExpandableItemElementID(containerItemElementView, expandablePropertyName);
-        itemElementView.setItemSeparatorText(expandablePropertyName);
-        itemElementView.getEditItemButton().removeFromParent();
-        itemElementView.getDeleteItemButton().removeFromParent();
-        itemElementView.getSaveChange().removeFromParent();
-        itemElementView.setItemId(expandableItemID);
-        propertiesMap.forEach((propertyName, propertyValue) ->
-                              innerItemContainer.appendChild(propertyPresenter.getPropertyFields(expandableItemID,
-                                                                                                 propertyName,
-                                                                                                 propertyValue)));
-        containerItemElementView.getInnerItemContainer().insertBefore(itemElementView.getItemContainer(), containerItemElementView.getSaveChange());
-    }
-
-    protected String generateExpandableItemElementID(final ItemElementView itemElementView, final String expandablePropertyName) {
-        return itemElementView.getItemId() + "." + expandablePropertyName;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementView.java
deleted file mode 100644
index 8398756..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementView.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.Map;
-
-import com.google.gwt.dom.client.LIElement;
-
-public interface ItemElementView extends ElementView<ItemElementView.Presenter> {
-
-
-    interface Presenter extends ElementView.Presenter<ItemElementView> {
-
-        /**
-         *
-         * @param itemId the id of the current item
-         * @param simplePropertiesMap the properties to be put inside the <code>UListElement</code>
-         * @param expandablePropertiesValues
-         * representing a single item of the list
-         *
-         * @return the <code>LIElement</code> representing all the items of the list
-         */
-        LIElement getItemContainer(String itemId, Map<String, String> simplePropertiesMap, Map<String, Map<String, String>> expandablePropertiesValues);
-
-        /**
-         * Retrieves a <code>Map</code> with the <code>Map</code>s of all the items' <b>simple</b> properties
-         *
-         * @return a <code>Map</code> where the <b>key</b> is the itemId of the item container, and the value is the map <b>propertyName/propertyValue</b>
-         */
-        Map<String, Map<String, String>> getSimpleItemsProperties();
-
-        /**
-         * Retrieves a <code>Map</code> with the <code>Map</code>s of all the items' <b>nested</b> properties
-         * @return a <code>Map</code> where the <b>key</b> is the itemId of the item container, and the value is the map of <b>nested</b> properties
-         */
-        Map<String, Map<String, Map<String, String>>> getExpandableItemsProperties();
-
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementViewImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementViewImpl.html
deleted file mode 100644
index 9539d63..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementViewImpl.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<li data-field="itemContainer" style="list-style-type: none">
-  <ul data-field="innerItemContainer">
-    <li
-      class="list-group-item node-treeview-object1 kie-drools-object-separator"
-      data-field="itemSeparator"
-      style="list-style-type: none"
-    >
-      <span class="icon expand-icon fa fa-angle-down" data-field="faAngleRight"></span>
-      <span data-field="itemSeparatorText"></span>
-      <div class="pull-right">
-        <button class="btn btn-link" aria-label="Edit item" data-field="editItemButton">
-          <span class="fa fa-pencil" aria-hidden="true"></span>
-        </button>
-        <button class="btn btn-link" aria-label="Delete item" data-field="deleteItemButton">
-          <span class="fa fa-trash" aria-hidden="true"></span>
-        </button>
-      </div>
-    </li>
-    <li class="list-group-item" data-field="saveChange" style="display: none; list-style-type: none">
-      <button class="btn btn-link" data-field="saveChangeButton">
-        <span class="fa fa-check"></span>
-        <span data-field="saveChangeButtonSpanText"></span>
-      </button>
-      <button class="btn btn-link" data-field="cancelChangeButton">
-        <span class="fa fa-close"></span>
-        <span data-field="cancelButtonSpanText"></span>
-      </button>
-    </li>
-  </ul>
-</li>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementViewImpl.java
deleted file mode 100644
index 873ebd3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementViewImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-/**
- * This class is used to show a single <b>item</b> of a <b>list</b>
- *
- */
-@Templated
-public class ItemElementViewImpl extends ElementViewImpl<ItemElementView.Presenter> implements ItemElementView {
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementPresenter.java
deleted file mode 100644
index daaee62..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementPresenter.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.UListElement;
-
-public class KeyValueElementPresenter extends ElementPresenter<KeyValueElementView> implements KeyValueElementView.Presenter {
-
-    @Override
-    public LIElement getKeyValueContainer(String itemId, Map<String, String> keyPropertiesValues, Map<String, String> valuePropertiesValues) {
-        final KeyValueElementView keyValueElementView = viewsProvider.getKeyValueElementView();
-        keyValueElementView.init(this);
-        keyValueElementView.setItemId(itemId);
-        final UListElement keyContainer = keyValueElementView.getKeyContainer();
-        List<String> keyValueIds = getKeyValueIds(itemId);
-        keyPropertiesValues.forEach((propertyName, propertyValue) ->
-                                            keyContainer.appendChild(propertyPresenter.getPropertyFields(keyValueIds.get(0), propertyName, propertyValue)));
-
-        final UListElement valueContainer = keyValueElementView.getValueContainer();
-        valuePropertiesValues.forEach((propertyName, propertyValue) ->
-                                              valueContainer.appendChild(propertyPresenter.getPropertyFields(keyValueIds.get(1), propertyName, propertyValue)));
-        elementViewList.add(keyValueElementView);
-        return keyValueElementView.getItemContainer();
-    }
-
-    @Override
-    public void onToggleRowExpansion(KeyValueElementView keyValueElementView, boolean isShown) {
-        CollectionEditorUtils.toggleRowExpansion(keyValueElementView.getFaAngleRight(), !isShown);
-        CollectionEditorUtils.toggleRowExpansion(keyValueElementView.getKeyLabel(), isShown);
-        CollectionEditorUtils.toggleRowExpansion(keyValueElementView.getValueLabel(), isShown);
-        List<String> keyValueIds = getKeyValueIds( keyValueElementView.getItemId());
-        keyValueIds.forEach(id -> propertyPresenter.onToggleRowExpansion(id, isShown));
-        updateCommonToggleStatus(isShown);
-    }
-
-    @Override
-    public void onEditItem(KeyValueElementView keyValueElementView) {
-        if (!keyValueElementView.isShown()) {
-            onToggleRowExpansion(keyValueElementView, false);
-        }
-        List<String> keyValueIds = getKeyValueIds( keyValueElementView.getItemId());
-        keyValueIds.forEach(id -> propertyPresenter.editProperties(id));
-        keyValueElementView.getSaveChange().getStyle().setDisplay(Style.Display.INLINE);
-        toggleEditingStatus(true);
-        collectionEditorPresenter.toggleEditingStatus(true);
-    }
-
-    @Override
-    public void onStopEditingItem(KeyValueElementView keyValueElementView) {
-        List<String> keyValueIds = getKeyValueIds( keyValueElementView.getItemId());
-        keyValueIds.forEach(id -> propertyPresenter.stopEditProperties(id));
-        keyValueElementView.getSaveChange().getStyle().setDisplay(Style.Display.NONE);
-        toggleEditingStatus(false);
-        collectionEditorPresenter.toggleEditingStatus(false);
-    }
-
-    @Override
-    public void onDeleteItem(KeyValueElementView keyValueElementView) {
-        List<String> keyValueIds = getKeyValueIds( keyValueElementView.getItemId());
-        keyValueIds.forEach(id -> propertyPresenter.deleteProperties(id));
-        keyValueElementView.getItemContainer().removeFromParent();
-        elementViewList.remove(keyValueElementView);
-        toggleEditingStatus(false);
-        collectionEditorPresenter.toggleEditingStatus(false);
-    }
-
-    @Override
-    public void updateItem(KeyValueElementView keyValueElementView) {
-        List<String> keyValueIds = getKeyValueIds( keyValueElementView.getItemId());
-        keyValueIds.forEach(id -> propertyPresenter.updateProperties(id));
-        keyValueElementView.getSaveChange().getStyle().setDisplay(Style.Display.NONE);
-        toggleEditingStatus(false);
-        collectionEditorPresenter.toggleEditingStatus(false);
-    }
-
-    @Override
-    public Map<Map<String, String>, Map<String, String>> getItemsProperties() {
-        return elementViewList.stream()
-                .collect(Collectors.toMap(
-                        keyValueElementView -> {
-                            String itemId = keyValueElementView.getItemId() + "#key";
-                            return propertyPresenter.getSimpleProperties(itemId);
-                        },
-                        keyValueElementView -> {
-                            String itemId = keyValueElementView.getItemId() + "#value";
-                            return propertyPresenter.getSimpleProperties(itemId);
-                        }));
-    }
-
-    /**
-     * Returns a <code>List</code>> with (itemId)#key at pos. 0 and (itemId)#value at pos. 1
-     * @param itemId
-     * @return
-     */
-    private List<String> getKeyValueIds(String itemId) {
-        return Arrays.asList(itemId + "#key", itemId + "#value");
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementView.java
deleted file mode 100644
index 7f87f0f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementView.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.Map;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.UListElement;
-
-public interface KeyValueElementView extends ElementView<KeyValueElementView.Presenter> {
-
-    interface Presenter extends ElementView.Presenter<KeyValueElementView> {
-
-        /**
-         * @param itemId the id of the current item
-         * @param keyPropertiesValues the properties to be put inside the <code>UListElement</code>
-         * representing the key of a single item of the map
-         * @param keyPropertiesValues the properties to be put inside the <code>UListElement</code>
-         * representing the value of a single item of the map
-         * @return the <code>LIElement</code> representing all the items of the map
-         */
-        LIElement getKeyValueContainer(String itemId, Map<String, String> keyPropertiesValues, Map<String, String> valuePropertiesValues);
-
-        /**
-         * Retrieves a <code>Map</code> with the <code>Map</code>s of all the items' key/value properties
-         * @return
-         */
-        Map<Map<String, String>, Map<String, String>> getItemsProperties();
-    }
-
-    /**
-     * @return the <code>UListElement</code> containing the <b>key</b> properties
-     */
-    UListElement getKeyContainer();
-
-    /**
-     * @return the <code>UListElement</code> containing the <b>value</b> properties
-     */
-    UListElement getValueContainer();
-
-    LIElement getKeyLabel();
-
-    LIElement getValueLabel();
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementViewImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementViewImpl.html
deleted file mode 100644
index 68a2a59..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementViewImpl.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<li data-field="itemContainer" style="list-style-type: none">
-  <ul class="list-group" data-field="innerItemContainer">
-    <li class="list-group-item kie-object-list__separator" data-field="itemSeparator" style="list-style-type: none">
-      <span class="fa fa-angle-down kie-object-list__expander" data-field="faAngleRight"></span>
-      <span data-field="itemSeparatorText"></span>
-      <div class="pull-right">
-        <button class="btn btn-link" aria-label="Edit item" data-field="editItemButton">
-          <span class="fa fa-pencil" aria-hidden="true"></span>
-        </button>
-        <button class="btn btn-link" aria-label="Delete item" data-field="deleteItemButton">
-          <span class="fa fa-trash" aria-hidden="true"></span>
-        </button>
-      </div>
-    </li>
-    <li class="list-group-item" data-field="keyValueContainer" style="list-style-type: none">
-      <ul class="list-group kie-object-list kie-object-list--mapping" data-field="keyContainer">
-        <li class="list-group-item" data-field="keyLabel" style="list-style-type: none">
-          <span data-i18n-key="KEY">KEY</span>
-        </li>
-      </ul>
-      <ul class="list-group kie-object-list kie-object-list--mapping" data-field="valueContainer">
-        <li
-          class="list-group-item node-treeview-object-edit node-hidden"
-          data-field="valueLabel"
-          style="list-style-type: none"
-        >
-          <span>VALUE</span>
-        </li>
-      </ul>
-    </li>
-    <li class="list-group-item" data-field="saveChange" style="display: none; list-style-type: none">
-      <button class="btn btn-link" data-field="saveChangeButton">
-        <span class="fa fa-check"></span>
-        <span data-field="saveChangeButtonSpanText"></span>
-      </button>
-      <button class="btn btn-link" data-field="cancelChangeButton">
-        <span class="fa fa-close"></span>
-        <span data-field="cancelButtonSpanText"></span>
-      </button>
-    </li>
-  </ul>
-</li>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementViewImpl.java
deleted file mode 100644
index d6646ca..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementViewImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.UListElement;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-/**
- * This class is used to show a <b>key/value</b> <b>item</b> of a <b>map</b>
- *
- */
-@Templated
-public class KeyValueElementViewImpl extends ElementViewImpl<KeyValueElementView.Presenter> implements KeyValueElementView {
-
-    @DataField("keyValueContainer")
-    protected LIElement keyValueContainer = Document.get().createLIElement();
-
-    @DataField("keyContainer")
-    protected UListElement keyContainer = Document.get().createULElement();
-
-    @DataField("valueContainer")
-    protected UListElement valueContainer = Document.get().createULElement();
-
-    @DataField("keyLabel")
-    protected LIElement keyLabel = Document.get().createLIElement();
-
-    @DataField("valueLabel")
-    protected LIElement valueLabel = Document.get().createLIElement();
-
-    @Override
-    public UListElement getKeyContainer() {
-        return keyContainer;
-    }
-
-    @Override
-    public UListElement getValueContainer() {
-        return valueContainer;
-    }
-
-    @Override
-    public LIElement getKeyLabel() {
-        return keyLabel;
-    }
-
-    @Override
-    public LIElement getValueLabel() {
-        return valueLabel;
-    }
-
-    @Override
-    public LIElement getSaveChange() {
-        return saveChange;
-    }
-
-    @Override
-    public SpanElement getFaAngleRight() {
-        return faAngleRight;
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyPresenter.java
deleted file mode 100644
index 3140436..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyPresenter.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-
-import static org.drools.workbench.screens.scenariosimulation.client.collectioneditor.CollectionEditorUtils.setSpanAttributeAttributes;
-
-public class PropertyPresenter implements PropertyView.Presenter {
-
-    @Inject
-    protected ViewsProvider viewsProvider;
-
-    /**
-     * <code>Map</code> to pair a given <b>property</b> with the <code>SpanElement</code> showing its value
-     */
-    protected Map<String, SpanElement> propertySpanElementMap = new HashMap<>();
-
-    /**
-     * <code>Map</code> to pair a given <b>itemId</b> with its <code>PropertyEditorView</code>s
-     */
-    protected Map<String, List<PropertyView>> propertyViewMap = new HashMap<>();
-
-    @Override
-    public String getPropertyValue(String propertyName) throws Exception {
-        if (propertySpanElementMap.containsKey(propertyName)) {
-            return propertySpanElementMap.get(propertyName).getInnerText();
-        } else {
-            throw new IllegalStateException(propertyName + " not found");
-        }
-    }
-
-    @Override
-    public void editProperties(String itemId) {
-        if (propertyViewMap.containsKey(itemId)) {
-            propertyViewMap.get(itemId)
-                    .forEach(this::startEditPropertyView);
-        }
-    }
-
-    @Override
-    public void stopEditProperties(String itemId) {
-        stopEdit(itemId, false);
-    }
-
-    @Override
-    public Map<String, String> updateProperties(String itemId) {
-        return stopEdit(itemId, true);
-    }
-
-    @Override
-    public Map<String, String> getSimpleProperties(String itemId) {
-        Map<String, String> toReturn = new HashMap<>();
-        if (propertyViewMap.containsKey(itemId)) {
-            propertyViewMap.get(itemId)
-                    .forEach(propertyEditorView -> {
-                        String propertyName = propertyEditorView.getPropertyName().getInnerText();
-                        propertyName = propertyName.substring(propertyName.lastIndexOf('#') + 1);
-                        toReturn.put(propertyName, propertyEditorView.getPropertyValueSpan().getInnerText());
-                    });
-        }
-        return toReturn;
-    }
-
-    @Override
-    public LIElement getPropertyFields(String itemId, String propertyName, String propertyValue) {
-        final PropertyView propertyEditorView = viewsProvider.getPropertyEditorView();
-        String hashedPropertyName = "#" + propertyName;
-        final SpanElement propertyNameSpan = propertyEditorView.getPropertyName();
-        setSpanAttributeAttributes(propertyName, hashedPropertyName, "propertyName" + hashedPropertyName, propertyNameSpan);
-        final SpanElement propertyValueSpan = propertyEditorView.getPropertyValueSpan();
-        setSpanAttributeAttributes(propertyName, propertyValue, "propertyValue" + hashedPropertyName, propertyValueSpan);
-        propertySpanElementMap.put(propertyName, propertyValueSpan);
-        final InputElement propertyValueInput = propertyEditorView.getPropertyValueInput();
-        propertyValueInput.setAttribute("placeholder", hashedPropertyName);
-        propertyValueInput.setAttribute("data-field", "propertyValue" + hashedPropertyName);
-        propertyValueInput.setDisabled(true);
-        propertyValueInput.getStyle().setDisplay(Style.Display.NONE);
-        final LIElement propertyFields = propertyEditorView.getPropertyFields();
-        propertyFields.setAttribute("data-field", "propertyFields" + hashedPropertyName);
-        if (propertyViewMap.containsKey(itemId)) {
-            propertyViewMap.get(itemId).add(propertyEditorView);
-        } else {
-            List<PropertyView> toPut = new ArrayList<>();
-            toPut.add(propertyEditorView);
-            propertyViewMap.put(itemId, toPut);
-        }
-        return propertyFields;
-    }
-
-    @Override
-    public LIElement getEditingPropertyFields(String itemId, String propertyName, String propertyValue) {
-        LIElement toReturn = getPropertyFields(itemId, propertyName, propertyValue);
-        editProperties(itemId);
-        return toReturn;
-    }
-
-    @Override
-    public void onToggleRowExpansion(String itemId, boolean isShown) {
-        if (propertyViewMap.containsKey(itemId)) {
-            propertyViewMap.get(itemId)
-                    .forEach(propertyEditorView -> CollectionEditorUtils.toggleRowExpansion(
-                            propertyEditorView.getPropertyFields(), isShown));
-        }
-    }
-
-    @Override
-    public void deleteProperties(String itemId) {
-        if (propertyViewMap.containsKey(itemId)) {
-            propertyViewMap.get(itemId)
-                    .forEach(this::deletePropertyView);
-            propertyViewMap.remove(itemId);
-        }
-    }
-
-    protected Map<String, String> stopEdit(String itemId, boolean toUpdate) {
-        Map<String, String> toReturn = new HashMap<>();
-        if (propertyViewMap.containsKey(itemId)) {
-            propertyViewMap.get(itemId)
-                    .forEach(propertyEditorView -> stopEditPropertyView(toReturn, propertyEditorView, toUpdate));
-        }
-        return toReturn;
-    }
-
-    /**
-     * Enable editing a property
-     * @param toEdit
-     */
-    protected void startEditPropertyView(PropertyView toEdit) {
-        toEdit.getPropertyValueSpan().getStyle().setDisplay(Style.Display.NONE);
-        toEdit.getPropertyValueInput().setValue(toEdit.getPropertyValueSpan().getInnerText());
-        toEdit.getPropertyValueInput().getStyle().setDisplay(Style.Display.INLINE);
-        toEdit.getPropertyValueInput().setDisabled(false);
-    }
-
-    /**
-     * Disable editing a property and put its value in given <code>Map</code>
-     * @param toPopulate
-     * @param toStopEdit
-     * @param toUpdate
-     */
-    protected void stopEditPropertyView(Map<String, String> toPopulate, PropertyView toStopEdit, boolean toUpdate) {
-        if (toUpdate) {
-            toStopEdit.getPropertyValueSpan().setInnerText(toStopEdit.getPropertyValueInput().getValue());
-        }
-        toStopEdit.getPropertyValueSpan().getStyle().setDisplay(Style.Display.INLINE);
-        toStopEdit.getPropertyValueInput().getStyle().setDisplay(Style.Display.NONE);
-        toStopEdit.getPropertyValueInput().setDisabled(true);
-        String propertyName = toStopEdit.getPropertyName().getInnerText();
-        propertyName = propertyName.substring(propertyName.lastIndexOf('#') + 1);
-        toPopulate.put(propertyName, toStopEdit.getPropertyValueSpan().getInnerText());
-    }
-
-    protected void deletePropertyView(PropertyView toDelete) {
-        String propertyName = toDelete.getPropertyName().getAttribute("data-i18n-key");
-        toDelete.getPropertyFields().removeFromParent();
-        propertySpanElementMap.remove(propertyName);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyView.java
deleted file mode 100644
index 3aade3d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyView.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.Map;
-
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-
-public interface PropertyView {
-
-    interface Presenter {
-
-        /**
-         * Get the text shown in the property value
-         * @param propertyName the property fro which we are retrieving the value
-         * @return
-         * @throws Exception if the given property value is not found
-         */
-        String getPropertyValue(String propertyName) throws Exception;
-
-        /**
-         * Show the <code>InputElement</code>s to edit the properties shown at the given <b>baseNodeId</b> and hide their <code>SpanElement</code>s
-         * @param itemId the id of the item containing the <code>LIElement</code>
-         */
-        void editProperties(String itemId);
-
-        /**
-         * Show the <code>SpanElement</code>s of the properties shown at the given <b>baseNodeId</b> <b>without</b> change their values, and and hide their  <code>InputElement</code>s
-         * @param itemId the id of the item containing the <code>LIElement</code>
-         */
-        void stopEditProperties(String itemId);
-
-        /**
-         * Retrieve the <b>simple</b> properties shown at the given <b>itemId</b>
-         *
-         * @param itemId the id of the item containing the <code>LIElement</code>
-         * @return the map with updated values
-         */
-        Map<String, String> getSimpleProperties(String itemId);
-
-        /**
-         * Show the <code>SpanElement</code>s of the properties shown at the given <b>baseNodeId</b> with the value of their <code>InputElement</code>s, and hide the latters
-         * @param itemId the id of the item containing the <code>LIElement</code>
-         *
-         * @return the map with updated values
-         */
-        Map<String, String> updateProperties(String itemId);
-
-        /**
-         * @param itemId the id of the item containing the <code>LIElement</code>
-         * @param propertyName
-         * @param propertyValue
-         * @return the <code>LIElement</code> containing the property' <b>fields</b>
-         */
-        LIElement getPropertyFields(String itemId, String propertyName, String propertyValue);
-
-        /**
-         * @param itemId the id of the item containing the <code>LIElement</code>
-         * @param propertyName
-         * @param propertyValue
-         * @return the <code>LIElement</code> containing the property' <b>fields</b> in <b>editing</b> mode
-         */
-        LIElement getEditingPropertyFields(String itemId, String propertyName, String propertyValue);
-
-        /**
-         *
-         * @param itemId the id of the item containing the <code>LIElement</code>
-         * @param isShown <code>true</code> it the item is currently shown
-         */
-        void onToggleRowExpansion(String itemId, boolean isShown);
-
-        /**
-         * Remove all the <b>properties</b> belonging to the given <b>baseNodeId</b> from both <code>DOM</code> and internal <code>Map</code>
-         *
-         * @param itemId the id of the item containing the <code>LIElement</code>
-         */
-        void deleteProperties(String itemId);
-
-    }
-
-    /**
-     * @return the <code>LIElement</code> containing the property' <b>fields</b>
-     */
-    LIElement getPropertyFields();
-
-    /**
-     * @return the <code>SpanElement</code> showing the property' <b>name</b>
-     */
-    SpanElement getPropertyName();
-
-    /**
-     * @return the <code>SpanElement</code> showing the property' <b>value</b>
-     */
-    SpanElement getPropertyValueSpan();
-
-    /**
-     * @return the <code>InputElement</code> editing the property' <b>value</b>
-     */
-    InputElement getPropertyValueInput();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyViewImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyViewImpl.html
deleted file mode 100644
index f645a5b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyViewImpl.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<li class="list-group-item" data-field="propertyFields" style="list-style-type: none">
-  <span class="kie-object-list__field-value" data-field="propertyValueSpan"></span>
-  <input type="text" placeholder="" data-field="propertyValueInput" />
-  <span class="kie-object-list__field-label" data-field="propertyName" style="color: gray"></span>
-</li>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyViewImpl.java
deleted file mode 100644
index 25259cf..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyViewImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-/**
- * This class is used to show a single <b>property</b> inside an <code>ItemElementView</code>
- */
-@Templated
-public class PropertyViewImpl implements PropertyView {
-
-    @DataField("propertyFields")
-    protected LIElement propertyFields = Document.get().createLIElement();
-
-    @DataField("propertyName")
-    protected SpanElement propertyName = Document.get().createSpanElement();
-
-    @DataField("propertyValueSpan")
-    protected SpanElement propertyValueSpan = Document.get().createSpanElement();
-
-    @DataField("propertyValueInput")
-    protected InputElement propertyValueInput = Document.get().createTextInputElement();
-
-    @Override
-    public LIElement getPropertyFields() {
-        return propertyFields;
-    }
-
-    @Override
-    public SpanElement getPropertyName() {
-        return propertyName;
-    }
-
-    @Override
-    public SpanElement getPropertyValueSpan() {
-        return propertyValueSpan;
-    }
-
-    public InputElement getPropertyValueInput() {
-        return propertyValueInput;
-    }
-
-    @EventHandler("propertyValueInput")
-    public void onPropertyValueInputClickEvent(ClickEvent clickEvent) {
-        propertyValueInput.focus();
-        clickEvent.stopPropagation();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/EditingBox.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/EditingBox.java
deleted file mode 100644
index 9532247..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/EditingBox.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import com.google.gwt.dom.client.HeadingElement;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.UListElement;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.CollectionView;
-import org.uberfire.client.mvp.HasPresenter;
-
-public interface EditingBox<T extends EditingBox.Presenter> extends HasPresenter<T> {
-
-    interface Presenter {
-
-        void save();
-
-        void close(EditingBox toClose);
-
-        void setCollectionEditorPresenter(CollectionView.Presenter collectionEditorPresenter);
-    }
-
-    /**
-     *
-     * @param key The key representing the property, i.e Classname#propertyname (e.g Author#books)
-     */
-    void setKey(String key);
-
-    LIElement getEditingBox();
-
-    HeadingElement getEditingBoxTitle();
-
-    UListElement getPropertiesContainer();
-
-    void removeButtonToolbar();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/EditingBoxImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/EditingBoxImpl.java
deleted file mode 100644
index 5322370..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/EditingBoxImpl.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import com.google.gwt.dom.client.ButtonElement;
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.HeadingElement;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-
-public abstract class EditingBoxImpl<T extends EditingBox.Presenter> implements EditingBox<T> {
-
-    @DataField("editingBox")
-    protected LIElement editingBox = Document.get().createLIElement();
-
-    @DataField("editingBoxTitle")
-    protected HeadingElement editingBoxTitle = Document.get().createHElement(3);
-
-    @DataField("propertiesContainer")
-    protected UListElement propertiesContainer = Document.get().createULElement();
-
-    @DataField("saveItem")
-    protected ButtonElement saveItem = Document.get().createButtonElement();
-
-    @DataField("discardItem")
-    protected ButtonElement discardItem = Document.get().createButtonElement();
-
-    @DataField("buttonsToolbar")
-    protected DivElement buttonsToolbar = Document.get().createDivElement();
-
-    protected Presenter presenter;
-
-    protected String key;
-
-    @Override
-    public void init(Presenter presenter) {
-        this.presenter = presenter;
-    }
-
-    @Override
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @Override
-    public LIElement getEditingBox() {
-        return editingBox;
-    }
-
-    @Override
-    public HeadingElement getEditingBoxTitle() {
-        return editingBoxTitle;
-    }
-
-    @Override
-    public UListElement getPropertiesContainer() {
-        return propertiesContainer;
-    }
-
-    @EventHandler("saveItem")
-    public void onSaveItemClickEvent(ClickEvent clickEvent) {
-        presenter.save();
-        close(clickEvent);
-        clickEvent.stopPropagation();
-    }
-
-    @EventHandler("discardItem")
-    public void onDiscardItemClickEvent(ClickEvent clickEvent) {
-        close(clickEvent);
-        clickEvent.stopPropagation();
-    }
-
-    @Override
-    public void removeButtonToolbar() {
-        buttonsToolbar.removeFromParent();
-    }
-
-    protected void close(ClickEvent clickEvent) {
-        presenter.close(this);
-        clickEvent.stopPropagation();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/EditingBoxPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/EditingBoxPresenter.java
deleted file mode 100644
index 2d4f667..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/EditingBoxPresenter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import javax.inject.Inject;
-
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.CollectionView;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.PropertyPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-
-public abstract class EditingBoxPresenter implements EditingBox.Presenter {
-
-    @Inject
-    protected ViewsProvider viewsProvider;
-
-    @Inject
-    protected PropertyPresenter propertyPresenter;
-
-    protected CollectionView.Presenter collectionEditorPresenter;
-
-    @Override
-    public void setCollectionEditorPresenter(CollectionView.Presenter collectionEditorPresenter) {
-        this.collectionEditorPresenter = collectionEditorPresenter;
-    }
-
-    @Override
-    public void close(EditingBox toClose) {
-        toClose.getEditingBox().removeFromParent();
-        collectionEditorPresenter.toggleEditingStatus(false);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBox.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBox.java
deleted file mode 100644
index 516225a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBox.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import java.util.Map;
-
-import com.google.gwt.dom.client.LIElement;
-
-public interface ItemEditingBox extends EditingBox<ItemEditingBox.Presenter> {
-
-    interface Presenter extends EditingBox.Presenter  {
-
-        /**
-         *
-         * @param key The key representing the property, i.e Classname#propertyname (e.g Author#books)
-         * @param simplePropertiesMap the simple properties tho show
-         * @param expandablePropertiesMap the expandable properties to show
-         * @return
-         */
-        LIElement getEditingBox(String key, Map<String, String> simplePropertiesMap, Map<String, Map<String, String>> expandablePropertiesMap);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxImpl.html
deleted file mode 100644
index 6e03b82..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxImpl.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<li data-field="editingBox" style="list-style-type: none; margin-top: 5px">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h3 class="panel-title" data-field="editingBoxTitle"></h3>
-    </div>
-    <div class="panel-body">
-      <div class="kie-object-list treeview" id="treeview-object-edit">
-        <ul class="list-group" data-field="propertiesContainer" style="margin-top: 20px"></ul>
-      </div>
-    </div>
-    <div class="panel-footer" data-field="buttonsToolbar">
-      <button class="btn btn-primary" data-field="saveItem"><span class="fa fa-check"></span></button>
-      <button class="btn btn-default" data-field="discardItem"><span class="fa fa-close"></span></button>
-    </div>
-  </div>
-</li>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxImpl.java
deleted file mode 100644
index 962675a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-@Templated
-public class ItemEditingBoxImpl extends EditingBoxImpl<ItemEditingBox.Presenter> implements ItemEditingBox {
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxPresenter.java
deleted file mode 100644
index a25dc68..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxPresenter.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.google.gwt.dom.client.LIElement;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-
-public class ItemEditingBoxPresenter extends EditingBoxPresenter implements ItemEditingBox.Presenter {
-
-    protected List<String> nestedPropertiesNamesList = new ArrayList<>(); // Map a given ItemEditingBox' key with its nested properties
-
-    @Override
-    public LIElement getEditingBox(String key, Map<String, String> simplePropertiesMap, Map<String, Map<String, String>> expandablePropertiesMap) {
-        String propertyName = key.substring(key.lastIndexOf("#") + 1);
-        final ItemEditingBox listEditingBox = viewsProvider.getItemEditingBox();
-        listEditingBox.init(this);
-        listEditingBox.setKey(key);
-        listEditingBox.getEditingBoxTitle().setInnerText("Edit " + propertyName);
-        nestedPropertiesNamesList.clear();
-        for (Map.Entry<String, String> entry : simplePropertiesMap.entrySet()) {
-            String propertyKey = entry.getKey();
-            listEditingBox.getPropertiesContainer().appendChild(propertyPresenter.getEditingPropertyFields(VALUE, propertyKey, ""));
-        }
-        for (Map.Entry<String, Map<String, String>> entry : expandablePropertiesMap.entrySet()) {
-            String nestedPropertyName = entry.getKey();
-            String nestedPropertyKey = key + "#" + propertyName;
-            addExpandableItemEditingBox(listEditingBox, entry.getValue(), nestedPropertyKey, nestedPropertyName);
-        }
-        return listEditingBox.getEditingBox();
-    }
-
-    @Override
-    public void save() {
-        Map<String, String> simplePropertiesValues = propertyPresenter.updateProperties(VALUE);
-        Map<String, Map<String, String>> expandablePropertiesValues = new HashMap<>();
-        for (String nestedPropertyName : nestedPropertiesNamesList) {
-            expandablePropertiesValues.put(nestedPropertyName, propertyPresenter.updateProperties(nestedPropertyName));
-        }
-        collectionEditorPresenter.addListItem(simplePropertiesValues, expandablePropertiesValues);
-    }
-
-    /**
-     * @param containerItemEditingBox
-     * @param propertiesMap
-     * @param key
-     * @param propertyName
-     */
-    protected void addExpandableItemEditingBox(ItemEditingBox containerItemEditingBox, Map<String, String> propertiesMap, String key, String propertyName) {
-        final ItemEditingBox listEditingBox = viewsProvider.getItemEditingBox();
-        listEditingBox.init(this);
-        listEditingBox.setKey(key);
-        listEditingBox.getEditingBoxTitle().setInnerText(propertyName);
-        listEditingBox.removeButtonToolbar();
-        nestedPropertiesNamesList.add(propertyName);
-        for (Map.Entry<String, String> entry : propertiesMap.entrySet()) {
-            String propertyKey = entry.getKey();
-            listEditingBox.getPropertiesContainer().appendChild(propertyPresenter.getEditingPropertyFields(propertyName, propertyKey, ""));
-        }
-        containerItemEditingBox.getPropertiesContainer().appendChild(listEditingBox.getEditingBox());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBox.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBox.java
deleted file mode 100644
index 35b60a7..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBox.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import java.util.Map;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.UListElement;
-
-public interface KeyValueEditingBox extends EditingBox<KeyValueEditingBox.Presenter> {
-
-    interface Presenter extends EditingBox.Presenter {
-
-        /**
-         * @param key The key representing the property, i.e Classname#propertyname (e.g Author#books)
-         * @param keyPropertyMap
-         * @param valuePropertyMap
-         */
-        LIElement getEditingBox(String key, Map<String, String> keyPropertyMap, Map<String, String> valuePropertyMap);
-    }
-
-    LIElement getKeyValueContainer();
-
-    UListElement getKeyContainer();
-
-    UListElement getValueContainer();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxImpl.html
deleted file mode 100644
index 02dd400..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxImpl.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<li data-field="editingBox" style="list-style-type: none; margin-top: 5px">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h3 class="panel-title" data-field="editingBoxTitle"></h3>
-    </div>
-    <div class="panel-body">
-      <div class="kie-object-list treeview" id="treeview-object-edit">
-        <ul class="list-group" data-field="propertiesContainer" style="margin-top: 20px">
-          <li data-field="keyValueContainer" style="list-style-type: none">
-            <div style="display: inline-table">
-              <ul data-field="keyContainer" style="display: inline-block; vertical-align: top">
-                <li class="list-group-item node-treeview-object-edit" style="list-style-type: none">
-                  <span>KEY</span>
-                </li>
-              </ul>
-              <ul data-field="valueContainer" style="display: inline-block; vertical-align: top">
-                <li class="list-group-item node-treeview-object-edit" style="list-style-type: none">
-                  <span>VALUE</span>
-                </li>
-              </ul>
-            </div>
-          </li>
-        </ul>
-      </div>
-    </div>
-    <div class="panel-footer" data-field="buttonsToolbar">
-      <button class="btn btn-primary" data-field="saveItem"><span class="fa fa-check"></span></button>
-      <button class="btn btn-default" data-field="discardItem"><span class="fa fa-close"></span></button>
-    </div>
-  </div>
-</li>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxImpl.java
deleted file mode 100644
index cd2385b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.UListElement;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-@Templated
-public class KeyValueEditingBoxImpl extends EditingBoxImpl<KeyValueEditingBox.Presenter> implements KeyValueEditingBox {
-
-    @DataField("keyValueContainer")
-    protected LIElement keyValueContainer = Document.get().createLIElement();
-
-    @DataField("keyContainer")
-    protected UListElement keyContainer = Document.get().createULElement();
-
-    @DataField("valueContainer")
-    protected UListElement valueContainer = Document.get().createULElement();
-
-    @Override
-    public LIElement getKeyValueContainer() {
-        return keyValueContainer;
-    }
-
-    @Override
-    public UListElement getKeyContainer() {
-        return keyContainer;
-    }
-
-    @Override
-    public UListElement getValueContainer() {
-        return valueContainer;
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxPresenter.java
deleted file mode 100644
index 3ee8972..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxPresenter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import java.util.Map;
-
-import com.google.gwt.dom.client.LIElement;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-
-public class KeyValueEditingBoxPresenter extends EditingBoxPresenter implements KeyValueEditingBox.Presenter {
-
-    @Override
-    public LIElement getEditingBox(String key, Map<String, String> keyPropertyMap, Map<String, String> valuePropertyMap) {
-        String propertyName = key.substring(key.lastIndexOf("#") + 1);
-        final KeyValueEditingBox mapEditingBox = viewsProvider.getKeyValueEditingBox();
-        mapEditingBox.init(this);
-        mapEditingBox.setKey(key);
-        mapEditingBox.getEditingBoxTitle().setInnerText("Edit " + propertyName);
-        keyPropertyMap.forEach((propertyKey, value) -> mapEditingBox.getKeyContainer().appendChild(propertyPresenter.getEditingPropertyFields("key", propertyKey, ""))
-        );
-        valuePropertyMap.forEach((propertyKey, value) -> mapEditingBox.getValueContainer().appendChild(propertyPresenter.getEditingPropertyFields(VALUE, propertyKey, "")));
-        return mapEditingBox.getEditingBox();
-    }
-
-    @Override
-    public void save() {
-        Map<String, String> keyPropertiesValues = propertyPresenter.updateProperties("key");
-        Map<String, String> valuePropertiesMap = propertyPresenter.updateProperties(VALUE);
-        collectionEditorPresenter.addMapItem(keyPropertiesValues, valuePropertiesMap);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/package-info.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/package-info.java
deleted file mode 100644
index 012d456..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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. 
- */
-
-/**
- * Classes/html inside this package are used inside the <b>editing</b> box shown inside the collection editor
- */
-package org.drools.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/package-info.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/package-info.java
deleted file mode 100644
index 6c84eb3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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. 
- */
-
-/**
- * Classes/html inside this package are used inside the <b>collection</b> editor
- */
-package org.drools.workbench.screens.scenariosimulation.client.collectioneditor;
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioCommandManager.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioCommandManager.java
deleted file mode 100644
index 047ac87..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioCommandManager.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands;
-
-import javax.enterprise.context.Dependent;
-
-import org.kie.workbench.common.command.client.impl.CommandManagerImpl;
-
-/**
- * This class is used to actually invoke <code>Command</code>' methods on given command (<b>allow</b>, <b>execute</b>, <b>undo</b>)
- */
-@Dependent
-public class ScenarioCommandManager extends CommandManagerImpl<ScenarioSimulationContext, ScenarioSimulationViolation> {
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioCommandRegistryManager.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioCommandRegistryManager.java
deleted file mode 100644
index edd8e7e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioCommandRegistryManager.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands;
-
-import java.util.Collections;
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.Optional;
-
-import javax.enterprise.context.Dependent;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.AbstractScenarioSimulationUndoableCommand;
-import org.kie.workbench.common.command.client.CommandResult;
-import org.kie.workbench.common.command.client.CommandResultBuilder;
-import org.kie.workbench.common.command.client.impl.CommandResultImpl;
-import org.kie.workbench.common.command.client.registry.AbstractCommandRegistryManager;
-
-/**
- * This class is used to store <code>Queue</code>es of <b>executed/undone</b> <code>Command</code>s
- */
-@Dependent
-public class ScenarioCommandRegistryManager extends AbstractCommandRegistryManager<AbstractScenarioSimulationUndoableCommand> {
-
-    /**
-     * Method to register the status as it was soon before the command execution,
-     * to be used for undo/redo
-     * @param context
-     * @param command
-     */
-    public void register(ScenarioSimulationContext context, AbstractScenarioSimulationUndoableCommand command) {
-        doneCommandsRegistry.register(command);
-        undoneCommandsRegistry.clear();
-        setUndoRedoButtonStatus(context);
-    }
-
-    /**
-     * Calls <b>undo</b> on the last executed <code>Command</code>
-     * @param scenarioSimulationContext
-     * @throws NoSuchElementException
-     */
-    public CommandResult<ScenarioSimulationViolation> undo(ScenarioSimulationContext scenarioSimulationContext) {
-        CommandResult<ScenarioSimulationViolation> toReturn;
-        if (!doneCommandsRegistry.isEmpty()) {
-            commonUndoRedoPreexecution(scenarioSimulationContext, doneCommandsRegistry.peek());
-            final AbstractScenarioSimulationUndoableCommand toUndo = doneCommandsRegistry.pop();
-            toReturn = commonUndoRedoOperation(scenarioSimulationContext, toUndo, true);
-            if (Objects.equals(CommandResultBuilder.SUCCESS, toReturn)) {
-                undoneCommandsRegistry.register(toUndo);
-            }
-        } else {
-            toReturn = new CommandResultImpl<>(CommandResult.Type.WARNING, Collections.singletonList(
-                    new ScenarioSimulationViolation("No commands to undo")));
-        }
-        setUndoRedoButtonStatus(scenarioSimulationContext);
-        return toReturn;
-    }
-
-    /**
-     * Re-execute the last <b>undone</b> <code>Command</code>
-     * @param scenarioSimulationContext
-     * @throws NoSuchElementException
-     */
-    public CommandResult<ScenarioSimulationViolation> redo(ScenarioSimulationContext scenarioSimulationContext) {
-        CommandResult<ScenarioSimulationViolation> toReturn;
-        if (!undoneCommandsRegistry.isEmpty()) {
-            commonUndoRedoPreexecution(scenarioSimulationContext, undoneCommandsRegistry.peek());
-            final AbstractScenarioSimulationUndoableCommand toRedo = undoneCommandsRegistry.pop();
-            toReturn = commonUndoRedoOperation(scenarioSimulationContext, toRedo, false);
-            if (Objects.equals(CommandResultBuilder.SUCCESS, toReturn)) {
-                doneCommandsRegistry.register(toRedo);
-            }
-        } else {
-            toReturn = new CommandResultImpl<>(CommandResult.Type.WARNING, Collections.singletonList(
-                    new ScenarioSimulationViolation("No commands to redo")));
-        }
-        setUndoRedoButtonStatus(scenarioSimulationContext);
-        return toReturn;
-    }
-
-    /**
-     * Method called soon before actual <b>undo</b> and <b>redo</b> operations to preliminary execute a tab switch <b>without</b>
-     * altering the call stack.
-     * If the command change the status of a not shown grid, this switches the tab and returns without removing now executing the actual command.
-     * @param scenarioSimulationContext
-     * @param command
-     */
-    protected Optional<CommandResult<ScenarioSimulationViolation>> commonUndoRedoPreexecution(final ScenarioSimulationContext scenarioSimulationContext,
-                                                                                              final AbstractScenarioSimulationUndoableCommand command) {
-        return command.commonUndoRedoPreExecution(scenarioSimulationContext);
-    }
-
-    /**
-     * Common method called by <b>undo</b> and <b>redo</b> events
-     * @param scenarioSimulationContext
-     * @param command
-     * @param isUndo
-     * @return
-     */
-    protected CommandResult<ScenarioSimulationViolation> commonUndoRedoOperation(final ScenarioSimulationContext scenarioSimulationContext,
-                                                                                 final AbstractScenarioSimulationUndoableCommand command,
-                                                                                 final boolean isUndo) {
-        CommandResult<ScenarioSimulationViolation> toReturn;
-        if (isUndo) {
-            toReturn = command.undo(scenarioSimulationContext);
-        } else {
-            toReturn = command.redo(scenarioSimulationContext);
-        }
-        return toReturn;
-    }
-
-    protected void setUndoRedoButtonStatus(final ScenarioSimulationContext scenarioSimulationContext) {
-        scenarioSimulationContext.setUndoButtonEnabledStatus(!doneCommandsRegistry.isEmpty());
-        scenarioSimulationContext.setRedoButtonEnabledStatus(!undoneCommandsRegistry.isEmpty());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationContext.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationContext.java
deleted file mode 100644
index f13595f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationContext.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationEditorPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.factories.CollectionEditorSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioExpressionCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.models.AbstractScesimGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridLayer;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridPanel;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridWidget;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-
-/**
- * This class represent the <b>Context</b> inside which the commands will be executed
- */
-public class ScenarioSimulationContext {
-
-    private static final AtomicLong STATUS_COUNTER_ID = new AtomicLong();
-    private static final String ILLEGAL_WIDGET_MESSAGE_PREFIX = "Illegal GridWidget ";
-
-    protected final ScenarioGridWidget simulationGridWidget;
-    protected final ScenarioGridWidget backgroundGridWidget;
-
-    protected ScenarioSimulationEditorPresenter scenarioSimulationEditorPresenter;
-    protected TestToolsView.Presenter testToolsPresenter;
-    protected SortedMap<String, FactModelTree> dataObjectFieldsMap;
-    protected Set<String> dataObjectsInstancesName;
-    protected Status status = new Status();
-
-    /**
-     * This constructor set the <b>Simulation</b> and <b>Background</b> <code>ScenarioGridWidget</code>s
-     * @param simulationGridWidget
-     * @param backgroundGridWidget
-     */
-    public ScenarioSimulationContext(ScenarioGridWidget simulationGridWidget, ScenarioGridWidget backgroundGridWidget) {
-        this.simulationGridWidget = simulationGridWidget;
-        this.backgroundGridWidget = backgroundGridWidget;
-    }
-
-    /**
-     * Get the current <code>Status</code>
-     * @return
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * Used to restore a previous <code>Status</code> inside this context
-     * @param status
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    public ScenarioSimulationEditorPresenter getScenarioSimulationEditorPresenter() {
-        return scenarioSimulationEditorPresenter;
-    }
-
-    public void setScenarioSimulationEditorPresenter(ScenarioSimulationEditorPresenter scenarioSimulationEditorPresenter) {
-        this.scenarioSimulationEditorPresenter = scenarioSimulationEditorPresenter;
-    }
-
-    public ScenarioSimulationModel getScenarioSimulationModel() {
-        return scenarioSimulationEditorPresenter.getModel();
-    }
-
-    public TestToolsView.Presenter getTestToolsPresenter() {
-        return testToolsPresenter;
-    }
-
-    public void setTestToolsPresenter(TestToolsView.Presenter testToolsPresenter) {
-        this.testToolsPresenter = testToolsPresenter;
-    }
-
-    public SortedMap<String, FactModelTree> getDataObjectFieldsMap() {
-        return dataObjectFieldsMap;
-    }
-
-    public void setDataObjectFieldsMap(SortedMap<String, FactModelTree> dataObjectFieldsMap) {
-        this.dataObjectFieldsMap = dataObjectFieldsMap;
-    }
-
-    /**
-     * Set the names of already existing Data Objects/Instances, used inside updateHeaderValidation
-     * @param dataObjectsInstancesName
-     */
-    public void setDataObjectsInstancesName(Set<String> dataObjectsInstancesName) {
-        this.dataObjectsInstancesName = dataObjectsInstancesName;
-    }
-
-    public Optional<ScenarioGridWidget> getSelectedScenarioGridWidget() {
-        if (backgroundGridWidget.isSelected() && simulationGridWidget.isSelected()) {
-            throw new IllegalStateException("Simulation and Background grids can not be selected at the same time");
-        }
-        if (!backgroundGridWidget.isSelected() && !simulationGridWidget.isSelected()) {
-            return Optional.empty();
-        }
-        // return the actually selected grid
-        return backgroundGridWidget.isSelected() ? Optional.of(backgroundGridWidget) : Optional.of(simulationGridWidget);
-    }
-
-    public ScenarioGrid getSimulationGrid() {
-        return simulationGridWidget.getScenarioGridPanel().getScenarioGrid();
-    }
-
-    public ScenarioGrid getBackgroundGrid() {
-        return backgroundGridWidget.getScenarioGridPanel().getScenarioGrid();
-    }
-
-    public Optional<ScenarioGridPanel> getSelectedScenarioGridPanel() {
-        return getSelectedScenarioGridWidget().map(ScenarioGridWidget::getScenarioGridPanel);
-    }
-
-    public ScenarioGridPanel getScenarioGridPanelByGridWidget(GridWidget gridWidget) {
-        switch (gridWidget) {
-            case SIMULATION:
-                return simulationGridWidget.getScenarioGridPanel();
-            case BACKGROUND:
-                return backgroundGridWidget.getScenarioGridPanel();
-            default:
-                throw new IllegalArgumentException(ILLEGAL_WIDGET_MESSAGE_PREFIX + gridWidget);
-        }
-    }
-
-    public AbstractScesimGridModel getAbstractScesimGridModelByGridWidget(GridWidget gridWidget) {
-        switch (gridWidget) {
-            case SIMULATION:
-                return simulationGridWidget.getModel();
-            case BACKGROUND:
-                return backgroundGridWidget.getModel();
-            default:
-                throw new IllegalArgumentException(ILLEGAL_WIDGET_MESSAGE_PREFIX + gridWidget);
-        }
-    }
-
-    public <T extends AbstractScesimData> AbstractScesimModel<T> getAbstractScesimModelByGridWidget(GridWidget gridWidget) {
-        switch (gridWidget) {
-            case SIMULATION:
-                return (AbstractScesimModel<T>) status.getSimulation();
-            case BACKGROUND:
-                return (AbstractScesimModel<T>) status.getBackground();
-            default:
-                throw new IllegalArgumentException(ILLEGAL_WIDGET_MESSAGE_PREFIX + gridWidget);
-        }
-    }
-
-    public Optional<AbstractScesimGridModel> getSelectedScenarioGridModel() {
-        return getSelectedScenarioGridLayer().map(ScenarioGridLayer::getScenarioGrid).map(ScenarioGrid::getModel);
-    }
-
-    public Optional<ScenarioGridLayer> getSelectedScenarioGridLayer() {
-        return getSelectedScenarioGridPanel().map(ScenarioGridPanel::getScenarioGridLayer);
-    }
-
-    public Optional<GridWidget> getSelectedGridWidget() {
-        return getSelectedScenarioGridModel().map(AbstractScesimGridModel::getGridWidget);
-    }
-
-    /**
-     * Method to verify that <code>Status</code>' <b>simulation</b> is populated, since <code>Simulation</code>
-     * is set inside the model <b>after</b> the creation ot the current instance
-     */
-    public void setStatusSimulationIfEmpty() {
-        if (status.getSimulation() == null) {
-            final Optional<AbstractScesimModel> abstractScesimModel = simulationGridWidget.getModel().getAbstractScesimModel();
-            status.setSimulation((Simulation) abstractScesimModel.orElseThrow(IllegalStateException::new));
-        }
-        if (status.getBackground() == null) {
-            final Optional<AbstractScesimModel> abstractScesimModel = backgroundGridWidget.getModel().getAbstractScesimModel();
-            status.setBackground((Background) abstractScesimModel.orElseThrow(IllegalStateException::new));
-        }
-    }
-
-    public CollectionEditorSingletonDOMElementFactory getCollectionEditorSingletonDOMElementFactory(GridWidget gridWidget) {
-        return getAbstractScesimGridModelByGridWidget(gridWidget).getCollectionEditorSingletonDOMElementFactory();
-    }
-
-    public ScenarioCellTextAreaSingletonDOMElementFactory getScenarioCellTextAreaSingletonDOMElementFactory(GridWidget gridWidget) {
-        return getAbstractScesimGridModelByGridWidget(gridWidget).getScenarioCellTextAreaSingletonDOMElementFactory();
-    }
-
-    public ScenarioHeaderTextBoxSingletonDOMElementFactory getScenarioHeaderTextBoxSingletonDOMElementFactory(GridWidget gridWidget){
-        return getAbstractScesimGridModelByGridWidget(gridWidget).getScenarioHeaderTextBoxSingletonDOMElementFactory();
-    }
-
-    public ScenarioExpressionCellTextAreaSingletonDOMElementFactory getScenarioExpressionCellTextAreaSingletonDOMElementFactory(GridWidget gridWidget) {
-        return getAbstractScesimGridModelByGridWidget(gridWidget).getScenarioExpressionCellTextAreaSingletonDOMElementFactory();
-    }
-
-    public void setUndoButtonEnabledStatus(boolean enabled) {
-        //scenarioSimulationEditorPresenter.setUndoButtonEnabledStatus(enabled);
-    }
-
-    public void setRedoButtonEnabledStatus(boolean enabled) {
-        //scenarioSimulationEditorPresenter.setRedoButtonEnabledStatus(enabled);
-    }
-
-    /**
-     * Class representing the variable <b>Status</b> of the context
-     */
-    public class Status {
-
-        /**
-         * Auto-generated incremental identifier used  to uniquely identify each status
-         */
-        private final long id;
-
-        protected String columnId;
-        protected int columnIndex;
-        protected boolean isRight;
-        protected boolean asProperty;
-
-        protected String columnGroup;
-
-        protected String fullPackage;
-        protected String className;
-        protected String importPrefix;
-
-        protected String value;
-        protected String valueClassName;
-        protected boolean keepData;
-
-        protected String gridCellValue;
-
-        protected int rowIndex;
-
-        protected Simulation simulation;
-
-        protected Background background;
-
-        protected GridWidget currentGrid;
-
-        /**
-         * The string to use for filtering in right panel
-         */
-        protected String filterTerm;
-
-        /**
-         * flag to decide which kind of filter (<b>equals</b> or <b>not euals</b>) is to be applied.
-         * Default to false (= <b>equals</b> filter)
-         */
-        protected boolean notEqualsSearch = false;
-
-        /**
-         * The <code>List</code> to <b>eventually</b> use to select the property in the test tools  panel
-         */
-        protected List<String> propertyNameElements;
-
-        /**
-         * The <b>content</b> of a header cell
-         */
-        protected String headerCellValue;
-
-        /**
-         * Disable the <b>TestTools</b>
-         */
-        protected boolean disable = true;
-
-        /**
-         * open the Right dock
-         */
-        protected boolean openDock = false;
-
-        public Status() {
-            this.id = STATUS_COUNTER_ID.getAndIncrement();
-        }
-
-        public long getId() {
-            return id;
-        }
-
-        public String getColumnId() {
-            return columnId;
-        }
-
-        public void setColumnId(String columnId) {
-            this.columnId = columnId;
-        }
-
-        public int getColumnIndex() {
-            return columnIndex;
-        }
-
-        public void setColumnIndex(int columnIndex) {
-            this.columnIndex = columnIndex;
-        }
-
-        public boolean isAsProperty() {
-            return asProperty;
-        }
-
-        public void setAsProperty(boolean asProperty) {
-            this.asProperty = asProperty;
-        }
-
-        public String getColumnGroup() {
-            return columnGroup;
-        }
-
-        public void setColumnGroup(String columnGroup) {
-            this.columnGroup = columnGroup;
-        }
-
-        public String getClassName() {
-            return className;
-        }
-
-        public void setClassName(String className) {
-            this.className = className;
-        }
-
-        public boolean isRight() {
-            return isRight;
-        }
-
-        public void setRight(boolean right) {
-            isRight = right;
-        }
-
-        public String getFullPackage() {
-            return fullPackage == null ? "" : fullPackage;
-        }
-
-        public void setFullPackage(String fullPackage) {
-            this.fullPackage = fullPackage;
-        }
-
-        public boolean isKeepData() {
-            return keepData;
-        }
-
-        public void setKeepData(boolean keepData) {
-            this.keepData = keepData;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        public String getValueClassName() {
-            return valueClassName;
-        }
-
-        public void setValueClassName(String valueClassName) {
-            this.valueClassName = valueClassName;
-        }
-
-        public int getRowIndex() {
-            return rowIndex;
-        }
-
-        public void setRowIndex(int rowIndex) {
-            this.rowIndex = rowIndex;
-        }
-
-        public String getFilterTerm() {
-            return filterTerm;
-        }
-
-        public void setFilterTerm(String filterTerm) {
-            this.filterTerm = filterTerm;
-        }
-
-        public boolean isNotEqualsSearch() {
-            return notEqualsSearch;
-        }
-
-        public void setNotEqualsSearch(boolean notEqualsSearch) {
-            this.notEqualsSearch = notEqualsSearch;
-        }
-
-        public List<String> getPropertyNameElements() {
-            return propertyNameElements;
-        }
-
-        public void setPropertyNameElements(List<String> propertyNameElements) {
-            this.propertyNameElements = propertyNameElements;
-        }
-
-        public boolean isDisable() {
-            return disable;
-        }
-
-        public void setDisable(boolean disable) {
-            this.disable = disable;
-        }
-
-        public boolean isOpenDock() {
-            return openDock;
-        }
-
-        public void setOpenDock(boolean openDock) {
-            this.openDock = openDock;
-        }
-
-        public String getGridCellValue() {
-            return gridCellValue;
-        }
-
-        public void setGridCellValue(String gridCellValue) {
-            this.gridCellValue = gridCellValue;
-        }
-
-        public String getHeaderCellValue() {
-            return headerCellValue;
-        }
-
-        public void setHeaderCellValue(String headerCellValue) {
-            this.headerCellValue = headerCellValue;
-        }
-
-        public Simulation getSimulation() {
-            return simulation;
-        }
-
-        public void setSimulation(Simulation simulation) {
-            this.simulation = simulation;
-        }
-
-        public Background getBackground() {
-            return background;
-        }
-
-        public void setBackground(Background background) {
-            this.background = background;
-        }
-
-        public GridWidget getCurrentGrid() {
-            return currentGrid;
-        }
-
-        public void setCurrentGrid(GridWidget currentGrid) {
-            this.currentGrid = currentGrid;
-        }
-
-        public String getImportPrefix() {
-            return importPrefix;
-        }
-
-        public void setImportPrefix(String importPrefix) {
-            this.importPrefix = importPrefix;
-        }
-
-        public Status cloneStatus() {
-            Status toReturn = new Status();
-            toReturn.columnId = this.columnId;
-            toReturn.columnIndex = this.columnIndex;
-            toReturn.isRight = this.isRight;
-            toReturn.asProperty = this.asProperty;
-            toReturn.columnGroup = this.columnGroup;
-            toReturn.fullPackage = this.fullPackage;
-            toReturn.className = this.className;
-            toReturn.value = this.value;
-            toReturn.valueClassName = this.valueClassName;
-            toReturn.keepData = this.keepData;
-            toReturn.gridCellValue = this.gridCellValue;
-            toReturn.rowIndex = this.rowIndex;
-            toReturn.simulation = this.simulation.cloneModel();
-            toReturn.background = this.background.cloneModel();
-            toReturn.currentGrid = this.currentGrid;
-            toReturn.importPrefix = this.importPrefix;
-            return toReturn;
-        }
-
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationEventHandler.java
deleted file mode 100644
index a241403..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationEventHandler.java
+++ /dev/null
@@ -1,574 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.event.Event;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.event.shared.HandlerRegistration;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.AbstractScenarioSimulationCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.AbstractScenarioSimulationUndoableCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.AppendColumnCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.AppendRowCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.DeleteColumnCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.DeleteRowCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.DisableTestToolsCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.DuplicateInstanceCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.DuplicateRowCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.EnableTestToolsCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.ImportCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.InsertColumnCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.InsertRowCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.PrependColumnCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.PrependRowCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.ReloadTestToolsCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.RunSingleScenarioCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.SetGridCellValueCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.SetHeaderCellValueCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.SetInstanceHeaderCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.SetPropertyHeaderCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.UpdateSettingsDataCommand;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationEditorPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.AppendColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.AppendRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DeleteColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DeleteRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DisableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DuplicateInstanceEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DuplicateRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.EnableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ImportEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.InsertColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.InsertRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.PrependColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.PrependRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.RedoEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ReloadTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.RunSingleScenarioEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioGridReloadEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioNotificationEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetGridCellValueEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetHeaderCellValueEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetInstanceHeaderEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetPropertyHeaderEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.UndoEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.UnsupportedDMNEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.UpdateSettingsDataEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ValidateSimulationEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.AppendColumnEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.AppendRowEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.DeleteColumnEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.DeleteRowEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.DisableTestToolsEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.DuplicateInstanceEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.DuplicateRowEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.EnableTestToolsEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ImportEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.InsertColumnEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.InsertRowEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.PrependColumnEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.PrependRowEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.RedoEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ReloadTestToolsEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.RunSingleScenarioEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioGridReloadEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioNotificationEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SetGridCellValueEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SetHeaderCellValueEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SetInstanceHeaderEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SetPropertyHeaderEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.UndoEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.UnsupportedDMNEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.UpdateSettingsDataEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ValidateSimulationEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.models.AbstractScesimGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.popup.ConfirmPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.DeletePopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.FileUploadPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.PreserveDeletePopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.kie.workbench.common.command.client.CommandResult;
-import org.kie.workbench.common.command.client.CommandResultBuilder;
-import org.uberfire.workbench.events.NotificationEvent;
-
-import static org.drools.workbench.screens.scenariosimulation.service.ImportExportType.CSV;
-
-/**
- * This class is meant to be a centralized listener for events fired up by UI, responding to them issuing specific <code>Command</code>s.
- * <p>
- * It follows the GWT standard Event/Handler mechanism
- */
-@Dependent
-public class ScenarioSimulationEventHandler implements AppendColumnEventHandler,
-                                                       AppendRowEventHandler,
-                                                       DeleteColumnEventHandler,
-                                                       DeleteRowEventHandler,
-                                                       DisableTestToolsEventHandler,
-                                                       DuplicateInstanceEventHandler,
-                                                       DuplicateRowEventHandler,
-                                                       EnableTestToolsEventHandler,
-                                                       ImportEventHandler,
-                                                       InsertColumnEventHandler,
-                                                       InsertRowEventHandler,
-                                                       PrependColumnEventHandler,
-                                                       PrependRowEventHandler,
-                                                       RedoEventHandler,
-                                                       ReloadTestToolsEventHandler,
-                                                       RunSingleScenarioEventHandler,
-                                                       ScenarioGridReloadEventHandler,
-                                                       ScenarioNotificationEventHandler,
-                                                       SetGridCellValueEventHandler,
-                                                       SetHeaderCellValueEventHandler,
-                                                       SetInstanceHeaderEventHandler,
-                                                       SetPropertyHeaderEventHandler,
-                                                       UndoEventHandler,
-                                                       UnsupportedDMNEventHandler,
-                                                       UpdateSettingsDataEventHandler,
-                                                       ValidateSimulationEventHandler {
-
-    protected DeletePopupPresenter deletePopupPresenter;
-    protected PreserveDeletePopupPresenter preserveDeletePopupPresenter;
-    protected ConfirmPopupPresenter confirmPopupPresenter;
-    protected FileUploadPopupPresenter fileUploadPopupPresenter;
-
-    protected EventBus eventBus;
-
-    protected List<HandlerRegistration> handlerRegistrationList = new ArrayList<>();
-
-    protected Event<NotificationEvent> notificationEvent;
-
-    protected ScenarioSimulationEditorPresenter scenarioSimulationEditorPresenter;
-
-    protected ScenarioCommandRegistryManager scenarioCommandRegistryManager;
-
-    protected ScenarioCommandManager scenarioCommandManager;
-
-    protected ScenarioSimulationContext context;
-
-    public void setEventBus(EventBus eventBus) {
-        this.eventBus = eventBus;
-        registerHandlers();
-    }
-
-    public void setDeletePopupPresenter(DeletePopupPresenter deletePopupPresenter) {
-        this.deletePopupPresenter = deletePopupPresenter;
-    }
-
-    public void setPreserveDeletePopupPresenter(PreserveDeletePopupPresenter preserveDeletePopupPresenter) {
-        this.preserveDeletePopupPresenter = preserveDeletePopupPresenter;
-    }
-
-    public void setConfirmPopupPresenter(ConfirmPopupPresenter confirmPopupPresenter) {
-        this.confirmPopupPresenter = confirmPopupPresenter;
-    }
-
-    public void setFileUploadPopupPresenter(FileUploadPopupPresenter fileUploadPopupPresenter) {
-        this.fileUploadPopupPresenter = fileUploadPopupPresenter;
-    }
-
-    public void setNotificationEvent(Event<NotificationEvent> notificationEvent) {
-        this.notificationEvent = notificationEvent;
-    }
-
-    public void setScenarioSimulationPresenter(ScenarioSimulationEditorPresenter scenarioSimulationEditorPresenter) {
-        this.scenarioSimulationEditorPresenter = scenarioSimulationEditorPresenter;
-    }
-
-    public void setScenarioCommandRegistryManager(ScenarioCommandRegistryManager scenarioCommandRegistryManager) {
-        this.scenarioCommandRegistryManager = scenarioCommandRegistryManager;
-    }
-
-    public void setScenarioCommandManager(ScenarioCommandManager scenarioCommandManager) {
-        this.scenarioCommandManager = scenarioCommandManager;
-    }
-
-    public void setContext(ScenarioSimulationContext context) {
-        this.context = context;
-    }
-
-    @PreDestroy
-    public void unregisterHandlers() {
-        handlerRegistrationList.forEach(HandlerRegistration::removeHandler);
-    }
-
-    @Override
-    public void onEvent(AppendColumnEvent event) {
-        context.getStatus().setColumnId(String.valueOf(new Date().getTime()));
-        context.getStatus().setColumnGroup(event.getColumnGroup());
-        commonExecution(new AppendColumnCommand(event.getGridWidget()), true);
-    }
-
-    @Override
-    public void onEvent(AppendRowEvent event) {
-        commonExecution(new AppendRowCommand(event.getGridWidget()), true);
-    }
-
-    @Override
-    public void onEvent(DeleteColumnEvent event) {
-        context.getStatus().setColumnIndex(event.getColumnIndex());
-        context.getStatus().setColumnGroup(event.getColumnGroup());
-        context.getStatus().setDisable(true);
-        context.getStatus().setOpenDock(false);
-        context.getStatus().setAsProperty(event.isAsProperty());
-        commonExecution(new DeleteColumnCommand(event.getGridWidget()), true);
-    }
-
-    @Override
-    public void onEvent(DeleteRowEvent event) {
-        context.getStatus().setRowIndex(event.getRowIndex());
-        commonExecution(new DeleteRowCommand(event.getGridWidget()), true);
-    }
-
-    @Override
-    public void onEvent(DisableTestToolsEvent event) {
-        commonExecution(new DisableTestToolsCommand(), false);
-    }
-
-    @Override
-    public void onEvent(DuplicateInstanceEvent event) {
-        context.getStatus().setColumnId(String.valueOf(new Date().getTime()));
-        context.getStatus().setColumnIndex(event.getColumnIndex());
-        context.getStatus().setRight(true);
-        context.getStatus().setAsProperty(false);
-        context.getStatus().setFullPackage(
-                ((ScenarioGridColumn) context.getAbstractScesimGridModelByGridWidget(event.getGridWidget()).getSelectedColumn()).getFactIdentifier().getPackageWithoutClassName());
-        commonExecution(new DuplicateInstanceCommand(event.getGridWidget()), true);
-    }
-
-    @Override
-    public void onEvent(DuplicateRowEvent event) {
-        context.getStatus().setRowIndex(event.getRowIndex());
-        commonExecution(new DuplicateRowCommand(event.getGridWidget()), true);
-    }
-
-    @Override
-    public void onEvent(EnableTestToolsEvent event) {
-        context.getStatus().setFilterTerm(event.getFilterTerm());
-        context.getStatus().setPropertyNameElements(event.getPropertyNameElements());
-        context.getStatus().setNotEqualsSearch(event.isNotEqualsSearch());
-        commonExecution(new EnableTestToolsCommand(), false);
-    }
-
-    @Override
-    public void onEvent(ImportEvent event) {
-        org.uberfire.mvp.Command okImportCommand = () -> {
-            ImportCommand importCommand = new ImportCommand(event.getGridWidget(), fileUploadPopupPresenter.getFileContents());
-            commonExecution(importCommand, false);
-        };
-        fileUploadPopupPresenter.show(Collections.singletonList(CSV.getExtension()),
-                                      ScenarioSimulationEditorConstants.INSTANCE.selectImportFile(),
-                                      ScenarioSimulationEditorConstants.INSTANCE.uploadWarning(),
-                                      ScenarioSimulationEditorConstants.INSTANCE.importLabel(),
-                                      okImportCommand);
-    }
-
-    @Override
-    public void onEvent(InsertColumnEvent event) {
-        context.getStatus().setColumnId(String.valueOf(new Date().getTime()));
-        context.getStatus().setColumnIndex(event.getColumnIndex());
-        context.getStatus().setRight(event.isRight());
-        context.getStatus().setAsProperty(event.isAsProperty());
-        commonExecution(new InsertColumnCommand(event.getGridWidget()), true);
-    }
-
-    @Override
-    public void onEvent(InsertRowEvent event) {
-        context.getStatus().setRowIndex(event.getRowIndex());
-        commonExecution(new InsertRowCommand(event.getGridWidget()), true);
-    }
-
-    @Override
-    public void onEvent(PrependColumnEvent event) {
-        context.getStatus().setColumnId(String.valueOf(new Date().getTime()));
-        context.getStatus().setColumnGroup(event.getColumnGroup());
-        commonExecution(new PrependColumnCommand(event.getGridWidget()), true);
-    }
-
-    @Override
-    public void onEvent(PrependRowEvent event) {
-        commonExecution(new PrependRowCommand(event.getGridWidget()), true);
-    }
-
-    @Override
-    public void onEvent(RedoEvent event) {
-        final CommandResult<ScenarioSimulationViolation> status = scenarioCommandRegistryManager.redo(context);
-        if (Objects.equals(CommandResult.Type.ERROR, status.getType())) {
-            commonNotifyError(status, ScenarioSimulationEditorConstants.INSTANCE.redo());
-        }
-    }
-
-    @Override
-    public void onEvent(ReloadTestToolsEvent event) {
-        context.getStatus().setDisable(event.isDisable());
-        context.getStatus().setOpenDock(event.isOpenDock());
-        commonExecution(new ReloadTestToolsCommand(), false);
-    }
-
-    @Override
-    public void onEvent(RunSingleScenarioEvent event) {
-        context.getStatus().setRowIndex(event.getRowIndex());
-        commonExecution(new RunSingleScenarioCommand(), false);
-    }
-
-    @Override
-    public void onEvent(ScenarioGridReloadEvent event) {
-        context.getScenarioGridPanelByGridWidget(event.getGridWidget()).onResize();
-    }
-
-    @Override
-    public void onEvent(ScenarioNotificationEvent event) {
-        notificationEvent.fire(new NotificationEvent(event.getMessage(), event.getNotificationType()).setAutoHide(event.isAutoHide()));
-    }
-
-    @Override
-    public void onEvent(SetGridCellValueEvent event) {
-        context.getStatus().setRowIndex(event.getRowIndex());
-        context.getStatus().setColumnIndex(event.getColumnIndex());
-        context.getStatus().setGridCellValue(event.getCellValue());
-        commonExecution(new SetGridCellValueCommand(event.getGridWidget()), false);
-    }
-
-    @Override
-    public void onEvent(SetHeaderCellValueEvent event) {
-        context.getStatus().setRowIndex(event.getRowIndex());
-        context.getStatus().setColumnIndex(event.getColumnIndex());
-        context.getStatus().setHeaderCellValue(event.getHeaderCellValue());
-        commonExecution(new SetHeaderCellValueCommand(event.getGridWidget(), event.isInstanceHeader(), event.isPropertyHeader()), false);
-    }
-
-    @Override
-    public void onEvent(SetInstanceHeaderEvent event) {
-        if (context.getAbstractScesimGridModelByGridWidget(event.getGridWidget()).isSameInstanceType(event.getClassName())) {
-            return;
-        }
-        context.getStatus().setFullPackage(event.getFullPackage());
-        context.getStatus().setClassName(event.getClassName());
-        if (((ScenarioGridColumn) context.getAbstractScesimGridModelByGridWidget(event.getGridWidget()).getSelectedColumn()).isInstanceAssigned()) {
-            org.uberfire.mvp.Command okPreserveCommand = () -> commonExecution(new SetInstanceHeaderCommand(event.getGridWidget()),
-                                                                               true);
-            deletePopupPresenter.show(ScenarioSimulationEditorConstants.INSTANCE.changeTypeMainTitle(),
-                                      ScenarioSimulationEditorConstants.INSTANCE.changeTypeMainQuestion(),
-                                      ScenarioSimulationEditorConstants.INSTANCE.changeTypeText1(),
-                                      ScenarioSimulationEditorConstants.INSTANCE.changeTypeTextQuestion(),
-                                      ScenarioSimulationEditorConstants.INSTANCE.changeTypeTextDanger(),
-                                      ScenarioSimulationEditorConstants.INSTANCE.changeType(),
-                                      okPreserveCommand);
-        } else {
-            commonExecution(new SetInstanceHeaderCommand(event.getGridWidget()), true);
-        }
-    }
-
-    @Override
-    public void onEvent(SetPropertyHeaderEvent event) {
-        if (context.getAbstractScesimGridModelByGridWidget(event.getGridWidget()).getSelectedColumn() == null) {
-            return;
-        }
-        if (context.getAbstractScesimGridModelByGridWidget(event.getGridWidget()).isAlreadyAssignedProperty(event.getPropertyNameElements())) {
-            String value;
-            if (Objects.equals(FactMappingValueType.EXPRESSION, event.getFactMappingValueType())) {
-                value = ConstantHolder.EXPRESSION;
-            } else {
-                value = String.join(".", event.getPropertyNameElements());
-            }
-            onEvent(new ScenarioNotificationEvent("Property \"" + value + "\" already assigned", NotificationEvent.NotificationType.ERROR));
-            return;
-        }
-        context.getStatus().setFullPackage(event.getFullPackage());
-        context.getStatus().setClassName(event.getFactType());
-        context.getStatus().setPropertyNameElements(event.getPropertyNameElements());
-        context.getStatus().setValueClassName(event.getValueClassName());
-        context.getStatus().setImportPrefix(event.getImportPrefix());
-        if (isSameFactProperty(event.getGridWidget(), event.getPropertyNameElements(), event.getFactMappingValueType()) &&
-                isSameSelectedColumnType(event.getGridWidget(), event.getValueClassName())) {
-            return;
-        } else {
-            if (isSelectedColumnEmpty(event.getGridWidget())) {
-                commonExecution(new SetPropertyHeaderCommand(event.getGridWidget(), event.getFactMappingValueType()), true);
-            } else {
-                if (isSameSelectedColumnType(event.getGridWidget(), event.getValueClassName()) && !ScenarioSimulationSharedUtils.isCollection(event.getValueClassName())) {
-                    showPreserveDeletePopup(event);
-                } else {
-                    showDeletePopup(event);
-                }
-            }
-        }
-    }
-
-    private boolean isSelectedColumnEmpty(GridWidget gridWidget) {
-        return context.getAbstractScesimGridModelByGridWidget(gridWidget).isSelectedColumnEmpty();
-    }
-
-    private boolean isSameFactProperty(GridWidget gridWidget, List<String> propertyNameElements, FactMappingValueType factMappingValueType) {
-        return context.getAbstractScesimGridModelByGridWidget(gridWidget).isSameSelectedColumnProperty(propertyNameElements, factMappingValueType);
-    }
-
-    private boolean isSameSelectedColumnType(GridWidget gridWidget, String valueTypeName) {
-        return context.getAbstractScesimGridModelByGridWidget(gridWidget).isSameSelectedColumnType(valueTypeName);
-    }
-
-    private void showDeletePopup(SetPropertyHeaderEvent event) {
-        org.uberfire.mvp.Command okPreserveCommand = () -> {
-            context.getStatus().setKeepData(false);
-            commonExecution(new SetPropertyHeaderCommand(event.getGridWidget(), event.getFactMappingValueType()), true);
-        };
-        deletePopupPresenter.show(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioMainTitle(),
-                                  ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioMainQuestion(),
-                                  ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioText1(),
-                                  ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioTextQuestion(),
-                                  null,
-                                  ScenarioSimulationEditorConstants.INSTANCE.deleteValues(),
-                                  okPreserveCommand);
-    }
-
-    private void showPreserveDeletePopup(SetPropertyHeaderEvent event) {
-        org.uberfire.mvp.Command okDeleteCommand = () -> {
-            context.getStatus().setKeepData(false);
-            commonExecution(new SetPropertyHeaderCommand(event.getGridWidget(), event.getFactMappingValueType()), true);
-        };
-        org.uberfire.mvp.Command okPreserveCommand = () -> {
-            context.getStatus().setKeepData(true);
-            commonExecution(new SetPropertyHeaderCommand(event.getGridWidget(), event.getFactMappingValueType()), true);
-        };
-        preserveDeletePopupPresenter.show(ScenarioSimulationEditorConstants.INSTANCE.preserveDeleteScenarioMainTitle(),
-                                          ScenarioSimulationEditorConstants.INSTANCE.preserveDeleteScenarioMainQuestion(),
-                                          ScenarioSimulationEditorConstants.INSTANCE.preserveDeleteScenarioText1(),
-                                          ScenarioSimulationEditorConstants.INSTANCE.preserveDeleteScenarioTextQuestion(),
-                                          ScenarioSimulationEditorConstants.INSTANCE.preserveDeleteScenarioTextOption1(),
-                                          ScenarioSimulationEditorConstants.INSTANCE.preserveDeleteScenarioTextOption2(),
-                                          ScenarioSimulationEditorConstants.INSTANCE.preserveValues(),
-                                          ScenarioSimulationEditorConstants.INSTANCE.deleteValues(),
-                                          okPreserveCommand,
-                                          okDeleteCommand);
-    }
-
-    @Override
-    public void onEvent(UndoEvent event) {
-        final CommandResult<ScenarioSimulationViolation> status = scenarioCommandRegistryManager.undo(context);
-        if (Objects.equals(CommandResult.Type.ERROR, status.getType())) {
-            commonNotifyError(status, ScenarioSimulationEditorConstants.INSTANCE.undo());
-        }
-    }
-
-    @Override
-    public void onEvent(UnsupportedDMNEvent event) {
-        confirmPopupPresenter.show("Unsupported DMN asset", event.getMessage());
-    }
-
-    @Override
-    public void onEvent(UpdateSettingsDataEvent updateSettingsDataEvent) {
-        if (updateSettingsDataEvent.getSettingsValueChanged().test(context.getScenarioSimulationModel().getSettings())) {
-            commonExecution(new UpdateSettingsDataCommand(updateSettingsDataEvent.getSettingsChangeToApply(),
-                                                          updateSettingsDataEvent.isDmnPathChanged()),
-                            false);
-            scenarioSimulationEditorPresenter.unpublishTestResultsAlerts();
-        }
-    }
-
-    @Override
-    public void onEvent(ValidateSimulationEvent event) {
-        scenarioSimulationEditorPresenter.validateSimulation();
-    }
-
-    /**
-     * Common method to execute the given <code>Command</code> inside the given <code>ScenarioSimulationContext</code>
-     * If successful, it adds the command to the <code>ScenarioCommandRegistry</code>, otherwise it fire a new <code>ScenarioNotificationEvent</code>
-     * with error details
-     * @param command
-     * @param focusGridAfterExecution
-     */
-    protected void commonExecution(final AbstractScenarioSimulationCommand command,
-                                   final boolean focusGridAfterExecution) {
-        final Optional<AbstractScesimGridModel> selectedScenarioGridModel = context.getSelectedScenarioGridModel();
-        final Optional<GridWidget> gridWidget =  selectedScenarioGridModel.isPresent() ? Optional.of(selectedScenarioGridModel.get().getGridWidget()) : Optional.empty();
-        gridWidget.ifPresent(grd -> context.getStatus().setCurrentGrid(grd));
-        final CommandResult<ScenarioSimulationViolation> status = scenarioCommandManager.execute(context, command);
-        if (Objects.equals(CommandResult.Type.ERROR, status.getType())) {
-            String operation = new StringBuilder()
-                    .append("Command ")
-                    .append(command.getClass().getSimpleName())
-                    .append(" failure")
-                    .toString();
-            commonNotifyError(status, operation);
-        } else if (Objects.equals(CommandResultBuilder.SUCCESS, status) && (command instanceof AbstractScenarioSimulationUndoableCommand)) {
-            scenarioCommandRegistryManager.register(context, (AbstractScenarioSimulationUndoableCommand) command);
-            scenarioSimulationEditorPresenter.getView().onResize();
-            if (focusGridAfterExecution && gridWidget.isPresent()) {
-                context.getScenarioGridPanelByGridWidget(gridWidget.get()).setFocus(true);
-            }
-        }
-    }
-
-    protected void commonNotifyError(CommandResult<ScenarioSimulationViolation> status, String operation) {
-        String violations = StreamSupport.stream(status.getViolations().spliterator(), false)
-                .map(ScenarioSimulationViolation::getMessage)
-                .collect(Collectors.joining("\r\n"));
-        String message = new StringBuilder()
-                .append(operation + ": " + status.getType())
-                .append("\r\n")
-                .append(violations)
-                .toString();
-        notificationEvent.fire(new NotificationEvent(message, NotificationEvent.NotificationType.ERROR));
-    }
-
-    protected void registerHandlers() {
-        handlerRegistrationList.add(eventBus.addHandler(AppendColumnEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(AppendRowEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(DeleteColumnEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(DeleteRowEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(DisableTestToolsEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(DuplicateInstanceEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(DuplicateRowEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(EnableTestToolsEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(ImportEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(InsertColumnEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(InsertRowEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(PrependColumnEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(PrependRowEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(RedoEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(ReloadTestToolsEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(RunSingleScenarioEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(ScenarioGridReloadEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(ScenarioNotificationEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(SetGridCellValueEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(SetHeaderCellValueEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(SetInstanceHeaderEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(SetPropertyHeaderEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(UndoEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(UnsupportedDMNEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(UpdateSettingsDataEvent.TYPE, this));
-        handlerRegistrationList.add(eventBus.addHandler(ValidateSimulationEvent.TYPE, this));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationViolation.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationViolation.java
deleted file mode 100644
index 4352406..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationViolation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands;
-
-/**
- * Class holding a meaningful <b>message</b> describing the violation happened
- */
-public class ScenarioSimulationViolation {
-
-    private String message;
-
-    public ScenarioSimulationViolation(String message) {
-        this.message = message;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractInsertColumnCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractInsertColumnCommand.java
deleted file mode 100644
index 7ab08e2..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractInsertColumnCommand.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Map;
-
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-
-public abstract class AbstractInsertColumnCommand extends AbstractScenarioGridCommand {
-
-    public AbstractInsertColumnCommand(GridWidget gridWidget) {
-        super(gridWidget);
-    }
-
-    public void commonInsertColumnCommand(ScenarioSimulationContext context, ScenarioSimulationContext.Status status, int index) {
-        FactMappingType factMappingType = FactMappingType.valueOf(status.getColumnGroup().toUpperCase());
-        Map.Entry<String, String> validPlaceholders = context.getAbstractScesimGridModelByGridWidget(gridWidget).getValidPlaceholders();
-        String instanceTitle = validPlaceholders.getKey();
-        String propertyTitle = validPlaceholders.getValue();
-        final ScenarioGridColumn scenarioGridColumnLocal = getScenarioGridColumnLocal(instanceTitle,
-                                                                                      propertyTitle,
-                                                                                      status.getColumnId(),
-                                                                                      status.getColumnGroup(),
-                                                                                      factMappingType,
-                                                                                      context.getScenarioHeaderTextBoxSingletonDOMElementFactory(gridWidget),
-                                                                                      context.getScenarioCellTextAreaSingletonDOMElementFactory(gridWidget),
-                                                                                      ScenarioSimulationEditorConstants.INSTANCE.defineValidType());
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).insertColumn(index, scenarioGridColumnLocal);
-        context.getSelectedScenarioGridLayer().ifPresent(layer -> layer.getScenarioGrid().selectCurrentHeaderCellGroup());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioGridCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioGridCommand.java
deleted file mode 100644
index ced650f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioGridCommand.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Collections;
-import java.util.Objects;
-import java.util.Optional;
-
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationViolation;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationBuilders;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.kie.workbench.common.command.client.CommandResult;
-import org.kie.workbench.common.command.client.CommandResultBuilder;
-import org.kie.workbench.common.command.client.impl.CommandResultImpl;
-
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils.getHeaderBuilder;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils.getScenarioGridColumn;
-
-public abstract class AbstractScenarioGridCommand extends AbstractScenarioSimulationUndoableCommand<ScenarioSimulationContext.Status> {
-
-    protected GridWidget gridWidget;
-
-    /**
-     * Calling this constructor will set the target <code>GridWidget</code>
-     * @param gridWidget
-     */
-    protected AbstractScenarioGridCommand(final GridWidget gridWidget) {
-        this.gridWidget = gridWidget;
-    }
-
-    @Override
-    protected ScenarioSimulationContext.Status setRestorableStatusPreExecution(ScenarioSimulationContext context) {
-        return context.getStatus().cloneStatus();
-    }
-
-    @Override
-    protected CommandResult<ScenarioSimulationViolation> setCurrentContext(ScenarioSimulationContext context) {
-        try {
-            final Simulation simulationToRestore = restorableStatus.getSimulation();
-            final Background backgroundToRestore = restorableStatus.getBackground();
-            if (simulationToRestore == null) {
-                throw new IllegalStateException("Simulation is null in restorable status");
-            }
-            if (backgroundToRestore == null) {
-                throw new IllegalStateException("Background is null in restorable status");
-            }
-            final ScenarioSimulationContext.Status originalStatus = context.getStatus().cloneStatus();
-            ScenarioSimulationModel.Type type = context.getScenarioSimulationModel().getSettings().getType();
-            context.getSimulationGrid().getModel().clearSelections();
-            context.getBackgroundGrid().getModel().clearSelections();
-            context.getSimulationGrid().setContent(simulationToRestore, type);
-            context.getScenarioSimulationEditorPresenter().getModel().setSimulation(simulationToRestore);
-            context.getBackgroundGrid().setContent(backgroundToRestore, type);
-            context.getScenarioSimulationEditorPresenter().getModel().setBackground(backgroundToRestore);
-            context.getScenarioSimulationEditorPresenter().reloadTestTools(true);
-            context.setStatus(restorableStatus);
-            restorableStatus = originalStatus;
-            return commonExecution(context);
-        } catch (Exception e) {
-            return new CommandResultImpl<>(CommandResult.Type.ERROR, Collections.singleton(new ScenarioSimulationViolation(e.getMessage())));
-        }
-    }
-
-    @Override
-    public Optional<CommandResult<ScenarioSimulationViolation>> commonUndoRedoPreExecution(final ScenarioSimulationContext context) {
-        final Optional<GridWidget> selectedGridWidgetOptional = context.getSelectedGridWidget();
-        if (selectedGridWidgetOptional.isPresent() && Objects.equals(gridWidget, selectedGridWidgetOptional.get())) {
-            return Optional.empty();
-        }
-        switch (gridWidget) {
-            case SIMULATION:
-                context.getScenarioSimulationEditorPresenter().selectSimulationTab();
-                break;
-            case BACKGROUND:
-                context.getScenarioSimulationEditorPresenter().selectBackgroundTab();
-                break;
-            default:
-                throw new IllegalStateException("Illegal GridWidget " + gridWidget);
-        }
-        context.getScenarioGridPanelByGridWidget(gridWidget).onResize();
-        context.getScenarioGridPanelByGridWidget(gridWidget).select();
-        return Optional.of(CommandResultBuilder.SUCCESS);
-    }
-
-    /**
-     * Returns a <code>ScenarioGridColumn</code> with the following default values:
-     * <p>
-     * width: 150
-     * </p>
-     * <p>
-     * isMovable: <code>false</code>;
-     * </p>
-     * <p>
-     * isPropertyAssigned: <code>false</code>;
-     * </p>
-     * <p>
-     * columnRenderer: new ScenarioGridColumnRenderer()
-     * </p>
-     * @param instanceTitle
-     * @param propertyTitle
-     * @param columnId
-     * @param columnGroup
-     * @param factMappingType
-     * @param factoryHeader
-     * @param factoryCell
-     * @param placeHolder
-     * @return
-     */
-    protected ScenarioGridColumn getScenarioGridColumnLocal(String instanceTitle,
-                                                            String propertyTitle,
-                                                            String columnId,
-                                                            String columnGroup,
-                                                            FactMappingType factMappingType,
-                                                            ScenarioHeaderTextBoxSingletonDOMElementFactory factoryHeader,
-                                                            ScenarioCellTextAreaSingletonDOMElementFactory factoryCell,
-                                                            String placeHolder) {
-        ScenarioSimulationBuilders.HeaderBuilder headerBuilder = getHeaderBuilder(instanceTitle, propertyTitle, columnId, columnGroup, factMappingType, factoryHeader);
-        return getScenarioGridColumn(headerBuilder, factoryCell, placeHolder);
-    }
-
-    protected Optional<FactIdentifier> getFactIdentifierByColumnTitle(String columnTitle, ScenarioSimulationContext context) {
-
-        return context.getAbstractScesimGridModelByGridWidget(gridWidget).getColumns().stream()
-                .filter(column -> columnTitle.equals(((ScenarioGridColumn) column).getInformationHeaderMetaData().getTitle()))
-                .findFirst()
-                .map(column -> ((ScenarioGridColumn) column).getFactIdentifier());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioSimulationCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioSimulationCommand.java
deleted file mode 100644
index 551353b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioSimulationCommand.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Collections;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationViolation;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridPanel;
-import org.kie.workbench.common.command.client.AbstractCommand;
-import org.kie.workbench.common.command.client.CommandResult;
-import org.kie.workbench.common.command.client.CommandResultBuilder;
-import org.kie.workbench.common.command.client.impl.CommandResultImpl;
-
-/**
- * <b>Abstract</b> <code>Command</code> class to provide common methods used by actual implementations
- */
-public abstract class AbstractScenarioSimulationCommand extends AbstractCommand<ScenarioSimulationContext, ScenarioSimulationViolation> {
-
-    private static final AtomicLong COUNTER_ID = new AtomicLong();
-
-    /**
-     * Auto-generated incremental identifier used to uniquely identify each command
-     */
-    private final long id;
-
-    protected AbstractScenarioSimulationCommand() {
-        this.id = COUNTER_ID.getAndIncrement();
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    @Override
-    public CommandResult<ScenarioSimulationViolation> undo(ScenarioSimulationContext context) {
-        String message = this.getClass().getSimpleName() + " is not undoable";
-        throw new IllegalStateException(message);
-    }
-
-    @Override
-    public CommandResult<ScenarioSimulationViolation> execute(ScenarioSimulationContext context) {
-        context.setStatusSimulationIfEmpty();
-        try {
-            internalExecute(context);
-            return commonExecution(context);
-        } catch (Exception e) {
-            return new CommandResultImpl<>(CommandResult.Type.ERROR, Collections.singleton(new ScenarioSimulationViolation(e.getMessage())));
-        }
-    }
-
-    protected abstract void internalExecute(ScenarioSimulationContext context);
-
-    protected CommandResult<ScenarioSimulationViolation> commonExecution(final ScenarioSimulationContext context) {
-        context.getSelectedScenarioGridPanel().ifPresent(ScenarioGridPanel::onResize);
-        context.getSelectedScenarioGridPanel().ifPresent(ScenarioGridPanel::select);
-        return CommandResultBuilder.SUCCESS;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioSimulationUndoableCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioSimulationUndoableCommand.java
deleted file mode 100644
index c8ff3b5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioSimulationUndoableCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Optional;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationViolation;
-import org.kie.workbench.common.command.client.CommandResult;
-
-/**
- * This abstract class defines a family of Commands which can be undo-able and redo-able.
- * @param <S> defines the changing object status during the command execution
- */
-public abstract class AbstractScenarioSimulationUndoableCommand<S> extends AbstractScenarioSimulationCommand {
-
-    /**
-     * The <code>ScenarioSimulationContext.Status</code> to restore when calling <b>undo/redo</b>.
-     * Needed only for <b>undoable</b> commands.
-     */
-    protected S restorableStatus = null;
-
-    /**
-     * The action to perform when an UNDO or REDO is required on this command. Typically it restores the previous status
-     * and it stores the current one.
-     * @param context
-     * @return
-     */
-    protected abstract CommandResult<ScenarioSimulationViolation> setCurrentContext(ScenarioSimulationContext context);
-
-    /**
-     * It sets the status BEFORE the command is launched. Typically it clones the current status before changes are applied.
-     * @param context
-     * @return
-     */
-    protected abstract S setRestorableStatusPreExecution(ScenarioSimulationContext context);
-
-    /**
-     * Method called soon before actual <b>undo</b> and <b>redo</b> operations to preliminary execute a tab switch <b>without</b>
-     * altering the call stack.
-     * (eg If the command change the status of a not shown grid, this switches the tab)
-     * @param context
-     * @return <code>Optional&lt;CommandResult&lt;ScenarioSimulationViolation&gt;&gt;</code> of <code>CommandResultBuilder.SUCCESS</code>
-     * if a tab switch happened, otherwise <code>Optional.empty()</code>
-     */
-    public abstract Optional<CommandResult<ScenarioSimulationViolation>> commonUndoRedoPreExecution(ScenarioSimulationContext context);
-
-    @Override
-    public CommandResult<ScenarioSimulationViolation> execute(final ScenarioSimulationContext context) {
-        restorableStatus = setRestorableStatusPreExecution(context);
-        return super.execute(context);
-    }
-
-    @Override
-    public CommandResult<ScenarioSimulationViolation> undo(final ScenarioSimulationContext context) {
-        return commonUndoRedo(context);
-    }
-
-    public CommandResult<ScenarioSimulationViolation> redo(final ScenarioSimulationContext context) {
-        return commonUndoRedo(context);
-    }
-
-    private CommandResult<ScenarioSimulationViolation> commonUndoRedo(final ScenarioSimulationContext context) {
-        if (restorableStatus == null) {
-            String message = this.getClass().getSimpleName() + " restorableStatus status is null";
-            throw new IllegalStateException(message);
-        }
-        return setCurrentContext(context);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractSelectedColumnCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractSelectedColumnCommand.java
deleted file mode 100644
index afab4a6..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractSelectedColumnCommand.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.SortedMap;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.ExpressionElement;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-
-import static org.drools.scenariosimulation.api.model.FactMapping.getPropertyPlaceHolder;
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils.getColumnSubGroup;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils.getPropertyNameElementsWithoutAlias;
-
-/**
- * <b>Abstract</b> <code>Command</code> class which assures that a <code>ScenarioColumn</code> is selected.
- */
-public abstract class AbstractSelectedColumnCommand extends AbstractScenarioGridCommand {
-
-    protected FactMappingValueType factMappingValueType;
-
-    protected AbstractSelectedColumnCommand(GridWidget gridWidget, FactMappingValueType factMappingValueType) {
-        super(gridWidget);
-        this.factMappingValueType = factMappingValueType;
-    }
-
-    protected abstract void executeIfSelectedColumn(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn);
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        getSelectedColumn(context).ifPresent(selectedColumn -> executeIfSelectedColumn(context, selectedColumn));
-    }
-
-    /**
-     * It inserts a new <code>ScenarioGridColumn</code> in <code>ScenarioGridModel</code>
-     * @param context It contains the <b>Context</b> inside which the commands will be executed
-     * @param selectedColumn The selected <code>ScenarioGridColumn</code> where the command was launched
-     * @param columnPosition Used to define in which position the new column should be added
-     * @param cloneInstance If true, it create a new column inside the same instance of the selected column
-     * @return The created <code>ScenarioGridColumn</code>
-     */
-    protected ScenarioGridColumn insertNewColumn(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn, int columnPosition, boolean cloneInstance) {
-        final ScenarioHeaderMetaData selectedInformationHeaderMetaData = selectedColumn.getInformationHeaderMetaData();
-        String columnGroup = selectedInformationHeaderMetaData.getColumnGroup();
-        String originalInstanceTitle = selectedInformationHeaderMetaData.getTitle();
-        final FactMappingType factMappingType = FactMappingType.valueOf(columnGroup.toUpperCase());
-        final Map.Entry<String, String> validPlaceholders = context.getAbstractScesimGridModelByGridWidget(gridWidget).getValidPlaceholders();
-        String instanceTitle = cloneInstance ? originalInstanceTitle : validPlaceholders.getKey();
-        String propertyTitle = validPlaceholders.getValue();
-        String placeHolder = ScenarioSimulationEditorConstants.INSTANCE.defineValidType();
-        final ScenarioGridColumn scenarioGridColumnLocal = getScenarioGridColumnLocal(instanceTitle,
-                                                                                      propertyTitle,
-                                                                                      String.valueOf(new Date().getTime()),
-                                                                                      columnGroup,
-                                                                                      factMappingType,
-                                                                                      context.getScenarioHeaderTextBoxSingletonDOMElementFactory(gridWidget),
-                                                                                      context.getScenarioCellTextAreaSingletonDOMElementFactory(gridWidget),
-                                                                                      placeHolder);
-        if (cloneInstance) {
-            scenarioGridColumnLocal.setFactIdentifier(selectedColumn.getFactIdentifier());
-        }
-        scenarioGridColumnLocal.setInstanceAssigned(cloneInstance);
-        scenarioGridColumnLocal.setPropertyAssigned(false);
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).insertColumn(columnPosition, scenarioGridColumnLocal);
-        return scenarioGridColumnLocal;
-    }
-
-    /**
-     * Sets the instance header for a <code>ScenarioSimulationContext</code>.
-     * @param context It contains the <b>Context</b> inside which the commands will be executed
-     * @param selectedColumn The selected <code>ScenarioGridColumn</code> where the command was launched
-     */
-    protected void setInstanceHeader(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn, String alias, String fullClassName) {
-        int columnIndex = context.getAbstractScesimGridModelByGridWidget(gridWidget).getColumns().indexOf(selectedColumn);
-        final FactIdentifier factIdentifier = setEditableHeadersAndGetFactIdentifier(context, selectedColumn, alias, fullClassName);
-        setInstanceHeaderMetaData(selectedColumn, alias, factIdentifier);
-        final ScenarioHeaderMetaData propertyHeaderMetaData = selectedColumn.getPropertyHeaderMetaData();
-        setPropertyMetaData(propertyHeaderMetaData,
-                            getPropertyPlaceHolder(columnIndex),
-                            false,
-                            selectedColumn,
-                            ScenarioSimulationUtils.getPlaceHolder(selectedColumn.isInstanceAssigned(),
-                                                                   selectedColumn.isPropertyAssigned(),
-                                                                   factMappingValueType,
-                                                                   fullClassName));
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).updateColumnInstance(columnIndex, selectedColumn);
-        if (context.getScenarioSimulationEditorPresenter() != null) {
-            context.getScenarioSimulationEditorPresenter().reloadTestTools(false);
-        }
-    }
-
-    /**
-     * Returns an <code>Optional<ScenarioGridColumn></code> for a <code>ScenarioSimulationContext</code>.
-     * @param context It contains the <b>Context</b> inside which the commands will be executed
-     * @return
-     */
-    protected Optional<ScenarioGridColumn> getSelectedColumn(ScenarioSimulationContext context) {
-        return Optional.ofNullable((ScenarioGridColumn) context.getAbstractScesimGridModelByGridWidget(gridWidget).getSelectedColumn());
-    }
-
-    /**
-     * Returns the full package <code>String</code> of a <code>ScenarioSimulationContext</code>.
-     * @param context
-     * @return
-     */
-    protected String getFullPackage(ScenarioSimulationContext context) {
-        String fullPackage = context.getStatus().getFullPackage();
-        if (!fullPackage.isEmpty() && !fullPackage.endsWith(".")) {
-            fullPackage += ".";
-        }
-        return fullPackage;
-    }
-
-    /**
-     * Sets the editable headers on a given <code>ScenarioGridColumn</code> and returns a <code>FactIdentifier</code>.
-     * @param context
-     * @param selectedColumn
-     * @param aliasName
-     * @param canonicalClassName
-     * @return
-     */
-    protected FactIdentifier setEditableHeadersAndGetFactIdentifier(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn, String aliasName, String canonicalClassName) {
-        final ScenarioSimulationModel.Type simulationModelType = context.getScenarioSimulationModel().getSettings().getType();
-        selectedColumn.setEditableHeaders(!(simulationModelType.equals(ScenarioSimulationModel.Type.DMN) || GridWidget.BACKGROUND.equals(gridWidget)));
-        String factIdentifierName = simulationModelType.equals(ScenarioSimulationModel.Type.DMN) ? aliasName : selectedColumn.getInformationHeaderMetaData().getColumnId();
-        String factIdentifierClassName = simulationModelType.equals(ScenarioSimulationModel.Type.DMN) ? aliasName : canonicalClassName;
-        String importPrefix = context.getStatus().getImportPrefix();
-        return getFactIdentifierByColumnTitle(aliasName, context).orElseGet(() -> FactIdentifier.create(factIdentifierName, factIdentifierClassName, importPrefix));
-    }
-
-    /**
-     * Sets the metadata for an instance header on a given <code>ScenarioGridColumn</code>.
-     * @param selectedColumn The selected <code>ScenarioGridColumn</code> where the command was launched
-     * @param aliasName The title to assign to the selected column
-     * @param factIdentifier The <code>FactIdentifier</code> to assign to the selected column
-     */
-    protected void setInstanceHeaderMetaData(ScenarioGridColumn selectedColumn, String aliasName, FactIdentifier factIdentifier) {
-        selectedColumn.getInformationHeaderMetaData().setTitle(aliasName);
-        selectedColumn.setInstanceAssigned(true);
-        selectedColumn.setFactIdentifier(factIdentifier);
-    }
-
-    /**
-     * It assigns a property to the selected <code>ScenarioGridColumn</code>
-     * @param context It contains the <b>Context</b> inside which the commands will be executed
-     * @param selectedColumn The selected <code>ScenarioGridColumn</code> where the command was launched
-     * @param propertyNameElements The <code>List</code> with the path instance_name.property.name (eg. Author.isAlive)
-     * @param propertyClass it contains the full classname of the property (eg. com.Author)
-     */
-    protected void setPropertyHeader(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn, String canonicalClassName, List<String> propertyNameElements, String propertyClass) {
-        String instanceAliasName = propertyNameElements.get(0);
-        final FactIdentifier factIdentifier = setEditableHeadersAndGetFactIdentifier(context, selectedColumn, instanceAliasName, canonicalClassName);
-        String propertyTitle = getPropertyHeaderTitle(context, propertyNameElements, factIdentifier);
-        this.setPropertyHeader(context, selectedColumn, factIdentifier, propertyNameElements, propertyClass, propertyTitle);
-    }
-
-    /**
-     * It assigns a property to the selected <code>ScenarioGridColumn</code>
-     * @param context It contains the <b>Context</b> inside which the commands will be executed
-     * @param selectedColumn The selected <code>ScenarioGridColumn</code> where the command was launched
-     * @param propertyNameElements The <code>List</code> with the path instance_name.property.name (eg. Author.isAlive)
-     * @param propertyClass it contains the full classname of the property (eg. com.Author)
-     * @param propertyTitle The title to assign to this property.
-     */
-    protected void setPropertyHeader(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn, String canonicalClassName, List<String> propertyNameElements, String propertyClass, String propertyTitle) {
-        String instanceAliasName = propertyNameElements.get(0);
-        final FactIdentifier factIdentifier = setEditableHeadersAndGetFactIdentifier(context, selectedColumn, instanceAliasName, canonicalClassName);
-        this.setPropertyHeader(context, selectedColumn, factIdentifier, propertyNameElements, propertyClass, propertyTitle);
-    }
-
-    /**
-     * It assigns a property to the selected <code>ScenarioGridColumn</code>
-     * @param context It contains the <b>Context</b> inside which the commands will be executed
-     * @param selectedColumn The selected <code>ScenarioGridColumn</code> where the command was launched
-     * @param factIdentifier The <code>FactIdentifier</code> associated to the selected column
-     * @param propertyNameElements The <code>List</code> with the path instance_name.property.name (eg. Author.isAlive)
-     * @param propertyClass it contains the full classname of the property (eg. com.Author)
-     * @param propertyTitle The title to assign to this property.
-     */
-    protected void setPropertyHeader(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn, FactIdentifier factIdentifier, List<String> propertyNameElements, String propertyClass, String propertyTitle) {
-        final ScenarioSimulationModel.Type simulationModelType = context.getScenarioSimulationModel().getSettings().getType();
-        if (propertyTitle == null) {
-            throw new IllegalArgumentException("Property title can not be null");
-        }
-        int columnIndex = context.getAbstractScesimGridModelByGridWidget(gridWidget).getColumns().indexOf(selectedColumn);
-        String instanceAliasName = propertyNameElements.get(0);
-        if (selectedColumn.isInstanceAssigned() && !instanceAliasName.equals(selectedColumn.getInformationHeaderMetaData().getTitle())) {
-            throw new IllegalArgumentException("It's not possible to assign this property");
-        }
-        String factName = simulationModelType.equals(ScenarioSimulationModel.Type.DMN) ?
-                factIdentifier.getName() :
-                factIdentifier.getClassNameWithoutPackage();
-        final GridData.Range instanceLimits = context.getAbstractScesimGridModelByGridWidget(gridWidget).getInstanceLimits(columnIndex);
-        IntStream.range(instanceLimits.getMinRowIndex(), instanceLimits.getMaxRowIndex() + 1)
-                .forEach(index -> {
-                    final ScenarioGridColumn scenarioGridColumn = (ScenarioGridColumn) context.getAbstractScesimGridModelByGridWidget(gridWidget).getColumns().get(index);
-                    if (!scenarioGridColumn.isInstanceAssigned()) { // We have not defined the instance, yet
-                        setInstanceHeaderMetaData(scenarioGridColumn, instanceAliasName, factIdentifier);
-                    }
-                });
-        selectedColumn.setPropertyAssigned(true);
-        selectedColumn.getPropertyHeaderMetaData().setColumnGroup(getColumnSubGroup(selectedColumn.getInformationHeaderMetaData().getColumnGroup()));
-        setPropertyMetaData(selectedColumn.getPropertyHeaderMetaData(),
-                            propertyTitle,
-                            false,
-                            selectedColumn,
-                            ScenarioSimulationUtils.getPlaceHolder(selectedColumn.isInstanceAssigned(),
-                                                                   selectedColumn.isPropertyAssigned(),
-                                                                   factMappingValueType,
-                                                                   propertyClass));
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).updateColumnProperty(columnIndex,
-                                                                                        selectedColumn,
-                                                                                        propertyNameElements,
-                                                                                        propertyClass,
-                                                                                        context.getStatus().isKeepData(),
-                                                                                        factMappingValueType,
-                                                                                        context.getScenarioSimulationModel().getSettings().getType());
-        if (ScenarioSimulationSharedUtils.isCollectionOrMap(propertyClass) && factMappingValueType.equals(FactMappingValueType.NOT_EXPRESSION)) {
-            manageCollectionProperty(context, selectedColumn, factName, columnIndex, propertyNameElements);
-        } else {
-            selectedColumn.setFactory(context.getAbstractScesimGridModelByGridWidget(gridWidget).getDOMElementFactory(propertyClass,
-                                                                                                                      context.getScenarioSimulationModel().getSettings().getType(),
-                                                                                                                      factMappingValueType));
-        }
-        if (context.getScenarioSimulationEditorPresenter() != null) {
-            context.getScenarioSimulationEditorPresenter().reloadTestTools(false);
-        }
-    }
-
-    /**
-     * It sets the title and readOnly setting of a property header and sets the place holder on a given <code>ScenarioGridColumn</code>.
-     * @param propertyHeaderMetaData
-     * @param title
-     * @param readOnly
-     * @param selectedColumn
-     * @param placeHolder
-     */
-    protected void setPropertyMetaData(ScenarioHeaderMetaData propertyHeaderMetaData, String title, boolean readOnly, ScenarioGridColumn selectedColumn, String placeHolder) {
-        propertyHeaderMetaData.setTitle(title);
-        propertyHeaderMetaData.setReadOnly(readOnly);
-        selectedColumn.setPlaceHolder(placeHolder);
-    }
-
-    /**
-     * @param context
-     * @param selectedColumn
-     * @param factName The name of the class to be used to retrieve the corresponding <code>FactModelTree</code>, i.e. without the <b>package</b>
-     * @param columnIndex
-     * @param fullPropertyPathElements This is the <code>List</code> of all the elements pointing to the final property (ex. Book.author.books)
-     */
-    protected void manageCollectionProperty(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn, String factName, int columnIndex, List<String> fullPropertyPathElements) {
-        final SortedMap<String, FactModelTree> dataObjectFieldsMap = context.getDataObjectFieldsMap();
-        final FactModelTree factModelTree = dataObjectFieldsMap.get(factName);
-        final Optional<AbstractScesimModel> selectedScenarioGridModel = context.getAbstractScesimGridModelByGridWidget(gridWidget).getAbstractScesimModel();
-        if (!selectedScenarioGridModel.isPresent()) {
-            throw new IllegalArgumentException("SelectedGrid not found");
-        }
-        final FactMapping factMapping = selectedScenarioGridModel.get().getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-        selectedColumn.setFactory(context.getCollectionEditorSingletonDOMElementFactory(gridWidget));
-        if (factModelTree.isSimple()) {
-            factMapping.setGenericTypes(factModelTree.getGenericTypeInfo(VALUE));
-        } else {
-            final FactModelTree nestedFactModelTree = navigateComplexObject(factModelTree,
-                                                                            fullPropertyPathElements,
-                                                                            dataObjectFieldsMap);
-            factMapping.setGenericTypes(nestedFactModelTree.getGenericTypeInfo(fullPropertyPathElements.get(fullPropertyPathElements.size() - 1)));
-        }
-    }
-
-    /**
-     * @param factModelTree
-     * @param pathElements This is the <code>List</code> of all the elements pointing to the final property (ex. Book.author.books)
-     * @param dataObjectFieldsMap
-     * @return
-     */
-    protected FactModelTree navigateComplexObject(FactModelTree factModelTree, List<String> pathElements, SortedMap<String, FactModelTree> dataObjectFieldsMap) {
-        FactModelTree nestedFactModelTree = factModelTree;
-        if (pathElements.size() > 2) {
-            for (String step : pathElements.subList(1, pathElements.size() - 1)) {
-                if (nestedFactModelTree.getExpandableProperties().containsKey(step)) {
-                    nestedFactModelTree = dataObjectFieldsMap.get(nestedFactModelTree.getExpandableProperties().get(step));
-                }
-            }
-        }
-        return nestedFactModelTree;
-    }
-
-    protected String getPropertyHeaderTitle(ScenarioSimulationContext context, List<String> propertyNameElements, FactIdentifier factIdentifier) {
-        /* If propertyNameElements contains only one step, it's managing an Expression or a SimpleClass type */
-        if (propertyNameElements.size() == 1) {
-            return FactMappingValueType.EXPRESSION.equals(factMappingValueType) ? ConstantHolder.EXPRESSION_INSTANCE_PLACEHOLDER : VALUE;
-        }
-        String propertyPathPart = String.join(".", propertyNameElements.subList(1, propertyNameElements.size()));
-        List<String> propertyNameElementsClone = getPropertyNameElementsWithoutAlias(propertyNameElements,
-                                                                                     factIdentifier,
-                                                                                     context.getScenarioSimulationModel().getSettings().getType());
-        // This is because the propertyName starts with the alias of the fact; i.e. it may be Book.name but also Bookkk.name,
-        // while the first element of ExpressionElements is always the class name
-        return getMatchingExpressionAlias(context, propertyNameElementsClone, factIdentifier).orElse(propertyPathPart);
-    }
-
-    protected Optional<String> getMatchingExpressionAlias(ScenarioSimulationContext context, List<String> propertyNameElements, FactIdentifier factIdentifier) {
-        final Stream<FactMapping> factMappingsByFactName = context.getAbstractScesimModelByGridWidget(gridWidget).getScesimModelDescriptor().getFactMappingsByFactName(factIdentifier.getName());
-        return factMappingsByFactName
-                .filter(factMapping -> {
-                    List<String> expressionElements = factMapping.getExpressionElements().stream().map(ExpressionElement::getStep).collect(Collectors.toList());
-                    return Objects.equals(expressionElements, propertyNameElements);
-                })
-                .findFirst()
-                .map(FactMapping::getExpressionAlias);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AppendColumnCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AppendColumnCommand.java
deleted file mode 100644
index 48f5302..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AppendColumnCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-
-/**
- * <code>Command</code> to <b>append</b> (i.e. put in the last position) a column to a given <i>group</i>
- */
-public class AppendColumnCommand extends AbstractInsertColumnCommand {
-
-    public AppendColumnCommand(GridWidget gridWidget) {
-        super(gridWidget);
-    }
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        final ScenarioSimulationContext.Status status = context.getStatus();
-        final int index = context.getAbstractScesimGridModelByGridWidget(gridWidget).getFirstIndexRightOfGroup(status.getColumnGroup());
-        commonInsertColumnCommand(context, status, index);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AppendRowCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AppendRowCommand.java
deleted file mode 100644
index 1818a01..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AppendRowCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridRow;
-
-/**
- * <code>Command</code> to <b>append</b> (i.e. put in the last position) a row
- */
-public class AppendRowCommand extends AbstractScenarioGridCommand {
-
-    public AppendRowCommand(GridWidget gridWidget) {
-        super(gridWidget);
-    }
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).appendRow(new ScenarioGridRow());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DeleteColumnCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DeleteColumnCommand.java
deleted file mode 100644
index a168e12..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DeleteColumnCommand.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Date;
-import java.util.Map;
-
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-
-/**
- * <code>Command</code> to <b>delete</b> a column. <b>Eventually</b> add a ne column if the deleted one is the last of its group.
- */
-public class DeleteColumnCommand extends AbstractScenarioGridCommand {
-
-    public DeleteColumnCommand(GridWidget gridWidget) {
-        super(gridWidget);
-    }
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        final ScenarioSimulationContext.Status status = context.getStatus();
-        int newColumnPosition = -1;
-        if (status.isAsProperty()) {
-            context.getAbstractScesimGridModelByGridWidget(gridWidget).deleteColumn(status.getColumnIndex());
-            newColumnPosition = status.getColumnIndex();
-        } else {
-            newColumnPosition = context.getAbstractScesimGridModelByGridWidget(gridWidget).getInstanceLimits(status.getColumnIndex()).getMinRowIndex();
-            context.getAbstractScesimGridModelByGridWidget(gridWidget).deleteInstance(status.getColumnIndex());
-        }
-        createColumnIfEmptyGroup(context, status, newColumnPosition);
-        new ReloadTestToolsCommand().execute(context);
-    }
-
-    /**
-     * Creates a new column in the group if there is none.
-     *
-     * @param context
-     * @param status
-     * @param newColumnPosition
-     */
-    protected void createColumnIfEmptyGroup(ScenarioSimulationContext context, ScenarioSimulationContext.Status status, int newColumnPosition) {
-        if (context.getAbstractScesimGridModelByGridWidget(gridWidget).getGroupSize(status.getColumnGroup()) < 1) {
-            FactMappingType factMappingType = FactMappingType.valueOf(status.getColumnGroup().toUpperCase());
-            Map.Entry<String, String> validPlaceholders = context.getAbstractScesimGridModelByGridWidget(gridWidget).getValidPlaceholders();
-            String instanceTitle = validPlaceholders.getKey();
-            String propertyTitle = validPlaceholders.getValue();
-            context.getAbstractScesimGridModelByGridWidget(gridWidget).insertColumn(newColumnPosition, getScenarioGridColumnLocal(instanceTitle,
-                                                                                                                                  propertyTitle,
-                                                                                                                                  String.valueOf(new Date().getTime()),
-                                                                                                                                  status.getColumnGroup(),
-                                                                                                                                  factMappingType,
-                                                                                                                                  context.getScenarioHeaderTextBoxSingletonDOMElementFactory(gridWidget),
-                                                                                                                                  context.getScenarioCellTextAreaSingletonDOMElementFactory(gridWidget),
-                                                                                                                                  ScenarioSimulationEditorConstants.INSTANCE.defineValidType()));
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DeleteRowCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DeleteRowCommand.java
deleted file mode 100644
index a15adf5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DeleteRowCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridRow;
-
-/**
- * <code>Command</code> to <b>delete</b> a row.
- */
-public class DeleteRowCommand extends AbstractScenarioGridCommand {
-
-    public DeleteRowCommand(GridWidget gridWidget) {
-        super(gridWidget);
-    }
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).deleteRow(context.getStatus().getRowIndex());
-        if (context.getAbstractScesimGridModelByGridWidget(gridWidget).getRows().isEmpty()) {
-            context.getAbstractScesimGridModelByGridWidget(gridWidget).insertRow(0, new ScenarioGridRow());
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DisableTestToolsCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DisableTestToolsCommand.java
deleted file mode 100644
index 93128b6..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DisableTestToolsCommand.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-
-/**
- * <code>Command</code> to <b>disable</b> the <code>TestToolsView</code>
- */
-public class DisableTestToolsCommand extends AbstractScenarioSimulationCommand {
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        if (context.getTestToolsPresenter() != null) {
-            context.getTestToolsPresenter().onDisableEditorTab();
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DuplicateInstanceCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DuplicateInstanceCommand.java
deleted file mode 100644
index b4536f2..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DuplicateInstanceCommand.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.ExpressionElement;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.models.AbstractScesimGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-
-/**
- * <code>Command</code> to <b>duplicate</b> an instance
- */
-public class DuplicateInstanceCommand extends AbstractSelectedColumnCommand {
-
-    public static final String COPY_LABEL = "_copy_";
-
-    public DuplicateInstanceCommand(GridWidget gridWidget) {
-        super(gridWidget, FactMappingValueType.NOT_EXPRESSION);
-    }
-
-    @Override
-    protected void executeIfSelectedColumn(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn) {
-        final AbstractScesimGridModel<? extends AbstractScesimModel, ? extends AbstractScesimData> selectedScenarioGridModel = context.getAbstractScesimGridModelByGridWidget(gridWidget);
-        /* Generating the new instance alias with following schema: <original instance name> + '_copy_' + <number of existing instances> */
-        int instancesCount = selectedScenarioGridModel.getInstancesCount(selectedColumn.getFactIdentifier().getClassName());
-        String alias = selectedColumn.getInformationHeaderMetaData().getTitle().split(COPY_LABEL)[0] + COPY_LABEL + instancesCount;
-
-        /* For every columns which belongs to the selected instance, it creates a new column and assign it the duplicated instance
-         * and the duplicated property, if are assigned */
-        int columnPosition = selectedScenarioGridModel.getInstanceLimits(selectedScenarioGridModel.getColumns().indexOf(selectedColumn)).getMaxRowIndex() + 1;
-        AtomicInteger nextColumnPosition = new AtomicInteger(columnPosition);
-        selectedScenarioGridModel.getInstanceScenarioGridColumns(selectedColumn).forEach(
-                originalColumn -> {
-                    ScenarioGridColumn createdColumn = insertNewColumn(context, originalColumn, nextColumnPosition.getAndIncrement(), false);
-                    if (originalColumn.isInstanceAssigned()) {
-                        setInstanceHeader(context, createdColumn, alias, originalColumn.getFactIdentifier().getClassName());
-
-                        if (originalColumn.isPropertyAssigned()) {
-                            int originalColumnIndex = selectedScenarioGridModel.getColumns().indexOf(originalColumn);
-                            final FactMapping originalFactMapping = selectedScenarioGridModel.getAbstractScesimModel().get().getScesimModelDescriptor().getFactMappingByIndex(originalColumnIndex);
-                            factMappingValueType = originalFactMapping.getFactMappingValueType();
-                            /*  Rebuilt propertyNameElements, which is composed by: factName.property . The property MUST be the original property name */
-                            List<String> propertyNameElements = new ArrayList<>();
-                            propertyNameElements.add(alias);
-                            propertyNameElements.addAll(originalFactMapping.getExpressionElementsWithoutClass().stream().map(ExpressionElement::getStep).collect(Collectors.toList()));
-                            setPropertyHeader(context,
-                                              createdColumn,
-                                              originalColumn.getFactIdentifier().getClassName(),
-                                              propertyNameElements,
-                                              originalFactMapping.getClassName(),
-                                              originalColumn.getPropertyHeaderMetaData().getTitle());
-
-                            /* It copies the properties values */
-                            int createdColumnIndex = selectedScenarioGridModel.getColumns().indexOf(createdColumn);
-                            selectedScenarioGridModel.duplicateColumnValues(originalColumnIndex, createdColumnIndex);
-                        }
-                    }
-                });
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DuplicateRowCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DuplicateRowCommand.java
deleted file mode 100644
index 27e83cb..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DuplicateRowCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridRow;
-
-/**
- * <code>Command</code> to <b>duplicate</b> a row.
- */
-public class DuplicateRowCommand extends AbstractScenarioGridCommand {
-
-    public DuplicateRowCommand(GridWidget gridWidget) {
-        super(gridWidget);
-    }
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).duplicateRow(context.getStatus().getRowIndex(), new ScenarioGridRow());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/EnableTestToolsCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/EnableTestToolsCommand.java
deleted file mode 100644
index d67e722..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/EnableTestToolsCommand.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-
-/**
- * <code>Command</code> to <b>enable</b> the <code>TestToolsView</code>
- */
-public class EnableTestToolsCommand extends AbstractScenarioSimulationCommand {
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        final ScenarioSimulationContext.Status status = context.getStatus();
-        if (context.getScenarioSimulationEditorPresenter() != null) {
-            context.getScenarioSimulationEditorPresenter().expandToolsDock();
-            context.getScenarioSimulationEditorPresenter().reloadTestTools(false);
-        }
-        if (context.getTestToolsPresenter() != null) {
-            if (status.getFilterTerm() == null) {
-                context.getTestToolsPresenter().onEnableEditorTab();
-            } else {
-                context.getTestToolsPresenter().onEnableEditorTab(status.getFilterTerm(), status.getPropertyNameElements(), status.isNotEqualsSearch());
-            }
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/ImportCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/ImportCommand.java
deleted file mode 100644
index 8baa18c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/ImportCommand.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-
-public class ImportCommand extends AbstractScenarioGridCommand {
-
-    protected String fileContent;
-
-    public ImportCommand(GridWidget gridWidget, String fileContent) {
-        super(gridWidget);
-        this.fileContent = fileContent;
-    }
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        context.getScenarioSimulationEditorPresenter().onImport(fileContent, gridWidget);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/InsertColumnCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/InsertColumnCommand.java
deleted file mode 100644
index d205f7e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/InsertColumnCommand.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-
-/**
- * <code>Command</code> to <b>insert</b> a column.
- */
-public class InsertColumnCommand extends AbstractSelectedColumnCommand {
-
-    public InsertColumnCommand(GridWidget gridWidget) {
-        super(gridWidget, FactMappingValueType.NOT_EXPRESSION);
-    }
-
-    @Override
-    protected void executeIfSelectedColumn(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn) {
-        /* Here, it calculates the position where the column will be added, according to the selected column position,
-           if it should be added in the right or on the left of the selected position and if is a property (i.e. is a new
-           property column which have to be added on the same instance group of the selected one */
-        int columnPosition;
-        if (context.getStatus().isAsProperty()) {
-            columnPosition = context.getStatus().isRight() ? context.getStatus().getColumnIndex() + 1 : context.getStatus().getColumnIndex();
-        } else {
-            GridData.Range instanceRange = context.getAbstractScesimGridModelByGridWidget(gridWidget).getInstanceLimits(context.getStatus().getColumnIndex());
-            columnPosition = context.getStatus().isRight() ? instanceRange.getMaxRowIndex() + 1 : instanceRange.getMinRowIndex();
-        }
-        boolean cloneInstance = context.getStatus().isAsProperty() && selectedColumn.isInstanceAssigned();
-
-        insertNewColumn(context, selectedColumn, columnPosition, cloneInstance);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/InsertRowCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/InsertRowCommand.java
deleted file mode 100644
index df821a5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/InsertRowCommand.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridRow;
-
-public class InsertRowCommand extends AbstractScenarioGridCommand {
-
-    public InsertRowCommand(GridWidget gridWidget) {
-        super(gridWidget);
-    }
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).insertRow(context.getStatus().getRowIndex(),
-                                                                             new ScenarioGridRow());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/PrependColumnCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/PrependColumnCommand.java
deleted file mode 100644
index 89eaa6f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/PrependColumnCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-
-/**
- * <code>Command</code> to <b>prepend</b> (i.e. put in the first position) a column to a given <i>group</i>
- */
-public class PrependColumnCommand extends AbstractInsertColumnCommand {
-
-    public PrependColumnCommand(GridWidget gridWidget) {
-        super(gridWidget);
-    }
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        final ScenarioSimulationContext.Status status = context.getStatus();
-        final int index = context.getAbstractScesimGridModelByGridWidget(gridWidget).getFirstIndexLeftOfGroup(status.getColumnGroup());
-        commonInsertColumnCommand(context, status, index);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/PrependRowCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/PrependRowCommand.java
deleted file mode 100644
index c184975..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/PrependRowCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridRow;
-
-/**
- * <code>Command</code> to <b>prepend</b> (i.e. put in the first position) a row
- */
-public class PrependRowCommand extends AbstractScenarioGridCommand {
-
-    public PrependRowCommand(GridWidget gridWidget) {
-        super(gridWidget);
-    }
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).insertRow(0, new ScenarioGridRow());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/ReloadTestToolsCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/ReloadTestToolsCommand.java
deleted file mode 100644
index 089b678..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/ReloadTestToolsCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-
-/**
- * <code>Command</code> to <b>reload</b> the <code>TestToolsView</code>, <b>eventually</b> showing it (if required by original event)
- */
-public class ReloadTestToolsCommand extends AbstractScenarioSimulationCommand {
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        final ScenarioSimulationContext.Status status = context.getStatus();
-        if (context.getScenarioSimulationEditorPresenter() != null) {
-            if (status.isOpenDock()) {
-                context.getScenarioSimulationEditorPresenter().expandToolsDock();
-            }
-            context.getScenarioSimulationEditorPresenter().reloadTestTools(status.isDisable());
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/RunSingleScenarioCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/RunSingleScenarioCommand.java
deleted file mode 100644
index 6a061e3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/RunSingleScenarioCommand.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-
-/**
- * <code>Command</code> to <b>run</b> a single <b>Scenario</b>
- */
-public class RunSingleScenarioCommand extends AbstractScenarioSimulationCommand {
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        int numberOfScenario = context.getStatus().getRowIndex();
-        List<Integer> indexOfScenarioToRun = Collections.singletonList(numberOfScenario);
-        context.getScenarioSimulationEditorPresenter().onRunScenario(indexOfScenarioToRun);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetGridCellValueCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetGridCellValueCommand.java
deleted file mode 100644
index 5ad406c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetGridCellValueCommand.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils;
-import org.drools.workbench.screens.scenariosimulation.client.values.ScenarioGridCellValue;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-
-/**
- * <code>Command</code> to set the <i>value</i> of a grid' cell
- */
-public class SetGridCellValueCommand extends AbstractScenarioGridCommand {
-
-    public SetGridCellValueCommand(GridWidget gridWidget) {
-        super(gridWidget);
-    }
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context) {
-        final ScenarioSimulationContext.Status status = context.getStatus();
-        AbstractScesimModel<AbstractScesimData> abstractScesimModel = context.getAbstractScesimModelByGridWidget(gridWidget);
-        int columnIndex = status.getColumnIndex();
-        FactMapping factMapping = abstractScesimModel.getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-        ScenarioGridColumn selectedColumn = (ScenarioGridColumn) context.getAbstractScesimGridModelByGridWidget(gridWidget).getColumns().get(columnIndex);
-        String placeholder = ScenarioSimulationUtils.getPlaceHolder(selectedColumn.isInstanceAssigned(),
-                                                                    selectedColumn.isPropertyAssigned(),
-                                                                    factMapping.getFactMappingValueType(),
-                                                                    factMapping.getClassName());
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).setCellValue(status.getRowIndex(),
-                                                                                columnIndex,
-                                                                                new ScenarioGridCellValue(status.getGridCellValue(),
-                                                                                                          placeholder));
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).resetError(status.getRowIndex(), columnIndex);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetHeaderCellValueCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetHeaderCellValueCommand.java
deleted file mode 100644
index 5a93f1b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetHeaderCellValueCommand.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-
-/**
- * <code>Command</code> to to set the <i>value</i> of a header' cell
- */
-public class SetHeaderCellValueCommand extends AbstractScenarioGridCommand {
-
-    protected boolean isInstanceHeader;
-    protected boolean isPropertyHeader;
-
-    public SetHeaderCellValueCommand(GridWidget gridWidget, boolean isInstanceHeader, boolean isPropertyHeader) {
-        super(gridWidget);
-        this.isInstanceHeader = isInstanceHeader;
-        this.isPropertyHeader = isPropertyHeader;
-    }
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context)  {
-        final ScenarioSimulationContext.Status status = context.getStatus();
-        String headerCellValue = status.getHeaderCellValue();
-        if (isInstanceHeader) {
-            validateInstanceHeader(context, headerCellValue, status.getColumnIndex());
-        } else if (isPropertyHeader) {
-            validatePropertyHeader(context, headerCellValue, status.getColumnIndex());
-        }
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).updateHeader(status.getColumnIndex(), status.getRowIndex(), headerCellValue);
-    }
-
-    protected void validateInstanceHeader(ScenarioSimulationContext context, String headerCellValue, int columnIndex) {
-        List<String> instanceNameElements = Collections.unmodifiableList(Arrays.asList(headerCellValue.split("\\.")));
-        boolean isADataType = !headerCellValue.endsWith(".") && instanceNameElements.size() == 1 && context.getDataObjectFieldsMap().containsKey(instanceNameElements.get(0));
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).validateInstanceHeaderUpdate(headerCellValue, columnIndex, isADataType);
-    }
-
-    protected void validatePropertyHeader(ScenarioSimulationContext context, String headerCellValue, int columnIndex) {
-        final ScenarioSimulationModel.Type simulationModelType = context.getScenarioSimulationModel().getSettings().getType();
-        List<String> propertyNameElements = Collections.unmodifiableList(Arrays.asList(headerCellValue.split("\\.")));
-        final FactMapping factMappingByIndex = context.getAbstractScesimModelByGridWidget(gridWidget).getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-        String factName = simulationModelType.equals(ScenarioSimulationModel.Type.DMN) ?
-                factMappingByIndex.getFactIdentifier().getName() :
-                factMappingByIndex.getFactIdentifier().getClassNameWithoutPackage();
-        final FactModelTree factModelTree = context.getDataObjectFieldsMap().get(factName);
-        boolean isPropertyType = !headerCellValue.endsWith(".") && factModelTree != null && recursivelyFindIsPropertyType(context, factModelTree, propertyNameElements);
-        context.getAbstractScesimGridModelByGridWidget(gridWidget).validatePropertyHeaderUpdate(headerCellValue, columnIndex, isPropertyType);
-    }
-
-    protected boolean recursivelyFindIsPropertyType(ScenarioSimulationContext context, FactModelTree factModelTree, List<String> propertyNameElements) {
-        boolean toReturn = propertyNameElements.size() == 1 && (factModelTree.getSimpleProperties().containsKey(propertyNameElements.get(0)) || factModelTree.getExpandableProperties().containsKey(propertyNameElements.get(0)));
-        if (!toReturn && propertyNameElements.size() > 1) {
-            String propertyParent = propertyNameElements.get(0);
-            if (factModelTree.getExpandableProperties().containsKey(propertyParent)) {
-                List<String> nestedPropertyNameElements = propertyNameElements.subList(1, propertyNameElements.size());
-                String className = factModelTree.getExpandableProperties().get(propertyParent);
-                final FactModelTree nestedFactModelTree = context.getDataObjectFieldsMap().get(className);
-                toReturn = recursivelyFindIsPropertyType(context, nestedFactModelTree, nestedPropertyNameElements);
-            }
-        }
-        return toReturn;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetInstanceHeaderCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetInstanceHeaderCommand.java
deleted file mode 100644
index c7afa32..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetInstanceHeaderCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-
-/**
- * <code>Command</code> to set the <i>instance</i> level header for a given column
- */
-public class SetInstanceHeaderCommand extends AbstractSelectedColumnCommand {
-
-    public SetInstanceHeaderCommand(GridWidget gridWidget) {
-        super(gridWidget, FactMappingValueType.NOT_EXPRESSION);
-    }
-
-    @Override
-    protected void executeIfSelectedColumn(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn) {
-        setInstanceHeader(context, selectedColumn, context.getStatus().getClassName(), getFullPackage(context) + context.getStatus().getClassName());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetPropertyHeaderCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetPropertyHeaderCommand.java
deleted file mode 100644
index b1e44cd..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetPropertyHeaderCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-
-/**
- * <code>Command</code> to to set the <i>property</i> level header for a given column
- */
-public class SetPropertyHeaderCommand extends AbstractSelectedColumnCommand {
-
-    public SetPropertyHeaderCommand(GridWidget gridWidget, FactMappingValueType factMappingValueType) {
-        super(gridWidget, factMappingValueType);
-    }
-
-    @Override
-    protected void executeIfSelectedColumn(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn) {
-        setPropertyHeader(context,
-                          selectedColumn,
-                          getFullPackage(context) + context.getStatus().getClassName(),
-                          context.getStatus().getPropertyNameElements(),
-                          context.getStatus().getValueClassName());
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/UpdateSettingsDataCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/UpdateSettingsDataCommand.java
deleted file mode 100644
index 69384d3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/UpdateSettingsDataCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Collections;
-import java.util.Optional;
-import java.util.function.Consumer;
-
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationViolation;
-import org.kie.workbench.common.command.client.CommandResult;
-import org.kie.workbench.common.command.client.CommandResultBuilder;
-import org.kie.workbench.common.command.client.impl.CommandResultImpl;
-
-/**
- * Command which manages every changes applied to the SettingsDock.
- */
-public class UpdateSettingsDataCommand extends AbstractScenarioSimulationUndoableCommand<Settings> {
-
-    private final Consumer<Settings> settingsConsumer;
-    private final boolean dmnPathChanged;
-
-    public UpdateSettingsDataCommand(final Consumer<Settings> settingsConsumer, 
-                                     final boolean dmnPathChanged) {
-        this.settingsConsumer = settingsConsumer;
-        this.dmnPathChanged = dmnPathChanged;
-    }
-
-    @Override
-    protected Settings setRestorableStatusPreExecution(ScenarioSimulationContext context) {
-        return context.getScenarioSimulationModel().getSettings().cloneSettings();
-    }
-
-    @Override
-    public Optional<CommandResult<ScenarioSimulationViolation>> commonUndoRedoPreExecution(ScenarioSimulationContext context) {
-        context.getScenarioSimulationEditorPresenter().expandSettingsDock();
-        return Optional.of(CommandResultBuilder.SUCCESS);
-    }
-
-    protected CommandResult<ScenarioSimulationViolation> setCurrentContext(ScenarioSimulationContext context) {
-        try {
-            if (restorableStatus == null) {
-                throw new IllegalStateException("restorableStatus is null");
-            }
-            final Settings originalSettings = context.getScenarioSimulationModel().getSettings().cloneSettings();
-            context.getScenarioSimulationEditorPresenter().getModel().setSettings(restorableStatus);
-            restorableStatus = originalSettings;
-            if (dmnPathChanged) {
-                context.getScenarioSimulationEditorPresenter().getPopulateTestToolsCommand().execute();
-                context.getScenarioSimulationEditorPresenter().validateSimulation();
-            }
-            context.getScenarioSimulationEditorPresenter().reloadSettingsDock();
-            return commonExecution(context);
-        } catch (Exception e) {
-            return new CommandResultImpl<>(CommandResult.Type.ERROR, Collections.singleton(new ScenarioSimulationViolation(e.getMessage())));
-        }
-    }
-
-    @Override
-    protected void internalExecute(ScenarioSimulationContext context)  {
-        settingsConsumer.accept(context.getScenarioSimulationModel().getSettings());
-        if (dmnPathChanged) {
-            context.getScenarioSimulationEditorPresenter().getPopulateTestToolsCommand().execute();
-            context.getScenarioSimulationEditorPresenter().getUpdateDMNMetadataCommand().execute();
-        } else {
-            context.getScenarioSimulationEditorPresenter().reloadSettingsDock();
-        }
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/domelements/CollectionEditorDOMElement.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/domelements/CollectionEditorDOMElement.java
deleted file mode 100644
index b44b767..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/domelements/CollectionEditorDOMElement.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.domelements;
-
-import java.util.Objects;
-
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.user.client.TakesValue;
-import com.google.gwt.user.client.ui.Focusable;
-import com.google.gwt.user.client.ui.SimplePanel;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.CollectionViewImpl;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetGridCellValueEvent;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.uberfire.ext.wires.core.grids.client.model.Bounds;
-import org.uberfire.ext.wires.core.grids.client.widget.context.GridBodyCellRenderContext;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.impl.BaseDOMElement;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-
-public class CollectionEditorDOMElement extends BaseDOMElement<String, CollectionViewImpl> implements TakesValue<String>,
-                                                                                                      Focusable {
-
-    protected ScenarioGridCell scenarioGridCell;
-
-    /**
-     * @param widget
-     * @param gridLayer
-     * @param gridWidget
-     */
-    public CollectionEditorDOMElement(final CollectionViewImpl widget,
-                                      final GridLayer gridLayer,
-                                      final GridWidget gridWidget) {
-        super(widget,
-              gridLayer,
-              gridWidget);
-        final Style style = widget.getElement().getStyle();
-        style.setProperty("resize", "none");
-
-        final SimplePanel widgetContainer = getContainer();
-        final Element widgetContainerElement = widgetContainer.getElement();
-        final Style widgetContainerElementStyle = widgetContainerElement.getStyle();
-
-        widgetContainerElementStyle.setPaddingLeft(5, Style.Unit.PX);
-        widgetContainerElementStyle.setPaddingRight(5, Style.Unit.PX);
-        widgetContainerElementStyle.setPaddingTop(5, Style.Unit.PX);
-        widgetContainerElementStyle.setPaddingBottom(5, Style.Unit.PX);
-
-        widgetContainer.setWidget(widget);
-    }
-
-    public void setScenarioGridCell(ScenarioGridCell scenarioGridCell) {
-        this.scenarioGridCell = scenarioGridCell;
-    }
-
-    public void stopEditingMode() {
-        if (scenarioGridCell != null) {
-            scenarioGridCell.setEditingMode(false);
-        }
-    }
-
-    @Override
-    public void initialise(final GridBodyCellRenderContext context) {
-        transform(context);
-        final Bounds visibleBounds = gridLayer.getVisibleBounds();
-        final double shownWidth = visibleBounds.getWidth();
-        final double widgetWidth = (shownWidth * 0.5);
-        final double widgetLeft = ((shownWidth - widgetWidth) / 2);
-        widgetContainer.getElement().getStyle().setWidth(widgetWidth, Style.Unit.PX);
-        widgetContainer.getElement().getStyle().setLeft(widgetLeft, Style.Unit.PX);
-        final double shownHeight = visibleBounds.getHeight();
-        final double widgetHeight = (shownHeight * 0.5);
-        widget.setFixedHeight(widgetHeight, Style.Unit.PX);
-        widgetContainer.getElement().getStyle().setTop(0, Style.Unit.PX);
-        // Verify Collection editor is always shown on center of the widget, even when clicked cell left margin is outside of the grid
-        widgetContainer.getElement().getStyle().clearProperty("clip");
-    }
-
-    @Override
-    public String getValue() {
-        return getWidget().getValue();
-    }
-
-    @Override
-    public void setValue(final String value) {
-        getWidget().setValue(value);
-    }
-
-    @Override
-    public int getTabIndex() {
-        return getWidget().getTabIndex();
-    }
-
-    @Override
-    public void setTabIndex(final int index) {
-        getWidget().setTabIndex(index);
-    }
-
-    @Override
-    public void setAccessKey(final char key) {
-        getWidget().setAccessKey(key);
-    }
-
-    @Override
-    public void setFocus(final boolean focused) {
-        getWidget().setFocus(focused);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void flush(final String value) {
-        if (scenarioGridCell != null) {
-            scenarioGridCell.setEditingMode(false);
-            String actualValue = (value == null || value.isEmpty()) ? null : value;
-            String cellValue = scenarioGridCell.getValue().getValue();
-            String originalValue = (cellValue == null || cellValue.isEmpty()) ? null : cellValue;
-            if (Objects.equals(actualValue, originalValue)) {
-                return;
-            }
-        }
-        internalFlush(value);
-    }
-
-    protected void internalFlush(final String value) {
-        final int rowIndex = context.getRowIndex();
-        final int columnIndex = context.getColumnIndex();
-        ((ScenarioGrid) gridWidget).getEventBus().fireEvent(new SetGridCellValueEvent(((ScenarioGrid) gridWidget).getGridWidget(), rowIndex, columnIndex, value));
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/domelements/ScenarioCellTextAreaDOMElement.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/domelements/ScenarioCellTextAreaDOMElement.java
deleted file mode 100644
index 4dfe393..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/domelements/ScenarioCellTextAreaDOMElement.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.domelements;
-
-import java.util.Objects;
-
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.user.client.TakesValue;
-import com.google.gwt.user.client.ui.Focusable;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetGridCellValueEvent;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.gwtbootstrap3.client.ui.TextArea;
-import org.uberfire.ext.wires.core.grids.client.widget.context.GridBodyCellRenderContext;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.impl.BaseDOMElement;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-
-public class ScenarioCellTextAreaDOMElement extends BaseDOMElement<String, TextArea> implements TakesValue<String>,
-                                                                                                Focusable {
-
-    protected ScenarioGridCell scenarioGridCell;
-
-    public ScenarioCellTextAreaDOMElement(final TextArea widget,
-                                          final GridLayer gridLayer,
-                                          final GridWidget gridWidget) {
-        super(widget,
-              gridLayer,
-              gridWidget);
-
-        init();
-    }
-
-    public void init() {
-        final Style style = widget.getElement().getStyle();
-        style.setWidth(100, Style.Unit.PCT);
-        style.setHeight(100, Style.Unit.PCT);
-        style.setFontSize(12, Style.Unit.PX);
-        style.setProperty("resize", "none");
-
-        getContainer().setWidget(widget);
-    }
-
-    public void setScenarioGridCell(ScenarioGridCell scenarioGridCell) {
-        this.scenarioGridCell = scenarioGridCell;
-    }
-
-    @Override
-    public void initialise(final GridBodyCellRenderContext context) {
-        transform(context);
-    }
-
-    @Override
-    public String getValue() {
-        return getWidget().getValue();
-    }
-
-    @Override
-    public void setValue(final String value) {
-        getWidget().setValue(value);
-    }
-
-    @Override
-    public int getTabIndex() {
-        return getWidget().getTabIndex();
-    }
-
-    @Override
-    public void setTabIndex(final int index) {
-        getWidget().setTabIndex(index);
-    }
-
-    @Override
-    public void setAccessKey(final char key) {
-        getWidget().setAccessKey(key);
-    }
-
-    @Override
-    public void setFocus(final boolean focused) {
-        getWidget().setFocus(focused);
-    }
-
-    @Override
-    public void flush(final String value) {
-        String actualValue = value != null && value.isEmpty() ? null : value;
-        if (scenarioGridCell != null) {
-            scenarioGridCell.setEditingMode(false);
-            String cellValue = scenarioGridCell.getValue().getValue();
-            if (Objects.equals(actualValue, cellValue)) {
-                return;
-            }
-        }
-        internalFlush(actualValue);
-    }
-
-    protected void internalFlush(final String value) {
-        final int rowIndex = context.getRowIndex();
-        final int columnIndex = context.getColumnIndex();
-        ((ScenarioGrid) gridWidget).getEventBus().fireEvent(new SetGridCellValueEvent(((ScenarioGrid) gridWidget).getGridWidget(), rowIndex, columnIndex, value));
-    }
-
-    @Override
-    public void detach() {
-        super.detach();
-        if (scenarioGridCell != null) {
-            scenarioGridCell.setEditingMode(false);
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/domelements/ScenarioHeaderTextAreaDOMElement.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/domelements/ScenarioHeaderTextAreaDOMElement.java
deleted file mode 100644
index a641749..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/domelements/ScenarioHeaderTextAreaDOMElement.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.domelements;
-
-import java.util.Objects;
-
-import org.drools.workbench.screens.scenariosimulation.client.events.ReloadTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioNotificationEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetHeaderCellValueEvent;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.gwtbootstrap3.client.ui.TextArea;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-import org.uberfire.workbench.events.NotificationEvent;
-
-public class ScenarioHeaderTextAreaDOMElement extends ScenarioCellTextAreaDOMElement {
-
-    private ScenarioHeaderMetaData scenarioHeaderMetaData;
-
-    public ScenarioHeaderTextAreaDOMElement(TextArea widget, GridLayer gridLayer, GridWidget gridWidget) {
-        super(widget, gridLayer, gridWidget);
-    }
-
-    /**
-     * Set the <code>ScenarioHeaderMetaData</code> this element is bind to
-     * @param scenarioHeaderMetaData
-     */
-    public void setScenarioHeaderMetaData(ScenarioHeaderMetaData scenarioHeaderMetaData) {
-        this.scenarioHeaderMetaData = scenarioHeaderMetaData;
-    }
-
-    @Override
-    public void flush(final String value) {
-        if (Objects.isNull(value) || value.trim().isEmpty()) {
-            ((ScenarioGrid) gridWidget).getEventBus().fireEvent(
-                    new ScenarioNotificationEvent(
-                            ScenarioSimulationEditorConstants.INSTANCE.headerTitleEmptyError(),
-                            NotificationEvent.NotificationType.ERROR));
-            return;
-        }
-        if (scenarioHeaderMetaData != null) {
-            scenarioHeaderMetaData.setEditingMode(false);
-            if (Objects.equals(value, scenarioHeaderMetaData.getTitle())) {
-                return;
-            }
-        }
-        internalFlush(value);
-    }
-
-    @Override
-    protected void internalFlush(final String value) {
-        final int rowIndex = context.getRowIndex();
-        final int columnIndex = context.getColumnIndex();
-        try {
-            boolean isInstanceHeader = scenarioHeaderMetaData != null && Objects.equals(scenarioHeaderMetaData.getMetadataType(), ScenarioHeaderMetaData.MetadataType.INSTANCE);
-            boolean isPropertyHeader = scenarioHeaderMetaData != null && Objects.equals(scenarioHeaderMetaData.getMetadataType(), ScenarioHeaderMetaData.MetadataType.PROPERTY);
-            ((ScenarioGrid) gridWidget).getEventBus().fireEvent(new SetHeaderCellValueEvent(((ScenarioGrid) gridWidget).getGridWidget(), rowIndex, columnIndex, value, isInstanceHeader, isPropertyHeader));
-            ((ScenarioGrid) gridWidget).getEventBus().fireEvent(new ReloadTestToolsEvent(true));
-        } catch (Exception e) {
-            throw new IllegalArgumentException(new StringBuilder().append("Impossible to update header (").append(rowIndex)
-                                                       .append(") of column ").append(columnIndex).toString(), e);
-        }
-    }
-
-    @Override
-    public void detach() {
-        super.detach();
-        if (scenarioHeaderMetaData != null) {
-            scenarioHeaderMetaData.setEditingMode(false);
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationAssetsDropdownProvider.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationAssetsDropdownProvider.java
deleted file mode 100644
index df159cf..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationAssetsDropdownProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.dropdown;
-
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItemsProvider;
-
-/**
- * Using this to specialize injected instance
- */
-public interface ScenarioSimulationAssetsDropdownProvider extends KieAssetsDropdownItemsProvider {
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationDropdown.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationDropdown.java
deleted file mode 100644
index c9668b0..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationDropdown.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.dropdown;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import com.google.gwt.user.client.ui.IsWidget;
-import org.kie.workbench.common.widgets.client.assets.dropdown.AbstractKieAssetsDropdown;
-
-@Dependent
-@Named(ScenarioSimulationDropdown.BEAN_NAME)
-public class ScenarioSimulationDropdown extends AbstractKieAssetsDropdown {
-
-    final public static String BEAN_NAME = "ScenarioDropdown";
-
-    @Inject
-    public ScenarioSimulationDropdown(@Named(ScenarioSimulationDropdownView.BEAN_NAME) ScenarioSimulationDropdownView view,
-                                      ScenarioSimulationAssetsDropdownProvider dataProvider) {
-        super(view, dataProvider);
-    }
-
-    public IsWidget asWidget() {
-        return ((ScenarioSimulationDropdownView) view).asWidget();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationDropdownView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationDropdownView.java
deleted file mode 100644
index 8c6769d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationDropdownView.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.dropdown;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import com.google.gwt.user.client.ui.IsWidget;
-import elemental2.dom.HTMLOptionElement;
-import elemental2.dom.HTMLSelectElement;
-import org.jboss.errai.common.client.ui.ElementWrapperWidget;
-import org.jboss.errai.ui.client.local.spi.TranslationService;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownView;
-
-@Dependent
-@Templated(value = "/org/kie/workbench/common/widgets/client/assets/dropdown/KieAssetsDropdownView.html")
-@Named(ScenarioSimulationDropdownView.BEAN_NAME)
-public class ScenarioSimulationDropdownView extends KieAssetsDropdownView implements ScenarioSimulationDropdown.View {
-
-    final public static String BEAN_NAME = "ScenarioDropdownView";
-
-    @Inject
-    public ScenarioSimulationDropdownView(HTMLSelectElement nativeSelect,
-                                          HTMLOptionElement htmlOptionElement,
-                                          TranslationService translationService) {
-        super(nativeSelect, htmlOptionElement, translationService);
-    }
-
-    public IsWidget asWidget() {
-        return ElementWrapperWidget.getWidget(getElement());
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/SettingsScenarioSimulationDropdown.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/SettingsScenarioSimulationDropdown.java
deleted file mode 100644
index e1e47df..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/SettingsScenarioSimulationDropdown.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.dropdown;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.uberfire.mvp.Command;
-
-@Dependent
-@Named(SettingsScenarioSimulationDropdown.BEAN_NAME)
-public class SettingsScenarioSimulationDropdown extends ScenarioSimulationDropdown {
-
-    public static final String BEAN_NAME = "SettingsDropdown";
-
-    protected String currentValue;
-    protected Command onMissingValueHandler = () -> {/*Nothing/*/};
-
-    @Inject
-    public SettingsScenarioSimulationDropdown(@Named(SettingsScenarioSimulationDropdownView.BEAN_NAME) SettingsScenarioSimulationDropdownView view,
-                                              ScenarioSimulationAssetsDropdownProvider dataProvider) {
-        super(view, dataProvider);
-    }
-
-    /**
-     * It loads the DMN assets and it sets currentValue variable.
-     * @param currentValue
-     */
-    public void loadAssets(String currentValue) {
-        Optional<KieAssetsDropdownItem> value = getValue();
-        if (!value.isPresent() || !Objects.equals(value.get().getValue(), currentValue)) {
-            this.currentValue = currentValue;
-            super.loadAssets();
-        }
-    }
-
-    public void registerOnMissingValueHandler(final Command onMissingValueHandler) {
-        this.onMissingValueHandler = onMissingValueHandler;
-    }
-
-    @Override
-    protected void assetListConsumerMethod(final List<KieAssetsDropdownItem> assetList) {
-        assetList.forEach(this::addValue);
-        view.refreshSelectPicker();
-        if (isValuePresentInKieAssets(currentValue)) {
-            ((SettingsScenarioSimulationDropdownView) view).initialize(currentValue);
-        } else {
-            view.initialize();
-            onMissingValueHandler.execute();
-        }
-        this.currentValue = null;
-    }
-
-    /**
-     * It navigate over the kieAssets list to check if a value is present.
-     * @param value
-     * @return
-     */
-    protected boolean isValuePresentInKieAssets(String value) {
-        return kieAssets.stream().anyMatch(asset -> asset.getValue().equals(value));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/SettingsScenarioSimulationDropdownView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/SettingsScenarioSimulationDropdownView.java
deleted file mode 100644
index 8dd6032..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/SettingsScenarioSimulationDropdownView.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.dropdown;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import elemental2.dom.HTMLOptionElement;
-import elemental2.dom.HTMLSelectElement;
-import org.jboss.errai.ui.client.local.spi.TranslationService;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-@Dependent
-@Templated(value = "/org/kie/workbench/common/widgets/client/assets/dropdown/KieAssetsDropdownView.html")
-@Named(SettingsScenarioSimulationDropdownView.BEAN_NAME)
-public class SettingsScenarioSimulationDropdownView extends ScenarioSimulationDropdownView implements ScenarioSimulationDropdown.View {
-
-    final public static String BEAN_NAME = "SettingsDropdownView";
-
-    @Inject
-    public SettingsScenarioSimulationDropdownView(HTMLSelectElement nativeSelect,
-                                                  HTMLOptionElement htmlOptionElement,
-                                                  TranslationService translationService) {
-        super(nativeSelect, htmlOptionElement, translationService);
-    }
-
-    public void initialize(String value) {
-        dropdown().selectpicker("val", value);
-        dropdown().selectpicker("show");
-    }
-
-    @Override
-    public void clear() {
-        removeChildren(nativeSelect);
-        refreshSelectPicker();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationEditorPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationEditorPresenter.java
deleted file mode 100644
index 0e50c61..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationEditorPresenter.java
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor;
-
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.shared.EventBus;
-import elemental2.dom.DomGlobal;
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.BackgroundData;
-import org.drools.scenariosimulation.api.model.BackgroundDataWithIndex;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValueStatus;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScenarioWithIndex;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.editor.strategies.AbstractDMODataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.client.editor.strategies.DataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.ImportEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.RedoEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioNotificationEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.UndoEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.AbstractScenarioSimulationDocksHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationHasBusyIndicatorDefaultErrorCallback;
-import org.drools.workbench.screens.scenariosimulation.client.popup.ConfirmPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.CustomBusyPopup;
-import org.drools.workbench.screens.scenariosimulation.client.producers.AbstractScenarioSimulationProducer;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorI18nServerManager;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.CheatSheetView;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsView;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.drools.workbench.screens.scenariosimulation.client.type.ScenarioSimulationResourceType;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridWidget;
-import org.drools.workbench.screens.scenariosimulation.model.FactMappingValidationError;
-import org.drools.workbench.screens.scenariosimulation.model.SimulationRunResult;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.kie.workbench.common.widgets.client.resources.i18n.CommonConstants;
-import org.uberfire.backend.vfs.ObservablePath;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.client.workbench.docks.UberfireDocksInteractionEvent;
-import org.uberfire.ext.editor.commons.client.file.exports.TextContent;
-import org.uberfire.ext.editor.commons.client.file.exports.TextFileExport;
-import org.uberfire.ext.widgets.common.client.common.BusyPopup;
-import org.uberfire.mvp.Command;
-import org.uberfire.workbench.events.NotificationEvent;
-
-import static org.drools.scenariosimulation.api.model.ScenarioSimulationModel.Type;
-import static org.drools.workbench.screens.scenariosimulation.service.ImportExportType.CSV;
-
-@ApplicationScoped
-public class ScenarioSimulationEditorPresenter {
-
-    public static final String IDENTIFIER = "ScenarioSimulationEditor";
-    private static final AtomicLong SCENARIO_PRESENTER_COUNTER = new AtomicLong();
-    //Package for which this Scenario Simulation relates
-    protected String packageName = "";
-    protected ObservablePath path;
-    protected EventBus eventBus;
-    protected ScenarioGridWidget scenarioMainGridWidget;
-    protected ScenarioGridWidget scenarioBackgroundGridWidget;
-    protected DataManagementStrategy dataManagementStrategy;
-    protected ScenarioSimulationContext context;
-    protected ScenarioSimulationModel model;
-    protected long scenarioPresenterId;
-    protected ScenarioSimulationEditorWrapper scenarioSimulationEditorWrapper;
-    private ScenarioSimulationResourceType type;
-    private ScenarioSimulationView view;
-    private Command populateTestToolsCommand;
-    private TextFileExport textFileExport;
-    private ConfirmPopupPresenter confirmPopupPresenter;
-    private AbstractScenarioSimulationDocksHandler abstractScenarioSimulationDocksHandler;
-
-    public ScenarioSimulationEditorPresenter() {
-        //Zero-parameter constructor for CDI proxies
-    }
-
-    @Inject
-    public ScenarioSimulationEditorPresenter(final AbstractScenarioSimulationProducer abstractScenarioSimulationProducer,
-                                             final ScenarioSimulationResourceType type,
-                                             final AbstractScenarioSimulationDocksHandler abstractScenarioSimulationDocksHandler,
-                                             final TextFileExport textFileExport,
-                                             final ConfirmPopupPresenter confirmPopupPresenter) {
-        this.view = abstractScenarioSimulationProducer.getScenarioSimulationView();
-        this.abstractScenarioSimulationDocksHandler = abstractScenarioSimulationDocksHandler;
-        this.type = type;
-        this.eventBus = abstractScenarioSimulationProducer.getEventBus();
-        this.textFileExport = textFileExport;
-        this.confirmPopupPresenter = confirmPopupPresenter;
-        view.init();
-        abstractScenarioSimulationProducer.setScenarioSimulationEditorPresenter(this);
-        scenarioMainGridWidget = view.getScenarioGridWidget();
-        scenarioMainGridWidget.getScenarioSimulationContext().setScenarioSimulationEditorPresenter(this);
-        scenarioBackgroundGridWidget = abstractScenarioSimulationProducer.getScenarioBackgroundGridWidget();
-        scenarioBackgroundGridWidget.getScenarioSimulationContext().setScenarioSimulationEditorPresenter(this);
-        populateTestToolsCommand = createPopulateTestToolsCommand();
-        scenarioPresenterId = SCENARIO_PRESENTER_COUNTER.getAndIncrement();
-        context = abstractScenarioSimulationProducer.getScenarioSimulationContext();
-    }
-
-    public void setWrapper(ScenarioSimulationEditorWrapper scenarioSimulationEditorWrapper) {
-        this.scenarioSimulationEditorWrapper = scenarioSimulationEditorWrapper;
-        this.scenarioSimulationEditorWrapper.addBackgroundPage(scenarioBackgroundGridWidget);
-    }
-
-    public void setPath(ObservablePath path) {
-        this.path = path;
-    }
-
-    public ObservablePath getPath() {
-        return path;
-    }
-
-    public void setPackageName(String packageName) {
-        this.packageName = packageName;
-    }
-
-    public void onClose() {
-        scenarioMainGridWidget.unregister();
-        scenarioBackgroundGridWidget.unregister();
-    }
-
-    public void initializeDocks() {
-        abstractScenarioSimulationDocksHandler.addDocks();
-        abstractScenarioSimulationDocksHandler.setScesimEditorId(String.valueOf(scenarioPresenterId));
-        expandToolsDock();
-        registerTestToolsCallback();
-        resetDocks();
-    }
-
-    public void hideDocks() {
-        abstractScenarioSimulationDocksHandler.removeDocks();
-        scenarioMainGridWidget.clearSelections();
-        scenarioBackgroundGridWidget.clearSelections();
-        unRegisterTestToolsCallback();
-        clearTestToolsStatus();
-    }
-
-    public void onUberfireDocksInteractionEvent(@Observes final UberfireDocksInteractionEvent uberfireDocksInteractionEvent) {
-        if (isUberfireDocksInteractionEventToManage(uberfireDocksInteractionEvent) && !TestToolsPresenter.IDENTIFIER.equals(uberfireDocksInteractionEvent.getTargetDock().getIdentifier())) {
-            populateRightDocks(uberfireDocksInteractionEvent.getTargetDock().getIdentifier());
-        }
-    }
-
-    public void expandToolsDock() {
-        abstractScenarioSimulationDocksHandler.expandToolsDock();
-    }
-
-    public void expandSettingsDock() {
-        abstractScenarioSimulationDocksHandler.expandSettingsDock();
-    }
-
-    public ScenarioSimulationView getView() {
-        return view;
-    }
-
-    public ScenarioSimulationModel getModel() {
-        return model;
-    }
-
-    public Command getPopulateTestToolsCommand() {
-        return populateTestToolsCommand;
-    }
-
-    /**
-     * To be called to force test tools panel reload
-     * @param disable set this to <code>true</code> to <b>also</b> disable the panel
-     */
-    public void reloadTestTools(boolean disable) {
-        populateRightDocks(TestToolsPresenter.IDENTIFIER);
-        if (disable) {
-            abstractScenarioSimulationDocksHandler.getTestToolsPresenter().onDisableEditorTab();
-        }
-    }
-
-    /**
-     * To be called to force settings panel reload
-     */
-    public void reloadSettingsDock() {
-        this.updateSettings(abstractScenarioSimulationDocksHandler.getSettingsPresenter());
-    }
-
-    public void onRunScenario() {
-        List<Integer> indexes = IntStream.range(0, context.getStatus().getSimulation().getUnmodifiableData().size())
-                .boxed()
-                .collect(Collectors.toList());
-        onRunScenario(indexes);
-    }
-
-    public void onRunScenario(List<Integer> indexOfScenarioToRun) {
-        scenarioMainGridWidget.resetErrors();
-        scenarioBackgroundGridWidget.resetErrors();
-        model.setSimulation(scenarioMainGridWidget.getScenarioSimulationContext().getStatus().getSimulation());
-        model.setBackground(scenarioMainGridWidget.getScenarioSimulationContext().getStatus().getBackground());
-        Simulation simulation = model.getSimulation();
-        List<ScenarioWithIndex> toRun = simulation.getScenarioWithIndex().stream()
-                .filter(elem -> indexOfScenarioToRun.contains(elem.getIndex() - 1))
-                .collect(Collectors.toList());
-        view.showBusyIndicator(ScenarioSimulationEditorConstants.INSTANCE.running());
-        scenarioSimulationEditorWrapper.onRunScenario(getRefreshModelCallback(),
-                                                      new ScenarioSimulationHasBusyIndicatorDefaultErrorCallback(view),
-                                                      simulation.getScesimModelDescriptor(),
-                                                      model.getSettings(),
-                                                      toRun,
-                                                      model.getBackground());
-    }
-
-    public void onUndo() {
-        eventBus.fireEvent(new UndoEvent());
-    }
-
-    public void onRedo() {
-        eventBus.fireEvent(new RedoEvent());
-    }
-
-    public DataManagementStrategy getDataManagementStrategy() {
-        return dataManagementStrategy;
-    }
-
-    public void onImport(String fileContents, GridWidget gridWidget) {
-        switch (gridWidget) {
-            case SIMULATION:
-                scenarioSimulationEditorWrapper.onImport(fileContents, getImportCallBack(), getImportErrorCallback(), context.getStatus().getSimulation());
-                break;
-            case BACKGROUND:
-                scenarioSimulationEditorWrapper.onImport(fileContents, getImportCallBack(), getImportErrorCallback(), context.getStatus().getBackground());
-                break;
-            default:
-                throw new IllegalArgumentException("Illegal GridWidget " + gridWidget);
-        }
-    }
-
-    public EventBus getEventBus() {
-        return eventBus;
-    }
-
-    public ScenarioSimulationContext getContext() {
-        return context;
-    }
-
-    /**
-     * It resets the status of all Docks widgets present in ScenarioSimulation. Considering the docks are
-     * marked as ApplicationScoped, this method should be call everytime ScenarioSimulationEditor is opened (or closed)
-     */
-    protected void resetDocks() {
-        abstractScenarioSimulationDocksHandler.resetDocks();
-    }
-
-    /**
-     * Method to verify if the given <code>UberfireDocksInteractionEvent</code> is to be processed by current instance.
-     * @param uberfireDocksInteractionEvent
-     * @return <code>true</code> if <code>UberfireDocksInteractionEvent.getTargetDock() != null</code> <b>and</b>
-     * the <b>scesimpath</b> parameter of <code>UberfireDocksInteractionEvent.getTargetDock().getPlaceRequest()</code>
-     * is equals to the <b>path</b> (toString) of the current instance; <code>false</code> otherwise
-     */
-    protected boolean isUberfireDocksInteractionEventToManage(UberfireDocksInteractionEvent uberfireDocksInteractionEvent) {
-        return true;
-    }
-
-    protected RemoteCallback<SimulationRunResult> getRefreshModelCallback() {
-        return this::refreshModelContent;
-    }
-
-    protected void refreshModelContent(SimulationRunResult newData) {
-        view.hideBusyIndicator();
-        if (this.model == null) {
-            return;
-        }
-        // refresh simulation data
-        Simulation simulation = this.model.getSimulation();
-        for (ScenarioWithIndex scenarioWithIndex : newData.getScenarioWithIndex()) {
-            int index = scenarioWithIndex.getIndex() - 1;
-            simulation.replaceData(index, scenarioWithIndex.getScesimData());
-        }
-        scenarioMainGridWidget.refreshContent(simulation);
-        context.getStatus().setSimulation(simulation);
-
-        // refresh background data
-        boolean hasBackgroundError = false;
-        Background background = this.model.getBackground();
-        for (BackgroundDataWithIndex backgroundDataWithIndex : newData.getBackgroundDataWithIndex()) {
-            int index = backgroundDataWithIndex.getIndex() - 1;
-            BackgroundData scesimData = backgroundDataWithIndex.getScesimData();
-            background.replaceData(index, scesimData);
-            hasBackgroundError |= scesimData.getUnmodifiableFactMappingValues().stream().anyMatch(elem -> !FactMappingValueStatus.SUCCESS.equals(elem.getStatus()));
-        }
-        scenarioBackgroundGridWidget.refreshContent(background);
-        context.getStatus().setBackground(background);
-
-        if (hasBackgroundError) {
-            sendNotification(ScenarioSimulationEditorConstants.INSTANCE.backgroundErrorNotification(), NotificationEvent.NotificationType.ERROR);
-            selectBackgroundTab();
-        }
-
-        dataManagementStrategy.setModel(model);
-        abstractScenarioSimulationDocksHandler.expandTestResultsDock();
-        scenarioSimulationEditorWrapper.onRefreshedModelContent(newData);
-    }
-
-    public void sendNotification(String text, NotificationEvent.NotificationType type) {
-        eventBus.fireEvent(new ScenarioNotificationEvent(text, type));
-    }
-
-    public void sendNotification(String text, NotificationEvent.NotificationType type, boolean autoHide) {
-        eventBus.fireEvent(new ScenarioNotificationEvent(text, type, autoHide));
-    }
-
-    protected void registerTestToolsCallback() {
-    }
-
-    protected void unRegisterTestToolsCallback() {
-    }
-
-    protected ErrorCallback<Object> getImportErrorCallback() {
-        return (error, exception) -> {
-            confirmPopupPresenter.show(ScenarioSimulationEditorConstants.INSTANCE.importErrorTitle(),
-                                       ScenarioSimulationEditorConstants.INSTANCE.importFailedMessage());
-            return false;
-        };
-    }
-
-    public void loadContent() {
-        CustomBusyPopup.showMessage(CommonConstants.INSTANCE.Loading());
-    }
-
-    public boolean isDirty() {
-        return false;
-    }
-
-    public void onEditTabSelected() {
-        scenarioMainGridWidget.selectAndFocus();
-        scenarioBackgroundGridWidget.deselectAndUnFocus();
-    }
-
-    public void onBackgroundTabSelected() {
-        scenarioBackgroundGridWidget.selectAndFocus();
-        scenarioMainGridWidget.deselectAndUnFocus();
-    }
-
-    public void onOverviewSelected() {
-        scenarioMainGridWidget.deselectAndUnFocus();
-        scenarioBackgroundGridWidget.deselectAndUnFocus();
-    }
-
-    public void onImportsTabSelected() {
-        scenarioMainGridWidget.deselectAndUnFocus();
-        scenarioBackgroundGridWidget.deselectAndUnFocus();
-    }
-
-    public void validateSimulation() {
-        scenarioSimulationEditorWrapper.validate(model.getSimulation(),
-                                                 model.getSettings(),
-                                                 getValidationCallback());
-    }
-
-    public void selectSimulationTab() {
-        scenarioSimulationEditorWrapper.selectSimulationTab();
-    }
-
-    public void selectBackgroundTab() {
-        scenarioSimulationEditorWrapper.selectBackgroundTab();
-    }
-
-    protected void onDownload(final Supplier<Path> pathSupplier) {
-        final String downloadURL = getFileDownloadURL(pathSupplier);
-        open(downloadURL);
-    }
-
-    protected void open(final String downloadURL) {
-        DomGlobal.window.open(downloadURL);
-    }
-
-    protected void showImportDialog() {
-        context.getSelectedGridWidget().ifPresent(gridWidget -> eventBus.fireEvent(new ImportEvent(gridWidget)));
-    }
-
-    protected void onExportToCsv() {
-        context.getSelectedGridWidget().ifPresent(gridWidget ->
-                                                          scenarioSimulationEditorWrapper
-                                                                  .onExportToCsv(getExportCallBack(),
-                                                                                 new ScenarioSimulationHasBusyIndicatorDefaultErrorCallback(view),
-                                                                                 context.getAbstractScesimModelByGridWidget(gridWidget)));
-    }
-
-    public RemoteCallback<String> getExportCallBack() {
-        return rawResult -> {
-            TextContent textContent = TextContent.create(rawResult);
-            textFileExport.export(textContent,
-                                  path.getFileName() + CSV.getExtension());
-        };
-    }
-
-    protected RemoteCallback<AbstractScesimModel> getImportCallBack() {
-        return scesimModel -> {
-            cleanReadOnlyColumn(scesimModel);
-            if (scesimModel instanceof Simulation) {
-                model.setSimulation((Simulation) scesimModel);
-                scenarioMainGridWidget.setContent(model.getSimulation(), model.getSettings().getType());
-                context.getStatus().setSimulation(model.getSimulation());
-                scenarioMainGridWidget.onResize();
-            } else if (scesimModel instanceof Background) {
-                model.setBackground((Background) scesimModel);
-                scenarioBackgroundGridWidget.setContent(model.getBackground(), model.getSettings().getType());
-                context.getStatus().setBackground(model.getBackground());
-                scenarioBackgroundGridWidget.onResize();
-            }
-        };
-    }
-
-    protected Command getValidateCommand() {
-        return this::validateSimulation;
-    }
-
-    protected RemoteCallback<List<FactMappingValidationError>> getValidationCallback() {
-        return result -> {
-            view.hideBusyIndicator();
-
-            if (result != null && !result.isEmpty()) {
-                StringBuilder errorMessage = new StringBuilder(ScenarioSimulationEditorConstants.INSTANCE.validationErrorMessage());
-                errorMessage.append(":<br/>");
-                for (FactMappingValidationError validationError : result) {
-                    String message = validationError.getErrorMessage() != null ? validationError.getErrorMessage() :
-                            ScenarioSimulationEditorI18nServerManager.retrieveMessage(validationError);
-                    errorMessage.append("<b>");
-                    errorMessage.append(validationError.getErrorId());
-                    errorMessage.append("</b> - ");
-                    errorMessage.append(message);
-                    errorMessage.append("<br/>");
-                }
-
-                confirmPopupPresenter.show(ScenarioSimulationEditorConstants.INSTANCE.validationErrorTitle(),
-                                           errorMessage.toString());
-            } else {
-                sendNotification(ScenarioSimulationEditorConstants.INSTANCE.validationSucceed(), NotificationEvent.NotificationType.SUCCESS);
-            }
-        };
-    }
-
-    public ErrorCallback<Boolean> getValidationFailedCallback() {
-        return (message, exception) -> {
-            CustomBusyPopup.close();
-            BusyPopup.close();
-            sendNotification(ScenarioSimulationEditorConstants.INSTANCE.validationFailedNotification(), NotificationEvent.NotificationType.ERROR);
-            return false;
-        };
-    }
-
-    /**
-     * Read only columns should not contains any values
-     * @param abstractScesimModel
-     */
-    protected void cleanReadOnlyColumn(AbstractScesimModel abstractScesimModel) {
-        ScesimModelDescriptor scesimModelDescriptor = abstractScesimModel.getScesimModelDescriptor();
-        for (int i = 0; i < abstractScesimModel.getUnmodifiableData().size(); i += 1) {
-            AbstractScesimData abstractScesimData = abstractScesimModel.getDataByIndex(i);
-            for (FactMapping factMapping : scesimModelDescriptor.getUnmodifiableFactMappings()) {
-                if (isColumnReadOnly(factMapping)) {
-                    abstractScesimData.getFactMappingValue(factMapping.getFactIdentifier(),
-                                                           factMapping.getExpressionIdentifier())
-                            .ifPresent(fmv -> fmv.setRawValue(null));
-                }
-            }
-        }
-    }
-
-    private boolean isColumnReadOnly(FactMapping factMapping) {
-        return !FactMappingType.OTHER.equals(factMapping.getExpressionIdentifier().getType()) &&
-                factMapping.getExpressionElements().isEmpty();
-    }
-
-    public void populateRightDocks(String identifier) {
-        if (dataManagementStrategy != null) {
-            scenarioSimulationEditorWrapper.populateDocks(identifier);
-        }
-    }
-
-    public void getModelSuccessCallbackMethod(DataManagementStrategy dataManagementStrategy, ScenarioSimulationModel model) {
-        this.dataManagementStrategy = dataManagementStrategy;
-        this.model = model;
-        context.getStatus().setSimulation(model.getSimulation());
-        context.getStatus().setBackground(model.getBackground());
-        scenarioMainGridWidget.setContent(model.getSimulation(), model.getSettings().getType());
-        scenarioBackgroundGridWidget.setContent(model.getBackground(), model.getSettings().getType());
-        // NOTE: keep here initialization of docks related with model
-        initializeDocks();
-        populateRightDocks(TestToolsPresenter.IDENTIFIER);
-        populateRightDocks(SettingsPresenter.IDENTIFIER);
-        CustomBusyPopup.close();
-        // Selecting and focusing current selected widget after a data model load
-        context.getBackgroundGrid().select();
-
-        context.getSelectedScenarioGridWidget().ifPresent(ScenarioGridWidget::selectAndFocus);
-        // check if structure is valid
-        getValidateCommand().execute();
-        //force tab to be refreshed
-        scenarioMainGridWidget.onResize();
-    }
-
-    public ScenarioSimulationResourceType getType() {
-        return type;
-    }
-
-    public void setTestTools(TestToolsView.Presenter presenter) {
-        context.setTestToolsPresenter(presenter);
-        presenter.setEventBus(eventBus);
-        GridWidget gridWidget = scenarioBackgroundGridWidget.isSelected() ? GridWidget.BACKGROUND : GridWidget.SIMULATION;
-        dataManagementStrategy.populateTestTools(presenter, context, gridWidget);
-    }
-
-    protected void clearTestToolsStatus() {
-        abstractScenarioSimulationDocksHandler.getTestToolsPresenter().onClearStatus();
-    }
-
-    public void setCheatSheet(CheatSheetView.Presenter presenter) {
-        Type modelType = dataManagementStrategy instanceof AbstractDMODataManagementStrategy ? Type.RULE : Type.DMN;
-        presenter.initCheatSheet(modelType);
-    }
-
-    public void setSettings(SettingsView.Presenter presenter) {
-        Type modelType = dataManagementStrategy instanceof AbstractDMODataManagementStrategy ? Type.RULE : Type.DMN;
-        presenter.setEventBus(eventBus);
-        presenter.setScenarioType(modelType, model.getSettings(), path.getFileName());
-    }
-
-    protected void updateSettings(SettingsView.Presenter presenter) {
-        presenter.updateSettingsData(model.getSettings());
-    }
-
-    public String getJsonModel(ScenarioSimulationModel model) {
-        return "{}";
-    }
-
-    protected String getFileDownloadURL(final Supplier<Path> pathSupplier) {
-        return GWT.getModuleBaseURL() + "defaulteditor/download?path=" + pathSupplier.get().toURI();
-    }
-
-    private Command createPopulateTestToolsCommand() {
-        return () -> populateRightDocks(TestToolsPresenter.IDENTIFIER);
-    }
-
-    public void unpublishTestResultsAlerts() {
-        scenarioSimulationEditorWrapper.unpublishTestResultsAlerts();
-    }
-
-    public Command getUpdateDMNMetadataCommand() { return () -> scenarioSimulationEditorWrapper.getDMNMetadata();}
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationEditorWrapper.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationEditorWrapper.java
deleted file mode 100644
index 2056af1..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationEditorWrapper.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor;
-
-import java.util.List;
-
-import com.google.gwt.user.client.ui.IsWidget;
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScenarioWithIndex;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.scenariosimulation.api.model.SimulationRunMetadata;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.AbstractScenarioSimulationDocksHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationHasBusyIndicatorDefaultErrorCallback;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.CheatSheetPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.CheatSheetView;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsView;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridPanel;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridWidget;
-import org.drools.workbench.screens.scenariosimulation.model.SimulationRunResult;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-
-public interface ScenarioSimulationEditorWrapper {
-
-    void onRunScenario(RemoteCallback<SimulationRunResult> refreshModelCallback, ScenarioSimulationHasBusyIndicatorDefaultErrorCallback scenarioSimulationHasBusyIndicatorDefaultErrorCallback, ScesimModelDescriptor simulationDescriptor, Settings settings, List<ScenarioWithIndex> toRun, Background background);
-
-    Integer getOriginalHash();
-
-    void wrappedRegisterDock(final String id, final IsWidget widget);
-
-    void onImport(String fileContents, RemoteCallback<AbstractScesimModel> importCallBack, ErrorCallback<Object> importErrorCallback, AbstractScesimModel<? extends AbstractScesimData> scesimModel);
-
-    void onExportToCsv(RemoteCallback<String> exportCallBack, ScenarioSimulationHasBusyIndicatorDefaultErrorCallback scenarioSimulationHasBusyIndicatorDefaultErrorCallback, AbstractScesimModel<? extends AbstractScesimData> scesimModel);
-
-    void onDownloadReportToCsv(RemoteCallback<String> exportCallBack, ScenarioSimulationHasBusyIndicatorDefaultErrorCallback scenarioSimulationHasBusyIndicatorDefaultErrorCallback, SimulationRunMetadata simulationRunMetadata, ScenarioSimulationModel.Type modelType);
-
-    void validate(Simulation simulation, Settings settings, RemoteCallback<?> callback);
-
-    void onRefreshedModelContent(SimulationRunResult testResult);
-
-    void addBackgroundPage(ScenarioGridWidget scenarioGridWidget);
-
-    void selectSimulationTab();
-
-    void selectBackgroundTab();
-
-    void unpublishTestResultsAlerts();
-
-    void getDMNMetadata();
-
-    AbstractScenarioSimulationDocksHandler getScenarioSimulationDocksHandler();
-
-    ScenarioSimulationEditorPresenter getScenarioSimulationEditorPresenter();
-
-    default void synchronizeColumnsDimension(ScenarioGridPanel simulationPanel, ScenarioGridPanel backgroundPanel) {
-        simulationPanel.synchronizeFactMappingsWidths();
-        backgroundPanel.synchronizeFactMappingsWidths();
-    }
-
-    default void populateDocks(String identifier) {
-        switch (identifier) {
-            case SettingsPresenter.IDENTIFIER:
-                SettingsView.Presenter settingsPresenter = getScenarioSimulationDocksHandler().getSettingsPresenter();
-                getScenarioSimulationEditorPresenter().setSettings(settingsPresenter);
-                settingsPresenter.setCurrentPath(getScenarioSimulationEditorPresenter().getPath());
-                break;
-            case TestToolsPresenter.IDENTIFIER:
-                getScenarioSimulationEditorPresenter().setTestTools(getScenarioSimulationDocksHandler().getTestToolsPresenter());
-                break;
-            case CheatSheetPresenter.IDENTIFIER:
-                CheatSheetView.Presenter cheatSheetPresenter = getScenarioSimulationDocksHandler().getCheatSheetPresenter();
-                getScenarioSimulationEditorPresenter().setCheatSheet(cheatSheetPresenter);
-                cheatSheetPresenter.setCurrentPath(getScenarioSimulationEditorPresenter().getPath());
-                break;
-            default:
-                throw new IllegalArgumentException("Invalid identifier");
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationView.java
deleted file mode 100644
index 3bcb419..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationView.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor;
-
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.RequiresResize;
-import com.google.gwt.user.client.ui.Widget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridWidget;
-import org.kie.workbench.common.widgets.metadata.client.KieEditorView;
-
-public interface ScenarioSimulationView extends KieEditorView,
-                                                IsWidget,
-                                                RequiresResize {
-
-    void init();
-
-    ScenarioGridWidget getScenarioGridWidget();
-
-    void setScenarioGridWidget(ScenarioGridWidget scenarioMainGridWidget);
-
-    void setContentWidget(Widget widget);
-
-    void setScenarioGridWidgetAsContent();
-
-    void setScenarioTabBarVisibility(boolean visible);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationViewImpl.java
deleted file mode 100644
index d627b19..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationViewImpl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.Widget;
-import elemental2.dom.DomGlobal;
-import elemental2.dom.Element;
-import elemental2.dom.HTMLCollection;
-import elemental2.dom.HTMLDivElement;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridWidget;
-import org.kie.workbench.common.widgets.metadata.client.KieEditorViewImpl;
-
-/**
- * Implementation of the main tab view for the ScenarioSimulation editor.
- * <p>
- * This class acts as a wrapper class which holds the main <code>ScenarioGridWidget</code>
- */
-@ApplicationScoped
-public class ScenarioSimulationViewImpl extends KieEditorViewImpl implements ScenarioSimulationView {
-
-    protected ScenarioGridWidget scenarioGridWidget;
-
-    private SimplePanel editorPanel = new SimplePanel();
-
-    @Override
-    public void init() {
-        setContentWidget(scenarioGridWidget);
-        initWidget(editorPanel);
-    }
-
-    @Override
-    public void setContentWidget(final Widget widget) {
-        editorPanel.setWidget(widget);
-    }
-
-    @Override
-    public void setScenarioGridWidgetAsContent() {
-        editorPanel.setWidget(scenarioGridWidget);
-    }
-
-    /**
-     * It manages the TabBar visibility of Test Scenario.
-     * For some unknown reasons, using the TabPanel API (i.e. in ScenarioSimulationEditorKogitoWrapper using this call:
-     * getWidget().getMultiPage().setTabBarVisible() ) doesn't work. To manage the Widget visibility, we use this
-     * workaround, directing accessing the DOM and modifying the resulting Element. This because this widget is outside
-     * ScenarioSimulationView. The className used to find the Element must be synchronized!
-     * @param visible
-     */
-    @Override
-    public void setScenarioTabBarVisibility(boolean visible) {
-        /* The element className is bound with "TabPanelWithDropdowns.ui.xml" */
-        HTMLCollection<Element> elements = DomGlobal.document.getElementsByClassName("uf-tabbar-panel-nav-tabs");
-        if (elements.length == 1) {
-            HTMLDivElement element = (HTMLDivElement) elements.getAt(0);
-            element.style.display = visible ? "" : "none";
-        }
-    }
-
-    @Override
-    public ScenarioGridWidget getScenarioGridWidget() {
-        return scenarioGridWidget;
-    }
-
-    @Override
-    public void setScenarioGridWidget(ScenarioGridWidget scenarioGridWidget) {
-        this.scenarioGridWidget = scenarioGridWidget;
-    }
-
-    @Override
-    public void onResize() {
-        final Widget parent = getParent();
-        if (parent != null) {
-            final double w = parent.getOffsetWidth();
-            final double h = parent.getOffsetHeight();
-            setPixelSize((int) w, (int) h);
-        }
-        scenarioGridWidget.onResize();
-    }
-
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractColumnMenuPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractColumnMenuPresenter.java
deleted file mode 100644
index 40ddf17..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractColumnMenuPresenter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import java.util.Objects;
-
-import com.google.gwt.dom.client.LIElement;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.DeleteColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DuplicateInstanceEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.InsertColumnEvent;
-
-/**
- * This class is meant to provide common methods to <b>column-specific</b> menus {@link ExpectedContextMenu} and {@link GivenContextMenu},
- * both <b>instance</b> and <b>property</b> header.
- * It is provided to avoid code duplication in concrete implementations
- */
-public abstract class AbstractColumnMenuPresenter extends AbstractHeaderMenuPresenter {
-
-    protected String COLUMNCONTEXTMENU_COLUMN;
-    protected String COLUMNCONTEXTMENU_INSERT_COLUMN_LEFT;
-    protected String COLUMNCONTEXTMENU_INSERT_COLUMN_RIGHT;
-    protected String COLUMNCONTEXTMENU_DELETE_COLUMN;
-    protected String COLUMNCONTEXTMENU_DELETE_INSTANCE;
-    protected String COLUMNCONTEXTMENU_DUPLICATE_INSTANCE;
-    protected String COLUMNCONTEXTMENU_LABEL;
-    protected String COLUMNCONTEXTMENU_I18N;
-
-    protected LIElement insertColumnLeftLIElement;
-    protected LIElement insertColumnRightLIElement;
-    protected LIElement deleteColumnInstanceLIElement;
-    protected LIElement duplicateInstanceLIElement;
-    protected LIElement columnContextLIElement;
-
-    /**
-     * This method set <b>column-specific</b> menu items and common <b>SCENARIO</b> menu items
-     */
-    @Override
-    public void initMenu() {
-        columnContextLIElement = addMenuItem(COLUMNCONTEXTMENU_COLUMN, COLUMNCONTEXTMENU_LABEL, COLUMNCONTEXTMENU_I18N);
-        insertColumnLeftLIElement = addExecutableMenuItem(COLUMNCONTEXTMENU_INSERT_COLUMN_LEFT, constants.insertColumnLeft(), "insertColumnLeft");
-        insertColumnRightLIElement = addExecutableMenuItem(COLUMNCONTEXTMENU_INSERT_COLUMN_RIGHT, constants.insertColumnRight(), "insertColumnRight");
-        deleteColumnInstanceLIElement = addExecutableMenuItem(COLUMNCONTEXTMENU_DELETE_COLUMN, constants.deleteColumn(), "deleteColumn");
-        duplicateInstanceLIElement = addExecutableMenuItem(COLUMNCONTEXTMENU_DUPLICATE_INSTANCE, constants.duplicateInstance(), "duplicateInstance");
-        super.initMenu();
-    }
-
-    public void show(final GridWidget gridWidget, final int mx, final int my, int columnIndex, String group, boolean asProperty, boolean showDuplicateInstance) {
-        /* Set GridTitle */
-        if (Objects.equals(GridWidget.BACKGROUND, gridWidget)) {
-            updateMenuItemAttributes(gridTitleElement, HEADERCONTEXTMENU_GRID_TITLE, constants.background(), "background");
-        } else {
-            updateMenuItemAttributes(gridTitleElement, HEADERCONTEXTMENU_GRID_TITLE, constants.scenario(), "scenario");
-        }
-        /* Manage Duplicate Instance menu item */
-        if (!(Objects.equals(GridWidget.SIMULATION, gridWidget) && showDuplicateInstance)) {
-            if (duplicateInstanceLIElement != null) {
-                removeMenuItem(duplicateInstanceLIElement);
-                duplicateInstanceLIElement = null;
-            }
-        } else if (duplicateInstanceLIElement == null) {
-            duplicateInstanceLIElement = addExecutableMenuItemAfter(COLUMNCONTEXTMENU_DUPLICATE_INSTANCE, constants.duplicateInstance(), "duplicateInstance", deleteColumnInstanceLIElement);
-        }
-        mapEvent(insertColumnLeftLIElement, new InsertColumnEvent(gridWidget, columnIndex, false, asProperty));
-        mapEvent(insertColumnRightLIElement, new InsertColumnEvent(gridWidget, columnIndex, true, asProperty));
-        if (asProperty) {
-            updateExecutableMenuItemAttributes(deleteColumnInstanceLIElement, COLUMNCONTEXTMENU_DELETE_COLUMN, constants.deleteColumn(), "deleteColumn");
-            mapEvent(deleteColumnInstanceLIElement, new DeleteColumnEvent(gridWidget, columnIndex, group, true));
-        } else {
-            updateExecutableMenuItemAttributes(deleteColumnInstanceLIElement, COLUMNCONTEXTMENU_DELETE_INSTANCE, constants.deleteInstance(), "deleteInstance");
-            mapEvent(deleteColumnInstanceLIElement, new DeleteColumnEvent(gridWidget, columnIndex, group, false));
-        }
-        if (duplicateInstanceLIElement != null) {
-            mapEvent(duplicateInstanceLIElement, new DuplicateInstanceEvent(gridWidget, columnIndex));
-        }
-        show(gridWidget, mx, my);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractHeaderGroupMenuPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractHeaderGroupMenuPresenter.java
deleted file mode 100644
index 79051d7..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractHeaderGroupMenuPresenter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.LIElement;
-/**
- * This class is meant to provide common methods to <b>group-specific</b> menus {@link HeaderExpectedContextMenu} and {@link HeaderGivenContextMenu}
- * It is provided to avoid code duplication in concrete implementations
- */
-public abstract class AbstractHeaderGroupMenuPresenter extends AbstractHeaderMenuPresenter {
-
-    protected String HEADERCONTEXTMENU_GROUP;
-    protected String HEADERCONTEXTMENU_INSERT_COLUMN_LEFT;
-    protected String HEADERCONTEXTMENU_INSERT_COLUMN_RIGHT;
-    protected String HEADERCONTEXTMENU_DELETE_COLUMN;
-    protected String HEADERCONTEXTMENU_LABEL;
-    protected String HEADERCONTEXTMENU_I18N;
-
-    protected LIElement appendColumnElement;
-    protected LIElement prependColumnElement;
-    /**
-     * This method set <b>group-specific</b> menu items and common <b>SCENARIO</b> menu items
-     */
-    @Override
-    public void initMenu() {
-        addMenuItem(HEADERCONTEXTMENU_GROUP, HEADERCONTEXTMENU_LABEL, HEADERCONTEXTMENU_I18N);
-        prependColumnElement = addExecutableMenuItem(HEADERCONTEXTMENU_INSERT_COLUMN_LEFT, constants.insertLeftmostColumn(), "insertLeftmostColumn");
-        appendColumnElement = addExecutableMenuItem(HEADERCONTEXTMENU_INSERT_COLUMN_RIGHT, constants.insertRightmostColumn(), "insertRightmostColumn");
-        super.initMenu();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractHeaderMenuPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractHeaderMenuPresenter.java
deleted file mode 100644
index 7241545..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractHeaderMenuPresenter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.event.shared.EventBus;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.PrependRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.models.ScenarioGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-
-/**
- * This is the first <i>ScenarioSimulation</i> specific abstract class - i.e. it is bound to a specific use case. Not every implementation
- * would need this. Menu initialization may be done in other different ways. It is provided to avoid code duplication in concrete implementations
- */
-public abstract class AbstractHeaderMenuPresenter extends BaseMenu implements HeaderMenuPresenter {
-
-    protected ScenarioSimulationEditorConstants constants = ScenarioSimulationEditorConstants.INSTANCE;
-
-    protected ScenarioGridModel model;
-
-    protected String HEADERCONTEXTMENU_GRID_TITLE;
-    protected String HEADERCONTEXTMENU_PREPEND_ROW;
-
-    /**
-     * The <b>Insert row below</b> menu element in the <b>header</b> contextual menu
-     */
-    protected LIElement insertRowBelowElement;
-    protected LIElement gridTitleElement;
-
-    public void setEventBus(EventBus eventBus) {
-        this.executableMenuItemPresenter.setEventBus(eventBus);
-    }
-
-    /**
-     * This method set common <b>SCENARIO</b> menu items
-     */
-    public void initMenu() {
-        // SCENARIO
-        gridTitleElement = addMenuItem(HEADERCONTEXTMENU_GRID_TITLE, constants.scenario(), "scenario");
-        insertRowBelowElement = addExecutableMenuItem(HEADERCONTEXTMENU_PREPEND_ROW, constants.insertRowBelow(), "insertRowBelow");
-    }
-
-    public void show(final GridWidget gridWidget, final int mx, final int my) {
-        super.show(mx, my);
-        mapEvent(insertRowBelowElement, new PrependRowEvent(gridWidget));
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenu.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenu.java
deleted file mode 100644
index 66cea5d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenu.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.RootPanel;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.web.bindery.event.shared.Event;
-import org.gwtbootstrap3.client.ui.constants.Styles;
-
-/**
- * Base Menu implementation for MenuItems.
- */
-public abstract class BaseMenu implements IsWidget,
-                                          BaseMenuView.BaseMenuPresenter {
-
-    @Inject
-    protected MenuItemPresenter menuItemPresenter;
-
-    @Inject
-    protected ExecutableMenuItemPresenter executableMenuItemPresenter;
-
-    @Inject
-    protected BaseMenuView view;
-
-    @PostConstruct
-    @Override
-    public void initialise() {
-        view.init(this);
-        executableMenuItemPresenter.init(this);
-    }
-
-    @Override
-    public LIElement addMenuItem(String id, String label, String i18n) {
-        final LIElement toReturn = menuItemPresenter.getLabelMenuElement(id, label);
-        view.getContextMenuDropdown().appendChild(toReturn);
-        return toReturn;
-    }
-
-    @Override
-    public LIElement addExecutableMenuItem(String id, String label, String i18n, Event event) {
-        final LIElement toReturn = executableMenuItemPresenter.getLExecutableMenuElement(id, label, event);
-        view.getContextMenuDropdown().appendChild(toReturn);
-        return toReturn;
-    }
-
-    @Override
-    public LIElement addExecutableMenuItem(String id, String label, String i18n) {
-        LIElement toReturn = executableMenuItemPresenter.getLExecutableMenuElement(id, label);
-        view.getContextMenuDropdown().appendChild(toReturn);
-        return toReturn;
-    }
-
-    @Override
-    public LIElement addExecutableMenuItemAfter(String id, String label, String i18n, LIElement previous) {
-        LIElement toReturn = executableMenuItemPresenter.getLExecutableMenuElement(id, label);
-        view.getContextMenuDropdown().insertAfter(toReturn, previous);
-        return toReturn;
-    }
-
-    @Override
-    public void removeMenuItem(LIElement toRemove) {
-        view.getContextMenuDropdown().removeChild(toRemove);
-    }
-
-    @Override
-    public void mapEvent(LIElement executableMenuItem, Event toBeMapped) {
-        executableMenuItemPresenter.mapEvent(executableMenuItem, toBeMapped);
-    }
-
-    @Override
-    public Widget asWidget() {
-        return view.asWidget();
-    }
-
-    @Override
-    public void show(final int mx, final int my) {
-        //See https://issues.jboss.org/browse/ERRAI-936
-        //Errai @Templated proxied beans have their "attached" state set to
-        //true, even though they are not physically attached to the DOM.
-        hide();
-        getRootPanel().add(this);
-        view.getContextMenuDropdown().getStyle().setLeft(mx, Style.Unit.PX);
-        view.getContextMenuDropdown().getStyle().setTop(my, Style.Unit.PX);
-        view.getContextMenuDropdown().getStyle().setDisplay(Style.Display.BLOCK);
-    }
-
-    @Override
-    public void hide() {
-        if (isShown()) {
-            getRootPanel().remove(this);
-            view.getContextMenuDropdown().getStyle().setDisplay(Style.Display.NONE);
-        }
-    }
-
-    @Override
-    public boolean isShown() {
-        return getRootPanel().getWidgetIndex(view) != -1;
-    }
-
-    @Override
-    public BaseMenuView getView() {
-        return view;
-    }
-
-    @Override
-    public void enableElement(Element element, boolean enabled) {
-        if (enabled) {
-            element.removeClassName(Styles.DISABLED);
-        } else {
-            element.addClassName(Styles.DISABLED);
-        }
-    }
-
-    @Override
-    public boolean isDisabled(final Element element) {
-        final List<String> classNames = Arrays.asList(element.getClassName().split("\\s"));
-        return classNames.contains(Styles.DISABLED);
-    }
-
-    @Override
-    public void onContextMenuEvent(ContextMenuEvent event) {
-        event.preventDefault();
-        event.stopPropagation();
-        hide();
-    }
-
-    protected RootPanel getRootPanel() {
-        return RootPanel.get();
-    }
-
-    /**
-     * It updates the given toUpdate element with given attributes. To be used with not executable menu items.
-     * The given label it's enriched with HTML bold tag.
-     * @param toUpdate
-     * @param id
-     * @param label
-     * @param i18n
-     */
-    protected void updateMenuItemAttributes(LIElement toUpdate, String id, String label, String i18n) {
-        this.updateExecutableMenuItemAttributes(toUpdate, id, "<b>" + label.toUpperCase() + "</b>", i18n);
-    }
-
-    /**
-     * It updates the given toUpdate element with given attributes. To be used with executable menu items.
-     * @param toUpdate
-     * @param id
-     * @param label
-     * @param i18n
-     */
-    protected void updateExecutableMenuItemAttributes(LIElement toUpdate, String id, String label, String i18n) {
-        toUpdate.setId(id);
-        toUpdate.getElementsByTagName("span").getItem(0).setInnerHTML(label);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuView.java
deleted file mode 100644
index 9140ab9..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuView.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import com.google.web.bindery.event.shared.Event;
-import org.uberfire.client.mvp.UberView;
-
-/**
- * Basic interface for any menu dynamically generated.
- * @param <M>
- */
-public interface BaseMenuView<M extends BaseMenu> extends UberView<M> {
-
-    interface BaseMenuPresenter {
-
-        void initialise();
-
-        /**
-         * Add a <i>label</i> menu voice in form of <code>LIElement</code> to the underlying view
-         * @param id
-         * @param label
-         * @param i18n
-         * @return
-         */
-        LIElement addMenuItem(String id, String label, String i18n);
-
-        /**
-         * Add an <i>executable</i> menu voice in form of <code>LIElement</code> to the underlying view
-         * @param id
-         * @param label
-         * @param i18n
-         * @param event the <code>Event</code> to fire on click
-         * @return
-         */
-        LIElement addExecutableMenuItem(String id, String label, String i18n, Event event);
-
-
-        /**
-         * Add an <i>executable</i> menu voice in form of <code>LIElement</code> to the underlying view
-         * It is an <b>overload</b> of {@link #addExecutableMenuItem(String, String, String, Event)} to dynamically provide
-         * an event at runtime
-         * @param id
-         * @param label
-         * @param i18n
-         */
-        LIElement addExecutableMenuItem(String id, String label, String i18n);
-
-        /**
-         * Add an <i>executable</i> menu voice in form of <code>LIElement</code> to the underlying view <b>after</b> another one
-         * It is an <b>overload</b> of {@link #addExecutableMenuItem(String, String, String, Event)} to dynamically provide
-         * an event at runtime
-         * @param id
-         * @param label
-         * @param i18n
-         * @param previous the <code>LIElement</code> after which append the newly created one
-         */
-        LIElement addExecutableMenuItemAfter(String id, String label, String i18n, LIElement previous);
-
-        /**
-         * Remove a menu voice from the given menu
-         * @param toRemove
-         */
-        void removeMenuItem(LIElement toRemove);
-
-        /**
-         * Method to map an <code>Event</code> to a given <b>EXECUTABLE</b> <code>LIElement</code>.
-         * To be used when <code>LIElement</code> has been retrieved with {@link #addExecutableMenuItem(String, String, String)}
-         * @param executableMenuItem
-         * @param toBeMapped
-         */
-        void mapEvent(LIElement executableMenuItem, Event toBeMapped);
-
-        void show(final int mx,
-                  final int my);
-
-        void hide();
-
-        BaseMenuView getView();
-
-        void enableElement(final Element element, final boolean enabled);
-
-        boolean isDisabled(final Element element);
-
-        /**
-         * Method to retrieve the visibility state of the view
-         * @return
-         */
-        boolean isShown();
-
-        void onContextMenuEvent(ContextMenuEvent event);
-    }
-
-    UListElement getContextMenuDropdown();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuViewImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuViewImpl.html
deleted file mode 100644
index acec563..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuViewImpl.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<!--
-  ~ 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.      
--->
-<ul id="contextMenuDropdown" class="dropdown-menu" style="position: absolute; display: none"></ul>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuViewImpl.java
deleted file mode 100644
index 439b139..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuViewImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import com.google.gwt.user.client.ui.Composite;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-@Templated
-public class BaseMenuViewImpl<M extends BaseMenu> extends Composite implements BaseMenuView<M> {
-
-    protected M presenter;
-
-    @DataField("contextMenuDropdown")
-    private UListElement contextMenuDropdown = Document.get().createULElement();
-
-    @Override
-    public void init(final M presenter) {
-        this.presenter = presenter;
-    }
-
-    @Override
-    public UListElement getContextMenuDropdown() {
-        return contextMenuDropdown;
-    }
-
-    @EventHandler()
-    public void onContextMenuEvent(ContextMenuEvent event) {
-        presenter.onContextMenuEvent(event);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemPresenter.java
deleted file mode 100644
index 2b2fdfc..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemPresenter.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.shared.EventBus;
-import com.google.web.bindery.event.shared.Event;
-
-public class ExecutableMenuItemPresenter implements ExecutableMenuItemView.Presenter {
-
-    @Inject
-    private Instance<ExecutableMenuItemView> instance;
-
-    EventBus eventBus;
-
-    BaseMenu parent;
-
-    protected Map<LIElement, Event> menuItemsEventMap = new HashMap<>();
-
-    @Override
-    public void init(BaseMenu parent) {
-        this.parent = parent;
-    }
-
-    @Override
-    public void setEventBus(EventBus eventBus) {
-        this.eventBus = eventBus;
-    }
-
-    @Override
-    public void onClickEvent(ClickEvent event, LIElement clickedElement) {
-        event.preventDefault();
-        event.stopPropagation();
-        parent.hide();
-        fireEvent(clickedElement);
-    }
-
-    @Override
-    public void fireEvent(LIElement clickedElement) {
-        if (menuItemsEventMap.containsKey(clickedElement)) {
-            final Event event = menuItemsEventMap.get(clickedElement);
-            eventBus.fireEvent(event);
-        }
-    }
-
-    @Override
-    public LIElement getLExecutableMenuElement(String id, String label, Event event) {
-        LIElement toReturn = getLExecutableMenuElement(id, label);
-        menuItemsEventMap.put(toReturn, event);
-        return toReturn;
-    }
-
-    @Override
-    public LIElement getLExecutableMenuElement(String id, String label) {
-        ExecutableMenuItemView menuItemView = getMenuItemView();
-        menuItemView.setId(id);
-        menuItemView.setLabel(label);
-        menuItemView.setPresenter(this);
-        return menuItemView.getLExecutableMenuElement();
-    }
-
-    @Override
-    public void mapEvent(LIElement executableMenuItem, Event toBeMapped) {
-        menuItemsEventMap.put(executableMenuItem, toBeMapped);
-    }
-
-    @Override
-    public void enableElement(boolean toEnable) {
-
-    }
-
-    protected ExecutableMenuItemView getMenuItemView() {  // This is needed for test because Mockito can not mock Instance
-        return instance.get();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemView.java
deleted file mode 100644
index e0d061a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemView.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.shared.EventBus;
-import com.google.web.bindery.event.shared.Event;
-
-public interface ExecutableMenuItemView {
-
-    interface Presenter {
-
-        void init(BaseMenu parent);
-
-        void setEventBus(EventBus eventBus);
-
-        void fireEvent(LIElement clickedElement);
-
-        /**
-         * This method retrieve an <b>EXECUTABLE</b> element (i.e. with a behaviour) to be put inside the menu
-         * @param id
-         * @param innerText
-         * @param event
-         * @return
-         */
-        LIElement getLExecutableMenuElement(String id, String innerText, Event event);
-
-        /**
-         * This method retrieve an <b>EXECUTABLE</b> element (i.e. with a behaviour) to be put inside the menu
-         * It is an <b>overload</b> of {@link #getLExecutableMenuElement(String, String, Event)} to dynamically provide
-         * an event at runtime
-         * @param id
-         * @param innerText
-         * @return
-         */
-        LIElement getLExecutableMenuElement(String id, String innerText);
-
-        /**
-         * Method to map an <code>Event</code> to a given <b>EXECUTABLE</b> <code>LIElement</code>.
-         * To be used when <code>LIElement</code> has been retrieved with {@link #getLExecutableMenuElement(String, String)}
-         * @param executableMenuItem
-         * @param toBeMapped
-         */
-        void mapEvent(LIElement executableMenuItem, Event toBeMapped);
-
-        void enableElement(boolean toEnable);
-
-        void onClickEvent(ClickEvent event, LIElement clickedElement);
-    }
-
-    void setPresenter(ExecutableMenuItemPresenter executableMenuItemPresenter);
-
-    void setId(String id);
-
-    void setDataI18nKey(String dataI18nKey);
-
-    void setLabel(String label);
-
-    /**
-     * This method retrieve an <b>EXECUTABLE</b> element (i.e. with a behaviour) to be put inside the menu
-     * @return
-     */
-    LIElement getLExecutableMenuElement();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemViewImpl.java
deleted file mode 100644
index 66a8eec..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemViewImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-@Templated("MenuItemViewImpl.html")
-public class ExecutableMenuItemViewImpl implements ExecutableMenuItemView {
-
-    @DataField("liElement")
-    private LIElement liElement = Document.get().createLIElement();
-
-    @DataField("spanElement")
-    private SpanElement spanElement = Document.get().createSpanElement();
-
-    private ExecutableMenuItemPresenter executableMenuItemPresenter;
-
-    @Override
-    public LIElement getLExecutableMenuElement() {
-        return liElement;
-    }
-
-    @Override
-    public void setPresenter(ExecutableMenuItemPresenter executableMenuItemPresenter) {
-        this.executableMenuItemPresenter = executableMenuItemPresenter;
-    }
-
-    @Override
-    public void setId(String id) {
-        liElement.setId(id);
-    }
-
-    @Override
-    public void setDataI18nKey(String dataI18nKey) {
-        spanElement.setAttribute("data-i18n-key", dataI18nKey);
-    }
-
-    @Override
-    public void setLabel(String label) {
-        spanElement.setInnerText(label);
-    }
-
-    @EventHandler("liElement")
-    public void onClickEvent(ClickEvent event) {
-        executableMenuItemPresenter.onClickEvent(event, liElement);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExpectedContextMenu.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExpectedContextMenu.java
deleted file mode 100644
index e773b36..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExpectedContextMenu.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.Dependent;
-
-/**
- * The contextual menu of a specific <i>EXPECT</i> column
- * It differ from {@link HeaderExpectedContextMenu} because it manage column (insert/remove) in different way
- */
-@Dependent
-public class ExpectedContextMenu extends AbstractColumnMenuPresenter {
-
-    // This strings are used to give unique id in the final dom
-    protected static final String EXPECTCONTEXTMENU_EXPECT = "expectcontextmenu-expect";
-    protected static final String EXPECTCONTEXTMENU_INSERT_COLUMN_LEFT = "expectcontextmenu-insert-column-left";
-    protected static final String EXPECTCONTEXTMENU_INSERT_COLUMN_RIGHT = "expectcontextmenu-insert-column-right";
-    protected static final String EXPECTCONTEXTMENU_DELETE_COLUMN = "expectcontextmenu-delete-column";
-    protected static final String EXPECTCONTEXTMENU_DELETE_INSTANCE = "expectcontextmenu-delete-instance";
-
-    @PostConstruct
-    @Override
-    public void initMenu() {
-        // EXPECT MENU
-        COLUMNCONTEXTMENU_COLUMN = EXPECTCONTEXTMENU_EXPECT;
-        COLUMNCONTEXTMENU_INSERT_COLUMN_LEFT = EXPECTCONTEXTMENU_INSERT_COLUMN_LEFT;
-        COLUMNCONTEXTMENU_INSERT_COLUMN_RIGHT = EXPECTCONTEXTMENU_INSERT_COLUMN_RIGHT;
-        COLUMNCONTEXTMENU_DELETE_COLUMN = EXPECTCONTEXTMENU_DELETE_COLUMN;
-        COLUMNCONTEXTMENU_DELETE_INSTANCE = EXPECTCONTEXTMENU_DELETE_INSTANCE;
-        COLUMNCONTEXTMENU_LABEL = constants.expect().toUpperCase();
-        COLUMNCONTEXTMENU_I18N = "expect";
-        // SCENARIO MENU
-        super.initMenu();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/GivenContextMenu.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/GivenContextMenu.java
deleted file mode 100644
index 77c6880..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/GivenContextMenu.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.Dependent;
-
-/**
- * The contextual menu of a specific <i>GIVEN</i> column
- * It differ from {@link HeaderGivenContextMenu} because it manage column (insert/remove) in different way
- */
-@Dependent
-public class GivenContextMenu extends AbstractColumnMenuPresenter {
-
-    // This strings are used to give unique id in the final dom
-    protected static final String GIVENCONTEXTMENU_GIVEN = "givencontextmenu-given";
-    protected static final String GIVENCONTEXTMENU_INSERT_COLUMN_LEFT = "givencontextmenu-insert-column-left";
-    protected static final String GIVENCONTEXTMENU_INSERT_COLUMN_RIGHT = "givencontextmenu-insert-column-right";
-    protected static final String GIVENCONTEXTMENU_DELETE_COLUMN = "givencontextmenu-delete-column";
-    protected static final String GIVENCONTEXTMENU_DELETE_INSTANCE = "givencontextmenu-delete-instance";
-    protected static final String GIVENCONTEXTMENU_DUPLICATE_INSTANCE = "givencontextmenu-duplicate-instance";
-
-    @PostConstruct
-    @Override
-    public void initMenu() {
-        // GIVEN MENU
-        COLUMNCONTEXTMENU_COLUMN = GIVENCONTEXTMENU_GIVEN;
-        COLUMNCONTEXTMENU_INSERT_COLUMN_LEFT = GIVENCONTEXTMENU_INSERT_COLUMN_LEFT;
-        COLUMNCONTEXTMENU_INSERT_COLUMN_RIGHT = GIVENCONTEXTMENU_INSERT_COLUMN_RIGHT;
-        COLUMNCONTEXTMENU_DELETE_COLUMN = GIVENCONTEXTMENU_DELETE_COLUMN;
-        COLUMNCONTEXTMENU_DELETE_INSTANCE = GIVENCONTEXTMENU_DELETE_INSTANCE;
-        COLUMNCONTEXTMENU_DUPLICATE_INSTANCE = GIVENCONTEXTMENU_DUPLICATE_INSTANCE;
-        COLUMNCONTEXTMENU_LABEL = constants.given().toUpperCase();
-        COLUMNCONTEXTMENU_I18N = "given";
-        // SCENARIO MENU
-        super.initMenu();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/GridContextMenu.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/GridContextMenu.java
deleted file mode 100644
index 3e14d4c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/GridContextMenu.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import java.util.Objects;
-
-import com.google.gwt.dom.client.LIElement;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.DeleteRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DuplicateRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.InsertRowEvent;
-
-/**
- * The contextual menu of a <i>ROW</i> cell whose <b>GROUP</b> does <b>allow</b> column modification (insert/delete). It has the same items has {@link AbstractColumnMenuPresenter} and specific ones (?)
- */
-public abstract class GridContextMenu extends AbstractHeaderMenuPresenter {
-
-    // This strings are used to give unique id in the final dom
-    protected static final String GRIDCONTEXTMENU_GRID_TITLE = "gridcontextmenu-grid-title";
-    protected static final String GRIDCONTEXTMENU_INSERT_ROW_ABOVE = "gridcontextmenu-insert-row-above";
-    protected static final String GRIDCONTEXTMENU_INSERT_ROW_BELOW = "gridcontextmenu-insert-row-below";
-    protected static final String GRIDCONTEXTMENU_DELETE_ROW = "gridcontextmenu-delete-row";
-    protected static final String GRIDCONTEXTMENU_DUPLICATE_ROW = "gridcontextmenu-duplicate-row";
-
-    protected LIElement insertRowAboveLIElement;
-    protected LIElement insertRowBelowLIElement;
-    protected LIElement duplicateRowLIElement;
-    protected LIElement deleteRowLIElement;
-
-    @Override
-    public void initMenu() {
-        super.initMenu();
-        removeMenuItem(insertRowBelowElement);
-        insertRowAboveLIElement = addExecutableMenuItem(GRIDCONTEXTMENU_INSERT_ROW_ABOVE, constants.insertRowAbove(), "insertRowAbove");
-        insertRowBelowLIElement = addExecutableMenuItem(GRIDCONTEXTMENU_INSERT_ROW_BELOW, constants.insertRowBelow(), "insertRowBelow");
-        duplicateRowLIElement = addExecutableMenuItem(GRIDCONTEXTMENU_DUPLICATE_ROW, constants.duplicateRow(), "duplicateRow");
-        deleteRowLIElement = addExecutableMenuItem(GRIDCONTEXTMENU_DELETE_ROW, constants.deleteRow(), "deleteRow");
-    }
-
-    public void show(final GridWidget gridWidget, final int mx, final int my, int rowIndex) {
-        show(gridWidget, mx, my);
-        mapEvent(insertRowAboveLIElement, new InsertRowEvent(gridWidget, rowIndex));
-        mapEvent(insertRowBelowLIElement, new InsertRowEvent(gridWidget, rowIndex + 1));
-        mapEvent(duplicateRowLIElement, new DuplicateRowEvent(gridWidget, rowIndex));
-        mapEvent(deleteRowLIElement, new DeleteRowEvent(gridWidget, rowIndex));
-        if (Objects.equals(GridWidget.BACKGROUND, gridWidget)) {
-            updateMenuItemAttributes(gridTitleElement , GRIDCONTEXTMENU_GRID_TITLE, constants.background(), "background");
-        } else if (Objects.equals(GridWidget.SIMULATION, gridWidget)) {
-            updateMenuItemAttributes(gridTitleElement , GRIDCONTEXTMENU_GRID_TITLE, constants.scenario(), "scenario");
-        }
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/HeaderExpectedContextMenu.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/HeaderExpectedContextMenu.java
deleted file mode 100644
index b656c6b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/HeaderExpectedContextMenu.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.Dependent;
-
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.AppendColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.PrependColumnEvent;
-
-/**
- * The contextual menu of the top level <i>EXPECT</i> group.
- * It differ from <code>ExpectedContextMenu</code> because it manage column (insert/remove) in different way
- */
-@Dependent
-public class HeaderExpectedContextMenu extends AbstractHeaderGroupMenuPresenter {
-
-    // This strings are used to give unique id in the final dom
-    private static final String HEADEREXPECTCONTEXTMENU_EXPECT = "headerexpectcontextmenu-expect";
-    private static final String HEADEREXPECTCONTEXTMENU_GRID_TITLE = "headerexpectcontextmenu-grid-title";
-    private static final String HEADEREXPECTCONTEXTMENU_INSERT_COLUMN_LEFT = "headerexpectcontextmenu-insert-column-left";
-    private static final String HEADEREXPECTCONTEXTMENU_INSERT_COLUMN_RIGHT = "headerexpectcontextmenu-insert-column-right";
-    private static final String HEADEREXPECTCONTEXTMENU_DELETE_COLUMN = "headerexpectcontextmenu-delete-column";
-    private static final String HEADEREXPECTCONTEXTMENU_INSERT_ROW_ABOVE = "headerexpectcontextmenu-insert-row-above";
-    private static final String HEADEREXPECTCONTEXTMENU_INSERT_ROW_BELOW = "headerexpectcontextmenu-insert-row-below";
-
-    @PostConstruct
-    @Override
-    public void initMenu() {
-        HEADERCONTEXTMENU_GROUP = HEADEREXPECTCONTEXTMENU_EXPECT;
-        HEADERCONTEXTMENU_GRID_TITLE = HEADEREXPECTCONTEXTMENU_GRID_TITLE;
-        HEADERCONTEXTMENU_INSERT_COLUMN_LEFT = HEADEREXPECTCONTEXTMENU_INSERT_COLUMN_LEFT;
-        HEADERCONTEXTMENU_INSERT_COLUMN_RIGHT = HEADEREXPECTCONTEXTMENU_INSERT_COLUMN_RIGHT;
-        HEADERCONTEXTMENU_DELETE_COLUMN = HEADEREXPECTCONTEXTMENU_DELETE_COLUMN;
-        HEADERCONTEXTMENU_PREPEND_ROW = HEADEREXPECTCONTEXTMENU_INSERT_ROW_ABOVE;
-        HEADERCONTEXTMENU_LABEL = constants.expect().toUpperCase();
-        HEADERCONTEXTMENU_I18N = "expect";
-        super.initMenu();
-    }
-
-    @Override
-    public void show(final GridWidget gridWidget, int mx, int my) {
-        super.show(gridWidget, mx, my);
-        mapEvent(appendColumnElement, new AppendColumnEvent(gridWidget, "EXPECT"));
-        mapEvent(prependColumnElement, new PrependColumnEvent(gridWidget, "EXPECT"));
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/HeaderGivenContextMenu.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/HeaderGivenContextMenu.java
deleted file mode 100644
index 8d3d67c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/HeaderGivenContextMenu.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import java.util.Objects;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.Dependent;
-
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.AppendColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.PrependColumnEvent;
-
-/**
- * The contextual menu of the top level <i>GIVEN</i> group.
- * It differ from <code>GivenContextMenu</code> because it manage column (insert/remove) in different way
- */
-@Dependent
-public class HeaderGivenContextMenu extends AbstractHeaderGroupMenuPresenter {
-
-    protected static final String HEADERGIVENCONTEXTMENU_GIVEN = "headergivencontextmenu-given";
-    protected static final String HEADERGIVENCONTEXTMENU_GRID_TITLE = "headergivencontextmenu-grid-title";
-    protected static final String HEADERGIVENCONTEXTMENU_INSERT_COLUMN_LEFT = "headergivencontextmenu-insert-column-left";
-    protected static final String HEADERGIVENCONTEXTMENU_INSERT_COLUMN_RIGHT = "headergivencontextmenu-insert-column-right";
-    protected static final String HEADERGIVENCONTEXTMENU_DELETE_COLUMN = "headergivencontextmenu-delete-column";
-    protected static final String HEADERGIVENCONTEXTMENU_INSERT_ROW_ABOVE = "headergivencontextmenu-insert-row-above";
-
-    @PostConstruct
-    @Override
-    public void initMenu() {
-        HEADERCONTEXTMENU_GROUP = HEADERGIVENCONTEXTMENU_GIVEN;
-        HEADERCONTEXTMENU_GRID_TITLE = HEADERGIVENCONTEXTMENU_GRID_TITLE;
-        HEADERCONTEXTMENU_INSERT_COLUMN_LEFT = HEADERGIVENCONTEXTMENU_INSERT_COLUMN_LEFT;
-        HEADERCONTEXTMENU_INSERT_COLUMN_RIGHT = HEADERGIVENCONTEXTMENU_INSERT_COLUMN_RIGHT;
-        HEADERCONTEXTMENU_DELETE_COLUMN = HEADERGIVENCONTEXTMENU_DELETE_COLUMN;
-        HEADERCONTEXTMENU_PREPEND_ROW = HEADERGIVENCONTEXTMENU_INSERT_ROW_ABOVE;
-        HEADERCONTEXTMENU_LABEL = constants.given().toUpperCase();
-        HEADERCONTEXTMENU_I18N = "given";
-        super.initMenu();
-    }
-
-    @Override
-    public void show(final GridWidget gridWidget, int mx, int my) {
-        super.show(gridWidget, mx, my);
-        if (Objects.equals(GridWidget.BACKGROUND, gridWidget)) {
-            updateMenuItemAttributes(gridTitleElement , HEADERGIVENCONTEXTMENU_GRID_TITLE, constants.background(), "background");
-        } else if (Objects.equals(GridWidget.SIMULATION, gridWidget)) {
-            updateMenuItemAttributes(gridTitleElement , HEADERGIVENCONTEXTMENU_GRID_TITLE, constants.scenario(), "scenario");
-        }
-        mapEvent(appendColumnElement, new AppendColumnEvent(gridWidget, "GIVEN"));
-        mapEvent(prependColumnElement, new PrependColumnEvent(gridWidget, "GIVEN"));
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/HeaderMenuPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/HeaderMenuPresenter.java
deleted file mode 100644
index 6be48e1..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/HeaderMenuPresenter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-/**
- * This is the first <i>ScenaraioSimulation</i> specific interface - i.e. it is bound to a specific use case. Not every implementation
- * would need this. Menu initialization may be done in other different ways
- */
-public interface HeaderMenuPresenter extends BaseMenuView.BaseMenuPresenter {
-
-    /**
-     * This method is required to initialze the menus
-     */
-    void initMenu();
-    
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemPresenter.java
deleted file mode 100644
index 47b3069..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemPresenter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-
-public class MenuItemPresenter implements MenuItemView.Presenter {
-
-    @Inject
-    protected ViewsProvider viewsProvider;
-
-    @Override
-    public void onClickEvent(ClickEvent event) {
-        event.preventDefault();
-        event.stopPropagation();
-    }
-
-    @Override
-    public LIElement getLabelMenuElement(String id, String label) {
-        MenuItemView menuItemView = viewsProvider.getMenuItemView();
-        menuItemView.setId(id);
-        menuItemView.setLabel(label);
-        menuItemView.setPresenter(this);
-        return menuItemView.getLabelMenuElement();
-    }
-
-    @Override
-    public void onEnableElement(boolean toEnable) {
-
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemView.java
deleted file mode 100644
index 6c79a39..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemView.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-
-public interface MenuItemView {
-
-    interface Presenter {
-
-        /**
-         * This method retrieve a <b>LABEL</b> element (i.e. without behaviour) to be put inside the menu
-         * @param id
-         * @param innerText
-         * @return
-         */
-        LIElement getLabelMenuElement(String id, String innerText);
-
-        void onEnableElement(boolean toEnable);
-
-        void onClickEvent(ClickEvent event);
-    }
-
-    void setPresenter(MenuItemPresenter menuItemPresenter);
-
-    void setId(String id);
-
-    void setDataI18nKey(String dataI18nKey);
-
-    void setLabel(String label);
-
-    /**
-     * This method retrieve a <b>LABEL</b> element (i.e. without behaviour) to be put inside the menu
-     *
-     * @return
-     */
-    LIElement getLabelMenuElement();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemViewImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemViewImpl.html
deleted file mode 100644
index f7ae263..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemViewImpl.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html>
-<!--
-  ~ 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.      
--->
-<li data-field="liElement" id="">
-  <a href="javascript:;">
-    <i class="fa fa-fw" aria-hidden="true"></i>
-    <span data-field="spanElement" data-i18n-key=""></span>
-  </a>
-</li>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemViewImpl.java
deleted file mode 100644
index 12f640e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemViewImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-@Templated
-public class MenuItemViewImpl implements MenuItemView {
-
-    @DataField("liElement")
-    private LIElement liElement = Document.get().createLIElement();
-
-    @DataField("spanElement")
-    private SpanElement spanElement = Document.get().createSpanElement();
-
-    private MenuItemPresenter menuItemPresenter;
-
-    @Override
-    public LIElement getLabelMenuElement() {
-        liElement.addClassName("disabled");
-        return liElement;
-    }
-
-    @Override
-    public void setPresenter(MenuItemPresenter menuItemPresenter) {
-        this.menuItemPresenter = menuItemPresenter;
-    }
-
-    @Override
-    public void setId(String id) {
-        liElement.setId(id);
-    }
-
-    @Override
-    public void setDataI18nKey(String dataI18nKey) {
-        spanElement.setAttribute("data-i18n-key", dataI18nKey);
-    }
-
-    @Override
-    public void setLabel(String label) {
-        String innerHtml = "<b>" + label.toUpperCase() + "</b>";
-        spanElement.setInnerHTML(innerHtml);
-    }
-
-    @EventHandler("liElement")
-    public void onClickEvent(ClickEvent event) {
-        menuItemPresenter.onClickEvent(event);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/OtherContextMenu.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/OtherContextMenu.java
deleted file mode 100644
index d16c860..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/OtherContextMenu.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.Dependent;
-
-/**
- * The contextual menu of the <i>OTHER</i> group (both top level and specific column).
- */
-@Dependent
-public class OtherContextMenu extends AbstractHeaderMenuPresenter {
-
-    // This strings are used to give unique id in the final dom
-    private static final String OTHERCONTEXTMENU_GRID_TITLE = "othercontextmenu-grid-title";
-    private static final String OTHERCONTEXTMENU_INSERT_ROW_ABOVE = "othercontextmenu-insert-row-above";
-
-    @PostConstruct
-    @Override
-    public void initMenu() {
-        HEADERCONTEXTMENU_GRID_TITLE = OTHERCONTEXTMENU_GRID_TITLE;
-        HEADERCONTEXTMENU_PREPEND_ROW = OTHERCONTEXTMENU_INSERT_ROW_ABOVE;
-        super.initMenu();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDMNDataManagementStrategy.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDMNDataManagementStrategy.java
deleted file mode 100644
index 6b7bd52..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDMNDataManagementStrategy.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.strategies;
-
-import java.util.Objects;
-
-import com.google.gwt.event.shared.EventBus;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.UnsupportedDMNEvent;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.uberfire.backend.vfs.Path;
-
-public abstract class AbstractDMNDataManagementStrategy extends AbstractDataManagementStrategy {
-
-    protected final EventBus eventBus;
-    protected Path currentPath;
-    protected String dmnFilePath;
-
-    protected AbstractDMNDataManagementStrategy(EventBus eventBus) {
-        this.eventBus = eventBus;
-    }
-
-    protected abstract void retrieveFactModelTuple(final TestToolsView.Presenter testToolsPresenter,
-                                                   final ScenarioSimulationContext context,
-                                                   final GridWidget gridWidget);
-
-    @Override
-    public void populateTestTools(final TestToolsView.Presenter testToolsPresenter,
-                                  final ScenarioSimulationContext context,
-                                  final GridWidget gridWidget) {
-        if (factModelTreeHolder.getFactModelTuple() != null && Objects.equals(dmnFilePath, model.getSettings().getDmnFilePath())) {
-            getSuccessCallback(testToolsPresenter, context, gridWidget).callback(factModelTreeHolder.getFactModelTuple());
-        } else {
-            dmnFilePath = model.getSettings().getDmnFilePath();
-            retrieveFactModelTuple(testToolsPresenter, context, gridWidget);
-        }
-    }
-
-    @Override
-    public boolean isADataType(String value) {
-        return factModelTreeHolder.factModelTuple.getHiddenFacts().keySet().contains(value) || factModelTreeHolder.factModelTuple.getVisibleFacts().keySet().contains(value);
-    }
-
-    public RemoteCallback<FactModelTuple> getSuccessCallback(final TestToolsView.Presenter testToolsPresenter,
-                                                             final ScenarioSimulationContext context,
-                                                             final GridWidget gridWidget) {
-        return factMappingTuple -> getSuccessCallbackMethod(factMappingTuple, testToolsPresenter, context, gridWidget);
-    }
-
-    public void getSuccessCallbackMethod(final FactModelTuple factModelTuple,
-                                         final TestToolsView.Presenter testToolsPresenter,
-                                         final ScenarioSimulationContext context,
-                                         final GridWidget gridWidget) {
-        // Instantiate a map of already assigned properties
-        factModelTreeHolder.setFactModelTuple(factModelTuple);
-        storeData(factModelTuple, testToolsPresenter, context, gridWidget);
-        showErrorsAndCleanupState(factModelTuple);
-    }
-
-    protected void showErrorsAndCleanupState(FactModelTuple factModelTuple) {
-        StringBuilder builder = new StringBuilder();
-        boolean showError = false;
-        if (!factModelTuple.getMultipleNestedCollectionError().isEmpty()) {
-            showError = true;
-            builder.append("Nested collections are not supported! Violated by:<br/>");
-            factModelTuple.getMultipleNestedCollectionError().forEach(error -> builder.append("<b>" + error + "</b><br/>"));
-            builder.append("<br/>");
-        }
-        if (!factModelTuple.getMultipleNestedObjectError().isEmpty()) {
-            showError = true;
-            builder.append("Complex nested objects inside a collection are not supported! Violated by:<br/>");
-            factModelTuple.getMultipleNestedObjectError().forEach(error -> builder.append("<b>" + error + "</b><br/>"));
-        }
-        if (showError) {
-            factModelTuple.getMultipleNestedCollectionError().clear();
-            factModelTuple.getMultipleNestedObjectError().clear();
-            eventBus.fireEvent(new UnsupportedDMNEvent(builder.toString()));
-        }
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDMODataManagementStrategy.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDMODataManagementStrategy.java
deleted file mode 100644
index c279684..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDMODataManagementStrategy.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.strategies;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
-
-import org.drools.scenariosimulation.api.utils.ConstantsHolder;
-import org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.drools.workbench.screens.scenariosimulation.model.dmo.ModelField;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-import org.uberfire.client.callbacks.Callback;
-
-public abstract class AbstractDMODataManagementStrategy extends AbstractDataManagementStrategy {
-
-    //Package for which this Scenario Simulation relates
-    protected String packageName = "";
-
-    protected abstract String getFQCNByFactName(String factName);
-
-    protected abstract String getParametricFieldType(String factName, String propertyName);
-
-    protected abstract List<String> getFactTypes();
-
-    protected abstract void getSuperType(String factType, Callback<String> callback);
-
-    protected abstract boolean skipPopulateTestTools();
-
-    protected abstract void manageDataObjects(final List<String> dataObjectsTypes,
-                                              final Map<String, String> superTypeMap,
-                                              final TestToolsView.Presenter testToolsPresenter,
-                                              final int expectedElements,
-                                              final SortedMap<String, FactModelTree> dataObjectsFieldsMap,
-                                              final ScenarioSimulationContext context,
-                                              final List<String> simpleJavaTypes,
-                                              final GridWidget gridWidget);
-
-    @Override
-    public void populateTestTools(final TestToolsView.Presenter testToolsPresenter,
-                                  final ScenarioSimulationContext context,
-                                  final GridWidget gridWidget) {
-        if (factModelTreeHolder.getFactModelTuple() != null) {
-            storeData(factModelTreeHolder.getFactModelTuple(), testToolsPresenter, context, gridWidget);
-        } else {
-            if (skipPopulateTestTools()) {
-                testToolsPresenter.hideInstances();
-                return;
-            }
-            // Retrieve the relevant facttypes
-            List<String> factTypes = getFactTypes();
-
-            // Split the DMO from the Simple Java types
-            final Map<Boolean, List<String>> partitionedFactTypes = factTypes.stream()
-                    .collect(Collectors.partitioningBy(factType -> SIMPLE_CLASSES_MAP.keySet().contains(factType)));
-
-            final List<String> dataObjectsTypes = partitionedFactTypes.get(false);
-            final List<String> simpleJavaTypes = partitionedFactTypes.get(true);
-            int expectedElements = dataObjectsTypes.size();
-            // Instantiate a dataObjects container map
-            final SortedMap<String, FactModelTree> dataObjectsFieldsMap = new TreeMap<>();
-            final Map<String, String> superTypesMap = new HashMap<>();
-            if (dataObjectsTypes.isEmpty()) { // Add to manage the situation when no complex objects are present
-                aggregatorCallbackMethod(testToolsPresenter, expectedElements, dataObjectsFieldsMap, context, null, simpleJavaTypes, gridWidget);
-            } else {
-                loadSuperTypes(dataObjectsTypes, testToolsPresenter, expectedElements, dataObjectsFieldsMap, superTypesMap, context, simpleJavaTypes, gridWidget);
-            }
-        }
-    }
-
-    protected void loadSuperTypes(final List<String> dataObjectsTypes,
-                                  final TestToolsView.Presenter testToolsPresenter,
-                                  final int expectedElements,
-                                  final SortedMap<String, FactModelTree> dataObjectsFieldsMap,
-                                  final Map<String, String> superTypesMap,
-                                  final ScenarioSimulationContext context,
-                                  final List<String> simpleJavaTypes,
-                                  final GridWidget gridWidget) {
-        dataObjectsTypes.forEach(factType -> getSuperType(factType, superTypeAggregatorCallBack(dataObjectsTypes,
-                                                                                                superTypesMap,
-                                                                                                testToolsPresenter,
-                                                                                                expectedElements,
-                                                                                                dataObjectsFieldsMap,
-                                                                                                context,
-                                                                                                simpleJavaTypes,
-                                                                                                gridWidget,
-                                                                                                factType)));
-    }
-
-    /**
-     * This method returns a Callback required when calling <code>getSuperType</code> method.
-     * Basically, its aim to to join all the asynchronous calls done previously calling
-     * <code>getSuperType</code> methods.
-     * @param dataObjectsTypes
-     * @param superTypeMap
-     * @param testToolsPresenter
-     * @param expectedElements
-     * @param dataObjectsFieldsMap
-     * @param context
-     * @param simpleJavaTypes
-     * @param gridWidget
-     * @param factType
-     * @return
-     */
-    protected Callback<String> superTypeAggregatorCallBack(final List<String> dataObjectsTypes,
-                                                           final Map<String, String> superTypeMap,
-                                                           final TestToolsView.Presenter testToolsPresenter,
-                                                           final int expectedElements,
-                                                           final SortedMap<String, FactModelTree> dataObjectsFieldsMap,
-                                                           final ScenarioSimulationContext context,
-                                                           final List<String> simpleJavaTypes,
-                                                           final GridWidget gridWidget,
-                                                           final String factType) {
-        return superType -> {
-            superTypeMap.put(factType, superType);
-            /* This is used to invoke this callback only once, when all the expected superclasses
-               of the expected factTypes have been managed */
-            if (superTypeMap.size() == expectedElements) {
-                manageDataObjects(dataObjectsTypes, superTypeMap, testToolsPresenter, expectedElements, dataObjectsFieldsMap, context, simpleJavaTypes, gridWidget);
-            }
-        };
-    }
-
-    /**
-     * Create a <code>FactModelTree</code> for a given <b>factName</b> populating it with the given
-     * <code>ModelField[]</code>
-     * @param factName
-     * @param superTypeMap
-     * @param modelFields
-     * @return
-     * @implNote For the moment being, due to current implementation of <b>DMO</b>, it it not possible to retrieve <b>all</b>
-     * the generic types of a class with more then one, but only the last one. So, for <code>Map</code>, the <b>key</b>
-     * will always be a <code>java.lang.String</code>
-     */
-    public FactModelTree getFactModelTree(String factName, Map<String, String> superTypeMap, ModelField[] modelFields) {
-        Map<String, FactModelTree.PropertyTypeName> simpleProperties = new HashMap<>();
-        Map<String, List<String>> genericTypesMap = new HashMap<>();
-        String fullFactClassName = getFQCNByFactName(factName);
-        String factPackageName = packageName;
-        String factClassName = fullFactClassName;
-        if (fullFactClassName != null && fullFactClassName.contains(".")) {
-            factPackageName = fullFactClassName.substring(0, fullFactClassName.lastIndexOf('.'));
-            factClassName = fullFactClassName.substring(fullFactClassName.lastIndexOf('.') + 1);
-        }
-        if (ScenarioSimulationSharedUtils.isEnumCanonicalName(superTypeMap.get(factName))) {
-            simpleProperties.put(ConstantsHolder.VALUE, new FactModelTree.PropertyTypeName(fullFactClassName));
-            return getSimpleClassFactModelTree(factName, fullFactClassName);
-        }
-
-        for (ModelField modelField : modelFields) {
-            if (!modelField.getName().equals("this")) {
-                String className = defineClassNameField(modelField.getClassName(), superTypeMap);
-                simpleProperties.put(modelField.getName(), new FactModelTree.PropertyTypeName(className));
-                if (ScenarioSimulationSharedUtils.isCollectionOrMap(className)) {
-                    populateGenericTypeMap(genericTypesMap, factName, modelField.getName(), ScenarioSimulationSharedUtils.isList(className));
-                }
-            }
-        }
-        return FactModelTree.ofDMO(factName, factPackageName, simpleProperties, genericTypesMap, factClassName);
-    }
-
-    protected String defineClassNameField(String modelFieldClassName, Map<String, String> superTypesMap) {
-        if (SIMPLE_CLASSES_MAP.containsKey(modelFieldClassName)) {
-            return SIMPLE_CLASSES_MAP.get(modelFieldClassName).getCanonicalName();
-        }
-        if (ScenarioSimulationSharedUtils.isEnumCanonicalName(superTypesMap.get(modelFieldClassName))) {
-            return getFQCNByFactName(modelFieldClassName);
-        }
-        return modelFieldClassName;
-    }
-
-    /**
-     * Populate the given <code>Map</code> with the generic type(s) of given property.
-     * If <code>isList</code> is false, the first generic will be <b>java.lang.String</b>
-     * @param toPopulate
-     * @param factName
-     * @param propertyName
-     * @param isList
-     * @implNote due to current DMO implementation, it is not possible to retrieve <b>all</b> generic types of a given class, but only the last one; for the moment being, the generic type
-     * for <code>Map</code> will be <b>java.lang.String</b>
-     */
-    public void populateGenericTypeMap(Map<String, List<String>> toPopulate, String factName, String propertyName, boolean isList) {
-        List<String> genericTypes = new ArrayList<>();
-        if (!isList) {
-            genericTypes.add(String.class.getName());
-        }
-        String genericInfo = getParametricFieldType(factName, propertyName);
-        String fullGenericInfoClassName = getFQCNByFactName(genericInfo);
-        genericTypes.add(fullGenericInfoClassName);
-        toPopulate.put(propertyName, genericTypes);
-    }
-
-    /**
-     * Actual code of the <b>aggregatorCallback</b>; isolated for testing
-     * @param testToolsPresenter
-     * @param expectedElements
-     * @param factTypeFieldsMap
-     * @param context
-     * @param result pass <code>null</code> if there is not any <i>complex</i> data object but only simple ones
-     * @param simpleJavaTypes
-     */
-    public void aggregatorCallbackMethod(final TestToolsView.Presenter testToolsPresenter,
-                                         final int expectedElements,
-                                         final SortedMap<String, FactModelTree> factTypeFieldsMap,
-                                         final ScenarioSimulationContext context,
-                                         final FactModelTree result,
-                                         final List<String> simpleJavaTypes,
-                                         final GridWidget gridWidget) {
-        if (result != null) {
-            factTypeFieldsMap.put(result.getFactName(), result);
-        }
-        if (factTypeFieldsMap.size() == expectedElements) { // This is used to invoke this callback only once, when all the expected "complex" objects has been managed
-            factTypeFieldsMap.values().forEach(factModelTree -> populateFactModelTree(factModelTree, factTypeFieldsMap));
-            SortedMap<String, FactModelTree> simpleJavaTypeFieldsMap =
-                    new TreeMap<>(simpleJavaTypes.stream()
-                                          .collect(Collectors.toMap(
-                                                  factType -> factType,
-                                                  factType -> {
-                                                      SimpleClassEntry classEntry = SIMPLE_CLASSES_MAP.get(factType);
-                                                      return getSimpleClassFactModelTree(classEntry.getSimpleName(), classEntry.getCanonicalName());
-                                                  })));
-
-            SortedMap<String, FactModelTree> visibleFacts = new TreeMap<>(factTypeFieldsMap);
-            visibleFacts.putAll(simpleJavaTypeFieldsMap);
-            FactModelTuple factModelTuple = new FactModelTuple(visibleFacts, new TreeMap<>());
-            factModelTreeHolder.setFactModelTuple(factModelTuple);
-            storeData(factModelTuple, testToolsPresenter, context, gridWidget);
-        }
-    }
-
-    /**
-     * This method replace a <b>simple property</b> from the given <code>FactModelTree</code> and replace it with
-     * an <b>expandable property</b> <code>FactModelTree</code> from the given  <b>factTypeFieldsMap</b>, if a matching
-     * element exists.
-     * @param toPopulate
-     * @param factTypeFieldsMap
-     */
-    public void populateFactModelTree(FactModelTree toPopulate, final SortedMap<String, FactModelTree> factTypeFieldsMap) {
-        List<String> toRemove = new ArrayList<>();
-        toPopulate.getSimpleProperties().forEach((key, value) -> {
-            if (factTypeFieldsMap.containsKey(value.getTypeName())) {
-                toRemove.add(key);
-                toPopulate.addExpandableProperty(key, factTypeFieldsMap.get(value.getTypeName()).getFactName());
-            }
-        });
-        toRemove.forEach(toPopulate::removeSimpleProperty);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDataManagementStrategy.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDataManagementStrategy.java
deleted file mode 100644
index 3bbc716..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDataManagementStrategy.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.strategies;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
-
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.ExpressionElement;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.models.AbstractScesimGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsPresenterData;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-
-/**
- * Abstract class to provide common methods to be used by actual implementations.
- */
-public abstract class AbstractDataManagementStrategy implements DataManagementStrategy {
-
-    protected ScenarioSimulationModel model;
-    protected ResultHolder factModelTreeHolder = new ResultHolder();
-
-    @Override
-    public void setModel(ScenarioSimulationModel model) {
-        this.model = model;
-    }
-
-    /**
-     * It creates a FactModelTree for a Simple Class Fact.
-     * @param classSimpleName The class simple name (eg. for 'com.Test' is 'Test'. For 'com.Test.Nested' is 'Test.Nested')
-     * @param fullClassName The class simple name (eg. for 'com.Test' or 'com.Test$Nested')
-     * @return
-     */
-    public static FactModelTree getSimpleClassFactModelTree(String classSimpleName, String fullClassName) {
-        String packageName = fullClassName.substring(0, fullClassName.lastIndexOf('.'));
-        String factClassName = fullClassName.substring(fullClassName.lastIndexOf('.') + 1);
-        return FactModelTree.ofSimpleDMO(classSimpleName, packageName, fullClassName, factClassName);
-    }
-
-    /**
-     * This method returns a <code>Map</code> with the properties of a given <b>Type</b> (Fact, class, other dmn defined) instance,
-     * to be hidden from the right panel.
-     * key: the name of the Fact class (ex. Author), value: list of properties to hide from right panel
-     * If click happen on an already assigned property, <b>all</b> all the properties of given type should be shown;
-     * if, instead, click is on an unassigned property, the already assigned properties must be hidden.
-     * (e.g. inside GIVEN there is an "Author" group; if clicking on "books" property header, the <b>value</b> of the <code>Map</code> returned by this method is an <b>empty</b> <code>List</code>;
-     * if click is on an unassigned property column, the <b>value</b> of the <code>Map</code> returned by this method is a <code>List</code>.
-     * with all the <b>already assigned</b> Author's properties)
-     * @param abstractScesimGridModel
-     * @return
-     */
-    public <T extends AbstractScesimModel<E>, E extends AbstractScesimData> Map<String, List<List<String>>> getPropertiesToHide(AbstractScesimGridModel<T, E> abstractScesimGridModel) {
-        final Map<String, List<List<String>>> toReturn = new HashMap<>();
-        final ScenarioGridColumn selectedColumn = (ScenarioGridColumn) abstractScesimGridModel.getSelectedColumn();
-        if (selectedColumn != null && selectedColumn.isInstanceAssigned()) {
-            toReturn.put(selectedColumn.getInformationHeaderMetaData().getTitle(), getPropertiesToHide(selectedColumn, abstractScesimGridModel));
-        }
-        return toReturn;
-    }
-
-    /**
-     * This method returns a <code>List</code> with the properties of a given <b>Type</b> (Fact, class, other dmn defined) instance,
-     * to be hidden from the right panel for the selected column.
-     * <p>
-     * If click happen on an already assigned property, <b>all</b> all the properties of given type should be shown;
-     * if, instead, click is on an unassigned property, the already assigned properties must be hidden.
-     * (e.g. inside GIVEN there is an "Author" group; if clicking on "books" property header, this method returns  an <b>empty</b> <code>List</code>;
-     * if click is on an unassigned property column, this method returns a <code>List</code>.
-     * with all the <b>already assigned</b> Author's properties)
-     * @param selectedColumn
-     * @param abstractScesimGridModel
-     * @return
-     */
-    protected <T extends AbstractScesimModel<E>, E extends AbstractScesimData> List<List<String>> getPropertiesToHide(ScenarioGridColumn selectedColumn, AbstractScesimGridModel<T, E> abstractScesimGridModel) {
-        List<List<String>> toReturn = new ArrayList<>();
-        if (!selectedColumn.isPropertyAssigned()) {
-            abstractScesimGridModel.getAbstractScesimModel().ifPresent(simulation -> {
-                final ScesimModelDescriptor simulationDescriptor = simulation.getScesimModelDescriptor();
-                List<ScenarioGridColumn> instanceColumns = abstractScesimGridModel.getInstanceScenarioGridColumns(selectedColumn);
-                toReturn.addAll(instanceColumns.stream()
-                                        .filter(ScenarioGridColumn::isPropertyAssigned)
-                                        .map(instanceColumn -> abstractScesimGridModel.getColumns().indexOf(instanceColumn))
-                                        .map(columnIndex -> {
-                                            List<String> propertyNameElements = simulationDescriptor.getFactMappingByIndex(columnIndex).getExpressionElementsWithoutClass()
-                                                    .stream()
-                                                    .map(ExpressionElement::getStep)
-                                                    .collect(Collectors.toList());
-                                            if (propertyNameElements.isEmpty()) {
-                                                propertyNameElements.add(VALUE);
-                                            }
-                                            return Collections.unmodifiableList(propertyNameElements);
-                                        })
-                                        .collect(Collectors.toList()));
-            });
-        }
-        return toReturn;
-    }
-
-    /**
-     * Store data in required target objects
-     */
-    public void storeData(final FactModelTuple factModelTuple,
-                          final TestToolsView.Presenter testToolsPresenter,
-                          final ScenarioSimulationContext context,
-                          final GridWidget gridWidget) {
-        // Instantiate a map of already assigned properties
-        final Map<String, List<List<String>>> propertiesToHide = getPropertiesToHide(context.getAbstractScesimGridModelByGridWidget(gridWidget));
-        final SortedMap<String, FactModelTree> visibleFacts = factModelTuple.getVisibleFacts();
-        final Map<Boolean, List<Map.Entry<String, FactModelTree>>> partitionBy = visibleFacts.entrySet().stream()
-                .collect(Collectors.partitioningBy(stringFactModelTreeEntry -> stringFactModelTreeEntry.getValue().isSimple()));
-        final SortedMap<String, FactModelTree> complexDataObjects = new TreeMap<>(partitionBy.get(false).stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
-        final SortedMap<String, FactModelTree> simpleDataObjects = new TreeMap<>(partitionBy.get(true).stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
-
-        // Update context
-        SortedMap<String, FactModelTree> dataObjectFieldsMap = new TreeMap<>();
-        dataObjectFieldsMap.putAll(visibleFacts);
-        dataObjectFieldsMap.putAll(factModelTuple.getHiddenFacts());
-        context.setDataObjectFieldsMap(dataObjectFieldsMap);
-        // Update model
-        // Avoid Collections.emptySortedMap() due to "The method emptySortedMap() is undefined for the type Collections" error
-        SortedMap<String, FactModelTree> instanceFieldsMap = new TreeMap<>();
-        SortedMap<String, FactModelTree> simpleJavaTypeInstanceFieldsMap = new TreeMap<>();
-        if (GridWidget.SIMULATION.equals(gridWidget)) {
-            instanceFieldsMap = getInstanceMap(complexDataObjects);
-            simpleJavaTypeInstanceFieldsMap = getInstanceMap(simpleDataObjects);
-            Set<String> dataObjectsInstancesName = new HashSet<>(visibleFacts.keySet());
-            dataObjectsInstancesName.addAll(instanceFieldsMap.keySet());
-            context.setDataObjectsInstancesName(dataObjectsInstancesName);
-            Set<String> simpleJavaTypeInstancesName = new HashSet<>(simpleDataObjects.keySet());
-            simpleJavaTypeInstancesName.addAll(simpleJavaTypeInstanceFieldsMap.keySet());
-            context.getAbstractScesimGridModelByGridWidget(gridWidget).setSimpleJavaTypeInstancesName(simpleJavaTypeInstancesName);
-        }
-        // Update right panel
-        TestToolsPresenterData testToolsPresenterData = new TestToolsPresenterData(complexDataObjects,
-                                                                                   simpleDataObjects,
-                                                                                   instanceFieldsMap,
-                                                                                   simpleJavaTypeInstanceFieldsMap,
-                                                                                   factModelTuple.getHiddenFacts(),
-                                                                                   propertiesToHide,
-                                                                                   gridWidget);
-        testToolsPresenter.populateTestTools(testToolsPresenterData);
-    }
-
-    /**
-     * Returns a <code>Map</code> of the <b>instances</b> as defined in the grid and the mapped <code>FactModelTree</code>
-     * @param sourceMap
-     * @return
-     */
-    public SortedMap<String, FactModelTree> getInstanceMap(SortedMap<String, FactModelTree> sourceMap) {
-        SortedMap<String, FactModelTree> toReturn = new TreeMap<>();
-        // map instance name to base class
-        if (model != null) {
-            final ScesimModelDescriptor simulationDescriptor = model.getSimulation().getScesimModelDescriptor();
-            final ScenarioSimulationModel.Type type = model.getSettings().getType();
-            simulationDescriptor.getUnmodifiableFactMappings()
-                    .stream()
-                    .filter(factMapping -> !Objects.equals(FactMappingType.OTHER, factMapping.getExpressionIdentifier().getType()))
-                    .forEach(factMapping -> {
-                        String dataObjectName = ScenarioSimulationModel.Type.DMN.equals(type) ?
-                                factMapping.getFactIdentifier().getClassName() :
-                                factMapping.getFactIdentifier().getClassNameWithoutPackage().replace("$", ".");
-                        final String instanceName = factMapping.getFactAlias();
-                        if (!instanceName.equals(dataObjectName)) {
-                            final FactModelTree factModelTree = sourceMap.get(dataObjectName);
-                            if (factModelTree != null) {
-                                toReturn.put(instanceName, factModelTree);
-                            }
-                        }
-                    });
-        }
-        return toReturn;
-    }
-
-    public static class ResultHolder {
-
-        FactModelTuple factModelTuple;
-
-        public FactModelTuple getFactModelTuple() {
-            return factModelTuple;
-        }
-
-        public void setFactModelTuple(FactModelTuple factModelTuple) {
-            this.factModelTuple = factModelTuple;
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/DataManagementStrategy.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/DataManagementStrategy.java
deleted file mode 100644
index 1d1aa9d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/DataManagementStrategy.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.strategies;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.LOCALDATETIME_CANONICAL_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.LOCALDATETIME_SIMPLE_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.LOCALDATE_CANONICAL_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.LOCALDATE_SIMPLE_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.LOCALTIME_CANONICAL_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.LOCALTIME_SIMPLE_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.OFFSETDATETIME_CANONICAL_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.OFFSETDATETIME_SIMPLE_NAME;
-
-/**
- * The <b>Strategy</b> to use to manage/modify/save data inside the editor.
- * Every actual implementation should provide methods to manage a specific kind of data source (ex. RULE, DMN)
- */
-public interface DataManagementStrategy {
-
-    Map<String, SimpleClassEntry> SIMPLE_CLASSES_MAP = Collections.unmodifiableMap(Stream.of(
-            new AbstractMap.SimpleEntry<>(ArrayList.class.getSimpleName(), new SimpleClassEntry(ArrayList.class)),
-            new AbstractMap.SimpleEntry<>(BigDecimal.class.getSimpleName(), new SimpleClassEntry(BigDecimal.class)),
-            new AbstractMap.SimpleEntry<>(BigInteger.class.getSimpleName(), new SimpleClassEntry(BigInteger.class)),
-            new AbstractMap.SimpleEntry<>(Boolean.class.getSimpleName(), new SimpleClassEntry(Boolean.class)),
-            new AbstractMap.SimpleEntry<>(Byte.class.getSimpleName(), new SimpleClassEntry(Byte.class)),
-            new AbstractMap.SimpleEntry<>(Character.class.getSimpleName(), new SimpleClassEntry(Character.class)),
-            new AbstractMap.SimpleEntry<>(Collection.class.getSimpleName(), new SimpleClassEntry(Collection.class)),
-            new AbstractMap.SimpleEntry<>(Date.class.getSimpleName(), new SimpleClassEntry(Date.class)),
-            new AbstractMap.SimpleEntry<>(Double.class.getSimpleName(), new SimpleClassEntry(Double.class)),
-            new AbstractMap.SimpleEntry<>(Float.class.getSimpleName(), new SimpleClassEntry(Float.class)),
-            new AbstractMap.SimpleEntry<>(HashMap.class.getSimpleName(), new SimpleClassEntry(HashMap.class)),
-            new AbstractMap.SimpleEntry<>(Integer.class.getSimpleName(), new SimpleClassEntry(Integer.class)),
-            new AbstractMap.SimpleEntry<>(LinkedList.class.getSimpleName(), new SimpleClassEntry(LinkedList.class)),
-            new AbstractMap.SimpleEntry<>(LinkedHashMap.class.getSimpleName(), new SimpleClassEntry(LinkedHashMap.class)),
-            new AbstractMap.SimpleEntry<>(List.class.getSimpleName(), new SimpleClassEntry(List.class)),
-            new AbstractMap.SimpleEntry<>(Long.class.getSimpleName(), new SimpleClassEntry(Long.class)),
-            new AbstractMap.SimpleEntry<>(Map.class.getSimpleName(), new SimpleClassEntry(Map.class)),
-            new AbstractMap.SimpleEntry<>(Number.class.getSimpleName(), new SimpleClassEntry(Number.class)),
-            new AbstractMap.SimpleEntry<>(Object.class.getSimpleName(), new SimpleClassEntry(Object.class)),
-            new AbstractMap.SimpleEntry<>(Short.class.getSimpleName(), new SimpleClassEntry(Short.class)),
-            new AbstractMap.SimpleEntry<>(String.class.getSimpleName(), new SimpleClassEntry(String.class)),
-            new AbstractMap.SimpleEntry<>(TreeMap.class.getSimpleName(), new SimpleClassEntry(TreeMap.class)),
-            // java.time (JSR-310) is not supported by GWT, therefore LocalDate and LocaleDateTime are not natively
-            new AbstractMap.SimpleEntry<>(LOCALDATE_SIMPLE_NAME, new SimpleClassEntry(LOCALDATE_SIMPLE_NAME, LOCALDATE_CANONICAL_NAME)),
-            new AbstractMap.SimpleEntry<>(LOCALTIME_SIMPLE_NAME, new SimpleClassEntry(LOCALTIME_SIMPLE_NAME, LOCALTIME_CANONICAL_NAME)),
-            new AbstractMap.SimpleEntry<>(LOCALDATETIME_SIMPLE_NAME, new SimpleClassEntry(LOCALDATETIME_SIMPLE_NAME, LOCALDATETIME_CANONICAL_NAME)),
-            new AbstractMap.SimpleEntry<>(OFFSETDATETIME_SIMPLE_NAME, new SimpleClassEntry(OFFSETDATETIME_SIMPLE_NAME, OFFSETDATETIME_CANONICAL_NAME))).
-            collect(Collectors.toMap(AbstractMap.SimpleEntry::getKey, AbstractMap.SimpleEntry::getValue)));
-
-    void populateTestTools(final TestToolsView.Presenter testToolsPresenter, final ScenarioSimulationContext context, final GridWidget gridWidget);
-
-    void setModel(ScenarioSimulationModel model);
-
-    /**
-     * Returns <code>true</code> if the given value is a <b>data</b> type (e.g. a <b>FactType</b> for DMO)
-     * @param value
-     * @return
-     */
-    boolean isADataType(String value);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/SimpleClassEntry.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/SimpleClassEntry.java
deleted file mode 100644
index c32d94b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/SimpleClassEntry.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.strategies;
-
-public class SimpleClassEntry {
-
-    private final String simpleName;
-    private final String canonicalName;
-
-    public SimpleClassEntry(Class<?> clazz) {
-        this(clazz.getSimpleName(), clazz.getCanonicalName());
-    }
-
-    public SimpleClassEntry(String simpleName, String canonicalName) {
-        this.simpleName = simpleName;
-        this.canonicalName = canonicalName;
-    }
-
-    public String getSimpleName() {
-        return simpleName;
-    }
-
-    public String getCanonicalName() {
-        return canonicalName;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/enums/GridWidget.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/enums/GridWidget.java
deleted file mode 100644
index b32a893..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/enums/GridWidget.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.enums;
-
-public enum GridWidget {
-    SIMULATION,
-    BACKGROUND;
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/AppendColumnEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/AppendColumnEvent.java
deleted file mode 100644
index a43fa1c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/AppendColumnEvent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.AppendColumnEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>append</b> (i.e. put in the last position) a column to a given <i>group</i>
- */
-public class AppendColumnEvent extends GwtEvent<AppendColumnEventHandler> {
-
-    public static final Type<AppendColumnEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-    private final String columnGroup;
-
-    /**
-     *
-     * @param gridWidget
-     * @param columnGroup
-     */
-    public AppendColumnEvent(GridWidget gridWidget, String columnGroup) {
-        this.gridWidget = gridWidget;
-        this.columnGroup = columnGroup;
-    }
-
-    @Override
-    public Type<AppendColumnEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    @Override
-    protected void dispatch(AppendColumnEventHandler handler) {
-        handler.onEvent(this);
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public String getColumnGroup() {
-        return columnGroup;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/AppendRowEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/AppendRowEvent.java
deleted file mode 100644
index 49ee7f7..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/AppendRowEvent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.AppendRowEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>append</b> (i.e. put in the last position) a row
- */
-public class AppendRowEvent extends GwtEvent<AppendRowEventHandler> {
-
-    public static final Type<AppendRowEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-
-    /**
-     *
-     * @param gridWidget
-     */
-    public AppendRowEvent(GridWidget gridWidget) {
-        this.gridWidget = gridWidget;
-    }
-
-    @Override
-    public Type<AppendRowEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    @Override
-    protected void dispatch(AppendRowEventHandler handler) {
-        handler.onEvent(this);
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/CloseCompositeEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/CloseCompositeEvent.java
deleted file mode 100644
index e293d3e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/CloseCompositeEvent.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.dom.client.DomEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.CloseCompositeEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>close</b> a <code>Composite</code>
- */
-public class CloseCompositeEvent extends DomEvent<CloseCompositeEventHandler> {
-
-    /**
-     * Event type for closeComposite events. Represents the meta-data associated with this
-     * event.
-     */
-    private static final Type<CloseCompositeEventHandler> TYPE = new Type<>("close_composite", new CloseCompositeEvent());
-
-    /**
-     * Gets the event type associated with closeComposite events.
-     * @return the handler type
-     */
-    public static Type<CloseCompositeEventHandler> getType() {
-        return TYPE;
-    }
-
-    @Override
-    public Type<CloseCompositeEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    @Override
-    protected void dispatch(CloseCompositeEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DeleteColumnEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DeleteColumnEvent.java
deleted file mode 100644
index 09aed3c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DeleteColumnEvent.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.DeleteColumnEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>delete</b> a column
- */
-public class DeleteColumnEvent extends GwtEvent<DeleteColumnEventHandler> {
-
-    public static final Type<DeleteColumnEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-    private final int columnIndex;
-    private final String columnGroup;
-    private final boolean asProperty;
-
-    /**
-     *
-     * @param gridWidget
-     * @param columnIndex
-     * @param columnGroup
-     * @param asProperty asProperty when <code>true</code> it delete only the column, when <code>false</code> it deletes the whole instance
-     */
-    public DeleteColumnEvent(GridWidget gridWidget, int columnIndex, String columnGroup, boolean asProperty) {
-        this.gridWidget = gridWidget;
-        this.columnIndex = columnIndex;
-        this.columnGroup = columnGroup;
-        this.asProperty = asProperty;
-    }
-
-    @Override
-    public Type<DeleteColumnEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public int getColumnIndex() {
-        return columnIndex;
-    }
-
-    public String getColumnGroup() {
-        return columnGroup;
-    }
-
-    public boolean isAsProperty() {
-        return asProperty;
-    }
-
-    @Override
-    protected void dispatch(DeleteColumnEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DeleteRowEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DeleteRowEvent.java
deleted file mode 100644
index daff72d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DeleteRowEvent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.DeleteRowEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>delete</b> a row
- */
-public class DeleteRowEvent extends GwtEvent<DeleteRowEventHandler> {
-
-    public static final Type<DeleteRowEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-    private final int rowIndex;
-
-    /**
-     *
-     * @param gridWidget
-     * @param rowIndex
-     */
-    public DeleteRowEvent(GridWidget gridWidget, int rowIndex) {
-        this.gridWidget = gridWidget;
-        this.rowIndex = rowIndex;
-    }
-
-    @Override
-    public Type<DeleteRowEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public int getRowIndex() {
-        return rowIndex;
-    }
-
-    @Override
-    protected void dispatch(DeleteRowEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DisableTestToolsEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DisableTestToolsEvent.java
deleted file mode 100644
index d8d2be2..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DisableTestToolsEvent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.DisableTestToolsEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>disable</b> the <code>TestToolsView</code>
- */
-public class DisableTestToolsEvent extends GwtEvent<DisableTestToolsEventHandler> {
-
-    public static final Type<DisableTestToolsEventHandler> TYPE = new Type<>();
-
-    @Override
-    public Type<DisableTestToolsEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    @Override
-    protected void dispatch(DisableTestToolsEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DuplicateInstanceEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DuplicateInstanceEvent.java
deleted file mode 100644
index 495146a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DuplicateInstanceEvent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.DuplicateInstanceEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>duplicate</b> an instance.
- */
-public class DuplicateInstanceEvent extends GwtEvent<DuplicateInstanceEventHandler> {
-
-    public static final Type<DuplicateInstanceEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-    private final int columnIndex;
-
-    /**
-     *
-     * @param gridWidget
-     * @param columnIndex
-     */
-    public DuplicateInstanceEvent(GridWidget gridWidget, int columnIndex) {
-        this.gridWidget = gridWidget;
-        this.columnIndex = columnIndex;
-    }
-
-    @Override
-    public Type<DuplicateInstanceEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public int getColumnIndex() {
-        return columnIndex;
-    }
-
-    @Override
-    protected void dispatch(DuplicateInstanceEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DuplicateRowEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DuplicateRowEvent.java
deleted file mode 100644
index 600ccb1..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/DuplicateRowEvent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.DuplicateRowEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>duplicate</b> a row
- */
-public class DuplicateRowEvent extends GwtEvent<DuplicateRowEventHandler> {
-
-    public static final Type<DuplicateRowEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-    private final int rowIndex;
-
-    /**
-     *
-     * @param gridWidget
-     * @param rowIndex
-     */
-    public DuplicateRowEvent(GridWidget gridWidget, int rowIndex) {
-        this.gridWidget = gridWidget;
-        this.rowIndex = rowIndex;
-    }
-
-    @Override
-    public Type<DuplicateRowEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public int getRowIndex() {
-        return rowIndex;
-    }
-
-    @Override
-    protected void dispatch(DuplicateRowEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/EnableTestToolsEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/EnableTestToolsEvent.java
deleted file mode 100644
index b98661f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/EnableTestToolsEvent.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import java.util.List;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.EnableTestToolsEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>enable</b> the <code>TestToolsView</code>
- */
-public class EnableTestToolsEvent extends GwtEvent<EnableTestToolsEventHandler> {
-
-    public static final Type<EnableTestToolsEventHandler> TYPE = new Type<>();
-
-    /**
-     * The string to use for filtering in test tools panel
-     */
-    private final String filterTerm;
-
-    /**
-     * flag to decide which kind of filter (<b>equals</b> or <b>not equals</b>) is to be applied.
-     * In addition, this boolean is set to TRUE when the referring column doesn't have an <b>Instance</b> assigned.
-     * Default to false (= <b>equals</b> filter)
-     */
-    private final boolean notEqualsSearch;
-
-    /**
-     * The <code>List</code> to <b>eventually</b> use to select the property in the test tools  panel
-     */
-    private final List<String> propertyNameElements;
-
-    /**
-     * Fire this event to show all the first-level data models <b>enabled</b> (i.e. <b>double-clickable</b> to map to an <i>instance</i> header/column)
-     * and their properties <b>disabled</b> (i.e. <b>not double-clickable</b>)
-     */
-    public EnableTestToolsEvent() {
-        filterTerm = null;
-        notEqualsSearch = false;
-        propertyNameElements = null;
-    }
-
-    /**
-     * Fire this event to show only the data model with the given name, <b>disabled</b> (i.e. <b>not double-clickable</b>)
-     * and their properties <b>enabled</b> (i.e. <b>double-clickable</b> to map to a <i>property</i> header/column below the belonging data model instance one).
-     * It show only results <b>equals</b> to filterTerm
-     * @param filterTerm
-     */
-    public EnableTestToolsEvent(String filterTerm) {
-        this.filterTerm = filterTerm;
-        notEqualsSearch = false;
-        propertyNameElements = null;
-    }
-
-    /**
-     * Fire this event to show only the data model with the given name, <b>disabled</b> (i.e. <b>not double-clickable</b>) and to highlight the given property
-     * and their properties <b>enabled</b> (i.e. <b>double-clickable</b> to map to a <i>property</i> header/column below the belonging data model instance one).
-     * It show only results <b>equals</b> to filterTerm
-     * @param filterTerm
-     * @param propertyNameElements The <code>List</code> to <b>eventually</b> use to select the property in the test tools  panel
-     */
-    public EnableTestToolsEvent(String filterTerm, List<String> propertyNameElements) {
-        this.filterTerm = filterTerm;
-        notEqualsSearch = false;
-        this.propertyNameElements = propertyNameElements;
-    }
-
-    /**
-     * Fire this event to filter the data model with the given name, <b>disabled</b> (i.e. <b>not double-clickable</b>)
-     * and their properties <b>enabled</b> (i.e. <b>double-clickable</b> to map to a <i>property</i> header/column below the belonging data model instance one)
-     * @param
-     * @param notEqualsSearch set to <code>true</code> to perform a <b>not</b> filter, i.e. to show only results <b>different</b> than filterTerm
-     */
-    public EnableTestToolsEvent(String filterTerm, boolean notEqualsSearch) {
-        this.filterTerm = filterTerm;
-        this.notEqualsSearch = notEqualsSearch;
-        propertyNameElements = null;
-    }
-
-    @Override
-    public Type<EnableTestToolsEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public String getFilterTerm() {
-        return filterTerm;
-    }
-
-    public boolean isNotEqualsSearch() {
-        return notEqualsSearch;
-    }
-
-    public List<String> getPropertyNameElements() {
-        return propertyNameElements;
-    }
-
-    @Override
-    protected void dispatch(EnableTestToolsEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ImportEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ImportEvent.java
deleted file mode 100644
index 25913bd..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ImportEvent.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ImportEventHandler;
-
-/**
- * <code>GwtEvent</code> to execute <b>import</b> from file
- */
-public class ImportEvent extends GwtEvent<ImportEventHandler> {
-
-    public static final Type<ImportEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-
-    /**
-     *
-     * @param gridWidget
-     */
-    public ImportEvent(GridWidget gridWidget) {
-        this.gridWidget = gridWidget;
-    }
-
-    @Override
-    public Type<ImportEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    @Override
-    protected void dispatch(ImportEventHandler handler) {
-        handler.onEvent(this);
-    }
-
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/InsertColumnEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/InsertColumnEvent.java
deleted file mode 100644
index d853d83..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/InsertColumnEvent.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.InsertColumnEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>insert</b> a column.
- */
-public class InsertColumnEvent extends GwtEvent<InsertColumnEventHandler> {
-
-    public static final Type<InsertColumnEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-    private final int columnIndex;
-    private final boolean isRight;
-    private final boolean asProperty;
-
-    /**
-     * @param gridWidget
-     * @param columnIndex
-     * @param isRight when <code>true</code>, column will be inserted to the right of the given index (i.e. at position columnIndex +1), otherwise to the left (i.e. at position columnIndex)
-     * @param asProperty when <code>true</code>, column will use the <b>instance</b> header of the original one, so to create a new "property" header under the same instance
-     */
-    public InsertColumnEvent(GridWidget gridWidget, int columnIndex, boolean isRight, boolean asProperty) {
-        this.gridWidget = gridWidget;
-        this.columnIndex = columnIndex;
-        this.isRight = isRight;
-        this.asProperty = asProperty;
-    }
-
-    @Override
-    public Type<InsertColumnEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public int getColumnIndex() {
-        return columnIndex;
-    }
-
-    public boolean isRight() {
-        return isRight;
-    }
-
-    public boolean isAsProperty() {
-        return asProperty;
-    }
-
-    @Override
-    protected void dispatch(InsertColumnEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/InsertRowEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/InsertRowEvent.java
deleted file mode 100644
index 335a93f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/InsertRowEvent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.InsertRowEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>append</b> (i.e. put in the last position) a row
- */
-public class InsertRowEvent extends GwtEvent<InsertRowEventHandler> {
-
-    public static final Type<InsertRowEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-    private final int rowIndex;
-
-    /**
-     *
-     * @param gridWidget
-     * @param rowIndex
-     */
-    public InsertRowEvent(GridWidget gridWidget, int rowIndex) {
-        this.gridWidget = gridWidget;
-        this.rowIndex = rowIndex;
-    }
-
-    @Override
-    public Type<InsertRowEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public int getRowIndex() {
-        return rowIndex;
-    }
-
-    @Override
-    protected void dispatch(InsertRowEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/PrependColumnEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/PrependColumnEvent.java
deleted file mode 100644
index f8f9708..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/PrependColumnEvent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.PrependColumnEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>prepend</b> (i.e. put in the first position) a column to a given <i>group</i>
- */
-public class PrependColumnEvent extends GwtEvent<PrependColumnEventHandler> {
-
-    public static final Type<PrependColumnEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-    private final String columnGroup;
-
-    /**
-     *
-     * @param gridWidget
-     * @param columnGroup
-     */
-    public PrependColumnEvent(GridWidget gridWidget, String columnGroup) {
-        this.gridWidget = gridWidget;
-        this.columnGroup = columnGroup;
-    }
-
-    @Override
-    public Type<PrependColumnEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public String getColumnGroup() {
-        return columnGroup;
-    }
-
-    @Override
-    protected void dispatch(PrependColumnEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/PrependRowEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/PrependRowEvent.java
deleted file mode 100644
index 3c9b460..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/PrependRowEvent.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.PrependRowEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>prepend</b> (i.e. put in the first position) a row
- */
-public class PrependRowEvent extends GwtEvent<PrependRowEventHandler> {
-
-    public static final Type<PrependRowEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-
-    public PrependRowEvent(GridWidget gridWidget) {
-        this.gridWidget = gridWidget;
-    }
-
-    @Override
-    public Type<PrependRowEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    @Override
-    protected void dispatch(PrependRowEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/RedoEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/RedoEvent.java
deleted file mode 100644
index c199d28..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/RedoEvent.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.RedoEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>redo</b> last command
- */
-public class RedoEvent extends GwtEvent<RedoEventHandler> {
-
-    public static final Type<RedoEventHandler> TYPE = new Type<>();
-
-    @Override
-    public Type<RedoEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    @Override
-    protected void dispatch(RedoEventHandler handler) {
-        handler.onEvent(this);
-    }
-
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ReloadTestToolsEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ReloadTestToolsEvent.java
deleted file mode 100644
index 018df8a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ReloadTestToolsEvent.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ReloadTestToolsEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>reload</b> the <code>TestToolsView</code>
- */
-public class ReloadTestToolsEvent extends GwtEvent<ReloadTestToolsEventHandler> {
-
-    public static final Type<ReloadTestToolsEventHandler> TYPE = new Type<>();
-
-    private final boolean disable;
-
-    private final boolean openDock;
-
-    /**
-     * Fire this event to reload the right panel content. With this constructor the dock <b>does not</b> open if it is closed
-     *
-     * @param disable set this to <code>true</code> to <b>also</b> disable the panel.
-     */
-    public ReloadTestToolsEvent(boolean disable) {
-        this.disable = disable;
-        openDock = false;
-    }
-
-    /**
-     * Fire this event to reload the right panel content.
-     *
-     * @param disable set this to <code>true</code> to <b>also</b> disable the panel.
-     * @param openDock set this to <code>true</code> to <b>also</b> open the dock in case it is closed
-     */
-    public ReloadTestToolsEvent(boolean disable, boolean openDock) {
-        this.disable = disable;
-        this.openDock = openDock;
-    }
-
-
-    @Override
-    public Type<ReloadTestToolsEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public boolean isDisable() {
-        return disable;
-    }
-
-    public boolean isOpenDock() {
-        return openDock;
-    }
-
-    @Override
-    protected void dispatch(ReloadTestToolsEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/RunSingleScenarioEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/RunSingleScenarioEvent.java
deleted file mode 100644
index 9e6c5d3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/RunSingleScenarioEvent.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.RunSingleScenarioEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>run</b> a scenario
- */
-public class RunSingleScenarioEvent extends GwtEvent<RunSingleScenarioEventHandler> {
-
-    public static final Type<RunSingleScenarioEventHandler> TYPE = new Type<>();
-
-    private int rowIndex;
-
-    public RunSingleScenarioEvent(int rowIndex) {
-        this.rowIndex = rowIndex;
-    }
-
-    @Override
-    public Type<RunSingleScenarioEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public int getRowIndex() {
-        return rowIndex;
-    }
-
-    @Override
-    protected void dispatch(RunSingleScenarioEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SaveEditorEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SaveEditorEvent.java
deleted file mode 100644
index 3cd5f76..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SaveEditorEvent.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.dom.client.DomEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SaveEditorEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>save</b> the current status of a <code>CollectionEditorDOMElement</code> to grid
- */
-public class SaveEditorEvent extends DomEvent<SaveEditorEventHandler> {
-
-    /**
-     * Event type for closeComposite events. Represents the meta-data associated with this
-     * event.
-     */
-    private static final Type<SaveEditorEventHandler> TYPE = new Type<>("save_editor", new SaveEditorEvent());
-
-    /**
-     * Gets the event type associated with closeComposite events.
-     * @return the handler type
-     */
-    public static Type<SaveEditorEventHandler> getType() {
-        return TYPE;
-    }
-
-    @Override
-    public Type<SaveEditorEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    @Override
-    protected void dispatch(SaveEditorEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ScenarioGridReloadEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ScenarioGridReloadEvent.java
deleted file mode 100644
index d27c4a7..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ScenarioGridReloadEvent.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioGridReloadEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>reload</b> a grid
- */
-public class ScenarioGridReloadEvent extends GwtEvent<ScenarioGridReloadEventHandler> {
-
-    public static final Type<ScenarioGridReloadEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-
-    public ScenarioGridReloadEvent(GridWidget gridWidget) {
-        this.gridWidget = gridWidget;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    @Override
-    public Type<ScenarioGridReloadEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    @Override
-    protected void dispatch(ScenarioGridReloadEventHandler handler) {
-        handler.onEvent(this);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ScenarioInputEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ScenarioInputEvent.java
deleted file mode 100644
index 47fb7bf..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ScenarioInputEvent.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.dom.client.DomEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioInputHandler;
-
-public class ScenarioInputEvent extends DomEvent<ScenarioInputHandler> {
-
-    public static final Type<ScenarioInputHandler> TYPE = new Type<>("input", new ScenarioInputEvent());
-
-    public static Type<ScenarioInputHandler> getType() {
-        return TYPE;
-    }
-
-    @Override
-    public final Type<ScenarioInputHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    @Override
-    protected void dispatch(ScenarioInputHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ScenarioNotificationEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ScenarioNotificationEvent.java
deleted file mode 100644
index 35d5a9d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ScenarioNotificationEvent.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioNotificationEventHandler;
-import org.uberfire.workbench.events.NotificationEvent;
-
-/**
- * <code>GwtEvent</code> to show a notification
- */
-public class ScenarioNotificationEvent extends GwtEvent<ScenarioNotificationEventHandler> {
-
-    public static final Type<ScenarioNotificationEventHandler> TYPE = new Type<>();
-
-    private final String message;
-    private final boolean autoHide;
-    private final org.uberfire.workbench.events.NotificationEvent.NotificationType notificationType;
-
-    public ScenarioNotificationEvent(String message, NotificationEvent.NotificationType type) {
-        this.message = message;
-        this.notificationType = type;
-        this.autoHide = true;
-    }
-
-    public ScenarioNotificationEvent(String message, NotificationEvent.NotificationType type, boolean autoHide) {
-        this.message = message;
-        this.notificationType = type;
-        this.autoHide = autoHide;
-    }
-
-    @Override
-    public Type<ScenarioNotificationEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public boolean isAutoHide() {
-        return autoHide;
-    }
-
-    public NotificationEvent.NotificationType getNotificationType() {
-        return notificationType;
-    }
-
-    @Override
-    protected void dispatch(ScenarioNotificationEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SetGridCellValueEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SetGridCellValueEvent.java
deleted file mode 100644
index 5270247..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SetGridCellValueEvent.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SetGridCellValueEventHandler;
-
-/**
- * <code>GwtEvent</code> to set the <code>GridCellValue</code> at a given rox/column position
- */
-public class SetGridCellValueEvent extends GwtEvent<SetGridCellValueEventHandler> {
-
-    public static final Type<SetGridCellValueEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-    private final int rowIndex;
-    private final int columnIndex;
-    private final String cellValue;
-
-    /**
-     *
-     * @param gridWidget
-     * @param rowIndex
-     * @param columnIndex
-     * @param cellValue
-     */
-    public SetGridCellValueEvent(GridWidget gridWidget, int rowIndex, int columnIndex, String cellValue) {
-        this.gridWidget = gridWidget;
-        this.rowIndex = rowIndex;
-        this.columnIndex = columnIndex;
-        this.cellValue = cellValue;
-    }
-
-    @Override
-    public Type<SetGridCellValueEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public int getRowIndex() {
-        return rowIndex;
-    }
-
-    public int getColumnIndex() {
-        return columnIndex;
-    }
-
-    public String getCellValue() {
-        return cellValue;
-    }
-
-    @Override
-    protected void dispatch(SetGridCellValueEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SetHeaderCellValueEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SetHeaderCellValueEvent.java
deleted file mode 100644
index 13ed9a6..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SetHeaderCellValueEvent.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SetHeaderCellValueEventHandler;
-
-/**
- * <code>GwtEvent</code> to set the <code>GridCellValue</code> at a given rox/column position
- */
-public class SetHeaderCellValueEvent extends GwtEvent<SetHeaderCellValueEventHandler> {
-
-    public static final Type<SetHeaderCellValueEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-    private final int rowIndex;
-    private final int columnIndex;
-    private final String headerCellValue;
-    private final boolean isInstanceHeader;
-    private final boolean isPropertyHeader;
-
-    /**
-     * @param gridWidget
-     * @param rowIndex
-     * @param columnIndex
-     * @param headerCellValue
-     * @param isPropertyHeader set to <code>true</code> if the edited cell is inside the header
-     */
-    public SetHeaderCellValueEvent(GridWidget gridWidget, int rowIndex, int columnIndex, String headerCellValue, boolean isInstanceHeader, boolean isPropertyHeader) {
-        this.gridWidget = gridWidget;
-        this.rowIndex = rowIndex;
-        this.columnIndex = columnIndex;
-        this.headerCellValue = headerCellValue;
-        this.isInstanceHeader = isInstanceHeader;
-        this.isPropertyHeader = isPropertyHeader;
-    }
-
-    @Override
-    public Type<SetHeaderCellValueEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public int getRowIndex() {
-        return rowIndex;
-    }
-
-    public int getColumnIndex() {
-        return columnIndex;
-    }
-
-    public String getHeaderCellValue() {
-        return headerCellValue;
-    }
-
-    public boolean isInstanceHeader() {
-        return isInstanceHeader;
-    }
-
-    public boolean isPropertyHeader() {
-        return isPropertyHeader;
-    }
-
-    @Override
-    protected void dispatch(SetHeaderCellValueEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SetInstanceHeaderEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SetInstanceHeaderEvent.java
deleted file mode 100644
index 00beb06..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SetInstanceHeaderEvent.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SetInstanceHeaderEventHandler;
-
-/**
- * <code>GwtEvent</code> to set the <i>instance</i> level header for a given column
- */
-public class SetInstanceHeaderEvent extends GwtEvent<SetInstanceHeaderEventHandler> {
-
-    public static final Type<SetInstanceHeaderEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-    private final String fullPackage;
-    private final String className;
-
-    /**
-     * Use this constructor to modify the <i>instance</i> level header
-     * @param gridWidget
-     * @param fullPackage
-     * @param className
-     */
-    public SetInstanceHeaderEvent(GridWidget gridWidget, String fullPackage, String className) {
-        this.gridWidget = gridWidget;
-        this.fullPackage = fullPackage;
-        this.className = className;
-    }
-
-    @Override
-    public Type<SetInstanceHeaderEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public String getFullPackage() {
-        return fullPackage;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    @Override
-    protected void dispatch(SetInstanceHeaderEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SetPropertyHeaderEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SetPropertyHeaderEvent.java
deleted file mode 100644
index fed0ca5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/SetPropertyHeaderEvent.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import java.util.List;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SetPropertyHeaderEventHandler;
-
-/**
- * <code>GwtEvent</code> to set the <i>property</i> level header for a given column
- */
-public class SetPropertyHeaderEvent extends GwtEvent<SetPropertyHeaderEventHandler> {
-
-    public static final Type<SetPropertyHeaderEventHandler> TYPE = new Type<>();
-
-    private final GridWidget gridWidget;
-    private final String fullPackage;
-    private final String factType;
-    private final List<String> propertyNameElements;
-    private final String valueClassName;
-    private final FactMappingValueType factMappingValueType;
-    private final String importPrefix;
-
-    /**
-     * Use this constructor to modify the <i>property</i> level header
-     *
-     * @param gridWidget
-     * @param fullPackage
-     * @param propertyNameElements
-     * @param valueClassName
-     * @param factMappingValueType
-     * @param importPrefix
-     */
-    public SetPropertyHeaderEvent(GridWidget gridWidget,
-                                  String fullPackage,
-                                  String factType,
-                                  List<String> propertyNameElements,
-                                  String valueClassName,
-                                  FactMappingValueType factMappingValueType,
-                                  String importPrefix) {
-        this.gridWidget = gridWidget;
-        this.fullPackage = fullPackage;
-        this.factType = factType;
-        this.propertyNameElements = propertyNameElements;
-        this.valueClassName = valueClassName;
-        this.factMappingValueType = factMappingValueType;
-        this.importPrefix = importPrefix;
-    }
-
-    @Override
-    public Type<SetPropertyHeaderEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public String getFullPackage() {
-        return fullPackage;
-    }
-
-    public String getFactType() {
-        return factType;
-    }
-
-    public List<String> getPropertyNameElements() {
-        return propertyNameElements;
-    }
-
-    public String getValueClassName() {
-        return valueClassName;
-    }
-
-    public FactMappingValueType getFactMappingValueType() {
-        return factMappingValueType;
-    }
-
-    public String getImportPrefix() {
-        return importPrefix;
-    }
-
-    @Override
-    protected void dispatch(SetPropertyHeaderEventHandler handler) {
-        handler.onEvent(this);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/UndoEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/UndoEvent.java
deleted file mode 100644
index 14fdc03..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/UndoEvent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.UndoEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>undo</b> last command
- */
-public class UndoEvent extends GwtEvent<UndoEventHandler> {
-
-    public static final Type<UndoEventHandler> TYPE = new Type<>();
-
-    @Override
-    public Type<UndoEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    @Override
-    protected void dispatch(UndoEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/UnsupportedDMNEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/UnsupportedDMNEvent.java
deleted file mode 100644
index c608284..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/UnsupportedDMNEvent.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.UnsupportedDMNEventHandler;
-
-/**
- * <code>GwtEvent</code> to show a notification
- */
-public class UnsupportedDMNEvent extends GwtEvent<UnsupportedDMNEventHandler> {
-
-    public static final Type<UnsupportedDMNEventHandler> TYPE = new Type<>();
-
-    private final String message;
-
-    public UnsupportedDMNEvent(String message) {
-        this.message = message;
-    }
-
-    @Override
-    public Type<UnsupportedDMNEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    @Override
-    protected void dispatch(UnsupportedDMNEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/UpdateSettingsDataEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/UpdateSettingsDataEvent.java
deleted file mode 100644
index e957fea..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/UpdateSettingsDataEvent.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.UpdateSettingsDataEventHandler;
-
-public class UpdateSettingsDataEvent extends GwtEvent<UpdateSettingsDataEventHandler> {
-
-    public static final Type<UpdateSettingsDataEventHandler> TYPE = new Type<>();
-
-    private final Consumer<Settings> settingsChangeToApply;
-    private final Predicate<Settings> settingsValueChanged;
-    private final boolean dmnPathChanged;
-
-    public UpdateSettingsDataEvent(final Consumer<Settings> settingsChangeToApply) {
-        this.settingsChangeToApply = settingsChangeToApply;
-        this.settingsValueChanged = settings -> true;
-        this.dmnPathChanged = false;
-    }
-
-    public UpdateSettingsDataEvent(final Consumer<Settings> settingsChangeToApply,
-                                   final Predicate<Settings> settingsValueChanged) {
-        this.settingsChangeToApply = settingsChangeToApply;
-        this.settingsValueChanged = settingsValueChanged;
-        this.dmnPathChanged = false;
-    }
-
-    public UpdateSettingsDataEvent(final Consumer<Settings> settingsChangeToApply,
-                                   final Predicate<Settings> settingsValueChanged,
-                                   final boolean dmnPathChanged) {
-        this.settingsChangeToApply = settingsChangeToApply;
-        this.settingsValueChanged = settingsValueChanged;
-        this.dmnPathChanged = dmnPathChanged;
-    }
-
-    @Override
-    public Type<UpdateSettingsDataEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    @Override
-    protected void dispatch(UpdateSettingsDataEventHandler handler) {
-        handler.onEvent(this);
-    }
-
-    public Consumer<Settings> getSettingsChangeToApply() {
-        return settingsChangeToApply;
-    }
-
-    public Predicate<Settings> getSettingsValueChanged() {
-        return settingsValueChanged;
-    }
-
-    public boolean isDmnPathChanged() {
-        return dmnPathChanged;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ValidateSimulationEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ValidateSimulationEvent.java
deleted file mode 100644
index ba1e7ab..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/events/ValidateSimulationEvent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.events;
-
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ValidateSimulationEventHandler;
-
-/**
- * <code>GwtEvent</code> to <b>validate</b> a <code>Simulation</code>
- */
-public class ValidateSimulationEvent extends GwtEvent<ValidateSimulationEventHandler> {
-
-    public static final Type<ValidateSimulationEventHandler> TYPE = new Type<>();
-
-    @Override
-    public Type<ValidateSimulationEventHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    @Override
-    protected void dispatch(ValidateSimulationEventHandler handler) {
-        handler.onEvent(this);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/AbstractTextBoxSingletonDOMElementFactory.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/AbstractTextBoxSingletonDOMElementFactory.java
deleted file mode 100644
index 454538c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/AbstractTextBoxSingletonDOMElementFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.factories;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import com.google.gwt.event.dom.client.MouseWheelEvent;
-import org.gwtbootstrap3.client.ui.TextArea;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.impl.BaseDOMElement;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.single.impl.BaseSingletonDOMElementFactory;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.impl.GridLienzoPanel;
-
-public abstract class AbstractTextBoxSingletonDOMElementFactory<T extends BaseDOMElement<String, TextArea>> extends BaseSingletonDOMElementFactory<String, TextArea, T> {
-
-    public AbstractTextBoxSingletonDOMElementFactory(final GridLienzoPanel gridPanel,
-                                                     final GridLayer gridLayer,
-                                                     final GridWidget gridWidget) {
-        super(gridPanel,
-              gridLayer,
-              gridWidget);
-    }
-
-    @Override
-    public TextArea createWidget() {
-        final TextArea textArea = GWT.create(TextArea.class);
-        /* Don't propagate MouseWheel and RightClick events to the Grid */
-        textArea.addDomHandler(MouseWheelEvent::stopPropagation,
-                               MouseWheelEvent.getType());
-        textArea.addDomHandler(event -> {event.stopPropagation(); event.preventDefault();},
-                               ContextMenuEvent.getType());
-        return textArea;
-    }
-
-    @Override
-    protected String getValue() {
-        if (widget != null) {
-            return widget.getValue();
-        }
-        return null;
-    }
-}
-
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactory.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactory.java
deleted file mode 100644
index 9aa48da..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactory.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.factories;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import com.google.gwt.event.dom.client.KeyDownEvent;
-import com.google.gwt.event.dom.client.MouseWheelEvent;
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.CollectionViewImpl;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.domelements.CollectionEditorDOMElement;
-import org.drools.workbench.screens.scenariosimulation.client.models.AbstractScesimGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.single.impl.BaseSingletonDOMElementFactory;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.impl.GridLienzoPanel;
-
-import static org.drools.scenariosimulation.api.model.ScenarioSimulationModel.Type.RULE;
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils.isSimpleJavaType;
-
-public class CollectionEditorSingletonDOMElementFactory extends BaseSingletonDOMElementFactory<String, CollectionViewImpl, CollectionEditorDOMElement> {
-
-    protected ViewsProvider viewsProvider;
-
-    protected ScenarioSimulationContext scenarioSimulationContext;
-
-    public CollectionEditorSingletonDOMElementFactory(final GridLienzoPanel gridPanel,
-                                                      final GridLayer gridLayer,
-                                                      final GridWidget gridWidget,
-                                                      final ScenarioSimulationContext scenarioSimulationContext,
-                                                      final ViewsProvider viewsProvider) {
-        super(gridPanel,
-              gridLayer,
-              gridWidget);
-        this.scenarioSimulationContext = scenarioSimulationContext;
-        this.viewsProvider = viewsProvider;
-    }
-
-    @Override
-    public CollectionViewImpl createWidget() {
-        return (CollectionViewImpl) viewsProvider.getCollectionEditorView();
-    }
-
-    @Override
-    public CollectionEditorDOMElement createDomElement(final GridLayer gridLayer,
-                                                       final GridWidget gridWidget) {
-        if (this.widget != null) {
-            this.widget.close();
-        }
-        this.widget = createWidget();
-        /* Don't propagate MouseWheel and RightClick events to the Grid */
-        this.widget.addDomHandler(MouseWheelEvent::stopPropagation,
-                                  MouseWheelEvent.getType());
-        this.widget.addDomHandler(event -> {
-                                      event.stopPropagation();
-                                      event.preventDefault();
-                                  },
-                                  ContextMenuEvent.getType());
-        this.widget.addDomHandler(ClickEvent::stopPropagation,
-                                  ClickEvent.getType());
-        this.widget.addDomHandler(KeyDownEvent::stopPropagation,
-                                  KeyDownEvent.getType());
-        final AbstractScesimGridModel<? extends AbstractScesimModel, ? extends AbstractScesimData> model = ((ScenarioGrid) gridWidget).getModel();
-        final GridData.SelectedCell selectedCellsOrigin = model.getSelectedCellsOrigin();
-        final Optional<GridColumn<?>> selectedColumn = model.getColumns().stream()
-                .filter(col -> col.getIndex() == selectedCellsOrigin.getColumnIndex())
-                .findFirst();
-        selectedColumn.ifPresent(col -> {
-            final int actualIndex = model.getColumns().indexOf(col);
-            final FactMapping factMapping = model.getAbstractScesimModel().get().getScesimModelDescriptor().getFactMappingByIndex(actualIndex);
-            setCollectionEditorStructureData(this.widget, factMapping);
-            this.e = createDomElementInternal(widget, gridLayer, gridWidget);
-        });
-        return e;
-    }
-
-    @Override
-    protected String getValue() {
-        return widget != null ? widget.getValue() : null;
-    }
-
-    protected void setCollectionEditorStructureData(CollectionViewImpl collectionEditorView, FactMapping factMapping) {
-        String propertyClass = factMapping.getClassName();
-        String className = factMapping.getFactAlias();
-        String propertyName = factMapping.getExpressionAlias();
-        List<String> genericTypes = factMapping.getGenericTypes();
-        if (propertyClass == null || className == null || propertyName == null || genericTypes == null || genericTypes.isEmpty()) {
-            throw new IllegalStateException("Missing required properties inside FactMapping");
-        }
-        String key = className + "#" + propertyName;
-        String genericTypeName0 = genericTypes.get(0);
-        final ScenarioSimulationModel.Type type = scenarioSimulationContext.getScenarioSimulationModel().getSettings().getType();
-        if (RULE.equals(type) && !isSimpleJavaType(genericTypeName0)) {
-            genericTypeName0 = getRuleComplexType(genericTypeName0);
-        }
-        if (ScenarioSimulationSharedUtils.isCollection(propertyClass)) {
-            manageList(collectionEditorView, key, genericTypeName0, type);
-        } else {
-            manageMap(collectionEditorView, key, genericTypeName0, genericTypes.get(1), type);
-        }
-    }
-
-    protected String getRuleComplexType(String genericTypeName0) {
-        return genericTypeName0.substring(genericTypeName0.lastIndexOf('.') + 1).replace("$", ".");
-    }
-
-    protected void manageList(CollectionViewImpl collectionEditorView, String key, String genericTypeName0, ScenarioSimulationModel.Type type) {
-        collectionEditorView.initListStructure(key, getSimplePropertiesMap(genericTypeName0), getExpandablePropertiesMap(genericTypeName0), type);
-    }
-
-    protected void manageMap(CollectionViewImpl collectionEditorView, String key, String genericTypeName0, String genericTypeName1, ScenarioSimulationModel.Type type) {
-        if (RULE.equals(type) && !isSimpleJavaType(genericTypeName1)) {
-            genericTypeName1 = getRuleComplexType(genericTypeName1);
-        }
-        collectionEditorView.initMapStructure(key, getSimplePropertiesMap(genericTypeName0), getSimplePropertiesMap(genericTypeName1), type);
-    }
-
-    @Override
-    public CollectionEditorDOMElement createDomElementInternal(final CollectionViewImpl collectionEditorView,
-                                                               final GridLayer gridLayer,
-                                                               final GridWidget gridWidget) {
-        return new CollectionEditorDOMElement(collectionEditorView, gridLayer, gridWidget);
-    }
-
-    /**
-     * Retrieve a <code>Map</code> with the property name/type of the given <b>typeName</b>
-     * <b>If</b> typeName is a <b>simple</b> class (see {@link ScenarioSimulationUtils#isSimpleJavaType(java.lang.String)})
-     * the returned <code>Map</code> will have an entry with <b>value</b> as key and <b>(typeName)</b> as value
-     * @param typeName
-     * @return
-     */
-    protected Map<String, String> getSimplePropertiesMap(String typeName) {
-        Map<String, String> toReturn;
-        if (isSimpleJavaType(typeName)) {
-            toReturn = new HashMap<>();
-            toReturn.put(VALUE, typeName);
-        } else {
-            toReturn = scenarioSimulationContext.getDataObjectFieldsMap().get(typeName).getSimpleProperties()
-                    .entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
-                                                                  e -> e.getValue().getTypeName()));
-        }
-        return toReturn;
-    }
-
-    protected Map<String, Map<String, String>> getExpandablePropertiesMap(String typeName) {
-        final Map<String, Map<String, String>> toReturn = new HashMap<>();
-        if (isSimpleJavaType(typeName)) {
-            return toReturn;
-        }
-        boolean isRule = RULE.equals(scenarioSimulationContext.getScenarioSimulationModel().getSettings().getType());
-        final Map<String, String> expandableProperties = scenarioSimulationContext.getDataObjectFieldsMap().get(typeName).getExpandableProperties();
-        expandableProperties.forEach((key, nestedTypeName) -> {
-            if (isRule) {
-                nestedTypeName = nestedTypeName.substring(nestedTypeName.lastIndexOf('.') + 1);
-            }
-            toReturn.put(key, getSimplePropertiesMap(nestedTypeName));
-        });
-        return toReturn;
-    }
-
-    protected void commonCloseHandling(final CollectionEditorDOMElement collectionEditorDOMElement) {
-        destroyResources();
-        gridLayer.batch();
-        gridPanel.setFocus(true);
-        collectionEditorDOMElement.stopEditingMode();
-    }
-
-    @Override
-    public void registerHandlers(final CollectionViewImpl widget, final CollectionEditorDOMElement widgetDomElement) {
-        widget.addCloseCompositeEventHandler(event -> commonCloseHandling(widgetDomElement));
-        widget.addSaveEditorEventHandler(event -> {
-            flush();
-            gridLayer.batch();
-            gridPanel.setFocus(true);
-        });
-    }
-}
-
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioCellTextAreaSingletonDOMElementFactory.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioCellTextAreaSingletonDOMElementFactory.java
deleted file mode 100644
index fb74fbd..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioCellTextAreaSingletonDOMElementFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.factories;
-
-import org.drools.workbench.screens.scenariosimulation.client.domelements.ScenarioCellTextAreaDOMElement;
-import org.gwtbootstrap3.client.ui.TextArea;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.impl.BaseDOMElement;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.impl.GridLienzoPanel;
-
-public class ScenarioCellTextAreaSingletonDOMElementFactory extends AbstractTextBoxSingletonDOMElementFactory<BaseDOMElement<String, TextArea>> {
-
-    public ScenarioCellTextAreaSingletonDOMElementFactory(GridLienzoPanel gridPanel, GridLayer gridLayer, GridWidget gridWidget) {
-        super(gridPanel, gridLayer, gridWidget);
-    }
-
-    @Override
-    protected BaseDOMElement<String, TextArea> createDomElementInternal(final TextArea widget,
-                                                                        final GridLayer gridLayer,
-                                                                        final GridWidget gridWidget) {
-        return new ScenarioCellTextAreaDOMElement(widget, gridLayer, gridWidget);
-    }
-}
-
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioExpressionCellTextAreaSingletonDOMElementFactory.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioExpressionCellTextAreaSingletonDOMElementFactory.java
deleted file mode 100644
index 043b9e5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioExpressionCellTextAreaSingletonDOMElementFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.factories;
-
-import com.google.gwt.event.dom.client.KeyCodes;
-import com.google.gwt.event.dom.client.KeyDownEvent;
-import com.google.gwt.user.client.DOM;
-import org.drools.workbench.screens.scenariosimulation.client.domelements.ScenarioCellTextAreaDOMElement;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioInputEvent;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ExpressionUtils;
-import org.gwtbootstrap3.client.ui.TextArea;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.impl.BaseDOMElement;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.impl.GridLienzoPanel;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.MVEL_ESCAPE_SYMBOL;
-
-public class ScenarioExpressionCellTextAreaSingletonDOMElementFactory extends AbstractTextBoxSingletonDOMElementFactory<BaseDOMElement<String, TextArea>> {
-
-    public ScenarioExpressionCellTextAreaSingletonDOMElementFactory(GridLienzoPanel gridPanel,
-                                                                    GridLayer gridLayer,
-                                                                    GridWidget gridWidget) {
-        super(gridPanel, gridLayer, gridWidget);
-    }
-
-    @Override
-    protected BaseDOMElement<String, TextArea> createDomElementInternal(final TextArea widget,
-                                                                        final GridLayer gridLayer,
-                                                                        final GridWidget gridWidget) {
-        return new ScenarioCellTextAreaDOMElement(widget, gridLayer, gridWidget);
-    }
-
-    @Override
-    public TextArea createWidget() {
-        TextArea textArea = super.createWidget();
-        DOM.sinkBitlessEvent(textArea.getElement(), ConstantHolder.INPUT);
-        textArea.addHandler(scenarioInputEvent -> checkExpressionSyntax(), ScenarioInputEvent.getType());
-        textArea.addFocusHandler(focusEvent -> checkExpressionSyntax());
-        textArea.addBlurHandler(blurEvent -> checkEmptyExpression());
-        textArea.addKeyDownHandler(this::checkEmptyExpression);
-        return textArea;
-    }
-
-    protected void checkExpressionSyntax() {
-        widget.setValue(ExpressionUtils.ensureExpressionSyntax(getValue()));
-    }
-
-    protected void checkEmptyExpression(KeyDownEvent event) {
-        if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) {
-            checkEmptyExpression();
-        }
-    }
-
-    protected void checkEmptyExpression() {
-        if (getValue().trim().equals(MVEL_ESCAPE_SYMBOL)) {
-            widget.setValue(null);
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioHeaderTextBoxSingletonDOMElementFactory.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioHeaderTextBoxSingletonDOMElementFactory.java
deleted file mode 100644
index c278c5e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioHeaderTextBoxSingletonDOMElementFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.factories;
-
-import org.drools.workbench.screens.scenariosimulation.client.domelements.ScenarioHeaderTextAreaDOMElement;
-import org.gwtbootstrap3.client.ui.TextArea;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.impl.BaseDOMElement;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.impl.GridLienzoPanel;
-
-public class ScenarioHeaderTextBoxSingletonDOMElementFactory extends AbstractTextBoxSingletonDOMElementFactory<BaseDOMElement<String, TextArea>> {
-
-    public ScenarioHeaderTextBoxSingletonDOMElementFactory(final GridLienzoPanel gridPanel,
-                                                           final GridLayer gridLayer,
-                                                           final GridWidget gridWidget) {
-        super(gridPanel,
-              gridLayer,
-              gridWidget);
-    }
-
-    @Override
-    protected BaseDOMElement<String, TextArea> createDomElementInternal(final TextArea widget,
-                                                                        final GridLayer gridLayer,
-                                                                        final GridWidget gridWidget) {
-        return new ScenarioHeaderTextAreaDOMElement(widget, gridLayer, gridWidget);
-    }
-}
-
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractScenarioSimulationDocksHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractScenarioSimulationDocksHandler.java
deleted file mode 100644
index dc6ec78..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractScenarioSimulationDocksHandler.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.CheatSheetPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.CheatSheetView;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsView;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.kie.workbench.common.widgets.client.docks.AbstractWorkbenchDocksHandler;
-import org.kie.workbench.common.widgets.client.docks.AuthoringEditorDock;
-import org.uberfire.client.workbench.docks.UberfireDock;
-import org.uberfire.client.workbench.docks.UberfireDockPosition;
-import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.mvp.impl.DefaultPlaceRequest;
-
-/**
- * Abstract Handler used to register docks in ScenarioSimulation. Subclasses have to be defined in
- * Business Cental and Kogito Contest
- */
-public abstract class AbstractScenarioSimulationDocksHandler extends AbstractWorkbenchDocksHandler {
-
-    public static final String SCESIMEDITOR_ID = "scesimeditorid";
-
-    @Inject
-    protected AuthoringEditorDock authoringWorkbenchDocks;
-    @Inject
-    protected TestToolsPresenter testToolsPresenter;
-    @Inject
-    protected SettingsPresenter settingsPresenter;
-    @Inject
-    protected CheatSheetPresenter cheatSheetPresenter;
-
-    private UberfireDock settingsDock;
-    private UberfireDock toolsDock;
-    private UberfireDock cheatSheetDock;
-    private String currentScesimEditorId;
-
-    @Override
-    public Collection<UberfireDock> provideDocks(final String perspectiveIdentifier) {
-        List<UberfireDock> result = new ArrayList<>();
-        settingsDock = new UberfireDock(UberfireDockPosition.EAST,
-                                        "SLIDERS",
-                                        new DefaultPlaceRequest(SettingsPresenter.IDENTIFIER)
-                                        //perspectiveIdentifier
-                                        );
-        result.add(settingsDock.withSize(450).withLabel(ScenarioSimulationEditorConstants.INSTANCE.settings()));
-        toolsDock = new UberfireDock(UberfireDockPosition.EAST,
-                                     "INFO_CIRCLE",
-                                     new DefaultPlaceRequest(TestToolsPresenter.IDENTIFIER)
-                                     //perspectiveIdentifier
-        );
-        result.add(toolsDock.withSize(450).withLabel(ScenarioSimulationEditorConstants.INSTANCE.testTools()));
-        cheatSheetDock = new UberfireDock(UberfireDockPosition.EAST,
-                                          "FILE_TEXT",
-                                          new DefaultPlaceRequest(CheatSheetPresenter.IDENTIFIER)
-                                          //perspectiveIdentifier
-        );
-        result.add(cheatSheetDock.withSize(450).withLabel(ScenarioSimulationEditorConstants.INSTANCE.scenarioCheatSheet()));
-        return result;
-    }
-
-    public void addDocks() {
-        refreshDocks(true, false);
-    }
-
-    public void removeDocks() {
-        refreshDocks(true, true);
-    }
-
-    /* Indirection for tests */
-    @Override
-    protected void refreshDocks(boolean shouldRefresh, boolean shouldDisable) {
-        super.refreshDocks(shouldRefresh, shouldDisable);
-    }
-
-    public void expandToolsDock() {
-        if (!testToolsPresenter.isOpen()) {
-            authoringWorkbenchDocks.expandAuthoringDock(toolsDock);
-        }
-    }
-
-    public void expandSettingsDock() {
-        if (!settingsPresenter.isOpen()) {
-            authoringWorkbenchDocks.expandAuthoringDock(settingsDock);
-        }
-    }
-
-    public abstract void expandTestResultsDock();
-
-    public void resetDocks() {
-        settingsPresenter.reset();
-        cheatSheetPresenter.reset();
-        testToolsPresenter.reset();
-    }
-
-    public void setScesimEditorId(String scesimEditorId) {
-        currentScesimEditorId = scesimEditorId;
-        settingsDock.getPlaceRequest().addParameter(SCESIMEDITOR_ID, scesimEditorId);
-        toolsDock.getPlaceRequest().addParameter(SCESIMEDITOR_ID, scesimEditorId);
-        cheatSheetDock.getPlaceRequest().addParameter(SCESIMEDITOR_ID, scesimEditorId);
-    }
-
-    public CheatSheetView.Presenter getCheatSheetPresenter() {
-        return cheatSheetPresenter;
-    }
-
-    public TestToolsView.Presenter getTestToolsPresenter() {
-        return testToolsPresenter;
-    }
-
-    public SettingsView.Presenter getSettingsPresenter() {
-        return settingsPresenter;
-    }
-
-    protected PlaceRequest getSettingsPlaceManager() {
-        return getCurrentRightDockPlaceRequest(SettingsPresenter.IDENTIFIER);
-    }
-
-    protected PlaceRequest getTestToolsPlaceManager() {
-        return getCurrentRightDockPlaceRequest(TestToolsPresenter.IDENTIFIER);
-    }
-
-    /**
-     * Returns a <code>PlaceRequest</code> for the <b>status</b> of the right dock with the given <b>identifier</b>
-     * relative to the current instance of <code>ScenarioSimulationEditorPresenter</code>
-     * @return A <code>PlaceRequest</code> for the <b>status</b> of the requested right dock
-     */
-    protected PlaceRequest getCurrentRightDockPlaceRequest(String identifier) {
-        PlaceRequest toReturn = new DefaultPlaceRequest(identifier);
-        toReturn.addParameter(SCESIMEDITOR_ID, String.valueOf(currentScesimEditorId));
-        return toReturn;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractScenarioSimulationGridPanelHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractScenarioSimulationGridPanelHandler.java
deleted file mode 100644
index 0df9d64..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractScenarioSimulationGridPanelHandler.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.ait.lienzo.client.core.types.Point2D;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridPanel;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.impl.BaseGridRendererHelper;
-
-import static org.uberfire.ext.wires.core.grids.client.util.CoordinateUtilities.convertDOMToGridCoordinate;
-import static org.uberfire.ext.wires.core.grids.client.util.CoordinateUtilities.getUiColumnIndex;
-import static org.uberfire.ext.wires.core.grids.client.util.CoordinateUtilities.getUiRowIndex;
-
-public abstract class AbstractScenarioSimulationGridPanelHandler  {
-
-    protected ScenarioGridPanel scenarioGridPanel;
-    protected ScenarioGrid scenarioGrid;
-    protected BaseGridRendererHelper rendererHelper;
-
-    public void setScenarioGridPanel(ScenarioGridPanel scenarioGridPanel) {
-        this.scenarioGridPanel = scenarioGridPanel;
-        this.scenarioGrid = scenarioGridPanel.getScenarioGrid();
-        this.rendererHelper = scenarioGrid.getRendererHelper();
-    }
-
-    /**
-     * It calculates the cell related to the given canvas coordinates. These coordinates will be handled by
-     * <code>manageHeaderCoordinates</code> if found cell is an HEADER or <code>manageBodyCoordinates</code> otherwise.
-     * @param canvasX
-     * @param canvasY
-     * @return
-     */
-    protected boolean manageCoordinates(final int canvasX, final int canvasY) {
-        final Point2D gridClickPoint = convertDOMToGridCoordinateLocal(canvasX, canvasY);
-        Integer uiRowIndex = getUiHeaderRowIndexLocal(gridClickPoint);
-        boolean isHeader = true;
-        if (uiRowIndex == null) {
-            uiRowIndex = getUiRowIndexLocal(gridClickPoint.getY());
-            isHeader = false;
-        }
-        final Integer uiColumnIndex = getUiColumnIndexLocal(gridClickPoint.getX());
-        ScenarioGridColumn scenarioGridColumn = uiColumnIndex != null ? (ScenarioGridColumn) scenarioGrid.getModel().getColumns().get(uiColumnIndex) : null;
-        if (isHeader) {
-            return manageHeaderCoordinates(uiColumnIndex, scenarioGridColumn, gridClickPoint);
-        } else {
-            return (uiRowIndex == null || uiColumnIndex == null) ? manageBodyCoordinates(-1, -1) : manageBodyCoordinates(uiRowIndex, uiColumnIndex);
-        }
-    }
-
-    /**
-     * This method check if the click happened on an <b>second level header</b> (i.e. the header of a specific column) cell. If it is so, manage it and returns <code>true</code>,
-     * otherwise returns <code>false</code>
-     * @param uiColumnIndex
-     * @param scenarioGridColumn
-     * @param clickPoint - coordinates relative to the grid top left corner
-     * @return
-     */
-    protected boolean manageHeaderCoordinates(Integer uiColumnIndex, ScenarioGridColumn scenarioGridColumn, Point2D
-            clickPoint) {
-        //Get row index
-        final Integer uiHeaderRowIndex = getUiHeaderRowIndexLocal(clickPoint);
-        if (uiHeaderRowIndex == null || uiColumnIndex == null || scenarioGridColumn == null) {
-            return false;
-        }
-        ScenarioHeaderMetaData clickedScenarioHeaderMetadata = getColumnScenarioHeaderMetaDataLocal(clickPoint);
-        if (clickedScenarioHeaderMetadata == null) {
-            return false;
-        }
-        String group = ScenarioSimulationUtils.getOriginalColumnGroup(clickedScenarioHeaderMetadata.getColumnGroup());
-        switch (group) {
-            case "GIVEN":
-            case "EXPECT":
-                return manageGivenExpectHeaderCoordinates(clickedScenarioHeaderMetadata,
-                                                        scenarioGridColumn,
-                                                        group,
-                                                        uiColumnIndex);
-            default:
-                return false;
-        }
-    }
-
-        /**
-     * This method manage the click happened on an <i>GIVEN</i> or <i>EXPECT</i> header, starting editing it if not already did.
-     * @param clickedScenarioHeaderMetadata
-     * @param scenarioGridColumn
-     * @param group
-     * @param uiColumnIndex
-     * @return
-     */
-    protected abstract boolean manageGivenExpectHeaderCoordinates(ScenarioHeaderMetaData clickedScenarioHeaderMetadata,
-                                                       ScenarioGridColumn scenarioGridColumn,
-                                                       String group,
-                                                       Integer uiColumnIndex);
-
-
-
-    /**
-     * This method check if the click happened on an column of a <b>grid row</b>. If it is so, select the cell,
-     * otherwise returns <code>false</code>
-     * @param uiRowIndex
-     * @param uiColumnIndex
-     * @return
-     */
-    protected abstract boolean manageBodyCoordinates(Integer uiRowIndex, Integer uiColumnIndex);
-
-
-    // Indirection add for test
-    protected Integer getUiHeaderRowIndexLocal(Point2D clickPoint) {
-        return CommonEditHandler.getUiHeaderRowIndexLocal(scenarioGrid, clickPoint);
-    }
-
-    // Indirection add for test
-    protected Integer getUiRowIndexLocal(double relativeY) {
-        return getUiRowIndex(scenarioGrid, relativeY);
-    }
-
-    // Indirection add for test
-    protected Integer getUiColumnIndexLocal(double relativeX) {
-        return getUiColumnIndex(scenarioGrid, relativeX);
-    }
-
-    // Indirection add for test
-    protected Point2D convertDOMToGridCoordinateLocal(double canvasX, double canvasY) {
-        return convertDOMToGridCoordinate(scenarioGrid,
-                                          new Point2D(canvasX,
-                                                      canvasY));
-    }
-
-    // Indirection add for test
-    protected ScenarioHeaderMetaData getColumnScenarioHeaderMetaDataLocal(Point2D clickPoint) {
-        return CommonEditHandler.getColumnScenarioHeaderMetaDataLocal(scenarioGrid, clickPoint);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AppendColumnEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AppendColumnEventHandler.java
deleted file mode 100644
index 5b7d79a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AppendColumnEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.AppendColumnEvent;
-
-/**
- * <code>EventHandler</code> for {@link AppendColumnEvent}
- */
-public interface AppendColumnEventHandler extends EventHandler {
-    void onEvent(AppendColumnEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AppendRowEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AppendRowEventHandler.java
deleted file mode 100644
index 4125d67..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AppendRowEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.AppendRowEvent;
-
-/**
- * <code>EventHandler</code> for {@link AppendRowEvent}
- */
-public interface AppendRowEventHandler extends EventHandler {
-    void onEvent(AppendRowEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/CloseCompositeEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/CloseCompositeEventHandler.java
deleted file mode 100644
index 2636026..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/CloseCompositeEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.CloseCompositeEvent;
-
-/**
- * <code>EventHandler</code> for {@link CloseCompositeEvent}
- */
-public interface CloseCompositeEventHandler extends EventHandler {
-    void onEvent(CloseCompositeEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/CommonEditHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/CommonEditHandler.java
deleted file mode 100644
index 9c4d8ef..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/CommonEditHandler.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.ait.lienzo.client.core.types.Point2D;
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.models.AbstractScesimGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationGridHeaderUtilities;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridCell;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.util.CellContextUtilities;
-import org.uberfire.ext.wires.core.grids.client.widget.context.GridBodyCellEditContext;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.impl.BaseGridRendererHelper;
-
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationGridHeaderUtilities.getColumnScenarioHeaderMetaData;
-import static org.uberfire.ext.wires.core.grids.client.util.CoordinateUtilities.getUiHeaderRowIndex;
-
-/**
- * This class is meant to provide common implementations for <b>editing</b> cell to be used by click handler and keyboard handler
- */
-public class CommonEditHandler {
-
-    /**
-     * Start editing a cell
-     * @param scenarioGrid
-     * @param uiColumnIndex
-     * @param scenarioGridColumn
-     * @param uiRowIndex
-     * @param isHeader
-     * @return
-     */
-    public static boolean startEdit(ScenarioGrid scenarioGrid, Integer uiColumnIndex, ScenarioGridColumn scenarioGridColumn, Integer uiRowIndex, boolean isHeader) {
-        if (isHeader) {
-            return manageHeaderLeftClick(scenarioGrid, uiColumnIndex, scenarioGridColumn, uiRowIndex);
-        } else {
-            return manageGridLeftClick(scenarioGrid, uiRowIndex, uiColumnIndex, scenarioGridColumn);
-        }
-    }
-
-    /**
-     * This method check if the click happened on an <b>second level header</b> (i.e. the header of a specific column) cell. If it is so, manage it and returns <code>true</code>,
-     * otherwise returns <code>false</code>
-     * @param scenarioGrid
-     * @param uiColumnIndex
-     * @param scenarioGridColumn
-     * @param uiHeaderRowIndex
-     * @return
-     */
-    protected static boolean manageHeaderLeftClick(ScenarioGrid scenarioGrid, Integer uiColumnIndex, ScenarioGridColumn scenarioGridColumn, Integer uiHeaderRowIndex/*, EventBus eventBus*/) {
-        if (!isEditableHeaderLocal(scenarioGridColumn, uiHeaderRowIndex)) {
-            return false;
-        }
-        ScenarioHeaderMetaData clickedScenarioHeaderMetadata = (ScenarioHeaderMetaData) scenarioGridColumn.getHeaderMetaData().get(uiHeaderRowIndex);
-        if (clickedScenarioHeaderMetadata == null) {
-            return false;
-        }
-        String group = ScenarioSimulationUtils.getOriginalColumnGroup(clickedScenarioHeaderMetadata.getColumnGroup());
-        switch (group) {
-            case "GIVEN":
-            case "EXPECT":
-                return manageGivenExpectHeaderLeftClick(scenarioGrid, clickedScenarioHeaderMetadata, uiColumnIndex, uiHeaderRowIndex);
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * This method manage the click happened on an <i>GIVEN</i> or <i>EXPECT</i> header, starting editing it if not already did.
-     * @param clickedScenarioHeaderMetadata
-     * @return
-     */
-    protected static boolean manageGivenExpectHeaderLeftClick(ScenarioGrid scenarioGrid, ScenarioHeaderMetaData clickedScenarioHeaderMetadata, int uiColumnIndex, int uiHeaderRowIndex) {
-        final AbstractScesimGridModel<? extends AbstractScesimModel, ? extends AbstractScesimData> gridModel = scenarioGrid.getModel();
-        final GridColumn<?> column = gridModel.getColumns().get(uiColumnIndex);
-        final BaseGridRendererHelper rendererHelper = scenarioGrid.getRendererHelper();
-        final BaseGridRendererHelper.RenderingInformation ri = rendererHelper.getRenderingInformation();
-        final double columnXCoordinate = rendererHelper.getColumnOffset(column) + column.getWidth() / 2;
-        final BaseGridRendererHelper.ColumnInformation ci = rendererHelper.getColumnInformation(columnXCoordinate);
-        final GridBodyCellEditContext context = CellContextUtilities.makeHeaderCellRenderContext(scenarioGrid,
-                                                                                                 ri,
-                                                                                                 ci,
-                                                                                                 null,
-                                                                                                 uiHeaderRowIndex);
-        clickedScenarioHeaderMetadata.edit(context);
-        return true;
-    }
-
-    /**
-     * This method check if the click happened on an <i>writable</i> column of a <b>grid row</b>. If it is so, start editing the cell,
-     * otherwise returns <code>false</code>
-     * @param uiRowIndex
-     * @param uiColumnIndex
-     * @param scenarioGridColumn
-     * @return
-     */
-    public static boolean manageGridLeftClick(ScenarioGrid scenarioGrid, Integer uiRowIndex, Integer uiColumnIndex, ScenarioGridColumn scenarioGridColumn) {
-        final GridCell<?> cell = scenarioGrid.getModel().getCell(uiRowIndex, uiColumnIndex);
-        if (cell == null) {
-            return false;
-        }
-        if (((ScenarioGridCell) cell).isEditingMode()) {
-            return true;
-        }
-        ((ScenarioGridCell) cell).setEditingMode((!scenarioGridColumn.isReadOnly()) && scenarioGrid.startEditingCell(uiRowIndex, uiColumnIndex));
-        return ((ScenarioGridCell) cell).isEditingMode();
-    }
-
-    // Indirection add for test
-    protected static ScenarioHeaderMetaData getColumnScenarioHeaderMetaDataLocal(ScenarioGrid scenarioGrid, Point2D point) {
-        return getColumnScenarioHeaderMetaData(scenarioGrid, point);
-    }
-
-    // Indirection add for test
-    protected static Integer getUiHeaderRowIndexLocal(ScenarioGrid scenarioGrid, Point2D point) {
-        return getUiHeaderRowIndex(scenarioGrid, point);
-    }
-
-    // Indirection add for test
-    protected static boolean isEditableHeaderLocal(ScenarioGridColumn scenarioGridColumn, Integer uiHeaderRowIndex) {
-        return ScenarioSimulationGridHeaderUtilities.isEditableHeader(scenarioGridColumn, uiHeaderRowIndex);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DeleteColumnEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DeleteColumnEventHandler.java
deleted file mode 100644
index ef2fefd..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DeleteColumnEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.DeleteColumnEvent;
-
-/**
- * <code>EventHandler</code> for {@link DeleteColumnEvent}
- */
-public interface DeleteColumnEventHandler extends EventHandler {
-    void onEvent(DeleteColumnEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DeleteRowEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DeleteRowEventHandler.java
deleted file mode 100644
index 2c392ff..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DeleteRowEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.DeleteRowEvent;
-
-/**
- * <code>EventHandler</code> for {@link DeleteRowEvent}
- */
-public interface DeleteRowEventHandler extends EventHandler {
-    void onEvent(DeleteRowEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DisableTestToolsEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DisableTestToolsEventHandler.java
deleted file mode 100644
index 12f4639..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DisableTestToolsEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.DisableTestToolsEvent;
-
-/**
- * <code>EventHandler</code> for {@link DisableTestToolsEvent}
- */
-public interface DisableTestToolsEventHandler extends EventHandler {
-    void onEvent(DisableTestToolsEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DuplicateInstanceEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DuplicateInstanceEventHandler.java
deleted file mode 100644
index 2d6496b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DuplicateInstanceEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.DuplicateInstanceEvent;
-
-/**
- * <code>EventHandler</code> for {@link DuplicateInstanceEvent}
- */
-public interface DuplicateInstanceEventHandler extends EventHandler {
-    void onEvent(DuplicateInstanceEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DuplicateRowEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DuplicateRowEventHandler.java
deleted file mode 100644
index 7aa65a0..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/DuplicateRowEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.DuplicateRowEvent;
-
-/**
- * <code>EventHandler</code> for {@link DuplicateRowEvent}
- */
-public interface DuplicateRowEventHandler extends EventHandler {
-    void onEvent(DuplicateRowEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/EnableTestToolsEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/EnableTestToolsEventHandler.java
deleted file mode 100644
index 34a40c7..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/EnableTestToolsEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.EnableTestToolsEvent;
-
-/**
- * <code>EventHandler</code> for {@link EnableTestToolsEvent}
- */
-public interface EnableTestToolsEventHandler extends EventHandler {
-    void onEvent(EnableTestToolsEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/HasCloseCompositeHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/HasCloseCompositeHandler.java
deleted file mode 100644
index cfb87d4..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/HasCloseCompositeHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.event.shared.HasHandlers;
-import org.drools.workbench.screens.scenariosimulation.client.events.CloseCompositeEvent;
-
-/**
- * A widget that implements this interface provides registration for
- * {@link CloseCompositeEventHandler} instances.
- */
-public interface HasCloseCompositeHandler extends HasHandlers {
-    /**
-     * Adds a {@link CloseCompositeEvent} handler.
-     *
-     * @param handler the handler
-     * @return {@link HandlerRegistration} used to remove this handler
-     */
-    HandlerRegistration addCloseCompositeEventHandler(CloseCompositeEventHandler handler);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/HasSaveEditorHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/HasSaveEditorHandler.java
deleted file mode 100644
index 85a4e55..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/HasSaveEditorHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.event.shared.HasHandlers;
-import org.drools.workbench.screens.scenariosimulation.client.events.SaveEditorEvent;
-
-/**
- * A widget that implements this interface provides registration for
- * {@link SaveEditorEventHandler} instances.
- */
-public interface HasSaveEditorHandler extends HasHandlers {
-    /**
-     * Adds a {@link SaveEditorEvent} handler.
-     *
-     * @param handler the handler
-     * @return {@link HandlerRegistration} used to remove this handler
-     */
-    HandlerRegistration addSaveEditorEventHandler(SaveEditorEventHandler handler);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ImportEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ImportEventHandler.java
deleted file mode 100644
index c9e337f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ImportEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.ImportEvent;
-
-/**
- * <code>EventHandler</code> for {@link ImportEvent}
- */
-public interface ImportEventHandler extends EventHandler {
-    void onEvent(ImportEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/InsertColumnEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/InsertColumnEventHandler.java
deleted file mode 100644
index 75f96b3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/InsertColumnEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.InsertColumnEvent;
-
-/**
- * <code>EventHandler</code> for {@link InsertColumnEvent}
- */
-public interface InsertColumnEventHandler extends EventHandler {
-    void onEvent(InsertColumnEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/InsertRowEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/InsertRowEventHandler.java
deleted file mode 100644
index 7f79e36..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/InsertRowEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.InsertRowEvent;
-
-/**
- * <code>EventHandler</code> for {@link InsertRowEvent}
- */
-public interface InsertRowEventHandler extends EventHandler {
-    void onEvent(InsertRowEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/PrependColumnEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/PrependColumnEventHandler.java
deleted file mode 100644
index a415d66..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/PrependColumnEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.PrependColumnEvent;
-
-/**
- * <code>EventHandler</code> for {@link PrependColumnEvent}
- */
-public interface PrependColumnEventHandler extends EventHandler {
-    void onEvent(PrependColumnEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/PrependRowEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/PrependRowEventHandler.java
deleted file mode 100644
index 41a19bc..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/PrependRowEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.PrependRowEvent;
-
-/**
- * <code>EventHandler</code> for {@link PrependRowEvent}
- */
-public interface PrependRowEventHandler extends EventHandler {
-    void onEvent(PrependRowEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/RedoEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/RedoEventHandler.java
deleted file mode 100644
index f301d0d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/RedoEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.RedoEvent;
-
-/**
- * <code>EventHandler</code> for {@link RedoEvent}
- */
-public interface RedoEventHandler extends EventHandler {
-    void onEvent(RedoEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ReloadTestToolsEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ReloadTestToolsEventHandler.java
deleted file mode 100644
index d9c3b23..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ReloadTestToolsEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.ReloadTestToolsEvent;
-
-/**
- * <code>EventHandler</code> for {@link ReloadTestToolsEvent}
- */
-public interface ReloadTestToolsEventHandler extends EventHandler {
-    void onEvent(ReloadTestToolsEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/RunSingleScenarioEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/RunSingleScenarioEventHandler.java
deleted file mode 100644
index 8963fa4..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/RunSingleScenarioEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.RunSingleScenarioEvent;
-
-/**
- * <code>EventHandler</code> for {@link RunSingleScenarioEvent}
- */
-public interface RunSingleScenarioEventHandler extends EventHandler {
-    void onEvent(RunSingleScenarioEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SaveEditorEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SaveEditorEventHandler.java
deleted file mode 100644
index 2b0ef99..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SaveEditorEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.SaveEditorEvent;
-
-/**
- * <code>EventHandler</code> for {@link SaveEditorEvent}
- */
-public interface SaveEditorEventHandler extends EventHandler {
-    void onEvent(SaveEditorEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioGridReloadEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioGridReloadEventHandler.java
deleted file mode 100644
index 7160e24..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioGridReloadEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioGridReloadEvent;
-
-/**
- * <code>EventHandler</code> for {@link ScenarioGridReloadEvent}
- */
-public interface ScenarioGridReloadEventHandler extends EventHandler {
-    void onEvent(ScenarioGridReloadEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioInputHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioInputHandler.java
deleted file mode 100644
index f92268c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioInputHandler.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioInputEvent;
-
-public interface ScenarioInputHandler extends EventHandler {
-
-    void onEvent(ScenarioInputEvent event);
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioInvokeContextMenuForSelectedCell.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioInvokeContextMenuForSelectedCell.java
deleted file mode 100644
index dc66a7c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioInvokeContextMenuForSelectedCell.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.ait.lienzo.client.core.types.Point2D;
-import org.drools.workbench.screens.scenariosimulation.client.menu.ScenarioContextMenuRegistry;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-import org.uberfire.ext.wires.core.grids.client.util.ColumnIndexUtilities;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.KeyboardOperationInvokeContextMenuForSelectedCell;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-
-public class ScenarioInvokeContextMenuForSelectedCell extends KeyboardOperationInvokeContextMenuForSelectedCell {
-
-    private ScenarioContextMenuRegistry scenarioContextMenuRegistry;
-
-    public ScenarioInvokeContextMenuForSelectedCell(final GridLayer gridLayer, final ScenarioContextMenuRegistry
-            scenarioContextMenuRegistry) {
-        super(gridLayer);
-        this.scenarioContextMenuRegistry = scenarioContextMenuRegistry;
-    }
-
-    @Override
-    public boolean isExecutable(final GridWidget gridWidget) {
-        final GridData model = gridWidget.getModel();
-        return ((!model.getSelectedHeaderCells().isEmpty() && model.getSelectedCells().isEmpty()) ||
-                (model.getSelectedHeaderCells().isEmpty() && model.getSelectedCells().size() == 1));
-    }
-
-    @Override
-    public boolean perform(final GridWidget gridWidget, final boolean isShiftKeyDown, final boolean isControlKeyDown) {
-        final GridData model = gridWidget.getModel();
-        if (!model.getSelectedHeaderCells().isEmpty()
-                && !model.getSelectedCells().isEmpty()) {
-            return false;
-        }
-        GridData.SelectedCell origin = null;
-        boolean isHeader = false;
-        if (!model.getSelectedHeaderCells().isEmpty()) {
-            origin = model.getSelectedHeaderCells().get(0);
-            isHeader = true;
-        } else if (model.getSelectedCells().size() == 1) {
-            origin = model.getSelectedCellsOrigin();
-        }
-        if (origin == null) {
-            return false;
-        }
-        final int uiRowIndex = origin.getRowIndex();
-        final int uiColumnIndex = ColumnIndexUtilities.findUiColumnIndex(model.getColumns(),
-                                                                         origin.getColumnIndex());
-        final GridColumn<?> column = model.getColumns().get(uiColumnIndex);
-        if (column instanceof ScenarioGridColumn) {
-            final Point2D middleXYCell = this.getMiddleXYCell(gridWidget, column, isHeader, uiRowIndex, gridLayer);
-            return scenarioContextMenuRegistry.manageRightClick((ScenarioGrid) gridWidget,
-                                                                (int) middleXYCell.getX(),
-                                                                (int) middleXYCell.getY(),
-                                                                uiRowIndex,
-                                                                uiColumnIndex,
-                                                                isHeader);
-        }
-        return false;
-    }
-
-    // Indirection for tests
-    protected Point2D getMiddleXYCell(GridWidget gridWidget, GridColumn column, boolean isHeader, int uiRowIndex, GridLayer gridLayer) {
-        return ScenarioSimulationUtils.getMiddleXYCell(gridWidget, column, isHeader, uiRowIndex, gridLayer);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioNotificationEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioNotificationEventHandler.java
deleted file mode 100644
index 37395b6..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioNotificationEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioNotificationEvent;
-
-/**
- * <code>EventHandler</code> for {@link ScenarioNotificationEvent}
- */
-public interface ScenarioNotificationEventHandler extends EventHandler {
-    void onEvent(ScenarioNotificationEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationGridPanelClickHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationGridPanelClickHandler.java
deleted file mode 100644
index d2bffdb..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationGridPanelClickHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.ContextMenuHandler;
-import com.google.gwt.event.shared.EventBus;
-import org.drools.workbench.screens.scenariosimulation.client.menu.ScenarioContextMenuRegistry;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridPanel;
-
-public interface ScenarioSimulationGridPanelClickHandler extends ClickHandler,
-                                                                 ContextMenuHandler {
-
-    void hideMenus();
-
-    void setScenarioContextMenuRegistry(ScenarioContextMenuRegistry scenarioContextMenuRegistry);
-
-    void setScenarioGridPanel(ScenarioGridPanel scenarioGridPanel);
-
-    void setEventBus(EventBus eventBus);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationGridPanelMouseMoveHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationGridPanelMouseMoveHandler.java
deleted file mode 100644
index 1c3ffb9..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationGridPanelMouseMoveHandler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.ait.lienzo.client.core.event.NodeMouseMoveHandler;
-import org.drools.workbench.screens.scenariosimulation.client.popover.ErrorReportPopoverPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridPanel;
-
-public interface ScenarioSimulationGridPanelMouseMoveHandler extends NodeMouseMoveHandler {
-
-    void hidePopover();
-
-    void setScenarioGridPanel(ScenarioGridPanel scenarioGridPanel);
-
-    void setErrorReportPopupPresenter(ErrorReportPopoverPresenter errorReportPopupPresenter);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationGridWidgetMouseEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationGridWidgetMouseEventHandler.java
deleted file mode 100644
index e9af952..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationGridWidgetMouseEventHandler.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import java.util.Objects;
-import java.util.Optional;
-
-import com.ait.lienzo.client.core.event.AbstractNodeHumanInputEvent;
-import com.ait.lienzo.client.core.types.Point2D;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridCell;
-import org.uberfire.ext.wires.core.grids.client.model.GridCellEditAction;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.DefaultGridWidgetEditCellMouseEventHandler;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.impl.BaseGridRendererHelper;
-
-public class ScenarioSimulationGridWidgetMouseEventHandler extends DefaultGridWidgetEditCellMouseEventHandler {
-
-    @Override
-    public boolean handleHeaderCell(final GridWidget gridWidget,
-                                    final Point2D relativeLocation,
-                                    final int uiHeaderRowIndex,
-                                    final int uiHeaderColumnIndex,
-                                    final AbstractNodeHumanInputEvent event) {
-        //Get column information
-        final double cx = relativeLocation.getX();
-        final BaseGridRendererHelper rendererHelper = gridWidget.getRendererHelper();
-        final BaseGridRendererHelper.ColumnInformation ci = rendererHelper.getColumnInformation(cx);
-        final GridColumn<?> column = ci.getColumn();
-        if (column == null) {
-            return false;
-        }
-        final ScenarioHeaderMetaData headerMetaData = (ScenarioHeaderMetaData) column.getHeaderMetaData().get(uiHeaderRowIndex);
-        final GridData gridData = gridWidget.getModel();
-        if (!gridData.getSelectedHeaderCells().isEmpty() && editSupportedLocal(headerMetaData.getSupportedEditAction(), event)) {
-            final GridData.SelectedCell firstSelectedHeaderCell = gridData.getSelectedHeaderCells().get(0);
-            final Optional<GridColumn<?>> firstSelectedColumnOptional = gridData.getColumns().stream()
-                    .filter(col -> col.getIndex() == firstSelectedHeaderCell.getColumnIndex())
-                    .findFirst();
-            final int firstSelectedColumnPosition = gridData.getColumns().indexOf(firstSelectedColumnOptional.orElseThrow(IllegalStateException::new));
-            return startEditLocal((ScenarioGrid) gridWidget, firstSelectedColumnPosition, (ScenarioGridColumn) column, uiHeaderRowIndex, true);
-        }
-        return true;
-    }
-
-    /**
-     * Checks if a {@link AbstractNodeHumanInputEvent} happened within a {@link GridCell}. If the
-     * {@link AbstractNodeHumanInputEvent} is found to have happened within a cell, the {@link GridCell#getSupportedEditAction()}
-     * is checked to {@link Object#equals(Object)} that for the {@link AbstractNodeHumanInputEvent}. If they equal then the
-     * {@link GridCell} is put into "edit" mode via {@link GridWidget#startEditingCell(Point2D)}.
-     */
-    @Override
-    public boolean handleBodyCell(final GridWidget gridWidget,
-                                  final Point2D relativeLocation,
-                                  final int uiRowIndex,
-                                  final int uiColumnIndex,
-                                  final AbstractNodeHumanInputEvent event) {
-        final GridData gridData = gridWidget.getModel();
-        if (gridData.getSelectedCells().size() == 1) {
-            final GridCell<?> cell = gridData.getCell(uiRowIndex, uiColumnIndex);
-            final GridCellEditAction cellEditAction = cell == null ? GridCell.DEFAULT_EDIT_ACTION : cell.getSupportedEditAction();
-            if (editSupportedLocal(cellEditAction, event)) {
-                ScenarioGridColumn scenarioGridColumn = (ScenarioGridColumn) gridWidget.getModel().getColumns().get(uiColumnIndex);
-                return startEditLocal((ScenarioGrid) gridWidget, uiColumnIndex, scenarioGridColumn, uiRowIndex, false);
-            }
-        }
-        return false;
-    }
-
-    // Indirection add for test
-    protected boolean editSupportedLocal(GridCellEditAction gridCellEditAction, final AbstractNodeHumanInputEvent event) {
-        return Objects.equals(gridCellEditAction, GridCellEditAction.getSupportedEditAction(event));
-    }
-
-    protected boolean startEditLocal(ScenarioGrid scenarioGrid, int uiHeaderColumnIndex, ScenarioGridColumn scenarioGridColumn, int uiHeaderRowIndex, boolean isHeader) {
-        return CommonEditHandler.startEdit(scenarioGrid, uiHeaderColumnIndex, scenarioGridColumn, uiHeaderRowIndex, isHeader);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationHasBusyIndicatorDefaultErrorCallback.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationHasBusyIndicatorDefaultErrorCallback.java
deleted file mode 100644
index 3d6622d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationHasBusyIndicatorDefaultErrorCallback.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import org.drools.workbench.screens.scenariosimulation.client.popup.CustomBusyPopup;
-import org.uberfire.ext.widgets.common.client.callbacks.HasBusyIndicatorDefaultErrorCallback;
-import org.uberfire.ext.widgets.common.client.common.HasBusyIndicator;
-
-public class ScenarioSimulationHasBusyIndicatorDefaultErrorCallback extends HasBusyIndicatorDefaultErrorCallback {
-
-
-    public ScenarioSimulationHasBusyIndicatorDefaultErrorCallback(HasBusyIndicator view) {
-        super(view);
-    }
-
-
-    @Override
-    public boolean error(final Object message,
-                         final Throwable throwable) {
-        CustomBusyPopup.close();
-        return errorLocal(message,
-                           throwable);
-    }
-
-    public void hideBusyIndicator() {
-        CustomBusyPopup.close();
-        super.hideBusyIndicator();
-    }
-
-    // Indirection add for testing purpose
-    protected boolean errorLocal(final Object message,
-                                 final Throwable throwable) {
-        return super.error(message,
-                           throwable);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationKeyboardEditHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationKeyboardEditHandler.java
deleted file mode 100644
index fce152c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationKeyboardEditHandler.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.workbench.screens.scenariosimulation.client.models.AbstractScesimGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-import org.uberfire.ext.wires.core.grids.client.util.ColumnIndexUtilities;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.KeyboardOperationEditCell;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-
-public class ScenarioSimulationKeyboardEditHandler extends KeyboardOperationEditCell {
-
-    public ScenarioSimulationKeyboardEditHandler(GridLayer gridLayer) {
-        super(gridLayer);
-    }
-
-    @Override
-    public boolean isExecutable(final GridWidget gridWidget) {
-        final GridData model = gridWidget.getModel();
-        return ((!model.getSelectedHeaderCells().isEmpty() && model.getSelectedCells().isEmpty()) ||
-                (model.getSelectedHeaderCells().isEmpty() && model.getSelectedCells().size() == 1));
-    }
-
-    @Override
-    public boolean perform(final GridWidget gridWidget,
-                           final boolean isShiftKeyDown,
-                           final boolean isControlKeyDown) {
-        ScenarioGrid scenarioGrid = (ScenarioGrid) gridWidget;
-        final AbstractScesimGridModel<? extends AbstractScesimModel, ? extends AbstractScesimData> scenarioGridModel = scenarioGrid.getModel();
-        // Allows editing only if a single cell is selected
-        if (!scenarioGridModel.getSelectedHeaderCells().isEmpty()
-                && !scenarioGridModel.getSelectedCells().isEmpty()) {
-            return false;
-        }
-        GridData.SelectedCell selectedCell = null;
-        boolean isHeader = true;
-        if (!scenarioGridModel.getSelectedHeaderCells().isEmpty()) {
-            selectedCell = scenarioGridModel.getSelectedHeaderCells().get(0);
-        } else if (scenarioGridModel.getSelectedCells().size() == 1) {
-            selectedCell = scenarioGridModel.getSelectedCellsOrigin();
-            isHeader = false;
-        }
-        if (selectedCell == null) {
-            return false;
-        }
-        final int uiRowIndex = selectedCell.getRowIndex();
-        final int uiColumnIndex = ColumnIndexUtilities.findUiColumnIndex(scenarioGridModel.getColumns(),
-                                                                         selectedCell.getColumnIndex());
-        ScenarioGridColumn scenarioGridColumn = (ScenarioGridColumn) scenarioGridModel.getColumns().get(uiColumnIndex);
-        if (scenarioGridColumn == null) {
-            return false;
-        }
-        return startEdit(scenarioGrid, uiColumnIndex, uiRowIndex, scenarioGridColumn, isHeader);
-    }
-
-    // Indirection for tests
-    protected boolean startEdit(ScenarioGrid scenarioGrid, int uiColumnIndex, int uiRowIndex, ScenarioGridColumn column, boolean isHeader) {
-        return CommonEditHandler.startEdit(scenarioGrid, uiColumnIndex, column, uiRowIndex, isHeader);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationMainGridPanelClickHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationMainGridPanelClickHandler.java
deleted file mode 100644
index 769b253..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationMainGridPanelClickHandler.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.enterprise.context.Dependent;
-
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import com.google.gwt.event.shared.EventBus;
-import org.drools.workbench.screens.scenariosimulation.client.events.DisableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.EnableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ReloadTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.menu.ScenarioContextMenuRegistry;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridCell;
-
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationGridHeaderUtilities.getEnableTestToolsEvent;
-import static org.uberfire.ext.wires.core.grids.client.util.CoordinateUtilities.getRelativeXOfEvent;
-import static org.uberfire.ext.wires.core.grids.client.util.CoordinateUtilities.getRelativeYOfEvent;
-
-@Dependent
-public class ScenarioSimulationMainGridPanelClickHandler extends AbstractScenarioSimulationGridPanelHandler
-        implements ScenarioSimulationGridPanelClickHandler {
-
-    protected ScenarioContextMenuRegistry scenarioContextMenuRegistry;
-    protected EventBus eventBus;
-    protected AtomicInteger clickReceived = new AtomicInteger(0);
-
-    public void setScenarioContextMenuRegistry(ScenarioContextMenuRegistry scenarioContextMenuRegistry) {
-        this.scenarioContextMenuRegistry = scenarioContextMenuRegistry;
-    }
-
-    /**
-     * This method must be called <b>after</b> all the <i>ContextMenu</i> setters
-     * @param eventBus
-     */
-    @Override
-    public void setEventBus(EventBus eventBus) {
-        this.eventBus = eventBus;
-    }
-
-    @Override
-    public void onClick(ClickEvent event) {
-        clickReceived.getAndIncrement();
-        final int canvasX = getRelativeXOfEvent(event);
-        final int canvasY = getRelativeYOfEvent(event);
-        scenarioContextMenuRegistry.hideMenus();
-        scenarioContextMenuRegistry.hideErrorReportPopover();
-        if (!manageCoordinates(canvasX, canvasY)) { // It was not a grid click
-            eventBus.fireEvent(new DisableTestToolsEvent());
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void onContextMenu(final ContextMenuEvent event) {
-        scenarioContextMenuRegistry.hideMenus();
-        if (scenarioContextMenuRegistry.manageRightClick(scenarioGrid, event)) {
-            scenarioContextMenuRegistry.hideErrorReportPopover();
-            event.preventDefault();
-            event.stopPropagation();
-        }
-    }
-
-    @Override
-    public void hideMenus() {
-        scenarioContextMenuRegistry.hideMenus();
-    }
-
-    /**
-     * This method manage the click happened on an <i>GIVEN</i> or <i>EXPECT</i> header, starting editing it if not already did.
-     * @param clickedScenarioHeaderMetadata
-     * @param scenarioGridColumn
-     * @param group
-     * @param uiColumnIndex
-     * @return
-     */
-    @Override
-    protected boolean manageGivenExpectHeaderCoordinates(ScenarioHeaderMetaData clickedScenarioHeaderMetadata,
-                                                         ScenarioGridColumn scenarioGridColumn,
-                                                         String group,
-                                                         Integer uiColumnIndex) {
-        scenarioGrid.setSelectedColumn(uiColumnIndex);
-        if (scenarioGridColumn.isInstanceAssigned() && clickedScenarioHeaderMetadata.getMetadataType().equals(ScenarioHeaderMetaData.MetadataType.INSTANCE)) {
-            eventBus.fireEvent(new ReloadTestToolsEvent(true, true));
-        } else {
-            EnableTestToolsEvent toFire = getEnableTestToolsEvent(scenarioGrid,
-                                                                  scenarioGridColumn,
-                                                                  clickedScenarioHeaderMetadata,
-                                                                  uiColumnIndex,
-                                                                  group);
-            eventBus.fireEvent(toFire);
-        }
-        return true;
-    }
-
-    /**
-     * This method check if the click happened on an column of a <b>grid row</b>. If it is so, select the cell,
-     * otherwise returns <code>false</code>
-     * @param uiRowIndex
-     * @param uiColumnIndex
-     * @return
-     */
-    @Override
-    protected boolean manageBodyCoordinates(Integer uiRowIndex, Integer uiColumnIndex) {
-        final GridCell<?> cell = scenarioGrid.getModel().getCell(uiRowIndex, uiColumnIndex);
-        if (cell == null) {
-            return false;
-        } else {
-            scenarioGrid.getModel().selectCell(uiRowIndex, uiColumnIndex);
-            eventBus.fireEvent(new DisableTestToolsEvent());
-            return true;
-        }
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationMainGridPanelMouseMoveHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationMainGridPanelMouseMoveHandler.java
deleted file mode 100644
index e4d8265..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationMainGridPanelMouseMoveHandler.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.IntStream;
-
-import javax.enterprise.context.Dependent;
-
-import com.ait.lienzo.client.core.event.NodeMouseMoveEvent;
-import com.ait.lienzo.client.core.types.Point2D;
-import com.ait.lienzo.tools.client.event.MouseEventUtil;
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingValue;
-import org.drools.scenariosimulation.api.model.FactMappingValueStatus;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetGridCellValueEvent;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.popover.ErrorReportPopoverPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popover.PopoverView;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-
-/**
- * This class is meant to provide common implementations for <b>on hover</b> behavior to be used by both mouse keyboard handler
- */
-@Dependent
-public class ScenarioSimulationMainGridPanelMouseMoveHandler extends AbstractScenarioSimulationGridPanelHandler
-        implements ScenarioSimulationGridPanelMouseMoveHandler {
-
-    /* This parameter must be synchronized with POPOVER_WIDTH static variable in ErrorReportPopoverView.less */
-    private static final int POPOVER_WIDTH = 220;
-    private static final String NULL = "null";
-    private static final String BR = "<br>";
-
-    protected ErrorReportPopoverPresenter errorReportPopupPresenter;
-
-    protected Integer currentlyShownBodyRowIndex = -1;
-    protected Integer currentlyShownBodyColumnIndex = -1;
-
-    @Override
-    public void onNodeMouseMove(NodeMouseMoveEvent event) {
-        manageCoordinates(event.getX(), event.getY());
-    }
-
-    @Override
-    public void hidePopover() {
-        errorReportPopupPresenter.hide();
-    }
-
-    @Override
-    public void setErrorReportPopupPresenter(ErrorReportPopoverPresenter errorReportPopupPresenter) {
-        this.errorReportPopupPresenter = errorReportPopupPresenter;
-    }
-
-    @Override
-    protected boolean manageGivenExpectHeaderCoordinates(ScenarioHeaderMetaData clickedScenarioHeaderMetadata, ScenarioGridColumn scenarioGridColumn, String group, Integer uiColumnIndex) {
-        return false;
-    }
-
-    @Override
-    protected boolean manageBodyCoordinates(Integer uiRowIndex, Integer uiColumnIndex) {
-        /* In this case, the mouse is out ot the GridLayer, then return false, without perform any action */
-        if (uiColumnIndex == -1 || uiRowIndex == -1) {
-            return false;
-        }
-        /* If the mouse position is the same of the previous one and the popover is already open, it does nothing.
-         * It returns true because the click happened on an column of a grid row */
-        if (uiRowIndex.equals(currentlyShownBodyRowIndex) &&
-                uiColumnIndex.equals(currentlyShownBodyColumnIndex) &&
-                errorReportPopupPresenter.isShown()) {
-            return true;
-        }
-        /* It updates the coordinates of the current shown cell */
-        currentlyShownBodyRowIndex = uiRowIndex;
-        currentlyShownBodyColumnIndex = uiColumnIndex;
-        final Optional<AbstractScesimModel<? extends AbstractScesimData>> optionalAbstractScesimModel = scenarioGrid.getModel().getAbstractScesimModel();
-        final AbstractScesimModel<? extends AbstractScesimData> scesimModel = optionalAbstractScesimModel.orElseThrow(IllegalStateException::new);
-        final AbstractScesimData scenarioByIndex = scesimModel.getDataByIndex(uiRowIndex);
-        final FactMapping factMapping = scesimModel.getScesimModelDescriptor().getFactMappingByIndex(uiColumnIndex);
-        final Optional<FactMappingValue> factMappingValueOptional = scenarioByIndex.getFactMappingValue(factMapping);
-        factMappingValueOptional.ifPresent(factMappingValue -> manageFactMappingValue(factMappingValue, uiRowIndex, uiColumnIndex));
-        return true;
-    }
-
-    protected void manageFactMappingValue(FactMappingValue toManage, Integer uiRowIndex, Integer uiColumnIndex) {
-        /* If an error is present in the FactMappingValue, it calculates the coordinates for Popover and show it */
-        if (toManage.getStatus() != null && FactMappingValueStatus.SUCCESS != toManage.getStatus()) {
-            manageFailedFactMappingValue(toManage, uiRowIndex, uiColumnIndex);
-        }
-    }
-
-    protected void manageFailedFactMappingValue(FactMappingValue toManage, Integer uiRowIndex, Integer uiColumnIndex) {
-        /* It calculates the coordinates */
-        final GridColumn<?> column = scenarioGrid.getModel().getColumns().get(uiColumnIndex);
-        final Point2D cellXYMiddleCoordinates = retrieveCellMiddleXYPosition(column, uiRowIndex);
-        int cellHeight = getCellHeight(column, uiRowIndex);
-        PopoverView.Position position = PopoverView.Position.RIGHT;
-        int xMiddleWidth = (int) column.getWidth() / 2;
-        int xPosition = (int) cellXYMiddleCoordinates.getX() + xMiddleWidth;
-        /* Handling scrolling y-position */
-        int yPosition = (int) cellXYMiddleCoordinates.getY();
-        /* It determines if the popover should be draw on the RIGHT or in the LEFT of the cell */
-        if (xPosition + POPOVER_WIDTH > scenarioGrid.getLayer().getWidth()) {
-            xPosition = (int) cellXYMiddleCoordinates.getX() - xMiddleWidth;
-            position = PopoverView.Position.LEFT;
-        }
-
-        /* Popover can't be to the right nor to the left (single column); put it ABOVE the cell */
-        if (xPosition <= MouseEventUtil.getAbsoluteLeft(scenarioGrid.getLayer().getElement())) {
-            xPosition = (int) cellXYMiddleCoordinates.getX();
-            yPosition = (int) cellXYMiddleCoordinates.getY() - cellHeight/2;
-            position = PopoverView.Position.TOP;
-        }
-        int scrollX = scenarioGridPanel.getScrollPanel().getElement().getScrollLeft();
-        xPosition -= scrollX;
-        int scrollY = scenarioGridPanel.getScrollPanel().getElement().getScrollTop();
-        yPosition -= scrollY;
-        setupPopupPresenter(toManage, uiRowIndex, uiColumnIndex, xPosition, yPosition, position);
-        errorReportPopupPresenter.show();
-    }
-
-    protected void setupPopupPresenter(final FactMappingValue factMappingValue,
-                                       final int uiRowIndex,
-                                       final int uiColumnIndex,
-                                       final int xPosition,
-                                       final int yPosition,
-                                       final PopoverView.Position position) {
-        final Object expectedValue = factMappingValue.getRawValue();
-        final Object errorValue = factMappingValue.getErrorValue();
-        if (FactMappingValueStatus.FAILED_WITH_ERROR == factMappingValue.getStatus()) {
-            if (Objects.isNull(factMappingValue.getCollectionPathToValue())) {
-                showErrorPopoverWithSuggestion(expectedValue, errorValue, uiRowIndex, uiColumnIndex, xPosition, yPosition, position);
-            } else {
-                showErrorPopoverWithoutSuggestion(getCollectionHTMLErrorMessage(errorValue,
-                                                                                factMappingValue.getCollectionPathToValue()),
-                                                  xPosition,
-                                                  yPosition,
-                                                  position);
-            }
-        } else if (FactMappingValueStatus.FAILED_WITH_EXCEPTION == factMappingValue.getStatus()) {
-            showErrorPopoverWithoutSuggestion(factMappingValue.getExceptionMessage(), xPosition, yPosition, position);
-        }
-    }
-
-    protected void showErrorPopoverWithoutSuggestion(final String errorMessage,
-                                                     final int xPosition,
-                                                     final int yPosition,
-                                                     final PopoverView.Position position) {
-        errorReportPopupPresenter.setup(ScenarioSimulationEditorConstants.INSTANCE.errorReason(),
-                                        errorMessage,
-                                        ScenarioSimulationEditorConstants.INSTANCE.close(),
-                                        xPosition,
-                                        yPosition,
-                                        position);
-    }
-
-    protected void showErrorPopoverWithSuggestion(final Object expectedValue,
-                                                  final Object errorValue,
-                                                  final int uiRowIndex,
-                                                  final int uiColumnIndex,
-                                                  final int xPosition,
-                                                  final int yPosition,
-                                                  final PopoverView.Position position) {
-        errorReportPopupPresenter.setup(ScenarioSimulationEditorConstants.INSTANCE.errorReason(),
-                                        ScenarioSimulationEditorConstants.INSTANCE.errorPopoverMessageFailedWithError(
-                                                decorateWithStrongHTMLTag(expectedValue != null ? expectedValue.toString() : NULL),
-                                                decorateWithStrongHTMLTag(errorValue != null ? errorValue.toString() : NULL)),
-                                        ScenarioSimulationEditorConstants.INSTANCE.keep(),
-                                        ScenarioSimulationEditorConstants.INSTANCE.apply(),
-                                        () -> scenarioGrid.getEventBus().fireEvent(
-                                                new SetGridCellValueEvent(scenarioGrid.getGridWidget(),
-                                                                          uiRowIndex,
-                                                                          uiColumnIndex,
-                                                                          errorValue != null ? errorValue.toString() : NULL)),
-                                        xPosition,
-                                        yPosition,
-                                        position);
-    }
-
-    protected String getCollectionHTMLErrorMessage(Object wrongValue, List<String> pathToWrongValue) {
-        if (pathToWrongValue.isEmpty()) {
-            return ScenarioSimulationEditorConstants.INSTANCE.errorPopoverGenericCollectionErrorMessage();
-        }
-        if (pathToWrongValue.size() == 1) {
-            StringBuilder builder = new StringBuilder();
-            builder.append(ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLFailureMessage(decorateWithEMHTMLTag(pathToWrongValue.get(0))));
-            if (wrongValue != null) {
-                builder.append(BR);
-                builder.append(ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLValue(decorateWithStrongHTMLTag(wrongValue.toString())));
-            }
-            return builder.toString();
-        }
-
-        StringBuilder builder = new StringBuilder();
-        builder.append(ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLFailureMessage(decorateWithEMHTMLTag(pathToWrongValue.get(0))));
-        builder.append(BR);
-        builder.append(ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLField(decorateWithEMHTMLTag(generateFieldsHierarchy(pathToWrongValue.subList(1, pathToWrongValue.size())))));
-        if (wrongValue != null) {
-            builder.append(ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLValue(decorateWithStrongHTMLTag(wrongValue.toString())));
-        }
-        return builder.toString();
-    }
-
-    protected String decorateWithStrongHTMLTag(String value) {
-        return "<strong>\"" + value + "\"</strong>";
-    }
-
-    protected String decorateWithEMHTMLTag(String value) {
-        return "<em>" + value + "</em>";
-    }
-
-    protected String generateFieldsHierarchy(List<String> hierarchy) {
-        if (hierarchy.size() == 1) {
-            return hierarchy.get(0) + BR;
-        }
-        StringBuilder builder = new StringBuilder();
-        hierarchy.forEach(step -> builder.append("<ul><li>" + step));
-        IntStream.range(0, hierarchy.size()).forEach(i -> builder.append("</li></ul>"));
-        return builder.toString();
-    }
-
-    //Indirection for test
-    protected Point2D retrieveCellMiddleXYPosition(GridColumn<?> column, int uiRowIndex) {
-        return ScenarioSimulationUtils.getMiddleXYCell(scenarioGrid, column, false, uiRowIndex, (GridLayer) scenarioGrid.getLayer());
-    }
-
-    //Indirection for test
-    protected int getCellHeight(GridColumn<?> column, int uiRowIndex) {
-        return ScenarioSimulationUtils.getCellHeight(scenarioGrid, column, false, uiRowIndex);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SetGridCellValueEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SetGridCellValueEventHandler.java
deleted file mode 100644
index 8c95c61..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SetGridCellValueEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetGridCellValueEvent;
-
-/**
- * <code>EventHandler</code> for {@link SetGridCellValueEvent}
- */
-public interface SetGridCellValueEventHandler extends EventHandler {
-    void onEvent(SetGridCellValueEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SetHeaderCellValueEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SetHeaderCellValueEventHandler.java
deleted file mode 100644
index 466ed9d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SetHeaderCellValueEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetHeaderCellValueEvent;
-
-/**
- * <code>EventHandler</code> for {@link SetHeaderCellValueEvent}
- */
-public interface SetHeaderCellValueEventHandler extends EventHandler {
-    void onEvent(SetHeaderCellValueEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SetInstanceHeaderEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SetInstanceHeaderEventHandler.java
deleted file mode 100644
index f8ae6cf..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SetInstanceHeaderEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetInstanceHeaderEvent;
-
-/**
- * <code>EventHandler</code> for {@link SetInstanceHeaderEvent}
- */
-public interface SetInstanceHeaderEventHandler extends EventHandler {
-    void onEvent(SetInstanceHeaderEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SetPropertyHeaderEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SetPropertyHeaderEventHandler.java
deleted file mode 100644
index 5b777fc..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SetPropertyHeaderEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetPropertyHeaderEvent;
-
-/**
- * <code>EventHandler</code> for {@link SetPropertyHeaderEvent}
- */
-public interface SetPropertyHeaderEventHandler extends EventHandler {
-    void onEvent(SetPropertyHeaderEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SourceTypeSelector.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SourceTypeSelector.java
deleted file mode 100644
index 01483c5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SourceTypeSelector.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.gwt.event.logical.shared.ValueChangeEvent;
-import com.google.gwt.event.logical.shared.ValueChangeHandler;
-import com.google.gwt.user.client.ui.VerticalPanel;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.gwtbootstrap3.client.ui.CheckBox;
-import org.gwtbootstrap3.client.ui.Radio;
-
-public class SourceTypeSelector extends VerticalPanel implements ValueChangeHandler<Boolean> {
-
-    protected static final String SOURCE_TYPE = "SOURCE_TYPE";
-    protected final TitledAttachmentFileWidget uploadWidget;
-    protected final List<Radio> radioButtonList = new ArrayList<Radio>();
-
-    public SourceTypeSelector(TitledAttachmentFileWidget uploadWidget) {
-        this.uploadWidget = uploadWidget;
-        addRadioButtons();
-    }
-
-
-    @Override
-    public void onValueChange(ValueChangeEvent<Boolean> event) {
-        final boolean dmnSelected = isDMNSelected();
-        uploadWidget.setVisible(dmnSelected);
-        if (dmnSelected) {
-            uploadWidget.updateAssetList();
-        }
-    }
-
-    public boolean validate() {
-        if (isDMNSelected()) {
-            return uploadWidget.validate();
-        } else {
-            return true;
-        }
-    }
-
-    public boolean isDMNSelected() {
-        return radioButtonList.stream()
-                .filter(CheckBox::getValue)
-                .anyMatch(radioButton -> radioButton.getText().equalsIgnoreCase(ScenarioSimulationModel.Type.DMN.name()));
-    }
-
-    /**
-     * Returns the selected Type. <b>By default, it returns <code>ScenarioSimulationModel.Type.RULE</code></b>
-     * @return
-     */
-    public ScenarioSimulationModel.Type getSelectedType() {
-        return radioButtonList.stream()
-                .filter(CheckBox::getValue)
-                .findFirst()
-                .map(selectedText -> ScenarioSimulationModel.Type.valueOf(selectedText.getText()))
-                .orElse(ScenarioSimulationModel.Type.RULE);
-    }
-
-    protected void addRadioButtons() {
-        boolean first = true;
-        radioButtonList.clear();
-        for (ScenarioSimulationModel.Type sourceType : ScenarioSimulationModel.Type.values()) {
-            Radio radioButton = new Radio(SOURCE_TYPE);
-            radioButton.setText(sourceType.name());
-            radioButton.setValue(first);
-            radioButton.addValueChangeHandler(this);
-            first = false;
-            radioButtonList.add(radioButton);
-            add(radioButton);
-        }
-        uploadWidget.setVisible(isDMNSelected());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/TitledAttachmentFileWidget.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/TitledAttachmentFileWidget.java
deleted file mode 100644
index 838b9f6..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/TitledAttachmentFileWidget.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import java.util.Optional;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.FlowPanel;
-import org.drools.workbench.screens.scenariosimulation.client.dropdown.ScenarioSimulationDropdown;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.gwtbootstrap3.client.ui.FormLabel;
-import org.gwtbootstrap3.client.ui.constants.ElementTags;
-import org.gwtbootstrap3.client.ui.constants.IconType;
-import org.gwtbootstrap3.client.ui.constants.Styles;
-import org.gwtbootstrap3.client.ui.html.Div;
-import org.gwtbootstrap3.client.ui.html.Span;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-
-public class TitledAttachmentFileWidget extends Composite {
-
-    protected FlowPanel fields = GWT.create(FlowPanel.class);
-    protected Div divElement = GWT.create(Div.class);
-    protected FormLabel titleLabel = GWT.create(FormLabel.class);
-    protected Span errorLabel = GWT.create(Span.class);
-    protected ScenarioSimulationDropdown scenarioSimulationDropdown;
-    protected String selectedPath;
-
-    public TitledAttachmentFileWidget(String title,
-                                      ScenarioSimulationDropdown scenarioSimulationDropdown) {
-        this.scenarioSimulationDropdown = scenarioSimulationDropdown;
-        titleLabel.setStyleName("control-label");
-        titleLabel.setText(title);
-        divElement.add(titleLabel);
-        divElement.getElement().appendChild(createIconElement());
-        errorLabel.setStyleName("help-block");
-        errorLabel.setColor("#c00");
-        errorLabel.setText(ScenarioSimulationEditorConstants.INSTANCE.chooseValidDMNAsset());
-        fields.add(divElement);
-        fields.add(this.scenarioSimulationDropdown.asWidget());
-        fields.add(this.errorLabel);
-        initWidget(fields);
-        scenarioSimulationDropdown.init();
-        scenarioSimulationDropdown.registerOnChangeHandler(() -> {
-            final Optional<KieAssetsDropdownItem> value = scenarioSimulationDropdown.getValue();
-            selectedPath = value.map(KieAssetsDropdownItem::getValue).orElse(null);
-            validate();
-        });
-    }
-
-    public void clearStatus() {
-        updateAssetList();
-        errorLabel.setText(null);
-        selectedPath = null;
-    }
-
-    public void updateAssetList() {
-        scenarioSimulationDropdown.loadAssets();
-    }
-
-    public String getSelectedPath() {
-        return selectedPath;
-    }
-
-    public boolean validate() {
-        boolean toReturn = selectedPath != null && !selectedPath.isEmpty();
-        if (!toReturn) {
-            errorLabel.setText(ScenarioSimulationEditorConstants.INSTANCE.chooseValidDMNAsset());
-        } else {
-            errorLabel.setText(null);
-        }
-        return toReturn;
-    }
-
-    /**
-     * @return a new icon element.
-     */
-    protected Element createIconElement() {
-        Element e = Document.get().createElement(ElementTags.I);
-        e.addClassName(Styles.FONT_AWESOME_BASE);
-        e.addClassName(IconType.STAR.getCssName());
-        Style s = e.getStyle();
-        s.setFontSize(6, Style.Unit.PX);
-        s.setPaddingLeft(2, Style.Unit.PX);
-        s.setPaddingRight(5, Style.Unit.PX);
-        s.setColor("#b94a48");
-        Element sup = Document.get().createElement("sup");
-        sup.appendChild(e);
-        return sup;
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/UndoEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/UndoEventHandler.java
deleted file mode 100644
index 0bcbeb1..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/UndoEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.UndoEvent;
-
-/**
- * <code>EventHandler</code> for {@link UndoEvent}
- */
-public interface UndoEventHandler extends EventHandler {
-    void onEvent(UndoEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/UnsupportedDMNEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/UnsupportedDMNEventHandler.java
deleted file mode 100644
index a76833f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/UnsupportedDMNEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.UnsupportedDMNEvent;
-
-/**
- * <code>EventHandler</code> for {@link UnsupportedDMNEvent}
- */
-public interface UnsupportedDMNEventHandler extends EventHandler {
-    void onEvent(UnsupportedDMNEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/UpdateSettingsDataEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/UpdateSettingsDataEventHandler.java
deleted file mode 100644
index d4e6290..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/UpdateSettingsDataEventHandler.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.UpdateSettingsDataEvent;
-
-public interface UpdateSettingsDataEventHandler extends EventHandler {
-
-    void onEvent(UpdateSettingsDataEvent event);
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ValidateSimulationEventHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ValidateSimulationEventHandler.java
deleted file mode 100644
index 1d22009..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ValidateSimulationEventHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.shared.EventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.events.ValidateSimulationEvent;
-
-/**
- * <code>EventHandler</code> for {@link ValidateSimulationEvent}
- */
-public interface ValidateSimulationEventHandler extends EventHandler {
-    void onEvent(ValidateSimulationEvent event);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/interfaces/TetraFunction.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/interfaces/TetraFunction.java
deleted file mode 100644
index 5c4a281..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/interfaces/TetraFunction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.interfaces;
-
-import java.util.Objects;
-import java.util.function.Function;
-
-/**
- * Represents a function that accepts two arguments and produces a result.
- * This is the four-arity specialization of {@link Function}.
- *
- * <p>This is a <a href="package-summary.html">functional interface</a>
- * whose functional method is {@link #apply(Object, Object, Object, Object)}.
- * @param <T> the type of the first argument to the function
- * @param <U> the type of the second argument to the function
- * @param <S> the type of the third argument to the function
- * @param <E> the type of the fourth argument to the function
- * @param <R> the type of the result of the function
- * @see Function
- */
-@FunctionalInterface
-public interface TetraFunction<T, U, S, E, R> {
-
-    /**
-     * Applies this function to the given arguments.
-     * @param t the first function argument
-     * @param u the second function argument
-     * @param s the third function argument
-     * @param e the fourth function argument
-     * @return the function result
-     */
-    R apply(T t, U u, S s, E e);
-
-    /**
-     * Returns a composed function that first applies this function to
-     * its input, and then applies the {@code after} function to the result.
-     * If evaluation of either function throws an exception, it is relayed to
-     * the caller of the composed function.
-     * @param <V> the type of output of the {@code after} function, and of the
-     * composed function
-     * @param after the function to apply after this function is applied
-     * @return a composed function that first applies this function and then
-     * applies the {@code after} function
-     * @throws NullPointerException if after is null
-     */
-    default <V> TetraFunction<T, U, S, E, V> andThen(Function<? super R, ? extends V> after) {
-        Objects.requireNonNull(after);
-        return (T t, U u, S s, E e) -> after.apply(apply(t, u, s, e));
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/interfaces/TriFunction.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/interfaces/TriFunction.java
deleted file mode 100644
index 1b41ef4..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/interfaces/TriFunction.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.interfaces;
-
-import java.util.Objects;
-import java.util.function.Function;
-
-/**
- * Represents a function that accepts two arguments and produces a result.
- * This is the three-arity specialization of {@link Function}.
- *
- * <p>This is a <a href="package-summary.html">functional interface</a>
- * whose functional method is {@link #apply(Object, Object, Object)}.
- * @param <T> the type of the first argument to the function
- * @param <U> the type of the second argument to the function
- * @param <S> the type of the third argument to the function
- * @param <R> the type of the result of the function
- * @see Function
- */
-@FunctionalInterface
-public interface TriFunction<T, U, S, R> {
-
-    /**
-     * Applies this function to the given arguments.
-     * @param t the first function argument
-     * @param u the second function argument
-     * @param s the third third argument
-     * @return the function result
-     */
-    R apply(T t, U u, S s);
-
-    /**
-     * Returns a composed function that first applies this function to
-     * its input, and then applies the {@code after} function to the result.
-     * If evaluation of either function throws an exception, it is relayed to
-     * the caller of the composed function.
-     * @param <V> the type of output of the {@code after} function, and of the
-     * composed function
-     * @param after the function to apply after this function is applied
-     * @return a composed function that first applies this function and then
-     * applies the {@code after} function
-     * @throws NullPointerException if after is null
-     */
-    default <V> TriFunction<T, U, S, V> andThen(Function<? super R, ? extends V> after) {
-        Objects.requireNonNull(after);
-        return (T t, U u, S s) -> after.apply(apply(t, u, s));
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/menu/ScenarioContextMenuRegistry.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/menu/ScenarioContextMenuRegistry.java
deleted file mode 100644
index 7299793..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/menu/ScenarioContextMenuRegistry.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.menu;
-
-import java.util.Objects;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import com.ait.lienzo.client.core.types.Point2D;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import com.google.gwt.event.shared.EventBus;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.ExpectedContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.GivenContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.GridContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.HeaderExpectedContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.HeaderGivenContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.OtherContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.popover.ErrorReportPopoverPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationGridHeaderUtilities;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.util.CoordinateUtilities;
-
-@Dependent
-public class ScenarioContextMenuRegistry {
-
-    private static final int BIGGEST_MENU_HEIGHT_PX = 130;
-
-    protected OtherContextMenu otherContextMenu;
-    protected HeaderGivenContextMenu headerGivenContextMenu;
-    protected HeaderExpectedContextMenu headerExpectedContextMenu;
-    protected GivenContextMenu givenContextMenu;
-    protected ExpectedContextMenu expectedContextMenu;
-    protected GridContextMenu gridContextMenu;
-    protected ErrorReportPopoverPresenter errorReportPopoverPresenter;
-
-    @Inject
-    public ScenarioContextMenuRegistry(final OtherContextMenu otherContextMenu,
-                                       final HeaderGivenContextMenu headerGivenContextMenu,
-                                       final HeaderExpectedContextMenu headerExpectedContextMenu,
-                                       final GivenContextMenu givenContextMenu,
-                                       final ExpectedContextMenu expectedContextMenu,
-                                       final GridContextMenu gridContextMenu) {
-        this.otherContextMenu = otherContextMenu;
-        this.headerGivenContextMenu = headerGivenContextMenu;
-        this.headerExpectedContextMenu = headerExpectedContextMenu;
-        this.givenContextMenu = givenContextMenu;
-        this.expectedContextMenu = expectedContextMenu;
-        this.gridContextMenu = gridContextMenu;
-    }
-
-    public void setEventBus(final EventBus eventBus) {
-        otherContextMenu.setEventBus(eventBus);
-        headerGivenContextMenu.setEventBus(eventBus);
-        headerExpectedContextMenu.setEventBus(eventBus);
-        givenContextMenu.setEventBus(eventBus);
-        expectedContextMenu.setEventBus(eventBus);
-        gridContextMenu.setEventBus(eventBus);
-    }
-
-    public void hideMenus() {
-        otherContextMenu.hide();
-        headerGivenContextMenu.hide();
-        headerExpectedContextMenu.hide();
-        givenContextMenu.hide();
-        expectedContextMenu.hide();
-        gridContextMenu.hide();
-    }
-
-    public boolean manageRightClick(final ScenarioGrid scenarioGrid,
-                                    final ContextMenuEvent event) {
-
-        final int canvasX = CoordinateUtilities.getRelativeXOfEvent(event);
-        final int canvasY = CoordinateUtilities.getRelativeYOfEvent(event);
-
-        final Point2D gridClickPoint = CoordinateUtilities.convertDOMToGridCoordinate(scenarioGrid,
-                                                                                      new Point2D(canvasX, canvasY));
-        boolean isHeader = true;
-        Integer uiRowIndex = CoordinateUtilities.getUiHeaderRowIndex(scenarioGrid, gridClickPoint);
-
-        if (uiRowIndex == null) {
-            uiRowIndex = CoordinateUtilities.getUiRowIndex(scenarioGrid, gridClickPoint.getY());
-            isHeader = false;
-        }
-        if (uiRowIndex == null) {
-            return false;
-        }
-
-        final Integer uiColumnIndex = CoordinateUtilities.getUiColumnIndex(scenarioGrid, gridClickPoint.getX());
-        if (uiColumnIndex == null) {
-            return false;
-        }
-
-        return manageRightClick(scenarioGrid,
-                                event.getNativeEvent().getClientX(),
-                                event.getNativeEvent().getClientY(),
-                                uiRowIndex,
-                                uiColumnIndex,
-                                isHeader);
-    }
-
-    public boolean manageRightClick(final ScenarioGrid scenarioGrid,
-                                    final int clientXPosition,
-                                    final int clientYPosition,
-                                    final Integer uiRowIndex,
-                                    final Integer uiColumnIndex,
-                                    final boolean isHeader) {
-        scenarioGrid.clearSelections();
-        ScenarioGridColumn scenarioGridColumn = (ScenarioGridColumn) scenarioGrid.getModel().getColumns().get(uiColumnIndex);
-        if (scenarioGridColumn == null) {
-            return false;
-        }
-        final int gridHeight =
-                (int) scenarioGrid.getRendererHelper().getRenderingInformation().getBounds().getHeight();
-        final int adjustedYPosition =
-                clientYPosition + BIGGEST_MENU_HEIGHT_PX < gridHeight ? clientYPosition : clientYPosition - BIGGEST_MENU_HEIGHT_PX;
-        if (isHeader) {
-            return manageHeaderRightClick(scenarioGrid,
-                                          clientXPosition,
-                                          adjustedYPosition,
-                                          uiRowIndex,
-                                          uiColumnIndex);
-        } else {
-            return manageBodyRightClickLocal(scenarioGrid,
-                                             clientXPosition,
-                                             adjustedYPosition,
-                                             uiRowIndex,
-                                             uiColumnIndex);
-        }
-    }
-
-    /**
-     * This method check if the click happened on an <b>body</b> cell. If it is so, manage it and returns <code>true</code>,
-     * otherwise returns <code>false</code>
-     * @param scenarioGrid
-     * @param left
-     * @param top
-     * @param uiRowIndex
-     * @param uiColumnIndex
-     * @return
-     */
-    private boolean manageBodyRightClickLocal(final ScenarioGrid scenarioGrid,
-                                              final int left,
-                                              final int top,
-                                              final Integer uiRowIndex,
-                                              final Integer uiColumnIndex) {
-
-        if (uiRowIndex == null) {
-            return false;
-        }
-        return manageScenarioBodyRightClick(scenarioGrid, left, top, uiRowIndex, uiColumnIndex);
-    }
-
-    /**
-     * This method check if the click happened on an <b>body</b> cell. If it is so, manage it and returns <code>true</code>,
-     * otherwise returns <code>false</code>
-     * @param scenarioGrid
-     * @param left
-     * @param top
-     * @param uiRowIndex
-     * @param uiColumnIndex
-     * @return
-     */
-    private boolean manageScenarioBodyRightClick(final ScenarioGrid scenarioGrid,
-                                                 final int left,
-                                                 final int top,
-                                                 final int uiRowIndex,
-                                                 final int uiColumnIndex) {
-        ScenarioGridColumn scenarioGridColumn = (ScenarioGridColumn) scenarioGrid.getModel().getColumns().get(uiColumnIndex);
-        if (scenarioGridColumn == null) {
-            return false;
-        }
-        gridContextMenu.show(scenarioGrid.getGridWidget(), left, top, uiRowIndex);
-        scenarioGrid.setSelectedCell(uiRowIndex, uiColumnIndex);
-        return true;
-    }
-
-    /**
-     * This method check if the click happened on an <b>header</b> cell. If it is so, manage it and returns <code>true</code>,
-     * otherwise returns <code>false</code>
-     * @param scenarioGrid
-     * @param left
-     * @param top
-     * @param uiHeaderRowIndex - coordinates relative to the grid top left corner
-     * @param uiColumnIndex
-     * @return
-     */
-    private boolean manageHeaderRightClick(final ScenarioGrid scenarioGrid,
-                                           final int left,
-                                           final int top,
-                                           final Integer uiHeaderRowIndex,
-                                           final Integer uiColumnIndex) {
-        final ScenarioGridColumn column = (ScenarioGridColumn) scenarioGrid.getModel().getColumns().get(uiColumnIndex);
-        if (column == null) {
-            return false;
-        }
-        ScenarioHeaderMetaData columnMetadata = ScenarioSimulationGridHeaderUtilities.getColumnScenarioHeaderMetaData(column, uiHeaderRowIndex);
-        if (columnMetadata == null) {
-            return false;
-        }
-        if (uiHeaderRowIndex == null) {
-            return false;
-        }
-        boolean showDuplicateInstance = scenarioGrid.getType().equals(ScenarioSimulationModel.Type.RULE);
-            String group = ScenarioSimulationUtils.getOriginalColumnGroup(columnMetadata.getColumnGroup());
-        /* The first case managed, empty string, is related to clicking on the first header row, the one containing
-           GIVEN or EXPECT labels. In this case, the menu to show depends on columnMetadata.getTitle() value.
-           All other cases, "GIVEN" and "EXPECT" groups names, manage the other headers rows.
-         */
-            switch (group) {
-                case "":
-                    switch (columnMetadata.getTitle()) {
-                    case "GIVEN":
-                            headerGivenContextMenu.show(scenarioGrid.getGridWidget(), left, top);
-                            break;
-                    case "EXPECT":
-                            headerExpectedContextMenu.show(scenarioGrid.getGridWidget(), left, top);
-                            break;
-                        default:
-                            otherContextMenu.show(left, top);
-                    }
-                    break;
-            case "GIVEN":
-                    givenContextMenu.show(scenarioGrid.getGridWidget(), left, top, uiColumnIndex, group, Objects.equals(columnMetadata.getMetadataType(), ScenarioHeaderMetaData.MetadataType.PROPERTY), showDuplicateInstance);
-                    break;
-            case "EXPECT":
-                    expectedContextMenu.show(scenarioGrid.getGridWidget(),left, top, uiColumnIndex, group, Objects.equals(columnMetadata.getMetadataType(), ScenarioHeaderMetaData.MetadataType.PROPERTY), showDuplicateInstance);
-                    break;
-                default:
-                    otherContextMenu.show(left, top);
-            }
-            scenarioGrid.setSelectedColumnAndHeader(uiHeaderRowIndex, uiColumnIndex);
-        return true;
-    }
-
-
-    public void setErrorReportPopoverPresenter(ErrorReportPopoverPresenter errorReportPopoverPresenter) {
-        this.errorReportPopoverPresenter = errorReportPopoverPresenter;
-    }
-
-    public void hideErrorReportPopover() {
-        errorReportPopoverPresenter.hide();
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/metadata/ScenarioHeaderMetaData.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/metadata/ScenarioHeaderMetaData.java
deleted file mode 100644
index 22283cf..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/metadata/ScenarioHeaderMetaData.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.metadata;
-
-import org.drools.workbench.screens.scenariosimulation.client.domelements.ScenarioHeaderTextAreaDOMElement;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.uberfire.ext.wires.core.grids.client.model.GridCellEditAction;
-import org.uberfire.ext.wires.core.grids.client.model.impl.BaseHeaderMetaData;
-import org.uberfire.ext.wires.core.grids.client.widget.context.GridBodyCellEditContext;
-
-public class ScenarioHeaderMetaData extends BaseHeaderMetaData {
-
-    public enum MetadataType {
-
-        GROUP, // ex GIVEN, EXPECTED
-        INSTANCE,
-        PROPERTY,
-        UNDEFINED
-    }
-
-    /*
-    `HeaderMetaData` now has a `CellSelectionStrategy` method (default is to select single cells)
-    you'd be able to add your own `CellSelectionStrategy` to your `HeaderMetaData` and do was you wish (e.g. select whole column)
-     */
-    final ScenarioHeaderTextBoxSingletonDOMElementFactory factory;
-    final String columnId;
-    private boolean readOnly;
-    // true if this header contains the column' informations (group, title, id) and it is an instance header
-    final boolean instanceHeader;
-    // true if this header contains the column' informations (group, title, id) and it is a property header
-    final boolean propertyHeader;
-    private boolean isEditingMode = false;
-    private final MetadataType metadataType;
-
-    /**
-     * Constructor for ScenarioHeaderMetaData
-     * @param columnId
-     * @param columnTitle
-     * @param columnGroup
-     * @param factory
-     * @param readOnly
-     * @param instanceHeader Set <code>true</code> for <i>instance</i>' header <b>or</b> the description/id ones, <code>false</code>
-     * @param propertyHeader Set <code>true</code> for <i>property</i>' header <b>or</b> the description/id ones, <code>false</code>
-     * @throws IllegalStateException if both <code>instanceHeader</code> and <code>propertyHeader</code> are <code>true</code>
-     */
-    public ScenarioHeaderMetaData(String columnId, String columnTitle, String columnGroup, final ScenarioHeaderTextBoxSingletonDOMElementFactory factory, boolean readOnly, boolean instanceHeader, boolean propertyHeader) throws IllegalStateException {
-        super(columnTitle, columnGroup);
-        if (instanceHeader && propertyHeader) {
-            throw new IllegalStateException("A ScenarioHeaderMetaData can not be both InstanceHeader and PropertyHeader");
-        }
-        this.columnId = columnId;
-        this.factory = factory;
-        this.readOnly = readOnly;
-        this.instanceHeader = instanceHeader;
-        this.propertyHeader = propertyHeader;
-        if (isInstanceHeader()) {
-            metadataType = MetadataType.INSTANCE;
-        } else if (isPropertyHeader()) {
-            metadataType = MetadataType.PROPERTY;
-        } else {
-            metadataType = MetadataType.UNDEFINED;
-        }
-    }
-
-    /**
-     * Constructor for ScenarioHeaderMetaData - readonly default to <code>false</code>
-     * @param columnId
-     * @param columnTitle
-     * @param columnGroup
-     * @param factory
-     * @param instanceHeader Set <code>true</code> for <i>instance</i>' header <b>or</b> the description/id ones, <code>false</code>
-     * @param propertyHeader Set <code>true</code> for <i>property</i>' header <b>or</b> the description/id ones, <code>false</code>
-     * @throws IllegalStateException if both <code>instanceHeader</code> and <code>propertyHeader</code> are <code>true</code>
-     */
-    public ScenarioHeaderMetaData(String columnId, String columnTitle, String columnGroup, final ScenarioHeaderTextBoxSingletonDOMElementFactory factory, boolean instanceHeader, boolean propertyHeader) throws IllegalStateException {
-        this(columnId, columnTitle, columnGroup, factory, false, instanceHeader, propertyHeader);
-    }
-
-    public void edit(final GridBodyCellEditContext context) {
-        if (readOnly) {
-            throw new IllegalStateException("A read only header cannot be edited");
-        }
-        if (!isEditingMode) {
-            factory.attachDomElement(context,
-                                     (e) -> {
-                                         e.getWidget().setText(getTitle());
-                                         if (e instanceof ScenarioHeaderTextAreaDOMElement) {
-                                             ((ScenarioHeaderTextAreaDOMElement) e).setScenarioHeaderMetaData(this);
-                                         }
-                                     },
-                                     (e) -> e.getWidget().setFocus(true));
-            isEditingMode = true;
-        }
-    }
-
-    public String getColumnId() {
-        return columnId;
-    }
-
-    public boolean isReadOnly() {
-        return readOnly;
-    }
-
-    public void setReadOnly(boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    public boolean isInstanceHeader() {
-        return instanceHeader;
-    }
-
-    public boolean isPropertyHeader() {
-        return propertyHeader;
-    }
-
-    public boolean isEditingMode() {
-        return isEditingMode;
-    }
-
-    public void setEditingMode(boolean editingMode) {
-        isEditingMode = editingMode;
-    }
-
-    public GridCellEditAction getSupportedEditAction() {
-        return GridCellEditAction.DOUBLE_CLICK;
-    }
-
-    public MetadataType getMetadataType() {
-        return metadataType;
-    }
-
-    @Override
-    public String toString() {
-        return "ScenarioHeaderMetaData{" +
-                "columnId='" + columnId + '\'' +
-                ", readOnly=" + readOnly +
-                ", instanceHeader=" + instanceHeader +
-                ", propertyHeader=" + propertyHeader +
-                ", isEditingMode=" + isEditingMode +
-                ", metadataType=" + metadataType +
-                '}';
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/AbstractScesimGridModel.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/AbstractScesimGridModel.java
deleted file mode 100644
index 2eecb3c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/AbstractScesimGridModel.java
+++ /dev/null
@@ -1,1128 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.models;
-
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.OptionalDouble;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import com.google.gwt.event.shared.EventBus;
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.ExpressionElement;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValue;
-import org.drools.scenariosimulation.api.model.FactMappingValueStatus;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.ReloadTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioGridReloadEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioNotificationEvent;
-import org.drools.workbench.screens.scenariosimulation.client.factories.CollectionEditorSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioExpressionCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils;
-import org.drools.workbench.screens.scenariosimulation.client.values.ScenarioGridCellValue;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridCell;
-import org.uberfire.ext.wires.core.grids.client.model.GridCellValue;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridRow;
-import org.uberfire.ext.wires.core.grids.client.model.impl.BaseGridData;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.single.impl.BaseSingletonDOMElementFactory;
-import org.uberfire.workbench.events.NotificationEvent;
-
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils.getPropertyNameElementsWithoutAlias;
-
-/**
- * Abstract <code>BaseGridData</code> to be extended by actual implementations (<b>Simulation</b> and <code>Background</code>)
- */
-public abstract class AbstractScesimGridModel<T extends AbstractScesimModel<E>, E extends AbstractScesimData> extends BaseGridData {
-
-    public static final int HEADER_ROW_COUNT = 3;
-
-    protected T abstractScesimModel;
-
-    protected EventBus eventBus;
-
-    protected AtomicInteger columnCounter = new AtomicInteger(0);
-
-    protected GridColumn<?> selectedColumn = null;
-
-    protected Set<String> simpleJavaTypeInstancesName;
-
-    protected CollectionEditorSingletonDOMElementFactory collectionEditorSingletonDOMElementFactory;
-    protected ScenarioCellTextAreaSingletonDOMElementFactory scenarioCellTextAreaSingletonDOMElementFactory;
-    protected ScenarioHeaderTextBoxSingletonDOMElementFactory scenarioHeaderTextBoxSingletonDOMElementFactory;
-    protected ScenarioExpressionCellTextAreaSingletonDOMElementFactory scenarioExpressionCellTextAreaSingletonDOMElementFactory;
-
-    protected AbstractScesimGridModel() {
-    }
-
-    protected AbstractScesimGridModel(boolean isMerged) {
-        super(isMerged);
-        setHeaderRowCount(HEADER_ROW_COUNT);
-    }
-
-    public abstract GridWidget getGridWidget();
-
-    /**
-     * Method to bind the data serialized inside backend <code>AbstractScesimModel</code>
-     * @param abstractScesimModel
-     */
-    public void bindContent(T abstractScesimModel) {
-        this.abstractScesimModel = abstractScesimModel;
-        checkSimulation();
-        columnCounter.set(abstractScesimModel.getScesimModelDescriptor().getUnmodifiableFactMappings().size());
-    }
-
-    public void setEventBus(EventBus eventBus) {
-        this.eventBus = eventBus;
-    }
-
-    public int nextColumnCount() {
-        return columnCounter.getAndIncrement();
-    }
-
-    public Map.Entry<String, String> getValidPlaceholders() {
-        String instanceTitle;
-        String propertyTitle;
-        do {
-            int nextColumnCount = nextColumnCount();
-            instanceTitle = FactMapping.getInstancePlaceHolder(nextColumnCount);
-            propertyTitle = FactMapping.getPropertyPlaceHolder(nextColumnCount);
-        } while (!isNewInstanceName(instanceTitle) ||
-                !isNewPropertyName(propertyTitle));
-        return new AbstractMap.SimpleEntry<>(instanceTitle, propertyTitle);
-    }
-
-    public CollectionEditorSingletonDOMElementFactory getCollectionEditorSingletonDOMElementFactory() {
-        return collectionEditorSingletonDOMElementFactory;
-    }
-
-    public void setCollectionEditorSingletonDOMElementFactory(CollectionEditorSingletonDOMElementFactory collectionEditorSingletonDOMElementFactory) {
-        this.collectionEditorSingletonDOMElementFactory = collectionEditorSingletonDOMElementFactory;
-    }
-
-    public ScenarioCellTextAreaSingletonDOMElementFactory getScenarioCellTextAreaSingletonDOMElementFactory() {
-        return scenarioCellTextAreaSingletonDOMElementFactory;
-    }
-
-    public void setScenarioCellTextAreaSingletonDOMElementFactory(ScenarioCellTextAreaSingletonDOMElementFactory scenarioCellTextAreaSingletonDOMElementFactory) {
-        this.scenarioCellTextAreaSingletonDOMElementFactory = scenarioCellTextAreaSingletonDOMElementFactory;
-    }
-
-    public ScenarioHeaderTextBoxSingletonDOMElementFactory getScenarioHeaderTextBoxSingletonDOMElementFactory() {
-        return scenarioHeaderTextBoxSingletonDOMElementFactory;
-    }
-
-    public void setScenarioHeaderTextBoxSingletonDOMElementFactory(ScenarioHeaderTextBoxSingletonDOMElementFactory scenarioHeaderTextBoxSingletonDOMElementFactory) {
-        this.scenarioHeaderTextBoxSingletonDOMElementFactory = scenarioHeaderTextBoxSingletonDOMElementFactory;
-    }
-
-    public ScenarioExpressionCellTextAreaSingletonDOMElementFactory getScenarioExpressionCellTextAreaSingletonDOMElementFactory() {
-        return scenarioExpressionCellTextAreaSingletonDOMElementFactory;
-    }
-
-    public void setScenarioExpressionCellTextAreaSingletonDOMElementFactory(ScenarioExpressionCellTextAreaSingletonDOMElementFactory scenarioExpressionCellTextAreaSingletonDOMElementFactory) {
-        this.scenarioExpressionCellTextAreaSingletonDOMElementFactory = scenarioExpressionCellTextAreaSingletonDOMElementFactory;
-    }
-
-    /**
-     * It flushes and detaches all DomElement resources for selected DOMElementFactorys
-     */
-    public void flushAllTextAreaDOMElementFactoryResources() {
-        scenarioCellTextAreaSingletonDOMElementFactory.flush();
-        scenarioExpressionCellTextAreaSingletonDOMElementFactory.flush();
-        scenarioHeaderTextBoxSingletonDOMElementFactory.flush();
-    }
-
-    /**
-     * This method <i>append</i> a new row to the grid <b>and</b> to the underlying model
-     * @param row
-     */
-    @Override
-    public void appendRow(GridRow row) {
-        checkSimulation();
-        super.appendRow(row);
-        int rowIndex = getRowCount() - 1;
-        commonAddRow(rowIndex);
-    }
-
-    /**
-     * This method <i>insert</i> a row to the grid and populate it with values taken from given <code>AbstractScesimData</code>
-     * @param row
-     */
-    public abstract void insertRowGridOnly(final int rowIndex,
-                                           final GridRow row,
-                                           final E abstractScesimData);
-
-    /**
-     * This method <i>insert</i> a row to the grid
-     * @param row
-     */
-    public void insertRowGridOnly(final int rowIndex, final GridRow row) {
-        checkSimulation();
-        super.insertRow(rowIndex, row);
-    }
-
-    /**
-     * This method <i>insert</i> a new row to the grid <b>and</b> to the underlying model
-     * @param row
-     */
-    @Override
-    public void insertRow(int rowIndex, GridRow row) {
-        insertRowGridOnly(rowIndex, row);
-        commonAddRow(rowIndex);
-    }
-
-    /**
-     * This method <i>delete</i> the row at the given index from both the grid <b>and</b> the underlying model
-     * @param rowIndex
-     */
-    @Override
-    public Range deleteRow(int rowIndex) {
-        checkSimulation();
-        Range toReturn = super.deleteRow(rowIndex);
-        abstractScesimModel.removeDataByIndex(rowIndex);
-        updateIndexColumn();
-        return toReturn;
-    }
-
-    /**
-     * This method <i>duplicate</i> the row at the given index from both the grid <b>and</b> the underlying model
-     * and insert just below the original one
-     * @param rowIndex
-     */
-    public void duplicateRow(int rowIndex, GridRow row) {
-        checkSimulation();
-        int newRowIndex = rowIndex + 1;
-        final E toDuplicate = abstractScesimModel.cloneData(rowIndex, newRowIndex);
-        insertRowGridOnly(newRowIndex, row, toDuplicate);
-    }
-
-    /**
-     * This method <i>duplicates</i> the row values at the source column index from both the grid <b>and</b> the underlying model
-     * and inserts at the target column index
-     * @param originalColumnIndex
-     * @param newColumnIndex
-     */
-    public void duplicateColumnValues(int originalColumnIndex, int newColumnIndex) {
-        checkSimulation();
-        List<GridCellValue<?>> originalValues = new ArrayList<>();
-        IntStream.range(0, getRowCount())
-                .forEach(rowIndex -> originalValues.add(getCell(rowIndex, originalColumnIndex).getValue()));
-        IntStream.range(0, getRowCount())
-                .forEach(rowIndex -> setCellValue(rowIndex, newColumnIndex, originalValues.get(rowIndex)));
-    }
-
-    /**
-     * This method <i>insert</i> a new column to the grid <b>without</b> modify underlying model
-     * @param index
-     * @param column
-     */
-    public void insertColumnGridOnly(final int index, final GridColumn<?> column) {
-        checkSimulation();
-        super.insertColumn(index, column);
-    }
-
-    /**
-     * This method <i>insert</i> a new column to the grid <b>and</b> to the underlying model
-     * @param index
-     * @param column
-     */
-    @Override
-    public void insertColumn(final int index, final GridColumn<?> column) {
-        checkSimulation();
-        commonAddColumn(index, column);
-    }
-
-    /**
-     * This method <i>delete</i> the column at the given index from both the grid <b>and</b> the underlying model
-     * @param columnIndex
-     */
-    public void deleteColumn(int columnIndex) {
-        checkSimulation();
-        final GridColumn<?> toDelete = getColumns().get(columnIndex);
-        deleteColumn(toDelete);
-        abstractScesimModel.removeFactMappingByIndex(columnIndex);
-    }
-
-    /**
-     * This method <i>delete</i> the <b>whole instance</b> of the column at the given index from both the grid <b>and</b> the underlying model
-     * @param columnIndex
-     */
-    public void deleteInstance(int columnIndex) {
-        checkSimulation();
-        Range instanceRange = getInstanceLimits(columnIndex);
-        IntStream.iterate(instanceRange.getMaxRowIndex(), i -> i - 1)
-                .limit(instanceRange.getMaxRowIndex() - instanceRange.getMinRowIndex() + 1L)
-                .forEach(this::deleteColumn);
-    }
-
-    /**
-     * This method update the instance mapped inside a given column
-     * @param columnIndex
-     * @param column
-     */
-    public void updateColumnInstance(int columnIndex, final GridColumn<?> column) {
-        checkSimulation();
-        replaceColumn(columnIndex, column);
-    }
-
-    /**
-     * This method update the type mapped inside a give column and updates the underlying model
-     * @param columnIndex
-     * @param column
-     * @param propertyNameElements
-     * @param lastLevelClassName
-     * @param keepData
-     */
-    public void updateColumnProperty(int columnIndex, final GridColumn<?> column, List<String> propertyNameElements, String lastLevelClassName, boolean keepData, FactMappingValueType valueType, ScenarioSimulationModel.Type type) {
-        checkSimulation();
-        List<GridCellValue<?>> originalValues = new ArrayList<>();
-        if (keepData) {
-            IntStream.range(0, getRowCount())
-                    .forEach(rowIndex -> originalValues.add(getCell(rowIndex, columnIndex).getValue()));
-        }
-        replaceColumn(columnIndex, column);
-        final FactMapping factMappingByIndex = abstractScesimModel.getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-        factMappingByIndex.setFactMappingValueType(valueType);
-        List<String> propertyNameElementsClone = getPropertyNameElementsWithoutAlias(propertyNameElements,
-                                                                                     factMappingByIndex.getFactIdentifier(),
-                                                                                     type);
-        // This is because the value starts with the alias of the fact; i.e. it may be Book.name but also Bookkk.name,
-        // while the first element of ExpressionElements is always the class name
-        IntStream.range(0, propertyNameElementsClone.size())
-                .forEach(stepIndex -> factMappingByIndex.addExpressionElement(propertyNameElementsClone.get(stepIndex), lastLevelClassName));
-        if (keepData) {
-            IntStream.range(0, getRowCount())
-                    .forEach(rowIndex -> setCellValue(rowIndex, columnIndex, originalValues.get(rowIndex)));
-        }
-    }
-
-    /**
-     * This method replace a column at columnIndex position with a new column. It also save and restore width of the columns
-     * @param columnIndex
-     * @param column
-     */
-    protected void replaceColumn(int columnIndex, GridColumn<?> column) {
-        List<Double> widthsToRestore = getColumns().stream().map(GridColumn::getWidth).collect(Collectors.toList());
-        deleteColumn(columnIndex);
-        String group = ((ScenarioGridColumn) column).getInformationHeaderMetaData().getColumnGroup();
-        String columnId = ((ScenarioGridColumn) column).getInformationHeaderMetaData().getColumnId();
-        ExpressionIdentifier ei = ExpressionIdentifier.create(columnId, FactMappingType.valueOf(group));
-        commonAddColumn(columnIndex, column, ei);
-        /* Restoring the expected columns dimension, overriding the automatic resizing */
-        IntStream.range(0, widthsToRestore.size())
-                .forEach(index -> getColumns().get(index).setWidth(widthsToRestore.get(index)));
-    }
-
-    /**
-     * This method <i>set</i> a cell value to the grid <b>without</b> modify underlying model
-     * @param rowIndex
-     * @param columnIndex
-     * @param cellSupplier
-     */
-    public Range setCellGridOnly(int rowIndex, int columnIndex, Supplier<GridCell<?>> cellSupplier) {
-        checkSimulation();
-        return super.setCell(rowIndex, columnIndex, cellSupplier);
-    }
-
-    /**
-     * This method <i>set</i> a cell value to the grid <b>and</b> to the underlying model
-     * @param rowIndex
-     * @param columnIndex
-     * @param cellSupplier
-     */
-    @Override
-    public Range setCell(int rowIndex, int columnIndex, Supplier<GridCell<?>> cellSupplier) {
-        checkSimulation();
-        Range toReturn = super.setCell(rowIndex, columnIndex, cellSupplier);
-        try {
-            Optional<?> optionalValue = getCellValue(getCell(rowIndex, columnIndex));
-            Object rawValue = optionalValue.orElse(null);
-            String cellValue = (rawValue instanceof String) ? (String) rawValue : null;
-            E scenarioByIndex = abstractScesimModel.getDataByIndex(rowIndex);
-            FactMapping factMappingByIndex = abstractScesimModel.getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-            FactIdentifier factIdentifier = factMappingByIndex.getFactIdentifier();
-            ExpressionIdentifier expressionIdentifier = factMappingByIndex.getExpressionIdentifier();
-            scenarioByIndex.addOrUpdateMappingValue(factIdentifier, expressionIdentifier, cellValue);
-        } catch (Exception e) {
-            toReturn = super.deleteCell(rowIndex, columnIndex);
-            eventBus.fireEvent(new ScenarioGridReloadEvent(getGridWidget()));
-        }
-        return toReturn;
-    }
-
-    @Override
-    public Range setCellValue(int rowIndex, int columnIndex, GridCellValue<?> value) {
-        return setCell(rowIndex, columnIndex, () -> {
-            ScenarioGridCell newCell = new ScenarioGridCell((ScenarioGridCellValue) value);
-            FactMapping factMappingByIndex = abstractScesimModel.getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-            if (ScenarioSimulationSharedUtils.isCollectionOrMap((factMappingByIndex.getClassName()))) {
-                newCell.setListMap(ScenarioSimulationSharedUtils.isList((factMappingByIndex.getClassName())));
-            }
-            return newCell;
-        });
-    }
-
-    @Override
-    public Range deleteCell(int rowIndex, int columnIndex) {
-        FactMapping factMapping = abstractScesimModel.getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-        abstractScesimModel.getDataByIndex(rowIndex)
-                .removeFactMappingValueByIdentifiers(factMapping.getFactIdentifier(), factMapping.getExpressionIdentifier());
-        return super.deleteCell(rowIndex, columnIndex);
-    }
-
-    /**
-     * This methods returns the <code>Range</code> of a <b>single</b> block of columns of the same instance/data object.
-     * A <code>single</code> block is made of all the columns immediately to the left and right of the selected one with the same "label".
-     * If there is another column with the same "label" but separated by a different column, it is not part of the group.
-     * @param columnIndex
-     * @return
-     */
-    public abstract Range getInstanceLimits(int columnIndex);
-
-    /**
-     * This methods returns the <code>List&lt;ScenarioGridColumn&gt;</code> of a <b>single</b> block of columns of the same instance/data object.
-     * A <code>single</code> block contains the selected column and all the columns immediately to the left and right of it with the same "label".
-     * If there is another column with the same "label" but separated by a different column, it is not part of the group.
-     * @param columnIndex
-     * @return
-     */
-    public List<ScenarioGridColumn> getInstanceScenarioGridColumns(int columnIndex) {
-        Range instanceRange = getInstanceLimits(columnIndex);
-        return columns.subList(instanceRange.getMinRowIndex(), instanceRange.getMaxRowIndex() + 1)
-                .stream()
-                .map(gridColumn -> (ScenarioGridColumn) gridColumn)
-                .collect(Collectors.toList());
-    }
-
-    /**
-     * This methods returns the <code>List&lt;ScenarioGridColumn&gt;</code> of a <b>single</b> block of columns of the same instance/data object.
-     * A <code>single</code> block contains the selected column and all the columns immediately to the left and right of it with the same "label".
-     * If there is another column with the same "label" but separated by a different column, it is not part of the group.
-     * @param selectedColumn
-     * @return
-     */
-    public List<ScenarioGridColumn> getInstanceScenarioGridColumns(ScenarioGridColumn selectedColumn) {
-        int columnIndex = columns.indexOf(selectedColumn);
-        return getInstanceScenarioGridColumns(columnIndex);
-    }
-
-    /**
-     * Return the first index to the left of the given group, i.e. <b>excluded</b> the left-most index of <b>that</b> group
-     * @param groupName
-     * @return
-     */
-    public int getFirstIndexLeftOfGroup(String groupName) {
-        // HORRIBLE TRICK BECAUSE gridColumn.getIndex() DOES NOT REFLECT ACTUAL POSITION, BUT ONLY ORDER OF INSERTION
-        final List<GridColumn<?>> columns = this.getColumns();
-        final Optional<Integer> first = columns    // Retrieving the column list
-                .stream()  // streaming
-                .filter(gridColumn -> ((ScenarioGridColumn) gridColumn).getInformationHeaderMetaData().getColumnGroup().equals(groupName))  // filtering by group name
-                .findFirst()
-                .map(gridColumn -> {
-                    int indexOfColumn = columns.indexOf(gridColumn);
-                    return indexOfColumn > -1 ? indexOfColumn : 0;   // mapping the retrieved column to its index inside the list, or 0
-                });
-        return first.orElseGet(() -> 0); // returning the retrieved value or, if null, 0
-    }
-
-    /**
-     * Return the first index to the right of the given group, i.e. <b>excluded</b> the right-most index of <b>that</b> group
-     * @param groupName
-     * @return
-     */
-    public int getFirstIndexRightOfGroup(String groupName) {
-        // HORRIBLE TRICK BECAUSE gridColumn.getIndex() DOES NOT REFLECT ACTUAL POSITION, BUT ONLY ORDER OF INSERTION
-        final Optional<Integer> last = this.getColumns()    // Retrieving the column list
-                .stream()  // streaming
-                .filter(gridColumn -> ((ScenarioGridColumn) gridColumn).getInformationHeaderMetaData().getColumnGroup().equals(groupName))  // filtering by group name
-                .reduce((first, second) -> second)  // reducing to have only the last element
-                .map(gridColumn -> {
-                    int indexOfColumn = this.getColumns().indexOf(gridColumn);
-                    return indexOfColumn > -1 ? indexOfColumn + 1 : getColumnCount();   // mapping the retrieved column to its index inside the list +1, or to the total number of columns
-                });
-        return last.orElseGet(this::getColumnCount); // returning the retrieved value or, if null, the total number of columns
-    }
-
-    /**
-     * Returns how many columns are already in place for the given group
-     * @param groupName
-     * @return
-     */
-    public long getGroupSize(String groupName) {
-        return this.getColumns()
-                .stream()
-                .filter(gridColumn -> ((ScenarioGridColumn) gridColumn).getInformationHeaderMetaData().getColumnGroup().equals(groupName))
-                .count();
-    }
-
-    /**
-     * Returns the count of instantiated facts given a classname.
-     * @param className
-     * @return
-     */
-    public int getInstancesCount(String className) {
-        return abstractScesimModel.getScesimModelDescriptor().getUnmodifiableFactMappings()
-                .stream()
-                .filter(factMapping -> factMapping.getFactIdentifier().getClassName().equals(className))
-                .collect(Collectors.groupingBy(FactMapping::getFactAlias))
-                .size();
-    }
-
-    public void updateHeader(int columnIndex, int headerRowIndex, String headerCellValue) {
-        final ScenarioHeaderMetaData editedMetadata = (ScenarioHeaderMetaData) getColumns().get(columnIndex).getHeaderMetaData().get(headerRowIndex);
-        // do not update if old and new value are the same
-        if (Objects.equals(editedMetadata.getTitle(), headerCellValue)) {
-            return;
-        }
-        ScesimModelDescriptor simulationDescriptor = abstractScesimModel.getScesimModelDescriptor();
-        FactMapping factMappingToEdit = simulationDescriptor.getFactMappingByIndex(columnIndex);
-        ScenarioHeaderMetaData.MetadataType metadataType = editedMetadata.getMetadataType();
-        IntStream.range(0, getColumnCount()).forEach(index -> updateFactMapping(simulationDescriptor, factMappingToEdit, index, headerCellValue, metadataType));
-        if (editedMetadata.getMetadataType().equals(ScenarioHeaderMetaData.MetadataType.INSTANCE)) {
-            eventBus.fireEvent(new ReloadTestToolsEvent(false));
-        }
-    }
-
-    public void clear() {
-        // Deleting rows
-        int to = getRowCount();
-        IntStream.range(0, to)
-                .map(i -> to - i - 1)
-                .forEach(super::deleteRow);
-        List<GridColumn<?>> copyList = new ArrayList<>(getColumns());
-        copyList.forEach(super::deleteColumn);
-        // clear can be called before bind
-        if (abstractScesimModel != null) {
-            abstractScesimModel.clear();
-        }
-    }
-
-    @Override
-    public void clearSelections() {
-        super.clearSelections();
-        selectedColumn = null;
-    }
-
-    /**
-     * It forces a <code>internalRefreshWidth</code> refresh
-     */
-    public boolean forceRefreshWidth() {
-        return internalRefreshWidth(true, OptionalDouble.empty());
-    }
-
-    /**
-     * It synchronizes all columns related <code>factMapping</code> columnnWidths
-     */
-    public void synchronizeFactMappingsWidths() {
-        getColumns().forEach(this::synchronizeFactMappingWidth);
-    }
-
-    /**
-     * It updates a column related <code>factMapping</code> columnWidth
-     * @param column
-     */
-    public void synchronizeFactMappingWidth(final GridColumn<?> column) {
-        if (!column.isVisible()) {
-            return;
-        }
-        final int columnIndex = getColumns().indexOf(column);
-        final FactMapping factMapping = abstractScesimModel.getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-        factMapping.setColumnWidth(column.getWidth());
-    }
-
-    /**
-     * It retrieves the stored columnWidths and assigns them to every grid column.
-     */
-    public void loadFactMappingsWidth() {
-        for (final GridColumn<?> column : getColumns()) {
-            final int columnIndex = getColumns().indexOf(column);
-            final FactMapping factMapping = abstractScesimModel.getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-            if (factMapping.getColumnWidth() != null) {
-                column.setWidth(factMapping.getColumnWidth());
-            }
-        }
-    }
-
-    /**
-     * It puts the column present in the given columnIndex as the current selected one.
-     * @param columnIndex
-     */
-    public void selectColumn(int columnIndex) {
-        if (columnIndex > getColumnCount() - 1 || columnIndex < 0) {
-            throw new IllegalArgumentException("Wrong column index: " + columnIndex);
-        }
-        selectedColumn = getColumns().get(columnIndex);
-    }
-
-    /**
-     * Select all the cells of the given row
-     * @param rowIndex
-     */
-    public void selectRow(int rowIndex) {
-        if (rowIndex > getRowCount() - 1) {
-            return;
-        }
-        int columns = getColumnCount();
-        IntStream.range(0, columns).forEach(columnIndex -> selectCell(rowIndex, columnIndex));
-    }
-
-    public GridColumn<?> getSelectedColumn() {
-        return selectedColumn;
-    }
-
-    public Optional<T> getAbstractScesimModel() {
-        return Optional.ofNullable(abstractScesimModel);
-    }
-
-    /**
-     * Returns <code>true</code> if all the grid cells of the selected column are empty, i.e. the GridCell.getValue() == null OR
-     * GridCell.getValue().getValue() == null
-     * @return
-     */
-    public boolean isSelectedColumnEmpty() {
-        return selectedColumn == null || isColumnEmpty(getColumns().indexOf(selectedColumn));
-    }
-
-    /**
-     * Returns <code>true</code> if all the grid cells of the column at given index are empty, i.e. the GridCell.getValue() == null OR
-     * GridCell.getValue().getValue() == null
-     * @param columnIndex
-     * @return
-     */
-    public boolean isColumnEmpty(int columnIndex) {
-        return IntStream.range(0, getRowCount())
-                .noneMatch(rowIndex -> getCellValue(getCell(rowIndex, columnIndex)).isPresent());
-    }
-
-    /**
-     * Returns <code>true</code> if property mapped to the selected column is already assigned to
-     * another column of the same <b>instance</b>
-     * @param propertyNameElements
-     * @return
-     */
-    public boolean isAlreadyAssignedProperty(List<String> propertyNameElements) {
-        boolean toReturn = selectedColumn == null;
-        if (!toReturn) {
-            try {
-                checkAlreadyAssignedProperty(getColumns().indexOf(selectedColumn), propertyNameElements);
-            } catch (Exception e) {
-                toReturn = true;
-            }
-        }
-        return toReturn;
-    }
-
-    /**
-     * Check if property mapped to the column at given index is already assigned to
-     * another column of the same <b>instance</b>
-     * @param columnIndex
-     * @param propertyNameElements
-     * @throws IllegalStateException if the given <code>propertyNameElements</code> are already mapped to a column of the same <b>instance</b>
-     */
-    public void checkAlreadyAssignedProperty(int columnIndex, List<String> propertyNameElements) {
-        Range instanceLimits = getInstanceLimits(columnIndex);
-        ScesimModelDescriptor simulationDescriptor = abstractScesimModel.getScesimModelDescriptor();
-        FactIdentifier factIdentifier = simulationDescriptor.getFactMappingByIndex(columnIndex).getFactIdentifier();
-        List<String> propertyNameElementsClone = new ArrayList<>(); // We have to keep the original List unmodified
-        propertyNameElementsClone.add(factIdentifier.getClassNameWithoutPackage());
-        propertyNameElementsClone.addAll(propertyNameElements.subList(1, propertyNameElements.size()));
-        if (IntStream.range(instanceLimits.getMinRowIndex(), instanceLimits.getMaxRowIndex() + 1)
-                .filter(index -> index != columnIndex)
-                .mapToObj(simulationDescriptor::getFactMappingByIndex)
-                .anyMatch(factMapping -> {
-                    List<String> factMappingPropertyNameElements = factMapping.getExpressionElements()
-                            .stream()
-                            .map(ExpressionElement::getStep)
-                            .collect(Collectors.toList());
-                    return Objects.equals(factMappingPropertyNameElements, propertyNameElementsClone);
-                })) {
-            throw new IllegalStateException(String.join(".", propertyNameElements) + " has already been used in the current instance.");
-        }
-    }
-
-    /**
-     * Returns <code>true</code> if property mapped to the selected column is the same as the provided one
-     * @param propertyNameElements
-     * @param factMappingValueType
-     * @return
-     */
-    public boolean isSameSelectedColumnProperty(List<String> propertyNameElements, FactMappingValueType factMappingValueType) {
-        return selectedColumn == null || isSameSelectedColumnProperty(getColumns().indexOf(selectedColumn), propertyNameElements, factMappingValueType);
-    }
-
-    /**
-     * Returns <code>true</code> if property mapped to the column at given index is the same as the provided one
-     * @param columnIndex
-     * @param propertyNameElements
-     * @param factMappingValueType
-     * @return
-     */
-    public boolean isSameSelectedColumnProperty(int columnIndex, List<String> propertyNameElements, FactMappingValueType factMappingValueType) {
-        String propertyName = String.join(".", propertyNameElements);
-        ScesimModelDescriptor simulationDescriptor = abstractScesimModel.getScesimModelDescriptor();
-        final FactMapping factMappingByIndex = simulationDescriptor.getFactMappingByIndex(columnIndex);
-        String expressionElement = factMappingByIndex.getExpressionElements().stream().map(ExpressionElement::getStep).collect(Collectors.joining("."));
-        return Objects.equals(expressionElement, propertyName) && Objects.equals(factMappingValueType, factMappingByIndex.getFactMappingValueType());
-    }
-
-    /**
-     * Returns <code>true</code> if no column is selected <b>OR</b> if type of the property mapped to the selected column is the same as the provided one
-     * @param className
-     * @return
-     */
-    public boolean isSameSelectedColumnType(String className) {
-        return selectedColumn == null || isSameSelectedColumnType(getColumns().indexOf(selectedColumn), className);
-    }
-
-    /**
-     * Returns <code>true</code> if type of the property mapped to the column at given index is the same as the provided one
-     * @param columnIndex
-     * @param className
-     * @return
-     */
-    public boolean isSameSelectedColumnType(int columnIndex, String className) {
-        ScesimModelDescriptor simulationDescriptor = abstractScesimModel.getScesimModelDescriptor();
-        final FactMapping factMappingByIndex = simulationDescriptor.getFactMappingByIndex(columnIndex);
-        return factMappingByIndex.getClassName().equals(className);
-    }
-
-    /**
-     * Returns <code>true</code> if no column is selected <b>OR</b> if type of the <b>INSTANCE</b> mapped to the selected column is the same as the provided one
-     * @param className
-     * @return
-     */
-    public boolean isSameInstanceType(String className) {
-        return selectedColumn == null || isSameInstanceType(getColumns().indexOf(selectedColumn), className);
-    }
-
-    /**
-     * Check if given <b>headerName</b> is the same as the <b>Fact</b> mapped to the
-     * column at given index
-     * @param columnIndex
-     * @param headerName
-     * @throws IllegalStateException if the given <b>headerName</b> is not the name of the class mapped to the given column
-     */
-    public void checkSameInstanceHeader(int columnIndex, String headerName) {
-        if (!isSameInstanceType(columnIndex, headerName)) {
-            throw new IllegalStateException(headerName + " is not the class of the current column.");
-        }
-    }
-
-    /**
-     * Returns <code>true</code> if type of the <b>INSTANCE</b> mapped to the column at given index is the same as the provided one
-     * @param columnIndex
-     * @param headerName
-     * @return
-     */
-    public boolean isSameInstanceType(int columnIndex, String headerName) {
-        ScesimModelDescriptor simulationDescriptor = abstractScesimModel.getScesimModelDescriptor();
-        final FactIdentifier factIdentifierByIndex = simulationDescriptor.getFactMappingByIndex(columnIndex).getFactIdentifier();
-        return Objects.equals(factIdentifierByIndex.getClassNameWithoutPackage(), headerName);
-    }
-
-    /**
-     * Check if given <b>headerName</b> is the same as the <b>element steps</b> mapped to the given column
-     * @param columnIndex
-     * @param propertyNameElements
-     * @throws IllegalStateException if the given <b>propertyNameElements</b> (corrected for the class name) represents the <b>element steps</b> of the given column
-     */
-    public void checkSamePropertyHeader(int columnIndex, List<String> propertyNameElements)  {
-        ScesimModelDescriptor simulationDescriptor = abstractScesimModel.getScesimModelDescriptor();
-        final FactMapping factMapping = simulationDescriptor.getFactMappingByIndex(columnIndex);
-        List<String> columnPropertyName = factMapping.getExpressionElementsWithoutClass().stream().map(ExpressionElement::getStep).collect(Collectors.toList());
-        if (!Objects.equals(columnPropertyName, propertyNameElements)) {
-            throw new IllegalStateException(String.join(".", propertyNameElements) + " is not the same property of the current column.");
-        }
-    }
-
-    /**
-     * It resets the <code>FactMappingValue</code> status for all CELLS
-     */
-    public void resetErrors() {
-        IntStream.range(0, getRowCount()).forEach(this::resetErrors);
-    }
-
-    /**
-     * It resets the <code>FactMappingValue</code> status for a specific ROW
-     * @param rowIndex
-     */
-    public void resetErrors(int rowIndex) {
-        E scesimDataByIndex = abstractScesimModel.getDataByIndex(rowIndex);
-        scesimDataByIndex.resetErrors();
-        refreshErrors();
-    }
-
-    /**
-     * It resets the <code>FactMappingValue</code> status for a specific CELL
-     * @param rowIndex
-     * @param columnIndex
-     */
-    public void resetError(int rowIndex, int columnIndex) {
-        E scesimDataByIndex = abstractScesimModel.getDataByIndex(rowIndex);
-        FactMapping factMapping = abstractScesimModel.getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-        Optional<FactMappingValue> factMappingValue = scesimDataByIndex.getFactMappingValue(factMapping);
-        factMappingValue.ifPresent(FactMappingValue::resetStatus);
-        refreshErrors();
-    }
-
-    public void refreshErrors() {
-        IntStream.range(0, getRowCount()).forEach(this::refreshErrorsRow);
-    }
-
-    /**
-     * Set the names of already existing Simple Java Types/Instances, used inside updateHeaderValidation
-     * @param simpleJavaTypeInstancesName
-     */
-    public void setSimpleJavaTypeInstancesName(Set<String> simpleJavaTypeInstancesName) {
-        this.simpleJavaTypeInstancesName = simpleJavaTypeInstancesName;
-    }
-
-    /**
-     * Check validity of given <b>instanceHeaderCellValue</b>
-     * @param instanceHeaderCellValue
-     * @param columnIndex
-     * @param isADataType
-     * @throws Exception with message specific to failed check
-     */
-    public void validateInstanceHeaderUpdate(String instanceHeaderCellValue, int columnIndex, boolean isADataType) {
-        if (isADataType) {
-            checkSameInstanceHeader(columnIndex, instanceHeaderCellValue);
-            checkValidAndUniqueInstanceHeaderTitle(instanceHeaderCellValue, columnIndex);
-        } else {
-            checkValidAndUniqueInstanceHeaderTitle(instanceHeaderCellValue, columnIndex);
-        }
-    }
-
-    /**
-     * Check validity of given <b>propertyHeaderCellValue</b>
-     * @param propertyHeaderCellValue
-     * @param columnIndex
-     * @param isPropertyType
-     * @throws Exception with message specific to failed check
-     */
-    public void validatePropertyHeaderUpdate(String propertyHeaderCellValue, int columnIndex, boolean isPropertyType) {
-        List<String> propertyNameElements = Collections.unmodifiableList(Arrays.asList(propertyHeaderCellValue.split("\\.")));
-        if (isPropertyType) {
-            checkSamePropertyHeader(columnIndex, propertyNameElements);
-            checkUniquePropertyHeaderTitle(propertyHeaderCellValue, columnIndex);
-        } else {
-            checkAlreadyAssignedProperty(columnIndex, propertyNameElements);
-            checkValidAndUniquePropertyHeaderTitle(propertyHeaderCellValue, columnIndex);
-        }
-    }
-
-    public boolean isSimpleType(String factClassName) {
-        return simpleJavaTypeInstancesName != null && simpleJavaTypeInstancesName.contains(factClassName);
-    }
-
-    /**
-     * This methods returns the <code>Range</code> of a <b>single</b> block of columns of the same instance/data object.
-     * A <code>single</code> block is made of all the columns immediately to the left and right of the selected one with the same "label".
-     * If there is another column with the same "label" but separated by a different column, it is not part of the group.
-     * @param columnIndex
-     * @param columnIndexStart the leftmost index to consider when evaluating the range
-     * @return
-     */
-    protected Range getInstanceLimits(int columnIndex, int columnIndexStart) {
-        final ScenarioGridColumn column = (ScenarioGridColumn) columns.get(columnIndex);
-        final String originalColumnGroup = column.getInformationHeaderMetaData().getColumnGroup();
-        final ScenarioHeaderMetaData selectedInformationHeaderMetaData = column.getInformationHeaderMetaData();
-        String originalColumnTitle = selectedInformationHeaderMetaData.getTitle();
-        int leftPosition = columnIndex;
-        while (leftPosition > columnIndexStart && ((ScenarioGridColumn) columns.get(leftPosition - 1)).getInformationHeaderMetaData().getColumnGroup().equals(originalColumnGroup) && ((ScenarioGridColumn) columns.get(leftPosition - 1)).getInformationHeaderMetaData().getTitle().equals(originalColumnTitle)) {
-            leftPosition--;
-        }
-        int rightPosition = columnIndex;
-        while (rightPosition < columns.size() - 1 && ((ScenarioGridColumn) columns.get(rightPosition + 1)).getInformationHeaderMetaData().getColumnGroup().equals(originalColumnGroup) && ((ScenarioGridColumn) columns.get(rightPosition + 1)).getInformationHeaderMetaData().getTitle().equals(originalColumnTitle)) {
-            rightPosition++;
-        }
-        return new Range(leftPosition, rightPosition);
-    }
-
-    /**
-     * If the <code>FactIdentifier</code> of the given <code>FactMapping</code> equals the one at <b>index</b>, update the <code>FactMapping.FactAlias</code> at <b>index</b>
-     * position with the provided <b>value</b>
-     * @param simulationDescriptor
-     * @param factMappingReference
-     * @param index
-     * @param value
-     */
-    protected void updateFactMapping(ScesimModelDescriptor simulationDescriptor, FactMapping factMappingReference, int index, String value, ScenarioHeaderMetaData.MetadataType metadataType) {
-        final FactIdentifier factIdentifierReference = factMappingReference.getFactIdentifier();
-        FactMapping factMappingToCheck = simulationDescriptor.getFactMappingByIndex(index);
-        final FactIdentifier factIdentifierToCheck = factMappingToCheck.getFactIdentifier();
-        boolean toUpdate = (Objects.equals(FactIdentifier.EMPTY, factIdentifierReference) &&
-                (Objects.equals(factIdentifierToCheck, factIdentifierReference) && Objects.equals(factMappingReference.getFactAlias(), factMappingToCheck.getFactAlias())))
-                || (Objects.equals(factIdentifierToCheck, factIdentifierReference));
-        if (toUpdate) {
-            switch (metadataType) {
-                case INSTANCE:
-                    ((ScenarioGridColumn) columns.get(index)).getInformationHeaderMetaData().setTitle(value);
-                    factMappingToCheck.setFactAlias(value);
-                    break;
-                case PROPERTY:
-                    if (Objects.equals(factMappingToCheck.getFullExpression(), factMappingReference.getFullExpression())) {
-                        ((ScenarioGridColumn) columns.get(index)).getPropertyHeaderMetaData().setTitle(value);
-                        factMappingToCheck.setExpressionAlias(value);
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    /**
-     * This method <i>add</i> or <i>insert</i> a new column to the grid <b>and</b> to the underlying model, depending on the index value.
-     * If index == -1 -> add, otherwise insert. It automatically creates default <code>FactIdentifier</code>  (for String class) and <code>ExpressionIdentifier</code>
-     * @param index
-     * @param column
-     */
-    protected void commonAddColumn(final int index, final GridColumn<?> column) {
-        String group = ((ScenarioGridColumn) column).getInformationHeaderMetaData().getColumnGroup();
-        String columnId = ((ScenarioGridColumn) column).getInformationHeaderMetaData().getColumnId();
-        final ExpressionIdentifier ei = ExpressionIdentifier.create(columnId, FactMappingType.valueOf(group));
-        commonAddColumn(index, column, ei);
-    }
-
-    /**
-     * This method <i>add</i> or <i>insert</i> a new column to the grid <b>and</b> to the underlying model, depending on the index value.
-     * If index == -1 -> add, otherwise insert.
-     * @param index
-     * @param column
-     * @param ei
-     */
-    protected void commonAddColumn(final int index, final GridColumn<?> column, ExpressionIdentifier ei) {
-        ScesimModelDescriptor simulationDescriptor = abstractScesimModel.getScesimModelDescriptor();
-        String instanceTitle = ((ScenarioGridColumn) column).getInformationHeaderMetaData().getTitle();
-        String propertyTitle = ((ScenarioGridColumn) column).getPropertyHeaderMetaData().getTitle();
-        final int columnIndex = index == -1 ? getColumnCount() : index;
-        try {
-            final FactMapping createdFactMapping = simulationDescriptor.addFactMapping(columnIndex, instanceTitle, ((ScenarioGridColumn) column).getFactIdentifier(), ei);
-            createdFactMapping.setExpressionAlias(propertyTitle);
-            if (index == -1) {  // This is actually an append
-                super.appendColumn(column);
-            } else {
-                super.insertColumn(index, column);
-            }
-            final Range instanceLimits = getInstanceLimits(columnIndex);
-            IntStream.range(instanceLimits.getMinRowIndex(), instanceLimits.getMaxRowIndex() + 1)
-                    .filter(currentIndex -> currentIndex != columnIndex)
-                    .forEach(currentIndex -> simulationDescriptor.getFactMappingByIndex(currentIndex).setFactAlias(createdFactMapping.getFactAlias()));
-        } catch (Exception e) {
-            eventBus.fireEvent(new ScenarioNotificationEvent("Error during column creation: " + e.getMessage(), NotificationEvent.NotificationType.ERROR));
-            eventBus.fireEvent(new ScenarioGridReloadEvent(getGridWidget()));
-            return;
-        }
-
-        final List<E> unmodifiableScesimData = abstractScesimModel.getUnmodifiableData();
-        String placeHolder = ((ScenarioGridColumn) column).getPlaceHolder();
-        IntStream.range(0, unmodifiableScesimData.size())
-                .forEach(rowIndex -> setCell(rowIndex, columnIndex, () -> new ScenarioGridCell(new ScenarioGridCellValue(null, placeHolder))));
-    }
-
-    protected abstract void commonAddRow(int rowIndex);
-
-    protected void commonAddRow(int rowIndex, int columnIndexStart)  {
-        E scesimData = abstractScesimModel.addData(rowIndex);
-        final ScesimModelDescriptor simulationDescriptor = abstractScesimModel.getScesimModelDescriptor();
-        IntStream.range(columnIndexStart, getColumnCount()).forEach(columnIndex -> {
-            final FactMapping factMappingByIndex = simulationDescriptor.getFactMappingByIndex(columnIndex);
-            scesimData.addMappingValue(factMappingByIndex.getFactIdentifier(), factMappingByIndex.getExpressionIdentifier(), null);
-            ScenarioGridColumn column = ((ScenarioGridColumn) columns.get(columnIndex));
-            String placeHolder = ScenarioSimulationUtils.getPlaceHolder(column.isInstanceAssigned(),
-                                                                        column.isPropertyAssigned(),
-                                                                        factMappingByIndex.getFactMappingValueType(),
-                                                                        factMappingByIndex.getClassName());
-            setCell(rowIndex, columnIndex, () -> {
-                ScenarioGridCell newCell = new ScenarioGridCell(new ScenarioGridCellValue(null, placeHolder));
-                if (ScenarioSimulationSharedUtils.isCollectionOrMap((factMappingByIndex.getClassName()))) {
-                    newCell.setListMap(ScenarioSimulationSharedUtils.isList((factMappingByIndex.getClassName())));
-                }
-                return newCell;
-            });
-        });
-    }
-
-    protected void updateIndexColumn() {
-        final Optional<GridColumn<?>> indexColumn = this.getColumns()    // Retrieving the column list
-                .stream()  // streaming
-                .filter(gridColumn -> ((ScenarioGridColumn) gridColumn).getInformationHeaderMetaData().getTitle().equals(FactIdentifier.INDEX.getName()))  // filtering by group name
-                .findFirst();
-        indexColumn.ifPresent(column -> {
-            int indexOfColumn = getColumns().indexOf(column);
-            IntStream.range(0, getRowCount())
-                    .forEach(rowIndex -> {
-                        String value = String.valueOf(rowIndex + 1);
-                        setCellValue(rowIndex, indexOfColumn, new ScenarioGridCellValue(value));
-                    });
-        });
-    }
-
-    protected void checkSimulation() {
-        Objects.requireNonNull(abstractScesimModel, "Bind a simulation to the ScenarioGridModel to use it");
-    }
-
-    /**
-     * Verify the given value is not already used as instance header name <b>between different groups</b>
-     * @param instanceHeaderCellValue
-     * @param columnIndex
-     * @throws IllegalArgumentException if the given <b>instanceHeaderCellValue</b> contains a <i>dot</i> <b>OR</b>
-     * it has already been used inside the <b>group (GIVEN/EXPECT)</b> of the given column
-     */
-    protected void checkValidAndUniqueInstanceHeaderTitle(String instanceHeaderCellValue, int columnIndex) {
-        if (instanceHeaderCellValue.contains(".")) {
-            throw new IllegalArgumentException(ScenarioSimulationEditorConstants.INSTANCE.instanceTitleWithPeriodsError());
-        }
-        Range instanceLimits = getInstanceLimits(columnIndex);
-        ScesimModelDescriptor simulationDescriptor = abstractScesimModel.getScesimModelDescriptor();
-        FactIdentifier factIdentifier = simulationDescriptor.getFactMappingByIndex(columnIndex).getFactIdentifier();
-        if (IntStream.range(0, getColumnCount())
-                .filter(index -> index < instanceLimits.getMinRowIndex() || index > instanceLimits.getMaxRowIndex())
-                .filter(index -> !Objects.equals(factIdentifier, simulationDescriptor.getFactMappingByIndex(index).getFactIdentifier()))
-                .mapToObj(index -> (ScenarioGridColumn) getColumns().get(index))
-                .filter(elem -> elem.getInformationHeaderMetaData() != null)
-                .map(ScenarioGridColumn::getInformationHeaderMetaData)
-                .anyMatch(elem -> Objects.equals(elem.getTitle(), instanceHeaderCellValue))) {
-            throw new IllegalArgumentException(ScenarioSimulationEditorConstants.INSTANCE.
-                    instanceTitleAssignedError(instanceHeaderCellValue));
-        }
-    }
-
-    /**
-     * Verify if the given value is not already used as property header name <b>inside the same instance</b>
-     * @param propertyHeaderCellValue
-     * @param columnIndex
-     * @throws IllegalArgumentException if the given <b>propertyHeaderCellValue</b> contains a <i>dot</i> <b>OR</b>
-     * it has already been used inside the <b>instance</b> of the given column
-     */
-    protected void checkValidAndUniquePropertyHeaderTitle(String propertyHeaderCellValue, int columnIndex) {
-        if (propertyHeaderCellValue.contains(".")) {
-            throw new IllegalArgumentException(ScenarioSimulationEditorConstants.INSTANCE.propertyTitleWithPeriodsError());
-        }
-        checkUniquePropertyHeaderTitle(propertyHeaderCellValue, columnIndex);
-    }
-
-    /**
-     * Verify if the given value is not already used as property header name <b>inside the same instance</b>
-     * @param propertyHeaderCellValue
-     * @param columnIndex
-     * @throws IllegalArgumentException if the given <b>propertyHeaderCellValue</b> has already been used
-     * inside the <b>instance</b> of the given column
-     */
-    protected void checkUniquePropertyHeaderTitle(String propertyHeaderCellValue, int columnIndex) {
-        ScesimModelDescriptor simulationDescriptor = abstractScesimModel.getScesimModelDescriptor();
-        FactIdentifier factIdentifier = simulationDescriptor.getFactMappingByIndex(columnIndex).getFactIdentifier();
-        if (IntStream.range(0, getColumnCount())
-                .filter(index -> index != columnIndex)
-                .filter(index -> Objects.equals(factIdentifier, simulationDescriptor.getFactMappingByIndex(index).getFactIdentifier()))
-                .mapToObj(index -> (ScenarioGridColumn) getColumns().get(index))
-                .filter(elem -> elem.getPropertyHeaderMetaData() != null)
-                .map(ScenarioGridColumn::getPropertyHeaderMetaData)
-                .anyMatch(elem -> Objects.equals(elem.getTitle(), propertyHeaderCellValue))) {
-            throw new IllegalArgumentException(ScenarioSimulationEditorConstants.INSTANCE.
-                    propertyTitleAssignedError(propertyHeaderCellValue));
-        }
-    }
-
-    protected boolean isNewInstanceName(String value) {
-        return getColumns().stream()
-                .map(elem -> ((ScenarioGridColumn) elem).getInformationHeaderMetaData())
-                .filter(Objects::nonNull)
-                .noneMatch(elem -> Objects.equals(elem.getTitle(), value));
-    }
-
-    protected boolean isNewPropertyName(String value) {
-        return getColumns().stream()
-                .map(elem -> ((ScenarioGridColumn) elem).getPropertyHeaderMetaData())
-                .filter(Objects::nonNull)
-                .noneMatch(elem -> Objects.equals(elem.getTitle(), value));
-    }
-
-    protected void refreshErrorsRow(int rowIndex) {
-        ScesimModelDescriptor simulationDescriptor = abstractScesimModel.getScesimModelDescriptor();
-        E scesimDataByIndex = abstractScesimModel.getDataByIndex(rowIndex);
-        IntStream.range(0, getColumnCount()).forEach(columnIndex -> {
-            ScenarioGridCell cell = (ScenarioGridCell) getCell(rowIndex, columnIndex);
-            if (cell == null) {
-                return;
-            }
-            final FactMapping factMappingByIndex = simulationDescriptor.getFactMappingByIndex(columnIndex);
-            Optional<FactMappingValue> factMappingValue = scesimDataByIndex.getFactMappingValue(factMappingByIndex.getFactIdentifier(), factMappingByIndex.getExpressionIdentifier());
-            if (factMappingValue.isPresent()) {
-                cell.setErrorMode(FactMappingValueStatus.SUCCESS != factMappingValue.get().getStatus());
-            } else {
-                cell.setErrorMode(false);
-            }
-        });
-    }
-
-    /**
-     * Returns the correct <b>DOMElement</b> factory to the given data
-     * @param modelType
-     * @param valueType
-     */
-    public BaseSingletonDOMElementFactory getDOMElementFactory(String className,
-                                                               ScenarioSimulationModel.Type modelType,
-                                                               FactMappingValueType valueType) {
-        boolean isRuleScenario = Objects.equals(ScenarioSimulationModel.Type.RULE, modelType);
-        if (ScenarioSimulationSharedUtils.isCollectionOrMap(className) && Objects.equals(FactMappingValueType.NOT_EXPRESSION, valueType)) {
-            return collectionEditorSingletonDOMElementFactory;
-        }
-        if (Objects.equals(FactMappingValueType.EXPRESSION, valueType) && isRuleScenario) {
-            return scenarioExpressionCellTextAreaSingletonDOMElementFactory;
-        }
-        return scenarioCellTextAreaSingletonDOMElementFactory;
-    }
-
-    // Helper method to avoid potential NPE
-    private Optional<?> getCellValue(GridCell<?> gridCell) {
-        if (gridCell == null || gridCell.getValue() == null) {
-            return Optional.empty();
-        }
-        return Optional.ofNullable(gridCell.getValue().getValue());
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/BackgroundGridModel.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/BackgroundGridModel.java
deleted file mode 100644
index 6a94da8..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/BackgroundGridModel.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.models;
-
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.BackgroundData;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.values.ScenarioGridCellValue;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridRow;
-
-public class BackgroundGridModel extends AbstractScesimGridModel<Background, BackgroundData> {
-
-    private BackgroundGridModel() {
-    }
-
-    public BackgroundGridModel(boolean isMerged) {
-        super(isMerged);
-    }
-
-    @Override
-    public GridWidget getGridWidget() {
-        return GridWidget.BACKGROUND;
-    }
-
-    @Override
-    public Range getInstanceLimits(int columnIndex) {
-        return getInstanceLimits(columnIndex, 0);
-    }
-
-
-    /**
-     * This method <i>insert</i> a row to the grid and populate it with values taken from given <code>Scenario</code>
-     * @param row
-     */
-    @Override
-    public void insertRowGridOnly(final int rowIndex,
-                                  final GridRow row,
-                                  final BackgroundData abstractScesimData) {
-        insertRowGridOnly(rowIndex, row);
-        abstractScesimData.getUnmodifiableFactMappingValues().forEach(value -> {
-            FactIdentifier factIdentifier = value.getFactIdentifier();
-            ExpressionIdentifier expressionIdentifier = value.getExpressionIdentifier();
-            if (value.getRawValue() == null || value.getRawValue() instanceof String) {
-                String stringValue = (String) value.getRawValue();
-                int columnIndex = abstractScesimModel.getScesimModelDescriptor().getIndexByIdentifier(factIdentifier, expressionIdentifier);
-                final FactMapping factMappingByIndex = abstractScesimModel.getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-                String placeHolder = ((ScenarioGridColumn) columns.get(columnIndex)).getPlaceHolder();
-                setCell(rowIndex, columnIndex, () -> {
-                    ScenarioGridCell newCell = new ScenarioGridCell(new ScenarioGridCellValue(stringValue, placeHolder));
-                    if (ScenarioSimulationSharedUtils.isCollectionOrMap((factMappingByIndex.getClassName()))) {
-                        newCell.setListMap(ScenarioSimulationSharedUtils.isList((factMappingByIndex.getClassName())));
-                    }
-                    return newCell;
-                });
-            } else {
-                throw new UnsupportedOperationException("Only string is supported at the moment");
-            }
-        });
-    }
-
-    @Override
-    protected void commonAddRow(int rowIndex) {
-        commonAddRow(rowIndex, 0);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/ScenarioGridModel.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/ScenarioGridModel.java
deleted file mode 100644
index cb17ff9..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/ScenarioGridModel.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.models;
-
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.Scenario;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.values.ScenarioGridCellValue;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridRow;
-
-public class ScenarioGridModel extends AbstractScesimGridModel<Simulation, Scenario> {
-
-    private ScenarioGridModel() {
-    }
-
-    public ScenarioGridModel(boolean isMerged) {
-        super(isMerged);
-    }
-
-    @Override
-    public GridWidget getGridWidget() {
-        return GridWidget.SIMULATION;
-    }
-
-    @Override
-    public Range getInstanceLimits(int columnIndex) {
-        return getInstanceLimits(columnIndex, 1);
-    }
-
-    /**
-     * This method <i>insert</i> a row to the grid and populate it with values taken from given <code>Scenario</code>
-     * @param row
-     */
-    @Override
-    public void insertRowGridOnly(final int rowIndex,
-                                  final GridRow row, final Scenario scenario) {
-        insertRowGridOnly(rowIndex, row);
-        scenario.getUnmodifiableFactMappingValues().forEach(value -> {
-            FactIdentifier factIdentifier = value.getFactIdentifier();
-            ExpressionIdentifier expressionIdentifier = value.getExpressionIdentifier();
-            if (value.getRawValue() == null || value.getRawValue() instanceof String) { // Let' put a placeholder
-                String stringValue = (String) value.getRawValue();
-                int columnIndex = abstractScesimModel.getScesimModelDescriptor().getIndexByIdentifier(factIdentifier, expressionIdentifier);
-                final FactMapping factMappingByIndex = abstractScesimModel.getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-                String placeHolder = ((ScenarioGridColumn) columns.get(columnIndex)).getPlaceHolder();
-                setCell(rowIndex, columnIndex, () -> {
-                    ScenarioGridCell newCell = new ScenarioGridCell(new ScenarioGridCellValue(stringValue, placeHolder));
-                    if (ScenarioSimulationSharedUtils.isCollectionOrMap((factMappingByIndex.getClassName()))) {
-                        newCell.setListMap(ScenarioSimulationSharedUtils.isList((factMappingByIndex.getClassName())));
-                    }
-                    return newCell;
-                });
-            } else {
-                throw new UnsupportedOperationException("Only string is supported at the moment");
-            }
-        });
-        updateIndexColumn();
-    }
-
-    protected void commonAddRow(int rowIndex) {
-        commonAddRow(rowIndex, 1);
-        updateIndexColumn();
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/AbstractPopoverView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/AbstractPopoverView.java
deleted file mode 100644
index ebc37e4..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/AbstractPopoverView.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popover;
-
-import java.util.Optional;
-
-import com.google.gwt.core.client.Scheduler;
-import com.google.gwt.user.client.ui.RootPanel;
-import org.jboss.errai.common.client.dom.Div;
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.jboss.errai.common.client.ui.ElementWrapperWidget;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.uberfire.client.views.pfly.widgets.JQueryProducer;
-import org.uberfire.client.views.pfly.widgets.Popover;
-import org.uberfire.client.views.pfly.widgets.PopoverOptions;
-
-public abstract class AbstractPopoverView implements PopoverView {
-
-    public static final String TOP = "top";
-    public static final String LEFT = "left";
-    public static final String POSITION = "position";
-    public static final String PX = "px";
-    public static final String ABSOLUTE = "absolute";
-    public static final String TITLE = "title";
-
-    @DataField("popover")
-    protected Div popoverElement;
-
-    @DataField("popover-container")
-    protected Div popoverContainerElement;
-
-    @DataField("popover-content")
-    protected Div popoverContentElement;
-
-    protected JQueryProducer.JQuery<Popover> jQueryPopover;
-
-    protected Popover popover;
-
-    protected ElementWrapperWidget<?> wrappedWidget;
-
-    protected PopoverOptions options = new PopoverOptions();
-
-    public AbstractPopoverView() {
-        //CDI proxy
-    }
-
-    public AbstractPopoverView(final Div popoverElement,
-                               final Div popoverContainerElement,
-                               final Div popoverContentElement,
-                               final JQueryProducer.JQuery<Popover> jQueryPopover) {
-        this.popoverElement = popoverElement;
-        this.popoverContainerElement = popoverContainerElement;
-        this.popoverContentElement = popoverContentElement;
-        this.jQueryPopover = jQueryPopover;
-        options.setContent(element -> popoverContentElement);
-        options.setAnimation(false);
-        options.setHtml(true);
-    }
-
-    @Override
-    public void setup(final Optional<String> editorTitle, final int mx, final int my, final Position position) {
-        if (isShown()) {
-            hide();
-        }
-        final HTMLElement element = this.getElement();
-        popover = jQueryPopover.wrap(element);
-        wrappedWidget = ElementWrapperWidget.getWidget(element);
-        addWidgetToRootPanel();
-        editorTitle.ifPresent(t -> popoverElement.setAttribute(TITLE, t));
-        popoverElement.getStyle().setProperty(TOP, my + PX);
-        popoverElement.getStyle().setProperty(LEFT, mx + PX);
-        popoverElement.getStyle().setProperty(POSITION, ABSOLUTE);
-        options.setPlacement(position.toString().toLowerCase());
-        popover.popover(options);
-    }
-
-    @Override
-    public void show() {
-        scheduleTask();
-    }
-
-    @Override
-    public boolean isShown() {
-        return wrappedWidget != null && RootPanel.get().getWidgetIndex(wrappedWidget) != -1;
-    }
-
-    @Override
-    public void hide() {
-        if (isShown()) {
-            removeWidgetFromRootPanel();
-            popover.destroy();
-            wrappedWidget = null;
-        }
-    }
-
-    /**
-     * Retrieve the actual height of the <code>ErrorReportPopover</code>
-     * @return
-     */
-    public int getActualHeight() {
-        return wrappedWidget != null ? wrappedWidget.getElement().getScrollHeight() : 0;
-    }
-
-    //indirection for tests
-    protected void addWidgetToRootPanel() {
-        RootPanel.get().add(wrappedWidget);
-    }
-
-    //indirection for tests
-    protected void removeWidgetFromRootPanel() {
-        RootPanel.get().remove(wrappedWidget);
-    }
-
-    //indirection for tests
-    protected void scheduleTask() {
-        Scheduler.get().scheduleDeferred(() -> popover.show());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopover.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopover.java
deleted file mode 100644
index 5103c9e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopover.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popover;
-
-import org.uberfire.mvp.Command;
-
-public interface ErrorReportPopover extends PopoverView {
-
-    /**
-     * Makes the <code>ErrorReportPopover</code> visible with Keep/Apply buttons.
-     * @param errorTitleText
-     * @param errorContentText
-     * @param keepText
-     * @param applyText
-     * @param applyCommand
-     * @param mx x position of the popover
-     * @param my y position of the popover
-     * @param position position where the popover is put (LEFT or RIGHT)
-     */
-    void setup(final String errorTitleText,
-               final String errorContentText,
-               final String keepText,
-               final String applyText,
-               final Command applyCommand,
-               final int mx,
-               final int my,
-               final Position position);
-
-    /**
-     * Makes the <code>ErrorReportPopover</code> visible with keep button only.
-     * @param errorTitleText
-     * @param errorContentText
-     * @param keepText
-     * @param mx x position of the popover
-     * @param my y position of the popover
-     * @param position position where the popover is put (LEFT or RIGHT)
-     */
-    void setup(final String errorTitleText,
-               final String errorContentText,
-               final String keepText,
-               final int mx,
-               final int my,
-               final Position position);
-
-    /**
-     * Makes this popover container(and the main content along with it) invisible. Has no effect if the popover is not
-     * already showing.
-     */
-    void hide();
-
-    /**
-     * Returns the status of the popver (open or closed)
-     * @return true if shown, false otherwise
-     */
-    boolean isShown();
-
-    interface Presenter {
-
-        /**
-         * Method to set/update status of the <code>ErrorReportPopover</code> <b>before</b> actually showing the view.
-         * Implemented to decouple this setup from the actual <b>show</b>, to be able to eventually add other modifications
-         * (e.g. change vertical position based on the actual height, that is available only <b>after</b> this method has been invoked)
-         * @param errorTitleText
-         * @param errorContentText
-         * @param keepText
-         * @param applyText
-         * @param applyCommand
-         * @param mx x position of the replace
-         * @param my y position of the popover
-         * @param position position where the popover is put (LEFT or RIGHT)
-         */
-        void setup(final String errorTitleText,
-                   final String errorContentText,
-                   final String keepText,
-                   final String applyText,
-                   final Command applyCommand,
-                   final int mx,
-                   final int my,
-                   final Position position);
-
-        /**
-         * Method to set/update status of the <code>ErrorReportPopover</code> <b>before</b> actually showing the view.
-         * Implemented to decouple this setup from the actual <b>show</b>, to be able to eventually add other modifications
-         * (e.g. change vertical position based on the actual height, that is available only <b>after</b> this method has been invoked)
-         * @param errorTitleText
-         * @param errorContentText
-         * @param keepText
-         * @param mx x position of the replace
-         * @param my y position of the popover
-         * @param position position where the popover is put (LEFT or RIGHT)
-         */
-        void setup(final String errorTitleText,
-                   final String errorContentText,
-                   final String keepText,
-                   final int mx,
-                   final int my,
-                   final Position position);
-
-        /**
-         * Makes this popover container(and the main content along with it) invisible. Has no effect if the popover is not
-         * already showing.
-         */
-        void hide();
-
-        /**
-         * Returns the status of the <code>ErrorReportPopover</code> (open or closed)
-         * @return true if shown, false otherwise
-         */
-        boolean isShown();
-
-        /**
-         * Method that actually <b>show</b> the view
-         */
-        void show();
-
-        /**
-         * Retrieve the actual height of the <code>ErrorReportPopover</code>
-         *
-         * @return
-         */
-        int getActualHeight();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverPresenter.java
deleted file mode 100644
index 26d4d46..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverPresenter.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popover;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import org.uberfire.mvp.Command;
-
-@ApplicationScoped
-public class ErrorReportPopoverPresenter implements ErrorReportPopover.Presenter {
-
-    @Inject
-    protected ErrorReportPopoverView errorReportPopupView;
-
-    @Override
-    public void setup(final String errorTitleText,
-                      final String errorContentText,
-                      final String keepText,
-                      final String applyText,
-                      final Command applyCommand,
-                      final int mx,
-                      final int my,
-                      final PopoverView.Position position) {
-        errorReportPopupView.setup(errorTitleText, errorContentText, keepText, applyText, applyCommand, mx, my, position);
-    }
-
-    @Override
-    public void setup(final String errorTitleText,
-                      final String errorContentText,
-                      final String keepText,
-                      final int mx,
-                      final int my,
-                      final PopoverView.Position position) {
-        errorReportPopupView.setup(errorTitleText, errorContentText, keepText, mx, my, position);
-    }
-
-    @Override
-    public void show() {
-        errorReportPopupView.show();
-    }
-
-    @Override
-    public void hide() {
-        errorReportPopupView.hide();
-    }
-
-    @Override
-    public boolean isShown() {
-        return errorReportPopupView.isShown();
-    }
-
-    @Override
-    public int getActualHeight() {
-        return errorReportPopupView.getActualHeight();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverView.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverView.html
deleted file mode 100644
index 0c13ec5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverView.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype html>
-<!--
-  ~ 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.      
--->
-<div
-  data-field="popover"
-  data-toggle="popover"
-  data-trigger="manual"
-  data-container="#popover-container"
-  title="i18ned"
-  data-close="true"
->
-  <div id="popover-container" data-field="popover-container"></div>
-  <div id="popover-content">
-    <div id="popover-content-text" data-field="errorContent"></div>
-    <div id="popover-content-buttons">
-      <button type="button" class="btn btn-default" data-dismiss="modal" data-field="keepButton"></button>
-      <button type="button" class="btn btn-primary" data-dismiss="modal" data-field="applyButton"></button>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverView.java
deleted file mode 100644
index e9eb65f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverView.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popover;
-
-import java.util.Optional;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.ButtonElement;
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.jboss.errai.common.client.dom.Div;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-import org.uberfire.client.views.pfly.widgets.JQueryProducer;
-import org.uberfire.client.views.pfly.widgets.Popover;
-import org.uberfire.mvp.Command;
-
-@ApplicationScoped
-@Templated
-public class ErrorReportPopoverView extends AbstractPopoverView implements ErrorReportPopover {
-
-    protected Command applyCommand;
-
-    @DataField("keepButton")
-    protected ButtonElement keepButton = Document.get().createPushButtonElement();
-
-    @DataField("applyButton")
-    protected ButtonElement applyButton = Document.get().createPushButtonElement();
-
-    @DataField("errorContent")
-    protected Div errorContent;
-
-    public ErrorReportPopoverView() {
-        //CDI proxy
-    }
-
-    @Inject
-    public ErrorReportPopoverView(final Div errorContent,
-                                  final Div popoverElement,
-                                  final Div popoverContainerElement,
-                                  final Div popoverContentElement,
-                                  final JQueryProducer.JQuery<Popover> jQueryPopover) {
-        super(popoverElement,
-              popoverContainerElement,
-              popoverContentElement,
-              jQueryPopover);
-        this.errorContent = errorContent;
-    }
-
-    @Override
-    public void setup(final String errorTitleText,
-                      final String errorContentText,
-                      final String keepText,
-                      final String applyText,
-                      final Command applyCommand,
-                      final int mx,
-                      final int my,
-                      final Position position) {
-        this.applyCommand = applyCommand;
-        errorContent.setInnerHTML(errorContentText);
-        keepButton.setInnerText(keepText);
-        applyButton.setInnerText(applyText);
-        applyButton.getStyle().setDisplay(Style.Display.INLINE);
-        super.setup(Optional.of(errorTitleText), mx, my, position);
-    }
-
-    @Override
-    public void setup(final String errorTitleText,
-                      final String errorContentText,
-                      final String keepText,
-                      final int mx,
-                      final int my,
-                      final Position position) {
-        errorContent.setInnerHTML(errorContentText);
-        keepButton.setInnerText(keepText);
-        applyButton.getStyle().setDisplay(Style.Display.NONE);
-        applyCommand = () -> {throw new UnsupportedOperationException();};
-        super.setup(Optional.of(errorTitleText), mx, my, position);
-    }
-
-    @EventHandler("keepButton")
-    public void onKeepButtonClicked(ClickEvent clickEvent) {
-        hide();
-    }
-
-    @EventHandler("applyButton")
-    public void onApplyButtonClicked(ClickEvent clickEvent) {
-        applyCommand.execute();
-        hide();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverView.less b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverView.less
deleted file mode 100644
index 3aced94..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverView.less
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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. 
- */
-[data-i18n-prefix="ErrorReportPopoverView."] {
-  #popover-container {
-    display: inline;
-  }
-
-  #popover-container .popover {
-    /* This parameter must be synchronized with POPOVER_WIDTH static variable ScenarioSimulationMainGridPanelMouseMoveHandler class */
-    width: 220px;
-  }
-
-  #popover-content-buttons {
-    text-align: right;
-    padding-top: 10px;
-  }
-
-  #popover-content-text {
-    overflow: auto;
-    white-space: pre-wrap;
-  }
-
-  #popover-content-text ul {
-    padding-inline-start: 20px;
-  }
-
-  .kie-scesim-container {
-    width: 100%;
-    height: 200px;
-    overflow-y: scroll;
-    margin-top: 10px;
-    border: 1px solid #cccccc;
-    padding: 0px 5px 5px 5px;
-  }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/PopoverView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/PopoverView.java
deleted file mode 100644
index f3735cc..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popover/PopoverView.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popover;
-
-import java.util.Optional;
-
-public interface PopoverView extends org.jboss.errai.ui.client.local.api.IsElement {
-
-    enum Position {
-        LEFT,
-        RIGHT,
-        TOP
-    }
-
-    /**
-     * Method to set/update status of the elements <b>before</b> actually showing the view.
-     * Implemented to decouple this setup from the actual <b>show</b>, to be able to eventually add other modifications
-     * (e.g. change vertical position based on the actual height, that is available only <b>after</b> this method has been invoked)
-     * @param editorTitle
-     * @param mx
-     * @param my
-     * @param position
-     */
-    void setup(final Optional<String> editorTitle, final int mx, final int my, final Position position);
-
-    /**
-     * Method that actually <b>show</b> the view
-     */
-    void show();
-
-    boolean isShown();
-
-    void hide();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioConfirmationPopup.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioConfirmationPopup.java
deleted file mode 100644
index efbf156..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioConfirmationPopup.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.uberfire.mvp.Command;
-
-public interface AbstractScenarioConfirmationPopup {
-
-    interface Presenter {
-
-        /**
-         * Makes the <code>ScenarioConfirmationPopup</code> visible with OK/Cancel buttons.
-         *
-         * @param mainTitleText
-         * @param mainQuestionText
-         * @param text1Text
-         * @param textQuestionText
-         * @param okDeleteButtonText
-         * @param okDeleteCommand
-         */
-        void show(final String mainTitleText,
-                  final String mainQuestionText,
-                  final String text1Text,
-                  final String textQuestionText,
-                  final String okDeleteButtonText,
-                  final Command okDeleteCommand);
-
-        /**
-         * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-         * already showing.
-         */
-        void hide();
-    }
-
-    /**
-     * Makes the <code>ScenarioConfirmationPopup</code> visible with OK/Cancel buttons.
-     *
-     * @param mainTitleText
-     * @param mainQuestionText
-     * @param text1Text
-     * @param textQuestionText
-     * @param okDeleteButtonText
-     * @param okDeleteCommand
-     */
-    void show(final String mainTitleText,
-              final String mainQuestionText,
-              final String text1Text,
-              final String textQuestionText,
-              final String okDeleteButtonText,
-              final Command okDeleteCommand);
-
-    HTMLElement getElement();
-
-    /**
-     * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-     * already showing.
-     */
-    void hide();
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioConfirmationPopupView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioConfirmationPopupView.java
deleted file mode 100644
index 5d01770..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioConfirmationPopupView.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.HeadingElement;
-import com.google.gwt.dom.client.ParagraphElement;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.uberfire.mvp.Command;
-
-public abstract class AbstractScenarioConfirmationPopupView extends AbstractScenarioPopupView implements AbstractScenarioConfirmationPopup {
-
-    @DataField("main-question")
-    protected HeadingElement mainQuestion = Document.get().createHElement(2);
-
-    @Inject
-    @DataField("text-1")
-    protected ParagraphElement text1;
-
-    @Inject
-    @DataField("text-question")
-    protected ParagraphElement textQuestion;
-
-    @Override
-    public void show(final String mainTitleText,
-                     final String mainQuestionText,
-                     final String text1Text,
-                     final String textQuestionText,
-                     final String okDeleteButtonText,
-                     final Command okDeleteCommand) {
-        super.show(mainTitleText, okDeleteButtonText, okDeleteCommand);
-        conditionalShow(mainQuestion, mainQuestionText);
-        conditionalShow(text1, text1Text);
-        conditionalShow(textQuestion, textQuestionText);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioPopup.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioPopup.java
deleted file mode 100644
index 74cdc8e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioPopup.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.uberfire.mvp.Command;
-
-public interface AbstractScenarioPopup {
-
-    interface Presenter {
-
-        /**
-         * Makes the <code>ScenarioPopup</code> visible with OK/Cancel buttons.
-         *
-         * @param mainTitleText
-         * @param okButtonText
-         * @param okCommand
-         */
-        void show(final String mainTitleText,
-                  final String okButtonText,
-                  final Command okCommand);
-
-        /**
-         * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-         * already showing.
-         */
-        void hide();
-    }
-
-    /**
-     * Makes the <code>ScenarioPopup</code> visible with OK/Cancel buttons.
-     *
-     * @param mainTitleText
-     * @param okButtonText
-     * @param okCommand
-     */
-    void show(final String mainTitleText,
-              final String okButtonText,
-              final Command okCommand);
-
-    HTMLElement getElement();
-
-    /**
-     * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-     * already showing.
-     */
-    void hide();
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioPopupView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioPopupView.java
deleted file mode 100644
index c4c7df3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioPopupView.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.HeadingElement;
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.jboss.errai.common.client.dom.MouseEvent;
-import org.jboss.errai.ui.client.local.spi.TranslationService;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.ForEvent;
-import org.uberfire.client.views.pfly.widgets.Button;
-import org.uberfire.client.views.pfly.widgets.Modal;
-import org.uberfire.mvp.Command;
-
-public abstract class AbstractScenarioPopupView implements AbstractScenarioPopup {
-
-    @DataField("main-title")
-    protected HeadingElement mainTitle = Document.get().createHElement(4);
-
-    @Inject
-    @DataField("cancel-button")
-    protected Button cancelButton;
-
-    @Inject
-    @DataField("ok-button")
-    protected Button okButton;
-
-    @Inject
-    @DataField("modal")
-    protected Modal modal;
-
-    @Inject
-    protected TranslationService translationService;
-
-    protected Command okCommand;
-
-    @PostConstruct
-    public void init() {
-        cancelButton.setText("Cancel");
-    }
-
-    @Override
-    public void show(final String mainTitleText,
-                     final String okButtonText,
-                     final Command okCommand) {
-        this.okCommand = okCommand;
-        conditionalShow(mainTitle, mainTitleText);
-        conditionalShow(okButton, okCommand, okButtonText);
-        modal.show();
-    }
-
-    @Override
-    public HTMLElement getElement() {
-        return modal.getElement();
-    }
-
-    @Override
-    public void hide() {
-        modal.hide();
-    }
-
-    @EventHandler("ok-button")
-    public void onOkClick(final @ForEvent("click") MouseEvent event) {
-        if (okCommand != null) {
-            okCommand.execute();
-        }
-        hide();
-    }
-
-    @EventHandler("cancel-button")
-    public void onCancelClick(final @ForEvent("click") MouseEvent event) {
-        hide();
-    }
-
-    protected void conditionalShow(Element element, String innerText) {
-        if (innerText != null) {
-            element.setInnerHTML(innerText);
-        } else {
-            element.removeFromParent();
-        }
-    }
-
-    protected void conditionalShow(Button button, Command command, String innerText) {
-        if (command == null) {
-            button.hide();
-        } else {
-            button.setText(innerText);
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopup.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopup.java
deleted file mode 100644
index 5601e10..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopup.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import org.jboss.errai.common.client.dom.HTMLElement;
-
-public interface ConfirmPopup {
-
-    interface Presenter {
-
-        /**
-         * Makes the <code>ConfirmPopup</code> visible with OK buttons.
-         * @param mainTitleText
-         * @param mainText
-         */
-        void show(final String mainTitleText,
-                  final String mainText);
-
-        /**
-         * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-         * already showing.
-         */
-        void hide();
-    }
-
-    /**
-     * Makes the <code>ConfirmPopup</code> visible with OK.
-     * @param mainTitleText
-     * @param mainText
-     */
-    void show(final String mainTitleText,
-              final String mainText);
-
-    HTMLElement getElement();
-
-    /**
-     * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-     * already showing.
-     */
-    void hide();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupPresenter.java
deleted file mode 100644
index 25e75a3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupPresenter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import javax.enterprise.context.Dependent;
-
-@Dependent
-public class ConfirmPopupPresenter implements ConfirmPopup.Presenter {
-
-    protected ConfirmPopup confirmPopupView = new ConfirmPopupView();
-
-    @Override
-    public void show(String mainTitleText, String mainText) {
-        confirmPopupView.show(mainTitleText, mainText);
-    }
-
-    @Override
-    public void hide() {
-        confirmPopupView.hide();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupView.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupView.html
deleted file mode 100644
index 71be8ed..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupView.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<div class="modal fade" id="confirmation-delete">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-          <span class="pficon pficon-close"></span>
-        </button>
-        <h4 class="modal-title" data-field="main-title"></h4>
-      </div>
-      <div class="modal-body">
-        <div class="pull-left">
-          <h2>
-            <span class="pficon pficon-warning-triangle-o"></span>
-          </h2>
-        </div>
-        <div style="margin-left: 3em">
-          <h2 data-field="main-question"></h2>
-          <div>
-            <p data-field="text-1"></p>
-            <p />
-            <p data-field="text-question"></p>
-            <p class="text-danger" data-field="text-danger"></p>
-          </div>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal" data-field="cancel-button"></button>
-          <button type="button" class="btn btn-danger" data-dismiss="modal" data-field="ok-button"></button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupView.java
deleted file mode 100644
index 19a8a02..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupView.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import javax.enterprise.context.Dependent;
-
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-@Dependent
-@Templated
-public class ConfirmPopupView extends AbstractScenarioConfirmationPopupView implements ConfirmPopup {
-
-    @Override
-    public void show(String mainTitleText, String mainText) {
-        super.show(mainTitleText, null, mainText, null,
-                   null,
-                   null);
-        cancelButton.setText("OK");
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/CustomBusyPopup.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/CustomBusyPopup.java
deleted file mode 100644
index 56af783..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/CustomBusyPopup.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.Timer;
-import com.google.gwt.user.client.ui.DecoratedPopupPanel;
-import com.google.gwt.user.client.ui.Widget;
-import org.gwtbootstrap3.client.ui.html.Span;
-import org.uberfire.ext.widgets.common.client.animations.LinearFadeInAnimation;
-import org.uberfire.ext.widgets.common.client.animations.LinearFadeOutAnimation;
-
-public class CustomBusyPopup extends DecoratedPopupPanel {
-
-    private static CustomBusyPopup.LoadingViewBinder uiBinder = GWT.create(CustomBusyPopup.LoadingViewBinder.class);
-    private static final CustomBusyPopup INSTANCE = new CustomBusyPopup();
-
-    private static Timer deferredShowTimer = new Timer() {
-        @Override
-        public void run() {
-            fadeInAnimation.run(250);
-        }
-    };
-
-    private static CustomBusyPopup.MessageState state = CustomBusyPopup.MessageState.DORMANT;
-    private static final LinearFadeInAnimation fadeInAnimation = new LinearFadeInAnimation(INSTANCE) {
-
-        @Override
-        public void onStart() {
-            state = CustomBusyPopup.MessageState.SHOWING;
-            INSTANCE.center();
-            super.onStart();
-        }
-
-        @Override
-        public void onComplete() {
-            state = CustomBusyPopup.MessageState.VISIBLE;
-            super.onComplete();
-        }
-    };
-    private static final LinearFadeOutAnimation fadeOutAnimation = new LinearFadeOutAnimation(INSTANCE) {
-
-        @Override
-        public void onStart() {
-            state = CustomBusyPopup.MessageState.HIDING;
-            super.onStart();
-        }
-
-        @Override
-        public void onComplete() {
-            state = CustomBusyPopup.MessageState.DORMANT;
-            INSTANCE.hide();
-            super.onComplete();
-        }
-    };
-    @UiField
-    Span message;
-
-    private CustomBusyPopup() {
-        setWidget(uiBinder.createAndBindUi(this));
-
-        //Make sure it appears on top of other popups
-        getElement().getStyle().setZIndex(Integer.MAX_VALUE);
-        setGlassEnabled(true);
-    }
-
-    public static void showMessage(final String message) {
-        switch (state) {
-            case DORMANT:
-                INSTANCE.message.setText(message);
-                deferredShowTimer.schedule(250);
-                state = CustomBusyPopup.MessageState.PENDING;
-                break;
-            case PENDING:
-            case SHOWING:
-            case VISIBLE:
-                INSTANCE.message.setText(message);
-                break;
-            case HIDING:
-                fadeOutAnimation.cancel();
-                INSTANCE.message.setText(message);
-                fadeInAnimation.onComplete();
-        }
-    }
-
-    public static void close() {
-        switch (state) {
-            case DORMANT:
-                break;
-            case PENDING:
-                deferredShowTimer.cancel();
-                state = CustomBusyPopup.MessageState.DORMANT;
-                break;
-            case SHOWING:
-                fadeInAnimation.cancel();
-                fadeOutAnimation.run(250);
-                break;
-            case VISIBLE:
-                fadeOutAnimation.run(250);
-                break;
-            case HIDING:
-                break;
-        }
-    }
-
-    private enum MessageState {
-        DORMANT,
-        PENDING,
-        SHOWING,
-        VISIBLE,
-        HIDING
-    }
-
-    interface LoadingViewBinder
-            extends
-            UiBinder<Widget, CustomBusyPopup> {
-
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/CustomBusyPopup.ui.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/CustomBusyPopup.ui.xml
deleted file mode 100644
index 3365ab3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/CustomBusyPopup.ui.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  ~ 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.      
--->
-<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
-<ui:UiBinder
-  xmlns:ui="urn:ui:com.google.gwt.uibinder"
-  xmlns:g="urn:import:com.google.gwt.user.client.ui"
-  xmlns:b="urn:import:org.gwtbootstrap3.client.ui"
-  xmlns:h="urn:import:org.gwtbootstrap3.client.ui.html"
->
-
-    <ui:with field="resources" type="org.uberfire.ext.widgets.common.client.resources.CommonResources" />
-
-    <g:HTMLPanel styleName="{resources.CSS.busyPopup}">
-        <b:Well>
-            <h:Div addStyleNames="spinner spinner-lg" pull="LEFT" />
-            <h:Span ui:field="message" />
-        </b:Well>
-    </g:HTMLPanel>
-
-</ui:UiBinder>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopup.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopup.java
deleted file mode 100644
index 67e7994..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopup.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.uberfire.mvp.Command;
-
-public interface DeletePopup {
-
-    interface Presenter {
-
-        /**
-         * Makes the <code>DeletePopup</code> visible with OK/Cancel buttons.
-         * @param mainTitleText
-         * @param mainQuestionText
-         * @param text1Text
-         * @param textQuestionText
-         * @param textDangerText
-         * @param okDeleteButtonText
-         * @param okDeleteCommand
-         */
-        void show(final String mainTitleText,
-                  final String mainQuestionText,
-                  final String text1Text,
-                  final String textQuestionText,
-                  final String textDangerText,
-                  final String okDeleteButtonText,
-                  final Command okDeleteCommand);
-
-        /**
-         * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-         * already showing.
-         */
-        void hide();
-    }
-
-    /**
-     * Makes the <code>DeletePopup</code> visible with OK/Cancel buttons.
-     * @param mainTitleText
-     * @param mainQuestionText
-     * @param text1Text
-     * @param textQuestionText
-     * @param textDangerText
-     * @param okDeleteButtonText
-     * @param okDeleteCommand
-     */
-    void show(final String mainTitleText,
-              final String mainQuestionText,
-              final String text1Text,
-              final String textQuestionText,
-              final String textDangerText,
-              final String okDeleteButtonText,
-              final Command okDeleteCommand);
-
-    HTMLElement getElement();
-
-    /**
-     * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-     * already showing.
-     */
-    void hide();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupPresenter.java
deleted file mode 100644
index fd5308c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupPresenter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import org.uberfire.mvp.Command;
-
-@Dependent
-public class DeletePopupPresenter implements DeletePopup.Presenter {
-
-    @Inject
-    protected DeletePopupView deletePopupView;
-
-    @Override
-    public void show(final String mainTitleText,
-                     final String mainQuestionText,
-                     final String text1Text,
-                     final String textQuestionText,
-                     final String textDangerText,
-                     final String okDeleteButtonText,
-                     final Command okDeleteCommand) {
-        deletePopupView.show(mainTitleText, mainQuestionText, text1Text, textQuestionText, textDangerText, okDeleteButtonText, okDeleteCommand);
-    }
-
-    @Override
-    public void hide() {
-        deletePopupView.hide();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupView.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupView.html
deleted file mode 100644
index 71be8ed..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupView.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<div class="modal fade" id="confirmation-delete">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-          <span class="pficon pficon-close"></span>
-        </button>
-        <h4 class="modal-title" data-field="main-title"></h4>
-      </div>
-      <div class="modal-body">
-        <div class="pull-left">
-          <h2>
-            <span class="pficon pficon-warning-triangle-o"></span>
-          </h2>
-        </div>
-        <div style="margin-left: 3em">
-          <h2 data-field="main-question"></h2>
-          <div>
-            <p data-field="text-1"></p>
-            <p />
-            <p data-field="text-question"></p>
-            <p class="text-danger" data-field="text-danger"></p>
-          </div>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal" data-field="cancel-button"></button>
-          <button type="button" class="btn btn-danger" data-dismiss="modal" data-field="ok-button"></button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupView.java
deleted file mode 100644
index ec8d567..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupView.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.ParagraphElement;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-import org.uberfire.mvp.Command;
-
-@Dependent
-@Templated
-public class DeletePopupView extends AbstractScenarioConfirmationPopupView implements DeletePopup {
-
-    @Inject
-    @DataField("text-danger")
-    protected ParagraphElement textDanger;
-
-    @Override
-    public void show(final String mainTitleText,
-                     final String mainQuestionText,
-                     final String text1Text,
-                     final String textQuestionText,
-                     final String textDangerText,
-                     final String okDeleteButtonText,
-                     final Command okDeleteCommand) {
-        conditionalShow(textDanger, textDangerText);
-        super.show(mainTitleText, mainQuestionText, text1Text, textQuestionText,
-                   okDeleteButtonText,
-                   okDeleteCommand);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopup.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopup.java
deleted file mode 100644
index fd280d8..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopup.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import java.util.List;
-
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.uberfire.mvp.Command;
-
-public interface FileUploadPopup extends AbstractScenarioPopup {
-
-    interface Presenter extends AbstractScenarioPopup.Presenter {
-
-        /**
-         * Same as default show method but with list of accepted extensions
-         *
-         * @param acceptedExtension
-         * @param mainTitleText
-         * @param okButtonText
-         * @param okCommand
-         */
-        void show(final List<String> acceptedExtension,
-                  final String mainTitleText,
-                  final String okButtonText,
-                  final Command okCommand);
-
-        String getFileContents();
-
-        String getFileName();
-
-        /**
-         * Same as default show method but with list of accepted extensions and uploadWarningText
-         *
-         * @param acceptedExtension
-         * @param mainTitleText
-         * @param uploadWarningText
-         * @param okButtonText
-         * @param okCommand
-         */
-        void show(final List<String> acceptedExtension,
-                  String mainTitleText,
-                  String uploadWarningText,
-                  String okButtonText,
-                  Command okCommand);
-    }
-
-    HTMLElement getElement();
-
-    void show(String mainTitleText,
-              String uploadWarningText,
-              String okButtonText,
-              Command okCommand);
-
-    String getFileContents();
-
-    String getFileName();
-
-    void setAcceptedExtension(List<String> acceptedExtension);
-
-    /**
-     * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-     * already showing.
-     */
-    void hide();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupPresenter.java
deleted file mode 100644
index 80a4f33..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupPresenter.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-import org.uberfire.mvp.Command;
-
-@Dependent
-public class FileUploadPopupPresenter implements FileUploadPopup.Presenter {
-
-    @Inject
-    protected ViewsProvider viewsProvider;
-
-    protected FileUploadPopup fileUploadPopup;
-
-    @Override
-    public void show(final String mainTitleText,
-                     final String okButtonText,
-                     final Command okCommand) {
-        show(Collections.emptyList(), mainTitleText, okButtonText, okCommand);
-    }
-
-    @Override
-    public void show(final List<String> acceptedExtension,
-                     final String mainTitleText,
-                     final String okButtonText,
-                     final Command okCommand) {
-        fileUploadPopup = viewsProvider.getFileUploadPopup();
-        fileUploadPopup.setAcceptedExtension(acceptedExtension);
-        fileUploadPopup.show(mainTitleText,
-                             okButtonText,
-                             okCommand);
-    }
-
-    @Override
-    public void show(List<String> acceptedExtension,
-                     String mainTitleText,
-                     String uploadWarningText,
-                     String okButtonText,
-                     Command okCommand) {
-        fileUploadPopup = viewsProvider.getFileUploadPopup();
-        fileUploadPopup.setAcceptedExtension(acceptedExtension);
-        fileUploadPopup.show(mainTitleText,
-                             uploadWarningText,
-                             okButtonText,
-                             okCommand);
-    }
-
-    @Override
-    public void hide() {
-        fileUploadPopup.hide();
-    }
-
-    @Override
-    public String getFileContents() {
-        return fileUploadPopup.getFileContents();
-    }
-
-    @Override
-    public String getFileName() {
-        return fileUploadPopup.getFileName();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupView.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupView.html
deleted file mode 100644
index 86ad626..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupView.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-  ~ 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.      
--->
-<div class="modal fade" id="fileupload">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-          <span class="pficon pficon-close"></span>
-        </button>
-        <h4 class="modal-title" data-field="main-title"></h4>
-      </div>
-      <div class="modal-body">
-        <div class="input-group">
-          <input class="form-control" data-field="file" type="FILE" style="display: none" />
-          <input class="form-control form-control-readonly" data-field="fileText" type="text" readonly />
-          <span class="input-group-addon btn btn-default" data-field="chooseButton">
-            <i class="fa fa-file-o"></i>
-          </span>
-        </div>
-        <div style="margin: 1em">
-          <p data-field="upload-warning"></p>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal" data-field="cancel-button"></button>
-        <button type="button" class="btn btn-primary" data-dismiss="modal" data-field="ok-button"></button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupView.java
deleted file mode 100644
index e465501..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupView.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.ParagraphElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.event.dom.client.ChangeEvent;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-import org.uberfire.mvp.Command;
-
-@Templated
-public class FileUploadPopupView extends AbstractScenarioPopupView implements FileUploadPopup {
-
-    private static final String FAKEPATH = "c:\\fakepath\\";
-
-    @DataField("file")
-    protected InputElement file = Document.get().createHiddenInputElement();
-
-    @DataField("fileText")
-    protected InputElement fileText = Document.get().createTextInputElement();
-
-    @DataField("chooseButton")
-    protected SpanElement chooseButton = Document.get().createSpanElement();
-
-    @DataField("upload-warning")
-    protected ParagraphElement uploadWarning = Document.get().createPElement();
-
-    protected List<String> acceptedExtension = new ArrayList<>();
-
-    protected static String fileContents;
-
-    protected static String fileName = null;
-
-    public static void fileLoaded(String fileContents) {
-        FileUploadPopupView.fileContents = fileContents;
-    }
-
-    @Override
-    public void init() {
-        super.init();
-        chooseButton.setTitle(ScenarioSimulationEditorConstants.INSTANCE.chooseFile());
-    }
-
-    @Override
-    public void show(final String mainTitleText,
-                     final String okButtonText,
-                     final Command okCommand) {
-        fileContents = "";
-        fileText.setValue("");
-        if (!acceptedExtension.isEmpty()) {
-            file.setAccept(String.join(",", acceptedExtension));
-        }
-        okButton.setEnabled(false);
-        super.show(mainTitleText, okButtonText, okCommand);
-    }
-
-    @Override
-    public void show(final String mainTitleText,
-                     final String uploadWarningText,
-                     final String okButtonText,
-                     final Command okCommand) {
-        uploadWarning.setInnerText(uploadWarningText);
-        show(mainTitleText, okButtonText, okCommand);
-    }
-
-    @Override
-    public String getFileContents() {
-        return fileContents;
-    }
-
-    @Override
-    public String getFileName() {
-        return fileName;
-    }
-
-    @Override
-    public void setAcceptedExtension(List<String> acceptedExtension) {
-        this.acceptedExtension.clear();
-        this.acceptedExtension.addAll(acceptedExtension);
-    }
-
-    @EventHandler("chooseButton")
-    public void onChooseButtonClickEvent(ClickEvent clickEvent) {
-        file.click();
-    }
-
-    @EventHandler("file")
-    public void onFileChangeEvent(ChangeEvent event) {
-        fileName = file.getValue();
-        if (fileName.toLowerCase().startsWith(FAKEPATH)) {
-            fileName = fileName.substring(FAKEPATH.length());
-        }
-        fileText.setValue(fileName);
-        JavaScriptObject files = file.getPropertyJSO("files");
-        readTextFile(files);
-        if (!"".equals(fileText.getValue())) {
-            okButton.setEnabled(true);
-        }
-    }
-
-    public static native void readTextFile(JavaScriptObject files)/*-{
-        var reader = new FileReader();
-        reader.onload = function (e) {
-            @org.drools.workbench.screens.scenariosimulation.client.popup.FileUploadPopupView::fileLoaded(*)(reader.result);
-        };
-        return reader.readAsText(files[0]);
-    }-*/;
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopup.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopup.java
deleted file mode 100644
index e305f96..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopup.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.uberfire.mvp.Command;
-
-public interface PreserveDeletePopup {
-
-    interface Presenter {
-
-        /**
-         * Makes the <code>PreserveDeletePopup</code> visible
-         * @param mainTitleText
-         * @param mainQuestionText
-         * @param text1Text
-         * @param textQuestionText
-         * @param option1Text
-         * @param option2Text
-         * @param okPreserveButtonText
-         * @param okDeleteButtonText
-         * @param okPreserveCommand
-         * @param okDeleteCommand
-         */
-        void show(final String mainTitleText,
-                  final String mainQuestionText,
-                  final String text1Text,
-                  final String textQuestionText,
-                  final String option1Text,
-                  final String option2Text,
-                  final String okPreserveButtonText,
-                  final String okDeleteButtonText,
-                  final Command okPreserveCommand,
-                  final Command okDeleteCommand);
-
-        /**
-         * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-         * already showing.
-         */
-        void hide();
-    }
-
-    /**
-     * Makes the <code>PreserveDeletePopup</code> visible
-     * @param mainTitleText
-     * @param mainQuestionText
-     * @param text1Text
-     * @param textQuestionText
-     * @param option1Text
-     * @param option2Text
-     * @param okPreserveButtonText
-     * @param okDeleteButtonText
-     * @param okPreserveCommand
-     * @param okDeleteCommand
-     */
-    void show(final String mainTitleText,
-              final String mainQuestionText,
-              final String text1Text,
-              final String textQuestionText,
-              final String option1Text,
-              final String option2Text,
-              final String okPreserveButtonText,
-              final String okDeleteButtonText,
-              final Command okPreserveCommand,
-              final Command okDeleteCommand);
-
-    HTMLElement getElement();
-
-    /**
-     * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-     * already showing.
-     */
-    void hide();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupPresenter.java
deleted file mode 100644
index 1943265..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupPresenter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import org.uberfire.mvp.Command;
-
-@Dependent
-public class PreserveDeletePopupPresenter implements PreserveDeletePopup.Presenter {
-
-    @Inject
-    protected PreserveDeletePopupView preserveDeletePopupView;
-
-    @Override
-    public void show(final String mainTitleText,
-                     final String mainQuestionText,
-                     final String text1Text,
-                     final String textQuestionText,
-                     final String option1Text,
-                     final String option2Text,
-                     final String okPreserveButtonText,
-                     final String okDeleteButtonText,
-                     final Command okPreserveCommand,
-                     final Command okDeleteCommand) {
-        preserveDeletePopupView.show(mainTitleText, mainQuestionText, text1Text, textQuestionText, option1Text, option2Text, okPreserveButtonText, okDeleteButtonText, okPreserveCommand, okDeleteCommand);
-    }
-
-    @Override
-    public void hide() {
-        preserveDeletePopupView.hide();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupView.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupView.html
deleted file mode 100644
index 59202be..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupView.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<div class="modal fade" tabindex="-1" role="dialog" id="confirmation">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span class="pficon pficon-close"></span>
-        </button>
-        <h4 class="modal-title" data-field="main-title"></h4>
-      </div>
-      <div class="modal-body">
-        <div class="pull-left">
-          <h2>
-            <span class="pficon pficon-warning-triangle-o"></span>
-          </h2>
-        </div>
-        <div style="margin-left: 3em">
-          <h2 data-field="main-question"></h2>
-          <div>
-            <p data-field="text-1"></p>
-            <p />
-            <p data-field="text-question"></p>
-            <ul>
-              <li data-field="option-1"></li>
-              <li data-field="option-2"></li>
-            </ul>
-          </div>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal" data-field="cancel-button"></button>
-          <button type="button" class="btn btn-default" data-field="ok-preserve-button"></button>
-          <button type="button" class="btn btn-danger" data-field="ok-button"></button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupView.java
deleted file mode 100644
index 9573dc2..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupView.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.LIElement;
-import org.jboss.errai.common.client.dom.MouseEvent;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.ForEvent;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-import org.uberfire.client.views.pfly.widgets.Button;
-import org.uberfire.mvp.Command;
-
-@Dependent
-@Templated
-public class PreserveDeletePopupView extends AbstractScenarioConfirmationPopupView implements PreserveDeletePopup {
-
-    @Inject
-    @DataField("option-1")
-    protected LIElement option1;
-
-    @Inject
-    @DataField("option-2")
-    protected LIElement option2;
-
-    @Inject
-    @DataField("ok-preserve-button")
-    protected Button okPreserveButton;
-
-    protected Command okPreserveCommand;
-
-    @Override
-    public void show(final String mainTitleText,
-                     final String mainQuestionText,
-                     final String text1Text,
-                     final String textQuestionText,
-                     final String option1Text,
-                     final String option2Text,
-                     final String okPreserveButtonText,
-                     final String okDeleteButtonText,
-                     final Command okPreserveCommand,
-                     final Command okDeleteCommand) {
-        option1.setInnerText(option1Text);
-        option2.setInnerText(option2Text);
-        okPreserveButton.setText(okPreserveButtonText);
-        this.okPreserveCommand = okPreserveCommand;
-        super.show(mainTitleText, mainQuestionText, text1Text, textQuestionText,
-                   okDeleteButtonText,
-                   okDeleteCommand);
-    }
-
-    @EventHandler("ok-preserve-button")
-    public void onOkPreserveButton(final @ForEvent("click") MouseEvent event) {
-        if (okPreserveCommand != null) {
-            okPreserveCommand.execute();
-        }
-        hide();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopup.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopup.java
deleted file mode 100644
index 147392a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopup.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.uberfire.mvp.Command;
-
-public interface ScenarioConfirmationPopup {
-
-    interface Presenter {
-
-        /**
-         * Makes the <code>ScenarioConfirmationPopup</code> visible with OK/Cancel buttons.
-         *
-         * @param mainTitleText
-         * @param mainQuestionText
-         * @param text1Text
-         * @param textQuestionText
-         * @param textWarningText
-         * @param okDeleteButtonText
-         * @param okDeleteCommand
-         */
-        void show(final String mainTitleText,
-                  final String mainQuestionText,
-                  final String text1Text,
-                  final String textQuestionText,
-                  final String textWarningText,
-                  final String okDeleteButtonText,
-                  final Command okDeleteCommand);
-
-        /**
-         * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-         * already showing.
-         */
-        void hide();
-    }
-
-    /**
-     * Makes the <code>ScenarioConfirmationPopup</code> visible with OK/Cancel buttons.
-     *
-     * @param mainTitleText
-     * @param mainQuestionText
-     * @param text1Text
-     * @param textQuestionText
-     * @param textWarningText
-     * @param okDeleteButtonText
-     * @param okDeleteCommand
-     */
-    void show(final String mainTitleText,
-              final String mainQuestionText,
-              final String text1Text,
-              final String textQuestionText,
-              final String textWarningText,
-              final String okDeleteButtonText,
-              final Command okDeleteCommand);
-
-    HTMLElement getElement();
-
-    /**
-     * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-     * already showing.
-     */
-    void hide();
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupPresenter.java
deleted file mode 100644
index 27d3706..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupPresenter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import org.uberfire.mvp.Command;
-
-@Dependent
-public class ScenarioConfirmationPopupPresenter implements ScenarioConfirmationPopup.Presenter {
-
-    @Inject
-    protected ScenarioConfirmationPopupView scenarioConfirmationPopupView;
-
-    @Override
-    public void show(final String mainTitleText,
-                     final String mainQuestionText,
-                     final String text1Text,
-                     final String textQuestionText,
-                     final String textWarningText,
-                     final String okDeleteButtonText,
-                     final Command okDeleteCommand) {
-        scenarioConfirmationPopupView.show(mainTitleText, mainQuestionText, text1Text, textQuestionText, textWarningText, okDeleteButtonText, okDeleteCommand);
-    }
-
-    @Override
-    public void hide() {
-        scenarioConfirmationPopupView.hide();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupView.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupView.html
deleted file mode 100644
index f5c4c0d2..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupView.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<div class="modal fade" id="confirmation-delete">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-          <span class="pficon pficon-close"></span>
-        </button>
-        <h4 class="modal-title" data-field="main-title"></h4>
-      </div>
-      <div class="modal-body">
-        <div class="pull-left">
-          <h2>
-            <span class="pficon pficon-warning-triangle-o"></span>
-          </h2>
-        </div>
-        <div style="margin-left: 3em">
-          <h2 data-field="main-question"></h2>
-          <div>
-            <p data-field="text-1"></p>
-            <p />
-            <p data-field="text-question"></p>
-            <p data-field="text-warning" style="color: red"></p>
-          </div>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal" data-field="cancel-button"></button>
-          <button type="button" class="btn btn-danger" data-dismiss="modal" data-field="ok-button"></button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupView.java
deleted file mode 100644
index e237a1d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupView.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.ParagraphElement;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-import org.uberfire.mvp.Command;
-
-@Dependent
-@Templated
-public class ScenarioConfirmationPopupView extends AbstractScenarioConfirmationPopupView implements ScenarioConfirmationPopup {
-
-    @Inject
-    @DataField("text-warning")
-    protected ParagraphElement textWarning;
-
-    @Override
-    public void show(final String mainTitleText,
-                     final String mainQuestionText,
-                     final String text1Text,
-                     final String textQuestionText,
-                     final String textWarningText,
-                     final String okDeleteButtonText,
-                     final Command okDeleteCommand) {
-        conditionalShow(textWarning, textWarningText);
-        show(mainTitleText, mainQuestionText, text1Text, textQuestionText, okDeleteButtonText, okDeleteCommand);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmPopup.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmPopup.java
deleted file mode 100644
index dd61c90..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmPopup.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.uberfire.client.views.pfly.widgets.Button;
-import org.uberfire.client.views.pfly.widgets.InlineNotification;
-import org.uberfire.mvp.Command;
-
-public interface YesNoConfirmPopup {
-
-    interface Presenter {
-
-        /**
-         * Makes the YesNoConfirmPopupView visible with OK/Cancel buttons.
-         * @param title
-         * @param okButtonText
-         * @param confirmMessage
-         * @param okCommand
-         */
-        void show(final String title,
-                  final String okButtonText,
-                  final String confirmMessage,
-                  final Command okCommand);
-
-        /**
-         * Makes the YesNoConfirmPopupView visible with OK/Cancel buttons.
-         * @param title
-         * @param inlineNotificationMessage
-         * @param inlineNotificationType
-         * @param okButtonText
-         * @param okButtonType
-         * @param confirmMessage
-         * @param okCommand
-         */
-        void show(final String title,
-                  final String inlineNotificationMessage,
-                  final InlineNotification.InlineNotificationType inlineNotificationType,
-                  final String okButtonText,
-                  final Button.ButtonStyleType okButtonType,
-                  final String confirmMessage,
-                  final Command okCommand);
-
-        /**
-         * Makes the YesNoConfirmPopupView visible with YES/NO/Cancel buttons.
-         * @param title
-         * @param yesButtonText
-         * @param noButtonText
-         * @param confirmMessage
-         * @param yesCommand
-         * @param noCommand
-         */
-        void show(final String title,
-                  final String yesButtonText,
-                  final String noButtonText,
-                  final String confirmMessage,
-                  final Command yesCommand,
-                  final Command noCommand);
-
-        /**
-         * Makes the YesNoConfirmPopupView visible with YES/NO/Cancel buttons.
-         *
-         * @param title
-         * @param inlineNotificationMessage
-         * @param inlineNotificationType
-         * @param yesButtonText
-         * @param noButtonText
-         * @param yesButtonType
-         * @param noButtonType
-         * @param confirmMessage
-         * @param yesCommand
-         * @param noCommand
-         */
-        void show(final String title,
-                  final String inlineNotificationMessage,
-                  final InlineNotification.InlineNotificationType inlineNotificationType,
-                  final String yesButtonText,
-                  final String noButtonText,
-                  final Button.ButtonStyleType yesButtonType,
-                  final Button.ButtonStyleType noButtonType,
-                  final String confirmMessage,
-                  final Command yesCommand,
-                  final Command noCommand);
-
-        /**
-         * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-         * already showing.
-         */
-        void hide();
-    }
-
-    /**
-     * Makes the YesNoConfirmPopupView visible with OK/Cancel buttons.
-     * @param title
-     * @param okButtonText
-     * @param confirmMessage
-     * @param okCommand
-     */
-    void show(final String title,
-              final String okButtonText,
-              final String confirmMessage,
-              final Command okCommand);
-
-    /**
-     * Makes the YesNoConfirmPopupView visible with OK/Cancel buttons.
-     * @param title
-     * @param inlineNotificationMessage
-     * @param inlineNotificationType
-     * @param okButtonText
-     * @param okButtonType
-     * @param confirmMessage
-     * @param okCommand
-     */
-    void show(final String title,
-              final String inlineNotificationMessage,
-              final InlineNotification.InlineNotificationType inlineNotificationType,
-              final String okButtonText,
-              final Button.ButtonStyleType okButtonType,
-              final String confirmMessage,
-              final Command okCommand);
-
-    /**
-     * Makes the YesNoConfirmPopupView visible with YES/NO/Cancel buttons.
-     * @param title
-     * @param yesButtonText
-     * @param noButtonText
-     * @param confirmMessage
-     * @param yesCommand
-     * @param noCommand
-     */
-    void show(final String title,
-              final String yesButtonText,
-              final String noButtonText,
-              final String confirmMessage,
-              final Command yesCommand,
-              final Command noCommand);
-
-    /**
-     * Makes the YesNoConfirmPopupView visible with YES/NO/Cancel buttons.
-     *
-     * @param title
-     * @param inlineNotificationMessage
-     * @param inlineNotificationType
-     * @param yesButtonText
-     * @param noButtonText
-     * @param yesButtonType
-     * @param noButtonType
-     * @param confirmMessage
-     * @param yesCommand
-     * @param noCommand
-     */
-    void show(final String title,
-              final String inlineNotificationMessage,
-              final InlineNotification.InlineNotificationType inlineNotificationType,
-              final String yesButtonText,
-              final String noButtonText,
-              final Button.ButtonStyleType yesButtonType,
-              final Button.ButtonStyleType noButtonType,
-              final String confirmMessage,
-              final Command yesCommand,
-              final Command noCommand);
-
-    HTMLElement getElement();
-
-    /**
-     * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-     * already showing.
-     */
-    void hide();
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmPopupPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmPopupPresenter.java
deleted file mode 100644
index fe8da0b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmPopupPresenter.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import org.uberfire.client.views.pfly.widgets.Button;
-import org.uberfire.client.views.pfly.widgets.InlineNotification;
-import org.uberfire.mvp.Command;
-
-@Dependent
-public class YesNoConfirmPopupPresenter implements YesNoConfirmPopup.Presenter {
-
-    @Inject
-    protected YesNoConfirmPopupView yesNoConfirmPopupView;
-
-    @Override
-    public void show(final String title,
-                     final String okButtonText,
-                     final String confirmMessage,
-                     final Command okCommand) {
-        show(title,
-             null,
-             null,
-             okButtonText,
-             org.uberfire.client.views.pfly.widgets.Button.ButtonStyleType.DANGER,
-             confirmMessage,
-             okCommand);
-    }
-
-    @Override
-    public void show(final String title,
-                     final String inlineNotificationMessage,
-                     final InlineNotification.InlineNotificationType inlineNotificationType,
-                     final String okButtonText,
-                     final Button.ButtonStyleType okButtonType,
-                     final String confirmMessage,
-                     final Command okCommand) {
-        yesNoConfirmPopupView.show(title, inlineNotificationMessage, inlineNotificationType, okButtonText, okButtonType, confirmMessage, okCommand);
-    }
-
-    @Override
-    public void show(String title, String yesButtonText, String noButtonText, String confirmMessage, Command yesCommand, Command noCommand) {
-        show(title, null, null, yesButtonText, noButtonText, Button.ButtonStyleType.DANGER,  Button.ButtonStyleType.DEFAULT, confirmMessage, yesCommand, noCommand);
-    }
-
-    @Override
-    public void show(String title, String inlineNotificationMessage, InlineNotification.InlineNotificationType inlineNotificationType, String yesButtonText, String noButtonText, Button.ButtonStyleType yesButtonType, Button.ButtonStyleType noButtonType, String confirmMessage, Command yesCommand, Command noCommand) {
-        yesNoConfirmPopupView.show(title, inlineNotificationMessage, inlineNotificationType, yesButtonText, noButtonText, yesButtonType,  noButtonType, confirmMessage, yesCommand, noCommand);
-    }
-
-    @Override
-    public void hide() {
-        yesNoConfirmPopupView.hide();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmPopupView.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmPopupView.html
deleted file mode 100644
index 77d0a35..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmPopupView.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<div class="modal fade" data-field="modal" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-field="confirm-close" data-dismiss="modal" aria-hidden="true">
-          <span class="pficon pficon-close"></span>
-        </button>
-        <h4 class="modal-title"><span data-field="confirm-title"></span></h4>
-      </div>
-      <div class="modal-body">
-        <form class="form-horizontal">
-          <fieldset>
-            <div data-field="confirm-inline-notification" style="display: none"></div>
-            <span data-field="confirm-message"></span>
-          </fieldset>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-field="confirm-cancel" data-dismiss="modal"></button>
-        <button type="button" class="btn btn-danger" data-field="confirm-ok"></button>
-        <button type="button" class="btn btn-default" data-field="confirm-yes"></button>
-        <button type="button" class="btn btn-default" data-field="confirm-no"></button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmPopupView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmPopupView.java
deleted file mode 100644
index 720f9a5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmPopupView.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.jboss.errai.common.client.dom.MouseEvent;
-import org.jboss.errai.common.client.dom.Span;
-import org.jboss.errai.ui.client.local.spi.TranslationService;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.ForEvent;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-import org.uberfire.client.views.pfly.widgets.Button;
-import org.uberfire.client.views.pfly.widgets.InlineNotification;
-import org.uberfire.client.views.pfly.widgets.Modal;
-import org.uberfire.mvp.Command;
-
-@Dependent
-@Templated
-public class YesNoConfirmPopupView implements YesNoConfirmPopup {
-
-    @Inject
-    @DataField("confirm-title")
-    Span modalTitle;
-
-    @Inject
-    @DataField("confirm-inline-notification")
-    InlineNotification confirmInlineNotification;
-
-    @Inject
-    @DataField("confirm-message")
-    Span modalConfirmationMessageLabel;
-
-    @Inject
-    @DataField("confirm-cancel")
-    Button cancelButton;
-
-    @Inject
-    @DataField("confirm-ok")
-    Button okButton;
-
-    @Inject
-    @DataField("confirm-yes")
-    Button yesButton;
-
-    @Inject
-    @DataField("confirm-no")
-    Button noButton;
-
-    @Inject
-    @DataField("modal")
-    Modal modal;
-
-    @Inject
-    private TranslationService translationService;
-
-    Command okCommand;
-
-    Command yesCommand;
-
-    Command noCommand;
-
-    @PostConstruct
-    public void init() {
-        cancelButton.setText("Cancel");
-    }
-
-    @Override
-    public void show(final String title,
-                     final String okButtonText,
-                     final String confirmMessage,
-                     final Command okCommand) {
-        show(title,
-             null,
-             null,
-             okButtonText,
-             Button.ButtonStyleType.DANGER,
-             confirmMessage,
-             okCommand);
-    }
-
-    @Override
-    public void show(final String title,
-                     final String inlineNotificationMessage,
-                     final InlineNotification.InlineNotificationType inlineNotificationType,
-                     final String okButtonText,
-                     final Button.ButtonStyleType okButtonType,
-                     final String confirmMessage,
-                     final Command okCommand) {
-        this.okCommand = okCommand;
-        okButton.show();
-        yesButton.hide();
-        noButton.hide();
-        okButton.setText(okButtonText);
-        if (okButtonType != null) {
-            okButton.setButtonStyleType(okButtonType);
-        }
-        commonShow(title, inlineNotificationMessage, inlineNotificationType, confirmMessage);
-    }
-
-    @Override
-    public void show(final String title,
-                     final String yesButtonText,
-                     final String noButtonText,
-                     final String confirmMessage,
-                     final Command yesCommand,
-                     final Command noCommand) {
-        show(title,
-             null,
-             null,
-             yesButtonText,
-             noButtonText,
-             Button.ButtonStyleType.DANGER,
-             Button.ButtonStyleType.DEFAULT,
-             confirmMessage,
-             yesCommand,
-             noCommand);
-    }
-
-    @Override
-    public void show(final String title,
-                     final String inlineNotificationMessage,
-                     final InlineNotification.InlineNotificationType inlineNotificationType,
-                     final String yesButtonText,
-                     final String noButtonText,
-                     final Button.ButtonStyleType yesButtonType,
-                     final Button.ButtonStyleType noButtonType,
-                     final String confirmMessage,
-                     final Command yesCommand,
-                     final Command noCommand) {
-        this.yesCommand = yesCommand;
-        this.noCommand = noCommand;
-        okButton.hide();
-        yesButton.show();
-        noButton.show();
-        yesButton.setText(yesButtonText);
-        noButton.setText(noButtonText);
-        if (yesButtonType != null) {
-            yesButton.setButtonStyleType(yesButtonType);
-        }
-        if (noButtonType != null) {
-            noButton.setButtonStyleType(noButtonType);
-        }
-        commonShow(title, inlineNotificationMessage, inlineNotificationType, confirmMessage);
-    }
-
-    @Override
-    public HTMLElement getElement() {
-        return modal.getElement();
-    }
-
-    @Override
-    public void hide() {
-        modal.hide();
-    }
-
-    @EventHandler("confirm-ok")
-    public void onOkClick(final @ForEvent("click") MouseEvent event) {
-        if (okCommand != null) {
-            okCommand.execute();
-        }
-        hide();
-    }
-
-    @EventHandler("confirm-cancel")
-    public void onCancelClick(final @ForEvent("click") MouseEvent event) {
-        hide();
-    }
-
-    @EventHandler("confirm-close")
-    public void onCloseClick(final @ForEvent("click") MouseEvent event) {
-        hide();
-    }
-
-    @EventHandler("confirm-yes")
-    public void onYesClick(final @ForEvent("click") MouseEvent event) {
-        if (yesCommand != null) {
-            yesCommand.execute();
-        }
-        this.hide();
-    }
-
-    @EventHandler("confirm-no")
-    public void onNoClick(final @ForEvent("click") MouseEvent event) {
-        if (noCommand != null) {
-            noCommand.execute();
-        }
-        this.hide();
-    }
-
-    protected void commonShow(final String title, final String inlineNotificationMessage,
-                              final InlineNotification.InlineNotificationType inlineNotificationType, final String confirmMessage) {
-        modalTitle.setTextContent(title);
-        if (inlineNotificationMessage != null && inlineNotificationType != null) {
-            confirmInlineNotification.setMessage(inlineNotificationMessage);
-            confirmInlineNotification.setType(inlineNotificationType);
-            confirmInlineNotification.getElement().getStyle().removeProperty("display");
-        } else {
-            confirmInlineNotification.getElement().getStyle().setProperty("display", "none");
-        }
-        modalConfirmationMessageLabel.setTextContent(confirmMessage);
-        modal.show();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/producers/AbstractScenarioSimulationProducer.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/producers/AbstractScenarioSimulationProducer.java
deleted file mode 100644
index f0a80fc..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/producers/AbstractScenarioSimulationProducer.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.producers;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
-
-import com.google.gwt.event.shared.EventBus;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioCommandManager;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioCommandRegistryManager;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationEditorPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationView;
-import org.drools.workbench.screens.scenariosimulation.client.menu.ScenarioContextMenuRegistry;
-import org.drools.workbench.screens.scenariosimulation.client.popup.ConfirmPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.DeletePopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.FileUploadPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.PreserveDeletePopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridWidget;
-import org.uberfire.workbench.events.NotificationEvent;
-
-/**
- * <code>@Dependent</code> Class meant to be the only <i>Producer</i> for a given {@link org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationEditorPresenter}
- */
-public abstract class AbstractScenarioSimulationProducer {
-
-    @Inject
-    protected ScenarioGridPanelProducer scenarioGridPanelProducer;
-
-    @Inject
-    protected EventBusProducer eventBusProducer;
-
-    @Inject
-    protected DeletePopupPresenter deletePopupPresenter;
-
-    @Inject
-    protected PreserveDeletePopupPresenter preserveDeletePopupPresenter;
-
-    @Inject
-    protected ConfirmPopupPresenter confirmPopupPresenter;
-
-    @Inject
-    protected FileUploadPopupPresenter fileUploadPopupPresenter;
-
-    @Inject
-    protected ScenarioSimulationEventHandler scenarioSimulationEventHandler;
-
-    @Inject
-    protected ScenarioCommandRegistryManager scenarioCommandRegistryManager;
-
-    @Inject
-    protected ScenarioCommandManager scenarioCommandManager;
-
-    @Inject
-    protected Event<NotificationEvent> notificationEvent;
-
-    @PostConstruct
-    public void init() {
-        final ScenarioContextMenuRegistry scenarioContextMenuRegistry = scenarioGridPanelProducer.getScenarioContextMenuRegistry();
-        scenarioContextMenuRegistry.setEventBus(getEventBus());
-
-        scenarioSimulationEventHandler.setEventBus(getEventBus());
-        scenarioSimulationEventHandler.setDeletePopupPresenter(deletePopupPresenter);
-        scenarioSimulationEventHandler.setPreserveDeletePopupPresenter(preserveDeletePopupPresenter);
-        scenarioSimulationEventHandler.setConfirmPopupPresenter(confirmPopupPresenter);
-        scenarioSimulationEventHandler.setFileUploadPopupPresenter(fileUploadPopupPresenter);
-        scenarioSimulationEventHandler.setNotificationEvent(notificationEvent);
-        scenarioSimulationEventHandler.setScenarioCommandManager(scenarioCommandManager);
-        scenarioSimulationEventHandler.setScenarioCommandRegistryManager(scenarioCommandRegistryManager);
-        scenarioSimulationEventHandler.setContext(scenarioGridPanelProducer.getScenarioSimulationContext());
-    }
-
-    public EventBus getEventBus() {
-        return eventBusProducer.getEventBus();
-    }
-
-    public ScenarioSimulationView getScenarioSimulationView() {
-        return scenarioGridPanelProducer.getScenarioSimulationView(getEventBus());
-    }
-
-    public ScenarioGridWidget getScenarioBackgroundGridWidget() {
-        return scenarioGridPanelProducer.getBackgroundGridWidget(getEventBus());
-    }
-
-    public ScenarioSimulationContext getScenarioSimulationContext() {
-        return scenarioGridPanelProducer.getScenarioSimulationContext();
-    }
-
-    public void setScenarioSimulationEditorPresenter(ScenarioSimulationEditorPresenter presenter) {
-        scenarioSimulationEventHandler.setScenarioSimulationPresenter(presenter);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/producers/EventBusProducer.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/producers/EventBusProducer.java
deleted file mode 100644
index 37c8cdb..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/producers/EventBusProducer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.producers;
-
-import javax.enterprise.context.Dependent;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.event.shared.SimpleEventBus;
-
-/**
- * <code>@Dependent</code> <i>Producer</i> for a given {@link EventBus}
- */
-@Dependent
-public class EventBusProducer {
-
-    private final EventBus eventBus = new SimpleEventBus();
-
-    public EventBus getEventBus() {
-        return eventBus;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/producers/ScenarioGridPanelProducer.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/producers/ScenarioGridPanelProducer.java
deleted file mode 100644
index 7b0c01f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/producers/ScenarioGridPanelProducer.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.producers;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import com.google.gwt.event.shared.EventBus;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationView;
-import org.drools.workbench.screens.scenariosimulation.client.factories.CollectionEditorSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioExpressionCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioInvokeContextMenuForSelectedCell;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationGridPanelClickHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationGridPanelMouseMoveHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationKeyboardEditHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationMainGridPanelClickHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationMainGridPanelMouseMoveHandler;
-import org.drools.workbench.screens.scenariosimulation.client.menu.ScenarioContextMenuRegistry;
-import org.drools.workbench.screens.scenariosimulation.client.models.AbstractScesimGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.models.BackgroundGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.models.ScenarioGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.popover.ErrorReportPopoverPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.renderers.ScenarioGridRenderer;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridLayer;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridPanel;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.BaseGridWidgetKeyboardHandler;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.KeyboardOperationMoveDown;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.KeyboardOperationMoveLeft;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.KeyboardOperationMoveRight;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.KeyboardOperationMoveUp;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.KeyboardOperationSelectBottomRightCell;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.KeyboardOperationSelectTopLeftCell;
-
-/**
- * <code>@Dependent</code> <i>Producer</i> for a given {@link ScenarioGridPanel}
- */
-@ApplicationScoped
-public class ScenarioGridPanelProducer {
-
-    @Inject
-    protected ScenarioContextMenuRegistry scenarioContextMenuRegistry;
-
-    @Inject
-    protected ScenarioGridLayer simulationGridLayer;
-
-    @Inject
-    protected ScenarioGridPanel simulationGridPanel;
-
-    @Inject
-    protected ScenarioGridLayer backgroundGridLayer;
-
-    @Inject
-    protected ScenarioGridPanel backgroundGridPanel;
-
-    @Inject
-    protected ViewsProvider viewsProvider;
-
-    @Inject
-    protected ScenarioSimulationView scenarioSimulationView;
-
-    @Inject
-    protected ScenarioGridWidget simulationGridWidget;
-
-    @Inject
-    protected ScenarioGridWidget backgroundGridWidget;
-
-    @Inject
-    protected ScenarioSimulationMainGridPanelClickHandler simulationGridPanelClickHandler;
-
-    @Inject
-    protected ScenarioSimulationMainGridPanelMouseMoveHandler simulationGridPanelMouseMoveHandler;
-
-    @Inject
-    protected ScenarioSimulationMainGridPanelClickHandler backgroundGridPanelClickHandler;
-
-    @Inject
-    protected ScenarioSimulationMainGridPanelMouseMoveHandler backgroundGridPanelMouseMoveHandler;
-
-    @Inject
-    protected ErrorReportPopoverPresenter errorReportPopupPresenter;
-
-    protected ScenarioSimulationContext scenarioSimulationContext;
-
-
-    @PostConstruct
-    public void init() {
-        scenarioSimulationContext = new ScenarioSimulationContext(simulationGridWidget, backgroundGridWidget);
-        initializeGrid(simulationGridLayer, simulationGridPanel, new ScenarioGridModel(false), scenarioSimulationContext, 1, 0);
-        initializeGrid(backgroundGridLayer, backgroundGridPanel, new BackgroundGridModel(false), scenarioSimulationContext, 0, 0);
-    }
-
-    public ScenarioSimulationContext getScenarioSimulationContext() {
-        return scenarioSimulationContext;
-    }
-
-    public ScenarioGridPanel getSimulationGridPanel() {
-        return simulationGridPanel;
-    }
-
-    public ScenarioGridPanel getBackgroundGridPanel() {
-        return backgroundGridPanel;
-    }
-
-    public ScenarioContextMenuRegistry getScenarioContextMenuRegistry() {
-        return scenarioContextMenuRegistry;
-    }
-
-    public ScenarioSimulationView getScenarioSimulationView(final EventBus eventBus) {
-        scenarioSimulationView.setScenarioGridWidget(getScenarioMainGridWidget(eventBus));
-        return scenarioSimulationView;
-    }
-
-    public ScenarioGridWidget getBackgroundGridWidget(final EventBus eventBus) {
-        initGridWidget(backgroundGridWidget, getBackgroundGridPanel(),
-                       backgroundGridPanelClickHandler,
-                       backgroundGridPanelMouseMoveHandler,
-                       eventBus);
-        return backgroundGridWidget;
-    }
-
-    protected void initializeGrid(ScenarioGridLayer scenarioGridLayer,
-                                  ScenarioGridPanel scenarioGridPanel,
-                                  AbstractScesimGridModel abstractScesimGridModel,
-                                  ScenarioSimulationContext scenarioSimulationContext,
-                                  int defaultDataCellX,
-                                  int defaultDataCellY) {
-        final ScenarioGrid scenarioGrid = new ScenarioGrid(abstractScesimGridModel,
-                                                           scenarioGridLayer,
-                                                           new ScenarioGridRenderer(false),
-                                                           scenarioContextMenuRegistry);
-        scenarioGridLayer.addScenarioGrid(scenarioGrid);
-        scenarioGridPanel.add(scenarioGridLayer);
-        scenarioGrid.setScenarioSimulationContext(scenarioSimulationContext);
-        scenarioGrid.setDefaultSelectedDataCell(defaultDataCellX, defaultDataCellY);
-        abstractScesimGridModel.setCollectionEditorSingletonDOMElementFactory(
-                new CollectionEditorSingletonDOMElementFactory(scenarioGridPanel,
-                                                               scenarioGridLayer,
-                                                               scenarioGridLayer.getScenarioGrid(),
-                                                               scenarioSimulationContext,
-                                                               viewsProvider));
-        abstractScesimGridModel.setScenarioCellTextAreaSingletonDOMElementFactory(
-                new ScenarioCellTextAreaSingletonDOMElementFactory(scenarioGridPanel,
-                                                                   scenarioGridLayer,
-                                                                   scenarioGridLayer.getScenarioGrid()));
-        abstractScesimGridModel.setScenarioHeaderTextBoxSingletonDOMElementFactory(
-                new ScenarioHeaderTextBoxSingletonDOMElementFactory(scenarioGridPanel,
-                                                                    scenarioGridLayer,
-                                                                    scenarioGridLayer.getScenarioGrid()));
-        abstractScesimGridModel.setScenarioExpressionCellTextAreaSingletonDOMElementFactory(
-                new ScenarioExpressionCellTextAreaSingletonDOMElementFactory(scenarioGridPanel,
-                                                                             scenarioGridLayer,
-                                                                             scenarioGridLayer.getScenarioGrid()));
-
-        final ScenarioSimulationKeyboardEditHandler scenarioSimulationKeyboardEditHandler =
-                new ScenarioSimulationKeyboardEditHandler(scenarioGridLayer);
-        final ScenarioInvokeContextMenuForSelectedCell invokeContextMenuKeyboardOperation =
-                new ScenarioInvokeContextMenuForSelectedCell(scenarioGridLayer, scenarioContextMenuRegistry);
-
-        final BaseGridWidgetKeyboardHandler handler = new BaseGridWidgetKeyboardHandler(scenarioGridLayer);
-        handler.addOperation(scenarioSimulationKeyboardEditHandler,
-                             new KeyboardOperationSelectTopLeftCell(scenarioGridLayer),
-                             new KeyboardOperationMoveLeft(scenarioGridLayer),
-                             new KeyboardOperationMoveRight(scenarioGridLayer),
-                             new KeyboardOperationMoveUp(scenarioGridLayer),
-                             new KeyboardOperationMoveDown(scenarioGridLayer),
-                             new KeyboardOperationSelectBottomRightCell(scenarioGridLayer),
-                             invokeContextMenuKeyboardOperation);
-        scenarioGridPanel.addKeyDownHandler(handler);
-
-        // Hack to enable PINNED MODE i.e. not draggable
-        scenarioGridLayer.enterPinnedMode(scenarioGrid, () -> {});
-    }
-
-    protected ScenarioGridWidget getScenarioMainGridWidget(final EventBus eventBus) {
-        initGridWidget(simulationGridWidget, getSimulationGridPanel(),
-                       simulationGridPanelClickHandler,
-                       simulationGridPanelMouseMoveHandler,
-                       eventBus);
-        return simulationGridWidget;
-    }
-
-    protected void initGridWidget(final ScenarioGridWidget scenarioGridWidget,
-                                  final ScenarioGridPanel scenarioGridPanel,
-                                  final ScenarioSimulationGridPanelClickHandler clickHandler,
-                                  final ScenarioSimulationGridPanelMouseMoveHandler mouseMoveHandler,
-                                  final EventBus eventBus) {
-        scenarioGridPanel.setEventBus(eventBus);
-        scenarioContextMenuRegistry.setEventBus(eventBus);
-        clickHandler.setScenarioContextMenuRegistry(scenarioContextMenuRegistry);
-        clickHandler.setScenarioGridPanel(scenarioGridPanel);
-        clickHandler.setEventBus(eventBus);
-        scenarioContextMenuRegistry.setErrorReportPopoverPresenter(errorReportPopupPresenter);
-        mouseMoveHandler.setScenarioGridPanel(scenarioGridPanel);
-        mouseMoveHandler.setErrorReportPopupPresenter(errorReportPopupPresenter);
-        scenarioGridPanel.addHandlers(clickHandler, mouseMoveHandler);
-        scenarioGridWidget.setScenarioGridPanel(scenarioGridPanel);
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/BaseExpressionGridRenderer.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/BaseExpressionGridRenderer.java
deleted file mode 100644
index eec5871..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/BaseExpressionGridRenderer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.renderers;
-
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.impl.BaseGridRenderer;
-
-public class BaseExpressionGridRenderer extends BaseGridRenderer {
-
-    protected static final double HEADER_HEIGHT = 64;
-
-    protected static final double HEADER_ROW_HEIGHT = 64;
-
-    protected final double headerHeight;
-
-    protected final double headerRowHeight;
-
-    public BaseExpressionGridRenderer(final boolean isHeaderHidden) {
-        super(new BaseExpressionGridTheme());
-        this.headerHeight = isHeaderHidden ? 0.0 : HEADER_HEIGHT;
-        this.headerRowHeight = isHeaderHidden ? 0.0 : HEADER_ROW_HEIGHT;
-    }
-
-    @Override
-    public double getHeaderHeight() {
-        return headerHeight;
-    }
-
-    @Override
-    public double getHeaderRowHeight() {
-        return headerRowHeight;
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/BaseExpressionGridTheme.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/BaseExpressionGridTheme.java
deleted file mode 100644
index 8b04a57..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/BaseExpressionGridTheme.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.renderers;
-
-import com.ait.lienzo.client.core.shape.Line;
-import com.ait.lienzo.client.core.shape.MultiPath;
-import com.ait.lienzo.client.core.shape.Rectangle;
-import com.ait.lienzo.client.core.shape.Text;
-import com.ait.lienzo.shared.core.types.ColorName;
-import com.ait.lienzo.shared.core.types.TextAlign;
-import com.ait.lienzo.shared.core.types.TextBaseLine;
-import com.ait.lienzo.shared.core.types.TextUnit;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.uberfire.ext.wires.core.grids.client.model.GridCell;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.themes.impl.KIEStyles;
-
-import static org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.themes.impl.KIEColours.CELL_ERROR_BACKGROUND;
-import static org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.themes.impl.KIEColours.CELL_ERROR_FOCUS;
-import static org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.themes.impl.KIEColours.CELL_FOCUS;
-import static org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.themes.impl.KIEColours.HEADER_BACKGROUND_DARK_BLUE;
-import static org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.themes.impl.KIEColours.HEADER_BACKGROUND_LIGHT_BLUE;
-import static org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.themes.impl.KIEColours.HEADER_BACKGROUND_WHITE;
-import static org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.themes.impl.KIEColours.TABLE_GRID;
-import static org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.themes.impl.KIEColours.TABLE_TEXT;
-
-public class BaseExpressionGridTheme implements ScenarioGridRendererTheme {
-
-    public static final String FONT_FAMILY_HEADER = "Open Sans, Helvetica, Arial, sans-serif";
-
-    public static final double SELECTOR_STROKE_WIDTH = 2.0;
-
-    public static final double STROKE_WIDTH = 1.0;
-
-    public static final double DEFAULT_STROKE_WIDTH = 0;
-
-
-    @Override
-    public String getName() {
-        return "Test Scenarios (Preview)";
-    }
-
-    @Override
-    public MultiPath getSelector() {
-        return new MultiPath().setVisible(false);
-    }
-
-    @Override
-    public Rectangle getCellSelectorBorder() {
-        return new Rectangle(0, 0)
-                .setStrokeColor(CELL_FOCUS)
-                .setStrokeWidth(SELECTOR_STROKE_WIDTH);
-    }
-
-    @Override
-    public Rectangle getCellSelectorBackground() {
-        return new Rectangle(0, 0).setVisible(false);
-    }
-
-    @Override
-    public Rectangle getHeaderBackground(final GridColumn<?> column) {
-        String colorToApply;
-        // GIVEN
-        if(FactMappingType.GIVEN.name().equalsIgnoreCase(column.getHeaderMetaData().get(0).getTitle())) {
-            colorToApply = HEADER_BACKGROUND_LIGHT_BLUE;
-        }
-        // EXPECT
-        else if (FactMappingType.EXPECT.name().equalsIgnoreCase(column.getHeaderMetaData().get(0).getTitle())) {
-            colorToApply = HEADER_BACKGROUND_DARK_BLUE;
-        }
-        // DEFAULT
-        else {
-            colorToApply = HEADER_BACKGROUND_WHITE;
-        }
-
-        return new Rectangle(0, 0)
-                .setFillColor(colorToApply)
-                .setStrokeWidth(DEFAULT_STROKE_WIDTH);
-    }
-
-    @Override
-    public MultiPath getHeaderGridLine() {
-        return new MultiPath()
-                .setStrokeColor(TABLE_GRID)
-                .setStrokeWidth(STROKE_WIDTH)
-                .setVisible(true);
-    }
-
-    @Override
-    public Text getHeaderText() {
-        return new Text("")
-                .setFillColor(TABLE_TEXT)
-                .setFontSize(KIEStyles.FONT_SIZE)
-                .setFontFamily(FONT_FAMILY_HEADER)
-                .setTextUnit(TextUnit.PT)
-                .setListening(false)
-                .setTextBaseLine(TextBaseLine.MIDDLE)
-                .setTextAlign(TextAlign.CENTER)
-                .setStrokeWidth(DEFAULT_STROKE_WIDTH);
-    }
-
-    @Override
-    public Rectangle getBodyBackground(final GridColumn<?> column) {
-        final Rectangle background = new Rectangle(0, 0);
-        background
-                .setFillColor(ColorName.TRANSPARENT)
-                .setStrokeWidth(DEFAULT_STROKE_WIDTH);
-        // to customize background on column-type base, set the fill color (e.g. background.setFillColor(LABEL_BACKGROUND_FILL_COLOUR); ) based on the column type
-        return background;
-    }
-
-    @Override
-    public MultiPath getBodyGridLine() {
-        return new MultiPath()
-                .setStrokeColor(TABLE_GRID)
-                .setStrokeWidth(STROKE_WIDTH)
-                .setVisible(true);
-    }
-
-    @Override
-    public Text getBodyText() {
-        return new Text("")
-                .setFillColor(TABLE_TEXT)
-                .setFontSize(KIEStyles.FONT_SIZE)
-                .setFontFamily(KIEStyles.FONT_FAMILY_LABEL)
-                .setTextUnit(TextUnit.PT)
-                .setListening(false)
-                .setTextBaseLine(TextBaseLine.MIDDLE)
-                .setTextAlign(TextAlign.CENTER)
-                .setStrokeWidth(DEFAULT_STROKE_WIDTH);
-    }
-
-    @Override
-    public Rectangle getGridBoundary() {
-        return new Rectangle(0, 0)
-                .setStrokeColor(TABLE_GRID)
-                .setStrokeWidth(STROKE_WIDTH)
-                .setVisible(true);
-    }
-
-    @Override
-    public Line getGridHeaderBodyDivider() {
-        return new Line()
-                .setStrokeColor(TABLE_GRID)
-                .setStrokeWidth(STROKE_WIDTH)
-                .setVisible(true);
-    }
-
-    @Override
-    public Rectangle getBodyErrorBackground(GridCell<?> cell) {
-        final Rectangle header = new Rectangle(0,
-                                               0)
-                .setFillColor(CELL_ERROR_BACKGROUND);
-        return header;
-    }
-
-    @Override
-    public Text getErrorText() {
-        return new Text("")
-                .setFillColor(CELL_ERROR_FOCUS)
-                .setFontSize(KIEStyles.FONT_SIZE)
-                .setFontFamily(KIEStyles.FONT_FAMILY_LABEL)
-                .setTextUnit(TextUnit.PT)
-                .setListening(false)
-                .setTextBaseLine(TextBaseLine.MIDDLE)
-                .setTextAlign(TextAlign.CENTER)
-                .setStrokeWidth(DEFAULT_STROKE_WIDTH);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRenderer.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRenderer.java
deleted file mode 100644
index ea696dd..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRenderer.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.renderers;
-
-import java.util.List;
-import java.util.function.BiFunction;
-
-import com.ait.lienzo.client.core.shape.Group;
-import com.ait.lienzo.client.core.shape.Rectangle;
-import com.ait.lienzo.client.core.shape.Text;
-import com.google.gwt.json.client.JSONParser;
-import com.google.gwt.json.client.JSONString;
-import com.google.gwt.json.client.JSONValue;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.uberfire.ext.wires.core.grids.client.model.GridCell;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.widget.context.GridBodyCellRenderContext;
-import org.uberfire.ext.wires.core.grids.client.widget.context.GridBodyColumnRenderContext;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.columns.impl.ColumnRenderingStrategyFlattened;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.columns.impl.StringColumnRenderer;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.GridRenderer;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.impl.BaseGridRendererHelper;
-
-public class ScenarioGridColumnRenderer extends StringColumnRenderer {
-
-    @Override
-    public Group renderCell(final GridCell<String> cell,
-                            final GridBodyCellRenderContext context) {
-        if (cell == null || cell.getValue() == null || (cell.getValue().getValue() == null && cell.getValue().getPlaceHolder() == null)) {
-            return null;
-        }
-
-        final ScenarioGridRendererTheme theme = (ScenarioGridRendererTheme) context.getRenderer().getTheme();
-
-        Text text;
-        String value;
-
-        // Show placeholder only if the following conditions are met
-        if ((cell instanceof ScenarioGridCell) && cell.getValue() != null && (cell.getValue().getValue() == null || cell.getValue().getValue().isEmpty() ) && cell.getValue().getPlaceHolder() != null) {
-            // Render as placeholder
-            text = theme.getPlaceholderText();
-            value = cell.getValue().getPlaceHolder();
-        } else {
-            text = ((ScenarioGridCell) cell).isErrorMode() ? theme.getErrorText() : theme.getBodyText();
-            value = getValueToShow((ScenarioGridCell) cell);
-        }
-
-        return internalRenderCell(cell,
-                                  context,
-                                  text,
-                                  value);
-    }
-
-    @Override
-    public List<GridRenderer.RendererCommand> renderColumn(GridColumn<?> column, GridBodyColumnRenderContext context, BaseGridRendererHelper rendererHelper, BaseGridRendererHelper.RenderingInformation renderingInformation, BiFunction<Boolean, GridColumn<?>, Boolean> columnRenderingConstraint) {
-        return ColumnRenderingStrategyFlattened.render(column,
-                                                       context,
-                                                       rendererHelper,
-                                                       renderingInformation,
-                                                       columnRenderingConstraint);
-    }
-
-    @Override
-    protected Group internalRenderCell(final GridCell<String> cell,
-                             final GridBodyCellRenderContext context,
-                             final Text text,
-                             final String value) {
-        if (value == null) {
-            return null;
-        }
-
-        final GridRenderer renderer = context.getRenderer();
-        final ScenarioGridRendererTheme theme = (ScenarioGridRendererTheme) renderer.getTheme();
-
-        final Group g = new Group();
-
-        text.setText(value);
-        text.setListening(false);
-        text.setX(context.getCellWidth() / 2);
-        text.setY(context.getCellHeight() / 2);
-
-        applyBackgroundColor((ScenarioGridCell)cell, context, g, theme);
-
-        g.add(text);
-        return g;
-    }
-
-    protected void applyBackgroundColor(ScenarioGridCell cell,
-                              GridBodyCellRenderContext context,
-                              Group group,
-                              ScenarioGridRendererTheme theme) {
-        if (cell.isErrorMode()) {
-            final Rectangle bodyErrorBackground = theme.getBodyErrorBackground(cell);
-            bodyErrorBackground.setWidth(context.getCellWidth());
-            bodyErrorBackground.setHeight(context.getCellHeight());
-            group.add(bodyErrorBackground);
-        }
-    }
-
-    protected String getValueToShow(ScenarioGridCell scenarioGridCell) {
-        String rawValue = scenarioGridCell.getValue() != null ? scenarioGridCell.getValue().getValue() : null;
-        return (rawValue != null && (scenarioGridCell.isList() || scenarioGridCell.isMap())) ? getCollectionString(rawValue, scenarioGridCell.isList()) : rawValue;
-    }
-
-    protected String getCollectionString(String jsonString, boolean isList) {
-        try {
-            JSONValue jsonValue = JSONParser.parseStrict(jsonString);
-            if (jsonValue instanceof JSONString) {
-                return isList ? "List()" : "Map()";
-            } else {
-                String toFormat = isList ? "List(%s)" : "Map(%s)";
-                int size = -1;
-                if (isList) {
-                    size = jsonValue.isArray().size();
-                } else {
-                    size = jsonValue.isObject().keySet().size();
-                }
-                return toFormat.replace("%s", String.valueOf(size));
-            }
-        } catch (Exception e) {
-            return jsonString;
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridRenderer.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridRenderer.java
deleted file mode 100644
index 9c285d3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridRenderer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.renderers;
-
-import org.drools.workbench.screens.scenariosimulation.client.models.ScenarioGridModel;
-
-public class ScenarioGridRenderer extends BaseExpressionGridRenderer {
-
-    private static final double HEADER_ROW_HEIGHT = 32.0;
-
-    public ScenarioGridRenderer(boolean isHeaderHidden) {
-        super(isHeaderHidden);
-    }
-
-    @Override
-    public double getHeaderHeight() {
-        return HEADER_ROW_HEIGHT * ScenarioGridModel.HEADER_ROW_COUNT;
-    }
-
-    @Override
-    public double getHeaderRowHeight() {
-        return HEADER_ROW_HEIGHT;
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridRendererTheme.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridRendererTheme.java
deleted file mode 100644
index 093e515..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridRendererTheme.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.renderers;
-
-import com.ait.lienzo.client.core.shape.Rectangle;
-import com.ait.lienzo.client.core.shape.Text;
-import org.uberfire.ext.wires.core.grids.client.model.GridCell;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.themes.GridRendererTheme;
-
-public interface ScenarioGridRendererTheme extends GridRendererTheme {
-
-    Rectangle getBodyErrorBackground(final GridCell<?> column);
-
-    Text getErrorText();
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/ScenarioSimulationEditorResources.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/ScenarioSimulationEditorResources.java
deleted file mode 100644
index b6dbacb..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/ScenarioSimulationEditorResources.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.resources;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
-import org.drools.workbench.screens.scenariosimulation.client.resources.css.ScenarioSimulationEditorStylesCss;
-import org.drools.workbench.screens.scenariosimulation.client.resources.images.ScenarioSimulationEditorImageResources;
-
-public interface ScenarioSimulationEditorResources
-        extends
-        ClientBundle {
-
-    ScenarioSimulationEditorResources INSTANCE = GWT.create(ScenarioSimulationEditorResources.class);
-
-    ScenarioSimulationEditorImageResources images();
-
-    @Source("css/ScenarioSimulationEditorStyles.css")
-    ScenarioSimulationEditorStylesCss css();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStylesCss.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStylesCss.java
deleted file mode 100644
index 264ac87..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStylesCss.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.resources.css;
-
-import com.google.gwt.resources.client.CssResource;
-
-public interface ScenarioSimulationEditorStylesCss extends CssResource {
-
-    String disabled();
-
-    @ClassName("list-group-item-header")
-    String listGroupItemHeader();
-
-    @ClassName("list-group-item-container")
-    String listGroupItemContainer();
-
-    @ClassName("list-view-pf-expand-active")
-    String listViewPfExpandActive();
-
-    @ClassName("kie-tree-list-view-pf-view--compact")
-    String kieTreeListViewPfViewCompact();
-
-    @ClassName("list-view-pf-main-info")
-    String listViewPfMainInfo();
-
-    @ClassName("list-group-item")
-    String listGroupItem();
-
-    @ClassName("list-view-pf-expand")
-    String listViewPfExpand();
-
-    @ClassName("selected")
-    String selected();
-
-    @ClassName("ul--plain")
-    String ulPlain();
-
-    @ClassName("node-hidden")
-    String nodeHidden();
-
-    @ClassName("treeview")
-    String treeview();
-
-    @ClassName("list-group")
-    String listGroup();
-
-    @ClassName("kie-object-list__field-label")
-    String kieObjectList__fieldLabel();
-
-    @ClassName("kie-object-list__separator")
-    String kieObjectList__separator();
-
-    @ClassName("kie-object-list")
-    String kieObjectList();
-
-    @ClassName("kie-object-list--mapping")
-    String kieObjectListMapping();
-
-    @ClassName("kie-object-list__field-value")
-    String kieObjectList__fieldValue();
-
-    @ClassName("kie-object-list__expander")
-    String kieObjectList__expander();
-
-    @ClassName("kie-tab-pane--scesim-panel")
-    String kieTabPaneScesimPanel();
-
-    @ClassName("kie-tab-pane--scesim-panel-footer")
-    String kieTabPaneScesimPanelFooter();
-
-    @ClassName("kie-test-tools-content__box")
-    String kieTestToolsContentBox();
-
-    @ClassName("kie-test-tools-info__icon")
-    String kieTestToolsInfoIcon();
-
-    @ClassName("kie-test-tools-search__box")
-    String kieTestToolsSearchBox();
-
-    @ClassName("kie-test-tools-instances-list__label")
-    String kieTestToolsInstancesListLabel();
-
-    @ClassName("kie-test-tools-clear-selection")
-    String kieTestToolsClearSelection();
-
-    @ClassName("kie-list-view-pf-main-field-element")
-    String kieListViewPfMainFieldElement();
-
-    @ClassName("kie-list-view-pf-main-info__check")
-    String kieListViewPfMainInfoCheck();
-
-    @ClassName("kie-list-view-pf-main-info__text")
-    String kieListViewPfMainInfoText();
-
-    @ClassName("kie-test-tools-insert-object-label")
-    String kieTestToolsInsertObjectLabel();
-
-    @ClassName("list-group-item-container-fact-property")
-    String listGroupItemContainerFactProperty();
-
-    @ClassName("kie-coverage__dl-horizontal")
-    String kieCoverageDlHorizontollectionEditorAddButtonContaineral();
-
-    @ClassName("collection-editor-expression_textarea")
-    String collectionEditorExpressionTextarea();
-
-    @ClassName("collection-editor-add-button-container")
-    String c();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.java
deleted file mode 100644
index 37f93a0..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.resources.i18n;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.i18n.client.Messages;
-
-/**
- * ScenarioSimulationEditor I18N constants
- */
-public interface ScenarioSimulationEditorConstants
-        extends
-        Messages {
-
-    ScenarioSimulationEditorConstants INSTANCE = GWT.create(ScenarioSimulationEditorConstants.class);
-
-    String newScenarioSimulationDescription();
-
-    String factColumnHeader();
-
-    String fieldColumnHeader();
-
-    String contextColumnHeader();
-
-    String addScenarioSimulation();
-
-    String scenarioSimulationEditorTitle();
-
-    String scenarioSimulationResourceTypeDescription();
-
-    String remove();
-
-    String currentlyNotAvailable();
-
-    String supportedDmnVersions();
-
-    String unSupportedDmnVersion(String dmnVersion);
-
-    String invalidDefinitionDisabled();
-
-    String testTools();
-
-    String testReport();
-
-    String testEditor();
-
-    String testToolsAddButton();
-
-    String testToolsAddButtonLabel();
-
-    String scenarioCheatSheet();
-
-    String ruleCheatSheet1();
-
-    String ruleCheatSheet2();
-
-    String ruleCheatSheet3();
-
-    String ruleCheatSheet4();
-
-    String ruleCheatSheet5();
-
-    String ruleCheatSheet6();
-
-    String ruleCheatSheet7();
-
-    String ruleCheatSheet8();
-
-    String ruleCheatSheet9();
-
-    String ruleCheatSheet10();
-
-    String ruleCheatSheet11();
-
-    String ruleCheatSheet12();
-
-    String ruleCheatSheet13();
-
-    String ruleCheatSheet14();
-
-    String ruleCheatSheet15();
-
-    String ruleCheatSheet16();
-
-    String ruleCheatSheet17();
-
-    String ruleCheatSheet18();
-
-    String ruleCheatSheet19();
-
-    String or();
-
-    String ruleCheatSheet20();
-
-    String ruleCheatSheet21();
-
-    String ruleCheatSheet22();
-
-    String ruleCheatSheet23();
-
-    String dmnCheatSheet1();
-
-    String dmnCheatSheet2();
-
-    String dmnCheatSheet3();
-
-    String dmnCheatSheet4();
-
-    String dmnCheatSheet5();
-
-    String dmnCheatSheet6();
-
-    String dmnCheatSheet7();
-
-    String and();
-
-    String dmnCheatSheet8();
-
-    String dmnCheatSheet9();
-
-    String dmnCheatSheet10();
-
-    String dmnCheatSheet11();
-
-    String dmnCheatSheet12();
-
-    String dmnCheatSheet13();
-
-    String dmnCheatSheet14();
-
-    String dmnCheatSheet15();
-
-    String dmnCheatSheet16();
-
-    String dmnCheatSheet17();
-
-    String dmnCheatSheet18();
-
-    String dmnCheatSheet19();
-
-    String dmnCheatSheet20();
-
-    String dmnCheatSheet21();
-
-    String forExample();
-
-    String runScenarioSimulation();
-
-    String expect();
-
-    String insertColumnLeft();
-
-    String insertColumnRight();
-
-    String deleteColumn();
-
-    String deleteInstance();
-
-    String duplicateInstance();
-
-    String insertRowBelow();
-
-    String scenario();
-
-    String background();
-
-    String given();
-
-    String insertRowAbove();
-
-    String deleteRow();
-
-    String duplicateRow();
-
-    String runSingleScenario();
-
-    String prependRow();
-
-    String appendRow();
-
-    String insertLeftmostColumn();
-
-    String insertRightmostColumn();
-
-    String description();
-
-    String insertValue();
-
-    String deleteValues();
-
-    String dateFormatPlaceholder();
-
-    String dateTimeFormatPlaceholder();
-
-    String timeFormatPlaceholder();
-
-    String dmnDateFormatPlaceholder();
-
-    String deleteScenarioMainTitle();
-
-    String deleteScenarioMainQuestion();
-
-    String deleteScenarioText1();
-
-    String deleteScenarioTextQuestion();
-
-    String deleteScenarioTextDanger();
-
-    String preserveDeleteScenarioMainTitle();
-
-    String preserveDeleteScenarioMainQuestion();
-
-    String preserveDeleteScenarioText1();
-
-    String preserveDeleteScenarioTextQuestion();
-
-    String preserveDeleteScenarioTextOption1();
-
-    String preserveDeleteScenarioTextOption2();
-
-    String preserveValues();
-
-    String defineValidType();
-
-    String insertExpression();
-
-    String changeType();
-
-    String changeTypeMainTitle();
-
-    String changeTypeMainQuestion();
-
-    String changeTypeText1();
-
-    String changeTypeTextQuestion();
-
-    String changeTypeTextDanger();
-
-    String undo();
-
-    String redo();
-
-    String sourceType();
-
-    String chooseDMN();
-
-    String chooseValidDMNAsset();
-
-    String removeCollectionMainTitle();
-
-    String removeCollectionMainQuestion();
-
-    String removeCollectionText1();
-
-    String removeCollectionQuestion();
-
-    String removeCollectionWarningText();
-
-    String collectionError();
-
-    String selectImportFile();
-
-    String importLabel();
-
-    String settings();
-
-    String name();
-
-    String type();
-
-    String dmnPathErrorLabel(String dmnPath);
-
-    String dmnPathErrorDetailedLabel(String dmnPath, String message);
-
-    String missingSelectedType();
-
-    String missingDmnPath();
-
-    String coverageReport();
-
-    String uploadWarning();
-
-    String chooseFile();
-
-    String importFailedMessage();
-
-    String importErrorTitle();
-
-    String executed();
-
-    String notCovered();
-
-    String decisionsEvaluated();
-
-    String rulesFired();
-
-    String coverageNotSupportedForRule();
-
-    String runATestToSeeCoverageReport();
-
-    String running();
-
-    String simpleTypes();
-
-    String complexTypes();
-
-    String dataObjectInstances();
-
-    String complexCustomInstances();
-
-    String simpleCustomInstances();
-
-    String reportAvailableLabel();
-
-    String reportExecutedLabel();
-
-    String reportCoverageLabel();
-
-    String numberOfTimesDecisionEvaluated();
-
-    String reportAvailableRuleLabel();
-
-    String reportExecutedRuleLabel();
-
-    String reportCoverageRuleLabel();
-
-    String numberOfTimesRulesFired();
-
-    String errorReason();
-
-    String keep();
-
-    String close();
-
-    String apply();
-
-    String errorPopoverMessageFailedWithError(String expectedValue, String errorValue);
-
-    String errorPopoverMessageFailedWithException(String errorMsg);
-
-    String errorPopoverGenericCollectionErrorMessage();
-
-    String errorPopoverCollectionHTMLFailureMessage(String failureMessage);
-
-    String errorPopoverCollectionHTMLField(String field);
-
-    String errorPopoverCollectionHTMLValue(String value);
-
-    String skipSimulation();
-
-    String downloadReportLabel();
-
-    String noDecisionsAvailable();
-
-    String noRulesAvailable();
-
-    String headerTitleEmptyError();
-
-    String instanceTitleAssignedError(String title);
-
-    String instanceTitleWithPeriodsError();
-
-    String propertyTitleAssignedError(String title);
-
-    String propertyTitleWithPeriodsError();
-
-    String validationErrorTitle();
-
-    String validationErrorMessage();
-
-    String validationFailedNotification();
-
-    String validationSucceed();
-
-    String loadContentFailedNotification();
-
-    String backgroundTabTitle();
-
-    String export();
-
-    String backgroundErrorNotification();
-
-    String ruleScenarioNotSupportedNotification();
-
-    String testToolsDescription();
-
-    String testToolObjectSelectionTitle();
-
-    String testToolObjectSelectionTooltip();
-
-    String testToolClearSelection();
-
-    String commonCheatSheetBackground(String background, String model);
-
-    String createButton();
-
-    String saveButton();
-
-    String removeButton();
-
-    String cancelButton();
-
-    String item();
-
-    String addNewListItem();
-
-    String addNewMapItem();
-
-    String createLabelList();
-
-    String createLabelMap();
-
-    String collectionListCreation();
-
-    String collectionMapCreation();
-
-    String createLabelListDescription();
-
-    String defineLabelList();
-
-    String defineLabelMap();
-
-    String defineLabelListDescription();
-
-    String createLabelMapDescription();
-
-    String defineLabelMapDescription();
-
-    String scenarioValidationNodeChangedError(String oldType, String newType);
-
-    String scenarioValidationFieldChangedError(String oldType, String newType);
-
-    String scenarioValidationFieldAddedConstraintError();
-
-    String scenarioValidationFieldRemovedConstraintError();
-
-    String scenarioParsingError();
-
-    String scenarioParsingErrorContent();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorI18nServerManager.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorI18nServerManager.java
deleted file mode 100644
index 7229827..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorI18nServerManager.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.resources.i18n;
-
-import org.drools.workbench.screens.scenariosimulation.model.FactMappingValidationError;
-
-public class ScenarioSimulationEditorI18nServerManager {
-
-    private ScenarioSimulationEditorI18nServerManager() {
-        // Util Class
-    }
-
-    public static String retrieveMessage(FactMappingValidationError error) {
-        if (error != null && error.getServerMessage() != null) {
-            switch (error.getServerMessage()) {
-                case SCENARIO_VALIDATION_NODE_CHANGED_ERROR:
-                    return ScenarioSimulationEditorConstants.INSTANCE.scenarioValidationNodeChangedError(error.getParameters()[0],
-                                                                                                         error.getParameters()[1]);
-                case SCENARIO_VALIDATION_FIELD_CHANGED_ERROR:
-                    return ScenarioSimulationEditorConstants.INSTANCE.scenarioValidationFieldChangedError(error.getParameters()[0],
-                                                                                                          error.getParameters()[1]);
-                case SCENARIO_VALIDATION_FIELD_ADDED_CONSTRAINT_ERROR:
-                    return ScenarioSimulationEditorConstants.INSTANCE.scenarioValidationFieldAddedConstraintError();
-                case SCENARIO_VALIDATION_FIELD_REMOVED_CONSTRAINT_ERROR:
-                    return ScenarioSimulationEditorConstants.INSTANCE.scenarioValidationFieldRemovedConstraintError();
-            }
-        }
-        throw new IllegalArgumentException();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/images/ScenarioSimulationEditorImageResources.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/images/ScenarioSimulationEditorImageResources.java
deleted file mode 100644
index 979aeca..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/images/ScenarioSimulationEditorImageResources.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.resources.images;
-
-import com.google.gwt.resources.client.ClientBundle;
-import com.google.gwt.resources.client.ImageResource;
-
-public interface ScenarioSimulationEditorImageResources
-        extends
-        ClientBundle {
-
-    @Source("BPM_FileIcons_ScenarioSimulation.png")
-    ImageResource typeScenarioSimulation();
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/AbstractSubDockPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/AbstractSubDockPresenter.java
deleted file mode 100644
index 3ae372d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/AbstractSubDockPresenter.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.Objects;
-
-import javax.annotation.PostConstruct;
-
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.Widget;
-import org.uberfire.backend.vfs.ObservablePath;
-import org.uberfire.client.mvp.AbstractActivity;
-import org.uberfire.security.ResourceType;
-import org.uberfire.workbench.model.ActivityResourceType;
-import org.uberfire.workbench.model.CompassPosition;
-import org.uberfire.workbench.model.Position;
-
-public abstract class AbstractSubDockPresenter<T extends SubDockView> extends AbstractActivity implements SubDockView.Presenter {
-
-    public static final int DEFAULT_PREFERRED_WIDHT = 300;
-
-    protected String title;
-    protected T view;
-    protected ObservablePath currentPath;
-
-    public AbstractSubDockPresenter() {
-    }
-
-    public AbstractSubDockPresenter(T view) {
-        this.view = view;
-    }
-
-    @PostConstruct
-    public void setup() {
-        view.init(this);
-    }
-
-    public Position getDefaultPosition() {
-        return CompassPosition.EAST;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    @Override
-    public IsWidget getWidget() {
-        return asWidget();
-    }
-
-    public Widget asWidget() {
-        return view.asWidget();
-    }
-
-    @Override
-    public void setCurrentPath(ObservablePath path) {
-        currentPath = path;
-    }
-
-    @Override
-    public boolean isCurrentlyShow(ObservablePath path) {
-        return Objects.equals(currentPath, path);
-    }
-
-   @Override
-   public ResourceType getResourceType() {
-        return ActivityResourceType.DOCK;
-   }
-
-    public boolean isOpen() {
-        return open;
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetPresenter.java
deleted file mode 100644
index 8b196b9..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetPresenter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-
-@ApplicationScoped
-@Named(CheatSheetPresenter.IDENTIFIER)
-public class CheatSheetPresenter extends AbstractSubDockPresenter<CheatSheetView> implements CheatSheetView.Presenter {
-
-    public static final String IDENTIFIER = "org.drools.scenariosimulation.CheatSheet";
-
-    public CheatSheetPresenter() {
-        //Zero argument constructor for CDI
-        title = ScenarioSimulationEditorConstants.INSTANCE.scenarioCheatSheet();
-    }
-
-    @Inject
-    public CheatSheetPresenter(CheatSheetView view) {
-        super(view);
-        title = ScenarioSimulationEditorConstants.INSTANCE.scenarioCheatSheet();
-    }
-
-    @Override
-    public String getIdentifier() {
-        return IDENTIFIER;
-    }
-
-    @Override
-    public void reset() {
-        view.reset();
-    }
-
-    public void initCheatSheet(ScenarioSimulationModel.Type type) {
-        if (type.equals(ScenarioSimulationModel.Type.RULE)) {
-            view.setRuleCheatSheetContent();
-        }
-        if (type.equals(ScenarioSimulationModel.Type.DMN)) {
-            view.setDMNCheatSheetContent();
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetView.java
deleted file mode 100644
index e951290..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetView.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-
-public interface CheatSheetView extends SubDockView<CheatSheetView.Presenter> {
-
-    void setRuleCheatSheetContent();
-
-    void setDMNCheatSheetContent();
-
-    interface Presenter extends SubDockView.Presenter {
-
-        /**
-         * Method to initialize cheat sheet content based on <code>ScenarioSimulationModel.Type</code>
-         * @param type
-         */
-        void initCheatSheet(ScenarioSimulationModel.Type type);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetViewImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetViewImpl.html
deleted file mode 100644
index 5a73823..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetViewImpl.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!doctype html>
-<!--
-  ~ 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.      
--->
-
-<!-- CHEATSHEET  -->
-<div id="cheatsheet-panel" class="uf-scroll-panel">
-  <!-- content for cheatsheet -->
-  <div id="kieCheatSheetContent" class="tab-pane kie-tab-pane--scesim-panel">
-    <div id="ruleCheatSheet">
-      <p id="ruleCheatSheetParagraph1"></p>
-      <p id="ruleCheatSheetParagraph2"></p>
-      <p id="ruleCheatSheetParagraphBackground"></p>
-      <p id="ruleCheatSheetParagraph3"></p>
-      <p id="ruleCheatSheetParagraph4"></p>
-      <ul>
-        <li id="ruleCheatSheetList1"></li>
-        <li id="ruleCheatSheetList2"></li>
-        <li id="ruleCheatSheetList3"></li>
-        <li id="ruleCheatSheetList4"></li>
-        <li id="ruleCheatSheetList5"></li>
-        <li id="ruleCheatSheetList6"></li>
-        <li id="ruleCheatSheetList7"></li>
-      </ul>
-      <p id="ruleCheatSheetParagraph5"></p>
-      <ul id="ruleCheatSheetExampleExpressions"></ul>
-    </div>
-    <div id="dmnCheatSheet">
-      <p id="dmnCheatSheetParagraph1"></p>
-      <p id="dmnCheatSheetParagraph2"></p>
-      <p id="dmnCheatSheetParagraphBackground"></p>
-      <p id="dmnCheatSheetParagraph3"></p>
-      <p id="dmnCheatSheetParagraph4"></p>
-      <p id="dmnCheatSheetParagraph5"></p>
-      <ul>
-        <li id="dmnCheatSheetList1"></li>
-        <li id="dmnCheatSheetList2"></li>
-        <li id="dmnCheatSheetList3"></li>
-        <li id="dmnCheatSheetList4"></li>
-        <li id="dmnCheatSheetList5"></li>
-        <li id="dmnCheatSheetList6"></li>
-        <li id="dmnCheatSheetList7"></li>
-        <li id="dmnCheatSheetList8"></li>
-        <li id="dmnCheatSheetList9"></li>
-      </ul>
-      <p id="dmnCheatSheetParagraph6"></p>
-      <p id="dmnCheatSheetParagraph7"></p>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetViewImpl.java
deleted file mode 100644
index ffced89..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetViewImpl.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.ParagraphElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.user.client.ui.Composite;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-@ApplicationScoped
-@Templated(stylesheet = "/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStyles.css")
-public class CheatSheetViewImpl
-        extends Composite
-        implements CheatSheetView {
-
-    protected Presenter presenter;
-
-    @DataField("ruleCheatSheet")
-    protected DivElement ruleCheatSheet = Document.get().createDivElement();
-
-    @DataField("ruleCheatSheetParagraph1")
-    protected ParagraphElement ruleCheatSheetParagraph1 = Document.get().createPElement();
-
-    @DataField("ruleCheatSheetParagraph2")
-    protected ParagraphElement ruleCheatSheetParagraph2 = Document.get().createPElement();
-
-    @DataField("ruleCheatSheetParagraph3")
-    protected ParagraphElement ruleCheatSheetParagraph3 = Document.get().createPElement();
-
-    @DataField("ruleCheatSheetParagraph4")
-    protected ParagraphElement ruleCheatSheetParagraph4 = Document.get().createPElement();
-
-    @DataField("ruleCheatSheetParagraphBackground")
-    protected ParagraphElement ruleCheatSheetParagraphBackground = Document.get().createPElement();
-
-    @DataField("ruleCheatSheetList1")
-    protected LIElement ruleCheatSheetList1 = Document.get().createLIElement();
-
-    @DataField("ruleCheatSheetList2")
-    protected LIElement ruleCheatSheetList2 = Document.get().createLIElement();
-
-    @DataField("ruleCheatSheetList3")
-    protected LIElement ruleCheatSheetList3 = Document.get().createLIElement();
-
-    @DataField("ruleCheatSheetList4")
-    protected LIElement ruleCheatSheetList4 = Document.get().createLIElement();
-
-    @DataField("ruleCheatSheetList5")
-    protected LIElement ruleCheatSheetList5 = Document.get().createLIElement();
-
-    @DataField("ruleCheatSheetList6")
-    protected LIElement ruleCheatSheetList6 = Document.get().createLIElement();
-
-    @DataField("ruleCheatSheetList7")
-    protected LIElement ruleCheatSheetList7 = Document.get().createLIElement();
-
-    @DataField("ruleCheatSheetParagraph5")
-    protected ParagraphElement ruleCheatSheetParagraph5 = Document.get().createPElement();
-
-    @DataField("ruleCheatSheetExampleExpressions")
-    protected UListElement ruleCheatSheetExampleExpressions = Document.get().createULElement();
-
-    @DataField("dmnCheatSheet")
-    protected DivElement dmnCheatSheet = Document.get().createDivElement();
-
-    @DataField("dmnCheatSheetParagraph1")
-    protected ParagraphElement dmnCheatSheetParagraph1 = Document.get().createPElement();
-
-    @DataField("dmnCheatSheetParagraph2")
-    protected ParagraphElement dmnCheatSheetParagraph2 = Document.get().createPElement();
-
-    @DataField("dmnCheatSheetParagraph3")
-    protected ParagraphElement dmnCheatSheetParagraph3 = Document.get().createPElement();
-
-    @DataField("dmnCheatSheetParagraph4")
-    protected ParagraphElement dmnCheatSheetParagraph4 = Document.get().createPElement();
-
-    @DataField("dmnCheatSheetParagraph5")
-    protected ParagraphElement dmnCheatSheetParagraph5 = Document.get().createPElement();
-
-    @DataField("dmnCheatSheetParagraph6")
-    protected ParagraphElement dmnCheatSheetParagraph6 = Document.get().createPElement();
-
-    @DataField("dmnCheatSheetParagraph7")
-    protected ParagraphElement dmnCheatSheetParagraph7 = Document.get().createPElement();
-
-    @DataField("dmnCheatSheetParagraphBackground")
-    protected ParagraphElement dmnCheatSheetParagraphBackground = Document.get().createPElement();
-
-    @DataField("dmnCheatSheetList1")
-    protected LIElement dmnCheatSheetList1 = Document.get().createLIElement();
-
-    @DataField("dmnCheatSheetList2")
-    protected LIElement dmnCheatSheetList2 = Document.get().createLIElement();
-
-    @DataField("dmnCheatSheetList3")
-    protected LIElement dmnCheatSheetList3 = Document.get().createLIElement();
-
-    @DataField("dmnCheatSheetList4")
-    protected LIElement dmnCheatSheetList4 = Document.get().createLIElement();
-
-    @DataField("dmnCheatSheetList5")
-    protected LIElement dmnCheatSheetList5 = Document.get().createLIElement();
-
-    @DataField("dmnCheatSheetList6")
-    protected LIElement dmnCheatSheetList6 = Document.get().createLIElement();
-
-    @DataField("dmnCheatSheetList7")
-    protected LIElement dmnCheatSheetList7 = Document.get().createLIElement();
-
-    @DataField("dmnCheatSheetList8")
-    protected LIElement dmnCheatSheetList8 = Document.get().createLIElement();
-
-    @DataField("dmnCheatSheetList9")
-    protected LIElement dmnCheatSheetList9 = Document.get().createLIElement();
-
-    @Override
-    public void init(Presenter presenter) {
-        this.presenter = presenter;
-    }
-
-    @Override
-    public Presenter getPresenter() {
-        return presenter;
-    }
-
-    @Override
-    public void setRuleCheatSheetContent() {
-        ruleCheatSheet.getStyle().setDisplay(Style.Display.BLOCK);
-        dmnCheatSheet.getStyle().setDisplay(Style.Display.NONE);
-
-        ruleCheatSheetParagraph1.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet1());
-        ruleCheatSheetParagraph2.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet2() + "<b>" + " " + ScenarioSimulationEditorConstants.INSTANCE.testEditor() + " " + "</b>"
-                                                      + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet3() + " <b>" + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet4() + " </b>"
-                                                      + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet5());
-
-        ruleCheatSheetParagraphBackground.setInnerHTML(backgroundMessage());
-        ruleCheatSheetParagraph3.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet6());
-        ruleCheatSheetParagraph4.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet7());
-        ruleCheatSheetList1.setInnerHTML("<tt>=</tt>" + " " + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet8());
-        ruleCheatSheetList2.setInnerHTML("<tt>!</tt>, <tt>!=</tt>, <tt>&lt;&gt;</tt>" + " " + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet9());
-        ruleCheatSheetList3.setInnerHTML("<tt>&lt;</tt>, <tt>&gt;</tt>, <tt>&lt;=</tt>, <tt>&gt;=</tt>" + " " + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet10());
-        ruleCheatSheetList4.setInnerHTML("<tt>[" + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet11() + "]</tt>" + " " + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet12() + " " + "<b>"
-                                                 + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet13() + "</b>" + " " + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet14());
-        ruleCheatSheetList5.setInnerHTML("<tt>" + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet15() + "</tt>" + " " + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet16()
-                                                 + " " + "<b>" + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet17() + "</b>" + " " + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet18());
-        ruleCheatSheetList6.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet19() + " " + "<tt>=</tt>, <tt>[]</tt>, " + ScenarioSimulationEditorConstants.INSTANCE.or() +
-                                                 " " + "<tt>;</tt>. " + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet20() + " " + "<tt>null</tt>. " + ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet21());
-        ruleCheatSheetList7.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet23());
-        ruleCheatSheetParagraph5.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.ruleCheatSheet22());
-        ruleCheatSheetExampleExpressions.setInnerHTML("<li><tt>&lt; 1</tt></li>" +
-                    "<li><tt>&lt; 1; ! [-1, 0]</tt></li>" +
-                    "<li><tt>[Jane, Doe]</tt></li>" +
-                    "<li><tt>&lt;&gt; [1, -1]; = 0</tt></li>");
-    }
-
-    @Override
-    public void setDMNCheatSheetContent() {
-        ruleCheatSheet.getStyle().setDisplay(Style.Display.NONE);
-        dmnCheatSheet.getStyle().setDisplay(Style.Display.BLOCK);
-
-        dmnCheatSheetParagraph1.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet1());
-        dmnCheatSheetParagraph2.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet2() + " <b>" + ScenarioSimulationEditorConstants.INSTANCE.testEditor() + "</b> "
-                                                     + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet3());
-        dmnCheatSheetParagraph3.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet4());
-        dmnCheatSheetParagraph4.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet5());
-        dmnCheatSheetParagraphBackground.setInnerHTML(backgroundMessage());
-        dmnCheatSheetParagraph5.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet6());
-        dmnCheatSheetList1.setInnerHTML("<i>" + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet7() + " " + "</i>" + ScenarioSimulationEditorConstants.INSTANCE.and()
-                + " " + "<i>" + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet8() + "</i>" + " " + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet9() + " "
-                + "<tt>\"John Doe\"</tt>" + " " + ScenarioSimulationEditorConstants.INSTANCE.or() + " " + "<tt>\"\"</tt>");
-        dmnCheatSheetList2.setInnerHTML("<i>" + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet10() + "</i> (<tt>true</tt>, <tt>false</tt>, "
-                + ScenarioSimulationEditorConstants.INSTANCE.and() + " " + "<tt>null</tt>)");
-        dmnCheatSheetList3.setInnerHTML("<i>" + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet11() + "</i>" + " "
-                                                + ScenarioSimulationEditorConstants.INSTANCE.and() + " " + "<i>" + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet12() + "</i>"
-                                                + ScenarioSimulationEditorConstants.INSTANCE.forExample() + " " + "<tt>date(\"2019-05-13\")<sup>*</sup></tt>" + " " + ScenarioSimulationEditorConstants.INSTANCE.or() + " "
-                                                + "<tt>time(\"14:10:00+02:00\")<sup>*</sup></tt>");
-        dmnCheatSheetList4.setInnerHTML("<i>" + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet19() + "</i>" + ScenarioSimulationEditorConstants.INSTANCE.forExample() +
-                                                " " + "<tt>duration(\"P1DT23H12M30S\")<sup>*</sup></tt>");
-        dmnCheatSheetList5.setInnerHTML("<i>" + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet20() + "</i>" + ScenarioSimulationEditorConstants.INSTANCE.forExample() +
-                                                " " + "<tt>duration(\"P3Y5M\")<sup>*</sup></tt>");
-        dmnCheatSheetList6.setInnerHTML("<i>" + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet13() + "</i>");
-        dmnCheatSheetList7.setInnerHTML("<i>" + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet14() + "</i>" + ScenarioSimulationEditorConstants.INSTANCE.forExample() +
-                                                " " + "<tt>{x : 5, even : false, type : \"integer number\"}</tt>");
-        dmnCheatSheetList8.setInnerHTML("<i>" + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet15() + "</i>"
-                                                + " " + ScenarioSimulationEditorConstants.INSTANCE.and() + " " + "<i>" + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet16() + "</i>"
-                                                + ScenarioSimulationEditorConstants.INSTANCE.forExample() + " " + "<tt>[1 .. 10]</tt> or <tt>[2, 3, 4, 5]</tt>");
-        dmnCheatSheetList9.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet18());
-        dmnCheatSheetParagraph6.setInnerHTML(ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet17());
-        dmnCheatSheetParagraph7.setInnerHTML("<i><sup>*</sup> " + ScenarioSimulationEditorConstants.INSTANCE.dmnCheatSheet21() + "</i>");
-    }
-
-    @Override
-    public void reset() {
-        dmnCheatSheet.getStyle().setDisplay(Style.Display.NONE);
-        ruleCheatSheet.getStyle().setDisplay(Style.Display.NONE);
-    }
-
-    private String backgroundMessage() {
-        return ScenarioSimulationEditorConstants.INSTANCE.commonCheatSheetBackground("<b>Background</b>", "<b>Model</b>");
-
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemPresenter.java
deleted file mode 100644
index b3e4d7f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemPresenter.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.LIElement;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-
-@Dependent
-public class FieldItemPresenter implements FieldItemView.Presenter {
-
-    @Inject
-    protected ViewsProvider viewsProvider;
-
-    protected ListGroupItemView.Presenter listGroupItemPresenter;
-
-    protected Map<String, FieldItemView> fieldItemMap = new HashMap<>();
-
-    @Override
-    public LIElement getLIElement(List<String> parentPath, String factName, String fieldName, String className, String classTypeName) {
-        String key = String.join(".", parentPath)  + "." + fieldName;
-        if (!fieldItemMap.containsKey(key)) {
-            FieldItemView fieldItemView = viewsProvider.getFieldItemView();
-            fieldItemView.setFieldData(parentPath, factName, fieldName, className, classTypeName);
-            fieldItemView.setPresenter(this);
-            fieldItemMap.put(key, fieldItemView);
-        }
-        return fieldItemMap.get(key).getLIElement();
-    }
-
-    @Override
-    public void setListGroupItemPresenter(ListGroupItemView.Presenter listGroupItemPresenter) {
-        this.listGroupItemPresenter = listGroupItemPresenter;
-    }
-
-    public void onFieldElementClick(FieldItemView selected) {
-        listGroupItemPresenter.onSelectedElement(selected);
-        fieldItemMap.values().stream().filter(fieldItemView -> !fieldItemView.equals(selected)).forEach(FieldItemView::unselect);
-    }
-
-    @Override
-    public void unselectAll() {
-        fieldItemMap.values().forEach(FieldItemView::unselect);
-    }
-
-    @Override
-    public void showAll() {
-        fieldItemMap.values().forEach(FieldItemView::show);
-    }
-
-    @Override
-    public void reset() {
-        fieldItemMap.clear();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemView.java
deleted file mode 100644
index b37e9fe..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemView.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.List;
-
-import com.google.gwt.dom.client.LIElement;
-
-public interface FieldItemView {
-
-    interface Presenter {
-
-        /**
-         * @param parentPath The parent path (empty if the properties belongs to a <b>top-level</b> element)
-         * @param factName
-         * @param fieldName
-         * @param className
-         * @param classTypeName
-         * @return
-         */
-        LIElement getLIElement(List<String> parentPath, String factName, String fieldName, String className, String classTypeName);
-
-        void onFieldElementClick(FieldItemView selected);
-
-        void setListGroupItemPresenter(ListGroupItemView.Presenter listGroupItemPresenter);
-
-        void unselectAll();
-
-        void showAll();
-
-        void reset();
-    }
-
-    List<String> getFullPath();
-
-    String getFactName();
-
-    String getFieldName();
-
-    String getClassName();
-
-    String getClassTypeName();
-
-    void setPresenter(FieldItemView.Presenter fieldItemPresenter);
-
-    /**
-     * It manages the fieldElement when is <b>automatically</b> selected.
-     */
-    void onFieldElementSelected();
-
-    /**
-     * @param fullPath The parent path (empty if the properties belongs to a <b>top-level</b> element)
-     * @param factName
-     * @param fieldName
-     * @param className
-     * @param classTypeName
-     */
-    void setFieldData(List<String> fullPath, String factName, String fieldName, String className, String classTypeName);
-
-    LIElement getLIElement();
-
-    void showCheck(boolean show);
-
-    boolean isCheckShown();
-
-    void unselect();
-
-    void hide();
-
-    void show();
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemViewImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemViewImpl.html
deleted file mode 100644
index 0dc645a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemViewImpl.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!doctype html>
-<!--
-  ~ 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.      
--->
-
-<li data-field="fieldElement" class="kie-list-view-pf-main-field-element">
-  <span data-field="fieldNameElement"></span>
-  <span data-field="checkElement" class="pull-right fa fa-check kie-list-view-pf-main-info__check"></span>
-</li>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemViewImpl.java
deleted file mode 100644
index 0013e8f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemViewImpl.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.List;
-import java.util.Objects;
-
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-/**
- * This class is used to represent a <b>simple</b> (i.e. not expandable) property, like for example java primitives
- */
-@Templated
-public class FieldItemViewImpl implements FieldItemView {
-
-    @DataField("fieldElement")
-    protected LIElement fieldElement = Document.get().createLIElement();
-
-    @DataField("fieldNameElement")
-    protected SpanElement fieldNameElement = Document.get().createSpanElement();
-
-    @DataField("checkElement")
-    protected SpanElement checkElement = Document.get().createSpanElement();
-
-    private Presenter fieldItemPresenter;
-
-    private List<String> fullPath;
-    private String factName;
-    private String fieldName;
-    private String className;
-    private String classTypeName;
-
-    @Override
-    public void setFieldData(List<String> fullPath, String factName, String fieldName, String className, String classTypeName) {
-        String innerHtml = new StringBuilder()
-                .append("<a>")
-                .append(fieldName)
-                .append("</a> [")
-                .append(classTypeName)
-                .append("]")
-                .toString();
-        fieldNameElement.setInnerHTML(innerHtml);
-        fieldNameElement.setAttribute("id", "fieldElement-" + factName + "-" + fieldName);
-        fieldNameElement.setAttribute("fieldName", fieldName);
-        fieldNameElement.setAttribute("className", className);
-        fieldNameElement.setAttribute("fullPath", String.join(".", fullPath));
-        this.factName = factName;
-        this.fieldName = fieldName;
-        this.className = className;
-        this.fullPath = fullPath;
-        this.classTypeName = classTypeName;
-    }
-
-    @Override
-    public List<String> getFullPath() {
-        return fullPath;
-    }
-
-    @Override
-    public String getFactName() {
-        return factName;
-    }
-
-    @Override
-    public String getFieldName() {
-        return fieldName;
-    }
-
-    @Override
-    public String getClassName() {
-        return className;
-    }
-
-    @Override
-    public String getClassTypeName() {
-        return classTypeName;
-    }
-
-    @Override
-    public void setPresenter(Presenter fieldItemPresenter) {
-        this.fieldItemPresenter = fieldItemPresenter;
-    }
-
-    @Override
-    public LIElement getLIElement() {
-        return fieldElement;
-    }
-
-    @EventHandler("fieldElement")
-    public void onFieldElementClick(ClickEvent clickEvent) {
-        onFieldElementSelected();
-    }
-
-    @Override
-    public void onFieldElementSelected() {
-        fieldElement.addClassName(ConstantHolder.SELECTED);
-        showCheck(true);
-        fieldItemPresenter.onFieldElementClick(this);
-    }
-
-    @Override
-    public void showCheck(boolean show) {
-        if (show) {
-            checkElement.getStyle().setDisplay(Style.Display.BLOCK);
-        } else {
-            checkElement.getStyle().setDisplay(Style.Display.NONE);
-        }
-    }
-
-    @Override
-    public boolean isCheckShown() {
-        return !Objects.equals(Style.Display.NONE.getCssName(), checkElement.getStyle().getDisplay());
-    }
-
-    @Override
-    public void unselect() {
-        fieldElement.removeClassName(ConstantHolder.SELECTED);
-        showCheck(false);
-    }
-
-    @Override
-    public void hide() {
-        fieldElement.getStyle().setDisplay(Style.Display.NONE);
-    }
-
-    @Override
-    public void show() {
-        fieldElement.getStyle().setDisplay(Style.Display.BLOCK);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        FieldItemViewImpl that = (FieldItemViewImpl) o;
-        return Objects.equals(getFullPath(), that.getFullPath()) &&
-                Objects.equals(getFactName(), that.getFactName()) &&
-                Objects.equals(getFieldName(), that.getFieldName()) &&
-                Objects.equals(getClassName(), that.getClassName()) &&
-                Objects.equals(getClassTypeName(), that.getClassTypeName());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getFullPath(), getFactName(), getFieldName(), getClassName(), getClassTypeName());
-    }
-
-    @Override
-    public String toString() {
-        return "FieldItemViewImpl{" +
-                "fullPath='" + fullPath + '\'' +
-                ", factName='" + factName + '\'' +
-                ", fieldName='" + fieldName + '\'' +
-                ", className='" + className + '\'' +
-                ", classNameShown='" + classTypeName + '\'' +
-                '}';
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemPresenter.java
deleted file mode 100644
index 1f07f2c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemPresenter.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import com.google.gwt.dom.client.DivElement;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-
-@Dependent
-public class ListGroupItemPresenter implements ListGroupItemView.Presenter {
-
-    @Inject
-    protected ViewsProvider viewsProvider;
-
-    @Inject
-    protected FieldItemPresenter fieldItemPresenter;
-
-    protected TestToolsView.Presenter testToolsPresenter;
-
-    protected Map<String, ListGroupItemView> listGroupItemViewMap = new HashMap<>();
-
-    private AtomicBoolean disabled = new AtomicBoolean(true);
-
-    /* In case of a selected column with <b>assigned</b> Instance, it contains its related Instance title.
-       Otherwise, in case of a <b>NOT assigned</b> Instance, it contains all the titles assigned to other columns of
-       the same group with the following syntax: "TITLE1;TITLE2;.." */
-    private String filterTerm = null;
-
-    @Override
-    public void enable() {
-        this.disabled.set(false);
-        filterTerm = null;
-    }
-
-    @Override
-    public void enable(String filterTerm) {
-        this.disabled.set(false);
-        this.filterTerm = filterTerm;
-    }
-
-    @Override
-    public void unselectAll() {
-        listGroupItemViewMap.values().forEach(ListGroupItemView::unselect);
-    }
-
-    @Override
-    public void showAll() {
-        fieldItemPresenter.showAll();
-    }
-
-    @Override
-    public void selectProperty(String factName, List<String> propertyParts) {
-        final ListGroupItemView instanceListGroupItemView = listGroupItemViewMap.get(factName);
-        if (!instanceListGroupItemView.isShown()) {
-            onToggleRowExpansion(instanceListGroupItemView, false);
-        }
-        String key;
-        for (int i = 1; i < propertyParts.size(); i++) {
-            String subPart = String.join(".", propertyParts.subList(0, i));
-            key = factName + "." + subPart;
-            final ListGroupItemView subListGroupItemView = listGroupItemViewMap.get(key);
-            if (subListGroupItemView != null && !subListGroupItemView.isShown()) {
-                onToggleRowExpansion(subListGroupItemView, false);
-            }
-        }
-        key = factName + "." + String.join(".", propertyParts);
-        if (fieldItemPresenter.fieldItemMap.containsKey(key)) {
-            fieldItemPresenter.fieldItemMap.get(key).onFieldElementSelected();
-        } else {
-            instanceListGroupItemView.showCheck(true);
-            onSelectedElement(instanceListGroupItemView);
-        }
-    }
-
-    @Override
-    public void hideProperty(String factName, List<String> propertyParts) {
-        String key = factName + "." + String.join(".", propertyParts);
-        if (fieldItemPresenter.fieldItemMap.containsKey(key)) {
-            fieldItemPresenter.fieldItemMap.get(key).hide();
-        }
-    }
-
-    @Override
-    public boolean isInstanceAssigned(String factName) {
-        return listGroupItemViewMap.get(factName).isInstanceAssigned();
-    }
-
-    @Override
-    public void setInstanceAssigned(String factName, boolean assigned) {
-        listGroupItemViewMap.get(factName).setInstanceAssigned(assigned);
-    }
-
-    @Override
-    public void disable() {
-        this.disabled.set(true);
-        filterTerm = null;
-        listGroupItemViewMap.values().forEach(ListGroupItemView::closeRow);
-        unselectAll();
-        fieldItemPresenter.unselectAll();
-    }
-
-    @Override
-    public void init(TestToolsView.Presenter testToolsPresenter) {
-        this.testToolsPresenter = testToolsPresenter;
-        fieldItemPresenter.setListGroupItemPresenter(this);
-    }
-
-    @Override
-    public DivElement getDivElement(String factName, FactModelTree factModelTree) {
-        List<String> parentPath = new ArrayList<>();
-        final ListGroupItemView listGroupItemView = commonGetListGroupItemView(parentPath, factName, false);
-        populateListGroupItemView(listGroupItemView, parentPath, factName, factModelTree);
-        return listGroupItemView.getListGroupItem();
-    }
-
-    @Override
-    public DivElement getDivElement(List<String> fullPath, String factName, String factModelTreeClass) {
-        final ListGroupItemView listGroupItemView = commonGetListGroupItemView(fullPath, factName, true);
-        populateListGroupItemView(listGroupItemView, factName, factModelTreeClass);
-        return listGroupItemView.getListGroupExpansion();
-    }
-
-    @Override
-    public void onToggleRowExpansion(ListGroupItemView listGroupItemView, boolean currentlyShown) {
-        if (disabled.get()) {
-            return;
-        }
-        if (currentlyShown) {
-            listGroupItemView.closeRow();
-        } else {
-            if (listGroupItemView.isToExpand()) {
-                FactModelTree factModelTree =
-                        testToolsPresenter.getFactModelTreeFromFactTypeMap(listGroupItemView.getFactType())
-                                .orElseGet(() -> testToolsPresenter.getFactModelTreeFromHiddenMap(listGroupItemView.getFactType()));
-                if (factModelTree != null) {
-                    populateListGroupItemView(listGroupItemView, listGroupItemView.getParentPath(), listGroupItemView.getFactName(), factModelTree);
-                    listGroupItemView.setToExpand(false);
-                }
-            }
-            listGroupItemView.expandRow();
-        }
-    }
-
-    @Override
-    public void onSelectedElement(ListGroupItemView selected) {
-        testToolsPresenter.setSelectedElement(selected);
-        listGroupItemViewMap.values().stream().filter(listGroupItemView -> !listGroupItemView.equals(selected)).forEach(ListGroupItemView::unselect);
-        fieldItemPresenter.unselectAll();
-    }
-
-    @Override
-    public void onSelectedElement(FieldItemView selected) {
-        testToolsPresenter.setSelectedElement(selected);
-        listGroupItemViewMap.values().forEach(ListGroupItemView::unselect);
-    }
-
-    @Override
-    public void reset() {
-        fieldItemPresenter.reset();
-        listGroupItemViewMap.clear();
-    }
-
-    @Override
-    public String getFilterTerm() {
-        return filterTerm;
-    }
-
-    /**
-     * Populate the "Assets" list. When
-     * @param toPopulate
-     * @param parentPath
-     * @param factName
-     * @param factModelTree the <code>FactModelTree</code> with all properties of a given type
-     */
-    protected void populateListGroupItemView(ListGroupItemView toPopulate, List<String> parentPath, String factName, FactModelTree factModelTree) {
-        if (factName.equals(factModelTree.getFactName())) {  // the name of the property equals the type of the factModelTree: this means that we are populating the "root" of the class
-            toPopulate.setFactName(factName);
-        } else {
-            toPopulate.setFactNameAndType(factName, factModelTree.getFactName()); // the name of the property differ from the type of the factModelTree: this means that we are populating children of the class
-        }
-        List<String> fullPath = new ArrayList<>(parentPath);
-        fullPath.add(factName);
-        factModelTree.getSimpleProperties().entrySet().stream().sorted(Map.Entry.comparingByKey()).forEach(entry ->
-                toPopulate.addFactField(fieldItemPresenter.getLIElement(fullPath, factName, entry.getKey(), entry.getValue().getTypeName(), entry.getValue().getPropertyTypeNameToVisualize())));
-        factModelTree.getExpandableProperties().entrySet().stream().sorted(Map.Entry.comparingByValue()).forEach(entry ->
-                 toPopulate.addExpandableFactField(getDivElement(fullPath, entry.getKey(), entry.getValue())));
-    }
-
-    /**
-     * Set the property' <b>name</b> (factName) and <b>type</b> (factModelTreeClass) of a given <code>ListGroupItemView</code>
-     * @param toPopulate
-     * @param factName the property' name
-     * @param factType the property' type
-     */
-    protected void populateListGroupItemView(ListGroupItemView toPopulate, String factName, String factType) {
-        toPopulate.setFactNameAndType(factName, factType);
-    }
-
-    /**
-     * @param parentPath the parent' path - empty for <b>top-level</b> elements
-     * @param factName
-     * @param toExpand If <code>true</code>, on {@link #onToggleRowExpansion(ListGroupItemView, boolean)} inner properties will be populated
-     * @return
-     */
-    protected ListGroupItemView commonGetListGroupItemView(List<String> parentPath, String factName, boolean toExpand) {
-        String key = parentPath.isEmpty() ? factName : String.join(".", parentPath) + "." + factName;
-        ListGroupItemView toReturn = viewsProvider.getListGroupItemView();
-        toReturn.init(this);
-        toReturn.setToExpand(toExpand);
-        toReturn.setParentPath(parentPath);
-        listGroupItemViewMap.put(key, toReturn);
-        return toReturn;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemView.java
deleted file mode 100644
index 1d3af64..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemView.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.List;
-
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.user.client.ui.IsWidget;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.uberfire.client.mvp.HasPresenter;
-
-public interface ListGroupItemView extends IsWidget,
-                                           HasPresenter<ListGroupItemView.Presenter> {
-
-    void setToExpand(boolean toExpand);
-
-    boolean isToExpand();
-
-    void showCheck(boolean show);
-
-    boolean isCheckShown();
-
-    void setFactName(String factName);
-
-    /**
-     * @param parentPath the <b>parent</b>' path
-     */
-    void setParentPath(List<String> parentPath);
-
-    /**
-     * @param factName the property' name
-     * @param factType the property' type
-     */
-    void setFactNameAndType(String factName, String factType);
-
-    List<String> getParentPath();
-
-    String getFactName();
-
-    String getFactType();
-
-    void addFactField(LIElement fieldElement);
-
-    /**
-     * This add and a <b>complex</b> (i.e. expandable) property, i.e. a class containing other properties
-     * @param fieldElement
-     */
-    void addExpandableFactField(DivElement fieldElement);
-
-    DivElement getListGroupExpansion();
-
-    DivElement getListGroupItem();
-
-    void closeRow();
-
-    void expandRow();
-
-    String getActualClassName();
-
-    void unselect();
-
-    boolean isShown();
-
-    void setInstanceAssigned(boolean assigned);
-
-    boolean isInstanceAssigned();
-
-    interface Presenter {
-
-        /**
-         * Use this when click on grid' <i>instance</i> header.
-         * Call this method to show all the first-level data models <b>enabled</b> (i.e. <b>double-clickable</b> to map to an <i>instance</i> header/column)
-         * and their properties <b>disabled</b> (i.e. <b>not double-clickable</b>)
-         */
-        void enable();
-
-        /**
-         * Use this when click on grid' <i>instance</i> header.
-         * Call this method to show all the first-level data models <b>enabled</b> (i.e. <b>double-clickable</b> to map to an <i>instance</i> header/column)
-         * and their properties <b>disabled</b> (i.e. <b>not double-clickable</b>)
-         * @param factName
-         */
-        void enable(String factName);
-
-        void disable();
-
-        /**
-         * This method returns a <b>top-level</b> <code>DivElement</code> representing a <b>complex</b> (i.e. expandable) property, i.e. a class containing other properties
-         * @param factName
-         * @param factModelTree
-         */
-        DivElement getDivElement(String factName, FactModelTree factModelTree);
-
-        /**
-         * This method returns a <b>nested</b> <code>DivElement</code> representing a <b>complex</b> (i.e. expandable) property, i.e. a class containing other properties
-         * @param parentPath the <b>parent</b> path
-         * @param factName the property' name
-         * @param factModelTreeClass the property' type
-         */
-        DivElement getDivElement(List<String> parentPath, String factName, String factModelTreeClass);
-
-        void onToggleRowExpansion(ListGroupItemView listGroupItemView, boolean currentlyShown);
-
-        void init(TestToolsView.Presenter testToolsPresenter);
-
-        /**
-         * Method to set the "selected" information - use this to set the <i>instance</i> level header
-         * @param selected
-         */
-        void onSelectedElement(ListGroupItemView selected);
-
-        /**
-         * Method to set the "selected" information - use this to set the <i>property</i> level header
-         * @param selected
-         */
-        void onSelectedElement(FieldItemView selected);
-
-        void unselectAll();
-
-        void showAll();
-
-        /**
-         * Expand the node and select the given property
-         * @param factName
-         * @param propertyParts
-         */
-        void selectProperty(String factName, List<String> propertyParts);
-
-        /**
-         * Hide the node of the given property
-         * @param factName
-         * @param propertyParts
-         */
-        void hideProperty(String factName, List<String> propertyParts);
-
-        boolean isInstanceAssigned(String factName);
-
-        void setInstanceAssigned(String factName, boolean assigned);
-
-        void reset();
-
-        String getFilterTerm();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemViewImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemViewImpl.html
deleted file mode 100644
index ef8ce0f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemViewImpl.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!doctype html>
-<!--
-  ~ 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.      
--->
-<div class="list-view-pf tree-list-view-pf-view kie-tree-list-view-pf-view--compact" data-field="listGroupExpansion">
-  <div class="list-group-item" data-field="listGroupItem">
-    <div class="list-group-item-header" data-field="listGroupItemHeader">
-      <div class="list-view-pf-expand">
-        <span class="fa fa-angle-right" data-field="faAngleRight"></span>
-      </div>
-      <div data-field="listGroupElement" class="list-view-pf-main-info">
-        <span data-field="fullClassName" class="kie-list-view-pf-main-info__text"></span>
-        <span data-field="checkElement" class="pull-right fa fa-check kie-list-view-pf-main-info__check"></span>
-      </div>
-    </div>
-    <div class="list-group-item-container container-fluid hidden" data-field="listGroupItemContainer">
-      <ul class="ul--plain" data-field="factProperties" style="padding-left: 0; margin-bottom: 0"></ul>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemViewImpl.java
deleted file mode 100644
index 610cea3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemViewImpl.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import javax.enterprise.context.Dependent;
-
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.user.client.ui.Widget;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.FA_ANGLE_DOWN;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.HIDDEN;
-
-/**
- * This class is used to represent a <b>complex</b> (i.e. expandable) property, i.e. a class containing other properties
- */
-@Dependent
-@Templated
-public class ListGroupItemViewImpl implements ListGroupItemView {
-
-    public static final String LIST_VIEW_PF_EXPAND_ACTIVE = "list-view-pf-expand-active";
-
-    @DataField("listGroupExpansion")
-    protected DivElement listGroupExpansion = Document.get().createDivElement();
-
-    @DataField("listGroupItem")
-    protected DivElement listGroupItem = Document.get().createDivElement();
-
-    @DataField("listGroupItemHeader")
-    protected DivElement listGroupItemHeader = Document.get().createDivElement();
-
-    @DataField("listGroupItemContainer")
-    protected DivElement listGroupItemContainer = Document.get().createDivElement();
-
-    @DataField("faAngleRight")
-    protected SpanElement faAngleRight = Document.get().createSpanElement();
-
-    @DataField("listGroupElement")
-    protected DivElement listGroupElement = Document.get().createDivElement();
-
-    @DataField("fullClassName")
-    protected SpanElement fullClassName = Document.get().createSpanElement();
-
-    @DataField("checkElement")
-    protected SpanElement checkElement = Document.get().createSpanElement();
-
-    @DataField("factProperties")
-    protected UListElement factProperties = Document.get().createULElement();
-
-    protected Presenter presenter;
-
-    protected List<String> parentPath = new ArrayList<>();
-
-    protected String factName;
-
-    protected String factType;
-
-    protected boolean toExpand = false;
-
-    protected boolean instanceAssigned = false;
-
-    @Override
-    public Widget asWidget() {
-        return null;
-    }
-
-    @Override
-    public String getActualClassName() {
-        return parentPath.isEmpty() ? factName : String.join(".", parentPath) + "." + factName;
-    }
-
-    @EventHandler("listGroupElement")
-    public void onFullClassNameClick(ClickEvent event) {
-        if (!listGroupElement.getClassName().contains(ConstantHolder.DISABLED)) {
-            showCheck(true);
-            presenter.onSelectedElement(this);
-        }
-    }
-
-    @EventHandler("faAngleRight")
-    public void onFaAngleRightClick(ClickEvent event) {
-        presenter.onToggleRowExpansion(this, isShown());
-    }
-
-    @Override
-    public void init(Presenter presenter) {
-        this.presenter = presenter;
-    }
-
-    @Override
-    public void setToExpand(boolean toExpand) {
-        this.toExpand = toExpand;
-    }
-
-    @Override
-    public boolean isToExpand() {
-        return toExpand;
-    }
-
-    @Override
-    public void unselect() {
-        showCheck(false);
-    }
-
-    @Override
-    public void showCheck(boolean show) {
-        if (show) {
-            checkElement.getStyle().setDisplay(Style.Display.BLOCK);
-            listGroupItem.addClassName(ConstantHolder.SELECTED);
-        } else {
-            checkElement.getStyle().setDisplay(Style.Display.NONE);
-            listGroupItem.removeClassName(ConstantHolder.SELECTED);
-        }
-    }
-
-    @Override
-    public boolean isCheckShown() {
-        return !Objects.equals(Style.Display.NONE.getCssName(), checkElement.getStyle().getDisplay());
-    }
-
-    @Override
-    public void setFactName(String factName) {
-        this.factName = factName;
-        this.factType = factName;
-        fullClassName.setInnerText(factName);
-        listGroupItem.setAttribute("id", "listGroupItem-" + factName);
-    }
-
-    @Override
-    public void setFactNameAndType(String factName, String factType) {
-        this.factName = factName;
-        this.factType = factType;
-        String innerHtml = new StringBuilder()
-                .append(factName)
-                .append(" [")
-                .append(factType)
-                .append("]")
-                .toString();
-        fullClassName.setInnerHTML(innerHtml);
-        fullClassName.setAttribute("factName", factName);
-        fullClassName.setAttribute("factType", factType);
-        fullClassName.setAttribute("parentPath", String.join(".", parentPath));
-        listGroupItem.setAttribute("id", "listGroupItem-" + factName);
-    }
-
-    @Override
-    public void setParentPath(List<String> parentPath) {
-        if (this.parentPath.isEmpty()) {
-            this.parentPath = parentPath;
-        } else {
-            this.parentPath.addAll(parentPath);
-        }
-
-        if (this.parentPath.isEmpty()) {
-            listGroupElement.removeClassName(ConstantHolder.DISABLED);
-        } else {
-            listGroupElement.addClassName(ConstantHolder.DISABLED);
-        }
-    }
-
-    @Override
-    public List<String> getParentPath() {
-        return parentPath;
-    }
-
-    @Override
-    public String getFactName() {
-        return factName;
-    }
-
-    @Override
-    public String getFactType() {
-        return factType;
-    }
-
-    @Override
-    public void addFactField(LIElement fieldElement) {
-        factProperties.appendChild(fieldElement);
-    }
-
-    @Override
-    public void addExpandableFactField(DivElement fieldElement) {
-        listGroupItemContainer.appendChild(fieldElement);
-    }
-
-    @Override
-    public DivElement getListGroupExpansion() {
-        return listGroupExpansion;
-    }
-
-    public DivElement getListGroupItem() {
-        return listGroupItem;
-    }
-
-    @Override
-    public void closeRow() {
-        listGroupItemHeader.removeClassName(LIST_VIEW_PF_EXPAND_ACTIVE);
-        listGroupItemContainer.addClassName(HIDDEN);
-        faAngleRight.removeClassName(FA_ANGLE_DOWN);
-    }
-
-    @Override
-    public void expandRow() {
-        listGroupItemHeader.addClassName(LIST_VIEW_PF_EXPAND_ACTIVE);
-        listGroupItemContainer.removeClassName(HIDDEN);
-        faAngleRight.addClassName(FA_ANGLE_DOWN);
-    }
-
-    @Override
-    public boolean isShown() {
-        return listGroupItemHeader.getClassName().contains(LIST_VIEW_PF_EXPAND_ACTIVE);
-    }
-
-    @Override
-    public void setInstanceAssigned(boolean instanceAssigned) {
-        this.instanceAssigned = instanceAssigned;
-    }
-
-    @Override
-    public boolean isInstanceAssigned() {
-        return instanceAssigned;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ListGroupItemViewImpl that = (ListGroupItemViewImpl) o;
-        return Objects.equals(getParentPath(), that.getParentPath()) &&
-                Objects.equals(getFactName(), that.getFactName()) &&
-                Objects.equals(getFactType(), that.getFactType());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getParentPath(), getFactName(), getFactType());
-    }
-
-    @Override
-    public String toString() {
-        return "ListGroupItemViewImpl{" +
-                "fullClassName=" + fullClassName +
-                ", parentPath='" + parentPath + '\'' +
-                ", factName='" + factName + '\'' +
-                ", factType='" + factType + '\'' +
-                '}';
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsPresenter.java
deleted file mode 100644
index 5dd506f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsPresenter.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Supplier;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.event.shared.EventBus;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.workbench.screens.scenariosimulation.client.dropdown.SettingsScenarioSimulationDropdown;
-import org.drools.workbench.screens.scenariosimulation.client.events.UpdateSettingsDataEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ValidateSimulationEvent;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.uberfire.mvp.Command;
-
-import static org.drools.scenariosimulation.api.model.ScenarioSimulationModel.Type.DMN;
-import static org.drools.scenariosimulation.api.model.ScenarioSimulationModel.Type.RULE;
-
-@ApplicationScoped
-@Named(SettingsPresenter.IDENTIFIER)
-public class SettingsPresenter extends AbstractSubDockPresenter<SettingsView> implements SettingsView.Presenter {
-
-    public static final int DEFAULT_PREFERRED_WIDHT = 300;
-
-    public static final String IDENTIFIER = "org.drools.scenariosimulation.Settings";
-
-    protected EventBus eventBus;
-
-    protected Command saveCommand;
-
-    protected SettingsScenarioSimulationDropdown settingsScenarioSimulationDropdown;
-
-    public SettingsPresenter() {
-        //Zero argument constructor for CDI
-        title = ScenarioSimulationEditorConstants.INSTANCE.settings();
-    }
-
-    @Inject
-    public SettingsPresenter(@Named(SettingsScenarioSimulationDropdown.BEAN_NAME) SettingsScenarioSimulationDropdown settingsScenarioSimulationDropdown,
-                             SettingsView view) {
-        super(view);
-        title = ScenarioSimulationEditorConstants.INSTANCE.settings();
-        this.settingsScenarioSimulationDropdown = settingsScenarioSimulationDropdown;
-    }
-
-    @PostConstruct
-    public void init() {
-        view.getSkipFromBuildLabel().setInnerText(ScenarioSimulationEditorConstants.INSTANCE.skipSimulation());
-        view.setupDropdown(settingsScenarioSimulationDropdown.asWidget().asWidget().getElement());
-        settingsScenarioSimulationDropdown.init();
-    }
-
-    @Override
-    public String getIdentifier() {
-        return IDENTIFIER;
-    }
-
-    @Override
-    public void setScenarioType(ScenarioSimulationModel.Type scenarioType, Settings settings, String fileName) {
-        view.getScenarioType().setInnerText(scenarioType.name());
-        view.getFileName().setValue(fileName);
-        view.getSkipFromBuild().setChecked(settings.isSkipFromBuild());
-        switch (scenarioType) {
-            case RULE:
-                setRuleSettings(settings);
-                break;
-            case DMN:
-                setDMNSettings(settings);
-                break;
-            default:
-                // nop
-        }
-    }
-
-    @Override
-    public void reset() {
-        view.reset();
-        settingsScenarioSimulationDropdown.clear();
-    }
-
-    @Override
-    public void setEventBus(EventBus eventBus) {
-        this.eventBus = eventBus;
-    }
-
-    public SettingsView getView() {
-        return view;
-    }
-
-    protected void setRuleSettings(Settings settings) {
-        view.getDmnSettings().getStyle().setDisplay(Style.Display.NONE);
-        view.getRuleSettings().getStyle().setDisplay(Style.Display.INLINE);
-        updateRuleSettings(settings);
-    }
-
-    protected void updateRuleSettings(Settings settings) {
-        view.getDmoSession().setValue(Optional.ofNullable(settings.getDmoSession()).orElse(""));
-        view.getRuleFlowGroup().setValue(Optional.ofNullable(settings.getRuleFlowGroup()).orElse(""));
-        view.getStateless().setChecked(settings.isStateless());
-    }
-
-    protected void setDMNSettings(Settings settings) {
-        view.getRuleSettings().getStyle().setDisplay(Style.Display.NONE);
-        view.getDmnSettings().getStyle().setDisplay(Style.Display.INLINE);
-        settingsScenarioSimulationDropdown.registerOnMissingValueHandler(() -> setDmnErrorPath(settings.getDmnFilePath()));
-        settingsScenarioSimulationDropdown.registerOnChangeHandler(this::validateSimulation);
-        updateDMNSettings(settings);
-    }
-
-    protected void updateDMNSettings(Settings settings) {
-        view.getDmnName().setValue(Optional.ofNullable(settings.getDmnName()).orElse(""));
-        view.getDmnNamespace().setValue(Optional.ofNullable(settings.getDmnNamespace()).orElse(""));
-        view.getDmnFilePathErrorLabel().getStyle().setDisplay(Style.Display.NONE);
-        view.getDmnFilePathErrorLabel().setInnerText("");
-        settingsScenarioSimulationDropdown.loadAssets(settings.getDmnFilePath());
-    }
-
-    @Override
-    public void syncDmoSession() {
-        String dmoSession = getCleanValue(() -> view.getDmoSession().getValue());
-        eventBus.fireEvent(new UpdateSettingsDataEvent(settingsToUpdate -> settingsToUpdate.setDmoSession(dmoSession),
-                                                       settingsToCheck -> !Objects.equals(settingsToCheck.getDmoSession(), dmoSession)));
-    }
-
-    @Override
-    public void syncRuleFlowGroup() {
-        String ruleFlow = getCleanValue(() -> view.getRuleFlowGroup().getValue());
-        eventBus.fireEvent(new UpdateSettingsDataEvent(settingsToUpdate -> settingsToUpdate.setRuleFlowGroup(ruleFlow),
-                                                       settingsToCheck -> !Objects.equals(settingsToCheck.getRuleFlowGroup(), ruleFlow)));
-    }
-
-    @Override
-    public void syncStateless() {
-        boolean isStateless = view.getStateless().isChecked();
-        eventBus.fireEvent(new UpdateSettingsDataEvent(settingsToUpdate -> settingsToUpdate.setStateless(isStateless)));
-    }
-
-    @Override
-    public void syncDmnFilePath() {
-        String dmnFilePath = getCleanValue(() -> settingsScenarioSimulationDropdown.getValue().map(KieAssetsDropdownItem::getValue).orElse(""));
-        eventBus.fireEvent(new UpdateSettingsDataEvent(settingsToUpdate -> settingsToUpdate.setDmnFilePath(dmnFilePath),
-                                                       settingsToCheck -> !Objects.equals(settingsToCheck.getDmnFilePath(), dmnFilePath),
-                                                       true));
-    }
-
-    @Override
-    public void syncSkipFromBuild() {
-        boolean isSkipFromBuild = view.getSkipFromBuild().isChecked();
-        eventBus.fireEvent(new UpdateSettingsDataEvent(settingsToUpdate -> settingsToUpdate.setSkipFromBuild(isSkipFromBuild)));
-    }
-
-    @Override
-    public void updateSettingsData(Settings settings) {
-        if (!isSettingTypeValid(settings.getType())) {
-            throw new IllegalStateException("Trying to update a wrong settings set for this Test Scenario, which is not of "
-                                                    + settings.getType() + " type.");
-        }
-        view.getSkipFromBuild().setChecked(settings.isSkipFromBuild());
-        if (RULE.equals(settings.getType())) {
-            setRuleSettings(settings);
-        } else {
-            setDMNSettings(settings);
-        }
-    }
-
-    private boolean isSettingTypeValid(ScenarioSimulationModel.Type type) {
-        return (DMN.equals(type) && Style.Display.INLINE.getCssName().equals(view.getDmnSettings().getStyle().getDisplay())) ||
-                (RULE.equals(type) && Style.Display.INLINE.getCssName().equals(view.getRuleSettings().getStyle().getDisplay()));
-    }
-
-    /**
-     * It sets an error message to <code>dmnPathErrorLabel</code> span element
-     * This method should be called in case of INVALID DMN file path.
-     */
-    protected void setDmnErrorPath(String requiredDMNFilePath) {
-        view.getDmnFilePathErrorLabel().getStyle().setDisplay(Style.Display.INLINE);
-        view.getDmnFilePathErrorLabel().setInnerText(
-                ScenarioSimulationEditorConstants.INSTANCE.dmnPathErrorLabel(requiredDMNFilePath));
-    }
-
-    /**
-     * It checks if a user selected DMN path is valid or not. If valid, it clears the <code>dmnPathErrorLabel</code>
-     * span element and it validates the whole Simulation. If not valid, the otherwise.
-     * This method should be called everytime a value is selected in <code>{@link SettingsScenarioSimulationDropdown}</code> widget
-     */
-    protected void validateSimulation() {
-        final Optional<KieAssetsDropdownItem> value = settingsScenarioSimulationDropdown.getValue();
-        String selectedPath = value.map(KieAssetsDropdownItem::getValue).orElse(null);
-        boolean isValid = selectedPath != null && !selectedPath.isEmpty();
-        if (!isValid) {
-            view.getDmnFilePathErrorLabel().getStyle().setDisplay(Style.Display.INLINE);
-            view.getDmnFilePathErrorLabel().setInnerText(ScenarioSimulationEditorConstants.INSTANCE.chooseValidDMNAsset());
-        } else {
-            this.syncDmnFilePath();
-            view.getDmnFilePathErrorLabel().getStyle().setDisplay(Style.Display.NONE);
-            view.getDmnFilePathErrorLabel().setInnerText("");
-            eventBus.fireEvent(new ValidateSimulationEvent());
-        }
-    }
-
-    private String getCleanValue(Supplier<String> supplier) {
-        String rawValue = supplier.get();
-        return "".equals(rawValue) ? null : rawValue;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsView.java
deleted file mode 100644
index ea4339a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsView.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.LabelElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.event.shared.EventBus;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.Settings;
-
-public interface SettingsView
-        extends SubDockView<SettingsView.Presenter> {
-
-    interface Presenter extends SubDockView.Presenter {
-
-        void setScenarioType(ScenarioSimulationModel.Type scenarioType, Settings settings, String fileName);
-
-        void setEventBus(EventBus eventBus);
-
-        void syncDmoSession();
-
-        void syncRuleFlowGroup();
-
-        void syncStateless();
-
-        void syncDmnFilePath();
-
-        void syncSkipFromBuild();
-
-        void updateSettingsData(Settings settings);
-    }
-
-    void setupDropdown(Element dropdownElement);
-
-    LabelElement getNameLabel();
-
-    InputElement getFileName();
-
-    LabelElement getTypeLabel();
-
-    SpanElement getScenarioType();
-
-    DivElement getRuleSettings();
-
-    InputElement getDmoSession();
-
-    InputElement getRuleFlowGroup();
-
-    DivElement getDmnSettings();
-
-    LabelElement getDmnFileLabel();
-
-    DivElement getDmnFilePathPlaceholder();
-
-    SpanElement getDmnFilePathErrorLabel();
-
-    LabelElement getDmnNamespaceLabel();
-
-    InputElement getDmnNamespace();
-
-    LabelElement getDmnNameLabel();
-
-    InputElement getDmnName();
-
-    InputElement getSkipFromBuild();
-
-    SpanElement getSkipFromBuildLabel();
-
-    InputElement getStateless();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsViewImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsViewImpl.html
deleted file mode 100644
index 342eb60..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsViewImpl.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!doctype html>
-<!--
-  ~ 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.      
--->
-
-<!-- GLOBAL SETTINGS -->
-<div id="settings-panel" class="uf-scroll-panel">
-  <div id="kieSettingsContent" class="tab-pane kie-tab-pane--scesim-panel">
-    <div class="pf-c-form__group">
-      <label for="kieScenarioSettingsName" data-field="nameLabel"></label>
-      <input class="form-control" data-field="fileName" id="kieScenarioSettingsName" type="text" readonly />
-    </div>
-    <br />
-    <div class="pf-c-form__group">
-      <label for="kieScenarioSettingsType" data-field="typeLabel"></label>
-      <span data-field="scenarioType" id="kieScenarioSettingsType"></span>
-    </div>
-    <br />
-    <div data-field="ruleSettings">
-      <div class="checkbox">
-        <label for="kieScenarioSettingsStateless">
-          <input type="checkbox" data-field="stateless" id="kieScenarioSettingsStateless" />
-          <span data-field="statelessLabel"></span>
-        </label>
-      </div>
-      <br />
-      <div class="pf-c-form__group">
-        <label for="kieScenarioSettingsKieSession">KieSession</label>
-        <input class="form-control" data-field="dmoSession" id="kieScenarioSettingsKieSession" />
-      </div>
-      <br />
-      <div class="pf-c-form__group">
-        <label for="kieScenarioSettingsRuleFlowGroup">RuleFlowGroup/AgendaGroup</label>
-        <input class="form-control" data-field="ruleFlowGroup" id="kieScenarioSettingsRuleFlowGroup" />
-      </div>
-    </div>
-    <div data-field="dmnSettings">
-      <div class="pf-c-form__group">
-        <label data-field="dmnFileLabel"></label>
-        <div data-field="dmnFilePathPlaceholder" id="kieScenarioSettingsModelPath"></div>
-        <span class="help-block" data-field="dmnFilePathErrorLabel" style="color: #cc0000"></span>
-      </div>
-      <br />
-      <div class="pf-c-form__group">
-        <label for="kieScenarioSettingsDMNNamespace" data-field="dmnNamespaceLabel"></label>
-        <input
-          class="form-control"
-          data-field="dmnNamespace"
-          id="kieScenarioSettingsDMNNamespace"
-          type="text"
-          readonly
-        />
-      </div>
-      <br />
-      <div class="pf-c-form__group">
-        <label for="kieScenarioSettingsDMNName" data-field="dmnNameLabel"></label>
-        <input class="form-control" data-field="dmnName" id="kieScenarioSettingsDMNName" type="text" readonly />
-      </div>
-    </div>
-    <br />
-    <div class="checkbox">
-      <label for="kieScenarioSettingsSkipFromBuild">
-        <input type="checkbox" data-field="skipFromBuild" id="kieScenarioSettingsSkipFromBuild" />
-        <span data-field="skipFromBuildLabel"></span>
-      </label>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsViewImpl.java
deleted file mode 100644
index e88fb35..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsViewImpl.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.LabelElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.event.dom.client.BlurEvent;
-import com.google.gwt.event.dom.client.ChangeEvent;
-import com.google.gwt.user.client.ui.Composite;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-@ApplicationScoped
-@Templated(stylesheet = "/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStyles.css")
-public class SettingsViewImpl
-        extends Composite
-        implements SettingsView {
-
-    protected static final String STATELESS_LABEL = "Stateless Session";
-    protected static final String DMN_MODEL_LABEL = "DMN model";
-    protected static final String DMN_NAMESPACE_LABEL = "DMN namespace";
-    protected static final String DMN_NAME_LABEL = "DMN name";
-
-    protected Presenter presenter;
-
-    @DataField("kieSettingsContent")
-    protected DivElement kieSettingsContent = Document.get().createDivElement();
-
-    @DataField("nameLabel")
-    protected LabelElement nameLabel = Document.get().createLabelElement();
-
-    @DataField("fileName")
-    protected InputElement fileName = Document.get().createTextInputElement();
-
-    @DataField("typeLabel")
-    protected LabelElement typeLabel = Document.get().createLabelElement();
-
-    @DataField("scenarioType")
-    protected SpanElement scenarioType = Document.get().createSpanElement();
-
-    @DataField("ruleSettings")
-    protected DivElement ruleSettings = Document.get().createDivElement();
-
-    @DataField("dmoSession")
-    protected InputElement dmoSession = Document.get().createTextInputElement();
-
-    @DataField("ruleFlowGroup")
-    protected InputElement ruleFlowGroup = Document.get().createTextInputElement();
-
-    @DataField("dmnSettings")
-    protected DivElement dmnSettings = Document.get().createDivElement();
-
-    @DataField("dmnFileLabel")
-    protected LabelElement dmnFileLabel = Document.get().createLabelElement();
-
-    @DataField("dmnFilePathPlaceholder")
-    protected DivElement dmnFilePathPlaceholder = Document.get().createDivElement();
-
-    @DataField("dmnFilePathErrorLabel")
-    protected SpanElement dmnFilePathErrorLabel = Document.get().createSpanElement();
-
-    @DataField("dmnNamespaceLabel")
-    protected LabelElement dmnNamespaceLabel = Document.get().createLabelElement();
-
-    @DataField("dmnNamespace")
-    protected InputElement dmnNamespace = Document.get().createTextInputElement();
-
-    @DataField("dmnNameLabel")
-    protected LabelElement dmnNameLabel = Document.get().createLabelElement();
-
-    @DataField("dmnName")
-    protected InputElement dmnName = Document.get().createTextInputElement();
-
-    @DataField("skipFromBuild")
-    protected InputElement skipFromBuild = Document.get().createCheckInputElement();
-
-    @DataField("skipFromBuildLabel")
-    protected SpanElement skipFromBuildLabel = Document.get().createSpanElement();
-
-    @DataField("stateless")
-    protected InputElement stateless = Document.get().createCheckInputElement();
-
-    @DataField("statelessLabel")
-    protected SpanElement statelessLabel = Document.get().createSpanElement();
-
-    @Override
-    public void init(Presenter presenter) {
-        this.presenter = presenter;
-        nameLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.name());
-        typeLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.type());
-        statelessLabel.setInnerText(STATELESS_LABEL);
-        dmnFileLabel.setInnerText(DMN_MODEL_LABEL);
-        dmnNamespaceLabel.setInnerText(DMN_NAMESPACE_LABEL);
-        dmnNameLabel.setInnerText(DMN_NAME_LABEL);
-    }
-
-    @Override
-    public void setupDropdown(final Element dropdownElement) {
-        dmnFilePathPlaceholder.appendChild(dropdownElement);
-    }
-
-    @Override
-    public Presenter getPresenter() {
-        return presenter;
-    }
-
-    @Override
-    public void reset() {
-        scenarioType.setInnerText("");
-        fileName.setValue("");
-        dmnName.setValue("");
-        dmnNamespace.setValue("");
-        dmnFilePathErrorLabel.getStyle().setDisplay(Style.Display.NONE);
-        dmnFilePathErrorLabel.setInnerText("");
-        skipFromBuild.setChecked(false);
-        stateless.setChecked(false);
-        dmnSettings.getStyle().setDisplay(Style.Display.NONE);
-        ruleSettings.getStyle().setDisplay(Style.Display.NONE);
-    }
-
-    @Override
-    public LabelElement getNameLabel() {
-        return nameLabel;
-    }
-
-    @Override
-    public InputElement getFileName() {
-        return fileName;
-    }
-
-    @Override
-    public LabelElement getTypeLabel() {
-        return typeLabel;
-    }
-
-    @Override
-    public SpanElement getScenarioType() {
-        return scenarioType;
-    }
-
-    @Override
-    public DivElement getRuleSettings() {
-        return ruleSettings;
-    }
-
-    @Override
-    public InputElement getDmoSession() {
-        return dmoSession;
-    }
-
-    @Override
-    public InputElement getRuleFlowGroup() {
-        return ruleFlowGroup;
-    }
-
-    @Override
-    public DivElement getDmnSettings() {
-        return dmnSettings;
-    }
-
-    @Override
-    public LabelElement getDmnFileLabel() {
-        return dmnFileLabel;
-    }
-
-    @Override
-    public DivElement getDmnFilePathPlaceholder() {
-        return dmnFilePathPlaceholder;
-    }
-
-    @Override
-    public SpanElement getDmnFilePathErrorLabel() {
-        return dmnFilePathErrorLabel;
-    }
-
-    @Override
-    public LabelElement getDmnNamespaceLabel() {
-        return dmnNamespaceLabel;
-    }
-
-    @Override
-    public InputElement getDmnNamespace() {
-        return dmnNamespace;
-    }
-
-    @Override
-    public LabelElement getDmnNameLabel() {
-        return dmnNameLabel;
-    }
-
-    @Override
-    public InputElement getDmnName() {
-        return dmnName;
-    }
-
-    @Override
-    public InputElement getSkipFromBuild() {
-        return skipFromBuild;
-    }
-
-    @Override
-    public SpanElement getSkipFromBuildLabel() {
-        return skipFromBuildLabel;
-    }
-
-    @Override
-    public InputElement getStateless() {
-        return stateless;
-    }
-
-    @EventHandler("dmoSession")
-    public void syncDmoSession(BlurEvent event) {
-        presenter.syncDmoSession();
-    }
-
-    @EventHandler("ruleFlowGroup")
-    public void syncRuleFlowGroup(BlurEvent event) {
-        presenter.syncRuleFlowGroup();
-    }
-
-    @EventHandler("stateless")
-    public void syncStateless(ChangeEvent event) {
-        presenter.syncStateless();
-    }
-
-    @EventHandler("skipFromBuild")
-    public void syncSkipFromBuild(ChangeEvent event) {
-        presenter.syncSkipFromBuild();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SubDockView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SubDockView.java
deleted file mode 100644
index 623498d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SubDockView.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import com.google.gwt.user.client.ui.IsWidget;
-import org.uberfire.backend.vfs.ObservablePath;
-import org.uberfire.client.mvp.HasPresenter;
-
-public interface SubDockView<T extends SubDockView.Presenter>
-        extends IsWidget,
-                HasPresenter<T> {
-
-
-    T getPresenter();
-
-    void reset();
-
-    interface Presenter {
-
-        /**
-         * Set the <code>ObservablePath</code> of the currently shown editor view
-         * @param path
-         */
-        void setCurrentPath(ObservablePath path);
-
-        /**
-         * Verify if the current <code>SubDock</code> already shows data of the currently shown <b>editor</b>.
-         * This is used to avoid unneeded re-population of the <code>SubDock</code>
-         * @param path
-         * @return <code>true</code> if given <code>ObservablePath</code> is equals to the current path of this <code>SubDock</code>
-         */
-        boolean isCurrentlyShow(ObservablePath path);
-
-        /**
-         * It resets the current status of the <code>SubDock</code> component
-         */
-        void reset();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsPresenter.java
deleted file mode 100644
index 59f9bcb..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsPresenter.java
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import com.google.gwt.event.shared.EventBus;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetPropertyHeaderEvent;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-
-@ApplicationScoped
-@Named(TestToolsPresenter.IDENTIFIER)
-public class TestToolsPresenter extends AbstractSubDockPresenter<TestToolsView> implements TestToolsView.Presenter {
-
-    public static final String IDENTIFIER = "org.drools.scenariosimulation.TestTools";
-    protected Map<String, FactModelTree> dataObjectFieldsMap = new TreeMap<>();
-    protected Map<String, FactModelTree> simpleJavaTypeFieldsMap = new TreeMap<>();
-    protected Map<String, FactModelTree> instanceFieldsMap = new TreeMap<>();
-    protected Map<String, FactModelTree> simpleJavaInstanceFieldsMap = new TreeMap<>();
-    protected Map<String, FactModelTree> hiddenFieldsMap = new TreeMap<>();
-    protected EventBus eventBus;
-    protected GridWidget gridWidget;
-    protected boolean editingColumnEnabled = false;
-    protected ListGroupItemView selectedListGroupItemView;
-    protected FieldItemView selectedFieldItemView;
-    private ListGroupItemPresenter listGroupItemPresenter;
-
-    public TestToolsPresenter() {
-        //Zero argument constructor for CDI
-        title = ScenarioSimulationEditorConstants.INSTANCE.testTools();
-    }
-
-    @Inject
-    public TestToolsPresenter(TestToolsView view, ListGroupItemPresenter listGroupItemPresenter) {
-        super(view);
-        this.listGroupItemPresenter = listGroupItemPresenter;
-        this.listGroupItemPresenter.init(this);
-        title = ScenarioSimulationEditorConstants.INSTANCE.testTools();
-    }
-
-    @Override
-    public String getIdentifier() {
-        return IDENTIFIER;
-    }
-
-    @Override
-    public void onClearSearch() {
-        view.clearInputSearch();
-        view.hideClearButton();
-        onSearchedEvent("");
-    }
-
-    @Override
-    public void onUndoSearch() {
-        view.clearInputSearch();
-        view.hideClearButton();
-        onPerfectMatchSearchedEvent(listGroupItemPresenter.getFilterTerm(), true);
-    }
-
-    @Override
-    public void onClearStatus() {
-        onClearSearch();
-    }
-
-    @Override
-    public void clearDataObjectList() {
-        view.clearDataObjectList();
-    }
-
-    @Override
-    public void clearSimpleJavaTypeList() {
-        view.clearSimpleJavaTypeList();
-    }
-
-    @Override
-    public void clearInstanceList() {
-        view.clearInstanceList();
-    }
-
-    @Override
-    public void clearSimpleJavaInstanceFieldList() {
-        view.clearSimpleJavaInstanceFieldList();
-    }
-
-    @Override
-    public void updateInstanceListSeparator() {
-        view.updateInstanceListSeparator(GridWidget.SIMULATION.equals(gridWidget));
-    }
-
-    @Override
-    public void showInstanceListContainerSeparator(boolean show) {
-        view.showInstanceListContainerSeparator(show);
-    }
-
-    @Override
-    public Optional<FactModelTree> getFactModelTreeFromFactTypeMap(String factName) {
-        return Optional.ofNullable(dataObjectFieldsMap.get(factName));
-    }
-
-    @Override
-    public Optional<FactModelTree> getFactModelTreeFromSimpleJavaTypeMap(String factName) {
-        return Optional.ofNullable(simpleJavaTypeFieldsMap.get(factName));
-    }
-
-    @Override
-    public Optional<FactModelTree> getFactModelTreeFromInstanceMap(String factName) {
-        return Optional.ofNullable(instanceFieldsMap.get(factName));
-    }
-
-    @Override
-    public Optional<FactModelTree> getFactModelTreeFromSimpleJavaInstanceMap(String factName) {
-        return Optional.ofNullable(simpleJavaInstanceFieldsMap.get(factName));
-    }
-
-    @Override
-    public FactModelTree getFactModelTreeFromHiddenMap(String factName) {
-        return hiddenFieldsMap.get(factName);
-    }
-
-    @Override
-    public void populateTestTools(TestToolsPresenterData data) {
-        setDataObjectFieldsMap(data.getDataObjectFieldsMap());
-        setSimpleJavaTypeFieldsMap(data.getSimpleJavaTypeFieldsMap());
-        setInstanceFieldsMap(data.getInstanceFieldsMap());
-        setSimpleJavaInstanceFieldsMap(data.getSimpleJavaInstanceFieldsMap());
-        setHiddenFieldsMap(data.getHiddenFieldsMap());
-        hideProperties(data.getPropertiesToHide());
-        setGridWidget(data.getGridWidget());
-    }
-
-    protected void setDataObjectFieldsMap(SortedMap<String, FactModelTree> dataObjectFieldsMap) {
-        clearDataObjectList();
-        this.dataObjectFieldsMap = dataObjectFieldsMap;
-        this.dataObjectFieldsMap.forEach(this::addDataObjectListGroupItemView);
-    }
-
-    protected void setSimpleJavaTypeFieldsMap(SortedMap<String, FactModelTree> simpleJavaTypeFieldsMap) {
-        clearSimpleJavaTypeList();
-        this.simpleJavaTypeFieldsMap = simpleJavaTypeFieldsMap;
-        this.simpleJavaTypeFieldsMap.forEach(this::addSimpleJavaTypeListGroupItemView);
-    }
-
-    protected void setInstanceFieldsMap(SortedMap<String, FactModelTree> instanceFieldsMap) {
-        clearInstanceList();
-        this.instanceFieldsMap = instanceFieldsMap;
-        this.instanceFieldsMap.forEach(this::addInstanceListGroupItemView);
-        updateInstanceListSeparator();
-    }
-
-    protected void setSimpleJavaInstanceFieldsMap(SortedMap<String, FactModelTree> simpleJavaInstanceFieldsMap) {
-        clearSimpleJavaInstanceFieldList();
-        this.simpleJavaInstanceFieldsMap = simpleJavaInstanceFieldsMap;
-        this.simpleJavaInstanceFieldsMap.forEach(this::addSimpleJavaInstanceListGroupItemView);
-        updateInstanceListSeparator();
-    }
-
-    protected void setHiddenFieldsMap(SortedMap<String, FactModelTree> hiddenFieldsMap) {
-        this.hiddenFieldsMap = hiddenFieldsMap;
-    }
-
-    protected void hideProperties(Map<String, List<List<String>>> propertiesToHide) {
-        listGroupItemPresenter.showAll();
-        propertiesToHide.entrySet().stream().forEach(
-                stringListEntry -> stringListEntry.getValue()
-                        .forEach(propertyParts ->
-                                         listGroupItemPresenter.hideProperty(stringListEntry.getKey(), propertyParts))
-        );
-    }
-
-    @Override
-    public void onShowClearButton() {
-        view.showClearButton();
-    }
-
-    @Override
-    public void setEventBus(EventBus eventBus) {
-        this.eventBus = eventBus;
-    }
-
-    protected void setGridWidget(GridWidget gridWidget) {
-        this.gridWidget = gridWidget;
-        if (GridWidget.BACKGROUND.equals(gridWidget)) {
-            hideInstances();
-        }
-    }
-
-    @Override
-    public void onSearchedEvent(String search) {
-        clearLists();
-        dataObjectFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getKey().toLowerCase().contains(search.toLowerCase()))
-                .forEach(filteredEntry -> addDataObjectListGroupItemView(filteredEntry.getKey(), filteredEntry.getValue()));
-        simpleJavaTypeFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getKey().toLowerCase().contains(search.toLowerCase()))
-                .forEach(filteredEntry -> addSimpleJavaTypeListGroupItemView(filteredEntry.getKey(), filteredEntry.getValue()));
-        instanceFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getKey().toLowerCase().contains(search.toLowerCase()))
-                .forEach(filteredEntry -> addInstanceListGroupItemView(filteredEntry.getKey(), filteredEntry.getValue()));
-        simpleJavaInstanceFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getKey().toLowerCase().contains(search.toLowerCase()))
-                .forEach(filteredEntry -> addSimpleJavaInstanceListGroupItemView(filteredEntry.getKey(), filteredEntry.getValue()));
-        updateInstanceListSeparator();
-    }
-
-    @Override
-    public void onPerfectMatchSearchedEvent(String search, boolean notEqualsSearch) {
-        clearLists();
-        dataObjectFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> filterTerm(entry.getKey(), search, notEqualsSearch))
-                .forEach(filteredEntry -> addDataObjectListGroupItemView(filteredEntry.getKey(), filteredEntry.getValue()));
-        simpleJavaTypeFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> filterTerm(entry.getKey(), search, notEqualsSearch))
-                .forEach(filteredEntry -> addSimpleJavaTypeListGroupItemView(filteredEntry.getKey(), filteredEntry.getValue()));
-        instanceFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> filterTerm(entry.getKey(), search, notEqualsSearch))
-                .forEach(filteredEntry -> addInstanceListGroupItemView(filteredEntry.getKey(), filteredEntry.getValue()));
-        simpleJavaInstanceFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> filterTerm(entry.getKey(), search, notEqualsSearch))
-                .forEach(filteredEntry -> addSimpleJavaInstanceListGroupItemView(filteredEntry.getKey(), filteredEntry.getValue()));
-        updateInstanceListSeparator();
-    }
-
-    @Override
-    public void addDataObjectListGroupItemView(String factName, FactModelTree factModelTree) {
-        view.addDataObjectListGroupItem(listGroupItemPresenter.getDivElement(factName, factModelTree));
-    }
-
-    @Override
-    public void addSimpleJavaTypeListGroupItemView(String factName, FactModelTree factModelTree) {
-        view.addSimpleJavaTypeListGroupItem(listGroupItemPresenter.getDivElement(factName, factModelTree));
-    }
-
-    @Override
-    public void addInstanceListGroupItemView(String instanceName, FactModelTree factModelTree) {
-        view.addInstanceListGroupItem(listGroupItemPresenter.getDivElement(instanceName, factModelTree));
-    }
-
-    @Override
-    public void addSimpleJavaInstanceListGroupItemView(String instanceName, FactModelTree factModelTree) {
-        view.addSimpleJavaInstanceListGroupItem(listGroupItemPresenter.getDivElement(instanceName, factModelTree));
-    }
-
-    @Override
-    public void onEnableEditorTab() {
-        onDisableEditorTab();
-        listGroupItemPresenter.enable();
-        editingColumnEnabled = true;
-        view.enableEditorTab();
-        view.enableSearch();
-    }
-
-    @Override
-    public void onEnableEditorTab(String filterTerm, List<String> propertyNameElements, boolean notEqualsSearch) {
-        onDisableEditorTab();
-        onPerfectMatchSearchedEvent(filterTerm, notEqualsSearch);
-        listGroupItemPresenter.enable(filterTerm);
-        editingColumnEnabled = true;
-        view.enableEditorTab();
-        /* If notEqualsSearch is TRUE, then the instance is not assigned for the selected column.
-         * Therefore, it isn't necessary to search through the maps to check it. In that case, the search is activated.
-         */
-        if (!notEqualsSearch) {
-            updateInstanceIsAssignedStatus(filterTerm);
-        } else {
-            view.enableSearch();
-        }
-        if (propertyNameElements != null && !notEqualsSearch) {
-            listGroupItemPresenter.selectProperty(filterTerm, propertyNameElements);
-        }
-    }
-
-    @Override
-    public void onDisableEditorTab() {
-        onSearchedEvent("");
-        listGroupItemPresenter.disable();
-        editingColumnEnabled = false;
-        view.disableEditorTab();
-        selectedFieldItemView = null;
-        selectedListGroupItemView = null;
-    }
-
-    @Override
-    public void setSelectedElement(ListGroupItemView selected) {
-        selectedListGroupItemView = selected;
-        selectedFieldItemView = null;
-        if (filterTerm(selected.getFactName(), listGroupItemPresenter.getFilterTerm(), selected.isInstanceAssigned())) {
-            view.disableAddButton();
-        } else {
-            view.enableAddButton();
-        }
-    }
-
-    @Override
-    public void setSelectedElement(FieldItemView selected) {
-        selectedFieldItemView = selected;
-        selectedListGroupItemView = null;
-        String factName = selectedFieldItemView.getFullPath().get(0);
-        boolean isFactNameAssigned = listGroupItemPresenter.isInstanceAssigned(factName);
-        /* If the check is not shown, the item was not selected by an user but automatically. If it's shown,
-           then it checks if the related instance is already assigned or not. */
-        if (!selectedFieldItemView.isCheckShown() ||
-                filterTerm(factName, listGroupItemPresenter.getFilterTerm(), isFactNameAssigned)) {
-            view.disableAddButton();
-        } else {
-            view.enableAddButton();
-        }
-    }
-
-    @Override
-    public void clearSelection() {
-        if (selectedFieldItemView != null) {
-            selectedFieldItemView.showCheck(false);
-        } else if (selectedListGroupItemView != null) {
-            selectedListGroupItemView.showCheck(false);
-        }
-        view.disableAddButton();
-    }
-
-    @Override
-    public void onModifyColumn() {
-        if (editingColumnEnabled) {
-            if (selectedListGroupItemView != null) {
-                String className = selectedListGroupItemView.getActualClassName();
-                getFactModelTreeFromMaps(className).ifPresent(factModelTree -> eventBus.fireEvent(
-                    new SetPropertyHeaderEvent(gridWidget,
-                                               factModelTree.getFullPackage(),
-                                               factModelTree.getTypeName(),
-                                               Collections.unmodifiableList(Arrays.asList(className)),
-                                               factModelTree.getFullTypeName(),
-                                               FactMappingValueType.EXPRESSION,
-                                               factModelTree.getImportPrefix())));
-            } else if (selectedFieldItemView != null) {
-                String baseClass = selectedFieldItemView.getFullPath().get(0);
-                List<String> propertyNameElements = new ArrayList<>(selectedFieldItemView.getFullPath());
-                if (!isSimple(baseClass)) {
-                    propertyNameElements.add(selectedFieldItemView.getFieldName());
-                }
-                getFactModelTreeFromMaps(baseClass).ifPresent(factModelTree -> eventBus.fireEvent(
-                    new SetPropertyHeaderEvent(gridWidget,
-                                               factModelTree.getFullPackage(),
-                                               factModelTree.getTypeName(),
-                                               Collections.unmodifiableList(propertyNameElements),
-                                               selectedFieldItemView.getClassName(),
-                                               FactMappingValueType.NOT_EXPRESSION,
-                                               factModelTree.getImportPrefix())));
-            }
-        }
-    }
-
-    @Override
-    public void reset() {
-        clearFieldsMaps();
-        listGroupItemPresenter.reset();
-        view.reset();
-    }
-
-    protected void clearFieldsMaps() {
-        dataObjectFieldsMap = new TreeMap<>();
-        simpleJavaTypeFieldsMap = new TreeMap<>();
-        instanceFieldsMap = new TreeMap<>();
-        simpleJavaInstanceFieldsMap = new TreeMap<>();
-        hiddenFieldsMap = new TreeMap<>();
-    }
-
-    /**
-     * Method to hide all the <b>instance-related</b> html
-     */
-    @Override
-    public void hideInstances() {
-        clearInstanceList();
-        clearSimpleJavaInstanceFieldList();
-        showInstanceListContainerSeparator(false);
-    }
-
-    /**
-     * It navigates through the maps, to check if the given key is present or not in the keySet of these maps.
-     * If present, then a INSTANCE is already assigned to the selected column. Then, it assigns the search result to
-     * its related view.
-     * @param key
-     */
-    protected void updateInstanceIsAssignedStatus(String key) {
-        if (key != null && !key.isEmpty()) {
-            boolean assigned = dataObjectFieldsMap.keySet().contains(key) ||
-                    simpleJavaTypeFieldsMap.keySet().contains(key) ||
-                    instanceFieldsMap.keySet().contains(key) ||
-                    simpleJavaInstanceFieldsMap.keySet().contains(key);
-            listGroupItemPresenter.setInstanceAssigned(key, assigned);
-        }
-    }
-
-    protected Optional<String> getFullPackage(String className) {
-        return getFactModelTreeFromMaps(className).map(FactModelTree::getFullPackage);
-    }
-
-    protected Optional<FactModelTree> getFactModelTreeFromMaps(String key) {
-        return Optional.ofNullable(getFactModelTreeFromFactTypeMap(key)
-                                           .orElseGet(() -> getFactModelTreeFromSimpleJavaTypeMap(key)
-                                                   .orElseGet(() -> getFactModelTreeFromInstanceMap(key)
-                                                           .orElseGet(() -> getFactModelTreeFromSimpleJavaInstanceMap(key).orElse(null)))));
-    }
-
-    protected boolean isSimple(String key) {
-        return Optional.ofNullable(getFactModelTreeFromSimpleJavaTypeMap(key)
-                                           .orElseGet(() -> getFactModelTreeFromSimpleJavaInstanceMap(key)
-                                                   .orElse(null))).isPresent();
-    }
-
-    protected void clearLists() {
-        clearDataObjectList();
-        clearSimpleJavaTypeList();
-        clearInstanceList();
-        clearSimpleJavaInstanceFieldList();
-    }
-
-    /**
-     * It determines if a key (factTitle) is present or not in the search variable.
-     * @param key It's the title of the fact to search
-     * @param search It represents a concatenation of titles, with ";" as separator
-     * @param notEqualsSearch It establishes the method logic: to check if a key is present or not in search string
-     * @return
-     */
-    protected boolean filterTerm(String key, String search, boolean notEqualsSearch) {
-        List<String> terms = Arrays.asList(search.split(";"));
-        if (notEqualsSearch) {
-            return !terms.contains(key);
-        } else {
-            return terms.contains(key);
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsPresenterData.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsPresenterData.java
deleted file mode 100644
index 7399fc5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsPresenterData.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-
-public class TestToolsPresenterData {
-
-    private SortedMap<String, FactModelTree> dataObjectFieldsMap;
-    private SortedMap<String, FactModelTree> simpleJavaTypeFieldsMap;
-    private SortedMap<String, FactModelTree> instanceFieldsMap;
-    private SortedMap<String, FactModelTree> simpleJavaInstanceFieldsMap;
-    private SortedMap<String, FactModelTree> hiddenFieldsMap;
-    private Map<String, List<List<String>>> propertiesToHide;
-    private GridWidget gridWidget;
-
-    public TestToolsPresenterData(SortedMap<String, FactModelTree> dataObjectFieldsMap,
-                                  SortedMap<String, FactModelTree> simpleJavaTypeFieldsMap,
-                                  SortedMap<String, FactModelTree> instanceFieldsMap,
-                                  SortedMap<String, FactModelTree> simpleJavaInstanceFieldsMap,
-                                  SortedMap<String, FactModelTree> hiddenFieldsMap,
-                                  Map<String, List<List<String>>> propertiesToHide, GridWidget gridWidget) {
-        this.dataObjectFieldsMap = dataObjectFieldsMap;
-        this.simpleJavaTypeFieldsMap = simpleJavaTypeFieldsMap;
-        this.instanceFieldsMap = instanceFieldsMap;
-        this.simpleJavaInstanceFieldsMap = simpleJavaInstanceFieldsMap;
-        this.hiddenFieldsMap = hiddenFieldsMap;
-        this.propertiesToHide = propertiesToHide;
-        this.gridWidget = gridWidget;
-    }
-
-    public SortedMap<String, FactModelTree> getDataObjectFieldsMap() {
-        return dataObjectFieldsMap;
-    }
-
-    public void setDataObjectFieldsMap(SortedMap<String, FactModelTree> dataObjectFieldsMap) {
-        this.dataObjectFieldsMap = dataObjectFieldsMap;
-    }
-
-    public SortedMap<String, FactModelTree> getSimpleJavaTypeFieldsMap() {
-        return simpleJavaTypeFieldsMap;
-    }
-
-    public void setSimpleJavaTypeFieldsMap(SortedMap<String, FactModelTree> simpleJavaTypeFieldsMap) {
-        this.simpleJavaTypeFieldsMap = simpleJavaTypeFieldsMap;
-    }
-
-    public SortedMap<String, FactModelTree> getInstanceFieldsMap() {
-        return instanceFieldsMap;
-    }
-
-    public void setInstanceFieldsMap(SortedMap<String, FactModelTree> instanceFieldsMap) {
-        this.instanceFieldsMap = instanceFieldsMap;
-    }
-
-    public SortedMap<String, FactModelTree> getSimpleJavaInstanceFieldsMap() {
-        return simpleJavaInstanceFieldsMap;
-    }
-
-    public void setSimpleJavaInstanceFieldsMap(SortedMap<String, FactModelTree> simpleJavaInstanceFieldsMap) {
-        this.simpleJavaInstanceFieldsMap = simpleJavaInstanceFieldsMap;
-    }
-
-    public SortedMap<String, FactModelTree> getHiddenFieldsMap() {
-        return hiddenFieldsMap;
-    }
-
-    public void setHiddenFieldsMap(SortedMap<String, FactModelTree> hiddenFieldsMap) {
-        this.hiddenFieldsMap = hiddenFieldsMap;
-    }
-
-    public Map<String, List<List<String>>> getPropertiesToHide() {
-        return propertiesToHide;
-    }
-
-    public void setPropertiesToHide(Map<String, List<List<String>>> propertiesToHide) {
-        this.propertiesToHide = propertiesToHide;
-    }
-
-    public GridWidget getGridWidget() {
-        return gridWidget;
-    }
-
-    public void setGridWidget(GridWidget gridWidget) {
-        this.gridWidget = gridWidget;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsView.java
deleted file mode 100644
index aedd95e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsView.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.List;
-import java.util.Optional;
-
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.event.shared.EventBus;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-
-public interface TestToolsView extends SubDockView<TestToolsView.Presenter> {
-
-    void clearInputSearch();
-
-    void hideClearButton();
-
-    void showClearButton();
-
-    void clearDataObjectList();
-
-    void clearSimpleJavaTypeList();
-
-    void clearInstanceList();
-
-    void clearSimpleJavaInstanceFieldList();
-
-    void addDataObjectListGroupItem(DivElement item);
-
-    void addSimpleJavaTypeListGroupItem(DivElement item);
-
-    void addInstanceListGroupItem(DivElement item);
-
-    void addSimpleJavaInstanceListGroupItem(DivElement item);
-
-    Presenter getPresenter();
-
-    void updateInstanceListSeparator(boolean show);
-
-    void showInstanceListContainerSeparator(boolean show);
-
-    /**
-     * By default the <b>Editor Tab</b> is disabled (no user interaction allowed).
-     * It is enabled only by click on grid' header
-     */
-    void enableEditorTab();
-
-    /**
-     * By default the <b>Editor Tab</b> must be disabled (no user interaction allowed).
-     * It is enabled only by click on grid' header
-     */
-    void disableEditorTab();
-
-    /**
-     * It enables all widgets related to the search box
-     */
-    void enableSearch();
-
-    /**
-     * It disables all widgets related to the search box
-     */
-    void disableSearch();
-
-    /**
-     * By default the <b>Add</b> button is disabled (no user interaction allowed).
-     * It is enabled only by selection of a property/data object
-     */
-    void enableAddButton();
-
-    void disableAddButton();
-
-    interface Presenter extends SubDockView.Presenter {
-
-        void onClearSearch();
-
-        void onUndoSearch();
-
-        void onClearStatus();
-
-        void populateTestTools(TestToolsPresenterData data);
-
-        void onShowClearButton();
-
-        /**
-         * Filter the data in the right panel if they <b>contains</b> the given search string, case-unsensitive. To be used by manual search
-         * @param search
-         */
-        void onSearchedEvent(String search);
-
-        /**
-         * Filter the data in the right panel if they are <b>exactly the same</b> as the given search string, case-sensitive. To be used by filter fired by grid.
-         * @param search
-         * @param notEqualsSearch set to <code>true</code> to perform a <b>not</b> filter, i.e. to show only results <b>different</b> than filterTerm
-         */
-        void onPerfectMatchSearchedEvent(String search, boolean notEqualsSearch);
-
-        void clearDataObjectList();
-
-        void clearSimpleJavaTypeList();
-
-        void clearInstanceList();
-
-        void clearSimpleJavaInstanceFieldList();
-
-        void updateInstanceListSeparator();
-
-        void addDataObjectListGroupItemView(String factName, FactModelTree factModelTree);
-
-        void addSimpleJavaTypeListGroupItemView(String factName, FactModelTree factModelTree);
-
-        void addInstanceListGroupItemView(String factName, FactModelTree factModelTree);
-
-        void addSimpleJavaInstanceListGroupItemView(String factName, FactModelTree factModelTree);
-
-        /**
-         * Method to hide all the <b>instance-related</b> html
-         */
-        void hideInstances();
-
-        void setEventBus(EventBus eventBus);
-
-        void showInstanceListContainerSeparator(boolean show);
-
-        Optional<FactModelTree> getFactModelTreeFromFactTypeMap(String factName);
-
-        Optional<FactModelTree> getFactModelTreeFromSimpleJavaTypeMap(String factName);
-
-        Optional<FactModelTree> getFactModelTreeFromInstanceMap(String factName);
-
-        Optional<FactModelTree> getFactModelTreeFromSimpleJavaInstanceMap(String factName);
-
-        FactModelTree getFactModelTreeFromHiddenMap(String factName);
-
-        /**
-         * By default the <b>Editor Tab</b> is disabled (no user interaction allowed).
-         * Use this when click on grid' <i>instance</i> header.
-         * Call this method to show all the first-level data models <b>enabled</b> (i.e. <b>double-clickable</b> to map to an <i>instance</i> header/column)
-         * and their properties <b>disabled</b> (i.e. <b>not double-clickable</b>)
-         */
-        void onEnableEditorTab();
-
-        /**
-         * By default the <b>Editor Tab</b> is disabled (no user interaction allowed).
-         * Use this when click on grid' <i>property</i> header.
-         * Call this method to show only the data model with the given name, <b>disabled</b> (i.e. <b>not double-clickable</b>)
-         * and their properties <b>enabled</b> (i.e. <b>double-clickable</b> to map to a <i>property</i> header/column below the belonging data model instance one)
-         * @param factName
-         * @param propertyNameElements The <code>List</code> to <b>eventually</b> use to select the property in the test tools  panel
-         * @param notEqualsSearch set to <code>true</code> to perform a <b>not</b> filter, i.e. to show only results <b>different</b> than filterTerm
-         */
-        void onEnableEditorTab(String factName, List<String> propertyNameElements, boolean notEqualsSearch);
-
-        /**
-         * By default the <b>Editor Tab</b> must be disabled (no user interaction allowed).
-         * It is enabled only by click on grid' header
-         */
-        void onDisableEditorTab();
-
-        /**
-         * Method to fire a <code>SetPropertyHeaderScenarioSImulationCommand</code>  or <code>SetPropertyHeaderScenarioSImulationCommand</code>,
-         * depending on the element currently selected
-         */
-        void onModifyColumn();
-
-        /**
-         * Method to set the "selected" information - use this to set the <i>instance</i> level header
-         * @param selected
-         */
-        void setSelectedElement(ListGroupItemView selected);
-
-        /**
-         * Method to set the "selected" information - use this to set the <i>property</i> level header
-         * @param selected
-         */
-        void setSelectedElement(FieldItemView selected);
-
-        void clearSelection();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsViewImpl.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsViewImpl.html
deleted file mode 100644
index bba88d2..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsViewImpl.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!doctype html>
-<!--
-  ~ 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.      
--->
-
-<!-- TEST TOOLS -->
-<div id="testtools-panel" class="uf-scroll-panel">
-  <div id="kieTestToolsContent" class="tab-pane kie-tab-pane--scesim-panel">
-    <p data-field="testToolsDescriptionElement"></p>
-    <div>
-      <label data-field="testToolObjectSelectionTitleElement" for="kie-search"></label>
-      <a href="#">
-        <span
-          data-field="infoSelectDataObjectElement"
-          class="pficon pficon-info kie-test-tools-info__icon"
-          data-toggle="tooltip"
-          data-placement="left"
-          title=""
-        ></span>
-      </a>
-    </div>
-    <div id="kie-search" class="kie-test-tools-content__box">
-      <!-- outlined data object box -->
-      <!-- search box -->
-      <div class="search-pf has-button kie-test-tools-search__box">
-        <div class="form-group has-clear">
-          <div class="search-pf-input-group">
-            <input id="search1" type="search" class="form-control" data-field="inputSearch" placeholder="Search" />
-            <button type="button" class="clear" data-field="clearSearchButton" aria-hidden="true">
-              <span class="pficon pficon-close"></span>
-            </button>
-          </div>
-        </div>
-        <div class="form-group">
-          <button class="btn btn-default" type="button" data-field="searchButton">
-            <span class="fa fa-search"></span>
-          </button>
-        </div>
-      </div>
-      <!-- end search box -->
-
-      <!-- data object list expansion -->
-      <div
-        id="data-object-pf-list-simple-expansion"
-        class="tree-list-view-pf-view kie-tree-list-view-pf-view--compact"
-        data-field="dataObjectListContainer"
-      ></div>
-      <!-- end list expansion -->
-      <!-- simple java type list expansion -->
-      <div
-        id="simple-java-type-pf-list-simple-expansion"
-        class="tree-list-view-pf-view kie-tree-list-view-pf-view--compact"
-        data-field="simpleJavaTypeListContainer"
-      ></div>
-      <!-- end list expansion -->
-      <!-- instance list expansion -->
-      <span data-field="instanceListContainer-separator" class="kie-test-tools-instances-list__label"></span>
-      <div
-        id="instance-pf-list-simple-expansion"
-        class="tree-list-view-pf-view kie-tree-list-view-pf-view--compact"
-        data-field="instanceListContainer"
-      ></div>
-      <!-- end list expansion -->
-      <!-- instance list expansion -->
-      <div
-        id="simple-java-instance-pf-list-simple-expansion"
-        class="tree-list-view-pf-view kie-tree-list-view-pf-view--compact"
-        data-field="simpleJavaInstanceListContainer"
-      ></div>
-      <!-- end list expansion -->
-    </div>
-    <!-- end outlined data object box -->
-    <div class="kie-tab-pane--scesim-panel-footer">
-      <span>
-        <button class="btn btn-lg btn-primary" type="button" data-field="addButton"></button>
-        <span>
-          <a class="kie-test-tools-clear-selection" data-field="clearSelectionElement" href="#"></a>
-        </span>
-      </span>
-      <div class="kie-test-tools-insert-object-label" data-field="addButtonLabel"></div>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsViewImpl.java
deleted file mode 100644
index f9f2887..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsViewImpl.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import com.google.gwt.dom.client.AnchorElement;
-import com.google.gwt.dom.client.ButtonElement;
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.LabelElement;
-import com.google.gwt.dom.client.ParagraphElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.KeyCodes;
-import com.google.gwt.event.dom.client.KeyDownEvent;
-import com.google.gwt.event.dom.client.KeyUpEvent;
-import com.google.gwt.user.client.ui.Composite;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-
-@ApplicationScoped
-@Templated(stylesheet = "/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStyles.css")
-public class TestToolsViewImpl
-        extends Composite
-        implements TestToolsView {
-
-    protected Presenter presenter;
-
-    @DataField("testToolsDescriptionElement")
-    protected ParagraphElement testToolsDescriptionElement = Document.get().createPElement();
-
-    @DataField("testToolObjectSelectionTitleElement")
-    protected LabelElement testToolObjectSelectionTitleElement = Document.get().createLabelElement();
-
-    @DataField("clearSelectionElement")
-    protected AnchorElement clearSelectionElement = Document.get().createAnchorElement();
-
-    @DataField("infoSelectDataObjectElement")
-    protected SpanElement infoSelectDataObjectElement = Document.get().createSpanElement();
-
-    @DataField("clearSearchButton")
-    protected ButtonElement clearSearchButton = Document.get().createPushButtonElement();
-
-    @DataField("searchButton")
-    protected ButtonElement searchButton = Document.get().createPushButtonElement();
-
-    @DataField("inputSearch")
-    protected InputElement inputSearch = Document.get().createTextInputElement();
-
-    @DataField("dataObjectListContainer")
-    protected DivElement dataObjectListContainer = Document.get().createDivElement();
-
-    @DataField("simpleJavaTypeListContainer")
-    protected DivElement simpleJavaTypeListContainer = Document.get().createDivElement();
-
-    @DataField("instanceListContainer-separator")
-    protected SpanElement instanceListContainerSeparator = Document.get().createSpanElement();
-
-    @DataField("instanceListContainer")
-    protected DivElement instanceListContainer = Document.get().createDivElement();
-
-    @DataField("simpleJavaInstanceListContainer")
-    protected DivElement simpleJavaInstanceListContainer = Document.get().createDivElement();
-
-    @DataField("addButtonLabel")
-    protected DivElement addButtonLabel = Document.get().createDivElement();
-
-    @DataField("addButton")
-    protected ButtonElement addButton = Document.get().createPushButtonElement();
-
-    @DataField("kieTestToolsContent")
-    protected DivElement kieTestToolsContent = Document.get().createDivElement();
-
-    protected List<DivElement> managedDivElements;
-
-    public TestToolsViewImpl() {
-        managedDivElements = Arrays.asList(dataObjectListContainer, simpleJavaTypeListContainer, instanceListContainer, simpleJavaTypeListContainer);
-    }
-
-    @Override
-    public void init(Presenter presenter) {
-        this.presenter = presenter;
-        disableEditorTab();
-        testToolsDescriptionElement.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.testToolsDescription());
-        testToolObjectSelectionTitleElement.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.testToolObjectSelectionTitle());
-        clearSelectionElement.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.testToolClearSelection());
-        addButton.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.testToolsAddButton());
-        addButtonLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.testToolsAddButtonLabel());
-        instanceListContainerSeparator.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.dataObjectInstances());
-        infoSelectDataObjectElement.setAttribute("title", ScenarioSimulationEditorConstants.INSTANCE.testToolObjectSelectionTooltip());
-    }
-
-    @Override
-    public Presenter getPresenter() {
-        return presenter;
-    }
-
-    @Override
-    public void reset() {
-        clearDataObjectList();
-        clearSimpleJavaTypeList();
-        showInstanceListContainerSeparator(false);
-        clearInstanceList();
-        clearSimpleJavaInstanceFieldList();
-    }
-
-    @EventHandler("clearSearchButton")
-    public void onClearSearchButtonClick(ClickEvent event) {
-        presenter.onUndoSearch();
-    }
-
-    @EventHandler("inputSearch")
-    public void onInputSearchKeyUp(KeyUpEvent event) {
-        presenter.onShowClearButton();
-    }
-
-    @EventHandler("inputSearch")
-    public void onInputSearchKeyDownEvent(KeyDownEvent event) {
-        if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) {
-            presenter.onSearchedEvent(inputSearch.getValue());
-        }
-    }
-
-    @EventHandler("clearSelectionElement")
-    public void onClearSelectionElementClicked(ClickEvent event) {
-        presenter.clearSelection();
-    }
-
-    @EventHandler("searchButton")
-    public void onSearchButtonClicked(ClickEvent event) {
-        presenter.onSearchedEvent(inputSearch.getValue());
-    }
-
-    @EventHandler("addButton")
-    public void onAddButtonClicked(ClickEvent event) {
-        presenter.onModifyColumn();
-        addButton.setDisabled(true);
-        presenter.onDisableEditorTab();
-    }
-
-    @Override
-    public void clearInputSearch() {
-        inputSearch.setValue("");
-    }
-
-    @Override
-    public void hideClearButton() {
-        clearSearchButton.setDisabled(true);
-        clearSearchButton.setAttribute("style", "display: none;");
-    }
-
-    @Override
-    public void showClearButton() {
-        clearSearchButton.setDisabled(false);
-        clearSearchButton.removeAttribute("style");
-    }
-
-    @Override
-    public void clearDataObjectList() {
-        dataObjectListContainer.removeAllChildren();
-        dataObjectListContainer.getStyle().setDisplay(Style.Display.NONE);
-    }
-
-    @Override
-    public void clearSimpleJavaTypeList() {
-        simpleJavaTypeListContainer.removeAllChildren();
-        simpleJavaTypeListContainer.getStyle().setDisplay(Style.Display.NONE);
-    }
-
-    @Override
-    public void clearInstanceList() {
-        instanceListContainer.removeAllChildren();
-        instanceListContainer.getStyle().setDisplay(Style.Display.NONE);
-    }
-
-    @Override
-    public void clearSimpleJavaInstanceFieldList() {
-        simpleJavaInstanceListContainer.removeAllChildren();
-        simpleJavaInstanceListContainer.getStyle().setDisplay(Style.Display.NONE);
-    }
-
-    @Override
-    public void addDataObjectListGroupItem(DivElement item) {
-        dataObjectListContainer.getStyle().setDisplay(Style.Display.BLOCK);
-        dataObjectListContainer.appendChild(item);
-    }
-
-    @Override
-    public void addSimpleJavaTypeListGroupItem(DivElement item) {
-        simpleJavaTypeListContainer.getStyle().setDisplay(Style.Display.BLOCK);
-        simpleJavaTypeListContainer.appendChild(item);
-    }
-
-    @Override
-    public void addInstanceListGroupItem(DivElement item) {
-        instanceListContainer.getStyle().setDisplay(Style.Display.BLOCK);
-        instanceListContainer.appendChild(item);
-    }
-
-    @Override
-    public void addSimpleJavaInstanceListGroupItem(DivElement item) {
-        simpleJavaInstanceListContainer.getStyle().setDisplay(Style.Display.BLOCK);
-        simpleJavaInstanceListContainer.appendChild(item);
-    }
-
-    @Override
-    public void updateInstanceListSeparator(boolean show) {
-        if (!show ||
-                (instanceListContainer.getChildCount() < 1 && simpleJavaInstanceListContainer.getChildCount() < 1)) {
-            instanceListContainerSeparator.getStyle().setDisplay(Style.Display.NONE);
-        } else {
-            instanceListContainerSeparator.getStyle().setDisplay(Style.Display.BLOCK);
-        }
-    }
-
-    @Override
-    public void showInstanceListContainerSeparator(boolean show) {
-        if (show) {
-            instanceListContainerSeparator.getStyle().setDisplay(Style.Display.BLOCK);
-        } else {
-            instanceListContainerSeparator.getStyle().setDisplay(Style.Display.NONE);
-        }
-    }
-
-    @Override
-    public void enableEditorTab() {
-        setDisabledStatus(false);
-    }
-
-    @Override
-    public void disableEditorTab() {
-        setDisabledStatus(true);
-    }
-
-    @Override
-    public void enableSearch() {
-        clearSearchButton.setDisabled(false);
-        searchButton.setDisabled(false);
-        inputSearch.setDisabled(false);
-    }
-
-    @Override
-    public void disableSearch() {
-        hideClearButton();
-        searchButton.setDisabled(true);
-        inputSearch.setDisabled(true);
-        inputSearch.setValue("");
-    }
-
-    @Override
-    public void enableAddButton() {
-        addButton.setDisabled(false);
-    }
-
-    @Override
-    public void disableAddButton() {
-        addButton.setDisabled(true);
-    }
-
-    protected void setDisabledStatus(boolean disabled) {
-        setClearSelectionAnchorDisabledStatus(disabled);
-        setInfoSelectDataObjectElementDisabledStatus(disabled);
-        setContainersDisabledStatus(disabled);
-        if (disabled) {
-            kieTestToolsContent.addClassName(ConstantHolder.DISABLED);
-            disableSearch();
-            disableAddButton();
-        } else {
-            kieTestToolsContent.removeClassName(ConstantHolder.DISABLED);
-        }
-    }
-
-    protected void setContainersDisabledStatus(boolean disabled) {
-        if (disabled) {
-            managedDivElements.forEach(divElement -> divElement.addClassName(ConstantHolder.DISABLED));
-        } else {
-            managedDivElements.forEach(divElement -> divElement.removeClassName(ConstantHolder.DISABLED));
-        }
-    }
-
-    protected void setClearSelectionAnchorDisabledStatus(boolean disabled) {
-        if (disabled) {
-            clearSelectionElement.addClassName(ConstantHolder.DISABLED);
-        } else {
-            clearSelectionElement.removeClassName(ConstantHolder.DISABLED);
-        }
-    }
-
-    protected void setInfoSelectDataObjectElementDisabledStatus(boolean disabled) {
-        if (disabled) {
-            infoSelectDataObjectElement.addClassName(ConstantHolder.DISABLED);
-        } else {
-            infoSelectDataObjectElement.removeClassName(ConstantHolder.DISABLED);
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/type/ScenarioSimulationResourceType.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/type/ScenarioSimulationResourceType.java
deleted file mode 100644
index 9b2ef5f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/type/ScenarioSimulationResourceType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.type;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.IsWidget;
-import org.drools.workbench.screens.scenariosimulation.client.resources.ScenarioSimulationEditorResources;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.type.ScenarioSimulationResourceTypeDefinition;
-import org.guvnor.common.services.project.categories.Decision;
-import org.uberfire.client.workbench.type.ClientResourceType;
-
-@ApplicationScoped
-public class ScenarioSimulationResourceType
-        extends ScenarioSimulationResourceTypeDefinition
-        implements ClientResourceType {
-
-    //GwtMockito barfs when this is static... so keep it as an instance variable
-    private Image IMAGE = new Image(ScenarioSimulationEditorResources.INSTANCE.images().typeScenarioSimulation());
-
-    public ScenarioSimulationResourceType() {
-    }
-
-    @Inject
-    public ScenarioSimulationResourceType(final Decision category) {
-        super(category);
-    }
-
-    @Override
-    public IsWidget getIcon() {
-        return IMAGE;
-    }
-
-    @Override
-    public String getDescription() {
-        String desc = ScenarioSimulationEditorConstants.INSTANCE.scenarioSimulationResourceTypeDescription();
-        if (desc == null || desc.isEmpty()) {
-            return super.getDescription();
-        }
-        return desc;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ConstantHolder.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ConstantHolder.java
deleted file mode 100644
index a58bf37..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ConstantHolder.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.utils;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.MVEL_ESCAPE_SYMBOL;
-
-/**
- * Class used to store constants used throughout the code
- */
-public class ConstantHolder {
-
-    private ConstantHolder() {
-        // Not instantiable
-    }
-
-    public static final String FA_ANGLE_DOWN = "fa-angle-down";
-    public static final String FA_ANGLE_RIGHT = "fa-angle-right";
-    public static final String HIDDEN = "hidden";
-    public static final String NODE_HIDDEN = "node-hidden";
-    public static final String DISABLED = "disabled";
-    public static final String SELECTED = "selected";
-    public static final String INPUT = "input";
-
-    public static final String EXPRESSION = "expression";
-    public static final String EXPRESSION_INSTANCE_PLACEHOLDER = EXPRESSION + " </>";
-    public static final String EXPRESSION_VALUE_PREFIX = MVEL_ESCAPE_SYMBOL + " ";
-
-    // java.time (JSR-310) is not supported by GWT, therefore LocalDate and LocaleDateTime are not native
-    public static final String LOCALDATE_SIMPLE_NAME = "LocalDate";
-    public static final String LOCALDATE_CANONICAL_NAME = "java.time.LocalDate";
-    public static final String LOCALTIME_SIMPLE_NAME = "LocalTime";
-    public static final String LOCALTIME_CANONICAL_NAME = "java.time.LocalTime";
-    public static final String LOCALDATETIME_SIMPLE_NAME = "LocalDateTime";
-    public static final String LOCALDATETIME_CANONICAL_NAME = "java.time.LocalDateTime";
-    public static final String OFFSETDATETIME_SIMPLE_NAME = "OffsetDateTime";
-    public static final String OFFSETDATETIME_CANONICAL_NAME = "java.time.OffsetDateTime";
-    public static final String DMN_DATE = "date";
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ExpressionUtils.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ExpressionUtils.java
deleted file mode 100644
index 99bfd88..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ExpressionUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.utils;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.MVEL_ESCAPE_SYMBOL;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.EXPRESSION_VALUE_PREFIX;
-
-/**
- * This utils class holds all shared functions used by <b>Expression</b> handling, where expressions are
- * used defined expression code put on GIVEN/EXPECTED data cells
- */
-public class ExpressionUtils {
-
-    private ExpressionUtils() {
-        // Not instantiable
-    }
-
-    /**
-     * It ensures if the given string starts with <code>EXPRESSION_VALUE_PREFIX</code>. If TRUE, it simply returns
-     * the given string. Otherwise, it adds <code>EXPRESSION_VALUE_PREFIX</code> as prefix of the given string.
-     * @param expressionValue
-     * @return
-     */
-    public static String ensureExpressionSyntax(String expressionValue) {
-        if (expressionValue != null && !expressionValue.startsWith(EXPRESSION_VALUE_PREFIX)) {
-            if (expressionValue.startsWith(MVEL_ESCAPE_SYMBOL)) {
-                return expressionValue.replaceFirst(MVEL_ESCAPE_SYMBOL, EXPRESSION_VALUE_PREFIX);
-            }
-            if (expressionValue.startsWith(" ")) {
-                return expressionValue.replaceFirst(" ", EXPRESSION_VALUE_PREFIX);
-            }
-            return EXPRESSION_VALUE_PREFIX + expressionValue;
-        }
-        return expressionValue;
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationBuilders.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationBuilders.java
deleted file mode 100644
index e6380dd..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationBuilders.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.renderers.ScenarioGridColumnRenderer;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-
-public class ScenarioSimulationBuilders {
-
-    /**
-     * <b>Builder</b> for <code>ScenarioGridColumn</code>.
-     * <p>
-     * If not provided, default values are:
-     * <p>
-     * width: 150
-     * </p>
-     * <p>
-     * isMovable: <code>false</code>;
-     * </p>
-     * <p>
-     * isPropertyAssigned: <code>false</code>;
-     * </p>
-     * <p>
-     * placeHolder: "";
-     * </p>
-     * <p>
-     * columnRenderer: new ScenarioGridColumnRenderer()
-     * </p>
-     * <p>
-     * headerMetaData: new ArrayList<>
-     * </p>
-     * </p>
-     */
-    public static class ScenarioGridColumnBuilder {
-
-        private double width = 150;
-        private boolean isMovable = false;
-        private String placeHolder = "";
-        private final HeaderBuilder headerBuilder;
-        private ScenarioGridColumnRenderer scenarioGridColumnRenderer;
-        private final ScenarioCellTextAreaSingletonDOMElementFactory factoryCell;
-
-        public static ScenarioGridColumnBuilder get(ScenarioCellTextAreaSingletonDOMElementFactory factoryCell, HeaderBuilder headerBuilder) {
-            return new ScenarioGridColumnBuilder(factoryCell, headerBuilder);
-        }
-
-        private ScenarioGridColumnBuilder(ScenarioCellTextAreaSingletonDOMElementFactory factoryCell, HeaderBuilder headerBuilder) {
-            this.factoryCell = factoryCell;
-            this.headerBuilder = headerBuilder;
-        }
-
-        public ScenarioGridColumnBuilder setWidth(double width) {
-            this.width = width;
-            return this;
-        }
-
-        public ScenarioGridColumnBuilder setMovable(boolean movable) {
-            isMovable = movable;
-            return this;
-        }
-
-        public ScenarioGridColumnBuilder setPlaceHolder(String placeHolder) {
-            this.placeHolder = placeHolder;
-            return this;
-        }
-
-        public ScenarioGridColumn build() {
-            List<GridColumn.HeaderMetaData> headerMetaDataList = headerBuilder.build();
-            ScenarioGridColumnRenderer actualScenarioGridColumnRenderer = scenarioGridColumnRenderer != null ? scenarioGridColumnRenderer : new ScenarioGridColumnRenderer();
-            return new ScenarioGridColumn(headerMetaDataList,
-                                          actualScenarioGridColumnRenderer,
-                                          width,
-                                          isMovable,
-                                          factoryCell,
-                                          placeHolder
-            );
-        }
-    }
-
-    /**
-     * <b>Builder</b> for <code>List&lt;GridColumn.HeaderMetaData&gt;</code>.
-     * <p>
-     * If not provided, default values are:
-     * <p>
-     * columnId: null
-     * </p>
-     * <p>
-     * columnTitle: null;
-     * </p>
-     * <p>
-     * isPropertyAssigned: <code>false</code>;
-     * </p>
-     * <p>
-     * instanceHeader: <code>false</code>;
-     * </p>
-     * </p>
-     */
-    public static class HeaderBuilder {
-
-        String columnId;
-        String columnTitle;
-        String columnGroup = "";
-        boolean readOnly = false;
-        boolean instanceHeader = false;
-        boolean propertyHeader = false;
-        HeaderBuilder nestedLevel;
-        final ScenarioHeaderTextBoxSingletonDOMElementFactory factory;
-
-        public static HeaderBuilder get(ScenarioHeaderTextBoxSingletonDOMElementFactory factory) {
-            return new HeaderBuilder(factory);
-        }
-
-        public HeaderBuilder(ScenarioHeaderTextBoxSingletonDOMElementFactory factory) {
-            this.factory = factory;
-        }
-
-        public String getColumnId() {
-            return columnId;
-        }
-
-        public HeaderBuilder setColumnId(String columnId) {
-            this.columnId = columnId;
-            return this;
-        }
-
-        public HeaderBuilder setColumnTitle(String columnTitle) {
-            this.columnTitle = columnTitle;
-            return this;
-        }
-
-        public HeaderBuilder setColumnGroup(String columnGroup) {
-            this.columnGroup = columnGroup;
-            return this;
-        }
-
-        public HeaderBuilder setReadOnly(boolean readOnly) {
-            this.readOnly = readOnly;
-            return this;
-        }
-
-        public HeaderBuilder setInstanceHeader(boolean instanceHeader) {
-            this.instanceHeader = instanceHeader;
-            return this;
-        }
-
-        public HeaderBuilder setPropertyHeader(boolean propertyHeader) {
-            this.propertyHeader = propertyHeader;
-            return this;
-        }
-
-        public HeaderBuilder newLevel() {
-            this.nestedLevel = HeaderBuilder.get(factory)
-                    .setColumnId(columnId)
-                    .setColumnTitle(columnTitle)
-                    .setColumnGroup(columnGroup)
-                    .setReadOnly(readOnly);
-            return this.nestedLevel;
-        }
-
-        public List<GridColumn.HeaderMetaData> build() {
-            List<GridColumn.HeaderMetaData> toReturn = new ArrayList<>();
-            HeaderBuilder current = this;
-            do {
-                toReturn.add(current.internalBuild());
-                current = current.nestedLevel;
-            } while (current != null);
-            return toReturn;
-        }
-
-        private GridColumn.HeaderMetaData internalBuild() {
-            return new ScenarioHeaderMetaData(columnId, columnTitle, columnGroup, factory, readOnly, instanceHeader, propertyHeader);
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationGridHeaderUtilities.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationGridHeaderUtilities.java
deleted file mode 100644
index 90a0949..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationGridHeaderUtilities.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.utils;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import com.ait.lienzo.client.core.types.Point2D;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.ExpressionElement;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.events.EnableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.models.AbstractScesimGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.util.CoordinateUtilities;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.impl.BaseGridRendererHelper;
-
-import static java.util.Collections.singletonList;
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-
-public class ScenarioSimulationGridHeaderUtilities {
-
-    /**
-     * Retrieve the  <code>ScenarioHeaderMetaData</code> from the <code>GridColumn</code> of a <code>GridWidget</code> at a given point x.
-     * It returns <code>null</code> if none is present at that position.
-     * @param gridWidget
-     * @param relativePoint within the gridWidget
-     * @return
-     */
-    public static ScenarioHeaderMetaData getColumnScenarioHeaderMetaData(GridWidget gridWidget, Point2D relativePoint) {
-        final GridColumn<?> column = getGridColumn(gridWidget, relativePoint.getX());
-        if (column == null) {
-            return null;
-        }
-        //Get row index
-        final Integer uiHeaderRowIndex = CoordinateUtilities.getUiHeaderRowIndex(gridWidget,
-                                                                                 relativePoint);
-        if (uiHeaderRowIndex == null) {
-            return null;
-        }
-        return (ScenarioHeaderMetaData) column.getHeaderMetaData().get(uiHeaderRowIndex);
-    }
-
-    /**
-     * Retrieve the <code>ScenarioHeaderMetaData</code> from the <code>GridColumn</code> corresponding to given row.
-     * It returns <code>null</code> row with given index doesn't exist.
-     * @param scenarioGridColumn
-     * @param uiRowIndex
-     * @return
-     */
-    public static ScenarioHeaderMetaData getColumnScenarioHeaderMetaData(final ScenarioGridColumn scenarioGridColumn,
-                                                                         final int uiRowIndex) {
-        if (scenarioGridColumn.getHeaderMetaData().size() > uiRowIndex) {
-            return (ScenarioHeaderMetaData) scenarioGridColumn.getHeaderMetaData().get(uiRowIndex);
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve the <code>GridColumn</code> of a <code>GridWidget</code> at a given point x.
-     * It returns <code>null</code> if none is present at that position.
-     * @param gridWidget
-     * @param cx
-     * @return
-     */
-    public static GridColumn<?> getGridColumn(GridWidget gridWidget, double cx) {
-        //Get column information
-        final BaseGridRendererHelper rendererHelper = gridWidget.getRendererHelper();
-        final BaseGridRendererHelper.RenderingInformation ri = rendererHelper.getRenderingInformation();
-        if (ri == null) {
-            return null;
-        }
-        final BaseGridRendererHelper.ColumnInformation ci = rendererHelper.getColumnInformation(cx);
-        return ci.getColumn();
-    }
-
-    /**
-     * Checks whether the edit mode can be invoked on header cell from given column on given row.
-     * @param column
-     * @param uiHeaderRowIndex
-     * @return true if conditions are met, false otherwise
-     */
-    public static boolean isEditableHeader(final ScenarioGridColumn column,
-                                           final Integer uiHeaderRowIndex) {
-        final GridColumn.HeaderMetaData headerMetaData = column.getHeaderMetaData().get(uiHeaderRowIndex);
-        if (!(headerMetaData instanceof ScenarioHeaderMetaData)) {
-            throw new IllegalStateException("Header metadata has to be an instance of ScenarioHeaderMetaData");
-        }
-
-        final ScenarioHeaderMetaData scenarioHeaderMetaData = (ScenarioHeaderMetaData) headerMetaData;
-        if (scenarioHeaderMetaData.isEditingMode() || scenarioHeaderMetaData.isReadOnly()) {
-            return false;
-        }
-
-        if (!column.isInstanceAssigned() || !column.isEditableHeaders()) {
-            return false;
-        }
-
-        return scenarioHeaderMetaData.isInstanceHeader() || (scenarioHeaderMetaData.isPropertyHeader() && column.isPropertyAssigned());
-    }
-
-    public static EnableTestToolsEvent getEnableTestToolsEvent(final ScenarioGrid scenarioGrid,
-                                                               final ScenarioGridColumn scenarioGridColumn,
-                                                               final ScenarioHeaderMetaData clickedScenarioHeaderMetadata,
-                                                               final Integer uiColumnIndex,
-                                                               final String columnGroup) {
-        if (!scenarioGridColumn.isInstanceAssigned()) {
-            String complexSearch = getExistingInstances(columnGroup,
-                                                        scenarioGrid.getType(),
-                                                        scenarioGrid.getModel().getColumns());
-            return new EnableTestToolsEvent(complexSearch, true);
-        } else if (Objects.equals(clickedScenarioHeaderMetadata.getMetadataType(), ScenarioHeaderMetaData.MetadataType.PROPERTY)) {
-            List<String> propertyNameElements = null;
-            if (scenarioGridColumn.isPropertyAssigned()) {
-                propertyNameElements = getPropertyNameElements(scenarioGrid.getModel(), uiColumnIndex);
-            }
-            return propertyNameElements != null ? new EnableTestToolsEvent(scenarioGridColumn.getInformationHeaderMetaData()
-                                                                                   .getTitle(), propertyNameElements) : new EnableTestToolsEvent(scenarioGridColumn.getInformationHeaderMetaData().getTitle());
-        } else {
-            return new EnableTestToolsEvent(scenarioGridColumn.getInformationHeaderMetaData().getTitle(), false);
-        }
-    }
-
-    public static String getExistingInstances(final String group,
-                                              final ScenarioSimulationModel.Type scenarioType,
-                                              final List<GridColumn<?>> columns) {
-        final boolean isDMN = ScenarioSimulationModel.Type.DMN.equals(scenarioType);
-        return String.join(";", columns
-                .stream()
-                .map(column -> (ScenarioGridColumn) column)
-                .filter(scenarioGridColumn -> {
-                    GridColumn.HeaderMetaData m = scenarioGridColumn.getInformationHeaderMetaData();
-                    String columnGroup = ScenarioSimulationUtils.getOriginalColumnGroup(group);
-                    return isDMN || columnGroup.equals(m.getColumnGroup());
-                })
-                .map(scenarioGridColumn -> scenarioGridColumn.getInformationHeaderMetaData().getTitle())
-                .collect(Collectors.toSet()));
-    }
-
-    public static List<String> getPropertyNameElements(final AbstractScesimGridModel abstractScesimGridModel, final int columnIndex) {
-        final Optional<AbstractScesimModel> optionalScesimModel = abstractScesimGridModel.getAbstractScesimModel();
-        return optionalScesimModel.map(abstractScesimModel -> {
-            final FactMapping factMapping = abstractScesimModel.getScesimModelDescriptor().getFactMappingByIndex(columnIndex);
-            if (FactMappingValueType.EXPRESSION.equals(factMapping.getFactMappingValueType())) {
-                return singletonList(ConstantHolder.EXPRESSION);
-            }
-            if (abstractScesimGridModel.isSimpleType(factMapping.getFactAlias()) &&
-                    FactMappingValueType.NOT_EXPRESSION.equals(factMapping.getFactMappingValueType())) {
-                return singletonList(VALUE);
-            }
-            return Collections.unmodifiableList(abstractScesimModel.getScesimModelDescriptor().getFactMappingByIndex(columnIndex).getExpressionElementsWithoutClass()
-                                                        .stream()
-                                                        .map(ExpressionElement::getStep)
-                                                        .collect(Collectors.toList()));
-        }).orElse(null);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationUtils.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationUtils.java
deleted file mode 100644
index 832bb7e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationUtils.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import com.ait.lienzo.client.core.types.Point2D;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.editor.strategies.SimpleClassEntry;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.util.CellContextUtilities;
-import org.uberfire.ext.wires.core.grids.client.widget.context.GridBodyCellEditContext;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.impl.BaseGridRendererHelper;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-
-import static org.drools.workbench.screens.scenariosimulation.client.editor.strategies.DataManagementStrategy.SIMPLE_CLASSES_MAP;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.DMN_DATE;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.LOCALDATETIME_CANONICAL_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.LOCALDATE_CANONICAL_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.LOCALTIME_CANONICAL_NAME;
-
-public class ScenarioSimulationUtils {
-
-    protected static AtomicInteger subGroupCounter = new AtomicInteger(0);
-
-    private ScenarioSimulationUtils() {
-        // Not instantiable
-    }
-
-    /**
-     * Given a columnGroup, it creates a new subGroup with the following format: 'columnGroupName-x'.
-     * @param columnGroup
-     * @return
-     */
-    public static String getColumnSubGroup(String columnGroup) {
-        return columnGroup + "-" + subGroupCounter.getAndIncrement();
-    }
-
-    /**
-     * Given a columnGroup, it returns the original group name, removing the the subgroup part (added in
-     * <code>getColumnSubGroup</code> with the following format: 'columnGroupName-x'
-     * @param columnGroup
-     * @return
-     */
-    public static String getOriginalColumnGroup(String columnGroup) {
-        return columnGroup.contains("-") ? columnGroup.substring(0, columnGroup.indexOf('-')) : columnGroup;
-    }
-
-    /**
-     * This method can be used <b>ONLY</b> when managing a <b>RULE</b> type Test Scenario.
-     * @param className
-     * @return
-     */
-    public static boolean isSimpleJavaType(String className) {
-        return SIMPLE_CLASSES_MAP.values()
-                .stream()
-                .map(SimpleClassEntry::getCanonicalName)
-                .anyMatch(className::equals);
-    }
-
-    /**
-     * It provides the correct <b>PlaceHolder</b> value to be assigned to an empty cell given its parameters
-     * status.
-     * @param isInstanceAssigned
-     * @param isPropertyAssigned
-     * @param valueType
-     * @param className
-     * @return
-     */
-    public static String getPlaceHolder(final boolean isInstanceAssigned,
-                                        final boolean isPropertyAssigned,
-                                        final FactMappingValueType valueType,
-                                        final String className) {
-        if (!isInstanceAssigned) {
-            return ScenarioSimulationEditorConstants.INSTANCE.defineValidType();
-        }
-        if (isPropertyAssigned) {
-            if (Objects.equals(FactMappingValueType.EXPRESSION, valueType)) {
-                return ScenarioSimulationEditorConstants.INSTANCE.insertExpression();
-            }
-            if (Objects.equals(LOCALDATE_CANONICAL_NAME, className)) {
-                return ScenarioSimulationEditorConstants.INSTANCE.dateFormatPlaceholder();
-            }
-            if (Objects.equals(LOCALDATETIME_CANONICAL_NAME, className)) {
-                return ScenarioSimulationEditorConstants.INSTANCE.dateTimeFormatPlaceholder();
-            }
-            if (Objects.equals(LOCALTIME_CANONICAL_NAME, className)) {
-                return ScenarioSimulationEditorConstants.INSTANCE.timeFormatPlaceholder();
-            }
-            if (Objects.equals(DMN_DATE, className)) {
-                return ScenarioSimulationEditorConstants.INSTANCE.dmnDateFormatPlaceholder();
-            }
-            return ScenarioSimulationEditorConstants.INSTANCE.insertValue();
-        }
-        return ScenarioSimulationEditorConstants.INSTANCE.defineValidType();
-    }
-
-    /**
-     * Method to retrieve a <b>new</b> <code>List</code> of <b>property name elements</b> where the first one is the
-     * the <b>actual</b> class name (i.e. an eventual <i>alias</i> get replaced)
-     * @param propertyNameElements
-     * @param factIdentifier
-     * @return
-     */
-    public static List<String> getPropertyNameElementsWithoutAlias(List<String> propertyNameElements,
-                                                                   FactIdentifier factIdentifier,
-                                                                   ScenarioSimulationModel.Type type) {
-        String actualClassName = ScenarioSimulationModel.Type.DMN.equals(type) ?
-                factIdentifier.getClassName() :
-                factIdentifier.getClassNameWithoutPackage().replace("$", ".");
-        List<String> toReturn = new ArrayList<>(); // We have to keep the original List unmodified
-        toReturn.addAll(propertyNameElements);
-        if (toReturn.size() > 1) {
-            toReturn.set(0, actualClassName);
-        }
-        return toReturn;
-    }
-
-    /**
-     * Returns a <code>ScenarioGridColumn</code> with the following default values:
-     * <p>
-     * width: 150
-     * </p>
-     * <p>
-     * isMovable: <code>false</code>;
-     * </p>
-     * <p>
-     * isPropertyAssigned: <code>false</code>;
-     * </p>
-     * <p>
-     * columnRenderer: new ScenarioGridColumnRenderer()
-     * </p>
-     * @param instanceTitle
-     * @param propertyTitle
-     * @param columnId
-     * @param columnGroup
-     * @param factMappingType
-     * @param factoryHeader
-     * @param factoryCell
-     * @param placeHolder
-     * @return
-     */
-    public static ScenarioGridColumn getScenarioGridColumn(String instanceTitle,
-                                                           String propertyTitle,
-                                                           String columnId,
-                                                           String columnGroup,
-                                                           FactMappingType factMappingType,
-                                                           ScenarioHeaderTextBoxSingletonDOMElementFactory factoryHeader,
-                                                           ScenarioCellTextAreaSingletonDOMElementFactory factoryCell,
-                                                           String placeHolder) {
-        ScenarioSimulationBuilders.HeaderBuilder headerBuilder = getHeaderBuilder(instanceTitle, propertyTitle, columnId, columnGroup, factMappingType, factoryHeader);
-        return getScenarioGridColumn(headerBuilder, factoryCell, placeHolder);
-    }
-
-    /**
-     * Returns a <code>ScenarioGridColumn</code> with the following default values:
-     * <p>
-     * width: 150
-     * </p>
-     * <p>
-     * isMovable: <code>false</code>;
-     * </p>
-     * <p>
-     * columnRenderer: new ScenarioGridColumnRenderer()
-     * </p>
-     * @param headerBuilder
-     * @param factoryCell
-     * @param placeHolder
-     * @return
-     */
-    public static ScenarioGridColumn getScenarioGridColumn(ScenarioSimulationBuilders.HeaderBuilder headerBuilder,
-                                                           ScenarioCellTextAreaSingletonDOMElementFactory factoryCell,
-                                                           String placeHolder) {
-        ScenarioSimulationBuilders.ScenarioGridColumnBuilder scenarioGridColumnBuilder = getScenarioGridColumnBuilder(factoryCell,
-                                                                                                                      headerBuilder,
-                                                                                                                      placeHolder);
-        return scenarioGridColumnBuilder.build();
-    }
-
-    /**
-     * Returns a <code>ScenarioSimulationBuilders.ScenarioGridColumnBuilder</code> with the following default values:
-     * <p>
-     * width: 150
-     * </p>
-     * <p>
-     * isMovable: <code>false</code>;
-     * </p>
-     * <p>
-     * isPropertyAssigned: <code>false</code>;
-     * </p>
-     * <p>
-     * columnRenderer: new ScenarioGridColumnRenderer()
-     * </p>
-     * @param factoryCell
-     * @param headerBuilder
-     * @param placeHolder
-     * @return
-     */
-    public static ScenarioSimulationBuilders.ScenarioGridColumnBuilder getScenarioGridColumnBuilder(ScenarioCellTextAreaSingletonDOMElementFactory factoryCell,
-                                                                                                    ScenarioSimulationBuilders.HeaderBuilder headerBuilder,
-                                                                                                    String placeHolder) {
-        ScenarioSimulationBuilders.ScenarioGridColumnBuilder toReturn = ScenarioSimulationBuilders.ScenarioGridColumnBuilder.get(factoryCell, headerBuilder);
-        toReturn.setPlaceHolder(placeHolder);
-        toReturn.setWidth(getColumnWidth(headerBuilder.getColumnId()));
-        return toReturn;
-    }
-
-    /**
-     * Retrieve a <b>single</b> or <b>triple</b> level Header metadata, i.e. a <code>List&lt;GridColumn.HeaderMetaData&gt;</code> with one  or three elements,
-     * depending on the column <b>Group</b>:
-     * <p>
-     * OTHER: single level
-     * </p>
-     * <p>
-     * EXPECT/GIVEN: triple level
-     * </p>
-     * @param instanceTitle
-     * @param propertyTitle
-     * @param columnId
-     * @param columnGroup
-     * @param factMappingType
-     * @param factoryHeader
-     * @return
-     */
-    public static ScenarioSimulationBuilders.HeaderBuilder getHeaderBuilder(String instanceTitle,
-                                                                            String propertyTitle,
-                                                                            String columnId,
-                                                                            String columnGroup,
-                                                                            FactMappingType factMappingType,
-                                                                            ScenarioHeaderTextBoxSingletonDOMElementFactory factoryHeader) {
-
-        ScenarioSimulationBuilders.HeaderBuilder headerBuilder = ScenarioSimulationBuilders.HeaderBuilder.get(factoryHeader);
-
-        headerBuilder.setColumnId(columnId);
-        headerBuilder.setColumnGroup(columnGroup);
-        headerBuilder.setColumnTitle(columnGroup);
-        headerBuilder.setReadOnly(true);
-
-        if (isOther(factMappingType)) {
-            headerBuilder.setColumnTitle(instanceTitle);
-            headerBuilder.setColumnGroup(columnGroup);
-            headerBuilder.setInstanceHeader(true);
-            return headerBuilder;
-        }
-
-        // The "instance" header
-        final ScenarioSimulationBuilders.HeaderBuilder instanceHeader = headerBuilder.newLevel()
-                .setColumnTitle(instanceTitle)
-                .setColumnGroup(columnGroup)
-                .setReadOnly(false)
-                .setInstanceHeader(true)
-                .setPropertyHeader(false);
-
-        // The "property" header
-        instanceHeader.newLevel()
-                .setColumnTitle(propertyTitle)
-                .setColumnGroup(getColumnSubGroup(columnGroup))
-                .setReadOnly(false)
-                .setInstanceHeader(false)
-                .setPropertyHeader(true);
-
-        return headerBuilder;
-    }
-
-    /**
-     * Returns an array where the 0-element is middle x of given cell and 1-element is middle y
-     * @param gridWidget
-     * @param column
-     * @param isHeader
-     * @param uiRowIndex
-     * @param gridLayer
-     * @return
-     */
-    public static Point2D getMiddleXYCell(final GridWidget gridWidget, final GridColumn<?> column, boolean isHeader, final int uiRowIndex, final GridLayer gridLayer) {
-        final BaseGridRendererHelper rendererHelper = gridWidget.getRendererHelper();
-        final BaseGridRendererHelper.RenderingInformation ri = rendererHelper.getRenderingInformation();
-        final double columnXCoordinate = rendererHelper.getColumnOffset(column) + column.getWidth() / 2;
-        final BaseGridRendererHelper.ColumnInformation ci = rendererHelper.getColumnInformation(columnXCoordinate);
-
-        final GridBodyCellEditContext context = isHeader ?
-                CellContextUtilities.makeHeaderCellRenderContext(gridWidget,
-                                                                 ri,
-                                                                 ci,
-                                                                 uiRowIndex)
-                : CellContextUtilities.makeCellRenderContext(gridWidget,
-                                                             ri,
-                                                             ci,
-                                                             uiRowIndex);
-        final int cellXMiddle = (int) (context.getAbsoluteCellX() +
-                context.getCellWidth() / 2 +
-                gridLayer.getDomElementContainer().getAbsoluteLeft());
-        final int cellYMiddle = (int) (context.getAbsoluteCellY() +
-                context.getCellHeight() / 2 +
-                gridLayer.getDomElementContainer().getAbsoluteTop());
-        return new Point2D(cellXMiddle, cellYMiddle);
-    }
-
-    public static int getCellHeight(final GridWidget gridWidget, final GridColumn<?> column, boolean isHeader, final int uiRowIndex) {
-        final BaseGridRendererHelper rendererHelper = gridWidget.getRendererHelper();
-        final BaseGridRendererHelper.RenderingInformation ri = rendererHelper.getRenderingInformation();
-        final double columnXCoordinate = rendererHelper.getColumnOffset(column) + column.getWidth() / 2;
-        final BaseGridRendererHelper.ColumnInformation ci = rendererHelper.getColumnInformation(columnXCoordinate);
-        final GridBodyCellEditContext context = isHeader ?
-                CellContextUtilities.makeHeaderCellRenderContext(gridWidget,
-                                                                 ri,
-                                                                 ci,
-                                                                 uiRowIndex)
-                : CellContextUtilities.makeCellRenderContext(gridWidget,
-                                                             ri,
-                                                             ci,
-                                                             uiRowIndex);
-        return (int) context.getCellHeight();
-    }
-
-    protected static double getColumnWidth(String columnId) {
-        ExpressionIdentifier.NAME expressionName = ExpressionIdentifier.NAME.Other;
-        try {
-            expressionName = ExpressionIdentifier.NAME.valueOf(columnId);
-        } catch (IllegalArgumentException e) {
-            // ColumnId not recognized
-        }
-        switch (expressionName) {
-            case Index:
-                return 70;
-            case Description:
-                return 300;
-            default:
-                return 114;
-        }
-    }
-
-    private static boolean isOther(FactMappingType factMappingType) {
-        return FactMappingType.OTHER.equals(factMappingType);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ViewsProvider.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ViewsProvider.java
deleted file mode 100644
index b86df6e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ViewsProvider.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.utils;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.CollectionView;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.ItemElementView;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.KeyValueElementView;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.PropertyView;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.editingbox.ItemEditingBox;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.editingbox.KeyValueEditingBox;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.MenuItemView;
-import org.drools.workbench.screens.scenariosimulation.client.popup.FileUploadPopup;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.FieldItemView;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.ListGroupItemView;
-import org.jboss.errai.ioc.client.api.ManagedInstance;
-
-/**
- * Class used as Provider for <i>Views</i> that has to be dynamically created
- */
-@ApplicationScoped
-public class ViewsProvider {
-
-    @Inject
-    private ManagedInstance<MenuItemView> menuItemViewInstance;
-
-    @Inject
-    private ManagedInstance<FieldItemView> fieldItemViewInstance;
-
-    @Inject
-    private ManagedInstance<ListGroupItemView> listGroupItemViewInstance;
-
-    @Inject
-    private ManagedInstance<CollectionView> collectionViewInstance;
-
-    @Inject
-    private ManagedInstance<ItemElementView> listElementViewInstance;
-
-    @Inject
-    private ManagedInstance<KeyValueElementView> keyValueElementViewInstance;
-
-    @Inject
-    private ManagedInstance<PropertyView> propertyViewInstance;
-
-    @Inject
-    private ManagedInstance<ItemEditingBox> listEditingBoxInstance;
-
-    @Inject
-    private ManagedInstance<KeyValueEditingBox> mapEditingBoxInstance;
-
-    @Inject
-    private ManagedInstance<FileUploadPopup> fileUploadPopupInstance;
-
-    public MenuItemView getMenuItemView() {
-        return menuItemViewInstance.get();
-    }
-
-    public FieldItemView getFieldItemView() {
-        return fieldItemViewInstance.get();
-    }
-
-    public ListGroupItemView getListGroupItemView() {
-        return listGroupItemViewInstance.get();
-    }
-
-    public CollectionView getCollectionEditorView() {
-        return collectionViewInstance.get();
-    }
-
-    public ItemElementView getListEditorElementView() {
-        return listElementViewInstance.get();
-    }
-
-    public KeyValueElementView getKeyValueElementView() {
-        return keyValueElementViewInstance.get();
-    }
-
-    public PropertyView getPropertyEditorView() {
-        return propertyViewInstance.get();
-    }
-
-    public ItemEditingBox getItemEditingBox() {
-        return listEditingBoxInstance.get();
-    }
-
-    public KeyValueEditingBox getKeyValueEditingBox() {
-        return mapEditingBoxInstance.get();
-    }
-
-    public FileUploadPopup getFileUploadPopup() {
-        return fileUploadPopupInstance.get();
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/values/ScenarioGridCellValue.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/values/ScenarioGridCellValue.java
deleted file mode 100644
index 9cdf6cf..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/values/ScenarioGridCellValue.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.values;
-
-import org.uberfire.ext.wires.core.grids.client.model.impl.BaseGridCellValue;
-
-public class ScenarioGridCellValue extends BaseGridCellValue<String> {
-
-    public ScenarioGridCellValue(String value) {
-        super(value);
-    }
-
-    public ScenarioGridCellValue(String value, String placeHolder) {
-        super(value, placeHolder);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGrid.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGrid.java
deleted file mode 100644
index c68a7df..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGrid.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.widgets;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.IntStream;
-
-import com.ait.lienzo.shared.core.types.EventPropagationMode;
-import com.google.gwt.event.shared.EventBus;
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.DisableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.EnableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ReloadTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationGridWidgetMouseEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.menu.ScenarioContextMenuRegistry;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.models.AbstractScesimGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.renderers.ScenarioGridRenderer;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationBuilders;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationGridHeaderUtilities;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn.ColumnWidthMode;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-import org.uberfire.ext.wires.core.grids.client.util.ColumnIndexUtilities;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.single.impl.BaseSingletonDOMElementFactory;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.NodeMouseEventHandler;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.BaseGridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.DefaultGridWidgetCellSelectorMouseEventHandler;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.selections.SelectionExtension;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridSelectionManager;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.pinning.GridPinnedModeManager;
-
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils.isSimpleJavaType;
-
-public class ScenarioGrid extends BaseGridWidget {
-
-    private ScenarioContextMenuRegistry scenarioContextMenuRegistry;
-    private ScenarioSimulationContext scenarioSimulationContext;
-    private EventBus eventBus;
-    private ScenarioSimulationModel.Type type;
-    private int defaultSelectedDataCellX = 0;
-    private int defaultSelectedDataCellY = 0;
-
-    public ScenarioGrid(AbstractScesimGridModel model,
-                        ScenarioGridLayer scenarioGridLayer,
-                        ScenarioGridRenderer renderer,
-                        ScenarioContextMenuRegistry scenarioContextMenuRegistry) {
-        super(model, scenarioGridLayer, scenarioGridLayer, renderer);
-        this.scenarioContextMenuRegistry = scenarioContextMenuRegistry;
-        setDraggable(false);
-        setEventPropagationMode(EventPropagationMode.NO_ANCESTORS);
-    }
-
-    public void setContent(AbstractScesimModel abstractScesimModel, ScenarioSimulationModel.Type type) {
-        this.type = type;
-        ((AbstractScesimGridModel) model).clear();
-        ((AbstractScesimGridModel) model).bindContent(abstractScesimModel);
-        setHeaderColumns(abstractScesimModel, type);
-        appendRows(abstractScesimModel);
-        ((AbstractScesimGridModel) model).loadFactMappingsWidth();
-        ((AbstractScesimGridModel) model).forceRefreshWidth();
-    }
-
-    public GridWidget getGridWidget() {
-        return ((AbstractScesimGridModel) model).getGridWidget();
-    }
-
-    public EventBus getEventBus() {
-        return eventBus;
-    }
-
-    public void setEventBus(EventBus eventBus) {
-        this.eventBus = eventBus;
-        ((AbstractScesimGridModel) model).setEventBus(eventBus);
-        scenarioContextMenuRegistry.setEventBus(eventBus);
-    }
-
-    public void setDefaultSelectedDataCell(int cellX, int cellY) {
-        defaultSelectedDataCellX = cellX;
-        defaultSelectedDataCellY = cellY;
-    }
-
-    public ScenarioSimulationContext getScenarioSimulationContext() {
-        return scenarioSimulationContext;
-    }
-
-    public void setScenarioSimulationContext(ScenarioSimulationContext scenarioSimulationContext) {
-        this.scenarioSimulationContext = scenarioSimulationContext;
-    }
-
-    @Override
-    public AbstractScesimGridModel getModel() {
-        return (AbstractScesimGridModel) model;
-    }
-
-    public ScenarioSimulationModel.Type getType() {
-        return type;
-    }
-
-    protected void setType(ScenarioSimulationModel.Type type) {
-        this.type = type;
-    }
-
-    /**
-     * Unselect all cells/columns from model {@see GridData.clearSelections()}
-     */
-    public void clearSelections() {
-        model.clearSelections();
-        getLayer().batch();
-    }
-
-    /**
-     * Set the current <b>selectedColumn</b> given its columnIndex
-     * @param columnIndex
-     */
-    public void setSelectedColumn(int columnIndex) {
-        ((AbstractScesimGridModel) model).selectColumn(columnIndex);
-    }
-
-    /**
-     * Set the <b>selectedColumn</b> status of the model and select the header cell actually clicked
-     * This should be used when header cells selection is NOT handled natively by the extended widget
-     * @param columnIndex
-     */
-    public void setSelectedColumnAndHeader(int headerRowIndex, int columnIndex) {
-        selectHeaderCell(headerRowIndex, columnIndex, false, false);
-        setSelectedColumn(columnIndex);
-        getLayer().batch();
-    }
-
-    /**
-     * It focus the current selected header cells group
-     */
-    public void selectCurrentHeaderCellGroup() {
-        if (!model.getSelectedHeaderCells().isEmpty()) {
-            int rowIndex = model.getSelectedHeaderCells().get(0).getRowIndex();
-            int columnIndex = ColumnIndexUtilities.findUiColumnIndex(model.getColumns(),
-                                                                     model.getSelectedHeaderCells().get(0).getColumnIndex());
-            setSelectedColumnAndHeader(rowIndex, columnIndex);
-        }
-    }
-
-    /**
-     * It ensures there is a selected cell (can be Header / Data cell) in the grid. If not, it selects the one defined
-     * in <code>defaultSelectedDataCellX</code> and <code>defaultSelectedDataCellY</code> fields.
-     */
-    public void ensureCellIsSelected() {
-        /* If model is empty, data are not available / loaded, do nothing */
-        if (model.getColumnCount() == 0) {
-            return;
-        }
-        /* If there isn't a selected cell (Header nor data) it selected the default one */
-        if (model.getSelectedCells().isEmpty() && model.getSelectedHeaderCells().isEmpty()) {
-            selectCell(defaultSelectedDataCellY, defaultSelectedDataCellX, false, false);
-            getLayer().batch();
-        }
-        signalTestTools();
-    }
-
-    /**
-     * Select body cell on the model
-     * @param columnIndex
-     */
-    public void setSelectedCell(int rowIndex, int columnIndex) {
-        selectCell(rowIndex, columnIndex, false, false);
-        getLayer().batch();
-    }
-
-    @Override
-    protected List<NodeMouseEventHandler> getNodeMouseClickEventHandlers(final GridSelectionManager selectionManager) {
-        final List<NodeMouseEventHandler> handlers = new ArrayList<>();
-        handlers.add(new DefaultGridWidgetCellSelectorMouseEventHandler(selectionManager));
-        return handlers;
-    }
-
-    @Override
-    protected List<NodeMouseEventHandler> getNodeMouseDoubleClickEventHandlers(final GridSelectionManager selectionManager,
-                                                                               final GridPinnedModeManager pinnedModeManager) {
-        final List<NodeMouseEventHandler> handlers = new ArrayList<>();
-        handlers.add(new ScenarioSimulationGridWidgetMouseEventHandler());
-        return handlers;
-    }
-
-    protected void setHeaderColumns(AbstractScesimModel abstractScesimModel, ScenarioSimulationModel.Type type) {
-        final List<FactMapping> factMappings = abstractScesimModel.getScesimModelDescriptor().getUnmodifiableFactMappings();
-        boolean editableHeaders = !(ScenarioSimulationModel.Type.DMN.equals(type) || (abstractScesimModel instanceof Background));
-        IntStream.range(0, factMappings.size())
-                .forEach(columnIndex -> setHeaderColumn(columnIndex, factMappings.get(columnIndex), editableHeaders));
-    }
-
-    protected void setHeaderColumn(int columnIndex, FactMapping factMapping, boolean editableHeaders) {
-        final FactIdentifier factIdentifier = factMapping.getFactIdentifier();
-        String columnId = factMapping.getExpressionIdentifier().getName();
-        String instanceTitle = factMapping.getFactAlias();
-        String propertyTitle = factMapping.getExpressionAlias();
-        String columnGroup = factMapping.getExpressionIdentifier().getType().name();
-        boolean isInstanceAssigned = isInstanceAssigned(factIdentifier);
-        boolean isPropertyAssigned = isPropertyAssigned(isInstanceAssigned, factMapping);
-        String placeHolder = getPlaceHolder(isInstanceAssigned,
-                                            isPropertyAssigned,
-                                            factMapping.getFactMappingValueType(),
-                                            factMapping.getClassName());
-        ScenarioGridColumn scenarioGridColumn = getScenarioGridColumnLocal(instanceTitle, propertyTitle, columnId, columnGroup, factMapping.getExpressionIdentifier().getType(), placeHolder);
-        scenarioGridColumn.setInstanceAssigned(isInstanceAssigned);
-        scenarioGridColumn.setPropertyAssigned(isPropertyAssigned);
-        scenarioGridColumn.setFactIdentifier(factIdentifier);
-        scenarioGridColumn.setEditableHeaders(editableHeaders);
-        if (FactMappingType.OTHER.equals(factMapping.getExpressionIdentifier().getType())) {
-            scenarioGridColumn.setColumnWidthMode(ColumnWidthMode.FIXED);
-            scenarioGridColumn.setMinimumWidth(scenarioGridColumn.getWidth());
-        }
-        if (isPropertyAssigned) {
-            BaseSingletonDOMElementFactory factory = ((AbstractScesimGridModel) model).getDOMElementFactory(
-                    factMapping.getClassName(),
-                    type,
-                    factMapping.getFactMappingValueType());
-            scenarioGridColumn.setFactory(factory);
-        }
-        ((AbstractScesimGridModel) model).insertColumnGridOnly(columnIndex, scenarioGridColumn);
-    }
-
-    /**
-     * Returns <code>true</code> when
-     * <p>
-     * factIdentifier == FactIdentifier.DESCRIPTION
-     * </p><p>
-     * <b>or</b>
-     * <p>
-     * factIdentifier != FactIdentifier.EMPTY
-     * </p><p>
-     * <b>and</b>
-     * </p><p>
-     * factIdentifier != FactIdentifier.INDEX
-     * </p><p>
-     * @param factIdentifier
-     * @return
-     */
-    protected boolean isInstanceAssigned(FactIdentifier factIdentifier) {
-        if (FactIdentifier.DESCRIPTION.equals(factIdentifier)) {
-            return true;
-        } else {
-            return !(FactIdentifier.EMPTY.equals(factIdentifier) || FactIdentifier.INDEX.equals(factIdentifier));
-        }
-    }
-
-    /**
-     * Returns <code>true</code> when
-     * <p>
-     * instanceAssigned == true
-     * </p><p>
-     * <b>and</b>
-     * </p><p>
-     * !factMapping.getExpressionElements().isEmpty()
-     * </p>
-     * @param instanceAssigned
-     * @param factMapping
-     * @return
-     */
-    protected boolean isPropertyAssigned(boolean instanceAssigned, FactMapping factMapping) {
-        if (FactIdentifier.DESCRIPTION.equals(factMapping.getFactIdentifier())) {
-            return true;
-        } else {
-            return instanceAssigned && (isSimpleJavaType(factMapping.getClassName()) || !factMapping.getExpressionElements().isEmpty());
-        }
-    }
-
-    protected ScenarioGridColumn getScenarioGridColumnLocal(String instanceTitle, String propertyTitle, String
-            columnId, String columnGroup, FactMappingType factMappingType, String placeHolder) {
-        ScenarioSimulationBuilders.HeaderBuilder headerBuilder = getHeaderBuilderLocal(instanceTitle, propertyTitle, columnId, columnGroup, factMappingType);
-        return getScenarioGridColumnLocal(headerBuilder, placeHolder);
-    }
-
-    protected ScenarioGridColumn getScenarioGridColumnLocal(ScenarioSimulationBuilders.HeaderBuilder headerBuilder, String placeHolder) {
-        return ScenarioSimulationUtils.getScenarioGridColumn(headerBuilder, ((AbstractScesimGridModel) model).getScenarioCellTextAreaSingletonDOMElementFactory(), placeHolder);
-    }
-
-    protected ScenarioSimulationBuilders.HeaderBuilder getHeaderBuilderLocal(String instanceTitle, String
-            propertyTitle, String columnId, String columnGroup, FactMappingType factMappingType) {
-        return ScenarioSimulationUtils.getHeaderBuilder(instanceTitle, propertyTitle, columnId, columnGroup, factMappingType, ((AbstractScesimGridModel) model).getScenarioHeaderTextBoxSingletonDOMElementFactory());
-    }
-
-    protected <T extends AbstractScesimData> void appendRows(AbstractScesimModel<T> abstractScesimModel) {
-        List<T> scesimData = abstractScesimModel.getUnmodifiableData();
-        IntStream.range(0, scesimData.size()).forEach(rowIndex -> appendRow(rowIndex, scesimData.get(rowIndex)));
-    }
-
-    protected <T extends AbstractScesimData> void appendRow(int rowIndex, T scesimData) {
-        ((AbstractScesimGridModel) model).insertRowGridOnly(rowIndex, new ScenarioGridRow(), scesimData);
-    }
-
-    @Override
-    public boolean adjustSelection(final SelectionExtension direction, final boolean isShiftKeyDown) {
-        final boolean selectionChanged = super.adjustSelection(direction, isShiftKeyDown);
-
-        signalTestTools();
-        scenarioContextMenuRegistry.hideMenus();
-        scenarioContextMenuRegistry.hideErrorReportPopover();
-
-        return selectionChanged;
-    }
-
-    protected void signalTestTools() {
-        eventBus.fireEvent(new DisableTestToolsEvent());
-
-        if (!model.getSelectedHeaderCells().isEmpty()) {
-            final GridData.SelectedCell cell = model.getSelectedHeaderCells().get(0);
-
-            final int uiColumnIndex = ColumnIndexUtilities.findUiColumnIndex(model.getColumns(),
-                                                                             cell.getColumnIndex());
-            final int uiRowIndex = cell.getRowIndex();
-
-            setSelectedColumn(uiColumnIndex);
-
-            final GridColumn column = model.getColumns().get(uiColumnIndex);
-            if (uiRowIndex > 0 && column instanceof ScenarioGridColumn) {
-                signalTestToolsHeaderCellSelected((ScenarioGridColumn) column,
-                                                  cell,
-                                                  uiColumnIndex);
-            }
-        }
-    }
-
-    protected void signalTestToolsHeaderCellSelected(final ScenarioGridColumn scenarioGridColumn,
-                                                     final GridData.SelectedCell selectedHeaderCell,
-                                                     final int uiColumnIndex) {
-        final ScenarioHeaderMetaData scenarioHeaderMetaData = getColumnScenarioHeaderMetaData(scenarioGridColumn,
-                                                                                              selectedHeaderCell.getRowIndex());
-        if (scenarioGridColumn.isInstanceAssigned() && scenarioHeaderMetaData.getMetadataType().equals(ScenarioHeaderMetaData.MetadataType.INSTANCE)) {
-            eventBus.fireEvent(new ReloadTestToolsEvent(true, true));
-        } else {
-            String group = ScenarioSimulationUtils.getOriginalColumnGroup(scenarioHeaderMetaData.getColumnGroup());
-            final EnableTestToolsEvent enableTestToolsEvent = getEnableTestToolsEvent(this,
-                                                                                      scenarioGridColumn,
-                                                                                      scenarioHeaderMetaData,
-                                                                                      uiColumnIndex,
-                                                                                      group);
-            eventBus.fireEvent(enableTestToolsEvent);
-        }
-    }
-
-    //Indirection for tests
-    protected ScenarioHeaderMetaData getColumnScenarioHeaderMetaData(final ScenarioGridColumn scenarioGridColumn,
-                                                                     final int rowIndex) {
-        return ScenarioSimulationGridHeaderUtilities.getColumnScenarioHeaderMetaData(scenarioGridColumn, rowIndex);
-    }
-
-    //Indirection for tests
-    protected EnableTestToolsEvent getEnableTestToolsEvent(final ScenarioGrid scenarioGrid,
-                                                           final ScenarioGridColumn scenarioGridColumn,
-                                                           final ScenarioHeaderMetaData scenarioHeaderMetaData,
-                                                           int uiColumnIndex,
-                                                           String group) {
-        return ScenarioSimulationGridHeaderUtilities.getEnableTestToolsEvent(scenarioGrid,
-                                                                             scenarioGridColumn,
-                                                                             scenarioHeaderMetaData,
-                                                                             uiColumnIndex,
-                                                                             group);
-    }
-
-    //Indirection for tests
-    protected String getPlaceHolder(final boolean isInstanceAssigned,
-                                     final boolean isPropertyAssigned,
-                                     final FactMappingValueType valueType,
-                                     final String className) {
-        return ScenarioSimulationUtils.getPlaceHolder(isInstanceAssigned,
-                                                      isPropertyAssigned,
-                                                      valueType,
-                                                      className);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridCell.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridCell.java
deleted file mode 100644
index eb48609..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridCell.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.widgets;
-
-import org.drools.workbench.screens.scenariosimulation.client.values.ScenarioGridCellValue;
-import org.uberfire.ext.wires.core.grids.client.model.impl.BaseGridCell;
-
-public class ScenarioGridCell extends BaseGridCell<String> {
-
-    private boolean isEditingMode = false;
-    private boolean isErrorMode = false;
-    private boolean isList = false;
-    private boolean isMap = false;
-
-    public ScenarioGridCell(ScenarioGridCellValue value) {
-        super(value);
-    }
-
-    public boolean isEditingMode() {
-        return isEditingMode;
-    }
-
-    public void setEditingMode(boolean editingMode) {
-        isEditingMode = editingMode;
-    }
-
-    public boolean isErrorMode() {
-        return isErrorMode;
-    }
-
-    public void setErrorMode(boolean errorMode) {
-        isErrorMode = errorMode;
-    }
-
-    public boolean isList() {
-        return isList;
-    }
-
-    /**
-     * Method to set the <b>isList/isMap</b> flags. Invoke this <b>only</b> for <i>collection</i> cells.
-     * By default, both <b>isList/isMap</b> are false.
-     * @param list
-     */
-    public void setListMap(boolean list) {
-        isList = list;
-        isMap = !list;
-    }
-
-    public boolean isMap() {
-        return isMap;
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridColumn.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridColumn.java
deleted file mode 100644
index b4b75839..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridColumn.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.widgets;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Consumer;
-
-import com.google.gwt.user.client.ui.FocusWidget;
-import com.google.gwt.user.client.ui.HasFocus;
-import com.google.gwt.user.client.ui.Widget;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.workbench.screens.scenariosimulation.client.domelements.CollectionEditorDOMElement;
-import org.drools.workbench.screens.scenariosimulation.client.domelements.ScenarioCellTextAreaDOMElement;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.values.ScenarioGridCellValue;
-import org.uberfire.ext.wires.core.grids.client.model.GridCell;
-import org.uberfire.ext.wires.core.grids.client.model.GridCellValue;
-import org.uberfire.ext.wires.core.grids.client.model.impl.BaseGridColumn;
-import org.uberfire.ext.wires.core.grids.client.widget.context.GridBodyCellRenderContext;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.impl.BaseDOMElement;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.single.impl.BaseSingletonDOMElementFactory;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.columns.GridColumnRenderer;
-
-public class ScenarioGridColumn extends BaseGridColumn<String> {
-
-    private BaseSingletonDOMElementFactory<String, ? extends Widget, ? extends BaseDOMElement<String, ? extends Widget>> factory;
-
-    protected final ScenarioHeaderMetaData informationHeaderMetaData;
-    protected final ScenarioHeaderMetaData propertyHeaderMetaData;
-
-    /**
-     * flag to know if an <b>instance</b> has been already assigned to this column; <code>false</code> on instantiation
-     */
-    protected boolean instanceAssigned = false;
-    /**
-     * flag to know if a <b>property</b> has been already assigned to this column; <code>false</code> on instantiation
-     */
-    protected boolean propertyAssigned = false;
-    /**
-     * flag to know if the <b>headers</b> are editable or not (as in the DMN-scenario case); <code>true</code> on instantiation
-     */
-    protected boolean editableHeaders = true;
-
-    /**
-     * The <code>FactIdentifier</code> mapped to this column; default to <code>FactIdentifier.EMPTY</code>
-     */
-    protected FactIdentifier factIdentifier = FactIdentifier.EMPTY;
-
-    public ScenarioGridColumn(List<HeaderMetaData> headerMetaData,
-                              GridColumnRenderer<String> columnRenderer,
-                              double width,
-                              boolean isMovable,
-                              BaseSingletonDOMElementFactory<String, ? extends Widget, ? extends BaseDOMElement<String, ? extends Widget>> factory,
-                              String placeHolder) {
-        super(headerMetaData, columnRenderer, width);
-        this.informationHeaderMetaData = (ScenarioHeaderMetaData) headerMetaData.stream().filter(hdm -> Objects.equals(((ScenarioHeaderMetaData) hdm).getMetadataType(), ScenarioHeaderMetaData.MetadataType.INSTANCE)).findFirst().orElse(headerMetaData.get(0));
-        this.propertyHeaderMetaData = (ScenarioHeaderMetaData) headerMetaData.stream().filter(hdm -> Objects.equals(((ScenarioHeaderMetaData) hdm).getMetadataType(), ScenarioHeaderMetaData.MetadataType.PROPERTY)).findFirst().orElse(null);
-        this.setMovable(isMovable);
-        this.factory = factory;
-        this.placeHolder = placeHolder;
-        this.setMinimumWidth(width);
-
-        // by default scenario columns should be auto to have auto resize
-        this.setColumnWidthMode(ColumnWidthMode.AUTO);
-    }
-
-    @Override
-    public void edit(GridCell<String> cell, GridBodyCellRenderContext context, Consumer<GridCellValue<String>> callback) {
-        factory.attachDomElement(context,
-                                 e -> {
-                                     try {
-                                         final GridCell<String> stringGridCell = assertCell(cell);
-                                         if (e instanceof ScenarioCellTextAreaDOMElement) {
-                                             ((ScenarioCellTextAreaDOMElement) e).getWidget().setValue(stringGridCell.getValue().getValue());
-                                             ((ScenarioCellTextAreaDOMElement) e).setScenarioGridCell((ScenarioGridCell) cell);
-                                         } else if (e instanceof CollectionEditorDOMElement) {
-                                             CollectionEditorDOMElement collectionEditorDOMElement = (CollectionEditorDOMElement) e;
-                                             collectionEditorDOMElement.getWidget().setValue(stringGridCell.getValue().getValue());
-                                             ((ScenarioGridCell) cell).setListMap(collectionEditorDOMElement.getWidget().isListWidget());
-                                             collectionEditorDOMElement.setScenarioGridCell((ScenarioGridCell) cell);
-                                         }
-                                     } catch (Exception ex) {
-                                         ((ScenarioGridCell) cell).setEditingMode(false);
-                                         throw ex;
-                                     }
-                                 },
-                                 e -> {
-                                     if ((e.getWidget() instanceof HasFocus)) {
-                                         ((FocusWidget) e.getWidget()).setFocus(true);
-                                     }
-                                 });
-    }
-
-    /**
-     * Set the <b>factory</b> used for creation of the editing <code>DOMElement</code>
-     * @param factory
-     */
-    public void setFactory(BaseSingletonDOMElementFactory<String, ? extends Widget, ? extends
-            BaseDOMElement<String, ? extends Widget>> factory) {
-        this.factory = factory;
-    }
-
-    /**
-     * Dynamically evaluated status to know if the values of the given column are editable or not
-     * @return
-     */
-    public boolean isReadOnly() {
-        if (FactIdentifier.INDEX.equals(factIdentifier) || FactIdentifier.EMPTY.equals(factIdentifier)) {
-            return true;
-        }
-        if (FactIdentifier.DESCRIPTION.equals(factIdentifier)) {
-            return false;
-        } else {
-            return !isPropertyAssigned();
-        }
-    }
-
-    public boolean isInstanceAssigned() {
-        return instanceAssigned;
-    }
-
-    /**
-     * Set to <code>true</code> if an <b>instance</b> has been assigned, <code>false</code> otherwise.
-     * Setting this to <code>false</code> automatically set to <code>false</code> also <code>propertyAssigned</code>
-     * @param instanceAssigned
-     */
-    public void setInstanceAssigned(boolean instanceAssigned) {
-        this.instanceAssigned = instanceAssigned;
-        if (!instanceAssigned) {
-            propertyAssigned = false;
-        }
-    }
-
-    public boolean isPropertyAssigned() {
-        return propertyAssigned;
-    }
-
-    /**
-     * Set to <code>true</code> if a <b>property</b> has been assigned, <code>false</code> otherwise.
-     * Setting this to <code>true</code> automatically set to <code>true</code> also <code>instanceAssigned</code>
-     * @param propertyAssigned
-     */
-    public void setPropertyAssigned(boolean propertyAssigned) {
-        this.propertyAssigned = propertyAssigned;
-        if (propertyAssigned) {
-            instanceAssigned = true;
-        }
-    }
-
-    public boolean isEditableHeaders() {
-        return editableHeaders;
-    }
-
-    /**
-     * Set to <code>false</code> to prevent/avoid header editing
-     * @param editableHeaders
-     */
-    public void setEditableHeaders(boolean editableHeaders) {
-        this.editableHeaders = editableHeaders;
-    }
-
-    @Override
-    public void setPlaceHolder(String placeHolder) {
-        this.placeHolder = placeHolder;
-    }
-
-    public ScenarioHeaderMetaData getInformationHeaderMetaData() {
-        return informationHeaderMetaData;
-    }
-
-    public ScenarioHeaderMetaData getPropertyHeaderMetaData() {
-        return propertyHeaderMetaData;
-    }
-
-    @Override
-    public String getPlaceHolder() {
-        return placeHolder;
-    }
-
-    public FactIdentifier getFactIdentifier() {
-        return factIdentifier;
-    }
-
-    public void setFactIdentifier(FactIdentifier factIdentifier) {
-        this.factIdentifier = factIdentifier;
-    }
-
-    @Override
-    public String toString() {
-        return "ScenarioGridColumn{" +
-                "informationHeaderMetaData=" + informationHeaderMetaData +
-                ", propertyHeaderMetaData=" + propertyHeaderMetaData +
-                '}';
-    }
-
-    private GridCell<String> assertCell(final GridCell<String> cell) {
-        if (cell != null) {
-            return cell;
-        }
-        return new ScenarioGridCell(new ScenarioGridCellValue("", placeHolder));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridLayer.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridLayer.java
deleted file mode 100644
index 37240cf..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridLayer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.widgets;
-
-import com.ait.lienzo.client.core.shape.Layer;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.impl.DefaultGridLayer;
-
-/**
- * ScenarioSimulation implementation of <code>DefaultGridLayer</code>.
- * <p>
- * This layer contains a <code>ScenarioGrid</code>.
- * It also has a reference to the containing <code>ScenarioGridPanel</code> to avoid circular references by CDI
- *
- */
-public class ScenarioGridLayer extends DefaultGridLayer {
-
-    private ScenarioGridPanel scenarioGridPanel;
-    private ScenarioGrid scenarioGrid;
-
-    public ScenarioGridPanel getScenarioGridPanel() {
-        return scenarioGridPanel;
-    }
-
-    public void setScenarioGridPanel(ScenarioGridPanel scenarioGridPanel) {
-        this.scenarioGridPanel = scenarioGridPanel;
-    }
-
-    public ScenarioGrid getScenarioGrid() {
-        return scenarioGrid;
-    }
-
-    /**
-     * Add a <code>ScenarioGrid</code> to this Layer. If the child is a GridWidget then also add
-     * a Connector between the Grid Widget and any "linked" GridWidgets.
-     * @param scenarioGrid <code>ScenarioGrid</code> to add to the Layer
-     * @return The <code>Layer</code>
-     */
-    public Layer addScenarioGrid(final ScenarioGrid scenarioGrid) {
-        this.scenarioGrid = scenarioGrid;
-        return super.add(scenarioGrid);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridPanel.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridPanel.java
deleted file mode 100644
index 8a11c9d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridPanel.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.widgets;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.enterprise.context.Dependent;
-
-import com.ait.lienzo.client.core.event.NodeMouseOutEvent;
-import com.ait.lienzo.client.core.event.NodeMouseOutHandler;
-import com.ait.lienzo.client.core.event.NodeMouseWheelEvent;
-import com.ait.lienzo.client.core.event.NodeMouseWheelHandler;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import com.google.gwt.event.dom.client.ScrollEvent;
-import com.google.gwt.event.dom.client.ScrollHandler;
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.event.shared.HandlerRegistration;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationGridPanelClickHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationGridPanelMouseMoveHandler;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.impl.GridLienzoPanel;
-
-/**
- * ScenarioGridPanel implementation of <code>GridLienzoPanel</code>.
- * <p>
- * This panel contains a <code>ScenarioGridLayer</code> and it is instantiated only once.
- * The Clicks are managed by the injected <code>ScenarioSimulationMainGridPanelClickHandler</code>
- */
-@Dependent
-public class ScenarioGridPanel extends GridLienzoPanel implements NodeMouseOutHandler,
-                                                                  NodeMouseWheelHandler,
-                                                                  ScrollHandler {
-
-    protected ScenarioSimulationGridPanelClickHandler clickHandler;
-    protected ScenarioSimulationGridPanelMouseMoveHandler mouseMoveHandler;
-    protected Set<HandlerRegistration> handlerRegistrations = new HashSet<>();
-    protected Set<com.ait.lienzo.tools.client.event.HandlerRegistration> lienzoHandlerRegistrations = new HashSet<>();
-
-    public void addHandlers(final ScenarioSimulationGridPanelClickHandler clickHandler,
-                            final ScenarioSimulationGridPanelMouseMoveHandler mouseMoveHandler) {
-        this.clickHandler = clickHandler;
-        this.mouseMoveHandler = mouseMoveHandler;
-        unregister();
-        handlerRegistrations.add(getDomElementContainer().addDomHandler(clickHandler,
-                                                                        ContextMenuEvent.getType()));
-        handlerRegistrations.add(getDomElementContainer().addDomHandler(clickHandler,
-                                                                        ClickEvent.getType()));
-        handlerRegistrations.add(getScrollPanel().addDomHandler(this, ScrollEvent.getType()));
-
-        // Lienzo handlers
-        lienzoHandlerRegistrations.add(getScenarioGridLayer().addNodeMouseOutHandler(this));
-        lienzoHandlerRegistrations.add(getScenarioGridLayer().addNodeMouseMoveHandler(mouseMoveHandler));
-        lienzoHandlerRegistrations.add(getScenarioGridLayer().addNodeMouseWheelHandler(this));
-    }
-
-    public ScenarioGridLayer getScenarioGridLayer() {
-        return (ScenarioGridLayer) getDefaultGridLayer();
-    }
-
-    public ScenarioGrid getScenarioGrid() {
-        return ((ScenarioGridLayer) getDefaultGridLayer()).getScenarioGrid();
-    }
-
-    public void setEventBus(EventBus eventBus) {
-        getScenarioGrid().setEventBus(eventBus);
-    }
-
-    public void select() {
-        getDefaultGridLayer().select(getScenarioGrid()); // This is to have "floatable" header, ie. not moving
-    }
-
-    @Override
-    public void onNodeMouseOut(NodeMouseOutEvent event) {
-        final int height = getScenarioGridLayer().getHeight();
-        final int width = getScenarioGridLayer().getWidth();
-        final int x = event.getX();
-        final int y = event.getY();
-        if (x < 0 || x > width || y < 0 || y > height) {
-            clickHandler.hideMenus();
-            mouseMoveHandler.hidePopover();
-        }
-    }
-
-    @Override
-    public void onScroll(ScrollEvent scrollEvent) {
-        clickHandler.hideMenus();
-        mouseMoveHandler.hidePopover();
-    }
-
-    @Override
-    public void onNodeMouseWheel(NodeMouseWheelEvent nodeMouseWheelEvent) {
-        getScenarioGrid().getModel().flushAllTextAreaDOMElementFactoryResources();
-    }
-
-    @Override
-    public void onResize() {
-        super.onResize();
-        getScenarioGridLayer().batch();
-        clickHandler.hideMenus();
-        mouseMoveHandler.hidePopover();
-    }
-
-    public void unregister() {
-        handlerRegistrations.forEach(HandlerRegistration::removeHandler);
-        handlerRegistrations.clear();
-        lienzoHandlerRegistrations.forEach(com.ait.lienzo.tools.client.event.HandlerRegistration::removeHandler);
-        lienzoHandlerRegistrations.clear();
-    }
-
-    public void synchronizeFactMappingsWidths() {
-        getScenarioGrid().getModel().synchronizeFactMappingsWidths();
-    }
-
-    public void ensureCellIsSelected() {
-        getScenarioGrid().ensureCellIsSelected();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridRow.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridRow.java
deleted file mode 100644
index c9bb72b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridRow.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.widgets;
-
-import org.uberfire.ext.wires.core.grids.client.model.impl.BaseGridRow;
-
-public class ScenarioGridRow extends BaseGridRow {
-
-    public static final double DEFAULT_HEIGHT = 30.0;
-
-    public ScenarioGridRow() {
-        super(DEFAULT_HEIGHT);
-    }
-
-    public ScenarioGridRow(double height) {
-        super(height);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridWidget.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridWidget.java
deleted file mode 100644
index 9686807..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridWidget.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.widgets;
-
-import com.google.gwt.user.client.ui.ResizeComposite;
-import com.google.gwt.user.client.ui.Widget;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.models.AbstractScesimGridModel;
-
-public class ScenarioGridWidget extends ResizeComposite {
-
-    protected ScenarioGridPanel scenarioGridPanel;
-
-    protected boolean selected;
-
-    public void setScenarioGridPanel(ScenarioGridPanel scenarioGridPanel) {
-        this.scenarioGridPanel = scenarioGridPanel;
-        initWidget(scenarioGridPanel);
-    }
-
-    public void setContent(AbstractScesimModel abstractScesimModel, ScenarioSimulationModel.Type type) {
-        scenarioGridPanel.getScenarioGrid().setContent(abstractScesimModel, type);
-    }
-
-    public ScenarioGridPanel getScenarioGridPanel() {
-        return scenarioGridPanel;
-    }
-
-    public ScenarioSimulationContext getScenarioSimulationContext() {
-        return scenarioGridPanel.getScenarioGrid().getScenarioSimulationContext();
-    }
-
-    public void refreshContent(AbstractScesimModel abstractScesimModel) {
-        scenarioGridPanel.getScenarioGrid().getModel().bindContent(abstractScesimModel);
-        scenarioGridPanel.getScenarioGrid().getModel().refreshErrors();
-        onResize();
-    }
-
-    public void unregister() {
-        scenarioGridPanel.unregister();
-    }
-
-    public void clearSelections() {
-        scenarioGridPanel.getScenarioGrid().getModel().clearSelections();
-    }
-
-    public void resetErrors() {
-        scenarioGridPanel.getScenarioGrid().getModel().resetErrors();
-    }
-
-    public AbstractScesimGridModel getModel() {
-        return scenarioGridPanel.getScenarioGrid().getModel();
-    }
-
-    public void selectAndFocus() {
-        scenarioGridPanel.getScenarioGrid().select();
-        scenarioGridPanel.setFocus(true);
-        scenarioGridPanel.ensureCellIsSelected();
-        selected = true;
-    }
-
-    public void deselectAndUnFocus() {
-        scenarioGridPanel.getScenarioGrid().deselect();
-        scenarioGridPanel.setFocus(false);
-        selected = false;
-    }
-
-    public boolean isSelected() {
-        return selected;
-    }
-
-    @Override
-    public void onResize() {
-        final Widget parent = getParent();
-        if (parent != null) {
-            final double w = parent.getOffsetWidth();
-            final double h = parent.getOffsetHeight();
-            setPixelSize((int) w, (int) h);
-        }
-        scenarioGridPanel.onResize();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/AbstractCommand.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/AbstractCommand.java
deleted file mode 100644
index b27ad66..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/AbstractCommand.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client;
-
-/**
- * Base type for commands
- */
-public abstract class AbstractCommand<T, V> implements Command<T, V> {
-
-    @Override
-    public CommandResult<V> allow(final T context) {
-        return buildResult();
-    }
-
-    protected CommandResult<V> buildResult() {
-        return CommandResultBuilder.SUCCESS;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/Command.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/Command.java
deleted file mode 100644
index 925c3f5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/Command.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client;
-
-public interface Command<T, V> {
-
-    /**
-     * Check whether the command operation is allowed.
-     * Does not perform any update or mutation.
-     */
-    CommandResult<V> allow(final T context);
-
-    /**
-     * Executes the command operation.
-     * Does perform some update or mutation.
-     */
-    CommandResult<V> execute(final T context);
-
-    /**
-     * Undo the changes done by this command execution.
-     */
-    CommandResult<V> undo(final T context);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/CommandListener.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/CommandListener.java
deleted file mode 100644
index 4a302f0..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/CommandListener.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client;
-
-public interface CommandListener<T, V> {
-
-    void onAllow(final T context,
-                 final Command<T, V> command,
-                 final CommandResult<V> result);
-
-    void onExecute(final T context,
-                   final Command<T, V> command,
-                   final CommandResult<V> result);
-
-    void onUndo(final T context,
-                final Command<T, V> command,
-                final CommandResult<V> result);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/CommandManager.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/CommandManager.java
deleted file mode 100644
index 14a0c14..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/CommandManager.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client;
-
-/**
- * Manager to handle execution of commands in a given context.
- * @param <T> The execution context
- * @param <V> The resulting violations of the command execution in the given context.
- */
-public interface CommandManager<T, V> {
-
-    /**
-     * Check whether the given command can be executed.
-     */
-    CommandResult<V> allow(final T context,
-                           final Command<T, V> command);
-
-    /**
-     * Execute the given command.
-     */
-    CommandResult<V> execute(final T context,
-                             final Command<T, V> command);
-
-    /**
-     * Undo an executed command.
-     */
-    CommandResult<V> undo(final T context,
-                          final Command<T, V> command);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/CommandResult.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/CommandResult.java
deleted file mode 100644
index 5d02841..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/CommandResult.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client;
-
-/**
- * Result from the execution of a command
- */
-public interface CommandResult<T> {
-
-    enum Type {
-        ERROR(3),
-        WARNING(2),
-        INFO(1);
-
-        private final int severity;
-
-        Type(final int severity) {
-            this.severity = severity;
-        }
-
-        public int getSeverity() {
-            return severity;
-        }
-    }
-
-    /**
-     * Type of Result
-     * @return
-     */
-    Type getType();
-
-    Iterable<T> getViolations();
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/CommandResultBuilder.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/CommandResultBuilder.java
deleted file mode 100644
index 6d39136..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/CommandResultBuilder.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client;
-
-import java.util.Collection;
-import java.util.LinkedList;
-
-import org.jboss.errai.common.client.api.annotations.NonPortable;
-import org.kie.workbench.common.command.client.impl.CommandResultImpl;
-
-@NonPortable
-public abstract class CommandResultBuilder<V> {
-
-    private CommandResult.Type type = CommandResult.Type.INFO;
-    private final Collection<V> violations = new LinkedList<>();
-
-    public static final CommandResult SUCCESS = new CommandResultImpl<>(CommandResult.Type.INFO,
-                                                                        new LinkedList<>()
-    );
-
-    public static final CommandResult FAILED = new CommandResultImpl<>(CommandResult.Type.ERROR,
-                                                                       new LinkedList<>()
-    );
-
-    public abstract CommandResult.Type getType(final V violation);
-
-    public CommandResultBuilder() {
-    }
-
-    public CommandResultBuilder(final Collection<V> violations) {
-        this.violations.addAll(violations);
-    }
-
-    public CommandResultBuilder<V> addViolation(final V violation) {
-        this.violations.add(violation);
-        return this;
-    }
-
-    public CommandResultBuilder<V> addViolations(final Collection<V> violations) {
-        this.violations.addAll(violations);
-        return this;
-    }
-
-    public CommandResultBuilder<V> setType(final CommandResult.Type type) {
-        this.type = type;
-        return this;
-    }
-
-    public CommandResult<V> build() {
-        violations.forEach(v -> {
-            final CommandResult.Type violationType = getType(v);
-            if (violationType.getSeverity() > this.type.getSeverity()) {
-                this.type = violationType;
-            }
-        });
-        return new CommandResultImpl<>(this.type,
-                                       this.violations);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/DelegateCommandManager.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/DelegateCommandManager.java
deleted file mode 100644
index a52582f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/DelegateCommandManager.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client;
-
-public abstract class DelegateCommandManager<C, V> implements CommandManager<C, V> {
-
-    protected abstract CommandManager<C, V> getDelegate();
-
-    @Override
-    public CommandResult<V> allow(final C context,
-                                  final Command<C, V> command) {
-        if (null != getDelegate()) {
-            preAllow(context, command);
-            final CommandResult<V> result = getDelegate().allow(context, command);
-            postAllow(context, command, result);
-            return result;
-        }
-        return null;
-    }
-
-    protected void preAllow(final C context,
-                            final Command<C, V> command) {
-    }
-
-    protected void postAllow(final C context,
-                             final Command<C, V> command,
-                             final CommandResult<V> result) {
-    }
-
-    @Override
-    public CommandResult<V> execute(final C context,
-                                    final Command<C, V> command) {
-        if (null != getDelegate()) {
-            preExecute(context, command);
-            final CommandResult<V> result = getDelegate().execute(context, command);
-            postExecute(context, command, result);
-            return result;
-        }
-        return null;
-    }
-
-    protected void preExecute(final C context,
-                              final Command<C, V> command) {
-    }
-
-    protected void postExecute(final C context,
-                               final Command<C, V> command,
-                               final CommandResult<V> result) {
-    }
-
-    @Override
-    public CommandResult<V> undo(final C context,
-                                 final Command<C, V> command) {
-        if (null != getDelegate()) {
-            preUndo(context, command);
-            final CommandResult<V> result = getDelegate().undo(context, command);
-            postUndo(context, command, result);
-            return result;
-        }
-        return null;
-    }
-
-    protected void preUndo(final C context,
-                           final Command<C, V> command) {
-    }
-
-    protected void postUndo(final C context,
-                            final Command<C, V> command,
-                            final CommandResult<V> result) {
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/HasCommandListener.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/HasCommandListener.java
deleted file mode 100644
index 46ed30e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/HasCommandListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client;
-
-public interface HasCommandListener<L extends CommandListener> {
-
-    void setCommandListener(final L listener);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/event/AbstractCommandEvent.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/event/AbstractCommandEvent.java
deleted file mode 100644
index 26baec2..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/event/AbstractCommandEvent.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client.event;
-
-import org.kie.workbench.common.command.client.Command;
-import org.kie.workbench.common.command.client.CommandResult;
-
-public abstract class AbstractCommandEvent<C, V> {
-
-    private final Command<C, V> command;
-    private final CommandResult<V> result;
-
-    public AbstractCommandEvent(final Command<C, V> command,
-                                final CommandResult<V> result) {
-        this.command = command;
-        this.result = result;
-    }
-
-    public Command<C, V> getCommand() {
-        return command;
-    }
-
-    public CommandResult<V> getResult() {
-        return result;
-    }
-
-    public boolean hasError() {
-        return result != null && CommandResult.Type.ERROR.equals(result.getType());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/exception/BadCommandArgumentsException.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/exception/BadCommandArgumentsException.java
deleted file mode 100644
index 6f79599..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/exception/BadCommandArgumentsException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client.exception;
-
-import org.kie.workbench.common.command.client.Command;
-
-/**
- * A command argument is not valid.
- * The command's executor should check the arguments on the context before calling the command.
- * For example if using a bad runtime execution context where element cannot be found in the index.
- */
-public final class BadCommandArgumentsException extends CommandException {
-
-    private final Object argument;
-
-    public BadCommandArgumentsException(final Command<?, ?> command,
-                                        final Object argument,
-                                        final String message) {
-        super("Bad argument: " + message,
-              command);
-        this.argument = argument;
-    }
-
-    public Object getArgument() {
-        return argument;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/exception/CommandException.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/exception/CommandException.java
deleted file mode 100644
index 5945b8f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/exception/CommandException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client.exception;
-
-import org.kie.workbench.common.command.client.Command;
-
-/**
- * Base exception type for runtime command errors.
- */
-public class CommandException extends RuntimeException {
-
-    private final Command<?, ?> command;
-
-    public CommandException(final Command<?, ?> command) {
-        this.command = command;
-    }
-
-    public CommandException(final String message,
-                            final Command<?, ?> command) {
-        super(message);
-        this.command = command;
-    }
-
-    @SuppressWarnings("unchecked")
-    protected <T> T cast() {
-        return (T) command;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/impl/CommandManagerImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/impl/CommandManagerImpl.java
deleted file mode 100644
index f83fe7b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/impl/CommandManagerImpl.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client.impl;
-
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.kie.workbench.common.command.client.Command;
-import org.kie.workbench.common.command.client.CommandListener;
-import org.kie.workbench.common.command.client.CommandManager;
-import org.kie.workbench.common.command.client.CommandResult;
-import org.kie.workbench.common.command.client.HasCommandListener;
-import org.kie.workbench.common.command.client.util.CommandUtils;
-
-public class CommandManagerImpl<C, V> implements CommandManager<C, V>,
-                                                 HasCommandListener<CommandListener<C, V>> {
-
-    private static Logger LOGGER = Logger.getLogger(CommandManagerImpl.class.getName());
-
-    private CommandListener<C, V> listener;
-
-    public CommandManagerImpl() {
-        this.listener = null;
-    }
-
-    @Override
-    public CommandResult<V> allow(final C context,
-                                  final Command<C, V> command) {
-        Objects.requireNonNull(command, "command");
-        logCommand("ALLOW",
-                   command);
-        final CommandResult<V> result = command.allow(context);
-        if (null != listener) {
-            listener.onAllow(context,
-                             command,
-                             result);
-        }
-        logResult(result);
-        return result;
-    }
-
-    @Override
-    public CommandResult<V> execute(final C context,
-                                    final Command<C, V> command) {
-        Objects.requireNonNull(command, "command");
-        logCommand("EXECUTE",
-                   command);
-        final CommandResult<V> result = command.execute(context);
-        if (null != listener) {
-            listener.onExecute(context,
-                               command,
-                               result);
-        }
-        logResult(result);
-        return result;
-    }
-
-    @Override
-    public CommandResult<V> undo(final C context,
-                                 final Command<C, V> command) {
-        logCommand("UNDO",
-                   command);
-        final CommandResult<V> result = command.undo(context);
-        if (null != listener) {
-            listener.onUndo(context,
-                            command,
-                            result);
-        }
-        logResult(result);
-        return result;
-    }
-
-    @Override
-    public void setCommandListener(final CommandListener<C, V> listener) {
-        this.listener = listener;
-    }
-
-    private static void logCommand(final String type,
-                                   final Command<?, ?> command) {
-        LOGGER.log(Level.FINE,
-                   "Evaluating (" + type + ") command [" + command + "]...");
-    }
-
-    private static void logResult(final CommandResult<?> result) {
-        LOGGER.log(Level.FINE,
-                   "Evaluation " + (CommandUtils.isError(result) ? "FAILED" : "SUCCESS") + " - " +
-                           "Result [" + result + "]");
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/impl/CommandResultImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/impl/CommandResultImpl.java
deleted file mode 100644
index 2c4565d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/impl/CommandResultImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client.impl;
-
-import java.util.Collection;
-
-import org.jboss.errai.common.client.api.annotations.MapsTo;
-import org.jboss.errai.common.client.api.annotations.Portable;
-import org.kie.workbench.common.command.client.CommandResult;
-
-@Portable
-public final class CommandResultImpl<V> implements CommandResult<V> {
-
-    private final Type type;
-    private final Collection<V> violations;
-
-    public CommandResultImpl(final @MapsTo("type") Type type,
-                             final @MapsTo("violations") Collection<V> violations) {
-        this.violations = violations;
-        this.type = type;
-    }
-
-    @Override
-    public Type getType() {
-        return type;
-    }
-
-    @Override
-    public Iterable<V> getViolations() {
-        return violations;
-    }
-
-    @Override
-    public String toString() {
-        return "[Class=" + super.getClass().getSimpleName() + ", "
-                + "Type=" + type.name() + ", "
-                + "Violations=" + violations + "]";
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/registry/AbstractCommandRegistryManager.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/registry/AbstractCommandRegistryManager.java
deleted file mode 100644
index 24a82dc..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/registry/AbstractCommandRegistryManager.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client.registry;
-
-import javax.inject.Inject;
-
-import org.appformer.client.stateControl.registry.Registry;
-import org.appformer.client.stateControl.registry.impl.DefaultRegistryImpl;
-import org.kie.workbench.common.command.client.Command;
-
-/**
- * This bean provides two Registries which can be used to manage the Undo/Redo functionality for an editor
- * Registry doneCommands contains executed commands by the user, while undoneCommand registry holds the undo commands
- * by the user, which can be redo. Used registries are compatible with Kogito and StateControlAPI.
- * @param <C>
- */
-public abstract class AbstractCommandRegistryManager<C extends Command> {
-
-    @Inject
-    protected Registry<C> doneCommandsRegistry;
-    @Inject
-    protected DefaultRegistryImpl<C> undoneCommandsRegistry;
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/util/CommandUtils.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/util/CommandUtils.java
deleted file mode 100644
index 41c8c37..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/command/client/util/CommandUtils.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.kie.workbench.common.command.client.util;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.kie.workbench.common.command.client.CommandResult;
-
-public class CommandUtils {
-
-    public static boolean isError(final CommandResult<?> result) {
-        return isCommandResultError(result);
-    }
-
-    public static <V> List<V> toList(final Iterable<V> iterable) {
-        final List<V> result = new LinkedList<>();
-        iterable.iterator().forEachRemaining(result::add);
-        return result;
-    }
-
-    private static boolean isCommandResultError(final CommandResult<?> result) {
-        return result != null && CommandResult.Type.ERROR.equals(result.getType());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/widgets/client/docks/AbstractWorkbenchDocksHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/widgets/client/docks/AbstractWorkbenchDocksHandler.java
deleted file mode 100644
index 6fd15ec..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/widgets/client/docks/AbstractWorkbenchDocksHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.kie.workbench.common.widgets.client.docks;
-
-import org.uberfire.mvp.Command;
-
-public abstract class AbstractWorkbenchDocksHandler implements WorkbenchDocksHandler {
-
-    private boolean shouldRefresh;
-
-    private boolean shouldDisable;
-
-    private Command updateDocksCommand;
-
-    @Override
-    public void init(Command updateDocksCommand) {
-        this.updateDocksCommand = updateDocksCommand;
-    }
-
-    @Override
-    public boolean shouldRefreshDocks() {
-        return shouldRefresh;
-    }
-
-    @Override
-    public boolean shouldDisableDocks() {
-        return shouldDisable;
-    }
-
-    protected void refreshDocks(boolean shouldRefresh,
-                                boolean shouldDisable) {
-        this.shouldRefresh = shouldRefresh;
-        this.shouldDisable = shouldDisable;
-
-        if (updateDocksCommand != null) {
-            updateDocksCommand.execute();
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/widgets/client/docks/WorkbenchDocksHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/widgets/client/docks/WorkbenchDocksHandler.java
deleted file mode 100644
index 4a24dd0..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/widgets/client/docks/WorkbenchDocksHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.kie.workbench.common.widgets.client.docks;
-
-import java.util.Collection;
-
-import org.uberfire.client.workbench.docks.UberfireDock;
-import org.uberfire.mvp.Command;
-
-/**
- * Component that handles the state of the authoring docks
- */
-public interface WorkbenchDocksHandler {
-
-    /**
-     * Initializes the handler with the callback {@link Command}. This {@link Command} will be executed any time
-     * the docks must be refreshed
-     */
-    void init(Command updateDocksCommand);
-
-    /**
-     * Determines if the docks should be refreshed or not.
-     */
-    boolean shouldRefreshDocks();
-
-    /**
-     * Determines if the docks should be disabled or not
-     */
-    boolean shouldDisableDocks();
-
-    /**
-     * Provides a Collection containing the {@link UberfireDock} that should be displayed when this handler is active
-     */
-    Collection<UberfireDock> provideDocks(String perspectiveIdentifier);
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/widgets/metadata/client/KieEditorView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/widgets/metadata/client/KieEditorView.java
deleted file mode 100644
index 7e919ed..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/widgets/metadata/client/KieEditorView.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.kie.workbench.common.widgets.metadata.client;
-
-import org.uberfire.ext.editor.commons.client.BaseEditorView;
-
-public interface KieEditorView
-        extends BaseEditorView {
-
-    void refreshTitle( final String fileName,
-                       final String description );
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/widgets/metadata/client/KieEditorViewImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/widgets/metadata/client/KieEditorViewImpl.java
deleted file mode 100644
index 4cf0714..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/kie/workbench/common/widgets/metadata/client/KieEditorViewImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.kie.workbench.common.widgets.metadata.client;
-
-import org.uberfire.ext.editor.commons.client.BaseEditorViewImpl;
-
-public abstract class KieEditorViewImpl
-        extends BaseEditorViewImpl
-        implements KieEditorView {
-
-    @Override
-    public void refreshTitle( String fileName,
-                              String description ) {
-        title.setText( fileName, description );
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/META-INF/ErraiApp.properties b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/META-INF/ErraiApp.properties
deleted file mode 100644
index ac3b5ed..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/META-INF/ErraiApp.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# 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. 
-#
-
-# ErraiApp.properties
-#
-# Do not remove, even if empty!
-#
-
-# This is a marker file. When it is detected inside a JAR or at the
-# top of any classpath, the subdirectories are scanned for deployable
-# components. As such, all Errai application modules in a project
-# should contain an ErraiApp.properties at the root of all classpaths
-# that you wish to be scanned.
-#
-# There are also some configuration options that can be set in this
-# file, although it is rarely necessary. See the documentation at
-# https://docs.jboss.org/author/display/ERRAI/ErraiApp.properties
-# for details.
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/META-INF/beans.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index 9c0d486..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" bean-discovery-mode="none">
-  <scan>
-    <exclude name="org.drools.workbench.screens.scenariosimulation.client.**" />
-  </scan>
-</beans>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/DroolsWorkbenchScenarioSimulationEditorClient.gwt.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/DroolsWorkbenchScenarioSimulationEditorClient.gwt.xml
deleted file mode 100644
index be0a820..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/DroolsWorkbenchScenarioSimulationEditorClient.gwt.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  ~ 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.      
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN"
-  "http://www.gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-  <source path="client" />
-  <source path="service" />
-
-  <!-- Inherit the core Web Toolkit stuff. -->
-  <inherits name="com.google.gwt.i18n.I18N" />
-  <inherits name="com.google.gwt.http.HTTP" />
-  <inherits name="com.google.gwt.user.User" />
-
-  <!-- This is to directly inherit Lienzo-related stuff -->
-  <inherits name="com.ait.lienzo.Lienzo" />
-  <inherits name="org.uberfire.ext.wires.core.grids.WiresCoreGrids" />
-
-  <inherits name="org.uberfire.ext.editor.commons.UberfireCommonsEditorClient" />
-
-  <inherits name="org.kie.workbench.common.widgets.KieWorkbenchWidgetsCommon" />
-
-  <inherits name='org.drools.workbench.screens.scenariosimulation.DroolsWorkbenchScenarioSimulationEditorAPI' />
-  <inherits name='org.drools.scenariosimulation.ScenarioSimulationAPI' />
-</module>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStyles.css b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStyles.css
deleted file mode 100644
index 6c97148..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStyles.css
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * 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. 
- */
-.disabled {
-  color: rgb(153, 153, 153);
-  cursor: not-allowed;
-  pointer-events: none;
-}
-
-/*
-For RightPanel
- */
-.kie-tree-list-view-pf-view--compact {
-  border-color: transparent;
-}
-
-.kie-tree-list-view-pf-view--compact .list-group-item {
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-.kie-tree-list-view-pf-view--compact .list-group-item :hover {
-  background-color: transparent;
-}
-
-.kie-tree-list-view-pf-view--compact .list-group-item .list-view-pf-expand {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-.kie-tree-list-view-pf-view--compact .list-group-item.list-view-pf-expand-active {
-  background-color: #fff;
-  border-color: transparent;
-  box-shadow: none;
-}
-
-.kie-tree-list-view-pf-view--compact .list-group-item.list-view-pf-expand-active:first-child {
-  border-color: transparent;
-}
-
-.kie-tree-list-view-pf-view--compact .selected > .list-group-item-header {
-  background-color: #edf8ff;
-}
-
-.kie-tree-list-view-pf-view--compact .list-group-item-header {
-  padding-top: 0;
-  padding-bottom: 0;
-  padding-left: 0;
-  font-weight: bold;
-}
-
-.kie-tree-list-view-pf-view--compact .list-group-item-header:hover {
-  background-color: #edf8ff;
-}
-
-.kie-tree-list-view-pf-view--compact .list-view-pf-main-info {
-  padding-top: 5px;
-  padding-bottom: 5px;
-}
-
-.kie-tree-list-view-pf-view--compact .list-group-item-container {
-  border-top-color: transparent;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-.kie-tree-list-view-pf-view--compact .ul--plain {
-  list-style: none;
-  padding-inline-start: 0;
-}
-
-.kie-tree-list-view-pf-view--compact .ul--plain li {
-  padding: 0.25em 15px 0.25em 0.25em;
-}
-
-.kie-tree-list-view-pf-view--compact .ul--plain li:hover {
-  background-color: #edf8ff;
-}
-
-.kie-tree-list-view-pf-view--compact .ul--plain > .selected {
-  background-color: #edf8ff;
-}
-
-.treeview .node-hidden {
-  display: none;
-}
-
-.kie-object-list {
-  list-style-type: none;
-}
-
-.kie-object-list .list-group {
-  border-top: none;
-  padding-left: 1.25rem;
-}
-
-.kie-object-list .list-group-item {
-  border: none;
-}
-
-.kie-object-list--mapping {
-  display: inline-table;
-}
-
-.kie-object-list__expander {
-  padding-right: 1em;
-}
-
-li.list-group-item.kie-object-list__separator,
-li.list-group-item.kie-object-list__separator:first-child {
-  border-top: 1px solid #ededed;
-}
-
-.kie-object-list__field-value {
-  font-weight: bold;
-}
-
-.kie-object-list__field-label {
-  font-weight: normal;
-}
-
-.kie-tab-pane--scesim-panel {
-  padding: 1em 1em 2em 1em;
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-
-.kie-tab-pane--scesim-panel-footer {
-  margin-top: 10px;
-}
-
-.kie-test-tools-content__box {
-  padding: 10px;
-  border: 1px solid #bbb;
-  flex: 1 1 auto;
-  overflow: auto;
-}
-
-.kie-test-tools-search__box {
-  margin-bottom: 10px;
-}
-
-.kie-test-tools-info__icon {
-  padding-top: 4px;
-}
-
-.kie-test-tools-instances-list__label {
-  margin: 10px 0px;
-  border-top: 1px solid #bbb;
-  display: none;
-}
-
-.kie-test-tools-clear-selection {
-  margin-left: 10px;
-}
-
-.kie-test-tools-insert-object-label {
-  margin-top: 10px;
-}
-
-.kie-list-view-pf-main-field-element {
-  padding-right: 15px;
-}
-
-span.kie-list-view-pf-main-info__text {
-  flex-grow: 1;
-}
-
-.kie-list-view-pf-main-info__check {
-  padding-top: 4px;
-  display: none;
-}
-
-.list-group-item-container-fact-property {
-  padding-left: 0;
-  margin-bottom: 0;
-}
-
-.kie-coverage__dl-horizontal dt {
-  overflow: visible;
-  text-overflow: clip;
-  white-space: normal;
-  text-align: inherit;
-  word-wrap: break-word;
-}
-
-.collection-editor-expression_textarea {
-  height: 12em;
-  width: 100%;
-  font-size: 12px;
-}
-
-.collection-editor-add-button-container {
-  height: 50px;
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.properties b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.properties
deleted file mode 100644
index 7d4a18b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.properties
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-# 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. 
-#
-
-newScenarioSimulationDescription=Test Scenario
-selectImportFile=Select file to import.
-importLabel=Import
-removeCollectionMainTitle=Remove collection
-collectionError=Collection Error
-removeCollectionMainQuestion=Remove the collection?
-factColumnHeader=Fact
-fieldColumnHeader=Field
-contextColumnHeader=Context
-addScenarioSimulation=Create Test Scenario
-scenarioSimulationEditorTitle=Test Scenarios
-scenarioSimulationResourceTypeDescription=Test Scenarios
-remove=Remove
-currentlyNotAvailable=Currently not available
-supportedDmnVersions=This editor supports up to DMN 1.2 version.
-unSupportedDmnVersion=Test scenario supports up to DMN version 1.2. The provided DMN file version is {0}.
-invalidDefinitionDisabled=Invalid definition. Editing is disabled.
-testTools=Test Tools
-testEditor=Test Editor
-testReport=Test Report
-testToolsAddButton=Insert Data Object
-testToolsAddButtonLabel=* Selecting a Data Object will require an expression value for the entire column.
-scenarioCheatSheet=Scenario Cheatsheet
-ruleCheatSheet1=To start off, right-click a cell in the table and use the contextual menus to insert new columns and rows.
-ruleCheatSheet2=Before defining the individual test scenarios, set the instance and field mappings for each column. Select a header cell and in the
-ruleCheatSheet3=tab, choose the required field. Click
-ruleCheatSheet4=Add
-ruleCheatSheet5=to set the mapping.
-ruleCheatSheet6=Now, define the test scenarios. Each cell of the table must contain a valid expression.
-ruleCheatSheet7=In rule-based scenarios, the following expressions are supported:
-ruleCheatSheet8=(or no symbol) specifies equality of a value. This is the default operator of each column and the only operator that is supported in the GIVEN section of the table.
-ruleCheatSheet9=specify inequality of a value. This operator can be combined with other operators.
-ruleCheatSheet10=specify a comparison: less than, greater than, less or equals than, and greater or equals than.
-ruleCheatSheet11=value1, value2, value3
-ruleCheatSheet12=specifies a list of values. If
-ruleCheatSheet13=one or more
-ruleCheatSheet14=values are valid, the scenario definition is evaluated as true.
-ruleCheatSheet15=expression1; expression2; expression3
-ruleCheatSheet16=specifies a list of expressions. If
-ruleCheatSheet17=all
-ruleCheatSheet18=expressions are valid, the scenario definition is evaluated as true.
-ruleCheatSheet19=To define an empty string, use
-ruleCheatSheet20=To define a null value, use
-ruleCheatSheet21=An empty cell is skipped from the evaluation.
-ruleCheatSheet22=Example expressions:
-dmnCheatSheet1=To start off, right-click a cell in the table and use the contextual menus to modify the generated table as required.
-dmnCheatSheet2=Before defining the individual test scenarios, verify the instance and field mappings for each column. If any changes are necessary, use the 
-dmnCheatSheet3=tab to update the mapping.
-dmnCheatSheet4=Now, define the test scenarios. Each cell of the table must contain a valid expression.
-dmnCheatSheet5=Values in the GIVEN part of the table are evaluated as literal expressions, whereas values in the EXPECT section are evaluated as unary expressions. The correctness of these unary tests is verified using the results from a DMN evaluation.
-dmnCheatSheet6=DMN-based scenarios use the FEEL expression language. Supported data types are:
-dmnCheatSheet7=numbers
-dmnCheatSheet8=strings
-dmnCheatSheet9=(strings must be delimited by quotation marks), for example
-dmnCheatSheet10=boolean values
-dmnCheatSheet11=dates
-dmnCheatSheet12=time
-dmnCheatSheet13=functions
-dmnCheatSheet14=contexts
-dmnCheatSheet15=ranges
-dmnCheatSheet16=lists
-dmnCheatSheet17=An empty cell is skipped from the evaluation.
-dmnCheatSheet18=In EXPECT section the type could also just a boolean with the result of the assertion and you can use ? identifier to access value to check.
-dmnCheatSheet19=Days and time duration
-dmnCheatSheet20=Years and months duration
-dmnCheatSheet21=expressed according to ISO 8601
-and=and
-or=or
-forExample=, for example
-runScenarioSimulation=Run Test
-insertValue=Insert value
-insertExpression=Insert expression
-defineValidType=Define valid type
-# Menus
-expect=Expect
-given=Given
-scenario=Scenario
-background=Background
-insertColumnLeft=Insert column left
-insertLeftmostColumn=Insert leftmost column
-insertColumnRight=Insert column right
-insertRightmostColumn=Insert rightmost column
-deleteColumn=Delete column
-deleteInstance=Delete Instance
-duplicateInstance=Duplicate instance
-prependRow=Insert top row
-appendRow=Insert bottom row
-insertRowAbove=Insert row above
-insertRowBelow=Insert row below
-deleteRow=Delete row
-duplicateRow=Duplicate row
-runSingleScenario=Run scenario
-description=Description
-# DeletePropertyConfirmPopup
-deleteValues=Delete Values
-deleteScenarioMainTitle=Delete scenario values
-deleteScenarioMainQuestion=Delete scenario values?
-deleteScenarioText1=This column contains scenario input values that will not correspond with the test statement after this change and will therefore be deleted.
-deleteScenarioTextQuestion=Do you want to continue and delete all scenario values in this column?
-deleteScenarioTextDanger=Warning: This action cannot be undone.
-# PreserveDeletePropertyConfirmPopup
-preserveDeleteScenarioMainTitle=Preserve or delete scenario values
-preserveDeleteScenarioMainQuestion=Preserve or delete scenario values?
-preserveDeleteScenarioText1=This column contains scenario input values that might not correspond with the test statement after this change.
-preserveDeleteScenarioTextQuestion=Select how you want to continue:
-preserveDeleteScenarioTextOption1=Preserve existing scenario values in this column.
-preserveDeleteScenarioTextOption2=Delete all scenario values in this column.
-preserveValues=Preserve Values
-# ChangeInstanceTypeConfirmPopup
-changeType=Change Type
-changeTypeMainTitle=Change instance type
-changeTypeMainQuestion=Change instance type?
-changeTypeText1=This column is mapped to a property that will not correspond with the test statement after this change and will therefore be deleted.
-changeTypeTextQuestion=Do you want to continue and delete this column?
-changeTypeTextDanger=Warning: This action cannot be undone.
-#
-undo=Undo
-redo=Redo
-#
-sourceType=Source type
-chooseDMN=Choose a DMN asset
-chooseValidDMNAsset=Choose a valid DMN asset from the list
-removeCollectionText1=This action will remove all items from the collection and the collection itself.
-removeCollectionQuestion=Do you want to continue and remove the collection?
-removeCollectionWarningText=This action cannot be undone.
-#
-settings=Settings
-name=Name
-type=Type
-dmnPathErrorLabel=Impossible to find ''{0}'' file. Please select one.
-dmnPathErrorDetailedLabel=ACTION REQUIRED: Referred DMN file ''{0}'' is not valid. Please provide a valid DMN file and update the DMN model in the Settings dock. Message: ''{1}''
-missingSelectedType=Missing selected type
-missingDmnPath=Missing DMN path
-coverageReport=Coverage Report
-uploadWarning=Make sure the headers in the selected CSV file have not been modified. Otherwise, the spreadsheet may not be successfully imported.
-chooseFile=Please select file to upload
-importFailedMessage=A CSV file with an incorrect header layout has been imported. Make sure the imported CSV file has unmodified headers.
-importErrorTitle=Error during import
-executed=Executed
-notCovered=Omitted
-decisionsEvaluated=Decisions evaluated for test scenario
-coverageNotSupportedForRule=The coverage report is currently not supported for rule-based test scenarios.
-runATestToSeeCoverageReport=Execute the test scenarios first to see the coverage report.
-running=Running...
-#
-testToolsDescription=To create a test template, define the "Given" and "Expect" columns by using the expression editor below.
-testToolObjectSelectionTitle=Select Data Object
-testToolObjectSelectionTooltip=Data objects are the java objects in specified packages of your project.
-testToolClearSelection=Clear selection
-simpleTypes=Simple Types
-complexTypes=Complex Types
-complexCustomInstances=Complex Custom Instances
-simpleCustomInstances=Simple Custom Instances
-dataObjectInstances=Data Object Instances
-reportAvailableLabel=Available decisions:
-reportExecutedLabel=Tested decisions:
-reportCoverageLabel=Percentage of decisions tested:
-numberOfTimesDecisionEvaluated=A number of times each decision has been evaluated:
-skipSimulation=Skip this simulation during the test
-downloadReportLabel=Download report
-#
-export=Export
-errorReason=Error reason
-keep=Keep
-close=Close
-apply=Apply
-errorPopoverMessageFailedWithError=The expected value is {0} but the actual one is {1}.
-errorPopoverMessageFailedWithException=Error message: {0}
-errorPopoverGenericCollectionErrorMessage=Impossible to find elements in the collection to satisfy the conditions.
-errorPopoverCollectionHTMLFailureMessage=Failed in: {0}
-errorPopoverCollectionHTMLField=Field: {0}
-errorPopoverCollectionHTMLValue=Value: {0}
-dateFormatPlaceholder=Insert date as yyyy-mm-dd
-dateTimeFormatPlaceholder=Insert datetime as yyyy-mm-ddThh:mm:ss
-timeFormatPlaceholder=Insert time as hh:mm:ss
-dmnDateFormatPlaceholder=Insert date as date("yyyy-mm-dd")
-rulesFired=Rules fired for test scenario
-numberOfTimesRulesFired=A number of times each rule has been fired:
-reportAvailableRuleLabel=Available rules:
-reportExecutedRuleLabel=Fired rules:
-reportCoverageRuleLabel=Percentage of rules fired:
-noDecisionsAvailable=A coverage report cannot be generated when no decisions are available.
-noRulesAvailable=A coverage report cannot be generated when no rules are available.
-
-headerTitleEmptyError=Not possible to assign an empty title!
-instanceTitleAssignedError=An instance with title ''{0}'' has already been used inside the current group
-instanceTitleWithPeriodsError=An instance alias cannot contain periods!
-propertyTitleAssignedError=A property with title ''{0}'' has already been used inside the current instance
-propertyTitleWithPeriodsError=A property alias cannot contain periods!
-validationErrorMessage=The data structure behind these columns has changed and need to be fixed
-validationErrorTitle=Wrong column mapping
-validationFailedNotification=Impossible to validate. Please verify project build compilation errors
-validationSucceed=Validation Succeed
-loadContentFailedNotification=Impossible to load file. Error: 
-
-backgroundTabTitle=Background
-backgroundErrorNotification=There are errors in Background data, please have a look
-ruleCheatSheet23=To specify a MVEL expression (or invoke a Java method) just put # at the beginning of the expression. In GIVEN section, return type of the expression has to be the same one of type of the column. In EXPECT section the type could also just a boolean with the result of the assertion and you can use actualValue identifier to access value to check.
-commonCheatSheetBackground=If the same GIVEN data is shared with the multiple test scenarios, you can use the {0} tab to define them only once. The way to create a column in the {0} tab is the same as of the {1} tab.
-
-ruleScenarioNotSupportedNotification=RULE Test Scenario is currently not supported
-
-createButton=Create
-saveButton=Save
-removeButton=Remove
-cancelButton=Cancel
-item=Item
-collectionEditorAddNewItem=Add new item
-addNewListItem=Add list value
-addNewMapItem=Add map value
-createLabelList=Create List
-createLabelMap=Create Map
-defineLabelList=Define List
-defineLabelMap=Define Map
-collectionListCreation=Define the list values for this data object
-collectionMapCreation=Define the map values for this data object
-createLabelListDescription= - create a list using a guided form
-defineLabelListDescription= - define a list using an expression
-defineLabelMapDescription= - define a map using an expression
-createLabelMapDescription= - create a map using a guided form
-
-scenarioValidationNodeChangedError=Node type has changed: old ''{0}'', current ''{1}''
-scenarioValidationFieldChangedError=Field type has changed: old ''{0}'', current ''{1}''
-scenarioValidationFieldAddedConstraintError=A constraint has been added for this type. This requires to redefine its related column.
-scenarioValidationFieldRemovedConstraintError=A constraint has been removed for this type. This requires to redefine its related column.
-
-scenarioParsingError=Parsing error
-scenarioParsingErrorContent=Unfortunately there was an unexpected error processing your Test Scenario file.
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_de.properties b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_de.properties
deleted file mode 100644
index 93e6c00..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_de.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.
-#
-
-# translation auto-copied from project Drools Workbench, version 6.0.0, document org.drools/drools-wb-guided-scorecard-editor-client/org/drools/workbench/screens/guided/scorecard/client/resources/i18n/GuidedScoreCardConstants, author jdimanos
-remove=Entfernen
-invalidDefinitionDisabled=Ungültige Definition. Bearbeiten ist deaktiviert.
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_es.properties b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_es.properties
deleted file mode 100644
index 4f85579..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_es.properties
+++ /dev/null
@@ -1,242 +0,0 @@
-#
-# 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. 
-#
-
-newScenarioSimulationDescription=Escenario de prueba
-selectImportFile=Seleccione el archivo para importar.
-importLabel=Importar
-removeCollectionMainTitle=Quitar la colección
-collectionError=Error de colección
-removeCollectionMainQuestion=¿Quitar la colección?
-factColumnHeader=Dato
-fieldColumnHeader=Campo
-contextColumnHeader=Contexto
-addScenarioSimulation=Crear un escenario de prueba.
-scenarioSimulationEditorTitle=Escenarios de prueba
-scenarioSimulationResourceTypeDescription=Escenarios de prueba
-remove=Quitar
-currentlyNotAvailable=Actualmente no está disponible
-invalidDefinitionDisabled=Definición no válida. La edición está deshabilitada.
-testTools=Herramientas de prueba
-testEditor=Editor de pruebas
-testReport=Informe de prueba
-testToolsAddButton=Insertar el objeto de datos
-testToolsAddButtonLabel=* La selección de un objeto de datos requerirá un valor de expresión para toda la columna.
-scenarioCheatSheet=Ficha de ayuda del escenario
-ruleCheatSheet1=Para empezar, haga clic con el botón derecho del ratón en una celda de la tabla y use los menús contextuales para insertar nuevas columnas y filas.
-ruleCheatSheet2=Antes de definir los escenarios de prueba individuales, establezca las asociaciones de instancia y de campo para cada columna. Seleccione una celda de encabezado y en la
-ruleCheatSheet3=pestaña elija el campo requerido. Haga clic
-ruleCheatSheet4=Agregar
-ruleCheatSheet5=para establecer la asociación.
-ruleCheatSheet6=Ahora, defina los escenarios de prueba. Cada celda de la tabla debe contener una expresión válida.
-ruleCheatSheet7=En los escenarios basados en reglas, se admiten las siguientes expresiones:
-ruleCheatSheet8=(o ningún símbolo) especifica la igualdad de un valor. Este es el operador predeterminado de cada columna y el único operador que se admite en la sección DADO de la tabla.
-ruleCheatSheet9=especifican la desigualdad de un valor. Este operador puede combinarse con otros operadores.
-ruleCheatSheet10=especificar una comparación: menor a, mayor a, menor o igual a, y mayor o igual a.
-ruleCheatSheet11=valor1, valor2, valor3
-ruleCheatSheet12=especifica una lista de valores. Si
-ruleCheatSheet13=uno o más
-ruleCheatSheet14=valores son válidos, la definición del escenario se evalúa como verdadera.
-ruleCheatSheet15=expresión1; expresión2; expresión3
-ruleCheatSheet16=especifica una lista de expresiones. Si
-ruleCheatSheet17=todo
-ruleCheatSheet18=las expresiones son válidas, la definición del escenario se evalúa como verdadera.
-ruleCheatSheet19=Para definir una cadena vacía, use
-ruleCheatSheet20=Para definir un valor nulo, use
-ruleCheatSheet21=Una celda vacía se salta de la evaluación.
-ruleCheatSheet22=Expresiones de ejemplo:
-dmnCheatSheet1=Para empezar, haga clic con el botón derecho del ratón en una celda de la tabla y use los menús contextuales para modificar la tabla generada según sea necesario.
-dmnCheatSheet2=Antes de definir los escenarios de prueba individuales, verifique las asociaciones de instancia y campo de cada columna. Si es necesario realizar algún cambio, use la 
-dmnCheatSheet3=pestaña para actualizar la asociación.
-dmnCheatSheet4=Ahora, defina los escenarios de prueba. Cada celda de la tabla debe contener una expresión válida.
-dmnCheatSheet5=Los valores en la sección DADO de la tabla se evalúan como expresiones literales, mientras que los valores en la sección PREVER se evalúan como expresiones unarias. La precisión de estas pruebas unarias se verifica usando los resultados de una evaluación de DMN.
-dmnCheatSheet6=Los escenarios basados en DMN usan el lenguaje de expresión FEEL. Los tipos de datos admitidos son:
-dmnCheatSheet7=números
-dmnCheatSheet8=cadenas
-dmnCheatSheet9=(las cadenas deben estar delimitadas por comillas), por ejemplo
-dmnCheatSheet10=valores booleanos
-dmnCheatSheet11=fechas
-dmnCheatSheet12=tiempo
-dmnCheatSheet13=funciones
-dmnCheatSheet14=contextos
-dmnCheatSheet15=rangos
-dmnCheatSheet16=listas
-dmnCheatSheet17=Una celda vacía se salta de la evaluación.
-dmnCheatSheet18=En la sección PREVER el tipo también podría ser solo un booleano con el resultado de la afirmación y se puede usar el identificador ? para acceder al valor a comprobar.
-dmnCheatSheet19=La duración del tiempo
-dmnCheatSheet20=Años y meses de duración
-dmnCheatSheet21=expresado según la norma ISO 8601
-and=y
-or=o
-forExample=, por ejemplo
-runScenarioSimulation=Ejecutar prueba
-insertValue=Insertar valor
-insertExpression=Insertar expresión
-defineValidType=Definir tipo válido
-# Menus
-expect=Prever
-given=Dado
-scenario=Escenario
-background=Fondo
-insertColumnLeft=Insertar la columna a la izquierda
-insertLeftmostColumn=Insertar la columna en el extremo izquierdo
-insertColumnRight=Insertar la columna a la derecha
-insertRightmostColumn=Insertar la columna en el extremo derecho
-deleteColumn=Eliminar la columna
-deleteInstance=Eliminar la instancia
-duplicateInstance=Duplicar instancia
-prependRow=Insertar la fila superior
-appendRow=Insertar la fila inferior
-insertRowAbove=Insertar la fila arriba
-insertRowBelow=Insertar la fila abajo
-deleteRow=Eliminar la fila
-duplicateRow=Duplicar fila
-runSingleScenario=Ejecutar escenario
-description=Descripción
-# DeletePropertyConfirmPopup
-deleteValues=Eliminar los valores
-deleteScenarioMainTitle=Eliminar los valores del escenario
-deleteScenarioMainQuestion=¿Eliminar los valores del escenario?
-deleteScenarioText1=Esta columna contiene valores de entrada del escenario que no coincidirán con la declaración de prueba después de este cambio y que, por lo tanto, se eliminarán.
-deleteScenarioTextQuestion=¿Desea continuar y eliminar todos los valores del escenario en esta columna?
-deleteScenarioTextDanger=Advertencia: Esta acción no puede deshacerse.
-# PreserveDeletePropertyConfirmPopup
-preserveDeleteScenarioMainTitle=Conservar o eliminar los valores del escenario
-preserveDeleteScenarioMainQuestion=¿Conservar o eliminar los valores del escenario?
-preserveDeleteScenarioText1=Esta columna contiene valores de entrada del escenario que podrían no corresponder con la declaración de prueba después de este cambio.
-preserveDeleteScenarioTextQuestion=Seleccionar cómo desea continuar:
-preserveDeleteScenarioTextOption1=Conservar los valores de los escenarios existentes en esta columna.
-preserveDeleteScenarioTextOption2=Eliminar todos los valores del escenario en esta columna.
-preserveValues=Conservar los valores
-# ChangeInstanceTypeConfirmPopup
-changeType=Cambiar el tipo
-changeTypeMainTitle=Cambiar el tipo de instancia
-changeTypeMainQuestion=¿Cambiar el tipo de instancia?
-changeTypeText1=Esta columna está asignada a una propiedad que no se corresponderá con la declaración de prueba después de este cambio y, por lo tanto, se eliminará.
-changeTypeTextQuestion=¿Desea continuar y eliminar esta columna?
-changeTypeTextDanger=Advertencia: Esta acción no puede deshacerse.
-#
-undo=Deshacer
-redo=Rehacer
-#
-sourceType=Tipo de fuente
-chooseDMN=Elegir un activo de DMN
-chooseValidDMNAsset=Elegir un activo de DMN válido de la lista.
-removeCollectionText1=Esta acción quitará todos los ítems de la colección y la colección misma.
-removeCollectionQuestion=¿Desea continuar y quitar la colección?
-removeCollectionWarningText=Esta acción no puede deshacerse.
-#
-settings=Ajustes
-name=Nombre
-type=Tipo
-dmnPathErrorLabel=Imposible encontrar el archivo ''{0}''. Seleccione uno.
-dmnPathErrorDetailedLabel=El archivo DMN referido ''{0}'' no es válido o no está presente. Por favor, proporcione un archivo DMN válido y actualice el muelle de configuración de la derecha. Mensaje: ''{1}''
-missingSelectedType=Falta el tipo seleccionado
-missingDmnPath=Falta la ruta DMN
-coverageReport=Informe de cobertura
-uploadWarning=Asegúrese de que los encabezados del archivo CSV seleccionado no hayan sido modificados. De lo contrario, es posible que la hoja de cálculo no se importe correctamente.
-chooseFile=Seleccione el archivo a cargar
-importFailedMessage=Se ha importado un archivo CSV con un diseño de encabezado incorrecto. Asegúrese de que el archivo CSV importado tenga encabezados sin modificar.
-importErrorTitle=Error durante la importación
-executed=Ejecutado
-notCovered=Omitido
-decisionsEvaluated=Decisiones evaluadas para el escenario de prueba
-coverageNotSupportedForRule=El informe sobre la cobertura actualmente no está respaldado para los escenarios de prueba basados en reglas.
-runATestToSeeCoverageReport=Ejecutar los escenarios de prueba primero para ver el informe de cobertura.
-running=Ejecutando…
-#
-testToolsDescription=Para crear una plantilla de prueba, definir las columnas “Dado” y “Prever” usando el editor de expresiones que aparece a continuación.
-testToolObjectSelectionTitle=Seleccionar el objeto de datos
-testToolObjectSelectionTooltip=Los objetos de datos son los objetos java en paquetes específicos de su proyecto.
-testToolClearSelection=Anular selección
-simpleTypes=Tipos simples
-complexTypes=Tipos complejos
-complexCustomInstances=Instancias complejas personalizadas
-simpleCustomInstances=Instancias simples personalizadas
-dataObjectInstances=Instancias de objetos de datos
-reportAvailableLabel=Decisiones disponibles:
-reportExecutedLabel=Decisiones evaluadas:
-reportCoverageLabel=Porcentaje de decisiones evaluadas:
-numberOfTimesDecisionEvaluated=Cada decisión se ha evaluado varias veces:
-skipSimulation=Sáltese esta simulación durante la prueba
-downloadReportLabel=Descargar el informe
-#
-export=Exportar
-errorReason=Motivo del error
-keep=Mantener
-close=Cerrar
-apply=Aplicar
-errorPopoverMessageFailedWithError=El valor previsto es ''{0}'' pero el valor real es ''{1}''.
-errorPopoverMessageFailedWithException=Mensaje de error: {0}
-errorPopoverGenericCollectionErrorMessage=Imposible encontrar elementos en la colección que satisfagan las condiciones.
-errorPopoverCollectionHTMLFailureMessage=CON ERRORES : {0}
-errorPopoverCollectionHTMLField=Campo : {0}
-errorPopoverCollectionHTMLValue=Valor : {0}
-dateFormatPlaceholder=Insertar la fecha como aaaa-mm-dd
-dateTimeFormatPlaceholder=Inserte la fecha como aaaa-mm-ddThh:mm:ss
-timeFormatPlaceholder=Insertar la hora como hh:mm:ss
-dmnDateFormatPlaceholder=Insertar la fecha como fecha (“aaaa-mm-dd”)
-rulesFired=Reglas ejecutadas para el escenario de prueba
-numberOfTimesRulesFired=La cantidad de veces que cada regla se ha ejecutado:
-reportAvailableRuleLabel=Reglas disponibles:
-reportExecutedRuleLabel=Reglas ejecutadas:
-reportCoverageRuleLabel=Porcentaje de reglas ejecutadas:
-noDecisionsAvailable=No se puede generar un informe de cobertura cuando no hay decisiones disponibles.
-noRulesAvailable=No se puede generar un informe de cobertura cuando hay reglas disponibles.
-
-headerTitleEmptyError=No es posible asignar un título vacío.
-instanceTitleAssignedError=Ya se ha usado una instancia con el título ''{0}'' dentro del grupo actual
-instanceTitleWithPeriodsError=Un alias de instancia no puede contener puntos.
-propertyTitleAssignedError=Ya se ha usado una propiedad con el título ''{0}'' dentro de la instancia actual
-propertyTitleWithPeriodsError=Un alias de propiedad no puede contener puntos.
-validationErrorMessage=La estructura de datos detrás de estas columnas ha cambiado y necesita arreglarse
-validationErrorTitle=Asociación de columna incorrecta
-validationFailedNotification=Imposible de validar. Verifique los errores de compilación de la construcción del proyecto
-validationSucceed=Validación correcta
-loadContentFailedNotification=Imposible cargar el archivo. Error: 
-
-backgroundTabTitle=Fondo
-backgroundErrorNotification=Hay errores en los datos de fondo, compruébelos
-ruleCheatSheet23=Para especificar una expresión de MVEL (o invocar un método de Java) solo hay que poner # al principio de la expresión. En la sección DADO, el tipo de retorno de la expresión debe coincidir con el del tipo de la columna. En la sección PREVER el tipo también podría ser solo un booleano con el resultado de la afirmación y se puede usar el identificador de valor real para acceder al valor a comprobar.
-commonCheatSheetBackground=Si se comparten los mismos datos de DADO con los múltiples escenarios de prueba, puede usar la pestaña {0} para definirlos solo una vez. La forma de crear una columna en la pestaña {0} es la misma que la de la pestaña {1}.
-
-ruleScenarioNotSupportedNotification=Actualmente no se admite el escenario de prueba RULE
-
-createButton=Crear
-saveButton=Guardar
-removeButton=Quitar
-cancelButton=Cancelar
-item=Ítem
-collectionEditorAddNewItem=Nuevo ítem
-addNewListItem=Añadir valor de la lista
-addNewMapItem=Añadir valor del mapa
-createLabelList=Crear enlace
-createLabelMap=Crear nuevo
-defineLabelList=Definir la lista
-defineLabelMap=Definir un
-collectionListCreation=Definir los valores de la lista para este objeto de datos
-collectionMapCreation=Definir los valores del mapa para este objeto de datos
-createLabelListDescription= - crear una lista mediante un formulario guiado
-defineLabelListDescription= - definir una lista mediante una expresión
-defineLabelMapDescription= - definir un mapa mediante una expresión
-createLabelMapDescription= - crear un mapa mediante un formulario guiado
-
-scenarioValidationNodeChangedError=El tipo de nodo ha cambiado: antiguo ''{0}'', actual ''{1}''
-scenarioValidationFieldChangedError=El tipo de campo ha cambiado: antiguo ''{0}'', actual ''{1}''
-scenarioValidationFieldAddedConstraintError=Se ha añadido una restricción para este tipo. Esto requiere redefinir su columna relacionada.
-scenarioValidationFieldRemovedConstraintError=Se ha eliminado una restricción para este tipo. Esto requiere redefinir su columna relacionada.
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_fr.properties b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_fr.properties
deleted file mode 100644
index c1f98be..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_fr.properties
+++ /dev/null
@@ -1,242 +0,0 @@
-#
-# 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. 
-#
-
-newScenarioSimulationDescription=Scénario de test
-selectImportFile=Sélectionnez le fichier à importer.
-importLabel=Importer
-removeCollectionMainTitle=Supprimer la collection
-collectionError=Erreur de collection
-removeCollectionMainQuestion=Supprimer la collection ?
-factColumnHeader=Fait
-fieldColumnHeader=Champ
-contextColumnHeader=Contexte
-addScenarioSimulation=Créer un scénario de test
-scenarioSimulationEditorTitle=Scénarios de test
-scenarioSimulationResourceTypeDescription=Scénarios de test
-remove=Supprimer
-currentlyNotAvailable=Non disponible actuellement
-invalidDefinitionDisabled=Définition non valide. La modification est désactivée.
-testTools=Outils de test
-testEditor=Éditeur de test
-testReport=Rapport de test
-testToolsAddButton=Insérer un objet de données
-testToolsAddButtonLabel=* La sélection d''un objet de données nécessite une valeur d''expression pour l''ensemble de la colonne.
-scenarioCheatSheet=Aide-mémoire du scénario
-ruleCheatSheet1=Pour commencer, cliquez avec le bouton droit de la souris sur une cellule du tableau et utilisez les menus contextuels pour insérer de nouvelles colonnes et lignes.
-ruleCheatSheet2=Avant de définir les différents scénarios de test, définissez les mappages d''instances et de champs pour chaque colonne. Sélectionnez une cellule d''en-tête et dans l''onglet
-ruleCheatSheet3=choisissez le champ requis. Cliquez sur
-ruleCheatSheet4=Ajouter
-ruleCheatSheet5=pour définir le mappage.
-ruleCheatSheet6=Définissez à présent les scénarios de test. Chaque cellule du tableau doit contenir une expression valide.
-ruleCheatSheet7=Dans les scénarios basés sur des règles, les expressions suivantes sont prises en charge :
-ruleCheatSheet8=(ou aucun symbole) indique l''égalité d''une valeur. Il s''agit de l''opérateur par défaut de chaque colonne et le seul à être pris en charge dans la section GIVEN du tableau.
-ruleCheatSheet9=indique l''inégalité d''une valeur. Cet opérateur peut être combiné à d''autres opérateurs.
-ruleCheatSheet10=indique une comparaison : inférieur à, supérieur à, inférieur ou égal à et supérieur ou égal à.
-ruleCheatSheet11=valeur1, valeur2, valeur3
-ruleCheatSheet12=indique une liste de valeurs. Si
-ruleCheatSheet13=une ou plusieurs
-ruleCheatSheet14=valeurs sont correctes, la définition du scénario est évaluée comme vraie.
-ruleCheatSheet15=expression1; expression2; expression3
-ruleCheatSheet16=indique une liste d''expressions. Si
-ruleCheatSheet17=tous
-ruleCheatSheet18=expressions sont valides, la définition du scénario est évaluée comme vraie.
-ruleCheatSheet19=Pour définir une chaîne vide, utilisez
-ruleCheatSheet20=Pour définir une valeur nulle, utilisez
-ruleCheatSheet21=Une cellule vide est omise de l''évaluation.
-ruleCheatSheet22=Exemples d''expressions :
-dmnCheatSheet1=Pour commencer, cliquez avec le bouton droit de la souris sur une cellule du tableau et utilisez les menus contextuels pour modifier le tableau généré suivant vos besoins.
-dmnCheatSheet2=Avant de définir les différents scénarios de test, vérifiez les mappages d''instances et de champs pour chaque colonne. Si des modifications sont nécessaires, utilisez l''onglet 
-dmnCheatSheet3=pour mettre à jour le mappage.
-dmnCheatSheet4=Définissez à présent les scénarios de test. Chaque cellule du tableau doit contenir une expression valide.
-dmnCheatSheet5=Les valeurs de la partie GIVEN du tableau sont évaluées comme des expressions littérales, tandis que les valeurs de la section EXPECT sont évaluées comme des expressions unaires. Pour vérifier l''exactitude de ces tests unaires, on utilise les résultats d''une évaluation DMN.
-dmnCheatSheet6=Les scénarios basés sur DMN utilisent le langage d''expression FEEL. Les types de données pris en charge sont les suivants :
-dmnCheatSheet7=nombres
-dmnCheatSheet8=chaînes de caractères
-dmnCheatSheet9=(les chaînes de caractères doivent être délimitées par des guillemets), par exemple
-dmnCheatSheet10=valeurs booléennes
-dmnCheatSheet11=dates
-dmnCheatSheet12=temps
-dmnCheatSheet13=fonctions
-dmnCheatSheet14=contextes
-dmnCheatSheet15=plages
-dmnCheatSheet16=listes
-dmnCheatSheet17=Une cellule vide est omise de l''évaluation.
-dmnCheatSheet18=Dans la section EXPECT, le type peut également être une simple valeur booléenne avec le résultat de l''assertion et vous pouvez utiliser l''identificateur ? pour accéder à la valeur à vérifier.
-dmnCheatSheet19=Jours et durée
-dmnCheatSheet20=Durée en années et en mois
-dmnCheatSheet21=exprimé selon la norme ISO 8601
-and=et
-or=ou
-forExample=, par exemple
-runScenarioSimulation=Exécuter le test
-insertValue=Insérer une valeur
-insertExpression=Insérer une expression
-defineValidType=Définir un type valide
-# Menus
-expect=Expect
-given=Given
-scenario=Scénario
-background=Arrière-plan
-insertColumnLeft=Insérer la colonne à gauche
-insertLeftmostColumn=Insérer la colonne la plus à gauche
-insertColumnRight=Insérer la colonne à droite
-insertRightmostColumn=Insérer la colonne la plus à droite
-deleteColumn=Supprimer la colonne
-deleteInstance=Supprimer l''instance
-duplicateInstance=Dupliquer l''instance
-prependRow=Insérer la ligne supérieure
-appendRow=Insérer la ligne inférieure
-insertRowAbove=Insérer la ligne au-dessus
-insertRowBelow=Insérer la ligne en dessous
-deleteRow=Supprimer la ligne
-duplicateRow=Dupliquer la ligne
-runSingleScenario=Exécuter le scénario
-description=Description
-# DeletePropertyConfirmPopup
-deleteValues=Supprimer les valeurs
-deleteScenarioMainTitle=Supprimer les valeurs du scénario
-deleteScenarioMainQuestion=Supprimer les valeurs du scénario ?
-deleteScenarioText1=Cette colonne contient des valeurs d''entrée de scénario qui ne correspondront pas au rapport de test après cette modification et qui seront donc supprimées.
-deleteScenarioTextQuestion=Voulez-vous procéder à la suppression de toutes les valeurs de scénario de cette colonne ?
-deleteScenarioTextDanger=Avertissement : cette action ne peut pas être annulée.
-# PreserveDeletePropertyConfirmPopup
-preserveDeleteScenarioMainTitle=Conserver ou supprimer les valeurs de scénario
-preserveDeleteScenarioMainQuestion=Conserver ou supprimer les valeurs de scénario ?
-preserveDeleteScenarioText1=Cette colonne contient des valeurs d''entrée de scénario qui ne correspondront peut-être pas au rapport de test après cette modification.
-preserveDeleteScenarioTextQuestion=Sélectionnez la méthode que vous souhaitez appliquer :
-preserveDeleteScenarioTextOption1=Conserver les valeurs de scénario existantes dans cette colonne.
-preserveDeleteScenarioTextOption2=Supprimer toutes les valeurs de scénario de cette colonne.
-preserveValues=Conserver les valeurs
-# ChangeInstanceTypeConfirmPopup
-changeType=Changer de type
-changeTypeMainTitle=Changer de type d''instance
-changeTypeMainQuestion=Changer de type d''instance ?
-changeTypeText1=Cette colonne est associée à une propriété qui ne correspondra pas au rapport de test après cette modification et qui sera donc supprimée.
-changeTypeTextQuestion=Voulez-vous procéder à la suppression de cette colonne ?
-changeTypeTextDanger=Avertissement : cette action ne peut pas être annulée.
-#
-undo=Annuler
-redo=Rétablir
-#
-sourceType=Type de source
-chooseDMN=Choisir une ressource DMN
-chooseValidDMNAsset=Sélectionnez une ressource  DMN valide dans la liste.
-removeCollectionText1=Cela aura pour effet de supprimer tous les éléments de la collection, ainsi que la collection proprement dite.
-removeCollectionQuestion=Voulez-vous procéder à la suppression de cette collection ?
-removeCollectionWarningText=Cette action ne peut pas être annulée.
-#
-settings=Paramètres
-name=Nom
-type=Type
-dmnPathErrorLabel=Impossible de trouver le fichier ''{0}''. Veuillez en sélectionner un.
-dmnPathErrorDetailedLabel=Le fichier DMN référencé ''{0}'' n''est pas valide ou n''est pas présent. Veuillez fournir un fichier DMN valide et mettre à jour la Configuration dock à droite. Message: ''{1}''
-missingSelectedType=Type sélectionné manquant
-missingDmnPath=Chemin d''accès du DMN manquant
-coverageReport=Rapport de couverture
-uploadWarning=Assurez-vous que les en-têtes du fichier CSV sélectionné n''ont pas été modifiés. Dans le cas contraire, il se peut que l''importation de la feuille de calcul échoue.
-chooseFile=Veuillez sélectionner un fichier à envoyer
-importFailedMessage=Un fichier CSV avec une disposition d''en-tête incorrecte a été importé. Assurez-vous que le fichier CSV importé comporte des en-têtes non modifiés.
-importErrorTitle=Erreur lors de l''importation
-executed=Exécuté
-notCovered=Omis
-decisionsEvaluated=Décisions évaluées pour le scénario de test
-coverageNotSupportedForRule=Le rapport de couverture n''est pas pris en charge actuellement pour les scénarios de test basés sur des règles.
-runATestToSeeCoverageReport=Exécutez d''abord les scénarios de test pour afficher le rapport de couverture.
-running=Exécution…
-#
-testToolsDescription=Pour créer un modèle de test, définissez les colonnes "Given" et "Expect" en utilisant l''éditeur d''expression ci-dessous.
-testToolObjectSelectionTitle=Sélectionner un objet de données
-testToolObjectSelectionTooltip=Les objets de données sont les objets Java situés dans les packages spécifiés de votre projet.
-testToolClearSelection=Effacer la sélection
-simpleTypes=Types simples
-complexTypes=Types complexes
-complexCustomInstances=Instances personnalisées complexes
-simpleCustomInstances=Instances personnalisées simples
-dataObjectInstances=Instances d''objets de données
-reportAvailableLabel=Décisions disponibles :
-reportExecutedLabel=Décisions testées :
-reportCoverageLabel=Pourcentage de décisions testées :
-numberOfTimesDecisionEvaluated=Nombre de fois où chaque décision a été évaluée :
-skipSimulation=Ignorer cette simulation pendant le test
-downloadReportLabel=Télécharger le rapport
-#
-export=Exporter
-errorReason=Raison de l''erreur
-keep=Conserver
-close=Fermer
-apply=Appliquer
-errorPopoverMessageFailedWithError=La valeur attendue est {0} mais la valeur réelle est {1}.
-errorPopoverMessageFailedWithException=Message d''erreur : {0}
-errorPopoverGenericCollectionErrorMessage=Impossible de trouver des éléments dans la collection pour satisfaire les conditions.
-errorPopoverCollectionHTMLFailureMessage=Échec dans : {0}
-errorPopoverCollectionHTMLField=Champ : {0}
-errorPopoverCollectionHTMLValue=Valeur : {0}
-dateFormatPlaceholder=Insérer la date au format aaaa-mm-jj
-dateTimeFormatPlaceholder=Insérer la date et l''heure comme suit : aaaa-mm-jjThh:mm:ss
-timeFormatPlaceholder=Insérer l''heure comme hh:mm:ss
-dmnDateFormatPlaceholder=Insérer la date au format date("aaaa-mm-jj")
-rulesFired=Règles déclenchées pour le scénario de test
-numberOfTimesRulesFired=Nombre de fois où chaque règle a été déclenchée :
-reportAvailableRuleLabel=Règles disponibles :
-reportExecutedRuleLabel=Règles déclenchées :
-reportCoverageRuleLabel=Pourcentage de règles déclenchées :
-noDecisionsAvailable=Un rapport de couverture ne peut pas être généré quand aucune décision n''est disponible.
-noRulesAvailable=Un rapport de couverture ne peut pas être généré quand aucune règle n''est disponible.
-
-headerTitleEmptyError=Impossible d''attribuer un titre vide !
-instanceTitleAssignedError=Une instance intitulée ''{0}'' a déjà été utilisée dans le groupe actuel
-instanceTitleWithPeriodsError=Un alias d''instance ne peut pas contenir de points !
-propertyTitleAssignedError=Une propriété intitulée ''{0}'' a déjà été utilisée dans l''instance actuelle
-propertyTitleWithPeriodsError=Un alias de propriété ne peut pas contenir de points !
-validationErrorMessage=La structure de données sous-jacente de ces colonnes a été modifiée et doit être corrigée
-validationErrorTitle=Mappage de colonnes incorrect
-validationFailedNotification=Validation impossible. Veuillez consulter les erreurs de compilation du projet
-validationSucceed=Validation réussie
-loadContentFailedNotification=Impossible de charger le fichier.  Erreur : 
-
-backgroundTabTitle=Arrière-plan
-backgroundErrorNotification=Les données d''arrière-plan comportent des erreurs. Veuillez les vérifier.
-ruleCheatSheet23=Pour spécifier une expression MVEL (ou appeler une méthode Java), il vous suffit de faire commencer l''expression par #. Dans la section GIVEN, le type de retour de l''expression doit être le même que celui de la colonne. Dans la section EXPECT, le type peut également être une simple valeur booléenne avec le résultat de l''assertion et vous pouvez utiliser l''identificateur actualValue pour accéder à la valeur à vérifier.
-commonCheatSheetBackground=Si les mêmes données GIVEN sont partagées avec les différents scénarios de test, vous pouvez utiliser l''onglet {0} pour les définir une seule fois. La méthode de création d''une colonne dans l''onglet {0} est identique à celle utilisée dans l''onglet {1}.
-
-ruleScenarioNotSupportedNotification=RULE Test Scenario n''est actuellement pas pris en charge
-
-createButton=Créer
-saveButton=Enregistrer
-removeButton=Supprimer
-cancelButton=Annuler
-item=Élément
-collectionEditorAddNewItem=Ajouter un nouvel élément
-addNewListItem=Ajouter une valeur à la liste
-addNewMapItem=Ajouter de la valeur à la mappe
-createLabelList=Créer une liste
-createLabelMap=Créer une mappe
-defineLabelList=Définir la liste
-defineLabelMap=Définir la mappe
-collectionListCreation=Définir les valeurs de liste pour cet objet de données
-collectionMapCreation=Définir les valeurs de la carte pour cet objet de données
-createLabelListDescription= - créer une liste à l''aide d''un formulaire guidé
-defineLabelListDescription= - définir une liste à l''aide d''une expression
-defineLabelMapDescription= - définir une mappe à l''aide d''une expression
-createLabelMapDescription= - créer une mappe à l''aide d''un formulaire guidé
-
-scenarioValidationNodeChangedError=Le type de nœud a changé : anciennement ''{0}'', actuellement ''{1}''
-scenarioValidationFieldChangedError=Le type de champ a changé : anciennement ''{0}'', actuellement ''{1}''
-scenarioValidationFieldAddedConstraintError=Une contrainte a été ajoutée pour ce type. Cela nécessite de redéfinir la colonne correspondante.
-scenarioValidationFieldRemovedConstraintError=Une contrainte a été supprimée pour ce type. Cela nécessite de redéfinir la colonne correspondante.
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_ja.properties b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_ja.properties
deleted file mode 100644
index 40fb395..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_ja.properties
+++ /dev/null
@@ -1,242 +0,0 @@
-#
-# 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. 
-#
-
-newScenarioSimulationDescription=テストシナリオ
-selectImportFile=インポートするファイルを選択します。
-importLabel=インポート
-removeCollectionMainTitle=コレクションを削除
-collectionError=コレクションのエラー
-removeCollectionMainQuestion=コレクションを削除しますか?
-factColumnHeader=ファクト
-fieldColumnHeader=フィールド
-contextColumnHeader=コンテキスト
-addScenarioSimulation=テストシナリオを作成
-scenarioSimulationEditorTitle=テストシナリオ
-scenarioSimulationResourceTypeDescription=テストシナリオ
-remove=削除
-currentlyNotAvailable=現在ご利用いただけません
-invalidDefinitionDisabled=無効な定義です。編集は無効となりました。
-testTools=テストツール
-testEditor=テストエディター
-testReport=テストレポート
-testToolsAddButton=データオブジェクトの挿入
-testToolsAddButtonLabel=* データオブジェクトを選択するには、列全体の式の値が必要です。
-scenarioCheatSheet=シナリオのチートシート
-ruleCheatSheet1=はじめにテーブル内のセルを右クリックし、コンテキストメニューを使って新たなコラムと行を挿入します。
-ruleCheatSheet2=個別のテストシナリオを定義する前に、各列のインスタンスとフィールドマッピングを設定します。ヘッダーセルを選択し、
-ruleCheatSheet3=タブで必要なフィールドを選択します。クリック
-ruleCheatSheet4=追加
-ruleCheatSheet5=マッピングを選択します。
-ruleCheatSheet6=続いて、テストシナリオを定義します。テーブルの各セルには、有効な式が含まれている必要があります。
-ruleCheatSheet7=ルールベースのシナリオでは、以下の式がサポートされています。
-ruleCheatSheet8=(または記号なし) 値が等しいことを指定します。これは各列のデフォルトのオペレーターで、テーブルの GIVEN セクションでサポートされている唯一のオペレーターです。
-ruleCheatSheet9=値が等しくないことを指定します。このオペレーターは他のオペレーターと組み合わせることが可能です。
-ruleCheatSheet10=比較を指定します: より小さい、より大きい、以下、以上。
-ruleCheatSheet11=値1、値2、値3
-ruleCheatSheet12=値のリストを指定します。もし
-ruleCheatSheet13=1 つ以上の値が有効な場合は、
-ruleCheatSheet14=シナリオの定義が true と評価されます。
-ruleCheatSheet15=式1; 式2; 式3
-ruleCheatSheet16=式のリストを指定します。もし
-ruleCheatSheet17=すべての式が有効な場合は、
-ruleCheatSheet18=シナリオの定義が true と評価されます。
-ruleCheatSheet19=空の文字列を定義するには、以下を使用します
-ruleCheatSheet20=null 値を定義するには、以下を使用します
-ruleCheatSheet21=空のセルは評価が省略されます。
-ruleCheatSheet22=式の例:
-dmnCheatSheet1=はじめにテーブル内のセルを右クリックし、コンテキストメニューを使って、必要に応じて生成されたテーブルを修正します。
-dmnCheatSheet2=個別のテストシナリオを定義する前に、各列のインスタンスとフィールドマッピングを確認します。変更が必要な場合は、 
-dmnCheatSheet3=変更が必要な場合は、タブを使ってマッピングを更新します。
-dmnCheatSheet4=続いて、テストシナリオを定義します。テーブルの各セルには、有効な式が含まれている必要があります。
-dmnCheatSheet5=テーブルの GIVEN 部分にある値はリテラル式として評価されますが、EXPECT セクションの値は単項式として評価されます。これらの単項テストの正確性は、DMN 評価の結果を使用して確認されます。
-dmnCheatSheet6=DMN ベースのシナリオでは、FEEL 式言語を使用します。サポートされるデータタイプは以下の通りです。
-dmnCheatSheet7=数字
-dmnCheatSheet8=文字列
-dmnCheatSheet9=(文字列は引用符で区切る必要があります)、たとえば
-dmnCheatSheet10=ブール値
-dmnCheatSheet11=日付
-dmnCheatSheet12=時間
-dmnCheatSheet13=関数
-dmnCheatSheet14=コンテキスト
-dmnCheatSheet15=範囲
-dmnCheatSheet16=一覧
-dmnCheatSheet17=空のセルは評価が省略されます。
-dmnCheatSheet18=EXPECT セクションでは、型は単にアサーションの結果としてのブール値である場合があり、? 識別子を使用してチェックする値にアクセスできます。
-dmnCheatSheet19=期間 (日時)
-dmnCheatSheet20=期間 (月日)
-dmnCheatSheet21=ISO 8601 に従って表現
-and=and
-or=または
-forExample=たとえば、
-runScenarioSimulation=テストを実行する
-insertValue=値を入力する
-insertExpression=式を挿入する
-defineValidType=有効なタイプを定義する
-# Menus
-expect=期待値
-given=指定
-scenario=シナリオ
-background=背景セット
-insertColumnLeft=左に列を挿入
-insertLeftmostColumn=左端に列を挿入
-insertColumnRight=右に列を挿入
-insertRightmostColumn=右端に列を挿入
-deleteColumn=列の削除
-deleteInstance=インスタンスの削除
-duplicateInstance=インスタンスを複製
-prependRow=上端に行を挿入
-appendRow=下端に行を挿入
-insertRowAbove=行を上に挿入
-insertRowBelow=行を下に挿入
-deleteRow=行の削除
-duplicateRow=行の重複
-runSingleScenario=シナリオを実行
-description=説明
-# DeletePropertyConfirmPopup
-deleteValues=値の削除
-deleteScenarioMainTitle=シナリオの値を削除
-deleteScenarioMainQuestion=シナリオの値を削除しますか?
-deleteScenarioText1=このコラムには、この変更後にテストステートメントと一致しなくなり、削除されることになるシナリオ入力値が含まれています。
-deleteScenarioTextQuestion=このコラムの全シナリオ値を本当に削除しますか?
-deleteScenarioTextDanger=警告: この操作は元に戻せません。
-# PreserveDeletePropertyConfirmPopup
-preserveDeleteScenarioMainTitle=シナリオ値の保持または削除
-preserveDeleteScenarioMainQuestion=シナリオの値を保持または削除しますか?
-preserveDeleteScenarioText1=このコラムには、この変更後にテストステートメントと一致しなくなる可能性のあるシナリオ入力値が含まれています。
-preserveDeleteScenarioTextQuestion=続行方法を選択してください:
-preserveDeleteScenarioTextOption1=このコラムの既存のシナリオ値を保持する。
-preserveDeleteScenarioTextOption2=この列のすべてのシナリオ値を削除します。
-preserveValues=値の保持
-# ChangeInstanceTypeConfirmPopup
-changeType=タイプの変更
-changeTypeMainTitle=インスタンスタイプの変更
-changeTypeMainQuestion=インスタンスタイプを変更しますか?
-changeTypeText1=このコラムは、この変更後にテストステートメントと一致しなくなり、削除されることになるプロパティーにマッピングされています。
-changeTypeTextQuestion=このコラムを本当に削除しますか?
-changeTypeTextDanger=警告: この操作は元に戻せません。
-#
-undo=元に戻す
-redo=やり直す
-#
-sourceType=ソースタイプ
-chooseDMN=DMN アセットを選択
-chooseValidDMNAsset=リストから有効な DMN アセットを選択します
-removeCollectionText1=このアクションでは、コレクション自体とコレクションからすべてのアイテムが削除されます。
-removeCollectionQuestion=続行してコレクションを削除しますか?
-removeCollectionWarningText=このアクションは取り消せません。
-#
-settings=設定
-name=名前
-type=タイプ
-dmnPathErrorLabel=''{0}'' ファイルを見つけることができません。1 つ選択してください。
-dmnPathErrorDetailedLabel=参照する DMN ファイル ''{0}'' は無効です。右側に、有効な DMN ファイルを指定して設定を更新してください。メッセージ: ''{1}''
-missingSelectedType=選択したタイプがありません
-missingDmnPath=DMN パスがありません
-coverageReport=カバレッジレポート
-uploadWarning=選択した CSV ファイルのヘッダーが変更されていないことを確認してください。そうしないと、スプレッドシートが正常にインポートされない場合があります。
-chooseFile=アップロードするファイルを選択してください
-importFailedMessage=誤ったヘッダーレイアウトの CSV ファイルがインポートされました。インポートされた CSV ファイルのヘッダーが変更されていないことを確認してください。
-importErrorTitle=インポート時のエラー
-executed=実行済み
-notCovered=省略
-decisionsEvaluated=テストシナリオ用に評価されたデシジョン
-coverageNotSupportedForRule=カバレッジレポートは現在、ルールベースのテストシナリオではサポートされていません。
-runATestToSeeCoverageReport=先にテストシナリオを実行してカバレッジレポートを表示してください。
-running=実行中...
-#
-testToolsDescription=テストテンプレートを作成するには、以下の式エディターを使用して "Given" と "Expect" の各列を定義します。
-testToolObjectSelectionTitle=データオブジェクトの選択
-testToolObjectSelectionTooltip=データオブジェクトは、プロジェクトの指定されたパッケージ内の Java オブジェクトです。
-testToolClearSelection=選択のクリア
-simpleTypes=シンプルな型
-complexTypes=複雑な型
-complexCustomInstances=複雑なカスタムインスタンス
-simpleCustomInstances=シンプルなカスタムインスタンス
-dataObjectInstances=データオブジェクトインスタンス
-reportAvailableLabel=利用可能なデシジョン:
-reportExecutedLabel=テスト済みのデシジョン:
-reportCoverageLabel=テスト済みのデシジョンの割合:
-numberOfTimesDecisionEvaluated=各デシジョンが評価された回数
-skipSimulation=テスト中にこのシミュレーションをスキップ
-downloadReportLabel=レポートをダウンロード
-#
-export=エクスポート
-errorReason=エラーの理由
-keep=保持
-close=閉じる
-apply=適用
-errorPopoverMessageFailedWithError=想定される値は {0} ですが、実際の値は {1} となっています。
-errorPopoverMessageFailedWithException=エラーメッセージ: {0}
-errorPopoverGenericCollectionErrorMessage=コレクションでこの条件を満たす要素を見つけることができません。
-errorPopoverCollectionHTMLFailureMessage=失敗: {0}
-errorPopoverCollectionHTMLField=フィールド: {0}
-errorPopoverCollectionHTMLValue=値: {0}
-dateFormatPlaceholder=日付を yyyy-mm-dd 形式で入力してください
-dateTimeFormatPlaceholder=日時を yyyy-mm-ddThh:mm:ss として挿入します
-timeFormatPlaceholder=時間を hh:mm:ss として挿入します
-dmnDateFormatPlaceholder=日付を入力してください ("yyyy-mm-dd" 形式)
-rulesFired=テストシナリオに対して実行されたルール
-numberOfTimesRulesFired=各ルールが実行された回数
-reportAvailableRuleLabel=利用可能なルール:
-reportExecutedRuleLabel=実行されたルール:
-reportCoverageRuleLabel=実行されたルールの割合:
-noDecisionsAvailable=利用可能なデシジョンがない場合、カバレッジレポートを生成できません。
-noRulesAvailable=利用可能なルールがない場合、カバレッジレポートを生成できません。
-
-headerTitleEmptyError=空のタイトルを割り当てることはできません!
-instanceTitleAssignedError=タイトル ''{0}'' のインスタンスは、現在のグループ内ですでに使用されています
-instanceTitleWithPeriodsError=インスタンスエイリアスには、ピリオドを含めることはできません!
-propertyTitleAssignedError=タイトル ''{0}'' のプロパティーは、現在のインスタンス内ですでに使用されています
-propertyTitleWithPeriodsError=プロパティーエイリアスには、ピリオドを含めることはできません!
-validationErrorMessage=これらの列の背後のデータ構造は変更されており、修正する必要があります
-validationErrorTitle=間違った列のマッピング
-validationFailedNotification=検証することができません。プロジェクトビルドのコンパイルエラーを確認してください
-validationSucceed=検証が正常に行われました
-loadContentFailedNotification=ファイルを読み込めません。エラー:
-
-backgroundTabTitle=背景セット
-backgroundErrorNotification=背景データにエラーがあります。確認してください。
-ruleCheatSheet23=MVEL 式を指定する (または Java メソッドを呼び出す) には、式の先頭に # を入力します。GIVEN セクションでは、式の戻り値の型は列の型と同じでなければなりません。EXPECT セクションでは、型は単にアサーションの結果としてのブール値である場合があり、actualValue 識別子を使用してチェックする値にアクセスできます。
-commonCheatSheetBackground=同じ GIVEN データが複数のテストシナリオで共有されている場合、{0} タブを使用してそれらを一度だけ定義できます。{0} タブで列を作成する方法は、{1} タブの場合と同じです。
-
-ruleScenarioNotSupportedNotification=RULE テストシナリオは現在サポートされていません
-
-createButton=作成
-saveButton=保存
-removeButton=削除
-cancelButton=キャンセル
-item=アイテム
-collectionEditorAddNewItem=新規アイテムの追加
-addNewListItem=リスト値の追加
-addNewMapItem=マップ値の追加
-createLabelList=リストの作成
-createLabelMap=マップの作成
-defineLabelList=リストの定義
-defineLabelMap=マップの定義
-collectionListCreation=このデータオブジェクトのリスト値の定義
-collectionMapCreation=このデータオブジェクトのマップ値の定義
-createLabelListDescription= - ガイド付きフォームを使用してリストを作成する
-defineLabelListDescription= - 式を使用してリストを定義する
-defineLabelMapDescription= - 式を使用してマップを定義する
-createLabelMapDescription= - ガイド付きフォームを使用してマップを作成する
-
-scenarioValidationNodeChangedError=ノードタイプが変更されました: old ''{0}'', current ''{1}''
-scenarioValidationFieldChangedError=フィールドタイプが変更されました: old ''{0}'', current ''{1}''
-scenarioValidationFieldAddedConstraintError=このタイプに制約が追加されました。これには、関連する列を再定義する必要があります。
-scenarioValidationFieldRemovedConstraintError=このタイプの制約が削除されました。これには、関連する列を再定義する必要があります。
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_pt_BR.properties b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_pt_BR.properties
deleted file mode 100644
index bfb09cf..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_pt_BR.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.
-#
-
-# translation auto-copied from project Drools Workbench, version 6.0.0, document org.drools/drools-wb-guided-scorecard-editor-client/org/drools/workbench/screens/guided/scorecard/client/resources/i18n/GuidedScoreCardConstants, author ldelima@redhat.com
-remove=Remover
-invalidDefinitionDisabled=Definição inválida. Edição desabilitada. 
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_zh_CN.properties b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_zh_CN.properties
deleted file mode 100644
index caba154..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants_zh_CN.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.
-#
-
-# translation auto-copied from project Drools Workbench, version 6.0.0, document org.drools/drools-wb-guided-scorecard-editor-client/org/drools/workbench/screens/guided/scorecard/client/resources/i18n/GuidedScoreCardConstants, author xi.huang
-remove=删除
-invalidDefinitionDisabled=无效定义。编辑被禁用。
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/images/BPM_FileIcons_ScenarioSimulation.png b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/images/BPM_FileIcons_ScenarioSimulation.png
deleted file mode 100644
index f621fc0..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/images/BPM_FileIcons_ScenarioSimulation.png
+++ /dev/null
Binary files differ
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/kie/workbench/common/KieWorkbenchCommonWidgets.gwt.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/kie/workbench/common/KieWorkbenchCommonWidgets.gwt.xml
deleted file mode 100644
index 9b1c03a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/kie/workbench/common/KieWorkbenchCommonWidgets.gwt.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  ~ 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.      
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN"
-  "http://www.gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-  <source path="widgets" />
-</module>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/kie/workbench/common/command/KieWorkbenchCommonCommand.gwt.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/kie/workbench/common/command/KieWorkbenchCommonCommand.gwt.xml
deleted file mode 100644
index 9a106b8..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/kie/workbench/common/command/KieWorkbenchCommonCommand.gwt.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  ~ 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.      
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN"
-  "http://www.gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-  <source path="client" />
-</module>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/AbstractScenarioSimulationTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/AbstractScenarioSimulationTest.java
deleted file mode 100644
index 57ba22a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/AbstractScenarioSimulationTest.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import javax.enterprise.event.Event;
-
-import com.ait.lienzo.client.core.types.Point2D;
-import com.google.gwt.event.shared.EventBus;
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.ExpressionElement;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValue;
-import org.drools.scenariosimulation.api.model.Scenario;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScenarioWithIndex;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioCommandManager;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioCommandRegistryManager;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationViolation;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.AppendRowCommand;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationEditorPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationView;
-import org.drools.workbench.screens.scenariosimulation.client.editor.strategies.DataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.factories.CollectionEditorSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioExpressionCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.models.BackgroundGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.models.ScenarioGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridLayer;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridPanel;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridWidget;
-import org.drools.workbench.screens.scenariosimulation.model.SimulationRunResult;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.junit.Before;
-import org.kie.workbench.common.command.client.CommandResult;
-import org.kie.workbench.common.command.client.CommandResultBuilder;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridCellValue;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-import org.uberfire.ext.wires.core.grids.client.model.GridRow;
-import org.uberfire.mocks.EventSourceMock;
-import org.uberfire.workbench.events.NotificationEvent;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_NUMBER;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_ALIAS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_IDENTIFIER_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FIRST_INDEX_LEFT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FIRST_INDEX_RIGHT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PACKAGE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_PROPERTY_TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyObject;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractScenarioSimulationTest {
-
-    // Simulation tab
-    protected ScenarioGridModel scenarioGridModelMock;
-
-    @Mock
-    protected Simulation simulationMock;
-    @Mock
-    protected Simulation clonedSimulationMock;
-
-    @Mock
-    protected ScesimModelDescriptor simulationDescriptorMock;
-    @Mock
-    protected ScenarioGridColumn gridColumnMock;
-    @Mock
-    protected List<GridRow> rowsMock;
-    @Mock
-    protected ScenarioGridPanel scenarioGridPanelMock;
-
-    @Mock
-    protected ScenarioGridLayer scenarioGridLayerMock;
-
-    protected ScenarioGridWidget scenarioGridWidgetSpy;
-
-    @Mock
-    protected ScenarioGrid scenarioGridMock;
-
-    @Mock
-    protected List<GridColumn.HeaderMetaData> headerMetaDatasMock;
-
-    @Mock
-    protected ScenarioHeaderMetaData informationHeaderMetaDataMock;
-    @Mock
-    protected ScenarioHeaderMetaData propertyHeaderMetaDataMock;
-
-    // Background tab
-    @Mock
-    protected BackgroundGridModel backgroundGridModelMock;
-
-    @Mock
-    protected Background backgroundMock;
-    @Mock
-    protected Background clonedBackgroundMock;
-
-    @Mock
-    protected ScenarioGridPanel backgroundGridPanelMock;
-
-    @Mock
-    protected ScenarioGridLayer backgroundGridLayerMock;
-
-    protected ScenarioGridWidget backgroundGridWidgetSpy;
-
-    @Mock
-    protected ScenarioGrid backgroundGridMock;
-
-    // Common
-    @Mock
-    protected EventBus eventBusMock;
-    @Mock
-    protected ScenarioSimulationEditorPresenter scenarioSimulationEditorPresenterMock;
-    @Mock
-    protected ScenarioSimulationView scenarioSimulationViewMock;
-
-    protected Event<NotificationEvent> notificationEvent = new EventSourceMock<NotificationEvent>() {
-        @Override
-        public void fire(final NotificationEvent event) {
-            //Do nothing. Default implementation throws a RuntimeException
-        }
-    };
-
-    @Mock
-    protected ScenarioCommandRegistryManager scenarioCommandRegistryManagerMock;
-    @Mock
-    protected ScenarioCommandManager scenarioCommandManagerMock;
-    @Mock
-    protected ScenarioSimulationModel scenarioSimulationModelMock;
-    @Mock
-    protected SimulationRunResult simulationRunResultMock;
-    @Mock
-    protected DataManagementStrategy dataManagementStrategyMock;
-    @Mock
-    protected SortedMap<String, FactModelTree> dataObjectFieldsMapMock;
-
-    @Mock
-    protected ViewsProvider viewsProviderMock;
-
-    @Mock
-    protected FactMapping factMappingMock;
-
-    @Mock
-    protected FactIdentifier factIdentifierMock;
-
-    @Mock
-    protected FactMappingValue factMappingValueMock;
-
-    protected List<FactMappingValue> factMappingValuesLocal = new ArrayList<>();
-
-    protected List<ScenarioWithIndex> scenarioWithIndexLocal;
-
-    protected ScenarioSimulationContext scenarioSimulationContextLocal;
-    protected AppendRowCommand appendRowCommandMock;
-    protected CollectionEditorSingletonDOMElementFactory collectionEditorSingletonDOMElementFactoryTest;
-    protected ScenarioCellTextAreaSingletonDOMElementFactory scenarioCellTextAreaSingletonDOMElementFactorySpy;
-    protected ScenarioHeaderTextBoxSingletonDOMElementFactory scenarioHeaderTextBoxSingletonDOMElementFactorySpy;
-    protected ScenarioExpressionCellTextAreaSingletonDOMElementFactory scenarioExpressionCellTextAreaSingletonDOMElementFactorySpy;
-
-    protected final Set<FactIdentifier> factIdentifierSet = new HashSet<>();
-    protected final List<FactMapping> factMappingLocal = new ArrayList<>();
-    protected final FactMappingType factMappingType = FactMappingType.valueOf(COLUMN_GROUP);
-    protected List<GridColumn<?>> gridColumns = new ArrayList<>();
-    protected Settings settingsLocal;
-    protected Background backgroundLocal;
-
-    @Before
-    public void setup() {
-        settingsLocal = new Settings();
-        backgroundLocal = new Background();
-        scenarioWithIndexLocal = new ArrayList<>();
-
-        scenarioGridWidgetSpy = spy(new ScenarioGridWidget() {
-            {
-                this.scenarioGridPanel = scenarioGridPanelMock;
-            }
-        });
-
-        backgroundGridWidgetSpy = spy(new ScenarioGridWidget() {
-            {
-                this.scenarioGridPanel = backgroundGridPanelMock;
-            }
-        });
-
-        when(simulationMock.getScesimModelDescriptor()).thenReturn(simulationDescriptorMock);
-        when(simulationMock.getScenarioWithIndex()).thenReturn(scenarioWithIndexLocal);
-        when(backgroundMock.getScesimModelDescriptor()).thenReturn(simulationDescriptorMock);
-        when(simulationRunResultMock.getScenarioWithIndex()).thenReturn(scenarioWithIndexLocal);
-        GridData.Range range = new GridData.Range(FIRST_INDEX_LEFT, FIRST_INDEX_RIGHT - 1);
-        collectionEditorSingletonDOMElementFactoryTest = new CollectionEditorSingletonDOMElementFactory(scenarioGridPanelMock,
-                                                                                                        scenarioGridLayerMock,
-                                                                                                        scenarioGridMock,
-                                                                                                        scenarioSimulationContextLocal, viewsProviderMock);
-        scenarioCellTextAreaSingletonDOMElementFactorySpy = spy(new ScenarioCellTextAreaSingletonDOMElementFactory(scenarioGridPanelMock,
-                                                                                                                   scenarioGridLayerMock,
-                                                                                                                   scenarioGridMock));
-        scenarioHeaderTextBoxSingletonDOMElementFactorySpy = spy(new ScenarioHeaderTextBoxSingletonDOMElementFactory(scenarioGridPanelMock,
-                                                                                                                     scenarioGridLayerMock,
-                                                                                                                     scenarioGridMock));
-        scenarioExpressionCellTextAreaSingletonDOMElementFactorySpy = spy(new ScenarioExpressionCellTextAreaSingletonDOMElementFactory(scenarioGridPanelMock,
-                                                                                                                                       scenarioGridLayerMock,
-                                                                                                                                       scenarioGridMock));
-
-        scenarioGridModelMock = spy(new ScenarioGridModel(false) {
-            {
-                this.abstractScesimModel = simulationMock;
-                this.columns = gridColumns;
-                this.rows = rowsMock;
-                this.collectionEditorSingletonDOMElementFactory = collectionEditorSingletonDOMElementFactoryTest;
-                this.scenarioCellTextAreaSingletonDOMElementFactory = scenarioCellTextAreaSingletonDOMElementFactorySpy;
-                this.scenarioHeaderTextBoxSingletonDOMElementFactory = scenarioHeaderTextBoxSingletonDOMElementFactorySpy;
-                this.scenarioExpressionCellTextAreaSingletonDOMElementFactory = scenarioExpressionCellTextAreaSingletonDOMElementFactorySpy;
-                this.eventBus = eventBusMock;
-            }
-
-            @Override
-            protected void commonAddColumn(int index, GridColumn<?> column) {
-                //
-            }
-
-            @Override
-            protected void commonAddColumn(final int index, final GridColumn<?> column, ExpressionIdentifier ei) {
-                //
-            }
-
-            @Override
-            protected void commonAddRow(int rowIndex) {
-                //
-            }
-
-            @Override
-            public List<GridColumn<?>> getColumns() {
-                return columns;
-            }
-
-            @Override
-            public Range getInstanceLimits(int columnIndex) {
-                return range;
-            }
-
-            @Override
-            public int getFirstIndexLeftOfGroup(String groupName) {
-                return FIRST_INDEX_LEFT;
-            }
-
-            @Override
-            public int getFirstIndexRightOfGroup(String groupName) {
-                return FIRST_INDEX_RIGHT;
-            }
-
-            @Override
-            public GridColumn<?> getSelectedColumn() {
-                return gridColumnMock;
-            }
-
-            @Override
-            public void deleteColumn(final GridColumn<?> column) {
-                //
-            }
-
-            @Override
-            public Range deleteRow(int rowIndex) {
-                return range;
-            }
-
-            @Override
-            public void insertRowGridOnly(final int rowIndex,
-                                          final GridRow row,
-                                          final Scenario scenario) {
-                //
-            }
-
-            @Override
-            public void insertRow(int rowIndex, GridRow row) {
-
-            }
-
-            @Override
-            public List<GridRow> getRows() {
-                return rowsMock;
-            }
-
-            @Override
-            public Range setCellValue(int rowIndex, int columnIndex, GridCellValue<?> value) {
-                return range;
-            }
-
-            @Override
-            public void validateInstanceHeaderUpdate(String instanceHeaderCellValue, int columnIndex, boolean isADataType)  {
-                //
-            }
-
-            @Override
-            public void validatePropertyHeaderUpdate(String propertyHeaderCellValue, int columnIndex, boolean isPropertyType) {
-                //
-            }
-        });
-        when(scenarioGridMock.getEventBus()).thenReturn(eventBusMock);
-        when(scenarioGridMock.getModel()).thenReturn(scenarioGridModelMock);
-        when(scenarioGridMock.getLayer()).thenReturn(scenarioGridLayerMock);
-        when(scenarioGridMock.getType()).thenReturn(ScenarioSimulationModel.Type.RULE);
-        when(scenarioGridMock.getGridWidget()).thenReturn(GridWidget.SIMULATION);
-
-        when(scenarioGridLayerMock.getScenarioGrid()).thenReturn(scenarioGridMock);
-        when(scenarioGridPanelMock.getScenarioGridLayer()).thenReturn(scenarioGridLayerMock);
-        when(scenarioGridPanelMock.getScenarioGrid()).thenReturn(scenarioGridMock);
-
-        when(backgroundGridMock.getEventBus()).thenReturn(eventBusMock);
-        when(backgroundGridMock.getModel()).thenReturn(backgroundGridModelMock);
-        when(backgroundGridMock.getLayer()).thenReturn(backgroundGridLayerMock);
-        when(backgroundGridMock.getType()).thenReturn(ScenarioSimulationModel.Type.RULE);
-        when(backgroundGridMock.getGridWidget()).thenReturn(GridWidget.BACKGROUND);
-        when(backgroundGridModelMock.getGridWidget()).thenReturn(GridWidget.BACKGROUND);
-        when(backgroundGridLayerMock.getScenarioGrid()).thenReturn(backgroundGridMock);
-        when(backgroundGridPanelMock.getScenarioGridLayer()).thenReturn(backgroundGridLayerMock);
-        when(backgroundGridPanelMock.getScenarioGrid()).thenReturn(backgroundGridMock);
-
-        final Point2D computedLocation = mock(Point2D.class);
-        when(computedLocation.getX()).thenReturn(0.0);
-        when(computedLocation.getY()).thenReturn(0.0);
-        when(scenarioGridMock.getComputedLocation()).thenReturn(computedLocation);
-
-        scenarioSimulationContextLocal = new ScenarioSimulationContext(scenarioGridWidgetSpy, backgroundGridWidgetSpy);
-        scenarioSimulationContextLocal.setScenarioSimulationEditorPresenter(scenarioSimulationEditorPresenterMock);
-        scenarioSimulationContextLocal.getStatus().setSimulation(simulationMock);
-        scenarioSimulationContextLocal.getStatus().setBackground(backgroundMock);
-        scenarioSimulationContextLocal.getStatus().setFullPackage(FULL_PACKAGE);
-        scenarioSimulationContextLocal.setScenarioSimulationEditorPresenter(scenarioSimulationEditorPresenterMock);
-        scenarioSimulationContextLocal.setDataObjectFieldsMap(dataObjectFieldsMapMock);
-        when(backgroundGridWidgetSpy.getScenarioSimulationContext()).thenReturn(scenarioSimulationContextLocal);
-        when(scenarioGridWidgetSpy.getScenarioSimulationContext()).thenReturn(scenarioSimulationContextLocal);
-
-        when(scenarioSimulationEditorPresenterMock.getView()).thenReturn(scenarioSimulationViewMock);
-        when(scenarioSimulationEditorPresenterMock.getModel()).thenReturn(scenarioSimulationModelMock);
-        scenarioSimulationContextLocal.setScenarioSimulationEditorPresenter(scenarioSimulationEditorPresenterMock);
-        when(scenarioSimulationEditorPresenterMock.getDataManagementStrategy()).thenReturn(dataManagementStrategyMock);
-        when(scenarioSimulationEditorPresenterMock.getContext()).thenReturn(scenarioSimulationContextLocal);
-
-        when(simulationMock.cloneModel()).thenReturn(clonedSimulationMock);
-        when(backgroundMock.cloneModel()).thenReturn(clonedBackgroundMock);
-        scenarioSimulationContextLocal.getStatus().setSimulation(simulationMock);
-
-        when(scenarioSimulationModelMock.getSimulation()).thenReturn(simulationMock);
-        when(scenarioSimulationModelMock.getBackground()).thenReturn(backgroundMock);
-        when(scenarioSimulationModelMock.getSettings()).thenReturn(settingsLocal);
-
-        when(scenarioCommandRegistryManagerMock.undo(scenarioSimulationContextLocal)).thenReturn(CommandResultBuilder.SUCCESS);
-        when(scenarioCommandRegistryManagerMock.redo(scenarioSimulationContextLocal)).thenReturn(CommandResultBuilder.SUCCESS);
-
-        appendRowCommandMock = spy(new AppendRowCommand(GridWidget.SIMULATION) {
-
-            {
-                this.restorableStatus = scenarioSimulationContextLocal.getStatus();
-            }
-
-            @Override
-            public CommandResult<ScenarioSimulationViolation> execute(ScenarioSimulationContext context) {
-                return CommandResultBuilder.SUCCESS;
-            }
-
-            @Override
-            public CommandResult<ScenarioSimulationViolation> undo(ScenarioSimulationContext context) {
-                return CommandResultBuilder.SUCCESS;
-            }
-        });
-        when(informationHeaderMetaDataMock.getTitle()).thenReturn(MULTIPART_VALUE);
-        when(informationHeaderMetaDataMock.getColumnGroup()).thenReturn(COLUMN_GROUP);
-        when(propertyHeaderMetaDataMock.getMetadataType()).thenReturn(ScenarioHeaderMetaData.MetadataType.PROPERTY);
-        when(propertyHeaderMetaDataMock.getTitle()).thenReturn(GRID_PROPERTY_TITLE);
-        when(propertyHeaderMetaDataMock.getColumnGroup()).thenReturn(GRID_COLUMN_GROUP);
-        when(propertyHeaderMetaDataMock.getColumnId()).thenReturn(GRID_COLUMN_ID);
-        when(headerMetaDatasMock.get(anyInt())).thenReturn(informationHeaderMetaDataMock);
-        when(gridColumnMock.getHeaderMetaData()).thenReturn(headerMetaDatasMock);
-        when(gridColumnMock.getInformationHeaderMetaData()).thenReturn(informationHeaderMetaDataMock);
-        when(gridColumnMock.getPropertyHeaderMetaData()).thenReturn(propertyHeaderMetaDataMock);
-        when(gridColumnMock.getFactIdentifier()).thenReturn(factIdentifierMock);
-        settingsLocal.setType(ScenarioSimulationModel.Type.RULE);
-        IntStream.range(0, COLUMN_NUMBER).forEach(columnIndex -> {
-            gridColumns.add(gridColumnMock);
-            factMappingValuesLocal.add(factMappingValueMock);
-            factIdentifierSet.add(factIdentifierMock);
-            factMappingLocal.add(factMappingMock);
-            when(simulationDescriptorMock.getFactMappingByIndex(columnIndex)).thenReturn(factMappingMock);
-        });
-        when(factIdentifierMock.getClassNameWithoutPackage()).thenReturn(CLASS_NAME);
-        when(factIdentifierMock.getPackageWithoutClassName()).thenReturn(FULL_PACKAGE);
-        when(factIdentifierMock.getClassName()).thenReturn(FULL_CLASS_NAME);
-        when(factIdentifierMock.getName()).thenReturn(FACT_IDENTIFIER_NAME);
-        when(simulationDescriptorMock.getFactIdentifiers()).thenReturn(factIdentifierSet);
-        when(simulationDescriptorMock.getUnmodifiableFactMappings()).thenReturn(factMappingLocal);
-        when(simulationDescriptorMock.getFactMappingsByFactName(anyString())).thenReturn(Stream.empty());
-        when(scenarioGridModelMock.nextColumnCount()).thenReturn(factMappingValuesLocal.size());
-        when(factMappingMock.getFactIdentifier()).thenReturn(factIdentifierMock);
-        when(factMappingMock.getFactAlias()).thenReturn(FACT_ALIAS);
-        when(factMappingMock.getGenericTypes()).thenReturn(new ArrayList<>());
-        doReturn(factMappingMock).when(simulationDescriptorMock).addFactMapping(anyInt(), anyString(), anyObject(), anyObject());
-        when(scenarioSimulationViewMock.getScenarioGridWidget()).thenReturn(scenarioGridWidgetSpy);
-    }
-
-    /**
-     * Common method to add a new column in the model
-     */
-    protected void addNewColumn(ScenarioGridColumn gridColumn, List<GridColumn.HeaderMetaData> metaData, ScenarioHeaderMetaData informationHeaderMetaData,
-                                ScenarioHeaderMetaData propertyHeaderMetaData, FactIdentifier factIdentifier, FactMapping factMapping, FactMappingValue factMappingValue,
-                                int factStartingRange, int factEndingRange, int columnIndex, String value, String propertyTitle, String columnId, String factAlias,
-                                String valueClassName, String propertyAlias, String fullClassName, String factIdentfierName) {
-        when(gridColumn.getHeaderMetaData()).thenReturn(metaData);
-        when(gridColumn.getInformationHeaderMetaData()).thenReturn(informationHeaderMetaData);
-        when(gridColumn.getPropertyHeaderMetaData()).thenReturn(propertyHeaderMetaData);
-        when(gridColumn.getFactIdentifier()).thenReturn(factIdentifier);
-        when(gridColumn.isInstanceAssigned()).thenReturn(Boolean.TRUE);
-        when(gridColumn.isPropertyAssigned()).thenReturn(Boolean.TRUE);
-
-        when(scenarioGridModelMock.getInstanceLimits(columnIndex)).thenReturn(new GridData.Range(factStartingRange, factEndingRange));
-
-        when(metaData.get(columnIndex)).thenReturn(informationHeaderMetaDataMock);
-
-        when(informationHeaderMetaData.getTitle()).thenReturn(value);
-        when(informationHeaderMetaData.getColumnGroup()).thenReturn(COLUMN_GROUP);
-
-        when(propertyHeaderMetaData.getMetadataType()).thenReturn(ScenarioHeaderMetaData.MetadataType.PROPERTY);
-        when(propertyHeaderMetaData.getTitle()).thenReturn(propertyTitle);
-        when(propertyHeaderMetaData.getColumnGroup()).thenReturn(COLUMN_GROUP);
-        when(propertyHeaderMetaData.getColumnId()).thenReturn(columnId);
-
-        when(factMapping.getFactIdentifier()).thenReturn(factIdentifier);
-        when(factMapping.getFactAlias()).thenReturn(factAlias);
-        when(factMapping.getClassName()).thenReturn(valueClassName);
-
-        final ExpressionElement factAliasExpressionElement = new ExpressionElement(factAlias);
-        final ExpressionElement propertyAliasExpressionElement = new ExpressionElement(propertyAlias);
-        List<ExpressionElement> expressionElements = new ArrayList<>();
-        expressionElements.add(factAliasExpressionElement);
-        expressionElements.add(propertyAliasExpressionElement);
-        when(factMapping.getExpressionElements()).thenReturn(expressionElements);
-        when(factMapping.getExpressionElementsWithoutClass()).thenReturn(Collections.singletonList(propertyAliasExpressionElement));
-
-        when(factIdentifier.getClassName()).thenReturn(fullClassName);
-        when(factIdentifier.getClassNameWithoutPackage()).thenReturn(fullClassName.substring(fullClassName.lastIndexOf(".") + 1));
-        when(factIdentifier.getPackageWithoutClassName()).thenReturn(fullClassName.substring(0, fullClassName.lastIndexOf(".")));
-        when(factIdentifier.getName()).thenReturn(factIdentfierName);
-
-        gridColumns.add(gridColumn);
-        factMappingValuesLocal.add(factMappingValue);
-        factIdentifierSet.add(factIdentifier);
-        factMappingLocal.add(factMapping);
-        when(simulationDescriptorMock.getFactMappingByIndex(columnIndex)).thenReturn(factMapping);
-        when(scenarioGridModelMock.nextColumnCount()).thenReturn(factMappingValuesLocal.size());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/MockProducer.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/MockProducer.java
deleted file mode 100644
index 437ae73..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/MockProducer.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client;
-
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.LabelElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsView;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DMN_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DMN_NAMESPACE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DMO_SESSION;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FILE_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.RULE_FLOW_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.SCENARIO_TYPE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.SKIP_FROM_BUILD;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.STATELESS;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class MockProducer {
-
-    public static SettingsView getSettingsViewMock() {
-        SettingsView toReturn = mock(SettingsView.class);
-        when(toReturn.getNameLabel()).thenReturn(nameLabelMock());
-        doReturn(fileNameMock()).when(toReturn).getFileName();
-        when(toReturn.getTypeLabel()).thenReturn(typeLabelMock());
-        doReturn(scenarioTypeMock()).when(toReturn).getScenarioType();
-        doReturn(ruleSettingsMock()).when(toReturn).getRuleSettings();
-        doReturn(dmoSessionMock()).when(toReturn).getDmoSession();
-        doReturn(ruleFlowGroupMock()).when(toReturn).getRuleFlowGroup();
-        doReturn(dmnSettingsMock()).when(toReturn).getDmnSettings();
-        when(toReturn.getDmnFileLabel()).thenReturn(dmnModelLabelMock());
-        doReturn(dmnFilePathPlaceholderMock()).when(toReturn).getDmnFilePathPlaceholder();
-        doReturn(dmnFilePathErrorLabelMock()).when(toReturn).getDmnFilePathErrorLabel();
-        when(toReturn.getDmnNamespaceLabel()).thenReturn(dmnNamespaceLabelMock());
-        doReturn(dmnNamespaceMock()).when(toReturn).getDmnNamespace();
-        when(toReturn.getDmnNameLabel()).thenReturn(dmnNameLabelMock());
-        doReturn(dmnNameMock()).when(toReturn).getDmnName();
-        doReturn(skipFromBuildMock()).when(toReturn).getSkipFromBuild();
-        doReturn(statelessMock()).when(toReturn).getStateless();
-        return toReturn;
-    }
-
-    public static DivElement kieSettingsContentMock() {
-        return mock(DivElement.class);
-    }
-
-    public static LabelElement typeLabelMock() {
-        return mock(LabelElement.class);
-    }
-
-    public static LabelElement nameLabelMock() {
-        return mock(LabelElement.class);
-    }
-
-    public static Style dmnFilePathErrorLabelStyleMock() {
-        return mock(Style.class);
-    }
-
-    public static Style dmnSettingsStyleMock() {
-        return mock(Style.class);
-    }
-
-    public static InputElement dmoSessionMock() {
-        InputElement toReturn = mock(InputElement.class);
-        when(toReturn.getValue()).thenReturn(DMO_SESSION);
-        return toReturn;
-    }
-
-    public static InputElement statelessMock() {
-        InputElement toReturn = mock(InputElement.class);
-        when(toReturn.isChecked()).thenReturn(STATELESS);
-        return toReturn;
-    }
-
-    public static InputElement skipFromBuildMock() {
-        InputElement toReturn = mock(InputElement.class);
-        when(toReturn.isChecked()).thenReturn(SKIP_FROM_BUILD);
-        return toReturn;
-    }
-
-    public static InputElement dmnNameMock() {
-        InputElement toReturn = mock(InputElement.class);
-        when(toReturn.getValue()).thenReturn(DMN_NAME);
-        return toReturn;
-    }
-
-    public static InputElement dmnNamespaceMock() {
-        InputElement toReturn = mock(InputElement.class);
-        when(toReturn.getValue()).thenReturn(DMN_NAMESPACE);
-        return toReturn;
-    }
-
-    public static LabelElement dmnNamespaceLabelMock() {
-        return mock(LabelElement.class);
-    }
-
-    public static SpanElement dmnFilePathErrorLabelMock() {
-        SpanElement toReturn = mock(SpanElement.class);
-        when(toReturn.getStyle()).thenReturn(dmnFilePathErrorLabelStyleMock());
-        return toReturn;
-    }
-
-    public static DivElement dmnFilePathPlaceholderMock() {
-        DivElement toReturn = mock(DivElement.class);
-        when(toReturn.getInnerText()).thenReturn("");
-        return toReturn;
-    }
-
-    public static LabelElement dmnModelLabelMock() {
-        return mock(LabelElement.class);
-    }
-
-    public static LabelElement dmnNameLabelMock() {
-        return mock(LabelElement.class);
-    }
-
-    public static DivElement dmnSettingsMock() {
-        DivElement toReturn = mock(DivElement.class);
-        when(toReturn.getStyle()).thenReturn(dmnSettingsStyleMock());
-        return toReturn;
-    }
-
-    public static InputElement ruleFlowGroupMock() {
-        InputElement toReturn = mock(InputElement.class);
-        when(toReturn.getValue()).thenReturn(RULE_FLOW_GROUP);
-        return toReturn;
-    }
-
-    public static SpanElement scenarioTypeMock() {
-        SpanElement toReturn = mock(SpanElement.class);
-        when(toReturn.getInnerText()).thenReturn(SCENARIO_TYPE);
-        return toReturn;
-    }
-
-    public static InputElement fileNameMock() {
-        InputElement toReturn = mock(InputElement.class);
-        when(toReturn.getValue()).thenReturn(FILE_NAME);
-        return toReturn;
-    }
-
-    public static Style ruleSettingsStyleMock() {
-        return mock(Style.class);
-    }
-
-    public static DivElement ruleSettingsMock() {
-        DivElement toReturn = mock(DivElement.class);
-        when(toReturn.getStyle()).thenReturn(ruleSettingsStyleMock());
-        return toReturn;
-    }
-
-    public static SpanElement statlessLabelMock() {
-        SpanElement toReturn = mock(SpanElement.class);
-        return toReturn;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/TestProperties.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/TestProperties.java
deleted file mode 100644
index b03cdf4..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/TestProperties.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridRow;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-
-/**
- * Put all statically defined properties here
- */
-public class TestProperties {
-
-    public static final int ROW_INDEX = 2;
-    public static final int ROW_COUNT = 3;
-    public static final int COLUMN_INDEX = 3;
-    public static final int COLUMN_NUMBER = COLUMN_INDEX + 1;
-
-    public static final int FIRST_INDEX_LEFT = 2;
-    public static final int FIRST_INDEX_RIGHT = 4;
-    public static final String COLUMN_ID = "COLUMN ID";
-
-    public static final String COLUMN_GROUP = FactMappingType.EXPECT.name();
-
-    public static final String FULL_PACKAGE = "test.scesim";
-
-    public static final List<String> FULL_PACKAGE_ELEMENTS = Arrays.asList(FULL_PACKAGE);
-
-    public static final String LOWER_CASE_VALUE = VALUE;
-
-    public static final String MULTIPART_VALUE = "MULTIPART.VALUE";
-
-    public static final List<String> MULTIPART_VALUE_ELEMENTS = Collections.unmodifiableList(Arrays.asList(MULTIPART_VALUE.split("\\.")));
-
-    public static final String CLASS_NAME = "TestClass";
-
-    public static final String PROPERTY_NAME = "testProperty";
-
-    public static final String FULL_CLASS_NAME = FULL_PACKAGE + "." + CLASS_NAME;
-
-    public static final String FULL_PROPERTY_NAME = CLASS_NAME + "." + PROPERTY_NAME;
-
-    public static final List<String> FULL_PROPERTY_NAME_ELEMENTS = Arrays.asList(CLASS_NAME, PROPERTY_NAME);
-
-    public static final String VALUE_CLASS_NAME = String.class.getName();
-
-    public static final String LIST_CLASS_NAME = List.class.getName();
-    public static final String MAP_CLASS_NAME = Map.class.getName();
-
-    public static final String FACT_IDENTIFIER_NAME = "FACT_IDENTIFIER_NAME";
-
-    public static final String FACT_ALIAS = "FACT_ALIAS";
-
-    public static final String GRID_PROPERTY_TITLE = "GRID_PROPERTY_TITLE";
-    public static final String GRID_COLUMN_GROUP = "GIVEN";
-    public static final String GRID_COLUMN_ID = "GRID_COLUMN_ID";
-
-    public static final String FULL_CLASSNAME_CREATED = FULL_PACKAGE + "." + CLASS_NAME;
-    public static final String LIST_PROPERTY_NAME = "listProperty";
-    public static final String FULL_PROPERTY_PATH = CLASS_NAME + "." + LIST_PROPERTY_NAME;
-    public static final List<String> FULL_PROPERTY_PATH_ELEMENTS = Arrays.asList(FULL_PROPERTY_PATH.split("\\."));
-
-    public static final String TEST_PROPERTYNAME = "TEST-PROPERTYNAME";
-
-    public static final String MAP_TEST_KEY = "TEST-KEY";
-    public static final String MAP_TEST_VALUE = "TEST-MULTIPART_VALUE";
-    public static final Map<String, String> TEST_INSTANCE_PROPERTY_MAP = Collections.singletonMap(MAP_TEST_KEY, MAP_TEST_VALUE);
-    public static final Map<String, String> TEST_KEY_PROPERTY_MAP = Collections.singletonMap("TEST-KEY1", "TEST-KEY2");
-    public static final Map<String, String> TEST_VALUE_PROPERTYY_MAP = Collections.singletonMap("TEST-VALUE1", "TEST-VALUE2");
-
-    public static final String TEST_JSON = "TEST-JSON";
-    public static final String TEST_JSON_STRING = "\"TEST-JSON\"";
-    public static final String TEST_CLASSNAME = "TEST-CLASSNAME";
-    public static final String TEST_KEY = TEST_CLASSNAME + "#" + TEST_PROPERTYNAME;
-    public static final int CHILD_COUNT = 3;
-    public static final String ITEM_ID = String.valueOf(CHILD_COUNT - 1);
-    public static final String UPDATED_VALUE = "UPDATED_VALUE";
-    public static final int JSON_ARRAY_SIZE = 2;
-    public static final Set<String> KEY_SET = new HashSet<>(Arrays.asList("prop1", "prop2"));
-
-    public static final String ELEMENT1_ID = "ELEMENT1_ID";
-    public static final String ELEMENT2_ID = "ELEMENT2_ID";
-
-    public static final String TEST_ITEM_ID = "TEST-ITEM-ID";
-    public static final String EXPANDABLE_PROPERTY = "EXPANDABLE_PROPERTY";
-    public static final Map<String, String> TEST_PROPERTIES_MAP = Collections.singletonMap("TEST-KEY", "TEST-MULTIPART_VALUE");
-    public static final Map<String, String> EXPANDABLE_PROPERTIES_MAP = Collections.singletonMap("EXPANDABLE-KEY", "EXPANDABLE-MULTIPART_VALUE");
-    public static final Map<String, Map<String, String>> EXPANDABLE_PROPERTIES_VALUES = Collections.singletonMap(EXPANDABLE_PROPERTY, EXPANDABLE_PROPERTIES_MAP);
-    public static final Map<String, List<String>> ITEM_ID_EXPANDABLE_PROPERTIES_MAP_LOCAL = new HashMap<>();
-    public static final List<String> EXPANDABLE_PROPERTIES = Collections.singletonList(EXPANDABLE_PROPERTY);
-
-    public static final String INNER_TEXT = "INNER_TEXT";
-    public static final String TEST_PROPERTYVALUE = "TEST-PROPERTYVALUE";
-    public static final String TEST_NEWVALUE = "TEST_NEWVALUE";
-
-    public static final String GRID_COLUMN_ID_1 = GRID_COLUMN_ID + "_1";
-    public static final String GRID_PROPERTY_TITLE_1 = GRID_PROPERTY_TITLE + "_1";
-    public static final String FACT_ALIAS_1 = FACT_ALIAS + "_1";
-    public static final String FULL_CLASS_NAME_1 = FULL_CLASS_NAME + "_1";
-    public static final String FACT_IDENTIFIER_NAME_1 = FACT_IDENTIFIER_NAME + "_1";
-    public static final String VALUE_1 = MULTIPART_VALUE + "_1";
-
-    public static final String FACT_NAME = "FACT_NAME";
-    public static final String FACT_NAME_2 = "FACT_NAME_2";
-    public static final String FIELD_NAME = "FIELD_NAME";
-
-    public static final String FILE_CONTENT = "FILE_CONTENT";
-
-    public static final String FULL_FACT_CLASSNAME = "FULL_FACT_CLASSNAME";
-    public static final String FILTER_TERM = FULL_CLASS_NAME_1 + ";" + FACT_NAME + ";" + FULL_FACT_CLASSNAME;
-
-    public static final String STRING_CLASS_NAME = String.class.getCanonicalName();
-    public static final String NUMBER_CLASS_NAME = Number.class.getCanonicalName();
-    public static final Map<String, FactModelTree.PropertyTypeName> EXPECTED_MAP_FOR_SIMPLE_TYPE = new HashMap<>();
-    public static final Map<String, FactModelTree.PropertyTypeName> EXPECTED_MAP_FOR_SIMPLE_TYPE_2 = new HashMap<>();
-    public static final Map<String, String> EXPECTED_MAP_FOR_EXPANDABLE_TYPE = new HashMap<>();
-    public static final Map<String, String> EXPECTED_MAP_FOR_EXPANDABLE_TYPE_2 = new HashMap<>();
-
-    public static final Double GRID_WIDTH = 100.0;
-    public static final Double GRID_HEIGHT = 400.0;
-    public static final Double HEADER_HEIGHT = 10.0;
-    public static final Double HEADER_ROW_HEIGHT = 10.0;
-    public static final int UI_COLUMN_INDEX = 0;
-    public static final int UI_ROW_INDEX = 1;
-    public static final double CLICK_POINT_X = 5;
-    public static final double CLICK_POINT_Y = 5;
-    public static final int OFFSET_X = 0;
-
-    public static final int MOUSE_EVENT_X = 32;
-    public static final int MOUSE_EVENT_Y = 64;
-    public static final double GRID_COMPUTED_LOCATION_X = 100.0;
-    public static final double GRID_COMPUTED_LOCATION_Y = 200.0;
-
-    public static final List<GridColumn.HeaderMetaData> HEADER_META_DATA = new ArrayList<>();
-    public static final List<GridRow> GRID_ROWS = new ArrayList<>();
-
-    public static final String MAIN_TITLE_TEXT = "MAIN_TITLE_TEXT";
-    public static final String MAIN_QUESTION_TEXT = "MAIN_QUESTION_TEXT";
-    public static final String TEXT1_TEXT = "TEXT1_TEXT";
-    public static final String TEXT_QUESTION_TEXT = "TEXT_QUESTION_TEXT";
-    public static final String TEXT_WARNING_TEXT = "TEXT_WARNING_TEXT";
-    public static final String OKDELETE_BUTTON_TEXT = "OKDELETE_BUTTON_TEXT";
-    public static final String OPTION1_TEXT = "OPTION1_TEXT";
-    public static final String OPTION2_TEXT = "OPTION2_TEXT";
-    public static final String OKPRESERVE_BUTTON_TEXT = "OKPRESERVE_BUTTON_TEXT";
-
-    public static final String OK_BUTTON_TEXT = "OK_BUTTON_TEXT";
-
-    public static final String TITLE = "TITLE";
-    public static final String YES_BUTTON_TEXT = "YES_BUTTON_TEXT";
-    public static final String NO_BUTTON_TEXT = "NO_BUTTON_TEXT";
-    public static final String CONFIRM_MESSAGE = "CONFIRM_MESSAGE";
-    public static final String INLINE_NOTIFICATION_MESSAGE = "INLINE_NOTIFICATION_MESSAGE";
-
-    public static final String MAIN_TEXT = "MAIN_TEXT";
-
-    public static final String TEXT_DANGER_TEXT = "TEXT_DANGER_TEXT";
-
-    public static final String PLACEHOLDER = "PLACEHOLDER";
-    public static final String LIST_VALUE = "[ \"Ford\", \"BMW\", \"Fiat\" ]";
-    public static final String MAP_VALUE = "{\"name\":\"myname\",\"age\":29}";
-    public static final String EXPRESSION_VALUE = "\"[1, 2, 3]\"";
-
-    public static final String SCENARIO_TYPE = "SCENARIO_TYPE";
-    public static final String FILE_NAME = "FILE_NAME";
-    public static final String KIE_SESSION = "KIE_SESSION";
-    public static final String RULE_FLOW_GROUP = "RULE_FLOW_GROUP";
-    public static final String DMO_SESSION = "DMO_SESSION";
-    public static final String DMN_FILE_PATH = "DMN_FILE_PATH";
-    public static final String DMN_NAMESPACE = "DMN_NAMESPACE";
-    public static final String DMN_NAME = "DMN_NAME";
-    public static final boolean STATELESS = true;
-    public static final boolean SKIP_FROM_BUILD = true;
-
-    public static final String FACT_PACKAGE = "test.scesim.package";
-    public static final String GRID_COLUMN_TITLE = "GRID_COLUMN_TITLE";
-    public static final String GRID_CELL_TEXT = "GRID_CELL_TEXT";
-
-    public static final String LIST_GROUP_ITEM = "list-group-item";
-
-    public static final String COLUMN_INSTANCE_TITLE_FIRST = "COLUMN_INSTANCE_TITLE_FIRST";
-    public static final String COLUMN_PROPERTY_TITLE_FIRST = "COLUMN_PROPERTY_TITLE_FIRST";
-    public static final String COLUMN_GROUP_FIRST = "OTHER";
-
-    public static final int HEADER_ROWS = 2;
-    public static final String COLUMN_ONE_TITLE = "column one";
-    public static final String COLUMN_TWO_TITLE = "column two";
-
-    public static final String TEST = "test";
-    public static final String DEFAULT_VALUE = "DEFAULT_VALUE";
-    public static final String KIEASSETSDROPDOWNVIEW_SELECT = "KIEASSETSDROPDOWNVIEW_SELECT";
-
-    public static Integer MX = 300;
-    public static Integer MY = 200;
-    public static final Integer DX = 325;
-    public static final Integer DY = 250;
-    public static final Double CELL_WIDTH = 50d;
-    public static final Integer LARGE_LAYER = 1000;
-    public static final Integer TINY_LAYER = 100;
-    public static final Integer SMALLEST_LAYER = 26;
-    public static final Integer SCROLL_TOP = 15;
-    public static final Integer SCROLL_LEFT = 75;
-    public static final String RAW_VALUE = "raw";
-    public static final String ERROR_VALUE = "error";
-    public static final String NULL = "null";
-    public static final String EXCEPTION = "GenericException";
-
-    public static final String EXPRESSION_ALIAS_DESCRIPTION = "EXPRESSION_ALIAS_DESCRIPTION";
-    public static final String EXPRESSION_ALIAS_GIVEN = "EXPRESSION_ALIAS_GIVEN";
-    public static final String EXPRESSION_ALIAS_INTEGER = "EXPRESSION_ALIAS_INTEGER";
-    public static final int COLUMNS = 6;
-    public static final double HEADER_ROWS_HEIGHT = 100.0;
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/TestUtils.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/TestUtils.java
deleted file mode 100644
index e02f041..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/TestUtils.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client;
-
-import java.util.stream.IntStream;
-
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.Scenario;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.model.Simulation;
-
-/**
- * Class used to provide common methods used by different classes
- */
-public class TestUtils {
-
-    public static Simulation getSimulation(int numberOfColumns, int numberOfRows) {
-        Simulation simulation = new Simulation();
-        ScesimModelDescriptor simulationDescriptor = simulation.getScesimModelDescriptor();
-        simulationDescriptor.addFactMapping(FactIdentifier.DESCRIPTION, ExpressionIdentifier.DESCRIPTION);
-        // generate simulationDescriptor
-        IntStream.range(0, numberOfColumns).forEach(columnIndex -> {
-            simulationDescriptor.addFactMapping(FactIdentifier.create(getFactName(columnIndex), String.class.getCanonicalName()),
-                                                ExpressionIdentifier.create(getColName(columnIndex), FactMappingType.EXPECT)
-            );
-        });
-        // generate scenarios
-        IntStream.range(0, numberOfRows).forEach(rowIndex -> {
-            final Scenario scenario = simulation.addData();
-            scenario.setDescription(getRowName(rowIndex));
-            IntStream.range(0, numberOfColumns).forEach( columnIndex -> {
-                scenario.addMappingValue(FactIdentifier.create(getFactName(columnIndex), String.class.getCanonicalName()),
-                                         ExpressionIdentifier.create(getColName(columnIndex), FactMappingType.EXPECT),
-                                         getCellValue(columnIndex, rowIndex));
-            });
-        });
-        return simulation;
-    }
-
-    public static String getColName(int index) {
-        return "COL-" + index;
-    }
-
-    public static String getRowName(int index) {
-        return "ROW-" + index;
-    }
-
-    public static String getFactName(int index) {
-        return "GROUP_COL-" + index;
-    }
-
-    public static String getCellValue(int col, int row) {
-        return "VAL_COL-" + col + "-ROW-" + row;
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/AbstractCollectionEditorTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/AbstractCollectionEditorTest.java
deleted file mode 100644
index 528d0c6..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/AbstractCollectionEditorTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-import org.mockito.Mock;
-
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractCollectionEditorTest {
-
-    @Mock
-    protected ViewsProvider viewsProviderMock;
-
-    @Mock
-    protected CollectionPresenter collectionPresenterMock;
-
-    @Mock
-    protected PropertyPresenter propertyPresenterMock;
-
-    @Mock
-    protected LIElement saveChangeMock;
-
-    @Mock
-    protected Style styleMock;
-
-    @Mock
-    protected LIElement itemContainerMock;
-
-    @Mock
-    protected UListElement innerItemContainerMock;
-
-    @Mock
-    protected SpanElement faAngleRightMock;
-
-    @Mock
-    protected LIElement itemSeparatorMock;
-
-    @Mock
-    protected SpanElement itemSeparatorTextMock;
-
-    @Mock
-    protected LIElement editingPropertyFieldsMock;
-
-    @Mock
-    protected ClickEvent clickEventMock;
-
-    protected void setup() {
-        when(saveChangeMock.getStyle()).thenReturn(styleMock);
-        when(propertyPresenterMock.getEditingPropertyFields(anyString(), anyString(), anyString())).thenReturn(editingPropertyFieldsMock);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionEditorUtilsTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionEditorUtilsTest.java
deleted file mode 100644
index 875f658..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionEditorUtilsTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.NODE_HIDDEN;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class CollectionEditorUtilsTest {
-
-    @Mock
-    private SpanElement faAngleRightMock;
-
-    @Mock
-    private LIElement liElementMock;
-
-    @Mock
-    private Style styleMock;
-
-    @Before
-    public void setup() {
-        when(liElementMock.getStyle()).thenReturn(styleMock);
-    }
-
-    @Test
-    public void toggleRowExpansionToExpandTrueSpanElement() {
-        commonToggleRowExpansionSpanElement(true);
-    }
-
-    @Test
-    public void toggleRowExpansionToExpandFalseSpanElement() {
-        commonToggleRowExpansionSpanElement(false);
-    }
-
-    @Test
-    public void toggleRowExpansionToExpandTrueLIElement() {
-        commonToggleRowExpansionLIElement(true);
-    }
-
-    @Test
-    public void toggleRowExpansionToExpandFalseLIElement() {
-        commonToggleRowExpansionLIElement(false);
-    }
-
-    @Test
-    public void setSpanAttributeAttributes() {
-        String dataI18nKey = "DATA_I18N_KEY";
-        String innerText = "INNER_TEXT";
-        String dataField = "DATA_FIELD";
-        CollectionEditorUtils.setSpanAttributeAttributes(dataI18nKey, innerText, dataField, faAngleRightMock);
-        verify(faAngleRightMock, times(1)).setInnerText(eq(innerText));
-        verify(faAngleRightMock, times(1)).setAttribute(eq("data-i18n-key"), eq(dataI18nKey));
-        verify(faAngleRightMock, times(1)).setAttribute(eq("data-field"), eq(dataField));
-    }
-
-    private void commonToggleRowExpansionSpanElement(boolean toExpand) {
-        CollectionEditorUtils.toggleRowExpansion(faAngleRightMock, toExpand);
-        String classToadd = toExpand ? ConstantHolder.FA_ANGLE_DOWN : ConstantHolder.FA_ANGLE_RIGHT;
-        String classToRemove = toExpand ? ConstantHolder.FA_ANGLE_RIGHT : ConstantHolder.FA_ANGLE_DOWN;
-        verify(faAngleRightMock, times(1)).addClassName(classToadd);
-        verify(faAngleRightMock, times(1)).removeClassName(classToRemove);
-    }
-
-    private void commonToggleRowExpansionLIElement(boolean isShown) {
-        CollectionEditorUtils.toggleRowExpansion(liElementMock, isShown);
-        Style.Display displayToSet = isShown ? Style.Display.NONE : Style.Display.BLOCK;
-        verify(styleMock, times(1)).setDisplay(displayToSet);
-        if (isShown) {
-            verify(liElementMock, times(1)).addClassName(NODE_HIDDEN);
-        } else {
-            verify(liElementMock, times(1)).removeClassName(NODE_HIDDEN);
-        }
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenterTest.java
deleted file mode 100644
index 5f98c1d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenterTest.java
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gwt.dom.client.HeadingElement;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.json.client.JSONArray;
-import com.google.gwt.json.client.JSONObject;
-import com.google.gwt.json.client.JSONString;
-import com.google.gwt.json.client.JSONValue;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.editingbox.ItemEditingBoxPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.editingbox.KeyValueEditingBoxPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.ConfirmPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.ScenarioConfirmationPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.mvp.Command;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CHILD_COUNT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ITEM_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.JSON_ARRAY_SIZE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.KEY_SET;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_JSON_STRING;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_KEY;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_PROPERTYNAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.UPDATED_VALUE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class CollectionPresenterTest extends AbstractCollectionEditorTest {
-
-    @Mock
-    private ItemElementPresenter listElementPresenterMock;
-
-    @Mock
-    private KeyValueElementPresenter mapElementPresenterMock;
-
-    @Mock
-    private ItemEditingBoxPresenter listEditingBoxPresenterMock;
-
-    @Mock
-    private KeyValueEditingBoxPresenter mapEditingBoxPresenterMock;
-
-    @Mock
-    private CollectionView collectionViewMock;
-
-    private Map<String, Map<String, String>> instancePropertiesMapLocal = new HashMap<>();
-
-    private Map<String, String> keyPropertyMapLocal = new HashMap<>();
-    private Map<String, String> propertyMapLocal = new HashMap<>();
-
-    @Mock
-    private UListElement elementsContainerMock;
-
-    @Mock
-    private LIElement listEditingBoxMock;
-
-    @Mock
-    private LIElement mapEditingBoxMock;
-
-    @Mock
-    private LIElement itemElementMock;
-
-    @Mock
-    private JSONString jsonStringMock;
-
-    @Mock
-    private JSONValue jsonValueMock;
-
-    @Mock
-    private JSONArray jsonArrayMock;
-
-    @Mock
-    private JSONValue jsonValueChildMock;
-
-    @Mock
-    private JSONObject jsonObjectMock;
-
-    @Mock
-    private JSONValue jsonValueNeph1Mock;
-
-    @Mock
-    private JSONValue jsonValueNeph2Mock;
-
-    @Mock
-    private JSONString jsonStringProp1Mock;
-
-    @Mock
-    private JSONString jsonStringProp2Mock;
-
-    @Mock
-    private JSONObject nestedValue1Mock;
-
-    @Mock
-    private JSONObject nestedValue2Mock;
-
-    @Mock
-    private HeadingElement editorTitleMock;
-
-    @Mock
-    private SpanElement propertyTitleMock;
-
-    @Mock
-    private ScenarioConfirmationPopupPresenter scenarioConfirmationPopupPresenterMock;
-
-    @Mock
-    private ConfirmPopupPresenter confirmPopupPresenterMock;
-
-    private CollectionPresenter collectionEditorPresenterSpy;
-
-    @Before
-    public void setup() {
-        when(elementsContainerMock.getChildCount()).thenReturn(CHILD_COUNT);
-        when(editorTitleMock.getInnerText()).thenReturn(TEST_KEY);
-        when(collectionViewMock.getElementsContainer()).thenReturn(elementsContainerMock);
-        when(collectionViewMock.getEditorTitle()).thenReturn(editorTitleMock);
-        when(collectionViewMock.getPropertyTitle()).thenReturn(propertyTitleMock);
-
-        when(nestedValue1Mock.keySet()).thenReturn(KEY_SET);
-        when(nestedValue1Mock.get(eq("prop1"))).thenReturn(jsonValueNeph1Mock);
-        when(nestedValue1Mock.get(eq("prop2"))).thenReturn(jsonValueNeph2Mock);
-
-        when(nestedValue2Mock.keySet()).thenReturn(KEY_SET);
-        when(nestedValue2Mock.get(eq("prop1"))).thenReturn(jsonValueNeph1Mock);
-        when(nestedValue2Mock.get(eq("prop2"))).thenReturn(jsonValueNeph2Mock);
-
-        when(jsonValueNeph1Mock.isString()).thenReturn(jsonStringProp1Mock);
-        when(jsonValueNeph2Mock.isString()).thenReturn(jsonStringProp2Mock);
-        when(jsonValueNeph1Mock.isObject()).thenReturn(nestedValue1Mock);
-        when(jsonValueNeph2Mock.isObject()).thenReturn(nestedValue2Mock);
-
-        when(jsonObjectMock.keySet()).thenReturn(KEY_SET);
-        when(jsonObjectMock.get(eq("prop1"))).thenReturn(jsonValueNeph1Mock);
-        when(jsonObjectMock.get(eq("prop2"))).thenReturn(jsonValueNeph2Mock);
-
-        when(jsonValueChildMock.isObject()).thenReturn(jsonObjectMock);
-        when(jsonArrayMock.size()).thenReturn(JSON_ARRAY_SIZE);
-        when(jsonArrayMock.get(anyInt())).thenReturn(jsonValueChildMock);
-        when(jsonValueMock.isArray()).thenReturn(jsonArrayMock);
-        when(jsonValueMock.isObject()).thenReturn(jsonObjectMock);
-        when(jsonValueMock.isString()).thenReturn(jsonStringMock);
-        this.collectionEditorPresenterSpy = spy(new CollectionPresenter() {
-            {
-                this.viewsProvider = viewsProviderMock;
-                this.listElementPresenter = listElementPresenterMock;
-                this.mapElementPresenter = mapElementPresenterMock;
-                this.listEditingBoxPresenter = listEditingBoxPresenterMock;
-                this.mapEditingBoxPresenter = mapEditingBoxPresenterMock;
-                this.simplePropertiesMap = instancePropertiesMapLocal;
-                this.collectionView = collectionViewMock;
-                this.scenarioConfirmationPopupPresenter = scenarioConfirmationPopupPresenterMock;
-                this.confirmPopupPresenter = confirmPopupPresenterMock;
-            }
-
-            @Override
-            protected JSONValue getJSONValue(String jsonString) {
-                return jsonValueMock;
-            }
-
-            @Override
-            protected String getListValue() {
-                return UPDATED_VALUE;
-            }
-
-            @Override
-            protected String getMapValue() {
-                return UPDATED_VALUE;
-            }
-
-            @Override
-            protected String getExpressionValue() {
-                return UPDATED_VALUE;
-            }
-        });
-        instancePropertiesMapLocal.clear();
-        when(listElementPresenterMock.getItemContainer(any(), any(), any())).thenReturn(itemElementMock);
-        when(mapElementPresenterMock.getKeyValueContainer(any(), any(), any())).thenReturn(itemElementMock);
-        when(listEditingBoxPresenterMock.getEditingBox(any(), any(), any())).thenReturn(listEditingBoxMock);
-        when(mapEditingBoxPresenterMock.getEditingBox(any(), any(), any())).thenReturn(mapEditingBoxMock);
-    }
-
-    @Test
-    public void initListStructure() {
-        collectionEditorPresenterSpy.initListStructure(TEST_KEY, propertyMapLocal, new HashMap<>(), collectionViewMock);
-        verify(collectionEditorPresenterSpy, times(1)).commonInit(eq(TEST_KEY), eq(collectionViewMock));
-        assertTrue(instancePropertiesMapLocal.containsKey(TEST_KEY));
-        assertEquals(instancePropertiesMapLocal.get(TEST_KEY), propertyMapLocal);
-        verify(listEditingBoxPresenterMock, times(1)).setCollectionEditorPresenter(eq(collectionEditorPresenterSpy));
-        verify(listElementPresenterMock, times(1)).setCollectionEditorPresenter(eq(collectionEditorPresenterSpy));
-    }
-
-    @Test
-    public void initMapStructure() {
-        collectionEditorPresenterSpy.initMapStructure(TEST_KEY, keyPropertyMapLocal, propertyMapLocal, collectionViewMock);
-        verify(collectionEditorPresenterSpy, times(1)).commonInit(eq(TEST_KEY), eq(collectionViewMock));
-        assertTrue(instancePropertiesMapLocal.containsKey(TEST_KEY + "#key"));
-        assertEquals(instancePropertiesMapLocal.get(TEST_KEY + "#key"), keyPropertyMapLocal);
-        assertTrue(instancePropertiesMapLocal.containsKey(TEST_KEY + "#value"));
-        assertEquals(instancePropertiesMapLocal.get(TEST_KEY + "#value"), propertyMapLocal);
-        verify(mapEditingBoxPresenterMock, times(1)).setCollectionEditorPresenter(eq(collectionEditorPresenterSpy));
-        verify(mapElementPresenterMock, times(1)).setCollectionEditorPresenter(eq(collectionEditorPresenterSpy));
-    }
-
-    @Test
-    public void setValueIsListWidgetTrue() {
-        commonSetValue(true, false);
-    }
-
-    @Test
-    public void setValueIsListWidgetFalse() {
-        commonSetValue(false, false);
-    }
-
-    @Test
-    public void setValueIsExpressionWidgetList() {
-        commonSetValue(true, true);
-    }
-
-    @Test
-    public void setValueIsExpressionWidgetMap() {
-        commonSetValue(false, true);
-    }
-
-    @Test
-    public void showEditingBoxIsListWidgetTrue() {
-        when(collectionViewMock.isListWidget()).thenReturn(true);
-        collectionEditorPresenterSpy.showEditingBox();
-        verify(collectionViewMock, times(1)).getElementsContainer();
-        verify(listEditingBoxPresenterMock, times(1)).getEditingBox(eq(TEST_KEY), any(), any());
-        verify(elementsContainerMock, times(1)).appendChild(eq(listEditingBoxMock));
-        verify(listEditingBoxMock, times(1)).scrollIntoView();
-        verify(mapEditingBoxMock, never()).scrollIntoView();
-    }
-
-    @Test
-    public void showEditingBoxIsListWidgetFalse() {
-        when(collectionViewMock.isListWidget()).thenReturn(false);
-        collectionEditorPresenterSpy.showEditingBox();
-        verify(collectionViewMock, times(1)).getElementsContainer();
-        verify(mapEditingBoxPresenterMock, times(1)).getEditingBox(eq(TEST_KEY), any(), any());
-        verify(elementsContainerMock, times(1)).appendChild(eq(mapEditingBoxMock));
-        verify(collectionEditorPresenterSpy, times(1)).toggleEditingStatus(eq(true));
-        verify(listElementPresenterMock, times(1)).toggleEditingStatus(eq(true));
-        verify(mapElementPresenterMock, times(1)).toggleEditingStatus(eq(true));
-        verify(listEditingBoxMock, never()).scrollIntoView();
-        verify(mapEditingBoxMock, times(1)).scrollIntoView();
-    }
-
-    @Test
-    public void onToggleRowExpansionIsShownTrue() {
-        commonOnToggleRowExpansionIsShown(true, true);
-        commonOnToggleRowExpansionIsShown(true, false);
-    }
-
-    @Test
-    public void onToggleRowExpansionIsShownFalse() {
-        commonOnToggleRowExpansionIsShown(false, true);
-        commonOnToggleRowExpansionIsShown(false, false);
-    }
-
-    @Test
-    public void addListItem() {
-        collectionEditorPresenterSpy.addListItem(propertyMapLocal, new HashMap<>());
-        verify(collectionViewMock, times(1)).getElementsContainer();
-        verify(elementsContainerMock, times(1)).getChildCount();
-        verify(listElementPresenterMock, times(1)).getItemContainer(eq(ITEM_ID), eq(propertyMapLocal), anyMap());
-        verify(elementsContainerMock, times(1)).appendChild(eq(itemElementMock));
-        verify(collectionEditorPresenterSpy, times(1)).toggleEditingStatus(eq(false));
-    }
-
-    @Test
-    public void addMapItem() {
-        collectionEditorPresenterSpy.addMapItem(keyPropertyMapLocal, propertyMapLocal);
-        verify(collectionViewMock, times(1)).getElementsContainer();
-        verify(elementsContainerMock, times(1)).getChildCount();
-        verify(mapElementPresenterMock, times(1)).getKeyValueContainer(eq(ITEM_ID), eq(keyPropertyMapLocal), eq(propertyMapLocal));
-        verify(elementsContainerMock, times(1)).appendChild(eq(itemElementMock));
-        verify(collectionEditorPresenterSpy, times(1)).toggleEditingStatus(eq(false));
-    }
-
-    @Test
-    public void saveIsListWidgetTrue() {
-        commonSave(true, false,false);
-        commonSave(true, false,true);
-    }
-
-    @Test
-    public void saveIsListWidgetFalse() {
-        commonSave(false, false,false);
-        commonSave(false, false,true);
-    }
-
-    @Test
-    public void saveIsExpressionWidget() {
-        commonSave(false, true,false);
-        commonSave(false, true,true);
-        commonSave(true, true,false);
-        commonSave(true, true,true);
-    }
-
-    @Test
-    public void removeIsListWidgetTrue() {
-        commonRemove(true);
-    }
-
-    @Test
-    public void removeIsListWidgetFalse() {
-        commonRemove(false);
-    }
-
-    @Test
-    public void okRemoveCommandMethodIsListWidgetTrue() {
-        commonOkRemoveCommandMethod(true);
-    }
-
-    @Test
-    public void okRemoveCommandMethodIsListWidgetFalse() {
-        commonOkRemoveCommandMethod(false);
-    }
-
-    @Test
-    public void commonInit() {
-        collectionEditorPresenterSpy.collectionView = null;
-        collectionEditorPresenterSpy.commonInit(TEST_KEY, collectionViewMock);
-        assertEquals(collectionEditorPresenterSpy.collectionView, collectionViewMock);
-        verify(editorTitleMock, times(1)).setInnerText(TEST_KEY);
-        verify(propertyTitleMock, times(1)).setInnerText(TEST_PROPERTYNAME);
-    }
-
-    @Test
-    public void populateList() {
-        collectionEditorPresenterSpy.populateList(jsonValueMock);
-        for (int i = 0; i < JSON_ARRAY_SIZE; i++) {
-            verify(jsonArrayMock, times(1)).get(eq(i));
-        }
-        verify(collectionEditorPresenterSpy, times(JSON_ARRAY_SIZE * 3)).getSimplePropertiesMap(any()); // Multiply x 3 because getSimplePropertiesMap is called by getExpandablePropertiesValues
-        verify(collectionEditorPresenterSpy, times(JSON_ARRAY_SIZE)).getExpandablePropertiesValues(any());
-        verify(collectionEditorPresenterSpy, times(JSON_ARRAY_SIZE)).addListItem(anyMap(), anyMap());
-    }
-
-    @Test
-    public void populateMap() {
-        collectionEditorPresenterSpy.populateMap(jsonValueMock);
-        verify(collectionEditorPresenterSpy, times(JSON_ARRAY_SIZE)).addMapItem(anyMap(), anyMap());
-    }
-
-    @Test
-    public void toggleEditingStatusToDisableTrue() {
-        collectionEditorPresenterSpy.toggleEditingStatus(true);
-        verify(collectionViewMock, times(1)).enableEditingMode(eq(true));
-        verify(listElementPresenterMock, times(1)).toggleEditingStatus(eq(true));
-        verify(mapElementPresenterMock, times(1)).toggleEditingStatus(eq(true));
-    }
-
-    @Test
-    public void toggleEditingStatusToDisableFalse() {
-        collectionEditorPresenterSpy.toggleEditingStatus(false);
-        verify(collectionViewMock, times(1)).enableEditingMode(eq(false));
-        verify(listElementPresenterMock, times(1)).toggleEditingStatus(eq(false));
-        verify(mapElementPresenterMock, times(1)).toggleEditingStatus(eq(false));
-    }
-
-    private void commonRemove(boolean isWidget) {
-        when(collectionViewMock.isListWidget()).thenReturn(isWidget);
-        collectionEditorPresenterSpy.remove();
-        verify(scenarioConfirmationPopupPresenterMock, times(1)).show(
-                eq(ScenarioSimulationEditorConstants.INSTANCE.removeCollectionMainTitle()),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.removeCollectionMainQuestion()),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.removeCollectionText1()),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.removeCollectionQuestion()),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.removeCollectionWarningText()),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.remove()),
-                isA(Command.class));
-        verify(mapElementPresenterMock, never()).remove();
-        verify(listElementPresenterMock, never()).remove();
-    }
-
-    private void commonOkRemoveCommandMethod(boolean isListWidget) {
-        when(collectionViewMock.isListWidget()).thenReturn(isListWidget);
-        collectionEditorPresenterSpy.okRemoveCommandMethod();
-        if (isListWidget) {
-            verify(listElementPresenterMock, times(1)).remove();
-            verify(mapElementPresenterMock, never()).remove();
-        } else {
-            verify(mapElementPresenterMock, times(1)).remove();
-            verify(listElementPresenterMock, never()).remove();
-        }
-        verify(collectionViewMock, times(1)).updateValue(eq(null));
-        verify(collectionViewMock, times(1)).close();
-    }
-
-    private void commonSetValue(boolean isListWidget, boolean isExpressionList) {
-        collectionEditorPresenterSpy.setValue(null);
-        verify(collectionEditorPresenterSpy, never()).getJSONValue(anyString());
-        reset(collectionEditorPresenterSpy);
-        collectionEditorPresenterSpy.setValue("");
-        verify(collectionEditorPresenterSpy, never()).getJSONValue(anyString());
-        reset(collectionEditorPresenterSpy);
-        when(collectionViewMock.isListWidget()).thenReturn(isListWidget);
-        when(collectionViewMock.isExpressionWidget()).thenReturn(isExpressionList);
-        if (isExpressionList) {
-           when(collectionEditorPresenterSpy.getJSONValue(TEST_JSON_STRING)).thenReturn(new JSONString(TEST_JSON_STRING));
-        }
-        collectionEditorPresenterSpy.setValue(TEST_JSON_STRING);
-        if (isExpressionList) {
-            verify(collectionEditorPresenterSpy, times(1)).populateExpression(isA(JSONValue.class));
-            verify(collectionEditorPresenterSpy, never()).populateCreateCollection(any());
-        } else {
-            if (isListWidget) {
-                verify(collectionEditorPresenterSpy, times(1)).populateCreateCollection(isA(JSONValue.class));
-                verify(collectionEditorPresenterSpy, never()).populateExpression(any());
-            } else {
-                verify(collectionEditorPresenterSpy, times(1)).populateCreateCollection(isA(JSONValue.class));
-                verify(collectionEditorPresenterSpy, never()).populateExpression(any());
-            }
-        }
-    }
-
-    private void commonOnToggleRowExpansionIsShown(boolean isShown, boolean isListWidget) {
-        when(collectionViewMock.isListWidget()).thenReturn(isListWidget);
-        collectionEditorPresenterSpy.onToggleRowExpansion(isShown);
-        verify(collectionViewMock, times(1)).toggleRowExpansion();
-        if (isListWidget) {
-            verify(listElementPresenterMock, times(1)).onToggleRowExpansion(eq(isShown));
-        } else {
-            verify(mapElementPresenterMock, times(1)).onToggleRowExpansion(eq(isShown));
-        }
-        reset(collectionViewMock);
-        reset(listElementPresenterMock);
-        reset(mapElementPresenterMock);
-    }
-
-    private void commonSave(boolean isListWidget, boolean isExpressionWidget, boolean throwException) {
-        when(collectionViewMock.isListWidget()).thenReturn(isListWidget);
-        when(collectionViewMock.isExpressionWidget()).thenReturn(isExpressionWidget);
-        if (throwException) {
-            if(isExpressionWidget) {
-                when(collectionEditorPresenterSpy.getExpressionValue()).thenThrow(IllegalStateException.class);
-            } else {
-                if (isListWidget) {
-                    when(collectionEditorPresenterSpy.getListValue()).thenThrow(IllegalStateException.class);
-                } else {
-                    when(collectionEditorPresenterSpy.getMapValue()).thenThrow(IllegalStateException.class);
-                }
-            }
-        }
-        collectionEditorPresenterSpy.save();
-        if (isExpressionWidget) {
-            verify(collectionEditorPresenterSpy, times(1)).getExpressionValue();
-            verify(collectionEditorPresenterSpy, never()).getValueFromCreateCollection();
-        } else {
-            if (isListWidget) {
-                verify(collectionEditorPresenterSpy, times(1)).getValueFromCreateCollection();
-                verify(collectionEditorPresenterSpy, never()).getExpressionValue();
-            } else {
-                verify(collectionEditorPresenterSpy, times(1)).getValueFromCreateCollection();
-                verify(collectionEditorPresenterSpy, never()).getExpressionValue();
-            }
-        }
-        if (throwException) {
-            verify(confirmPopupPresenterMock, times(1)).show(eq(ScenarioSimulationEditorConstants.INSTANCE.collectionError()), any());
-            verify(collectionViewMock, never()).updateValue(anyString());
-        } else {
-            verify(confirmPopupPresenterMock, never()).show(eq(ScenarioSimulationEditorConstants.INSTANCE.collectionError()), anyString());
-            verify(collectionViewMock, times(1)).updateValue(eq(UPDATED_VALUE));
-        }
-        reset(confirmPopupPresenterMock);
-        reset(collectionViewMock);
-        reset(collectionEditorPresenterSpy);
-    }
-
-    @Test
-    public void populateExpression() {
-        when(jsonStringMock.stringValue()).thenReturn("test-string");
-        collectionEditorPresenterSpy.populateExpression(jsonValueMock);
-        verify(collectionViewMock, times(1)).setExpression("test-string");
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImplTest.java
deleted file mode 100644
index 7b412d7..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImplTest.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.Collections;
-
-import com.google.gwt.dom.client.ButtonElement;
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.LabelElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.TextAreaElement;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.events.CloseCompositeEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SaveEditorEvent;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class CollectionViewImplTest extends AbstractCollectionEditorTest {
-
-    private CollectionViewImpl collectionEditorViewImplSpy;
-
-    @Mock
-    private DivElement collectionEditorModalBodyMock;
-    @Mock
-    private LabelElement createLabelMock;
-    @Mock
-    private LabelElement collectionCreationModeLabelMock;
-    @Mock
-    private SpanElement collectionCreationCreateLabelMock;
-    @Mock
-    private SpanElement collectionCreationCreateSpanMock;
-    @Mock
-    private SpanElement collectionCreationDefineLabelMock;
-    @Mock
-    private SpanElement collectionCreationDefineSpanMock;
-    @Mock
-    private ButtonElement saveButtonMock;
-    @Mock
-    private SpanElement saveButtonSpanTextMock;
-    @Mock
-    private ButtonElement cancelButtonMock;
-    @Mock
-    private ButtonElement removeButtonMock;
-    @Mock
-    private SpanElement removeButtonSpanTextMock;
-    @Mock
-    private ButtonElement addItemButtonMock;
-    @Mock
-    private InputElement createCollectionRadioMock;
-    @Mock
-    private InputElement defineCollectionRadioMock;
-    @Mock
-    private SpanElement addItemButtonLabelMock;
-    @Mock
-    private DivElement createCollectionContainerMock;
-    @Mock
-    private Style createCollectionContainerStyleMock;
-    @Mock
-    private DivElement defineCollectionContainerMock;
-    @Mock
-    private Style defineCollectionContainerStyleMock;
-    @Mock
-    private Style addItemButtonStyleMock;
-    @Mock
-    private TextAreaElement expressionElementMock;
-
-    @Before
-    public void setup() {
-        when(collectionEditorModalBodyMock.getStyle()).thenReturn(styleMock);
-        when(createCollectionContainerMock.getStyle()).thenReturn(createCollectionContainerStyleMock);
-        when(defineCollectionContainerMock.getStyle()).thenReturn(defineCollectionContainerStyleMock);
-        when(addItemButtonMock.getStyle()).thenReturn(addItemButtonStyleMock);
-        this.collectionEditorViewImplSpy = spy(new CollectionViewImpl() {
-            {
-                this.presenter = collectionPresenterMock;
-                this.collectionEditorModalBody = collectionEditorModalBodyMock;
-                this.createLabel = createLabelMock;
-                this.collectionCreationModeLabel = collectionCreationModeLabelMock;
-                this.collectionCreationCreateLabel = collectionCreationCreateLabelMock;
-                this.collectionCreationCreateSpan = collectionCreationCreateSpanMock;
-                this.collectionCreationDefineLabel = collectionCreationDefineLabelMock;
-                this.collectionCreationDefineSpan = collectionCreationDefineSpanMock;
-                this.createCollectionContainer = createCollectionContainerMock;
-                this.defineCollectionContainer = defineCollectionContainerMock;
-                this.expressionElement = expressionElementMock;
-                this.saveButton = saveButtonMock;
-                this.cancelButton = cancelButtonMock;
-                this.removeButton = removeButtonMock;
-                this.addItemButtonLabel = addItemButtonLabelMock;
-                this.addItemButton = addItemButtonMock;
-                this.createCollectionRadio = createCollectionRadioMock;
-                this.defineCollectionRadio = defineCollectionRadioMock;
-                this.removeButtonSpanText = removeButtonSpanTextMock;
-                this.saveButtonSpanText = saveButtonSpanTextMock;
-            }
-        });
-    }
-
-    @Test
-    public void initListStructure() {
-        collectionEditorViewImplSpy.initListStructure("key", Collections.EMPTY_MAP, Collections.EMPTY_MAP, ScenarioSimulationModel.Type.DMN);
-        verify(collectionEditorViewImplSpy, times(1)).commonInit(eq(ScenarioSimulationModel.Type.DMN));
-        verify(createLabelMock, atLeast(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelList());
-        verify(collectionCreationModeLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.collectionListCreation());
-        verify(collectionCreationCreateLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelList());
-        verify(collectionCreationCreateSpanMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelListDescription());
-        verify(collectionCreationDefineLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelList());
-        verify(collectionCreationDefineSpanMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelListDescription());
-        verify(collectionPresenterMock, times(1)).initListStructure(eq("key"), eq(Collections.EMPTY_MAP), eq(Collections.EMPTY_MAP), eq(collectionEditorViewImplSpy));
-        verify(addItemButtonLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.addNewListItem());
-        assertTrue(collectionEditorViewImplSpy.listWidget);
-    }
-
-    @Test
-    public void initMapStructure() {
-        collectionEditorViewImplSpy.initMapStructure("key", Collections.EMPTY_MAP, Collections.EMPTY_MAP, ScenarioSimulationModel.Type.DMN);
-        verify(collectionEditorViewImplSpy, times(1)).commonInit(eq(ScenarioSimulationModel.Type.DMN));
-        verify(createLabelMock, atLeast(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMap());
-        verify(collectionCreationModeLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.collectionMapCreation());
-        verify(collectionCreationCreateLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMap());
-        verify(collectionCreationCreateSpanMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMapDescription());
-        verify(collectionCreationDefineLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelMap());
-        verify(collectionCreationDefineSpanMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelMapDescription());
-        verify(addItemButtonLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.addNewMapItem());
-        verify(collectionPresenterMock, times(1)).initMapStructure(eq("key"), eq(Collections.EMPTY_MAP), eq(Collections.EMPTY_MAP), eq(collectionEditorViewImplSpy));
-        assertFalse(collectionEditorViewImplSpy.listWidget);
-    }
-
-    @Test
-    public void commonInit_RuleScenario() {
-        collectionEditorViewImplSpy.commonInit(ScenarioSimulationModel.Type.RULE);
-        assertEquals(ScenarioSimulationModel.Type.RULE, collectionEditorViewImplSpy.scenarioType);
-        verify(saveButtonSpanTextMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.saveButton());
-        verify(cancelButtonMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.cancelButton());
-        verify(removeButtonSpanTextMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.removeButton());
-        verify(collectionEditorViewImplSpy, times(1)).enableCreateCollectionContainer(eq(true));
-        verify(collectionEditorViewImplSpy, times(1)).initAndRegisterHandlerForExpressionTextArea();
-    }
-
-    @Test
-    public void commonInit_DMNScenario() {
-        collectionEditorViewImplSpy.commonInit(ScenarioSimulationModel.Type.DMN);
-        assertEquals(ScenarioSimulationModel.Type.DMN, collectionEditorViewImplSpy.scenarioType);
-        verify(saveButtonSpanTextMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.saveButton());
-        verify(cancelButtonMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.cancelButton());
-        verify(removeButtonSpanTextMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.removeButton());
-        verify(collectionEditorViewImplSpy, times(1)).enableCreateCollectionContainer(eq(true));
-        verify(collectionEditorViewImplSpy, never()).initAndRegisterHandlerForExpressionTextArea();
-    }
-
-    @Test
-    public void setValue() {
-        String testValue = "TEST-JSON";
-        collectionEditorViewImplSpy.setValue(testValue);
-        verify(collectionPresenterMock, times(1)).setValue(eq(testValue));
-    }
-
-    @Test
-    public void onCloseCollectionEditorButtonClick() {
-        collectionEditorViewImplSpy.onCloseCollectionEditorButtonClick(clickEventMock);
-        verify(collectionEditorViewImplSpy, times(1)).fireEvent(isA(CloseCompositeEvent.class));
-    }
-
-    @Test
-    public void onCancelButtonClick() {
-        collectionEditorViewImplSpy.onCancelButtonClick(clickEventMock);
-        verify(collectionEditorViewImplSpy, times(1)).close();
-    }
-
-    @Test
-    public void onRemoveButtonClick() {
-        collectionEditorViewImplSpy.onRemoveButtonClick(clickEventMock);
-        verify(collectionPresenterMock, times(1)).remove();
-    }
-
-    @Test
-    public void onSaveButtonClick() {
-        collectionEditorViewImplSpy.onSaveButtonClick(clickEventMock);
-        verify(collectionPresenterMock, times(1)).save();
-    }
-
-    @Test
-    public void onAddItemButton() {
-        collectionEditorViewImplSpy.onAddItemButton(clickEventMock);
-        verify(collectionPresenterMock, times(1)).showEditingBox();
-    }
-
-    @Test
-    public void onFaAngleRightClick() {
-        doReturn(true).when(collectionEditorViewImplSpy).isShown();
-        collectionEditorViewImplSpy.onFaAngleRightClick(clickEventMock);
-        verify(collectionPresenterMock, times(1)).onToggleRowExpansion(eq(true));
-        reset(collectionPresenterMock);
-        reset(clickEventMock);
-        doReturn(false).when(collectionEditorViewImplSpy).isShown();
-        collectionEditorViewImplSpy.onFaAngleRightClick(clickEventMock);
-        verify(collectionPresenterMock, times(1)).onToggleRowExpansion(eq(false));
-    }
-
-    @Test
-    public void toggleRowExpansion() {
-        doReturn(true).when(collectionEditorViewImplSpy).isShown();
-        collectionEditorViewImplSpy.toggleRowExpansion();
-        verify(collectionEditorViewImplSpy, times(1)).toggleRowExpansion(false);
-        reset(collectionEditorViewImplSpy);
-        doReturn(false).when(collectionEditorViewImplSpy).isShown();
-        collectionEditorViewImplSpy.toggleRowExpansion();
-        verify(collectionEditorViewImplSpy, times(1)).toggleRowExpansion(true);
-    }
-
-    @Test
-    public void updateValue() {
-        collectionEditorViewImplSpy.updateValue("TEST_VALUE");
-        verify(collectionEditorViewImplSpy, times(1)).fireEvent(isA(SaveEditorEvent.class));
-    }
-
-    @Test
-    public void close() {
-        collectionEditorViewImplSpy.close();
-        verify(collectionEditorViewImplSpy, times(1)).fireEvent(isA(CloseCompositeEvent.class));
-    }
-
-    @Test
-    public void setFixedHeight() {
-        double value = 23.0;
-        Style.Unit unit = Style.Unit.PX;
-        collectionEditorViewImplSpy.setFixedHeight(value, unit);
-        verify(styleMock, times(1)).setHeight(eq(value), eq(unit));
-    }
-
-    @Test
-    public void enableCreateCollectionContainer_CreateList() {
-        enableCreateCollectionContainer(true, true);
-    }
-
-    @Test
-    public void enableCreateCollectionContainer_CreateMap() {
-        enableCreateCollectionContainer(true, false);
-    }
-
-    @Test
-    public void enableCreateCollectionContainer_DefineList() {
-        enableCreateCollectionContainer(false, true);
-    }
-
-    @Test
-    public void enableCreateCollectionContainer_DefineMap() {
-        enableCreateCollectionContainer(false, false);
-    }
-
-    private void enableCreateCollectionContainer(boolean toEnable, boolean isList) {
-        collectionEditorViewImplSpy.listWidget = isList;
-        collectionEditorViewImplSpy.enableCreateCollectionContainer(toEnable);
-        verify(collectionEditorViewImplSpy, times(1)).showCreateCollectionContainer(eq(toEnable));
-        verify(collectionEditorViewImplSpy, times(1)).showDefineCollectionContainer(eq(!toEnable));
-        verify(collectionEditorViewImplSpy, times(1)).showAddItemButton(eq(toEnable));
-        if (isList) {
-            verify(createLabelMock, times(1)).setInnerText(eq(ScenarioSimulationEditorConstants.INSTANCE.createLabelList()));
-        } else {
-            verify(createLabelMock, times(1)).setInnerText(eq(ScenarioSimulationEditorConstants.INSTANCE.createLabelMap()));
-        }
-    }
-
-    @Test
-    public void checkExpressionSyntax_Rule() {
-        collectionEditorViewImplSpy.scenarioType = ScenarioSimulationModel.Type.RULE;
-        collectionEditorViewImplSpy.ensureExpressionSyntax();
-        verify(expressionElementMock, times(1)).setValue(any());
-    }
-
-    @Test
-    public void checkExpressionSyntax_DMN() {
-        collectionEditorViewImplSpy.scenarioType = ScenarioSimulationModel.Type.DMN;
-        collectionEditorViewImplSpy.ensureExpressionSyntax();
-        verify(expressionElementMock, never()).setValue(anyString());
-    }
-
-    @Test
-    public void setExpression() {
-        collectionEditorViewImplSpy.setExpression("test");
-        verify(collectionEditorViewImplSpy, times(1)).enableCreateCollectionContainer(eq(false));
-        verify(expressionElementMock, times(1)).setValue(eq("test"));
-    }
-
-    @Test
-    public void enableEditingMode_False() {
-        collectionEditorViewImplSpy.enableEditingMode(false);
-        verify(createCollectionRadioMock).setDisabled(eq(false));
-        verify(defineCollectionRadioMock).setDisabled(eq(false));
-        verify(collectionEditorViewImplSpy, times(1)).showAddItemButton(eq(true));
-        verify(addItemButtonMock).setDisabled(eq(false));
-        verify(cancelButtonMock).setDisabled(eq(false));
-        verify(removeButtonMock).setDisabled(eq(false));
-        verify(saveButtonMock).setDisabled(eq(false));
-    }
-
-    @Test
-    public void enableEditingMode_True() {
-        collectionEditorViewImplSpy.enableEditingMode(true);
-        verify(createCollectionRadioMock).setDisabled(eq(true));
-        verify(defineCollectionRadioMock).setDisabled(eq(true));
-        verify(collectionEditorViewImplSpy, times(1)).showAddItemButton(eq(false));
-        verify(addItemButtonMock).setDisabled(eq(true));
-        verify(cancelButtonMock).setDisabled(eq(true));
-        verify(removeButtonMock).setDisabled(eq(true));
-        verify(saveButtonMock).setDisabled(eq(true));
-    }
-
-    @Test
-    public void showCreateCollectionContainer() {
-        collectionEditorViewImplSpy.showCreateCollectionContainer(false);
-        checkStyleDisplay(createCollectionContainerStyleMock, false);
-        collectionEditorViewImplSpy.showCreateCollectionContainer(true);
-        checkStyleDisplay(createCollectionContainerStyleMock, true);
-    }
-
-    @Test
-    public void showDefineCollectionContainer() {
-        collectionEditorViewImplSpy.showDefineCollectionContainer(false);
-        checkStyleDisplay(defineCollectionContainerStyleMock, false);
-        collectionEditorViewImplSpy.showDefineCollectionContainer(true);
-        checkStyleDisplay(defineCollectionContainerStyleMock, true);
-    }
-
-    @Test
-    public void showAddItemButton() {
-        collectionEditorViewImplSpy.showAddItemButton(false);
-        checkStyleDisplay(addItemButtonStyleMock, false);
-        collectionEditorViewImplSpy.showAddItemButton(true);
-        checkStyleDisplay(addItemButtonStyleMock, true);
-    }
-
-    private void checkStyleDisplay(Style styleElement, boolean show) {
-        if (show) {
-            verify(styleElement, times(1)).setDisplay(Style.Display.BLOCK);
-        } else {
-            verify(styleElement, times(1)).setDisplay(Style.Display.NONE);
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementPresenterTest.java
deleted file mode 100644
index e5ff797..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementPresenterTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-import com.google.gwt.dom.client.ButtonElement;
-import org.junit.Test;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ELEMENT1_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ELEMENT2_ID;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public abstract class ElementPresenterTest<E extends ElementView, T extends ElementView.Presenter<E>> extends AbstractCollectionEditorTest {
-
-
-
-    protected T elementPresenter;
-
-    /**
-     * <code>List</code> of currently present <code>ElementView</code>s
-     */
-    protected List<E> elementViewListLocal = new ArrayList<>();
-
-    protected E elementView1Mock;
-    protected E elementView2Mock;
-
-    @Mock
-    protected ButtonElement editItemButtonMock;
-    @Mock
-    protected ButtonElement deleteItemButtonMock;
-
-    protected void setup() {
-        super.setup();
-        when(elementView1Mock.getEditItemButton()).thenReturn(editItemButtonMock);
-        when(elementView2Mock.getEditItemButton()).thenReturn(editItemButtonMock);
-        when(elementView1Mock.getDeleteItemButton()).thenReturn(deleteItemButtonMock);
-        when(elementView2Mock.getDeleteItemButton()).thenReturn(deleteItemButtonMock);
-        when(elementView1Mock.getItemId()).thenReturn(ELEMENT1_ID);
-        when(elementView2Mock.getItemId()).thenReturn(ELEMENT2_ID);
-        when(elementView1Mock.getItemSeparator()).thenReturn(itemSeparatorMock);
-        when(elementView1Mock.getItemSeparator()).thenReturn(itemSeparatorMock);
-        when(elementView1Mock.getFaAngleRight()).thenReturn(faAngleRightMock);
-        when(elementView2Mock.getFaAngleRight()).thenReturn(faAngleRightMock);
-        when(elementView1Mock.getItemContainer()).thenReturn(itemContainerMock);
-        when(elementView2Mock.getItemContainer()).thenReturn(itemContainerMock);
-        when(elementView1Mock.getInnerItemContainer()).thenReturn(innerItemContainerMock);
-        when(elementView2Mock.getInnerItemContainer()).thenReturn(innerItemContainerMock);
-        when(elementView1Mock.getSaveChange()).thenReturn(saveChangeMock);
-        when(elementView2Mock.getSaveChange()).thenReturn(saveChangeMock);
-        elementViewListLocal.add(elementView1Mock);
-        elementViewListLocal.add(elementView2Mock);
-        for (String el : Arrays.asList(ELEMENT1_ID, ELEMENT2_ID)) {
-            when(propertyPresenterMock.getSimpleProperties(eq(el + "#KEY"))).thenReturn(new HashMap<>());
-            when(propertyPresenterMock.getSimpleProperties(eq(el + "#MULTIPART_VALUE"))).thenReturn(new HashMap<>());
-        }
-    }
-
-    @Test
-    public void onToggleRowExpansionTrue() {
-        commonOnToggleRowExpansion(true);
-    }
-
-    @Test
-    public void onToggleRowExpansionFalse() {
-        commonOnToggleRowExpansion(false);
-    }
-
-    @Test
-    public void updateCommonToggleStatusNotIsShown() {
-        commonUpdateCommonToggleStatus(false, true);
-        commonUpdateCommonToggleStatus(false, false);
-    }
-
-    @Test
-    public void updateCommonToggleStatusIsShown() {
-        commonUpdateCommonToggleStatus(true, true);
-        commonUpdateCommonToggleStatus(true, false);
-    }
-
-    @Test
-    public void remove() {
-        elementPresenter.remove();
-        elementViewListLocal.forEach(elementViewMock -> {
-            verify(elementPresenter, times(1)).onDeleteItem(eq(elementViewMock));
-        });
-    }
-
-    @Test
-    public void toggleEditItemButtonStatusToDisableTrue() {
-        elementPresenter.toggleEditingStatus(true);
-        elementViewListLocal.forEach(elementViewMock -> {
-            verify(elementViewMock, times(1)).getEditItemButton();
-            verify(elementViewMock, times(1)).getDeleteItemButton();
-        });
-        verify(editItemButtonMock, times(2)).setDisabled(true);
-        verify(deleteItemButtonMock, times(2)).setDisabled(true);
-    }
-
-    @Test
-    public void toggleEditItemButtonStatusToDisableFalse() {
-        elementPresenter.toggleEditingStatus(false);
-        elementViewListLocal.forEach(elementViewMock -> {
-            verify(elementViewMock, times(1)).getEditItemButton();
-            verify(elementViewMock, times(1)).getDeleteItemButton();
-        });
-        verify(editItemButtonMock, times(2)).setDisabled(false);
-        verify(deleteItemButtonMock, times(2)).setDisabled(false);
-    }
-
-    private void commonUpdateCommonToggleStatus(boolean isShown, boolean allEquals) {
-        if (allEquals) {
-            elementViewListLocal.forEach(elementViewMock -> doReturn(!isShown).when(elementViewMock).isShown());
-        } else {
-            doReturn(!isShown).when(elementView1Mock).isShown();
-            doReturn(isShown).when(elementView2Mock).isShown();
-        }
-        elementPresenter.updateCommonToggleStatus(isShown);
-        if (allEquals) {
-            verify(collectionPresenterMock, times(1)).updateRowExpansionStatus(eq(isShown));
-        } else {
-            verify(collectionPresenterMock, never()).updateRowExpansionStatus(eq(isShown));
-        }
-        reset(collectionPresenterMock);
-    }
-
-    private void commonOnToggleRowExpansion(boolean isShown) {
-        elementPresenter.onToggleRowExpansion(isShown);
-        elementViewListLocal.forEach(elementViewMock -> {
-            verify(elementPresenter, times(1)).onToggleRowExpansion(eq(elementViewMock), eq(isShown));
-        });
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementViewImplTest.java
deleted file mode 100644
index 1cf657a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ElementViewImplTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import org.junit.Test;
-
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.FA_ANGLE_DOWN;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.FA_ANGLE_RIGHT;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public abstract class ElementViewImplTest<E extends ElementView, T extends ElementView.Presenter<E>>  extends AbstractCollectionEditorTest {
-
-    protected T elementPresenterMock;
-
-    protected E elementView;
-
-    protected void setup() {
-        super.setup();
-    }
-
-    @Test
-    public void onFaAngleRightClick() {
-        when(faAngleRightMock.getClassName()).thenReturn(FA_ANGLE_RIGHT);
-        elementView.onFaAngleRightClick(clickEventMock);
-        verify(elementPresenterMock, times(1)).onToggleRowExpansion(eq(elementView), eq(false));
-        verify(clickEventMock, times(1)).stopPropagation();
-        reset(clickEventMock);
-        reset(elementPresenterMock);
-        when(faAngleRightMock.getClassName()).thenReturn(FA_ANGLE_DOWN);
-        elementView.onFaAngleRightClick(clickEventMock);
-        verify(elementPresenterMock, times(1)).onToggleRowExpansion(eq(elementView), eq(true));
-        verify(clickEventMock, times(1)).stopPropagation();
-    }
-
-    @Test
-    public void onEditItemButtonClick() {
-        elementView.onEditItemButtonClick(clickEventMock);
-        verify(elementPresenterMock, times(1)).onEditItem(eq(elementView));
-        verify(clickEventMock, times(1)).stopPropagation();
-    }
-
-    @Test
-    public void onDeleteItemButtonClick() {
-        elementView.onDeleteItemButtonClick(clickEventMock);
-        verify(elementPresenterMock, times(1)).onDeleteItem(eq(elementView));
-        verify(clickEventMock, times(1)).stopPropagation();
-    }
-
-    @Test
-    public void onSaveChangeButtonClick() {
-        elementView.onSaveChangeButtonClick(clickEventMock);
-        verify(elementPresenterMock, times(1)).updateItem(eq(elementView));
-        verify(clickEventMock, times(1)).stopPropagation();
-    }
-
-
-    @Test
-    public void onCancelChangeButton() {
-        elementView.onCancelChangeButton(clickEventMock);
-        verify(elementPresenterMock, times(1)).onStopEditingItem(eq(elementView));
-        verify(clickEventMock, times(1)).stopPropagation();
-    }
-
-    @Test
-    public void isShown() {
-        when(faAngleRightMock.getClassName()).thenReturn(FA_ANGLE_DOWN);
-        assertTrue(elementView.isShown());
-        when(faAngleRightMock.getClassName()).thenReturn(FA_ANGLE_RIGHT);
-        assertFalse(elementView.isShown());
-    }
-
-    @Test
-    public void toggleRowExpansion() {
-        commonToggleRowExpansion(true);
-        commonToggleRowExpansion(false);
-    }
-
-    private void commonToggleRowExpansion(boolean toExpand) {
-        String classToAdd = toExpand ? FA_ANGLE_DOWN : FA_ANGLE_RIGHT;
-        String classToRemove= toExpand ? FA_ANGLE_RIGHT : FA_ANGLE_DOWN;
-        elementView.toggleRowExpansion(toExpand);
-        verify(faAngleRightMock, times(1)).addClassName(eq(classToAdd));
-        verify(faAngleRightMock, times(1)).removeClassName(eq(classToRemove));
-        reset(faAngleRightMock);
-    }
-
-    @Test
-    public void setItemSeparatorText() {
-        elementView.setItemSeparatorText("itemName");
-        verify(itemSeparatorTextMock).setInnerText(eq("itemName"));
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementPresenterTest.java
deleted file mode 100644
index cfd0e61..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementPresenterTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.Map;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ELEMENT1_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.EXPANDABLE_PROPERTIES;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.EXPANDABLE_PROPERTIES_VALUES;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ITEM_ID_EXPANDABLE_PROPERTIES_MAP_LOCAL;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_ITEM_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_PROPERTIES_MAP;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ItemElementPresenterTest extends ElementPresenterTest<ItemElementView, ItemElementView.Presenter> {
-
-
-    @Mock
-    private LIElement propertyFieldsMock;
-
-    @Before
-    public void setup() {
-        elementView1Mock = mock(ItemElementView.class);
-        elementView2Mock = mock(ItemElementView.class);
-        super.setup();
-        when(viewsProviderMock.getListEditorElementView()).thenReturn(elementView1Mock);
-        when(propertyPresenterMock.getPropertyFields(anyString(), anyString(), anyString())).thenReturn(propertyFieldsMock);
-        elementPresenter = spy(new ItemElementPresenter() {
-            {
-                this.viewsProvider = viewsProviderMock;
-                this.propertyPresenter = propertyPresenterMock;
-                this.elementViewList = elementViewListLocal;
-                this.collectionEditorPresenter = collectionPresenterMock;
-                this.itemIdExpandablePropertiesMap = ITEM_ID_EXPANDABLE_PROPERTIES_MAP_LOCAL;
-            }
-        });
-        ITEM_ID_EXPANDABLE_PROPERTIES_MAP_LOCAL.put(elementView1Mock.getItemId(), EXPANDABLE_PROPERTIES);
-        ITEM_ID_EXPANDABLE_PROPERTIES_MAP_LOCAL.put(elementView2Mock.getItemId(), EXPANDABLE_PROPERTIES);
-    }
-
-    @Test
-    public void getItemContainer() {
-        elementViewListLocal.clear();
-        ITEM_ID_EXPANDABLE_PROPERTIES_MAP_LOCAL.clear();
-        LIElement itemContainer = elementPresenter.getItemContainer(TEST_ITEM_ID, TEST_PROPERTIES_MAP, EXPANDABLE_PROPERTIES_VALUES);
-        verify(elementView1Mock, times(1 + EXPANDABLE_PROPERTIES_VALUES.size())).init(elementPresenter); // Add invocation inside EXPANDABLE_PROPERTIES_VALUES loop
-        verify(elementView1Mock, times(1)).setItemId(TEST_ITEM_ID);
-        verify(elementView1Mock, times(1 + EXPANDABLE_PROPERTIES_VALUES.size())).getItemContainer(); // Add invocation inside EXPANDABLE_PROPERTIES_VALUES loop
-        verify(elementView1Mock, times(3)).getSaveChange(); // Three times because invoked also inside EXPANDABLE_PROPERTIES_VALUES loop
-        TEST_PROPERTIES_MAP.forEach((propertyName, propertyValue) -> {
-            verify(propertyPresenterMock, times(1))
-                    .getPropertyFields(eq(TEST_ITEM_ID), eq(propertyName), eq(propertyValue));
-            verify(innerItemContainerMock, times(1)).insertBefore(propertyFieldsMock, saveChangeMock);
-            reset(innerItemContainerMock);
-        });
-        assertTrue(ITEM_ID_EXPANDABLE_PROPERTIES_MAP_LOCAL.containsKey(TEST_ITEM_ID));
-        EXPANDABLE_PROPERTIES_VALUES.forEach((nestedPropertyName, nestedPropertiesValues) -> {
-            assertTrue(ITEM_ID_EXPANDABLE_PROPERTIES_MAP_LOCAL.get(TEST_ITEM_ID).contains(nestedPropertyName));
-            verify((ItemElementPresenter) elementPresenter, times(1)).addExpandableItemElementView(eq(elementView1Mock), eq(nestedPropertiesValues), eq(nestedPropertyName));
-        });
-        assertNotNull(itemContainer);
-        assertTrue(elementViewListLocal.contains(elementView1Mock));
-    }
-
-    @Test
-    public void onEditItemShown() {
-        doReturn(true).when(elementView1Mock).isShown();
-        elementPresenter.onEditItem(elementView1Mock);
-        verify(elementPresenter, never()).onToggleRowExpansion(eq(elementView1Mock), eq((false)));
-        verify(propertyPresenterMock, times(1)).editProperties(eq(elementView1Mock.getItemId()));
-        for (String expandableProperty : EXPANDABLE_PROPERTIES) {
-            verify(propertyPresenterMock, times(1)).editProperties(eq(ELEMENT1_ID + "." + expandableProperty));
-        }
-        verify(styleMock, times(1)).setDisplay(Style.Display.INLINE);
-        verify(collectionPresenterMock, times(1)).toggleEditingStatus(eq(true));
-    }
-
-    @Test
-    public void onEditItemNotShown() {
-        doReturn(false).when(elementView1Mock).isShown();
-        elementPresenter.onEditItem(elementView1Mock);
-        verify(elementPresenter, times(1)).onToggleRowExpansion(eq(elementView1Mock), eq((false)));
-        verify(propertyPresenterMock, times(1)).editProperties(eq(elementView1Mock.getItemId()));
-        for (String expandableProperty : EXPANDABLE_PROPERTIES) {
-            verify(propertyPresenterMock, times(1)).editProperties(eq(ELEMENT1_ID + "." + expandableProperty));
-        }
-        verify(styleMock, times(1)).setDisplay(Style.Display.INLINE);
-        verify(collectionPresenterMock, times(1)).toggleEditingStatus(eq(true));
-    }
-
-    @Test
-    public void onStopEditingItem() {
-        elementPresenter.onStopEditingItem(elementView1Mock);
-        verify(elementPresenter, never()).onToggleRowExpansion(eq(elementView1Mock), eq((false)));
-        verify(propertyPresenterMock, times(1)).stopEditProperties(eq(ELEMENT1_ID));
-        verify(styleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(collectionPresenterMock, times(1)).toggleEditingStatus(eq(false));
-    }
-
-    @Test
-    public void onDeleteItem() {
-        elementPresenter.onDeleteItem(elementView1Mock);
-        verify(propertyPresenterMock, times(1)).deleteProperties(eq(ELEMENT1_ID));
-        verify(itemContainerMock, times(1)).removeFromParent();
-        assertFalse(elementViewListLocal.contains(elementView1Mock));
-        verify(collectionPresenterMock, times(1)).toggleEditingStatus(eq(false));
-    }
-
-    @Test
-    public void updateItem() {
-        elementPresenter.updateItem(elementView1Mock);
-        verify(propertyPresenterMock, times(1)).updateProperties(eq(elementView1Mock.getItemId()));
-        for (String expandableProperty : EXPANDABLE_PROPERTIES) {
-            verify(propertyPresenterMock, times(1)).updateProperties(eq(ELEMENT1_ID + "." + expandableProperty));
-        }
-        verify(styleMock, times(1)).setDisplay(Style.Display.NONE);
-        verify(collectionPresenterMock, times(1)).toggleEditingStatus(eq(false));
-    }
-
-    @Test
-    public void getItemsProperties() {
-        Map<String, Map<String, String>> itemsProperties = elementPresenter.getSimpleItemsProperties();
-        assertNotNull(itemsProperties);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementViewImplTest.java
deleted file mode 100644
index 40bb7fc..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/ItemElementViewImplTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ItemElementViewImplTest extends ElementViewImplTest<ItemElementView, ItemElementView.Presenter> {
-
-    @Before
-    public void setup() {
-        elementPresenterMock = mock(ItemElementView.Presenter.class);
-        elementView = spy(new ItemElementViewImpl() {
-            {
-                this.presenter = elementPresenterMock;
-                this.faAngleRight = faAngleRightMock;
-                this.itemSeparatorText = itemSeparatorTextMock;
-            }
-        });
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementPresenterTest.java
deleted file mode 100644
index b54f5b6..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementPresenterTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ELEMENT1_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ELEMENT2_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_ITEM_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_KEY_PROPERTY_MAP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_VALUE_PROPERTYY_MAP;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class KeyValueElementPresenterTest extends ElementPresenterTest<KeyValueElementView, KeyValueElementView.Presenter> {
-
-
-    @Mock
-    private LIElement propertyFieldsMock;
-
-    @Mock
-    private UListElement keyContainerMock;
-
-    @Mock
-    private UListElement valueContainerMock;
-
-    @Mock
-    private LIElement keyLabelMock;
-
-    @Mock
-    private LIElement valueLabelMock;
-
-    @Before
-    public void setup() {
-        elementView1Mock = mock(KeyValueElementView.class);
-        elementView2Mock = mock(KeyValueElementView.class);
-        when(elementView1Mock.getKeyContainer()).thenReturn(keyContainerMock);
-        when(elementView2Mock.getKeyContainer()).thenReturn(keyContainerMock);
-        when(elementView1Mock.getValueContainer()).thenReturn(valueContainerMock);
-        when(elementView2Mock.getValueContainer()).thenReturn(valueContainerMock);
-        when(elementView1Mock.getItemId()).thenReturn(ELEMENT1_ID);
-        when(elementView2Mock.getItemId()).thenReturn(ELEMENT2_ID);
-        when(keyLabelMock.getStyle()).thenReturn(styleMock);
-        when(valueLabelMock.getStyle()).thenReturn(styleMock);
-        when(elementView1Mock.getKeyLabel()).thenReturn(keyLabelMock);
-        when(elementView2Mock.getKeyLabel()).thenReturn(keyLabelMock);
-        when(elementView1Mock.getValueLabel()).thenReturn(valueLabelMock);
-        when(elementView2Mock.getValueLabel()).thenReturn(valueLabelMock);
-        super.setup();
-        when(viewsProviderMock.getKeyValueElementView()).thenReturn(elementView1Mock);
-        when(propertyPresenterMock.getPropertyFields(anyString(), anyString(), anyString())).thenReturn(propertyFieldsMock);
-        elementPresenter = spy(new KeyValueElementPresenter() {
-            {
-                this.viewsProvider = viewsProviderMock;
-                this.propertyPresenter = propertyPresenterMock;
-                this.elementViewList = elementViewListLocal;
-                this.collectionEditorPresenter = collectionPresenterMock;
-            }
-        });
-    }
-
-    @Test
-    public void getKeyValueContainer() {
-        elementViewListLocal.clear();
-        LIElement keyValueContainer = elementPresenter.getKeyValueContainer(TEST_ITEM_ID, TEST_KEY_PROPERTY_MAP, TEST_VALUE_PROPERTYY_MAP);
-        verify(elementView1Mock, times(1)).init(elementPresenter);
-        verify(elementView1Mock, times(1)).setItemId(TEST_ITEM_ID);
-        verify(elementView1Mock, times(1)).getKeyContainer();
-        verify(keyContainerMock, times(1)).appendChild(propertyFieldsMock);
-        verify(elementView1Mock, times(1)).getValueContainer();
-        verify(valueContainerMock, times(1)).appendChild(propertyFieldsMock);
-        assertNotNull(keyValueContainer);
-        assertTrue(elementViewListLocal.contains(elementView1Mock));
-    }
-
-    @Test
-    public void onEditItemShown() {
-        doReturn(true).when(elementView1Mock).isShown();
-        elementPresenter.onEditItem(elementView1Mock);
-        verify(elementPresenter, never()).onToggleRowExpansion(eq(elementView1Mock), eq((false)));
-        verify(propertyPresenterMock, times(2)).editProperties(anyString());
-        verify(styleMock, times(1)).setDisplay(Style.Display.INLINE);
-        verify(collectionPresenterMock, times(1)).toggleEditingStatus(eq(true));
-    }
-
-    @Test
-    public void onEditItemNotShown() {
-        doReturn(false).when(elementView1Mock).isShown();
-        elementPresenter.onEditItem(elementView1Mock);
-        verify(propertyPresenterMock, times(2)).editProperties(anyString());
-        verify(styleMock, times(1)).setDisplay(Style.Display.INLINE);
-        verify(collectionPresenterMock, times(1)).toggleEditingStatus(eq(true));
-    }
-
-    @Test
-    public void onStopEditingItem() {
-        elementPresenter.onStopEditingItem(elementView1Mock);
-        verify(propertyPresenterMock, times(1)).stopEditProperties(eq(ELEMENT1_ID + "#key"));
-        verify(propertyPresenterMock, times(1)).stopEditProperties(eq(ELEMENT1_ID + "#value"));
-        verify(styleMock, times(1)).setDisplay(Style.Display.NONE);
-        verify(collectionPresenterMock, times(1)).toggleEditingStatus(eq(false));
-    }
-
-    @Test
-    public void onDeleteItem() {
-        elementPresenter.onDeleteItem(elementView1Mock);
-        verify(propertyPresenterMock, times(1)).deleteProperties(eq(ELEMENT1_ID + "#key"));
-        verify(propertyPresenterMock, times(1)).deleteProperties(eq(ELEMENT1_ID + "#value"));
-        verify(itemContainerMock, times(1)).removeFromParent();
-        assertFalse(elementViewListLocal.contains(elementView1Mock));
-        verify(collectionPresenterMock, times(1)).toggleEditingStatus(eq(false));
-    }
-
-    @Test
-    public void updateItem() {
-        elementPresenter.updateItem(elementView1Mock);
-        verify(propertyPresenterMock, times(2)).updateProperties(anyString());
-        verify(styleMock, times(1)).setDisplay(Style.Display.NONE);
-        verify(collectionPresenterMock, times(1)).toggleEditingStatus(eq(false));
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementViewImplTest.java
deleted file mode 100644
index 66b7228..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/KeyValueElementViewImplTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class KeyValueElementViewImplTest extends ElementViewImplTest<KeyValueElementView, KeyValueElementView.Presenter> {
-
-    @Before
-    public void setup() {
-        elementPresenterMock = mock(KeyValueElementView.Presenter.class);
-        elementView = spy(new KeyValueElementViewImpl() {
-            {
-                this.presenter = elementPresenterMock;
-                this.faAngleRight = faAngleRightMock;
-                this.itemSeparatorText = itemSeparatorTextMock;
-            }
-        });
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyPresenterTest.java
deleted file mode 100644
index 4631bfa..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyPresenterTest.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.INNER_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ITEM_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_NEWVALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_PROPERTYNAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_PROPERTYVALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.NODE_HIDDEN;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class PropertyPresenterTest extends AbstractCollectionEditorTest {
-
-
-    @Mock
-    private PropertyView propertyViewMock;
-
-    @Mock
-    private PropertyViewImpl propertyViewImplMock;
-
-    @Mock
-    private LIElement liElementMock;
-
-    @Mock
-    private SpanElement spanElementMock;
-
-    @Mock
-    private InputElement propertyValueInputMock;
-
-    @Mock
-    private LIElement propertyFieldsMock;
-
-    private Map<String, SpanElement> propertySpanElementMapLocal = new HashMap<>();
-
-    private Map<String, List<PropertyView>> propertyViewMapLocal = new HashMap<>();
-
-    @Mock
-    private Style styleMock;
-
-    private PropertyPresenter propertyEditorPresenter;
-
-    @Before
-    public void setup() {
-        List<PropertyView> propertyViewListLocal = new ArrayList<>();
-        propertyViewListLocal.add(propertyViewMock);
-        propertyViewMapLocal.put(ITEM_ID, propertyViewListLocal);
-        propertySpanElementMapLocal.put(TEST_PROPERTYNAME, spanElementMock);
-        when(liElementMock.getStyle()).thenReturn(styleMock);
-        this.propertyEditorPresenter = spy(new PropertyPresenter() {
-            {
-                this.viewsProvider = viewsProviderMock;
-                this.propertySpanElementMap = propertySpanElementMapLocal;
-                this.propertyViewMap = propertyViewMapLocal;
-            }
-        });
-        when(spanElementMock.getInnerText()).thenReturn(INNER_TEXT);
-        when(spanElementMock.getStyle()).thenReturn(styleMock);
-        when(spanElementMock.getAttribute("data-i18n-key")).thenReturn(TEST_PROPERTYNAME);
-        when(viewsProviderMock.getPropertyEditorView()).thenReturn(propertyViewMock);
-        when(propertyValueInputMock.getStyle()).thenReturn(styleMock);
-        when(propertyValueInputMock.getValue()).thenReturn(TEST_NEWVALUE);
-        when(propertyViewMock.getPropertyName()).thenReturn(spanElementMock);
-        when(propertyViewMock.getPropertyValueSpan()).thenReturn(spanElementMock);
-        when(propertyViewMock.getPropertyFields()).thenReturn(propertyFieldsMock);
-        when(propertyViewMock.getPropertyValueInput()).thenReturn(propertyValueInputMock);
-        when(propertyViewImplMock.getPropertyFields()).thenReturn(liElementMock);
-        when(propertyFieldsMock.getStyle()).thenReturn(styleMock);
-    }
-
-    @Test
-    public void getPropertyValueContainsKey() throws Exception {
-        assertEquals(INNER_TEXT, propertyEditorPresenter.getPropertyValue(TEST_PROPERTYNAME));
-    }
-
-    @Test(expected = Exception.class)
-    public void getPropertyValueNotContainsKey() throws Exception {
-        propertySpanElementMapLocal.clear();
-        propertyEditorPresenter.getPropertyValue(TEST_PROPERTYNAME);
-    }
-
-    @Test
-    public void editProperties() {
-        propertyEditorPresenter.editProperties(ITEM_ID);
-        verify(spanElementMock, times(1)).getStyle();
-        verify(styleMock, times(1)).setDisplay(Style.Display.NONE);
-        verify(propertyValueInputMock, times(1)).setValue(anyString());
-        verify(propertyValueInputMock, times(1)).getStyle();
-        verify(styleMock, times(1)).setDisplay(Style.Display.INLINE);
-        verify(propertyValueInputMock, times(1)).setDisabled(eq(false));
-    }
-
-    @Test
-    public void editPropertiesNoSimpleProperties() {
-        propertyEditorPresenter.editProperties("missing-item");
-        verify(spanElementMock, never()).getStyle();
-        verify(styleMock, never()).setDisplay(any());
-        verify(propertyValueInputMock, never()).setValue(anyString());
-        verify(propertyValueInputMock, never()).getStyle();
-        verify(styleMock, never()).setDisplay(any());
-        verify(propertyValueInputMock, never()).setDisabled(anyBoolean());
-    }
-
-    @Test
-    public void stopEditProperties() {
-        propertyEditorPresenter.stopEditProperties(ITEM_ID);
-        verify(propertyEditorPresenter, times(1)).stopEdit(eq(ITEM_ID), eq(false));
-    }
-
-    @Test
-    public void updateProperties() {
-        assertNotNull(propertyEditorPresenter.updateProperties(ITEM_ID));
-        verify(propertyEditorPresenter, times(1)).stopEdit(eq(ITEM_ID), eq(true));
-    }
-
-    @Test
-    public void getProperties() {
-        assertFalse(propertyEditorPresenter.getSimpleProperties(ITEM_ID).isEmpty());
-        assertTrue(propertyEditorPresenter.getSimpleProperties("missing-item").isEmpty());
-    }
-
-    @Test
-    public void getPropertyFields() {
-        String hashedPropertyName = "#" + TEST_PROPERTYNAME;
-        propertyViewMapLocal.clear();
-        final LIElement retireved = propertyEditorPresenter.getPropertyFields(ITEM_ID, TEST_PROPERTYNAME, TEST_PROPERTYVALUE);
-        assertNotNull(retireved);
-        verify(propertyValueInputMock, times(1)).setAttribute(eq("placeholder"), eq(hashedPropertyName));
-        verify(propertyValueInputMock, times(1)).setAttribute(eq("data-field"), eq("propertyValue" + hashedPropertyName));
-        verify(propertyValueInputMock, times(1)).setDisabled(eq(true));
-        verify(styleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(propertyFieldsMock, times(1)).setAttribute(eq("data-field"), eq("propertyFields" + hashedPropertyName));
-        assertTrue(propertyViewMapLocal.containsKey(ITEM_ID));
-        assertTrue(propertyViewMapLocal.get(ITEM_ID).contains(propertyViewMock));
-    }
-
-    @Test
-    public void getEditingPropertyFields() {
-        assertNotNull(propertyEditorPresenter.getEditingPropertyFields(ITEM_ID, TEST_PROPERTYNAME, TEST_PROPERTYVALUE));
-        verify(propertyEditorPresenter, times(1)).getPropertyFields(eq(ITEM_ID), eq(TEST_PROPERTYNAME), eq(TEST_PROPERTYVALUE));
-        verify(propertyEditorPresenter, times(1)).editProperties(eq(ITEM_ID));
-    }
-
-    @Test
-    public void onToggleRowExpansion() {
-        propertyEditorPresenter.onToggleRowExpansion(ITEM_ID, true);
-        verify(propertyFieldsMock, times(1)).addClassName(eq(NODE_HIDDEN));
-        verify(styleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-        propertyEditorPresenter.onToggleRowExpansion(ITEM_ID, false);
-        verify(propertyFieldsMock, times(1)).removeClassName(eq(NODE_HIDDEN));
-        verify(styleMock, times(1)).setDisplay(eq(Style.Display.BLOCK));
-    }
-
-    @Test
-    public void onToggleRowExpansionNoSimpleProperties() {
-        propertyEditorPresenter.onToggleRowExpansion(eq("missing-item"), anyBoolean());
-        verify(propertyFieldsMock, never()).addClassName(anyString());
-        verify(styleMock, never()).setDisplay(any());
-    }
-
-    @Test
-    public void deleteProperties() {
-        propertyEditorPresenter.deleteProperties(ITEM_ID);
-        verify(propertyFieldsMock, times(1)).removeFromParent();
-        assertFalse(propertySpanElementMapLocal.containsKey(TEST_PROPERTYNAME));
-        assertFalse(propertyViewMapLocal.containsKey(ITEM_ID));
-    }
-
-    @Test
-    public void deletePropertiesNoSimpleProperties() {
-        propertyEditorPresenter.deleteProperties("missing-item");
-        verify(propertyFieldsMock, never()).removeFromParent();
-    }
-
-    @Test
-    public void stopEditToUpdateTrue() {
-        commonStopEdit(true);
-    }
-
-    @Test
-    public void stopEditToUpdateFalse() {
-        commonStopEdit(false);
-    }
-
-    private void commonStopEdit(boolean toUpdate) {
-        final Map<String, String> retrieved = propertyEditorPresenter.stopEdit(ITEM_ID, toUpdate);
-        assertNotNull(retrieved);
-        assertTrue(retrieved.containsKey(INNER_TEXT));
-        if (toUpdate) {
-            verify(spanElementMock, times(1)).setInnerText(eq(TEST_NEWVALUE));
-        }
-        assertEquals(INNER_TEXT, retrieved.get(INNER_TEXT));
-        verify(styleMock, times(1)).setDisplay(Style.Display.INLINE);
-        verify(styleMock, times(1)).setDisplay(Style.Display.NONE);
-        verify(propertyValueInputMock, times(1)).setDisabled(eq(true));
-    }
-
-    @Test
-    public void stopEditNoSimpleProperties() {
-        final Map<String, String> retrieved = propertyEditorPresenter.stopEdit(eq(ITEM_ID), anyBoolean());
-        assertTrue(retrieved.isEmpty());
-        verify(spanElementMock, never()).setInnerText(anyString());
-        verify(styleMock, never()).setDisplay(any());
-        verify(styleMock, never()).setDisplay(any());
-        verify(propertyValueInputMock, never()).setDisabled(anyBoolean());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyViewImplTest.java
deleted file mode 100644
index 9979494..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/PropertyViewImplTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor;
-
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class PropertyViewImplTest extends AbstractCollectionEditorTest {
-
-    private PropertyViewImpl propertyViewImpl;
-
-    @Mock
-    InputElement propertyValueInputMock;
-
-    @Before
-    public void setup() {
-        propertyViewImpl = spy(new PropertyViewImpl() {
-            {
-                this.propertyValueInput = propertyValueInputMock;
-            }
-        });
-    }
-
-    @Test
-    public void onPropertyValueInputClickEvent() {
-        propertyViewImpl.onPropertyValueInputClickEvent(clickEventMock);
-        verify(propertyValueInputMock, times(1)).focus();
-        verify(clickEventMock, times(1)).stopPropagation();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/AbstractEditingBoxImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/AbstractEditingBoxImplTest.java
deleted file mode 100644
index e9dea36..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/AbstractEditingBoxImplTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.junit.Test;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-public abstract class AbstractEditingBoxImplTest {
-
-    protected EditingBox.Presenter presenterMock;
-
-    protected EditingBoxImpl editingBoxImpl;
-
-    protected ClickEvent clickEventMock = mock(ClickEvent.class);
-
-    @Test
-    public void onSaveItemClickEvent() {
-        editingBoxImpl.onSaveItemClickEvent(clickEventMock);
-        verify(presenterMock, times(1)).save();
-        verify(editingBoxImpl, times(1)).close(clickEventMock);
-        verify(clickEventMock, times(2)).stopPropagation();
-    }
-
-    @Test
-    public void onDiscardItemClickEvent() {
-        editingBoxImpl.onDiscardItemClickEvent(clickEventMock);
-        verify(editingBoxImpl, times(1)).close(clickEventMock);
-        verify(clickEventMock, times(2)).stopPropagation();
-    }
-
-    @Test
-    public void close() {
-        editingBoxImpl.close(clickEventMock);
-        verify(presenterMock, times(1)).close(editingBoxImpl);
-        verify(clickEventMock, times(1)).stopPropagation();
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/AbstractEditingBoxPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/AbstractEditingBoxPresenterTest.java
deleted file mode 100644
index 10763ee..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/AbstractEditingBoxPresenterTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import com.google.gwt.dom.client.HeadingElement;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.UListElement;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.AbstractCollectionEditorTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractEditingBoxPresenterTest extends AbstractCollectionEditorTest {
-
-    protected EditingBox editingBoxToCloseMock;
-
-    protected EditingBoxPresenter editingBoxPresenter;
-
-    @Mock
-    protected LIElement editingBoxMock;
-
-    @Mock
-    protected HeadingElement editingBoxTitleMock;
-
-    @Mock
-    protected UListElement propertiesContainerMock;
-
-    @Before
-    public void setup() {
-        super.setup();
-        when(editingBoxToCloseMock.getEditingBox()).thenReturn(editingBoxMock);
-        when(editingBoxToCloseMock.getEditingBoxTitle()).thenReturn(editingBoxTitleMock);
-        when(editingBoxToCloseMock.getPropertiesContainer()).thenReturn(propertiesContainerMock);
-    }
-
-    @Test
-    public void close() {
-        editingBoxPresenter.close(editingBoxToCloseMock);
-        verify(editingBoxMock, times(1)).removeFromParent();
-        verify(collectionPresenterMock, times(1)).toggleEditingStatus(eq(false));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxImplTest.java
deleted file mode 100644
index bad2142..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxImplTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ItemEditingBoxImplTest extends AbstractEditingBoxImplTest {
-
-    @Before
-    public void setup() {
-        presenterMock = mock(ItemEditingBoxPresenter.class);
-        editingBoxImpl = spy(new ItemEditingBoxImpl() {
-            {
-                this.presenter = presenterMock;
-            }
-        });
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxPresenterTest.java
deleted file mode 100644
index 434bbea..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/ItemEditingBoxPresenterTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LOWER_CASE_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAP_TEST_KEY;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_INSTANCE_PROPERTY_MAP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_KEY;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_PROPERTYNAME;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ItemEditingBoxPresenterTest extends AbstractEditingBoxPresenterTest {
-
-
-    @Mock
-    private ItemEditingBox listEditingBoxMock;
-
-
-    private List<String> nestedPropertiesNamesListLocal = new ArrayList<>();
-
-
-    @Before
-    public void setup() {
-        editingBoxToCloseMock = listEditingBoxMock;
-        when(viewsProviderMock.getItemEditingBox()).thenReturn(listEditingBoxMock);
-        editingBoxPresenter = spy(new ItemEditingBoxPresenter() {
-            {
-                this.viewsProvider = viewsProviderMock;
-                this.propertyPresenter = propertyPresenterMock;
-                this.collectionEditorPresenter = collectionPresenterMock;
-                this.nestedPropertiesNamesList = nestedPropertiesNamesListLocal;
-            }
-        });
-        super.setup(); // This call needs to be made after editingBoxPresenter instantiation
-        nestedPropertiesNamesListLocal.clear();
-    }
-
-    @Test
-    public void getEditingBox() {
-        ((ItemEditingBoxPresenter)editingBoxPresenter).getEditingBox(TEST_KEY, TEST_INSTANCE_PROPERTY_MAP, new HashMap<>());
-        verify(viewsProviderMock, times(1)).getItemEditingBox();
-        verify(listEditingBoxMock, times(1)).init(((ItemEditingBoxPresenter)editingBoxPresenter));
-        verify(listEditingBoxMock, times(1)).setKey(TEST_KEY);
-        verify(editingBoxTitleMock, times(1)).setInnerText("Edit " + TEST_PROPERTYNAME);
-        verify(listEditingBoxMock, times(1)).getEditingBox();
-    }
-
-    @Test
-    public void save() {
-        editingBoxPresenter.save();
-        verify(propertyPresenterMock, times(1)).updateProperties(LOWER_CASE_VALUE);
-        verify(collectionPresenterMock, times(1)).addListItem(anyMap(), anyMap());
-    }
-
-
-    @Test
-    public void addExpandableItemEditingBox() {
-        reset(propertyPresenterMock);
-        assertFalse(nestedPropertiesNamesListLocal.contains(TEST_KEY));
-        ItemEditingBox containerItemEditingBoxMock = mock(ItemEditingBox.class);
-        UListElement containerPropertiesContainerMock = mock(UListElement.class);
-        when(containerItemEditingBoxMock.getPropertiesContainer()).thenReturn(containerPropertiesContainerMock);
-        ((ItemEditingBoxPresenter)editingBoxPresenter).addExpandableItemEditingBox(containerItemEditingBoxMock, TEST_INSTANCE_PROPERTY_MAP, TEST_KEY, TEST_PROPERTYNAME);
-        verify(viewsProviderMock, times(1)).getItemEditingBox();
-        verify(listEditingBoxMock, times(1)).init(((ItemEditingBoxPresenter)editingBoxPresenter));
-        verify(listEditingBoxMock, times(1)).setKey(TEST_KEY);
-        verify(editingBoxTitleMock, times(1)).setInnerText(TEST_PROPERTYNAME);
-        verify(listEditingBoxMock, times(1)).removeButtonToolbar();
-        assertTrue(nestedPropertiesNamesListLocal.contains(TEST_PROPERTYNAME));
-        verify(propertyPresenterMock, times(1)).getEditingPropertyFields(eq(TEST_PROPERTYNAME), eq(MAP_TEST_KEY), eq(""));
-        // verify nested properties added to expandable container
-        verify(propertiesContainerMock, times(1)).appendChild(any());
-        // Verify expandable item added to main container
-        verify(containerPropertiesContainerMock, times(1)).appendChild(eq(editingBoxMock));
-
-    }
-
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxImplTest.java
deleted file mode 100644
index c488a08..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxImplTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class KeyValueEditingBoxImplTest extends AbstractEditingBoxImplTest {
-
-    @Before
-    public void setup() {
-        presenterMock = mock(KeyValueEditingBoxPresenter.class);
-        editingBoxImpl = spy(new KeyValueEditingBoxImpl() {
-            {
-                this.presenter = presenterMock;
-            }
-        });
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxPresenterTest.java
deleted file mode 100644
index 303bdc9..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/editingbox/KeyValueEditingBoxPresenterTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.collectioneditor.editingbox;
-
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LOWER_CASE_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_KEY;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_KEY_PROPERTY_MAP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_PROPERTYNAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_VALUE_PROPERTYY_MAP;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class KeyValueEditingBoxPresenterTest extends AbstractEditingBoxPresenterTest {
-
-
-
-    @Mock
-    private KeyValueEditingBox keyValueEditingBoxMock;
-
-    @Mock
-    private UListElement keyContainerMock;
-
-    @Mock
-    private UListElement valueContainerMock;
-
-    @Before
-    public void setup() {
-        editingBoxToCloseMock = keyValueEditingBoxMock;
-        when(keyValueEditingBoxMock.getKeyContainer()).thenReturn(keyContainerMock);
-        when(keyValueEditingBoxMock.getValueContainer()).thenReturn(valueContainerMock);
-        when(keyValueEditingBoxMock.getPropertiesContainer()).thenReturn(propertiesContainerMock);
-        when(viewsProviderMock.getKeyValueEditingBox()).thenReturn(keyValueEditingBoxMock);
-        editingBoxPresenter = spy(new KeyValueEditingBoxPresenter() {
-            {
-                this.viewsProvider = viewsProviderMock;
-                this.propertyPresenter = propertyPresenterMock;
-                this.collectionEditorPresenter = collectionPresenterMock;
-            }
-        });
-        super.setup();
-    }
-
-    @Test
-    public void getEditingBox() {
-        editingBoxMock =  ((KeyValueEditingBoxPresenter)editingBoxPresenter).getEditingBox(TEST_KEY, TEST_KEY_PROPERTY_MAP, TEST_VALUE_PROPERTYY_MAP);
-        verify(viewsProviderMock, times(1)).getKeyValueEditingBox();
-        verify(keyValueEditingBoxMock, times(1)).init((KeyValueEditingBoxPresenter)editingBoxPresenter);
-        verify(keyValueEditingBoxMock, times(1)).setKey(TEST_KEY);
-        verify(editingBoxTitleMock, times(1)).setInnerText("Edit " + TEST_PROPERTYNAME);
-        verify(keyContainerMock, times(1)).appendChild(editingPropertyFieldsMock);
-        verify(valueContainerMock, times(1)).appendChild(editingPropertyFieldsMock);
-        verify(keyValueEditingBoxMock, times(1)).getEditingBox();
-        assertNotNull(editingBoxMock);
-    }
-
-    @Test
-    public void save() {
-        editingBoxPresenter.save();
-        verify(propertyPresenterMock, times(1)).updateProperties("key");
-        verify(propertyPresenterMock, times(1)).updateProperties(LOWER_CASE_VALUE);
-        verify(collectionPresenterMock, times(1)).addMapItem(anyMap(), anyMap());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioCommandRegistryManagerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioCommandRegistryManagerTest.java
deleted file mode 100644
index 63e5e32..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioCommandRegistryManagerTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands;
-
-import java.util.Optional;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.appformer.client.stateControl.registry.impl.DefaultRegistryImpl;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.AbstractScenarioSimulationUndoableCommand;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.command.client.CommandResult;
-import org.kie.workbench.common.command.client.CommandResultBuilder;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioCommandRegistryManagerTest extends AbstractScenarioSimulationTest {
-
-    private ScenarioCommandRegistryManager scenarioCommandRegistryManagerSpy;
-    private DefaultRegistryImpl<AbstractScenarioSimulationUndoableCommand> doneCommandsRegistrySpy;
-    private DefaultRegistryImpl<AbstractScenarioSimulationUndoableCommand> undoneCommandsRegistrySpy;
-
-    @Mock
-    private AbstractScenarioSimulationUndoableCommand abstractScenarioGridCommandMock;
-
-    @Before
-    public void setup() {
-        super.setup();
-        doneCommandsRegistrySpy = spy(new DefaultRegistryImpl<>());
-        undoneCommandsRegistrySpy = spy(new DefaultRegistryImpl<>());
-        scenarioCommandRegistryManagerSpy = spy(new ScenarioCommandRegistryManager() {
-            {
-                this.doneCommandsRegistry = doneCommandsRegistrySpy;
-                this.undoneCommandsRegistry = undoneCommandsRegistrySpy;
-            }
-        });
-    }
-
-    @Test
-    public void register() {
-        undoneCommandsRegistrySpy.register(abstractScenarioGridCommandMock);
-        assertFalse(undoneCommandsRegistrySpy.isEmpty());
-        scenarioCommandRegistryManagerSpy.register(scenarioSimulationContextLocal, abstractScenarioGridCommandMock);
-        verify(doneCommandsRegistrySpy, times(1)).register(eq(abstractScenarioGridCommandMock));
-        verify(undoneCommandsRegistrySpy, times(1)).clear();
-        verify(scenarioCommandRegistryManagerSpy, times(1)).setUndoRedoButtonStatus(eq(scenarioSimulationContextLocal));
-        assertTrue(undoneCommandsRegistrySpy.isEmpty());
-    }
-
-    @Test
-    public void undoEmpty() {
-        final CommandResult<ScenarioSimulationViolation> retrieved = scenarioCommandRegistryManagerSpy.undo(scenarioSimulationContextLocal);
-        assertEquals(CommandResult.Type.WARNING, retrieved.getType());
-        verify(scenarioCommandRegistryManagerSpy, never()).commonUndoRedoOperation(eq(scenarioSimulationContextLocal), eq(appendRowCommandMock), eq(true));
-        verify(scenarioCommandRegistryManagerSpy, times(1)).setUndoRedoButtonStatus(eq(scenarioSimulationContextLocal));
-    }
-
-    @Test
-    public void undoNotEmptySameGrid() {
-        doneCommandsRegistrySpy.register(abstractScenarioGridCommandMock);
-        doReturn(CommandResultBuilder.SUCCESS).when(scenarioCommandRegistryManagerSpy).commonUndoRedoOperation(any(), any(), anyBoolean());
-        doReturn(Optional.empty()).when(scenarioCommandRegistryManagerSpy).commonUndoRedoPreexecution(any(), any());
-        final CommandResult<ScenarioSimulationViolation> retrieved = scenarioCommandRegistryManagerSpy.undo(scenarioSimulationContextLocal);
-        assertEquals(CommandResult.Type.INFO, retrieved.getType());
-        verify(scenarioCommandRegistryManagerSpy, times(1)).commonUndoRedoOperation(eq(scenarioSimulationContextLocal), eq(abstractScenarioGridCommandMock), eq(true));
-        verify(scenarioCommandRegistryManagerSpy, times(1)).setUndoRedoButtonStatus(eq(scenarioSimulationContextLocal));
-    }
-
-    @Test
-    public void undoNotEmptyDifferentGrid() {
-        doneCommandsRegistrySpy.register(appendRowCommandMock);
-        doReturn(Optional.of(CommandResultBuilder.SUCCESS)).when(appendRowCommandMock).commonUndoRedoPreExecution(eq(scenarioSimulationContextLocal));
-        assertFalse(doneCommandsRegistrySpy.isEmpty());
-        scenarioCommandRegistryManagerSpy.undo(scenarioSimulationContextLocal);
-        assertTrue(doneCommandsRegistrySpy.isEmpty());
-        verify(scenarioCommandRegistryManagerSpy, times(1)).commonUndoRedoOperation(eq(scenarioSimulationContextLocal), eq(appendRowCommandMock), eq(true));
-        verify(scenarioCommandRegistryManagerSpy, times(1)).setUndoRedoButtonStatus(eq(scenarioSimulationContextLocal));
-    }
-
-    @Test
-    public void redoEmpty() {
-        scenarioCommandRegistryManagerSpy.redo(scenarioSimulationContextLocal);
-        verify(scenarioCommandRegistryManagerSpy, never()).commonUndoRedoOperation(eq(scenarioSimulationContextLocal), eq(appendRowCommandMock), eq(true));
-        verify(scenarioCommandRegistryManagerSpy, times(1)).setUndoRedoButtonStatus(eq(scenarioSimulationContextLocal));
-    }
-
-    @Test
-    public void redoNotEmptySameGrid() {
-        undoneCommandsRegistrySpy.register(abstractScenarioGridCommandMock);
-        doReturn(CommandResultBuilder.SUCCESS).when(scenarioCommandRegistryManagerSpy).commonUndoRedoOperation(any(), any(), anyBoolean());
-        doReturn(Optional.empty()).when(scenarioCommandRegistryManagerSpy).commonUndoRedoPreexecution(any(), any());
-        final CommandResult<ScenarioSimulationViolation> retrieved = scenarioCommandRegistryManagerSpy.redo(scenarioSimulationContextLocal);
-        assertEquals(CommandResult.Type.INFO, retrieved.getType());
-        verify(scenarioCommandRegistryManagerSpy, never()).commonUndoRedoOperation(eq(scenarioSimulationContextLocal), eq(abstractScenarioGridCommandMock), eq(true));
-        verify(scenarioCommandRegistryManagerSpy, times(1)).setUndoRedoButtonStatus(eq(scenarioSimulationContextLocal));
-    }
-
-    @Test
-    public void redoNotEmptyDifferentGrid() {
-        undoneCommandsRegistrySpy.register(appendRowCommandMock);
-        doReturn(Optional.of(CommandResultBuilder.SUCCESS)).when(appendRowCommandMock).commonUndoRedoPreExecution(eq(scenarioSimulationContextLocal));
-        assertFalse(undoneCommandsRegistrySpy.isEmpty());
-        scenarioCommandRegistryManagerSpy.redo(scenarioSimulationContextLocal);
-        verify(scenarioCommandRegistryManagerSpy, times(1)).commonUndoRedoOperation(eq(scenarioSimulationContextLocal), eq(appendRowCommandMock), eq(false));
-        verify(scenarioCommandRegistryManagerSpy, times(1)).setUndoRedoButtonStatus(eq(scenarioSimulationContextLocal));
-        assertTrue(undoneCommandsRegistrySpy.isEmpty());
-    }
-
-    @Test
-    public void commonOperationUndo() {
-        scenarioCommandRegistryManagerSpy.commonUndoRedoOperation(scenarioSimulationContextLocal, appendRowCommandMock, true);
-        verify(appendRowCommandMock, times(1)).undo(eq(scenarioSimulationContextLocal));
-        verify(appendRowCommandMock, never()).redo(eq(scenarioSimulationContextLocal));
-    }
-
-    @Test
-    public void commonOperationRedo() {
-        scenarioCommandRegistryManagerSpy.commonUndoRedoOperation(scenarioSimulationContextLocal, appendRowCommandMock, false);
-        verify(appendRowCommandMock, times(1)).redo(eq(scenarioSimulationContextLocal));
-        verify(appendRowCommandMock, never()).undo(eq(scenarioSimulationContextLocal));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationContextTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationContextTest.java
deleted file mode 100644
index b4b9d73..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationContextTest.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands;
-
-import java.util.Optional;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.models.AbstractScesimGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridPanel;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PACKAGE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationContextTest extends AbstractScenarioSimulationTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-    }
-
-    @Test
-    public void getSelectedScenarioGridPanelSIMULATION() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(true);
-        assertEquals(Optional.of(scenarioGridPanelMock), scenarioSimulationContextLocal.getSelectedScenarioGridPanel());
-    }
-
-    @Test
-    public void getSelectedScenarioGridPanelBACKGROUND() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(true);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        assertEquals(Optional.of(backgroundGridPanelMock), scenarioSimulationContextLocal.getSelectedScenarioGridPanel());
-    }
-
-    @Test
-    public void getSelectedScenarioGridPanelNone() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        assertEquals(Optional.empty(), scenarioSimulationContextLocal.getSelectedScenarioGridPanel());
-    }
-
-    @Test
-    public void getSelectedScenarioGridWidgetSIMULATION() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(true);
-        assertEquals(Optional.of(scenarioGridWidgetSpy), scenarioSimulationContextLocal.getSelectedScenarioGridWidget());
-    }
-
-    @Test
-    public void getSelectedScenarioGridWidgetBACKGROUND() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(true);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        assertEquals(Optional.of(backgroundGridWidgetSpy), scenarioSimulationContextLocal.getSelectedScenarioGridWidget());
-    }
-
-    @Test
-    public void getSelectedScenarioGridWidgetNone() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        assertEquals(Optional.empty(), scenarioSimulationContextLocal.getSelectedScenarioGridWidget());
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void getSelectedScenarioGridWidgetFail() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(true);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(true);
-        scenarioSimulationContextLocal.getSelectedScenarioGridWidget();
-    }
-
-    @Test
-    public void getSelectedScenarioGridModelSIMULATION() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(true);
-        assertEquals(Optional.of(scenarioGridModelMock), scenarioSimulationContextLocal.getSelectedScenarioGridModel());
-    }
-
-    @Test
-    public void getSelectedScenarioGridModelBACKGROUND() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(true);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        assertEquals(Optional.of(backgroundGridModelMock), scenarioSimulationContextLocal.getSelectedScenarioGridModel());
-    }
-
-    @Test
-    public void getSelectedScenarioGridModelNone() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        assertEquals(Optional.empty(), scenarioSimulationContextLocal.getSelectedScenarioGridModel());
-    }
-
-    @Test
-    public void getSelectedScenarioGridLayerSIMULATION() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(true);
-        assertEquals(Optional.of(scenarioGridLayerMock), scenarioSimulationContextLocal.getSelectedScenarioGridLayer());
-    }
-
-    @Test
-    public void getSelectedScenarioGridLayerBACKGROUND() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(true);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        assertEquals(Optional.of(backgroundGridLayerMock), scenarioSimulationContextLocal.getSelectedScenarioGridLayer());
-    }
-
-    @Test
-    public void getSelectedScenarioGridLayerNone() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        assertEquals(Optional.empty(), scenarioSimulationContextLocal.getSelectedScenarioGridLayer());
-    }
-
-    @Test
-    public void getScenarioGridPanelByGridWidget() {
-        assertEquals(scenarioGridPanelMock, scenarioSimulationContextLocal.getScenarioGridPanelByGridWidget(GridWidget.SIMULATION));
-        assertEquals(backgroundGridPanelMock, scenarioSimulationContextLocal.getScenarioGridPanelByGridWidget(GridWidget.BACKGROUND));
-    }
-
-    @Test
-    public void getScenarioGridPanelByGridWidgetCheckSwitch() {
-        // Test to verify there are not new, un-managed, GridWidget
-        for (GridWidget gridWidget : GridWidget.values()) {
-            ScenarioGridPanel gridPanel = scenarioSimulationContextLocal.getScenarioGridPanelByGridWidget(gridWidget);
-            if (GridWidget.BACKGROUND.equals(gridWidget)) {
-                assertEquals(backgroundGridPanelMock, gridPanel);
-            } else {
-                assertEquals(scenarioGridPanelMock, gridPanel);
-            }
-        }
-    }
-
-    @Test
-    public void getAbstractScesimGridModelByGridWidget() {
-        assertEquals(scenarioGridModelMock, scenarioSimulationContextLocal.getAbstractScesimGridModelByGridWidget(GridWidget.SIMULATION));
-        assertEquals(backgroundGridModelMock, scenarioSimulationContextLocal.getAbstractScesimGridModelByGridWidget(GridWidget.BACKGROUND));
-    }
-
-    @Test
-    public void getAbstractScesimGridModelByGridWidgetCheckSwitch() {
-        // Test to verify there are not new, un-managed, GridWidget
-        for (GridWidget gridWidget : GridWidget.values()) {
-            AbstractScesimGridModel model = scenarioSimulationContextLocal.getAbstractScesimGridModelByGridWidget(gridWidget);
-            if (GridWidget.BACKGROUND.equals(gridWidget)) {
-                assertEquals(backgroundGridModelMock, model);
-            } else {
-                assertEquals(scenarioGridModelMock, model);
-            }
-        }
-    }
-
-    @Test
-    public void getAbstractScesimModelByGridWidget() {
-        assertEquals(scenarioSimulationContextLocal.status.simulation, scenarioSimulationContextLocal.getAbstractScesimModelByGridWidget(GridWidget.SIMULATION));
-        assertEquals(scenarioSimulationContextLocal.status.background, scenarioSimulationContextLocal.getAbstractScesimModelByGridWidget(GridWidget.BACKGROUND));
-    }
-
-    @Test
-    public void getAbstractScesimModelByGridWidgetCheckSwitch() {
-        // Test to verify there are not new, un-managed, GridWidget
-        for (GridWidget gridWidget : GridWidget.values()) {
-            AbstractScesimModel<AbstractScesimData> abstractScesimData = scenarioSimulationContextLocal.getAbstractScesimModelByGridWidget(gridWidget);
-            if (GridWidget.BACKGROUND.equals(gridWidget)) {
-                assertEquals(backgroundMock, abstractScesimData);
-            } else {
-                assertEquals(simulationMock, abstractScesimData);
-            }
-        }
-    }
-
-    @Test
-    public void getScenarioSimulationModel() {
-        ScenarioSimulationModel model = scenarioSimulationContextLocal.getScenarioSimulationModel();
-        assertSame(scenarioSimulationModelMock, model);
-    }
-
-    @Test
-    public void getCollectionEditorSingletonDOMElementFactory() {
-        assertEquals(collectionEditorSingletonDOMElementFactoryTest,
-                     scenarioSimulationContextLocal.getCollectionEditorSingletonDOMElementFactory(GridWidget.SIMULATION));
-    }
-
-    @Test
-    public void getScenarioCellTextAreaSingletonDOMElementFactory() {
-        assertEquals(scenarioCellTextAreaSingletonDOMElementFactorySpy,
-                     scenarioSimulationContextLocal.getScenarioCellTextAreaSingletonDOMElementFactory(GridWidget.SIMULATION));
-    }
-
-    @Test
-    public void getScenarioHeaderTextBoxSingletonDOMElementFactory() {
-        assertEquals(scenarioHeaderTextBoxSingletonDOMElementFactorySpy,
-                     scenarioSimulationContextLocal.getScenarioHeaderTextBoxSingletonDOMElementFactory(GridWidget.SIMULATION));
-    }
-
-    @Test
-    public void getScenarioExpressionCellTextAreaSingletonDOMElementFactory() {
-        assertEquals(scenarioExpressionCellTextAreaSingletonDOMElementFactorySpy,
-                     scenarioSimulationContextLocal.getScenarioExpressionCellTextAreaSingletonDOMElementFactory(GridWidget.SIMULATION));
-    }
-
-    @Test
-    public void getStatusFullPackage() {
-        scenarioSimulationContextLocal.getStatus().setFullPackage(null);
-        assertEquals("", scenarioSimulationContextLocal.getStatus().getFullPackage());
-        scenarioSimulationContextLocal.getStatus().setFullPackage(FULL_PACKAGE);
-        assertEquals(FULL_PACKAGE, scenarioSimulationContextLocal.getStatus().getFullPackage());
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationEventHandlerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationEventHandlerTest.java
deleted file mode 100644
index 104ade3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/ScenarioSimulationEventHandlerTest.java
+++ /dev/null
@@ -1,730 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.AbstractScenarioSimulationCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.AppendColumnCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.AppendRowCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.DeleteColumnCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.DeleteRowCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.DisableTestToolsCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.DuplicateInstanceCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.DuplicateRowCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.EnableTestToolsCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.InsertColumnCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.InsertRowCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.PrependColumnCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.PrependRowCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.ReloadTestToolsCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.RunSingleScenarioCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.SetGridCellValueCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.SetHeaderCellValueCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.SetInstanceHeaderCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.SetPropertyHeaderCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.actualcommands.UpdateSettingsDataCommand;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.AppendColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.AppendRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DeleteColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DeleteRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DisableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DuplicateInstanceEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DuplicateRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.EnableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ImportEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.InsertColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.InsertRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.PrependColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.PrependRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.RedoEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ReloadTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.RunSingleScenarioEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioGridReloadEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioNotificationEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetGridCellValueEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetHeaderCellValueEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetInstanceHeaderEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetPropertyHeaderEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.UndoEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.UnsupportedDMNEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.UpdateSettingsDataEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ValidateSimulationEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.RedoEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ReloadTestToolsEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.RunSingleScenarioEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SetGridCellValueEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SetHeaderCellValueEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.UndoEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.UnsupportedDMNEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.UpdateSettingsDataEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.popup.ConfirmPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.DeletePopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.FileUploadPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.PreserveDeletePopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.command.client.CommandResult;
-import org.kie.workbench.common.command.client.CommandResultBuilder;
-import org.kie.workbench.common.command.client.impl.CommandResultImpl;
-import org.mockito.Mock;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.IMPORTED_PREFIX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PACKAGE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LIST_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE_ELEMENTS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.VALUE_CLASS_NAME;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationEventHandlerTest extends AbstractScenarioSimulationTest {
-
-    @Mock
-    private List<HandlerRegistration> handlerRegistrationListMock;
-    @Mock
-    private HandlerRegistration appendColumnHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration appendRowHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration deleteColumnHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration deleteRowHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration disableTestToolsEventHandlerMock;
-    @Mock
-    private HandlerRegistration duplicateColumnHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration duplicateHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration enableTestToolsEventHandlerMock;
-    @Mock
-    private HandlerRegistration importHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration insertColumnHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration insertRowHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration prependColumnHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration prependRowHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration redoEventHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration reloadTestToolsHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration runSingleScenarioHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration scenarioGridReloadHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration setGridCellValueEventHandlerMock;
-    @Mock
-    private HandlerRegistration setHeaderCellValueEventHandlerMock;
-    @Mock
-    private HandlerRegistration setInstanceHeaderEventHandlerMock;
-    @Mock
-    private HandlerRegistration setPropertyHeaderEventHandlerMock;
-    @Mock
-    private HandlerRegistration undoEventHandlerRegistrationMock;
-    @Mock
-    private HandlerRegistration updateSettingsDataRegistrationMock;
-    @Mock
-    private HandlerRegistration unsupportedDMNEventHandlerRegistrationMock;
-    @Mock
-    private DeletePopupPresenter deletePopupPresenterMock;
-    @Mock
-    private PreserveDeletePopupPresenter preserveDeletePopupPresenterMock;
-    @Mock
-    private ConfirmPopupPresenter confirmPopupPresenterMock;
-    @Mock
-    private FileUploadPopupPresenter fileUploadPopupPresenterMock;
-
-    private ScenarioSimulationEventHandler scenarioSimulationEventHandler;
-
-    @Before
-    public void setup() {
-        super.setup();
-        when(eventBusMock.addHandler(eq(AppendColumnEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(appendColumnHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(AppendRowEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(appendRowHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(DeleteColumnEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(deleteColumnHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(DeleteRowEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(deleteRowHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(DisableTestToolsEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(disableTestToolsEventHandlerMock);
-        when(eventBusMock.addHandler(eq(DuplicateInstanceEvent.TYPE), isA((ScenarioSimulationEventHandler.class)))).thenReturn(duplicateColumnHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(DuplicateRowEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(duplicateHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(EnableTestToolsEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(enableTestToolsEventHandlerMock);
-        when(eventBusMock.addHandler(eq(ImportEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(importHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(InsertColumnEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(insertColumnHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(InsertRowEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(insertRowHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(PrependColumnEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(prependColumnHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(PrependRowEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(prependRowHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(RedoEvent.TYPE), isA(RedoEventHandler.class))).thenReturn(redoEventHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(ReloadTestToolsEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(reloadTestToolsHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(RunSingleScenarioEvent.TYPE), isA(RunSingleScenarioEventHandler.class))).thenReturn(runSingleScenarioHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(ScenarioGridReloadEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(scenarioGridReloadHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(SetGridCellValueEvent.TYPE), isA(SetGridCellValueEventHandler.class))).thenReturn(setGridCellValueEventHandlerMock);
-        when(eventBusMock.addHandler(eq(SetHeaderCellValueEvent.TYPE), isA(SetHeaderCellValueEventHandler.class))).thenReturn(setHeaderCellValueEventHandlerMock);
-        when(eventBusMock.addHandler(eq(SetInstanceHeaderEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(setInstanceHeaderEventHandlerMock);
-        when(eventBusMock.addHandler(eq(SetPropertyHeaderEvent.TYPE), isA(ScenarioSimulationEventHandler.class))).thenReturn(setPropertyHeaderEventHandlerMock);
-        when(eventBusMock.addHandler(eq(UndoEvent.TYPE), isA(UndoEventHandler.class))).thenReturn(undoEventHandlerRegistrationMock);
-        when(eventBusMock.addHandler(eq(UpdateSettingsDataEvent.TYPE), isA(UpdateSettingsDataEventHandler.class))).thenReturn(updateSettingsDataRegistrationMock);
-        when(eventBusMock.addHandler(eq(UnsupportedDMNEvent.TYPE), isA(UnsupportedDMNEventHandler.class))).thenReturn(unsupportedDMNEventHandlerRegistrationMock);
-
-        when(scenarioCommandManagerMock.execute(eq(scenarioSimulationContextLocal), isA(AbstractScenarioSimulationCommand.class))).thenReturn(CommandResultBuilder.SUCCESS);
-        scenarioSimulationEventHandler = spy(new ScenarioSimulationEventHandler() {
-            {
-                this.eventBus = eventBusMock;
-                this.handlerRegistrationList = handlerRegistrationListMock;
-                this.deletePopupPresenter = deletePopupPresenterMock;
-                this.preserveDeletePopupPresenter = preserveDeletePopupPresenterMock;
-                this.confirmPopupPresenter = confirmPopupPresenterMock;
-                this.fileUploadPopupPresenter = fileUploadPopupPresenterMock;
-                this.scenarioSimulationEditorPresenter = scenarioSimulationEditorPresenterMock;
-                this.scenarioCommandManager = scenarioCommandManagerMock;
-                this.scenarioCommandRegistryManager = scenarioCommandRegistryManagerMock;
-                this.notificationEvent = ScenarioSimulationEventHandlerTest.this.notificationEvent;
-                this.context = scenarioSimulationContextLocal;
-            }
-        });
-    }
-
-    @Test
-    public void setEventBus() {
-        scenarioSimulationEventHandler.setEventBus(eventBusMock);
-        verify(scenarioSimulationEventHandler, times(1)).registerHandlers();
-        assertEquals(eventBusMock, scenarioSimulationEventHandler.eventBus);
-    }
-
-    @Test
-    public void unregisterHandlers() {
-        scenarioSimulationEventHandler.unregisterHandlers();
-        verify(handlerRegistrationListMock, times(1)).forEach(any());
-    }
-
-    @Test
-    public void onAppendColumnEvent() {
-        AppendColumnEvent event = new AppendColumnEvent(GridWidget.SIMULATION, COLUMN_GROUP);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(AppendColumnCommand.class), eq(true));
-    }
-
-    @Test
-    public void onAppendRowEvent() {
-        AppendRowEvent event = new AppendRowEvent(GridWidget.SIMULATION);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(AppendRowCommand.class), eq(true));
-    }
-
-    @Test
-    public void onDeleteColumnEvent() {
-        DeleteColumnEvent event = new DeleteColumnEvent(GridWidget.SIMULATION, COLUMN_INDEX, COLUMN_GROUP, false);
-        when(scenarioGridModelMock.getSelectedColumn()).thenReturn(null);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(DeleteColumnCommand.class), eq(true));
-    }
-
-    @Test
-    public void onDeleteRowEvent() {
-        DeleteRowEvent event = new DeleteRowEvent(GridWidget.SIMULATION, ROW_INDEX);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(DeleteRowCommand.class), eq(true));
-    }
-
-    @Test
-    public void onDisableTestToolsEvent() {
-        DisableTestToolsEvent event = new DisableTestToolsEvent();
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(DisableTestToolsCommand.class), eq(false));
-    }
-
-    @Test
-    public void onDuplicateColumnEvent() {
-        DuplicateInstanceEvent event = new DuplicateInstanceEvent(GridWidget.SIMULATION, COLUMN_INDEX);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(DuplicateInstanceCommand.class), eq(true));
-    }
-
-    @Test
-    public void onDuplicateRowEvent() {
-        DuplicateRowEvent event = new DuplicateRowEvent(GridWidget.SIMULATION, ROW_INDEX);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(DuplicateRowCommand.class), eq(true));
-    }
-
-    @Test
-    public void onEnableTestToolsEvent() {
-        EnableTestToolsEvent event = new EnableTestToolsEvent();
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(EnableTestToolsCommand.class), eq(false));
-    }
-
-    @Test
-    public void onImportEvent() {
-        ImportEvent event = new ImportEvent(GridWidget.SIMULATION);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(fileUploadPopupPresenterMock, times(1))
-                .show(anyList(),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.selectImportFile()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.uploadWarning()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.importLabel()),
-                      isA(org.uberfire.mvp.Command.class));
-    }
-
-    @Test
-    public void onInsertColumnEvent() {
-        InsertColumnEvent event = new InsertColumnEvent(GridWidget.SIMULATION, COLUMN_INDEX, true, false);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(InsertColumnCommand.class), eq(true));
-    }
-
-    @Test
-    public void onInsertRowEvent() {
-        InsertRowEvent event = new InsertRowEvent(GridWidget.SIMULATION, ROW_INDEX);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(InsertRowCommand.class), eq(true));
-    }
-
-    @Test
-    public void onPrependColumnEvent() {
-        PrependColumnEvent event = new PrependColumnEvent(GridWidget.SIMULATION, COLUMN_GROUP);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(PrependColumnCommand.class), eq(true));
-    }
-
-    @Test
-    public void onPrependRowEvent() {
-        PrependRowEvent event = new PrependRowEvent(GridWidget.SIMULATION);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(PrependRowCommand.class), eq(true));
-    }
-
-    @Test
-    public void onRedoEvent() {
-        RedoEvent event = new RedoEvent();
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioCommandRegistryManagerMock, times(1)).redo(eq(scenarioSimulationContextLocal));
-    }
-
-    @Test
-    public void onReloadTestToolsEvent() {
-        ReloadTestToolsEvent event = new ReloadTestToolsEvent(true);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(ReloadTestToolsCommand.class), eq(false));
-    }
-
-    @Test
-    public void onRunSingleScenarioPanelEvent() {
-        RunSingleScenarioEvent event = new RunSingleScenarioEvent(ROW_INDEX);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(RunSingleScenarioCommand.class), eq(false));
-    }
-
-    @Test
-    public void onScenarioGridReloadEventSIMULATION() {
-        ScenarioGridReloadEvent event = new ScenarioGridReloadEvent(GridWidget.SIMULATION);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioGridPanelMock, times(1)).onResize();
-    }
-
-    @Test
-    public void onScenarioGridReloadEventBACKGROUND() {
-        ScenarioGridReloadEvent event = new ScenarioGridReloadEvent(GridWidget.BACKGROUND);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(backgroundGridPanelMock, times(1)).onResize();
-    }
-
-    @Test
-    public void onSetGridCellValueEvent() {
-        SetGridCellValueEvent event = new SetGridCellValueEvent(GridWidget.SIMULATION, ROW_INDEX, COLUMN_INDEX, MULTIPART_VALUE);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(SetGridCellValueCommand.class), eq(false));
-    }
-
-    @Test
-    public void onSetHeaderCellValueEventInstanceHeader() {
-        SetHeaderCellValueEvent event = new SetHeaderCellValueEvent(GridWidget.SIMULATION, ROW_INDEX, COLUMN_INDEX, MULTIPART_VALUE, true, false);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(SetHeaderCellValueCommand.class), eq(false));
-    }
-
-    @Test
-    public void onSetHeaderCellValueEventPropertyHeader() {
-        SetHeaderCellValueEvent event = new SetHeaderCellValueEvent(GridWidget.SIMULATION, ROW_INDEX, COLUMN_INDEX, MULTIPART_VALUE, false, true);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(SetHeaderCellValueCommand.class), eq(false));
-    }
-
-    @Test
-    public void onSetInstanceHeaderEvent() {
-        SetInstanceHeaderEvent event = new SetInstanceHeaderEvent(GridWidget.SIMULATION, FULL_PACKAGE, FULL_CLASS_NAME);
-        when(scenarioGridModelMock.getSelectedColumn()).thenReturn(null);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(SetInstanceHeaderCommand.class), anyBoolean());
-        //
-        doReturn(gridColumnMock).when(scenarioGridModelMock).getSelectedColumn();
-        when(scenarioGridModelMock.isSameSelectedColumnType(anyString())).thenReturn(true);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(SetInstanceHeaderCommand.class), anyBoolean());
-        //
-        when(scenarioGridModelMock.isSameInstanceType(anyString())).thenReturn(false);
-        when(gridColumnMock.isInstanceAssigned()).thenReturn(true);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(deletePopupPresenterMock, times(1))
-                .show(eq(ScenarioSimulationEditorConstants.INSTANCE.changeTypeMainTitle()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.changeTypeMainQuestion()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.changeTypeText1()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.changeTypeTextQuestion()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.changeTypeTextDanger()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.changeType()),
-                      isA(org.uberfire.mvp.Command.class));
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(SetInstanceHeaderCommand.class), anyBoolean());
-
-        when(scenarioGridModelMock.isSameSelectedColumnType(anyString())).thenReturn(false);
-        when(gridColumnMock.isInstanceAssigned()).thenReturn(false);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler).commonExecution(isA(SetInstanceHeaderCommand.class), eq(true));
-    }
-
-    @Test
-    public void onSetPropertyHeaderEvent() {
-        SetPropertyHeaderEvent event = new SetPropertyHeaderEvent(GridWidget.SIMULATION, FULL_PACKAGE, CLASS_NAME, MULTIPART_VALUE_ELEMENTS, VALUE_CLASS_NAME, FactMappingValueType.NOT_EXPRESSION, IMPORTED_PREFIX);
-        when(scenarioGridModelMock.getSelectedColumn()).thenReturn(null);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).onEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(SetPropertyHeaderCommand.class), anyBoolean());
-        verify(preserveDeletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any(), any() );
-        verify(deletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any());
-        //
-        doReturn(gridColumnMock).when(scenarioGridModelMock).getSelectedColumn();
-        when(scenarioGridModelMock.isAlreadyAssignedProperty(MULTIPART_VALUE_ELEMENTS)).thenReturn(true);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, times(1)).onEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(SetPropertyHeaderCommand.class), anyBoolean());
-        verify(preserveDeletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any(), any() );
-        verify(deletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any());
-        //
-        reset(scenarioSimulationEventHandler);
-        when(scenarioGridModelMock.isAlreadyAssignedProperty(MULTIPART_VALUE_ELEMENTS)).thenReturn(false);
-        when(scenarioGridModelMock.isSelectedColumnEmpty()).thenReturn(true);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).onEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(SetPropertyHeaderCommand.class), anyBoolean());
-        verify(preserveDeletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any(), any() );
-        verify(deletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any());
-        //
-        reset(scenarioSimulationEventHandler);
-        when(scenarioGridModelMock.isAlreadyAssignedProperty(MULTIPART_VALUE_ELEMENTS)).thenReturn(false);
-        when(scenarioGridModelMock.isSelectedColumnEmpty()).thenReturn(false);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).onEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(SetPropertyHeaderCommand.class), anyBoolean());
-        verify(preserveDeletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any(), any() );
-        verify(deletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any());
-        //
-        reset(scenarioSimulationEventHandler);
-        when(scenarioGridModelMock.isAlreadyAssignedProperty(MULTIPART_VALUE_ELEMENTS)).thenReturn(false);
-        when(scenarioGridModelMock.isSelectedColumnEmpty()).thenReturn(true);
-        when(scenarioGridModelMock.isSameSelectedColumnProperty(anyList(), any())).thenReturn(false);
-        when(scenarioGridModelMock.isSameSelectedColumnType(anyString())).thenReturn(true);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).onEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioSimulationEventHandler, times(1)).commonExecution(isA(SetPropertyHeaderCommand.class), eq(true));
-        verify(preserveDeletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any(), any() );
-        verify(deletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any());
-        //
-        reset(scenarioSimulationEventHandler);
-        when(scenarioGridModelMock.isAlreadyAssignedProperty(MULTIPART_VALUE_ELEMENTS)).thenReturn(false);
-        when(scenarioGridModelMock.isSelectedColumnEmpty()).thenReturn(false);
-        when(scenarioGridModelMock.isSameSelectedColumnProperty(anyList(), any())).thenReturn(false);
-        when(scenarioGridModelMock.isSameSelectedColumnType(anyString())).thenReturn(true);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).onEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(SetPropertyHeaderCommand.class), anyBoolean());
-        verify(preserveDeletePopupPresenterMock, times(1))
-                .show(eq(ScenarioSimulationEditorConstants.INSTANCE.preserveDeleteScenarioMainTitle()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.preserveDeleteScenarioMainQuestion()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.preserveDeleteScenarioText1()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.preserveDeleteScenarioTextQuestion()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.preserveDeleteScenarioTextOption1()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.preserveDeleteScenarioTextOption2()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.preserveValues()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteValues()),
-                      isA(org.uberfire.mvp.Command.class),
-                      isA(org.uberfire.mvp.Command.class));
-        verify(deletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any());
-        //
-        reset(scenarioSimulationEventHandler, preserveDeletePopupPresenterMock);
-        when(scenarioGridModelMock.isAlreadyAssignedProperty(MULTIPART_VALUE_ELEMENTS)).thenReturn(false);
-        when(scenarioGridModelMock.isSelectedColumnEmpty()).thenReturn(true);
-        when(scenarioGridModelMock.isSameSelectedColumnProperty(anyList(), any())).thenReturn(true);
-        when(scenarioGridModelMock.isSameSelectedColumnType(anyString())).thenReturn(false);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).onEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioSimulationEventHandler, times(1)).commonExecution(isA(SetPropertyHeaderCommand.class), eq(true));
-        verify(preserveDeletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any(), any() );
-        verify(deletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any());
-        //
-        reset(scenarioSimulationEventHandler, deletePopupPresenterMock);
-        when(scenarioGridModelMock.isAlreadyAssignedProperty(MULTIPART_VALUE_ELEMENTS)).thenReturn(false);
-        when(scenarioGridModelMock.isSelectedColumnEmpty()).thenReturn(false);
-        when(scenarioGridModelMock.isSameSelectedColumnProperty(anyList(), any())).thenReturn(false);
-        when(scenarioGridModelMock.isSameSelectedColumnType(anyString())).thenReturn(false);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).onEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(SetPropertyHeaderCommand.class), anyBoolean());
-        verify(preserveDeletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any(), any() );
-        verify(deletePopupPresenterMock, times(1))
-                .show(eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioMainTitle()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioMainQuestion()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioText1()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioTextQuestion()),
-                      isNull(),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteValues()),
-                      isA(org.uberfire.mvp.Command.class));
-        //
-        reset(scenarioSimulationEventHandler, preserveDeletePopupPresenterMock, deletePopupPresenterMock);
-        when(scenarioGridModelMock.isAlreadyAssignedProperty(MULTIPART_VALUE_ELEMENTS)).thenReturn(false);
-        when(scenarioGridModelMock.isSelectedColumnEmpty()).thenReturn(true);
-        when(scenarioGridModelMock.isSameSelectedColumnProperty(anyList(), any())).thenReturn(false);
-        when(scenarioGridModelMock.isSameSelectedColumnType(anyString())).thenReturn(false);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).onEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioSimulationEventHandler, times(1)).commonExecution(isA(SetPropertyHeaderCommand.class), eq(true));
-        verify(preserveDeletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any(), any() );
-        verify(deletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any());
-        //
-        reset(scenarioSimulationEventHandler);
-        when(scenarioGridModelMock.isAlreadyAssignedProperty(MULTIPART_VALUE_ELEMENTS)).thenReturn(false);
-        when(scenarioGridModelMock.isSelectedColumnEmpty()).thenReturn(false);
-        when(scenarioGridModelMock.isSameSelectedColumnProperty(anyList(), any())).thenReturn(false);
-        when(scenarioGridModelMock.isSameSelectedColumnType(anyString())).thenReturn(false);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).onEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(SetPropertyHeaderCommand.class), anyBoolean());
-        verify(preserveDeletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any(), any() );
-        verify(deletePopupPresenterMock, times(1))
-                .show(eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioMainTitle()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioMainQuestion()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioText1()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioTextQuestion()),
-                      isNull(),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteValues()),
-                      isA(org.uberfire.mvp.Command.class));
-    }
-
-    @Test
-    public void onSetPropertyHeaderCollectionEvent() {
-        SetPropertyHeaderEvent event = new SetPropertyHeaderEvent(GridWidget.SIMULATION, FULL_PACKAGE, CLASS_NAME, MULTIPART_VALUE_ELEMENTS, LIST_CLASS_NAME, FactMappingValueType.NOT_EXPRESSION, IMPORTED_PREFIX);
-        when(scenarioGridModelMock.isAlreadyAssignedProperty(MULTIPART_VALUE_ELEMENTS)).thenReturn(false);
-        when(scenarioGridModelMock.isSelectedColumnEmpty()).thenReturn(false);
-        when(scenarioGridModelMock.isSameSelectedColumnProperty(anyList(), any())).thenReturn(false);
-        when(scenarioGridModelMock.isSameSelectedColumnType(anyString())).thenReturn(false);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).onEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(SetPropertyHeaderCommand.class), anyBoolean());
-        verify(preserveDeletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any(), any() );
-        verify(deletePopupPresenterMock, times(1))
-                .show(eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioMainTitle()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioMainQuestion()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioText1()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioTextQuestion()),
-                      isNull(),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteValues()),
-                      isA(org.uberfire.mvp.Command.class));
-        //
-        reset(scenarioSimulationEventHandler, deletePopupPresenterMock, preserveDeletePopupPresenterMock);
-        when(scenarioGridModelMock.isAlreadyAssignedProperty(MULTIPART_VALUE_ELEMENTS)).thenReturn(false);
-        when(scenarioGridModelMock.isSelectedColumnEmpty()).thenReturn(false);
-        when(scenarioGridModelMock.isSameSelectedColumnProperty(anyList(), any())).thenReturn(false);
-        when(scenarioGridModelMock.isSameSelectedColumnType(anyString())).thenReturn(true);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, never()).onEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(SetPropertyHeaderCommand.class), anyBoolean());
-        verify(preserveDeletePopupPresenterMock, never()).show(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), any(), any() );
-        verify(deletePopupPresenterMock, times(1))
-                .show(eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioMainTitle()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioMainQuestion()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioText1()),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteScenarioTextQuestion()),
-                      isNull(),
-                      eq(ScenarioSimulationEditorConstants.INSTANCE.deleteValues()),
-                      isA(org.uberfire.mvp.Command.class));
-    }
-
-    @Test
-    public void onUndoEvent() {
-        UndoEvent event = new UndoEvent();
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioCommandRegistryManagerMock, times(1)).undo(eq(scenarioSimulationContextLocal));
-    }
-
-    @Test
-    public void onUpdateSettingDataEventChangedValue() {
-        Predicate<Settings> predicateMock = mock(Predicate.class);
-        when(predicateMock.test(eq(settingsLocal))).thenReturn(true);
-        Consumer<Settings> consumerMock = mock(Consumer.class);
-        UpdateSettingsDataEvent event = new UpdateSettingsDataEvent(consumerMock, predicateMock);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(predicateMock, times(1)).test(eq(settingsLocal));
-        verify(scenarioSimulationEventHandler, times(1)).commonExecution(isA(UpdateSettingsDataCommand.class), eq(false));
-        verify(scenarioSimulationEditorPresenterMock, times(1)).unpublishTestResultsAlerts();
-    }
-
-    @Test
-    public void onUpdateSettingDataEventNoChangedValue() {
-        Predicate<Settings> predicateMock = mock(Predicate.class);
-        when(predicateMock.test(eq(settingsLocal))).thenReturn(false);
-        Consumer<Settings> consumerMock = mock(Consumer.class);
-        UpdateSettingsDataEvent event = new UpdateSettingsDataEvent(consumerMock, predicateMock);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(predicateMock, times(1)).test(eq(settingsLocal));
-        verify(scenarioSimulationEventHandler, never()).commonExecution(isA(UpdateSettingsDataCommand.class), eq(false));
-        verify(scenarioSimulationEditorPresenterMock, never()).unpublishTestResultsAlerts();
-    }
-
-    @Test
-    public void onUpdateSettingDataEventNoChangedValueTest() {
-        Consumer<Settings> consumerMock = mock(Consumer.class);
-        UpdateSettingsDataEvent event = new UpdateSettingsDataEvent(consumerMock);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEventHandler, times(1)).commonExecution(isA(UpdateSettingsDataCommand.class), eq(false));
-        verify(scenarioSimulationEditorPresenterMock, times(1)).unpublishTestResultsAlerts();
-    }
-
-    @Test
-    public void onUnsupportedDMNEvent() {
-        String DMN_ERROR = "DMN_ERROR";
-        UnsupportedDMNEvent event = new UnsupportedDMNEvent(DMN_ERROR);
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(confirmPopupPresenterMock, times(1)).show(anyString(), eq(DMN_ERROR));
-    }
-
-    @Test
-    public void onValidateEvent() {
-        ValidateSimulationEvent event = new ValidateSimulationEvent();
-        scenarioSimulationEventHandler.onEvent(event);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).validateSimulation();
-    }
-
-    @Test
-    public void commonExecution() {
-        when(scenarioCommandManagerMock.execute(eq(scenarioSimulationContextLocal), eq(appendRowCommandMock))).thenReturn(CommandResultBuilder.SUCCESS);
-        scenarioSimulationEventHandler.commonExecution(appendRowCommandMock, true);
-        assertEquals(simulationMock, scenarioSimulationContextLocal.getStatus().getSimulation());
-        verify(scenarioCommandRegistryManagerMock, times(1)).register(eq(scenarioSimulationContextLocal), eq(appendRowCommandMock));
-        //
-        reset(scenarioCommandRegistryManagerMock);
-        CommandResult<ScenarioSimulationViolation> status = new CommandResultImpl<>(CommandResult.Type.ERROR, Collections.singletonList(new ScenarioSimulationViolation("FAKE ERROR")));
-        when(scenarioCommandManagerMock.execute(eq(scenarioSimulationContextLocal), eq(appendRowCommandMock))).thenReturn(status);
-        scenarioSimulationEventHandler.commonExecution(appendRowCommandMock, true);
-        assertEquals(simulationMock, scenarioSimulationContextLocal.getStatus().getSimulation());
-        verify(scenarioCommandRegistryManagerMock, never()).register(eq(scenarioSimulationContextLocal), eq(appendRowCommandMock));
-        //
-        reset(scenarioCommandRegistryManagerMock);
-        when(scenarioCommandManagerMock.execute(eq(scenarioSimulationContextLocal), eq(appendRowCommandMock))).thenReturn(CommandResultBuilder.SUCCESS);
-        EnableTestToolsCommand enableTestToolsCommandMock = mock(EnableTestToolsCommand.class);
-        scenarioSimulationEventHandler.commonExecution(enableTestToolsCommandMock, true);
-        verify(scenarioCommandRegistryManagerMock, never()).register(eq(scenarioSimulationContextLocal), eq(appendRowCommandMock));
-    }
-
-    @Test
-    public void registerHandlers() {
-        scenarioSimulationEventHandler.registerHandlers();
-        verify(eventBusMock, times(1)).addHandler(eq(AppendColumnEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(appendColumnHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(AppendRowEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(appendRowHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(DeleteColumnEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(deleteColumnHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(DeleteRowEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(deleteRowHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(DisableTestToolsEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(disableTestToolsEventHandlerMock));
-        verify(eventBusMock, times(1)).addHandler(eq(DuplicateInstanceEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(duplicateColumnHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(DuplicateRowEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(duplicateHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(EnableTestToolsEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(enableTestToolsEventHandlerMock));
-        verify(eventBusMock, times(1)).addHandler(eq(ImportEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(importHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(InsertColumnEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(insertColumnHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(InsertRowEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(insertRowHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(PrependColumnEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(prependColumnHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(PrependRowEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(prependRowHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(RedoEvent.TYPE), isA(RedoEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(redoEventHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(ReloadTestToolsEvent.TYPE), isA(ReloadTestToolsEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(reloadTestToolsHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(RunSingleScenarioEvent.TYPE), isA(RunSingleScenarioEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(runSingleScenarioHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(ScenarioGridReloadEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(scenarioGridReloadHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(SetGridCellValueEvent.TYPE), isA(SetGridCellValueEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(setGridCellValueEventHandlerMock));
-        verify(eventBusMock, times(1)).addHandler(eq(SetHeaderCellValueEvent.TYPE), isA(SetHeaderCellValueEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(setHeaderCellValueEventHandlerMock));
-        verify(eventBusMock, times(1)).addHandler(eq(SetInstanceHeaderEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(setInstanceHeaderEventHandlerMock));
-        verify(eventBusMock, times(1)).addHandler(eq(SetPropertyHeaderEvent.TYPE), isA(ScenarioSimulationEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(setPropertyHeaderEventHandlerMock));
-        verify(eventBusMock, times(1)).addHandler(eq(UndoEvent.TYPE), isA(UndoEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(undoEventHandlerRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(UpdateSettingsDataEvent.TYPE), isA(UpdateSettingsDataEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(updateSettingsDataRegistrationMock));
-        verify(eventBusMock, times(1)).addHandler(eq(UnsupportedDMNEvent.TYPE), isA(UnsupportedDMNEventHandler.class));
-        verify(handlerRegistrationListMock, times(1)).add(eq(unsupportedDMNEventHandlerRegistrationMock));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioGridCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioGridCommandTest.java
deleted file mode 100644
index 7da092a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioGridCommandTest.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Optional;
-
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationViolation;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.junit.Before;
-import org.junit.Test;
-import org.kie.workbench.common.command.client.CommandResult;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractScenarioGridCommandTest extends AbstractScenarioSimulationTest {
-
-    protected AbstractScenarioGridCommand commandSpy;
-
-    @Before
-    public void setup() {
-        super.setup();
-    }
-
-    @Test
-    public void setRestorableStatus() {
-        ScenarioSimulationContext.Status clonedStatus = commandSpy.setRestorableStatusPreExecution(scenarioSimulationContextLocal);
-        assertNotNull(clonedStatus);
-        assertEquals(clonedSimulationMock, clonedStatus.getSimulation());
-        assertEquals(clonedBackgroundMock, clonedStatus.getBackground());
-    }
-
-    @Test
-    public void undoWithRestorable() {
-        commandSpy.restorableStatus = scenarioSimulationContextLocal.getStatus();
-        commandSpy.undo(scenarioSimulationContextLocal);
-        verify(commandSpy, times(1)).setCurrentContext(eq(scenarioSimulationContextLocal));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void undoWithoutRestorable() {
-        commandSpy.restorableStatus = null;
-        commandSpy.undo(scenarioSimulationContextLocal);
-    }
-
-    @Test
-    public void redoWithRestorable() {
-        commandSpy.restorableStatus = scenarioSimulationContextLocal.getStatus();
-        commandSpy.redo(scenarioSimulationContextLocal);
-        verify(commandSpy, times(1)).setCurrentContext(eq(scenarioSimulationContextLocal));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void redoWithoutRestorable() {
-        commandSpy.restorableStatus = null;
-        commandSpy.redo(scenarioSimulationContextLocal);
-    }
-
-    @Test
-    public void execute() {
-        final ScenarioSimulationContext.Status status = scenarioSimulationContextLocal.getStatus();
-        commandSpy.execute(scenarioSimulationContextLocal);
-        assertEquals(clonedBackgroundMock, commandSpy.restorableStatus.getBackground());
-        assertEquals(clonedSimulationMock, commandSpy.restorableStatus.getSimulation());
-        try {
-            verify(commandSpy, times(1)).internalExecute(eq(scenarioSimulationContextLocal));
-            assertNotEquals(status, commandSpy.restorableStatus);
-        } catch (Exception e) {
-            fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void setCurrentContextNoSimulationNoBackground() {
-        final ScenarioSimulationContext.Status status = scenarioSimulationContextLocal.getStatus();
-        commandSpy.restorableStatus = status;
-        commandSpy.restorableStatus.setSimulation(null);
-        commandSpy.restorableStatus.setBackground(null);
-        final CommandResult<ScenarioSimulationViolation> retrieved = commandSpy.setCurrentContext(scenarioSimulationContextLocal);
-        assertEquals(CommandResult.Type.ERROR, retrieved.getType());
-        verify(scenarioGridModelMock, never()).clearSelections();
-        verify(backgroundGridModelMock, never()).clearSelections();
-        verify(scenarioGridMock, never()).setContent(eq(simulationMock), eq(settingsLocal.getType()));
-        verify(scenarioSimulationModelMock, never()).setSimulation(eq(simulationMock));
-        verify(backgroundGridMock, never()).setContent(eq(simulationMock), eq(settingsLocal.getType()));
-        verify(scenarioSimulationModelMock, never()).setBackground(eq(backgroundMock));
-        verify(scenarioSimulationEditorPresenterMock, never()).reloadTestTools(eq(true));
-        verify(commandSpy, never()).commonExecution(eq(scenarioSimulationContextLocal));
-        assertEquals(status, commandSpy.restorableStatus);
-    }
-
-    @Test
-    public void setCurrentContextSimulationBackground() {
-        final ScenarioSimulationContext.Status status = scenarioSimulationContextLocal.getStatus();
-        commandSpy.restorableStatus = status;
-        final CommandResult<ScenarioSimulationViolation> retrieved = commandSpy.setCurrentContext(scenarioSimulationContextLocal);
-        assertEquals(CommandResult.Type.INFO, retrieved.getType());
-        verify(scenarioGridModelMock, times(1)).clearSelections();
-        verify(backgroundGridModelMock, times(1)).clearSelections();
-        verify(scenarioGridMock, times(1)).setContent(eq(simulationMock), eq(settingsLocal.getType()));
-        verify(scenarioSimulationModelMock, times(1)).setSimulation(eq(simulationMock));
-        verify(backgroundGridMock, times(1)).setContent(eq(backgroundMock), eq(settingsLocal.getType()));
-        verify(scenarioSimulationModelMock, times(1)).setBackground(eq(backgroundMock));
-        verify(scenarioSimulationEditorPresenterMock, times(1)).reloadTestTools(eq(true));
-        verify(commandSpy, times(1)).commonExecution(eq(scenarioSimulationContextLocal));
-        assertNotEquals(status, commandSpy.restorableStatus);
-    }
-
-    @Test
-    public void commonUndoRedoPreExecutionSameGrid() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(true);
-        commandSpy.gridWidget = GridWidget.SIMULATION;
-        final Optional<CommandResult<ScenarioSimulationViolation>> retrieved = commandSpy.commonUndoRedoPreExecution(scenarioSimulationContextLocal);
-        assertFalse(retrieved.isPresent());
-        verify(scenarioGridPanelMock, never()).onResize();
-        verify(scenarioGridPanelMock, never()).select();
-    }
-
-    @Test
-    public void commonUndoRedoPreexecutionDifferentGridSIMULATION() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(true);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        commandSpy.gridWidget = GridWidget.SIMULATION;
-        final Optional<CommandResult<ScenarioSimulationViolation>> retrieved = commandSpy.commonUndoRedoPreExecution(scenarioSimulationContextLocal);
-        assertTrue(retrieved.isPresent());
-        assertEquals(CommandResult.Type.INFO, retrieved.get().getType());
-        verify(scenarioGridPanelMock, times(1)).onResize();
-        verify(scenarioGridPanelMock, times(1)).select();
-    }
-
-    @Test
-    public void commonUndoRedoPreexecutionDifferentGridBACKGROUND() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(true);
-        commandSpy.gridWidget = GridWidget.BACKGROUND;
-        final Optional<CommandResult<ScenarioSimulationViolation>> retrieved = commandSpy.commonUndoRedoPreExecution(scenarioSimulationContextLocal);
-        assertTrue(retrieved.isPresent());
-        assertEquals(CommandResult.Type.INFO, retrieved.get().getType());
-        verify(backgroundGridPanelMock, times(1)).onResize();
-        verify(backgroundGridPanelMock, times(1)).select();
-    }
-
-    @Test
-    public void commonUndoRedoPreExecutionDifferentGridCheckSwitch() {
-        // Test to verify there are not new, un-managed, GridWidget
-        for (GridWidget gridWidget : GridWidget.values()) {
-            when(scenarioGridWidgetSpy.isSelected()).thenReturn(GridWidget.BACKGROUND.equals(gridWidget));
-            when(backgroundGridWidgetSpy.isSelected()).thenReturn(GridWidget.SIMULATION.equals(gridWidget));
-            commandSpy.gridWidget = gridWidget;
-            commandSpy.commonUndoRedoPreExecution(scenarioSimulationContextLocal);
-            if (GridWidget.SIMULATION.equals(gridWidget)) {
-                verify(scenarioSimulationEditorPresenterMock, times(1)).selectSimulationTab();
-                verify(scenarioGridPanelMock, times(1)).onResize();
-                verify(scenarioGridPanelMock, times(1)).select();
-            } else {
-                verify(scenarioSimulationEditorPresenterMock, times(1)).selectBackgroundTab();
-                verify(backgroundGridPanelMock, times(1)).onResize();
-                verify(backgroundGridPanelMock, times(1)).select();
-            }
-        }
-    }
-
-    @Test
-    public void commonExecutionSIMULATION() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(true);
-        commandSpy.commonExecution(scenarioSimulationContextLocal);
-        verify(scenarioGridPanelMock, times(1)).onResize();
-        verify(scenarioGridPanelMock, times(1)).select();
-        verify(backgroundGridPanelMock, never()).onResize();
-        verify(backgroundGridPanelMock, never()).select();
-    }
-
-    @Test
-    public void commonExecutionBACKGROUND() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(true);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        commandSpy.commonExecution(scenarioSimulationContextLocal);
-        verify(backgroundGridPanelMock, times(1)).onResize();
-        verify(backgroundGridPanelMock, times(1)).select();
-        verify(scenarioGridPanelMock, never()).onResize();
-        verify(scenarioGridPanelMock, never()).select();
-    }
-
-    @Test
-    public void commonExecutionNone() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        commandSpy.commonExecution(scenarioSimulationContextLocal);
-        verify(scenarioGridPanelMock, never()).onResize();
-        verify(scenarioGridPanelMock, never()).select();
-        verify(backgroundGridPanelMock, never()).onResize();
-        verify(backgroundGridPanelMock, never()).select();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioSimulationCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioSimulationCommandTest.java
deleted file mode 100644
index 3eb5139..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractScenarioSimulationCommandTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwt.event.shared.EventBus;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsPresenter;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-public abstract class AbstractScenarioSimulationCommandTest extends AbstractScenarioSimulationTest {
-
-    @Mock
-    protected TestToolsPresenter testToolsPresenterMock;
-
-    @Mock
-    protected EventBus eventBusMock;
-
-    protected AbstractScenarioSimulationCommand command;
-
-    @Before
-    public void setup() {
-        super.setup();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void undo() {
-        command.undo(scenarioSimulationContextLocal);
-    }
-
-    @Test
-    public void execute() {
-        command.execute(scenarioSimulationContextLocal);
-        try {
-            verify(command, times(1)).internalExecute(eq(scenarioSimulationContextLocal));
-        } catch (Exception e) {
-            fail(e.getMessage());
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractSelectedColumnCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractSelectedColumnCommandTest.java
deleted file mode 100644
index 2203408..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AbstractSelectedColumnCommandTest.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
-
-import org.drools.scenariosimulation.api.model.ExpressionElement;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-
-import static java.util.Collections.singletonList;
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_IDENTIFIER_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PACKAGE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PROPERTY_NAME_ELEMENTS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PROPERTY_PATH;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PROPERTY_PATH_ELEMENTS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LIST_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LIST_PROPERTY_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LOWER_CASE_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE_ELEMENTS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.PROPERTY_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.VALUE_CLASS_NAME;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractSelectedColumnCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Mock
-    protected List<GridColumn<?>> gridColumnsMock;
-    @Mock
-    protected FactModelTree factModelTreeMock;
-
-    public void setup() {
-        super.setup();
-
-        when(gridColumnsMock.indexOf(gridColumnMock)).thenReturn(COLUMN_INDEX);
-        when(factModelTreeMock.getExpandableProperties()).thenReturn(mock(SortedMap.class));
-        when(dataObjectFieldsMapMock.get(anyString())).thenReturn(factModelTreeMock);
-
-        scenarioSimulationContextLocal.getStatus().setFullPackage(FULL_PACKAGE);
-        scenarioSimulationContextLocal.getStatus().setValue(MULTIPART_VALUE);
-        scenarioSimulationContextLocal.getStatus().setValueClassName(VALUE_CLASS_NAME);
-        scenarioSimulationContextLocal.getStatus().setColumnId(COLUMN_ID);
-        scenarioSimulationContextLocal.getStatus().setColumnIndex(COLUMN_INDEX);
-        scenarioSimulationContextLocal.getStatus().setPropertyNameElements(MULTIPART_VALUE_ELEMENTS);
-        scenarioSimulationContextLocal.getStatus().setClassName(CLASS_NAME);
-    }
-
-    @Test
-    public void executeIfSelected() {
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify((AbstractSelectedColumnCommand) commandSpy, times(1)).executeIfSelectedColumn(scenarioSimulationContextLocal, gridColumnMock);
-    }
-
-    @Test
-    public void executeIfSelected_NoColumn() {
-        gridColumnMock = null;
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify((AbstractSelectedColumnCommand) commandSpy, never()).executeIfSelectedColumn(scenarioSimulationContextLocal, gridColumnMock);
-    }
-
-    /* Tests related to insertNewColumn method */
-
-    @Test
-    public void insertNewColumn_NotToClone() {
-        insertNewColumnCommon(COLUMN_INDEX, false);
-    }
-
-    @Test
-    public void insertNewColumn_ToClone() {
-        this.insertNewColumnCommon(COLUMN_INDEX, true);
-    }
-
-    protected void insertNewColumnCommon(int columnIndex, boolean cloneInstance) {
-        int instanceNum = simulationDescriptorMock.getUnmodifiableFactMappings().size();
-        ScenarioGridColumn createdColumn = ((AbstractSelectedColumnCommand) commandSpy).insertNewColumn(scenarioSimulationContextLocal, gridColumnMock, columnIndex, cloneInstance);
-        String columnGroup = gridColumnMock.getInformationHeaderMetaData().getColumnGroup();
-        String originalInstanceTitle = gridColumnMock.getInformationHeaderMetaData().getTitle();
-        String instanceTitle = cloneInstance ? originalInstanceTitle : "INSTANCE " + instanceNum;
-        String propertyTitle = "PROPERTY " + instanceNum;
-        final FactMappingType factMappingType = FactMappingType.valueOf(columnGroup.toUpperCase());
-        verify(commandSpy, times(1)).getScenarioGridColumnLocal(
-                eq(instanceTitle),
-                eq(propertyTitle),
-                anyString(),
-                eq(columnGroup),
-                eq(factMappingType),
-                eq(scenarioHeaderTextBoxSingletonDOMElementFactorySpy),
-                eq(scenarioCellTextAreaSingletonDOMElementFactorySpy),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.defineValidType()));
-        if (cloneInstance) {
-            verify(createdColumn, times(1)).setFactIdentifier(eq(gridColumnMock.getFactIdentifier()));
-        } else {
-            verify(createdColumn, never()).setFactIdentifier(any());
-        }
-        verify(createdColumn, times(1)).setInstanceAssigned(eq(cloneInstance));
-        verify(scenarioGridModelMock, times(1)).insertColumn(COLUMN_INDEX, createdColumn);
-    }
-
-    /* Tests related to setPropertyHeader method */
-    @Test
-    public void executeKeepDataFalseDMN() {
-        scenarioSimulationContextLocal.getStatus().setKeepData(false);
-        settingsLocal.setType(ScenarioSimulationModel.Type.DMN);
-        commonSetPropertyHeader(ScenarioSimulationModel.Type.DMN, false, MULTIPART_VALUE_ELEMENTS, VALUE_CLASS_NAME);
-    }
-
-    @Test
-    public void executeKeepDataFalseRule() {
-        scenarioSimulationContextLocal.getStatus().setKeepData(false);
-        commonSetPropertyHeader(ScenarioSimulationModel.Type.RULE, false, MULTIPART_VALUE_ELEMENTS, VALUE_CLASS_NAME);
-    }
-
-    @Test
-    public void executeKeepDataTrue() {
-        scenarioSimulationContextLocal.getStatus().setKeepData(true);
-        commonSetPropertyHeader(ScenarioSimulationModel.Type.RULE, true, MULTIPART_VALUE_ELEMENTS, VALUE_CLASS_NAME);
-    }
-
-    @Test
-    public void executeWithPropertyAsCollection() {
-        scenarioSimulationContextLocal.getStatus().setValueClassName(LIST_CLASS_NAME);
-        scenarioSimulationContextLocal.getStatus().setValue(FULL_PROPERTY_PATH);
-        doReturn(factIdentifierMock).when(((AbstractSelectedColumnCommand) commandSpy)).setEditableHeadersAndGetFactIdentifier(eq(scenarioSimulationContextLocal), eq(gridColumnMock), eq(CLASS_NAME), eq(FULL_CLASS_NAME));
-        ((AbstractSelectedColumnCommand) commandSpy).setPropertyHeader(scenarioSimulationContextLocal, gridColumnMock, FULL_CLASS_NAME, FULL_PROPERTY_PATH_ELEMENTS, LIST_CLASS_NAME);
-        verify(((AbstractSelectedColumnCommand) commandSpy), times(2)).setInstanceHeaderMetaData(eq(gridColumnMock), eq(CLASS_NAME), eq(factIdentifierMock));
-        verify(propertyHeaderMetaDataMock, times(1)).setColumnGroup(anyString());
-        verify(propertyHeaderMetaDataMock, times(1)).setTitle(eq(LIST_PROPERTY_NAME));
-        verify(propertyHeaderMetaDataMock, times(1)).setReadOnly(eq(false));
-        verify(scenarioGridModelMock, times(1)).updateColumnProperty(anyInt(), eq(gridColumnMock), eq(FULL_PROPERTY_PATH_ELEMENTS), eq(LIST_CLASS_NAME), anyBoolean(), isA(FactMappingValueType.class), eq(ScenarioSimulationModel.Type.RULE));
-        verify((AbstractSelectedColumnCommand) commandSpy, times(1)).manageCollectionProperty(eq(scenarioSimulationContextLocal), eq(gridColumnMock), eq(CLASS_NAME), eq(0), eq(FULL_PROPERTY_PATH_ELEMENTS));
-        verify((AbstractSelectedColumnCommand) commandSpy, times(1)).navigateComplexObject(eq(factModelTreeMock), eq(FULL_PROPERTY_PATH_ELEMENTS), eq(scenarioSimulationContextLocal.getDataObjectFieldsMap()));
-    }
-
-    @Test
-    public void executePropertyWithSameInstance() {
-        scenarioSimulationContextLocal.getStatus().setValueClassName(LIST_CLASS_NAME);
-        scenarioSimulationContextLocal.getStatus().setValue(FULL_PROPERTY_PATH);
-        when(gridColumnMock.isInstanceAssigned()).thenReturn(true);
-        when(gridColumnMock.getInformationHeaderMetaData().getTitle()).thenReturn(CLASS_NAME);
-        ((AbstractSelectedColumnCommand) commandSpy).setPropertyHeader(scenarioSimulationContextLocal, gridColumnMock, FULL_CLASS_NAME, FULL_PROPERTY_PATH_ELEMENTS, LIST_CLASS_NAME);
-        verify(((AbstractSelectedColumnCommand) commandSpy), never()).setInstanceHeaderMetaData(eq(gridColumnMock), eq(CLASS_NAME), eq(factIdentifierMock));
-        verify(propertyHeaderMetaDataMock, times(1)).setColumnGroup(anyString());
-        verify(propertyHeaderMetaDataMock, times(1)).setTitle(eq(LIST_PROPERTY_NAME));
-        verify(propertyHeaderMetaDataMock, times(1)).setReadOnly(eq(false));
-        verify(scenarioGridModelMock, times(1)).updateColumnProperty(anyInt(), eq(gridColumnMock), eq(FULL_PROPERTY_PATH_ELEMENTS), eq(LIST_CLASS_NAME), anyBoolean(), isA(FactMappingValueType.class), eq(ScenarioSimulationModel.Type.RULE));
-        verify((AbstractSelectedColumnCommand) commandSpy, times(1)).manageCollectionProperty(eq(scenarioSimulationContextLocal), eq(gridColumnMock), eq(CLASS_NAME), eq(0), eq(FULL_PROPERTY_PATH_ELEMENTS));
-        verify((AbstractSelectedColumnCommand) commandSpy, times(1)).navigateComplexObject(eq(factModelTreeMock), eq(FULL_PROPERTY_PATH_ELEMENTS), eq(scenarioSimulationContextLocal.getDataObjectFieldsMap()));
-    }
-
-    @Test
-    public void executePropertyWithPropertyTitle() {
-        scenarioSimulationContextLocal.getStatus().setValueClassName(LIST_CLASS_NAME);
-        scenarioSimulationContextLocal.getStatus().setValue(FULL_PROPERTY_PATH);
-        when(gridColumnMock.isInstanceAssigned()).thenReturn(true);
-        when(gridColumnMock.getInformationHeaderMetaData().getTitle()).thenReturn(CLASS_NAME);
-        ((AbstractSelectedColumnCommand) commandSpy).setPropertyHeader(scenarioSimulationContextLocal, gridColumnMock, FULL_CLASS_NAME, FULL_PROPERTY_PATH_ELEMENTS, LIST_CLASS_NAME, PROPERTY_NAME);
-        verify(((AbstractSelectedColumnCommand) commandSpy), never()).setInstanceHeaderMetaData(eq(gridColumnMock), eq(CLASS_NAME), eq(factIdentifierMock));
-        verify(propertyHeaderMetaDataMock, times(1)).setColumnGroup(anyString());
-        verify(propertyHeaderMetaDataMock, times(1)).setTitle(eq(PROPERTY_NAME));
-        verify(propertyHeaderMetaDataMock, times(1)).setReadOnly(eq(false));
-        verify(scenarioGridModelMock, times(1)).updateColumnProperty(anyInt(), eq(gridColumnMock), eq(FULL_PROPERTY_PATH_ELEMENTS), eq(LIST_CLASS_NAME), anyBoolean(), isA(FactMappingValueType.class), eq(ScenarioSimulationModel.Type.RULE));
-        verify((AbstractSelectedColumnCommand) commandSpy, times(1)).manageCollectionProperty(eq(scenarioSimulationContextLocal), eq(gridColumnMock), eq(CLASS_NAME), eq(0), eq(FULL_PROPERTY_PATH_ELEMENTS));
-        verify((AbstractSelectedColumnCommand) commandSpy, times(1)).navigateComplexObject(eq(factModelTreeMock), eq(FULL_PROPERTY_PATH_ELEMENTS), eq(scenarioSimulationContextLocal.getDataObjectFieldsMap()));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void executePropertyWithWrongInstance() {
-        scenarioSimulationContextLocal.getStatus().setValueClassName(LIST_CLASS_NAME);
-        scenarioSimulationContextLocal.getStatus().setValue(FULL_PROPERTY_PATH);
-        when(gridColumnMock.isInstanceAssigned()).thenReturn(true);
-        ((AbstractSelectedColumnCommand) commandSpy).setPropertyHeader(scenarioSimulationContextLocal, gridColumnMock, FULL_CLASS_NAME, FULL_PROPERTY_PATH_ELEMENTS, LIST_CLASS_NAME);
-        verify(((AbstractSelectedColumnCommand) commandSpy), never()).setInstanceHeaderMetaData(eq(gridColumnMock), eq(CLASS_NAME), eq(factIdentifierMock));
-        verify(propertyHeaderMetaDataMock, never()).setColumnGroup(anyString());
-        verify(propertyHeaderMetaDataMock, never()).setTitle(anyString());
-        verify(propertyHeaderMetaDataMock, never()).setReadOnly(anyBoolean());
-        verify(scenarioGridModelMock, never()).updateColumnProperty(anyInt(), eq(gridColumnMock), eq(FULL_PROPERTY_PATH_ELEMENTS), eq(LIST_CLASS_NAME), anyBoolean(), isA(FactMappingValueType.class), eq(ScenarioSimulationModel.Type.RULE));
-        verify((AbstractSelectedColumnCommand) commandSpy, never()).manageCollectionProperty(eq(scenarioSimulationContextLocal), eq(gridColumnMock), eq(CLASS_NAME), eq(0), eq(FULL_PROPERTY_PATH_ELEMENTS));
-        verify((AbstractSelectedColumnCommand) commandSpy, never()).navigateComplexObject(eq(factModelTreeMock), eq(FULL_PROPERTY_PATH_ELEMENTS), eq(scenarioSimulationContextLocal.getDataObjectFieldsMap()));
-    }
-
-    @Test
-    public void setInstanceHeaderMetaData() {
-        ((AbstractSelectedColumnCommand) commandSpy).setInstanceHeaderMetaData(gridColumnMock, FACT_NAME, factIdentifierMock);
-        verify(((AbstractSelectedColumnCommand) commandSpy)).setInstanceHeaderMetaData(eq(gridColumnMock), eq(FACT_NAME), eq(factIdentifierMock));
-        verify(gridColumnMock, times(1)).setInstanceAssigned(true);
-        verify(gridColumnMock, times(1)).setFactIdentifier(eq(factIdentifierMock));
-        verify(informationHeaderMetaDataMock, times(1)).setTitle(eq(FACT_NAME));
-    }
-
-    @Test
-    public void getFullPackage() {
-        scenarioSimulationContextLocal.getStatus().setFullPackage(FULL_PACKAGE);
-        String fullPackage = ((AbstractSelectedColumnCommand) commandSpy).getFullPackage(scenarioSimulationContextLocal);
-        assertEquals(fullPackage, FULL_PACKAGE + ".");
-        scenarioSimulationContextLocal.getStatus().setFullPackage("");
-        fullPackage = ((AbstractSelectedColumnCommand) commandSpy).getFullPackage(scenarioSimulationContextLocal);
-        assertEquals("", fullPackage);
-        scenarioSimulationContextLocal.getStatus().setFullPackage(null);
-        fullPackage = ((AbstractSelectedColumnCommand) commandSpy).getFullPackage(scenarioSimulationContextLocal);
-        assertEquals("", fullPackage);
-    }
-
-    /* This test is usable ONLY by <code>SetPropertyCommandTest</code> subclass */
-    public void manageCollectionProperty() {
-        scenarioSimulationContextLocal.getStatus().setValueClassName(LIST_CLASS_NAME);
-        scenarioSimulationContextLocal.getStatus().setValue(FULL_PROPERTY_PATH);
-        final List<String> fullPropertyPathElements = Arrays.asList(FULL_PROPERTY_PATH.split("\\."));
-        ((AbstractSelectedColumnCommand) commandSpy).manageCollectionProperty(scenarioSimulationContextLocal, gridColumnMock, FULL_PROPERTY_PATH, 0, fullPropertyPathElements);
-        verify((AbstractSelectedColumnCommand) commandSpy, times(1)).navigateComplexObject(eq(factModelTreeMock), eq(fullPropertyPathElements), eq(scenarioSimulationContextLocal.getDataObjectFieldsMap()));
-        verify(gridColumnMock, times(1)).setFactory(eq(scenarioSimulationContextLocal.getCollectionEditorSingletonDOMElementFactory(GridWidget.SIMULATION)));
-        verify(factMappingMock, times(1)).setGenericTypes(eq(factModelTreeMock.getGenericTypeInfo(LIST_PROPERTY_NAME)));
-    }
-
-    /* This test is usable ONLY by <code>SetPropertyCommandTest</code> subclass */
-    public void manageSimpleTypeCollectionProperty() {
-        when(factModelTreeMock.isSimple()).thenReturn(true);
-        scenarioSimulationContextLocal.getStatus().setValueClassName(LIST_CLASS_NAME);
-        scenarioSimulationContextLocal.getStatus().setValue(FULL_PROPERTY_PATH);
-        final List<String> fullPropertyPathElements = Arrays.asList(FULL_PROPERTY_PATH.split("\\."));
-        ((AbstractSelectedColumnCommand) commandSpy).manageCollectionProperty(scenarioSimulationContextLocal, gridColumnMock, FULL_PROPERTY_PATH, 0, fullPropertyPathElements);
-        verify((AbstractSelectedColumnCommand) commandSpy, never()).navigateComplexObject(any(), any(), any());
-        verify(gridColumnMock, times(1)).setFactory(eq(scenarioSimulationContextLocal.getCollectionEditorSingletonDOMElementFactory(GridWidget.SIMULATION)));
-        verify(factMappingMock, times(1)).setGenericTypes(eq(factModelTreeMock.getGenericTypeInfo(LOWER_CASE_VALUE)));
-    }
-
-    protected void commonSetPropertyHeader(ScenarioSimulationModel.Type type, boolean keepData, List<String> propertyNameElements, String propertyClass) {
-        ((AbstractSelectedColumnCommand) commandSpy).setPropertyHeader(scenarioSimulationContextLocal, gridColumnMock, FULL_CLASS_NAME, propertyNameElements, propertyClass);
-        verify(gridColumnMock, times(1)).setEditableHeaders(eq(!type.equals(ScenarioSimulationModel.Type.DMN)));
-        verify(propertyHeaderMetaDataMock, times(1)).setColumnGroup(anyString());
-        verify(propertyHeaderMetaDataMock, times(1)).setTitle(String.join(".", propertyNameElements.subList(1, propertyNameElements.size())));
-        verify(propertyHeaderMetaDataMock, times(1)).setReadOnly(false);
-        verify(scenarioGridModelMock, times(1)).updateColumnProperty(anyInt(), eq(gridColumnMock), eq(propertyNameElements), eq(propertyClass), eq(keepData), isA(FactMappingValueType.class), eq(type));
-        verify(scenarioSimulationContextLocal.getScenarioSimulationEditorPresenter(), times(1)).reloadTestTools(false);
-    }
-
-    /* This test is usable ONLY by <code>SetPropertyCommandTest</code> subclass */
-    protected void navigateComplexObject() {
-        FactModelTree book = new FactModelTree("Book", "com.Book", new HashMap<>(), new HashMap<>());
-        book.addExpandableProperty("author", "Author");
-        FactModelTree author = new FactModelTree("Author", "com.Author", new HashMap<>(), new HashMap<>());
-        SortedMap<String, FactModelTree> sortedMap = spy(new TreeMap<>());
-        sortedMap.put("Book", book);
-        sortedMap.put("Author", author);
-        List<String> elements = Arrays.asList("Book", "author", "currentlyPrinted");
-        FactModelTree target = ((AbstractSelectedColumnCommand) commandSpy).navigateComplexObject(book, elements, sortedMap);
-        assertEquals(target, author);
-        verify(sortedMap, times(1)).get("Author");
-    }
-
-    protected void navigateComplexObject3Levels() {
-        FactModelTree book = new FactModelTree("Book", "com.Book", new HashMap<>(), new HashMap<>());
-        book.addExpandableProperty("author", "Author");
-        FactModelTree author = new FactModelTree("Author", "com.Author", new HashMap<>(), new HashMap<>());
-        author.addExpandableProperty("firstBook", "Book");
-        SortedMap<String, FactModelTree> sortedMap = spy(new TreeMap<>());
-        sortedMap.put("Book", book);
-        sortedMap.put("Author", author);
-        List<String> elements = Arrays.asList("Book", "author", "firstBook", "topics");
-        FactModelTree target = ((AbstractSelectedColumnCommand) commandSpy).navigateComplexObject(book, elements, sortedMap);
-        assertEquals(target, book);
-        verify(sortedMap, times(1)).get("Author");
-    }
-
-    /* This test is usable ONLY by <code>SetPropertyCommandTest</code> subclass */
-    protected void getPropertyHeaderTitle() {
-        Optional<String> emptyMatching = Optional.empty();
-        doReturn(emptyMatching).when((AbstractSelectedColumnCommand) commandSpy).getMatchingExpressionAlias(eq(scenarioSimulationContextLocal), eq(MULTIPART_VALUE_ELEMENTS), eq(factIdentifierMock));
-        String retrieved = ((AbstractSelectedColumnCommand) commandSpy).getPropertyHeaderTitle(scenarioSimulationContextLocal, MULTIPART_VALUE_ELEMENTS, factIdentifierMock);
-        List<String> propertyNameElements = new ArrayList<>();
-        propertyNameElements.add(CLASS_NAME);
-        propertyNameElements.addAll(MULTIPART_VALUE_ELEMENTS.subList(1, MULTIPART_VALUE_ELEMENTS.size()));
-        verify((AbstractSelectedColumnCommand) commandSpy, times(1)).getMatchingExpressionAlias(eq(scenarioSimulationContextLocal), eq(propertyNameElements), eq(factIdentifierMock));
-        String expected = String.join(".", MULTIPART_VALUE_ELEMENTS.subList(1, MULTIPART_VALUE_ELEMENTS.size()));
-        assertEquals(expected, retrieved);
-        String EXPECTED_VALUE_STRING = "EXPECTED_VALUE_STRING";
-        Optional<String> expectedValue = Optional.of("EXPECTED_VALUE_STRING");
-        doReturn(expectedValue).when((AbstractSelectedColumnCommand) commandSpy).getMatchingExpressionAlias(eq(scenarioSimulationContextLocal), eq(FULL_PROPERTY_NAME_ELEMENTS), eq(factIdentifierMock));
-        retrieved = ((AbstractSelectedColumnCommand) commandSpy).getPropertyHeaderTitle(scenarioSimulationContextLocal, FULL_PROPERTY_NAME_ELEMENTS, factIdentifierMock);
-        verify((AbstractSelectedColumnCommand) commandSpy, times(1)).getMatchingExpressionAlias(eq(scenarioSimulationContextLocal), eq(FULL_PROPERTY_NAME_ELEMENTS), eq(factIdentifierMock));
-        assertEquals(EXPECTED_VALUE_STRING, retrieved);
-        List<String> aliasedPropertyNameElements = Arrays.asList(CLASS_NAME + "_ALIAS", PROPERTY_NAME);
-        retrieved = ((AbstractSelectedColumnCommand) commandSpy).getPropertyHeaderTitle(scenarioSimulationContextLocal, aliasedPropertyNameElements, factIdentifierMock);
-        verify((AbstractSelectedColumnCommand) commandSpy, times(2)).getMatchingExpressionAlias(eq(scenarioSimulationContextLocal), eq(FULL_PROPERTY_NAME_ELEMENTS), eq(factIdentifierMock));
-        assertEquals(EXPECTED_VALUE_STRING, retrieved);
-    }
-
-    protected void getPropertyHeaderTitle_Value() {
-        Optional<String> emptyMatching = Optional.empty();
-        doReturn(emptyMatching).when((AbstractSelectedColumnCommand) commandSpy).getMatchingExpressionAlias(eq(scenarioSimulationContextLocal), eq(singletonList(CLASS_NAME)), eq(factIdentifierMock));
-        String retrieved = ((AbstractSelectedColumnCommand) commandSpy).getPropertyHeaderTitle(scenarioSimulationContextLocal, singletonList(CLASS_NAME), factIdentifierMock);
-        assertEquals(VALUE, retrieved);
-    }
-
-    protected void getPropertyHeaderTitle_Expression() {
-        Optional<String> emptyMatching = Optional.empty();
-        doReturn(emptyMatching).when((AbstractSelectedColumnCommand) commandSpy).getMatchingExpressionAlias(eq(scenarioSimulationContextLocal), eq(singletonList(CLASS_NAME)), eq(factIdentifierMock));
-        ((AbstractSelectedColumnCommand) commandSpy).factMappingValueType = FactMappingValueType.EXPRESSION;
-        String retrieved = ((AbstractSelectedColumnCommand) commandSpy).getPropertyHeaderTitle(scenarioSimulationContextLocal, singletonList(CLASS_NAME), factIdentifierMock);
-        assertEquals(ConstantHolder.EXPRESSION_INSTANCE_PLACEHOLDER, retrieved);
-    }
-
-    /* This test is usable ONLY by <code>SetPropertyCommandTest</code> subclass */
-    protected void getMatchingExpressionAlias() {
-        Optional<String> retrieved = ((AbstractSelectedColumnCommand) commandSpy).getMatchingExpressionAlias(scenarioSimulationContextLocal, MULTIPART_VALUE_ELEMENTS, factIdentifierMock);
-        verify(simulationDescriptorMock, times(1)).getFactMappingsByFactName(eq(factIdentifierMock.getName()));
-        assertEquals(Optional.empty(), retrieved);
-        List<FactMapping> factMappingList = new ArrayList<>();
-        factMappingList.add(factMappingMock);
-        when(simulationDescriptorMock.getFactMappingsByFactName(FACT_IDENTIFIER_NAME)).thenReturn(factMappingList.stream());
-        String EXPRESSION_ALIAS = "EXPRESSION_ALIAS";
-        when(factMappingMock.getExpressionAlias()).thenReturn(EXPRESSION_ALIAS);
-        retrieved = ((AbstractSelectedColumnCommand) commandSpy).getMatchingExpressionAlias(scenarioSimulationContextLocal, FULL_PROPERTY_NAME_ELEMENTS, factIdentifierMock);
-        assertEquals(Optional.empty(), retrieved);
-        List<ExpressionElement> expressionElements = FULL_PROPERTY_NAME_ELEMENTS.stream().map(ExpressionElement::new).collect(Collectors.toList());
-        when(factMappingMock.getExpressionElements()).thenReturn(expressionElements);
-        when(simulationDescriptorMock.getFactMappingsByFactName(FACT_IDENTIFIER_NAME)).thenReturn(factMappingList.stream());
-        retrieved = ((AbstractSelectedColumnCommand) commandSpy).getMatchingExpressionAlias(scenarioSimulationContextLocal, FULL_PROPERTY_NAME_ELEMENTS, factIdentifierMock);
-        assertEquals(Optional.of(EXPRESSION_ALIAS), retrieved);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AppendColumnCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AppendColumnCommandTest.java
deleted file mode 100644
index a4c0beb..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AppendColumnCommandTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FIRST_INDEX_RIGHT;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class AppendColumnCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new AppendColumnCommand(GridWidget.SIMULATION) {
-            @Override
-            protected ScenarioGridColumn getScenarioGridColumnLocal(String instanceTitle, String propertyTitle, String columnId, String columnGroup, FactMappingType factMappingType, ScenarioHeaderTextBoxSingletonDOMElementFactory factoryHeader,
-                                                                    ScenarioCellTextAreaSingletonDOMElementFactory factoryCell, String placeHolder) {
-                return gridColumnMock;
-            }
-        });
-    }
-
-    @Test
-    public void execute() {
-        scenarioSimulationContextLocal.getStatus().setColumnId(COLUMN_ID);
-        scenarioSimulationContextLocal.getStatus().setColumnGroup(COLUMN_GROUP);
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(true);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(commandSpy, times(1)).getScenarioGridColumnLocal(anyString(), anyString(), eq(COLUMN_ID), eq(COLUMN_GROUP), eq(factMappingType), eq(scenarioHeaderTextBoxSingletonDOMElementFactorySpy), eq(scenarioCellTextAreaSingletonDOMElementFactorySpy), eq(ScenarioSimulationEditorConstants.INSTANCE.defineValidType()));
-        verify(scenarioGridModelMock, times(1)).getFirstIndexRightOfGroup(eq(COLUMN_GROUP));
-        verify(scenarioGridModelMock, times(1)).insertColumn(eq(FIRST_INDEX_RIGHT), eq(gridColumnMock));
-        verify(scenarioGridMock, times(1)).selectCurrentHeaderCellGroup();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AppendRowCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AppendRowCommandTest.java
deleted file mode 100644
index e9d3391..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/AppendRowCommandTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridRow;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class AppendRowCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new AppendRowCommand(GridWidget.SIMULATION));
-    }
-
-    @Test
-    public void execute() {
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(scenarioGridModelMock, times(1)).appendRow(isA(ScenarioGridRow.class));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DeleteColumnCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DeleteColumnCommandTest.java
deleted file mode 100644
index 7077b52..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DeleteColumnCommandTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INDEX;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyObject;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class DeleteColumnCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new DeleteColumnCommand(GridWidget.SIMULATION) {
-            @Override
-            protected ScenarioGridColumn getScenarioGridColumnLocal(String instanceTitle, String propertyTitle, String columnId, String columnGroup, FactMappingType factMappingType, ScenarioHeaderTextBoxSingletonDOMElementFactory factoryHeader,
-                                                                    ScenarioCellTextAreaSingletonDOMElementFactory factoryCell, String placeHolder) {
-                return gridColumnMock;
-            }
-        });
-    }
-
-    @Test
-    public void executeAsProperty() {
-        scenarioSimulationContextLocal.getStatus().setColumnIndex(COLUMN_INDEX);
-        scenarioSimulationContextLocal.getStatus().setColumnGroup(COLUMN_GROUP);
-        scenarioSimulationContextLocal.getStatus().setAsProperty(true);
-        doReturn(4l).when(scenarioGridModelMock).getGroupSize(COLUMN_GROUP);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(scenarioGridModelMock, times(1)).deleteColumn(eq(COLUMN_INDEX));
-        verify(scenarioGridModelMock, never()).insertColumn(anyInt(), anyObject());
-        reset(scenarioGridModelMock);
-        doReturn(0l).when(scenarioGridModelMock).getGroupSize(COLUMN_GROUP);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(commandSpy, times(1)).getScenarioGridColumnLocal(anyString(), anyString(), anyString(), eq(COLUMN_GROUP), eq(factMappingType), eq(scenarioHeaderTextBoxSingletonDOMElementFactorySpy), eq(scenarioCellTextAreaSingletonDOMElementFactorySpy), eq(ScenarioSimulationEditorConstants.INSTANCE.defineValidType()));
-        verify(scenarioGridModelMock, times(1)).deleteColumn(eq(COLUMN_INDEX));
-        verify(scenarioGridModelMock, times(1)).insertColumn(eq(COLUMN_INDEX), eq(gridColumnMock));
-    }
-
-    @Test
-    public void executeNotAsProperty() {
-        scenarioSimulationContextLocal.getStatus().setColumnIndex(COLUMN_INDEX);
-        scenarioSimulationContextLocal.getStatus().setColumnGroup(COLUMN_GROUP);
-        scenarioSimulationContextLocal.getStatus().setAsProperty(false);
-        doReturn(4l).when(scenarioGridModelMock).getGroupSize(COLUMN_GROUP);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(scenarioGridModelMock, times(1)).deleteColumn(eq(COLUMN_INDEX));
-        verify(scenarioGridModelMock, never()).insertColumn(anyInt(), anyObject());
-        reset(scenarioGridModelMock);
-        doReturn(0l).when(scenarioGridModelMock).getGroupSize(COLUMN_GROUP);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(commandSpy, times(1)).getScenarioGridColumnLocal(anyString(), anyString(), anyString(), eq(COLUMN_GROUP), eq(factMappingType), eq(scenarioHeaderTextBoxSingletonDOMElementFactorySpy), eq(scenarioCellTextAreaSingletonDOMElementFactorySpy), eq(ScenarioSimulationEditorConstants.INSTANCE.defineValidType()));
-        verify(scenarioGridModelMock, times(1)).deleteColumn(eq(COLUMN_INDEX));
-        verify(scenarioGridModelMock, times(1)).insertColumn(eq(COLUMN_INDEX  -1), eq(gridColumnMock));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DeleteRowCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DeleteRowCommandTest.java
deleted file mode 100644
index f6f978b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DeleteRowCommandTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridRow;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class DeleteRowCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new DeleteRowCommand(GridWidget.SIMULATION));
-    }
-
-    @Test
-    public void execute() {
-        scenarioSimulationContextLocal.getStatus().setRowIndex(ROW_INDEX);
-        when(rowsMock.isEmpty()).thenReturn(false);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(scenarioGridModelMock, times(1)).deleteRow(eq(ROW_INDEX));
-        verify(scenarioGridModelMock, never()).insertRow(anyInt(), isA(ScenarioGridRow.class));
-        reset(scenarioGridModelMock);
-        when(rowsMock.isEmpty()).thenReturn(true);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(scenarioGridModelMock, times(1)).deleteRow(eq(ROW_INDEX));
-        verify(scenarioGridModelMock, times(1)).insertRow(eq(0), isA(ScenarioGridRow.class));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DisableTestToolsCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DisableTestToolsCommandTest.java
deleted file mode 100644
index a2c8367c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DisableTestToolsCommandTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class DisableTestToolsCommandTest extends AbstractScenarioSimulationCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        command = spy(new DisableTestToolsCommand());
-
-    }
-
-    @Test
-    public void execute() {
-        scenarioSimulationContextLocal.setTestToolsPresenter(testToolsPresenterMock);
-        command.execute(scenarioSimulationContextLocal);
-        verify(testToolsPresenterMock, times(1)).onDisableEditorTab();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DuplicateInstanceCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DuplicateInstanceCommandTest.java
deleted file mode 100644
index 7dbaa9b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DuplicateInstanceCommandTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValue;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_NUMBER;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_ALIAS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_ALIAS_1;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_IDENTIFIER_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_IDENTIFIER_NAME_1;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_CLASS_NAME_1;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_ID_1;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_PROPERTY_TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_PROPERTY_TITLE_1;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.VALUE_1;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.VALUE_CLASS_NAME;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.internal.verification.VerificationModeFactory.times;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class DuplicateInstanceCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Mock
-    protected ScenarioGridColumn scenarioGridColumnMock1;
-    @Mock
-    protected ScenarioGridColumn scenarioGridColumnMock2;
-    @Mock
-    protected ScenarioGridColumn scenarioGridColumnMock3;
-    @Mock
-    protected FactMapping factMappingMock1;
-    @Mock
-    protected FactMapping factMappingMock2;
-    @Mock
-    protected FactMapping factMappingMock3;
-    @Mock
-    protected FactMappingValue factMappingValueMock1;
-    @Mock
-    protected FactMappingValue factMappingValueMock2;
-    @Mock
-    protected FactMappingValue factMappingValueMock3;
-    @Mock
-    protected FactIdentifier factIdentifierMock1;
-    @Mock
-    protected FactIdentifier factIdentifierMock2;
-    @Mock
-    protected List<GridColumn.HeaderMetaData> headerMetaDatasMock1;
-    @Mock
-    protected List<GridColumn.HeaderMetaData> headerMetaDatasMock2;
-    @Mock
-    protected List<GridColumn.HeaderMetaData> headerMetaDatasMock3;
-    @Mock
-    protected ScenarioHeaderMetaData informationHeaderMetaDataMock1;
-    @Mock
-    protected ScenarioHeaderMetaData informationHeaderMetaDataMock2;
-    @Mock
-    protected ScenarioHeaderMetaData propertyHeaderMetaDataMock1;
-    @Mock
-    protected ScenarioHeaderMetaData propertyHeaderMetaDataMock2;
-    @Mock
-    protected ScenarioHeaderMetaData propertyHeaderMetaDataMock3;
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new DuplicateInstanceCommand(GridWidget.SIMULATION) {
-            @Override
-            protected void setInstanceHeader(ScenarioSimulationContext context, ScenarioGridColumn selectedColumn, String alias, String fullClassName) {
-                //Do nothing
-            }
-
-            @Override
-            protected ScenarioGridColumn getScenarioGridColumnLocal(String instanceTitle, String propertyTitle, String columnId, String columnGroup, FactMappingType factMappingType, ScenarioHeaderTextBoxSingletonDOMElementFactory factoryHeader,
-                                                                    ScenarioCellTextAreaSingletonDOMElementFactory factoryCell, String placeHolder) {
-                return gridColumnMock;
-            }
-        });
-        addNewColumn(scenarioGridColumnMock1, headerMetaDatasMock1, informationHeaderMetaDataMock1, propertyHeaderMetaDataMock1, factIdentifierMock1, factMappingMock1,
-                          factMappingValueMock1, COLUMN_NUMBER, COLUMN_NUMBER, COLUMN_NUMBER, VALUE_1, GRID_PROPERTY_TITLE_1, GRID_COLUMN_ID_1, FACT_ALIAS_1, VALUE_CLASS_NAME,
-                          "test", FULL_CLASS_NAME_1, FACT_IDENTIFIER_NAME_1);
-    }
-
-    @Test
-    public void executeIfSelectedColumn_WithoutInstanceAndProperty() {
-        when(scenarioGridColumnMock1.isInstanceAssigned()).thenReturn(Boolean.FALSE);
-        when(scenarioGridColumnMock1.isPropertyAssigned()).thenReturn(Boolean.FALSE);
-        ((DuplicateInstanceCommand) commandSpy).executeIfSelectedColumn(scenarioSimulationContextLocal, scenarioGridColumnMock1);
-        verify(scenarioGridModelMock, times(1)).getInstancesCount(eq(scenarioGridColumnMock1.getFactIdentifier().getClassName()));
-        verify((DuplicateInstanceCommand) commandSpy, times(1)).insertNewColumn(eq(scenarioSimulationContextLocal), eq(scenarioGridColumnMock1), eq(COLUMN_NUMBER + 1), eq(Boolean.FALSE));
-        verify((DuplicateInstanceCommand) commandSpy, never()).setInstanceHeader(any(), any(), any(), any());
-        verify((DuplicateInstanceCommand) commandSpy, never()).setPropertyHeader(any(), any(), any(), any(), any());
-        verify(scenarioGridModelMock, never()).duplicateColumnValues(anyInt(), eq(0)); // The created column is mocked as gridColumnMock, with position 0
-    }
-
-    @Test
-    public void executeIfSelectedColumn_WithInstanceOnly() {
-        when(scenarioGridColumnMock1.isPropertyAssigned()).thenReturn(Boolean.FALSE);
-        ((DuplicateInstanceCommand) commandSpy).executeIfSelectedColumn(scenarioSimulationContextLocal, scenarioGridColumnMock1);
-        verify(scenarioGridModelMock, times(1)).getInstancesCount(eq(scenarioGridColumnMock1.getFactIdentifier().getClassName()));
-        verify((DuplicateInstanceCommand) commandSpy, times(1)).insertNewColumn(eq(scenarioSimulationContextLocal), eq(scenarioGridColumnMock1), eq(COLUMN_NUMBER + 1), eq(Boolean.FALSE));
-        verify((DuplicateInstanceCommand) commandSpy, times(1)).setInstanceHeader(eq(scenarioSimulationContextLocal), eq(gridColumnMock), eq(VALUE_1 + DuplicateInstanceCommand.COPY_LABEL + "1"), eq(FULL_CLASS_NAME_1));
-        verify((DuplicateInstanceCommand) commandSpy, never()).setPropertyHeader(any(), any(), any(), any(), any());
-        verify(scenarioGridModelMock, never()).duplicateColumnValues(anyInt(), eq(0)); // The created column is mocked as gridColumnMock, with position 0
-    }
-
-    @Test
-    public void executeIfSelectedColumn_WithInstanceAndProperty() {
-        ((DuplicateInstanceCommand) commandSpy).executeIfSelectedColumn(scenarioSimulationContextLocal, scenarioGridColumnMock1);
-        verify(scenarioGridModelMock, times(1)).getInstancesCount(eq(scenarioGridColumnMock1.getFactIdentifier().getClassName()));
-        verify((DuplicateInstanceCommand) commandSpy, times(1)).insertNewColumn(eq(scenarioSimulationContextLocal), eq(scenarioGridColumnMock1), eq(COLUMN_NUMBER + 1), eq(Boolean.FALSE));
-        String expectedDuplicatedLabel = VALUE_1 + DuplicateInstanceCommand.COPY_LABEL + "1";
-        verify((DuplicateInstanceCommand) commandSpy, times(1)).setInstanceHeader(eq(scenarioSimulationContextLocal), eq(gridColumnMock), eq(expectedDuplicatedLabel), eq(FULL_CLASS_NAME_1));
-        List<String> expectedPropertyNameElements = Arrays.asList(expectedDuplicatedLabel, "test");
-        verify((DuplicateInstanceCommand) commandSpy, times(1)).setPropertyHeader(eq(scenarioSimulationContextLocal), eq(gridColumnMock), eq(FULL_CLASS_NAME_1), eq(expectedPropertyNameElements), eq(VALUE_CLASS_NAME), eq(GRID_PROPERTY_TITLE_1));
-        verify(scenarioGridModelMock, times(1)).duplicateColumnValues(eq(COLUMN_NUMBER), eq(0)); // The created column is mocked as gridColumnMock, with position 0
-    }
-
-    @Test
-    public void executeIfSelectedColumn_WithInstanceAndPropertyAndThreeColumns() {
-        final String SECOND = "SECOND";
-        addNewColumn(scenarioGridColumnMock2, headerMetaDatasMock2, informationHeaderMetaDataMock2, propertyHeaderMetaDataMock2, factIdentifierMock2, factMappingMock2,
-                     factMappingValueMock2, COLUMN_NUMBER + 1, COLUMN_NUMBER + 2, COLUMN_NUMBER + 1, MULTIPART_VALUE + "_2", GRID_PROPERTY_TITLE + "_2", GRID_COLUMN_ID + "_2", FACT_ALIAS + "_2", VALUE_CLASS_NAME,
-                     SECOND, FULL_CLASS_NAME + "_2", FACT_IDENTIFIER_NAME + "_2");
-        final String THIRD = "THIRD";
-        addNewColumn(scenarioGridColumnMock3, headerMetaDatasMock3, informationHeaderMetaDataMock2, propertyHeaderMetaDataMock3, factIdentifierMock2, factMappingMock3,
-                     factMappingValueMock3, COLUMN_NUMBER + 1, COLUMN_NUMBER + 2, COLUMN_NUMBER + 2, MULTIPART_VALUE + "_2", GRID_PROPERTY_TITLE + "_3", GRID_COLUMN_ID + "_3", FACT_ALIAS + "_3", VALUE_CLASS_NAME,
-                     THIRD, FULL_CLASS_NAME + "_2", FACT_IDENTIFIER_NAME + "_3");
-        ((DuplicateInstanceCommand) commandSpy).executeIfSelectedColumn(scenarioSimulationContextLocal, scenarioGridColumnMock2);
-        verify(scenarioGridModelMock, times(1)).getInstancesCount(eq(scenarioGridColumnMock2.getFactIdentifier().getClassName()));
-        verify((DuplicateInstanceCommand) commandSpy, times(1)).insertNewColumn(eq(scenarioSimulationContextLocal), eq(scenarioGridColumnMock2), eq(7), eq(Boolean.FALSE));
-        verify((DuplicateInstanceCommand) commandSpy, times(1)).insertNewColumn(eq(scenarioSimulationContextLocal), eq(scenarioGridColumnMock3), eq(8), eq(Boolean.FALSE));
-        String expectedDuplicatedLabelSecond = MULTIPART_VALUE + "_2" + DuplicateInstanceCommand.COPY_LABEL + "2";
-        verify((DuplicateInstanceCommand) commandSpy, times(2)).setInstanceHeader(eq(scenarioSimulationContextLocal), eq(gridColumnMock), eq(expectedDuplicatedLabelSecond), eq(FULL_CLASS_NAME + "_2"));
-        List<String> expectedPropertyNameElementsSecond = Arrays.asList(expectedDuplicatedLabelSecond, SECOND);
-        List<String> expectedPropertyNameElementsThird = Arrays.asList(expectedDuplicatedLabelSecond, THIRD);
-        verify((DuplicateInstanceCommand) commandSpy, times(1)).setPropertyHeader(eq(scenarioSimulationContextLocal), eq(gridColumnMock), eq(FULL_CLASS_NAME + "_2"), eq(expectedPropertyNameElementsSecond), eq(VALUE_CLASS_NAME), eq(GRID_PROPERTY_TITLE + "_2"));
-        verify((DuplicateInstanceCommand) commandSpy, times(1)).setPropertyHeader(eq(scenarioSimulationContextLocal), eq(gridColumnMock), eq(FULL_CLASS_NAME + "_2"), eq(expectedPropertyNameElementsThird), eq(VALUE_CLASS_NAME), eq(GRID_PROPERTY_TITLE + "_3"));
-        verify(scenarioGridModelMock, times(1)).duplicateColumnValues(eq(COLUMN_NUMBER + 1), eq(0)); // The created column is mocked as gridColumnMock, with position 0
-        verify(scenarioGridModelMock, times(1)).duplicateColumnValues(eq(COLUMN_NUMBER + 2), eq(0)); // The created column is mocked as gridColumnMock, with position 0
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DuplicateRowCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DuplicateRowCommandTest.java
deleted file mode 100644
index 551b2bb..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/DuplicateRowCommandTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridRow;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class DuplicateRowCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new DuplicateRowCommand(GridWidget.SIMULATION));
-    }
-
-    @Test
-    public void execute() {
-        scenarioSimulationContextLocal.getStatus().setRowIndex(ROW_INDEX);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(scenarioGridModelMock, times(1)).duplicateRow(eq(ROW_INDEX), isA(ScenarioGridRow.class));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/EnableTestToolsCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/EnableTestToolsCommandTest.java
deleted file mode 100644
index 8d7f5b9..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/EnableTestToolsCommandTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_NAME;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class EnableTestToolsCommandTest extends AbstractScenarioSimulationCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        command = spy(new EnableTestToolsCommand());
-    }
-
-    @Test
-    public void executeWithFactName() {
-        scenarioSimulationContextLocal.setTestToolsPresenter(testToolsPresenterMock);
-        scenarioSimulationContextLocal.getStatus().setFilterTerm(FACT_NAME);
-        scenarioSimulationContextLocal.getStatus().setPropertyNameElements(null);
-        scenarioSimulationContextLocal.getStatus().setNotEqualsSearch(true);
-        command.execute(scenarioSimulationContextLocal);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).expandToolsDock();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).reloadTestTools(eq(false));
-        verify(testToolsPresenterMock, times(1)).onEnableEditorTab(eq(FACT_NAME), eq(null), eq(true));
-        verify(testToolsPresenterMock, never()).onEnableEditorTab();
-    }
-
-    @Test
-    public void executeWithoutFactName() {
-        scenarioSimulationContextLocal.setTestToolsPresenter(testToolsPresenterMock);
-        scenarioSimulationContextLocal.getStatus().setFilterTerm(null);
-        scenarioSimulationContextLocal.getStatus().setPropertyNameElements(null);
-        scenarioSimulationContextLocal.getStatus().setNotEqualsSearch(true);
-        command.execute(scenarioSimulationContextLocal);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).expandToolsDock();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).reloadTestTools(eq(false));
-        verify(testToolsPresenterMock, times(1)).onEnableEditorTab();
-        verify(testToolsPresenterMock, never()).onEnableEditorTab(anyString(), any(), anyBoolean());
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/ImportCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/ImportCommandTest.java
deleted file mode 100644
index 1def08d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/ImportCommandTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FILE_CONTENT;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ImportCommandTest extends AbstractScenarioSimulationCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        command = spy(new ImportCommand(GridWidget.SIMULATION, FILE_CONTENT));
-    }
-
-    @Test
-    public void execute() {
-        command.execute(scenarioSimulationContextLocal);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).onImport(eq(FILE_CONTENT), eq(GridWidget.SIMULATION));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/InsertColumnCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/InsertColumnCommandTest.java
deleted file mode 100644
index 196a06b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/InsertColumnCommandTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INDEX;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class InsertColumnCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new InsertColumnCommand(GridWidget.SIMULATION) {
-            @Override
-            protected ScenarioGridColumn getScenarioGridColumnLocal(String instanceTitle, String propertyTitle, String columnId, String columnGroup,
-                                                                    FactMappingType factMappingType, ScenarioHeaderTextBoxSingletonDOMElementFactory factoryHeader,
-                                                                    ScenarioCellTextAreaSingletonDOMElementFactory factoryCell, String placeHolder) {
-                return gridColumnMock;
-            }
-        });
-        scenarioSimulationContextLocal.getStatus().setColumnId(COLUMN_ID);
-        scenarioSimulationContextLocal.getStatus().setColumnIndex(COLUMN_INDEX);
-    }
-
-    @Test
-    public void executeIfSelectedColumn_NotIsRightIsAsProperty() {
-        when(gridColumnMock.isInstanceAssigned()).thenReturn(Boolean.TRUE);
-        commonTest(false, true, 3);
-    }
-
-    @Test
-    public void executeIfSelectedColumn_IsRightIsAsProperty() {
-        when(gridColumnMock.isInstanceAssigned()).thenReturn(Boolean.TRUE);
-        commonTest(true, true, 4);
-    }
-
-    @Test
-    public void executeIfSelectedColumn_NotIsRightNotIsAsProperty() {
-        commonTest(false, false, 2);
-    }
-
-    @Test
-    public void executeIfSelectedColumn_NotIsAsProperty() {
-        commonTest(true, false, 4);
-    }
-
-    protected void commonTest(boolean right, boolean asProperty, int expectedIndex) {
-        scenarioSimulationContextLocal.getStatus().setRight(right);
-        scenarioSimulationContextLocal.getStatus().setAsProperty(asProperty);
-        ((InsertColumnCommand) commandSpy).executeIfSelectedColumn(scenarioSimulationContextLocal, gridColumnMock);
-        boolean cloneInstance = scenarioSimulationContextLocal.getStatus().isAsProperty() && gridColumnMock.isInstanceAssigned();
-        verify((InsertColumnCommand) commandSpy, times(1)).insertNewColumn(eq(scenarioSimulationContextLocal), eq(gridColumnMock), eq(expectedIndex), eq(cloneInstance));
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/InsertRowCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/InsertRowCommandTest.java
deleted file mode 100644
index 462808f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/InsertRowCommandTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridRow;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class InsertRowCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new InsertRowCommand(GridWidget.SIMULATION));
-    }
-
-    @Test
-    public void execute() {
-        scenarioSimulationContextLocal.getStatus().setRowIndex(ROW_INDEX);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(scenarioGridModelMock, times(1)).insertRow(eq(ROW_INDEX), isA(ScenarioGridRow.class));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/PrependColumnCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/PrependColumnCommandTest.java
deleted file mode 100644
index a3e3dd1cd..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/PrependColumnCommandTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FIRST_INDEX_LEFT;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class PrependColumnCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new PrependColumnCommand(GridWidget.SIMULATION) {
-            @Override
-            protected ScenarioGridColumn getScenarioGridColumnLocal(String instanceTitle, String propertyTitle, String columnId, String columnGroup, FactMappingType factMappingType, ScenarioHeaderTextBoxSingletonDOMElementFactory factoryHeader,
-                                                                    ScenarioCellTextAreaSingletonDOMElementFactory factoryCell, String placeHolder) {
-                return gridColumnMock;
-            }
-        });
-    }
-
-    @Test
-    public void execute() {
-        scenarioSimulationContextLocal.getStatus().setColumnId(COLUMN_ID);
-        scenarioSimulationContextLocal.getStatus().setColumnGroup(COLUMN_GROUP);
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(true);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(commandSpy, times(1)).getScenarioGridColumnLocal(anyString(), anyString(), anyString(), eq(COLUMN_GROUP), eq(factMappingType), eq(scenarioHeaderTextBoxSingletonDOMElementFactorySpy), eq(scenarioCellTextAreaSingletonDOMElementFactorySpy), eq(ScenarioSimulationEditorConstants.INSTANCE.defineValidType()));
-        verify(scenarioGridModelMock, times(1)).getFirstIndexLeftOfGroup(eq(COLUMN_GROUP));
-        verify(scenarioGridModelMock, times(1)).insertColumn(eq(FIRST_INDEX_LEFT), eq(gridColumnMock));
-        verify(scenarioGridMock, times(1)).selectCurrentHeaderCellGroup();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/PrependRowCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/PrependRowCommandTest.java
deleted file mode 100644
index 917e8be..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/PrependRowCommandTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridRow;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class PrependRowCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new PrependRowCommand(GridWidget.SIMULATION));
-    }
-
-    @Test
-    public void execute() {
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(scenarioGridModelMock, times(1)).insertRow(eq(0), isA(ScenarioGridRow.class));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/ReloadTestToolsCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/ReloadTestToolsCommandTest.java
deleted file mode 100644
index c464880..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/ReloadTestToolsCommandTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ReloadTestToolsCommandTest extends AbstractScenarioSimulationCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        command = spy(new ReloadTestToolsCommand());
-        scenarioSimulationContextLocal.setScenarioSimulationEditorPresenter(scenarioSimulationEditorPresenterMock);
-    }
-
-    @Test
-    public void executeDisableOpen() {
-        scenarioSimulationContextLocal.getStatus().setDisable(true);
-        scenarioSimulationContextLocal.getStatus().setOpenDock(true);
-        command.execute(scenarioSimulationContextLocal);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).expandToolsDock();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).reloadTestTools(eq(true));
-    }
-
-    @Test
-    public void executeNotDisableOpen() {
-        scenarioSimulationContextLocal.getStatus().setDisable(false);
-        scenarioSimulationContextLocal.getStatus().setOpenDock(true);
-        command.execute(scenarioSimulationContextLocal);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).expandToolsDock();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).reloadTestTools(eq(false));
-    }
-
-    @Test
-    public void executeDisableNotOpen() {
-        scenarioSimulationContextLocal.getStatus().setDisable(true);
-        scenarioSimulationContextLocal.getStatus().setOpenDock(false);
-        command.execute(scenarioSimulationContextLocal);
-        verify(scenarioSimulationEditorPresenterMock, never()).expandToolsDock();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).reloadTestTools(eq(true));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/RunSingleScenarioCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/RunSingleScenarioCommandTest.java
deleted file mode 100644
index ad5722a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/RunSingleScenarioCommandTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Collections;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class RunSingleScenarioCommandTest extends AbstractScenarioSimulationCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        command = spy(new RunSingleScenarioCommand());
-    }
-
-    @Test
-    public void execute() {
-        scenarioSimulationContextLocal.getStatus().setRowIndex(ROW_INDEX);
-        command.execute(scenarioSimulationContextLocal);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).onRunScenario(Collections.singletonList(ROW_INDEX));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetGridCellValueCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetGridCellValueCommandTest.java
deleted file mode 100644
index c5462cd..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetGridCellValueCommandTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.values.ScenarioGridCellValue;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class SetGridCellValueCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new SetGridCellValueCommand(GridWidget.SIMULATION));
-    }
-
-    @Test
-    public void execute() {
-        scenarioSimulationContextLocal.getStatus().setRowIndex(ROW_INDEX);
-        scenarioSimulationContextLocal.getStatus().setColumnIndex(COLUMN_INDEX);
-        scenarioSimulationContextLocal.getStatus().setGridCellValue(MULTIPART_VALUE);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(scenarioGridModelMock, times(1)).setCellValue(eq(ROW_INDEX), eq(COLUMN_INDEX), isA(ScenarioGridCellValue.class));
-        verify(scenarioGridModelMock, times(1)).resetError(eq(ROW_INDEX), eq(COLUMN_INDEX));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetHeaderCellValueCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetHeaderCellValueCommandTest.java
deleted file mode 100644
index cfeeea4..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetHeaderCellValueCommandTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.SortedMap;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LOWER_CASE_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE_ELEMENTS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class SetHeaderCellValueCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new SetHeaderCellValueCommand(GridWidget.SIMULATION, false, false));
-        scenarioSimulationContextLocal.getStatus().setRowIndex(ROW_INDEX);
-        scenarioSimulationContextLocal.getStatus().setColumnIndex(COLUMN_INDEX);
-        scenarioSimulationContextLocal.getStatus().setGridCellValue(MULTIPART_VALUE);
-    }
-
-    @Test
-    public void executeInstanceHeaderValid() throws Exception {
-        commonExecute(true, false, true);
-    }
-
-    @Test
-    public void executeInstanceHeaderInvalid() throws Exception {
-        commonExecute(true, false, false);
-    }
-
-    @Test
-    public void executePropertyHeaderValid() throws Exception {
-        commonExecute(false, true, true);
-    }
-
-    @Test
-    public void executePropertyHeaderInvalid() throws Exception {
-        commonExecute(false, true, false);
-    }
-
-    @Test
-    public void executeOtherHeader() throws Exception {
-        commonExecute(false, false, false);
-    }
-
-    @Test
-    public void validateInstanceHeader() throws Exception {
-        commonValidateInstanceHeader(false);
-        commonValidateInstanceHeader(true);
-    }
-
-    @Test
-    public void validatePropertyHeaderNoFactModelMapped() throws Exception {
-        commonValidatePropertyHeader(false, false);
-    }
-
-    @Test
-    public void validatePropertyHeaderFactModelMappedNoProperty() throws Exception {
-        commonValidatePropertyHeader(true, false);
-    }
-
-    @Test
-    public void validatePropertyHeaderFactModelMappedProperty() throws Exception {
-        commonValidatePropertyHeader(true, true);
-    }
-
-    @Test
-    public void recursivelyFindIsPropertyType() {
-        Map<String, FactModelTree.PropertyTypeName> bookSimpleProperties = new HashMap<>();
-        bookSimpleProperties.put("name", new FactModelTree.PropertyTypeName("String"));
-        Map<String, String> bookExpandableProperties = new HashMap<>();
-        bookExpandableProperties.put("author", "Author");
-        Map<String, FactModelTree.PropertyTypeName> authorSimpleProperties = new HashMap<>();
-        authorSimpleProperties.put("books", new FactModelTree.PropertyTypeName("List"));
-        Map<String, String> authorExpandableProperties = new HashMap<>();
-        FactModelTree bookFactModelTreeMock = getMockedFactModelTree(bookSimpleProperties, bookExpandableProperties);
-        FactModelTree authorFactModelTreeMock = getMockedFactModelTree(authorSimpleProperties, authorExpandableProperties);
-        when(dataObjectFieldsMapMock.get("Author")).thenReturn(authorFactModelTreeMock);
-        when(dataObjectFieldsMapMock.get("Book")).thenReturn(bookFactModelTreeMock);
-        assertFalse(((SetHeaderCellValueCommand) commandSpy).recursivelyFindIsPropertyType(scenarioSimulationContextLocal, bookFactModelTreeMock, Collections.singletonList("not-existing")));
-        assertTrue(((SetHeaderCellValueCommand) commandSpy).recursivelyFindIsPropertyType(scenarioSimulationContextLocal, bookFactModelTreeMock, Collections.singletonList("name")));
-        assertFalse(((SetHeaderCellValueCommand) commandSpy).recursivelyFindIsPropertyType(scenarioSimulationContextLocal, bookFactModelTreeMock, Arrays.asList("author", "not-existing")));
-        assertTrue(((SetHeaderCellValueCommand) commandSpy).recursivelyFindIsPropertyType(scenarioSimulationContextLocal, bookFactModelTreeMock, Arrays.asList("author", "books")));
-    }
-
-    private FactModelTree getMockedFactModelTree(Map<String, FactModelTree.PropertyTypeName> simpleProperties, Map<String, String> expandableProperties) {
-        FactModelTree toReturn = mock(FactModelTree.class);
-        when(toReturn.getSimpleProperties()).thenReturn(simpleProperties);
-        when(toReturn.getExpandableProperties()).thenReturn(expandableProperties);
-        return toReturn;
-    }
-
-    private void commonExecute(boolean isInstanceHeader, boolean isPropertyHeader, boolean isValid) throws Exception {
-        ((SetHeaderCellValueCommand) commandSpy).isInstanceHeader = isInstanceHeader;
-        ((SetHeaderCellValueCommand) commandSpy).isPropertyHeader = isPropertyHeader;
-        scenarioSimulationContextLocal.getStatus().setHeaderCellValue(MULTIPART_VALUE);
-        doNothing().when(((SetHeaderCellValueCommand) commandSpy)).validateInstanceHeader(eq(scenarioSimulationContextLocal), eq(MULTIPART_VALUE), eq(COLUMN_INDEX));
-        doNothing().when(((SetHeaderCellValueCommand) commandSpy)).validatePropertyHeader(eq(scenarioSimulationContextLocal), eq(MULTIPART_VALUE), eq(COLUMN_INDEX));
-        commandSpy.execute(scenarioSimulationContextLocal);
-        if (isInstanceHeader) {
-            verify(((SetHeaderCellValueCommand) commandSpy), times(1)).validateInstanceHeader(eq(scenarioSimulationContextLocal), eq(MULTIPART_VALUE), eq(COLUMN_INDEX));
-        } else if (isPropertyHeader) {
-            verify(((SetHeaderCellValueCommand) commandSpy), times(1)).validatePropertyHeader(eq(scenarioSimulationContextLocal), eq(MULTIPART_VALUE), eq(COLUMN_INDEX));
-        } else {
-            verify(((SetHeaderCellValueCommand) commandSpy), never()).validateInstanceHeader(eq(scenarioSimulationContextLocal), eq(MULTIPART_VALUE), eq(COLUMN_INDEX));
-            verify(((SetHeaderCellValueCommand) commandSpy), never()).validateInstanceHeader(eq(scenarioSimulationContextLocal), eq(MULTIPART_VALUE), eq(COLUMN_INDEX));
-        }
-        if (isValid) {
-            verify(scenarioGridModelMock, times(1)).updateHeader(eq(COLUMN_INDEX), eq(ROW_INDEX), eq(MULTIPART_VALUE));
-        }
-    }
-
-    private void commonValidateInstanceHeader(boolean isADataType) throws Exception {
-        doReturn(isADataType).when(dataObjectFieldsMapMock).containsKey(LOWER_CASE_VALUE);
-        doNothing().when(scenarioGridModelMock).validateInstanceHeaderUpdate(eq(LOWER_CASE_VALUE), eq(COLUMN_INDEX), eq(isADataType));
-        ((SetHeaderCellValueCommand) commandSpy).validateInstanceHeader(scenarioSimulationContextLocal, LOWER_CASE_VALUE, COLUMN_INDEX);
-        verify(dataObjectFieldsMapMock, times(1)).containsKey(eq(LOWER_CASE_VALUE));
-        verify(scenarioGridModelMock, times(1)).validateInstanceHeaderUpdate(eq(LOWER_CASE_VALUE), eq(COLUMN_INDEX), eq(isADataType));
-        reset(dataObjectFieldsMapMock);
-        reset(scenarioGridModelMock);
-    }
-
-    private void commonValidatePropertyHeader(boolean factModelPresent, boolean simplePropertyPresent) throws Exception {
-        FactModelTree factModelTreeMock = mock(FactModelTree.class);
-        doReturn(simplePropertyPresent).when((SetHeaderCellValueCommand) commandSpy).recursivelyFindIsPropertyType(eq(scenarioSimulationContextLocal), eq(factModelTreeMock), eq(MULTIPART_VALUE_ELEMENTS));
-        if (factModelPresent) {
-            Map<String, FactModelTree.PropertyTypeName> simplePropertiesMock = mock(SortedMap.class);
-            when(factModelTreeMock.getSimpleProperties()).thenReturn(simplePropertiesMock);
-            Map<String, String> expandablePropertiesMock = mock(SortedMap.class);
-            when(factModelTreeMock.getExpandableProperties()).thenReturn(expandablePropertiesMock);
-            when(dataObjectFieldsMapMock.get(anyString())).thenReturn(factModelTreeMock);
-            doReturn(simplePropertyPresent).when(simplePropertiesMock).containsKey(eq(MULTIPART_VALUE_ELEMENTS.get(0)));
-            doReturn(simplePropertyPresent).when(expandablePropertiesMock).containsKey(eq(MULTIPART_VALUE_ELEMENTS.get(0)));
-        } else {
-            when(dataObjectFieldsMapMock.get(anyString())).thenReturn(null);
-        }
-        boolean isPropertyType = factModelPresent && simplePropertyPresent;
-        doNothing().when(scenarioGridModelMock).validatePropertyHeaderUpdate(eq(MULTIPART_VALUE), eq(COLUMN_INDEX), eq(isPropertyType));
-        ((SetHeaderCellValueCommand) commandSpy).validatePropertyHeader(scenarioSimulationContextLocal, MULTIPART_VALUE, COLUMN_INDEX);
-        verify(simulationDescriptorMock, times(1)).getFactMappingByIndex(eq(COLUMN_INDEX));
-        verify(scenarioGridModelMock, times(1)).validatePropertyHeaderUpdate(eq(MULTIPART_VALUE), eq(COLUMN_INDEX), eq(isPropertyType));
-        reset(simulationDescriptorMock);
-        reset(scenarioGridModelMock);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetInstanceHeaderCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetInstanceHeaderCommandTest.java
deleted file mode 100644
index 6c059d4..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetInstanceHeaderCommandTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.List;
-import java.util.Optional;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PACKAGE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.VALUE_CLASS_NAME;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class SetInstanceHeaderCommandTest extends AbstractScenarioGridCommandTest {
-
-    @Mock
-    private List<GridColumn<?>> mockGridColumns;
-
-    @Before
-    public void setup() {
-        super.setup();
-        when(mockGridColumns.indexOf(gridColumnMock)).thenReturn(COLUMN_INDEX);
-        when(scenarioGridModelMock.getColumns()).thenReturn(mockGridColumns);
-        commandSpy = spy(new SetInstanceHeaderCommand(GridWidget.SIMULATION) {
-
-            @Override
-            protected ScenarioGridColumn getScenarioGridColumnLocal(String instanceTitle, String propertyTitle, String columnId, String columnGroup, FactMappingType factMappingType, ScenarioHeaderTextBoxSingletonDOMElementFactory factoryHeader, ScenarioCellTextAreaSingletonDOMElementFactory factoryCell, String placeHolder) {
-                return gridColumnMock;
-            }
-
-            @Override
-            protected Optional<FactIdentifier> getFactIdentifierByColumnTitle(String columnTitle, ScenarioSimulationContext context) {
-                return Optional.empty();
-            }
-        });
-    }
-
-    @Test
-    public void executeNoColumn() {
-        gridColumnMock = null;
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify((SetInstanceHeaderCommand) commandSpy, never()).executeIfSelectedColumn(scenarioSimulationContextLocal, gridColumnMock);
-    }
-
-    @Test
-    public void executeDMN() {
-        scenarioSimulationContextLocal.getStatus().setFullPackage(FULL_PACKAGE);
-        scenarioSimulationContextLocal.getStatus().setClassName(VALUE_CLASS_NAME);
-        settingsLocal.setType(ScenarioSimulationModel.Type.DMN);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(gridColumnMock, times(1)).setEditableHeaders(eq(false));
-        verify(gridColumnMock, atLeastOnce()).getInformationHeaderMetaData();
-        verify(informationHeaderMetaDataMock, times(1)).setTitle(eq(VALUE_CLASS_NAME));
-        verify(gridColumnMock, times(1)).setInstanceAssigned(eq(true));
-        verify(propertyHeaderMetaDataMock, times(1)).setReadOnly(eq(false));
-        verify(scenarioGridModelMock, times(1)).updateColumnInstance(eq(COLUMN_INDEX), eq(gridColumnMock));
-    }
-
-    @Test
-    public void executeRULE() {
-        scenarioSimulationContextLocal.getStatus().setFullPackage(FULL_PACKAGE);
-        scenarioSimulationContextLocal.getStatus().setClassName(VALUE_CLASS_NAME);
-        commandSpy.execute(scenarioSimulationContextLocal);
-        verify(gridColumnMock, times(1)).setEditableHeaders(eq(true));
-        verify(gridColumnMock, atLeastOnce()).getInformationHeaderMetaData();
-        verify(informationHeaderMetaDataMock, times(1)).setTitle(eq(VALUE_CLASS_NAME));
-        verify(gridColumnMock, times(1)).setInstanceAssigned(eq(true));
-        verify(propertyHeaderMetaDataMock, times(1)).setReadOnly(eq(false));
-        verify(scenarioGridModelMock, times(1)).updateColumnInstance(eq(COLUMN_INDEX), eq(gridColumnMock));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetPropertyHeaderCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetPropertyHeaderCommandTest.java
deleted file mode 100644
index 18ee725..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/SetPropertyHeaderCommandTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PACKAGE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE_ELEMENTS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.VALUE_CLASS_NAME;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class SetPropertyHeaderCommandTest extends AbstractSelectedColumnCommandTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        commandSpy = spy(new SetPropertyHeaderCommand(GridWidget.SIMULATION, FactMappingValueType.NOT_EXPRESSION) {
-
-            @Override
-            protected ScenarioGridColumn getScenarioGridColumnLocal(String instanceTitle, String propertyTitle, String columnId, String columnGroup,
-                                                                    FactMappingType factMappingType, ScenarioHeaderTextBoxSingletonDOMElementFactory factoryHeader,
-                                                                    ScenarioCellTextAreaSingletonDOMElementFactory factoryCell, String placeHolder) {
-                return gridColumnMock;
-            }
-        });
-    }
-
-    @Test
-    public void executeIfSelected() {
-        ((SetPropertyHeaderCommand) commandSpy).executeIfSelectedColumn(scenarioSimulationContextLocal, gridColumnMock);
-        verify((SetPropertyHeaderCommand) commandSpy, times(1)).setPropertyHeader(eq(scenarioSimulationContextLocal),
-                                                                                  eq(gridColumnMock),
-                                                                                  eq(FULL_PACKAGE + "." + CLASS_NAME),
-                                                                                  eq(MULTIPART_VALUE_ELEMENTS),
-                                                                                  eq(VALUE_CLASS_NAME));
-    }
-
-    @Test
-    @SuppressWarnings("squid:S2699")
-    public void getPropertyHeaderTitle() {
-        super.getPropertyHeaderTitle();
-    }
-
-    @Test
-    @SuppressWarnings("squid:S2699")
-    public void getPropertyHeaderType_Expression() {
-        super.getPropertyHeaderTitle_Expression();
-    }
-
-    @Test
-    @SuppressWarnings("squid:S2699")
-    public void getPropertyHeaderType_Value() {
-        super.getPropertyHeaderTitle_Value();
-    }
-
-    @Test
-    @SuppressWarnings("squid:S2699")
-    public void getMatchingExpressionAlias() {
-        super.getMatchingExpressionAlias();
-    }
-
-    @Test
-    @SuppressWarnings("squid:S2699")
-    public void navigateComplexObject() {
-        super.navigateComplexObject();
-    }
-
-    @Test
-    @SuppressWarnings("squid:S2699")
-    public void navigateComplexObject3Levels() {
-        super.navigateComplexObject3Levels();
-    }
-
-    @Test
-    @SuppressWarnings("squid:S2699")
-    public void manageCollectionProperty() {
-        super.manageCollectionProperty();
-    }
-
-    @Test
-    @SuppressWarnings("squid:S2699")
-    public void manageSimpleTypeCollectionProperty() {
-        super.manageSimpleTypeCollectionProperty();
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/UpdateSettingsDataCommandTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/UpdateSettingsDataCommandTest.java
deleted file mode 100644
index 119d8af..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/commands/actualcommands/UpdateSettingsDataCommandTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.commands.actualcommands;
-
-import java.util.Optional;
-import java.util.function.Consumer;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationViolation;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.command.client.CommandResult;
-import org.kie.workbench.common.command.client.CommandResultBuilder;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class UpdateSettingsDataCommandTest extends AbstractScenarioSimulationTest {
-
-    @Mock
-    private Consumer consumerMock;
-
-    protected UpdateSettingsDataCommand commandSpy;
-
-    @Before
-    public void setup() {
-        commandSpy = spy(new UpdateSettingsDataCommand(consumerMock, false));
-        super.setup();
-    }
-
-    @Test
-    public void setRestorableStatus() {
-        Settings clonedStatus = commandSpy.setRestorableStatusPreExecution(scenarioSimulationContextLocal);
-        assertNotNull(clonedStatus);
-    }
-
-    @Test
-    public void undoWithRestorable() {
-        commandSpy.restorableStatus = settingsLocal;
-        commandSpy.undo(scenarioSimulationContextLocal);
-        verify(commandSpy, times(1)).setCurrentContext(eq(scenarioSimulationContextLocal));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void undoWithoutRestorable() {
-        commandSpy.restorableStatus = null;
-        commandSpy.undo(scenarioSimulationContextLocal);
-    }
-
-    @Test
-    public void redoWithRestorable() {
-        commandSpy.restorableStatus = settingsLocal;
-        commandSpy.redo(scenarioSimulationContextLocal);
-        verify(commandSpy, times(1)).setCurrentContext(eq(scenarioSimulationContextLocal));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void redoWithoutRestorable() {
-        commandSpy.restorableStatus = null;
-        commandSpy.redo(scenarioSimulationContextLocal);
-    }
-
-    @Test
-    public void commonUndoRedoPreExecution() {
-        Optional<CommandResult<ScenarioSimulationViolation>> optional = commandSpy.commonUndoRedoPreExecution(scenarioSimulationContextLocal);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).expandSettingsDock();
-        assertEquals(CommandResultBuilder.SUCCESS, optional.get());
-    }
-
-    @Test
-    public void internalExecute() {
-        commandSpy.internalExecute(scenarioSimulationContextLocal);
-        verify(consumerMock, times(1)).accept(eq(settingsLocal));
-        verify(scenarioSimulationEditorPresenterMock, never()).getPopulateTestToolsCommand();
-        verify(scenarioSimulationEditorPresenterMock, never()).getUpdateDMNMetadataCommand();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).reloadSettingsDock();
-    }
-
-    @Test
-    public void internalExecuteDMNPathChanged() {
-        when(scenarioSimulationEditorPresenterMock.getPopulateTestToolsCommand()).thenReturn(() -> {});
-        when(scenarioSimulationEditorPresenterMock.getUpdateDMNMetadataCommand()).thenReturn(() -> {});
-        commandSpy = spy(new UpdateSettingsDataCommand(consumerMock, true));
-        commandSpy.internalExecute(scenarioSimulationContextLocal);
-        verify(consumerMock, times(1)).accept(eq(settingsLocal));
-        verify(scenarioSimulationEditorPresenterMock, times(1)).getPopulateTestToolsCommand();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).getUpdateDMNMetadataCommand();
-        verify(scenarioSimulationEditorPresenterMock, never()).reloadSettingsDock();
-    }
-
-    @Test
-    public void setCurrentContextNullStatus() {
-        commandSpy.restorableStatus = null;
-        CommandResult<ScenarioSimulationViolation> returned = commandSpy.setCurrentContext(scenarioSimulationContextLocal);
-        assertEquals(CommandResult.Type.ERROR, returned.getType());
-    }
-
-    @Test
-    public void setCurrentContext() {
-        commandSpy.restorableStatus = settingsLocal;
-        commandSpy.setCurrentContext(scenarioSimulationContextLocal);
-        verify(scenarioSimulationModelMock, times(1)).setSettings(eq(settingsLocal));
-        verify(scenarioSimulationEditorPresenterMock, times(1)).reloadSettingsDock();
-        verify(scenarioSimulationEditorPresenterMock, never()).getUpdateDMNMetadataCommand();
-        verify(scenarioSimulationEditorPresenterMock, never()).validateSimulation();
-        verify(commandSpy, times(1)).commonExecution(eq(scenarioSimulationContextLocal));
-        assertNotEquals(settingsLocal, commandSpy.restorableStatus);
-    }
-
-    @Test
-    public void setCurrentContextDMNPatchChanged() {
-        when(scenarioSimulationEditorPresenterMock.getPopulateTestToolsCommand()).thenReturn(() -> {});
-        commandSpy = spy(new UpdateSettingsDataCommand(consumerMock, true));
-        commandSpy.restorableStatus = settingsLocal;
-        commandSpy.setCurrentContext(scenarioSimulationContextLocal);
-        verify(scenarioSimulationModelMock, times(1)).setSettings(eq(settingsLocal));
-        verify(scenarioSimulationEditorPresenterMock, times(1)).getPopulateTestToolsCommand();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).validateSimulation();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).reloadSettingsDock();
-        verify(commandSpy, times(1)).commonExecution(eq(scenarioSimulationContextLocal));
-        assertNotEquals(settingsLocal, commandSpy.restorableStatus);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/domelements/CollectionEditorDOMElementTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/domelements/CollectionEditorDOMElementTest.java
deleted file mode 100644
index 60ad05b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/domelements/CollectionEditorDOMElementTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.domelements;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.user.client.ui.AbsolutePanel;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.CollectionViewImpl;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetGridCellValueEvent;
-import org.drools.workbench.screens.scenariosimulation.client.factories.AbstractFactoriesTest;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridCellValue;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class CollectionEditorDOMElementTest extends AbstractFactoriesTest {
-
-    private final static String WIDGET_VALUE = "WIDGET VALUE";
-
-    private final static int TAB_INDEX = 1;
-
-    @Mock
-    private ScenarioGridCell scenarioGridCellMock;
-
-    @Mock
-    private CollectionViewImpl widgetMock;
-
-    @Mock
-    private GridCellValue gridCellValueMock;
-
-    private CollectionEditorDOMElement collectionEditorDOMElementSpy;
-
-    @Before
-    public void setup() {
-        super.setup();
-        when(elementMock.getStyle()).thenReturn(styleMock);
-        when(widgetMock.getElement()).thenReturn(elementMock);
-        when(widgetMock.getValue()).thenReturn(WIDGET_VALUE);
-        when(widgetMock.getTabIndex()).thenReturn(TAB_INDEX);
-        when(scenarioGridLayerMock.getDomElementContainer()).thenReturn(new AbsolutePanel());
-        when(scenarioGridCellMock.getValue()).thenReturn(gridCellValueMock);
-        collectionEditorDOMElementSpy = spy(new CollectionEditorDOMElement(widgetMock, scenarioGridLayerMock, scenarioGridMock) {
-            {
-                this.context = contextMock;
-                this.scenarioGridCell = scenarioGridCellMock;
-            }
-        });
-    }
-
-    @Test
-    public void getValue() {
-        assertEquals(WIDGET_VALUE, collectionEditorDOMElementSpy.getValue());
-    }
-
-    @Test
-    public void setValue() {
-        final String newValue = "New Value";
-        collectionEditorDOMElementSpy.setValue(newValue);
-        verify(widgetMock, times(1)).setValue(eq(newValue));
-    }
-
-    @Test
-    public void getTabIndex() {
-        assertEquals(TAB_INDEX, collectionEditorDOMElementSpy.getTabIndex());
-    }
-
-    @Test
-    public void setTabIndex() {
-        final int newIndex = 2;
-        collectionEditorDOMElementSpy.setTabIndex(newIndex);
-        verify(widgetMock, times(1)).setTabIndex(eq(newIndex));
-    }
-
-    @Test
-    public void setAccessKey() {
-        final char newAccessKey = 'i';
-        collectionEditorDOMElementSpy.setAccessKey(newAccessKey);
-        verify(widgetMock, times(1)).setAccessKey(eq(newAccessKey));
-    }
-
-    @Test
-    public void setFocus() {
-        collectionEditorDOMElementSpy.setFocus(true);
-        verify(widgetMock, times(1)).setFocus(eq(true));
-        reset(widgetMock);
-        collectionEditorDOMElementSpy.setFocus(false);
-        verify(widgetMock, times(1)).setFocus(eq(false));
-    }
-
-    @Test
-    public void flushNullGridCell() {
-        collectionEditorDOMElementSpy.scenarioGridCell = null;
-        final String newValue = "New Value";
-        collectionEditorDOMElementSpy.flush(newValue);
-        verify(scenarioGridCellMock, never()).setEditingMode(anyBoolean());
-        verify(scenarioGridCellMock, never()).getValue();
-        verify(collectionEditorDOMElementSpy, times(1)).internalFlush(eq(newValue));
-    }
-
-    @Test
-    public void flushNotNullGridCell() {
-        final String newValue = "New Value";
-        collectionEditorDOMElementSpy.flush(newValue);
-        verify(scenarioGridCellMock, times(1)).setEditingMode(anyBoolean());
-        verify(scenarioGridCellMock, times(1)).getValue();
-        verify(collectionEditorDOMElementSpy, times(1)).internalFlush(eq(newValue));
-
-    }
-
-    @Test
-    public void internalFlush() {
-        final String newValue = "New Value";
-        collectionEditorDOMElementSpy.internalFlush(newValue);
-        verify(eventBusMock, times(1)).fireEvent(isA(SetGridCellValueEvent.class));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/domelements/ScenarioCellTextAreaDOMElementTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/domelements/ScenarioCellTextAreaDOMElementTest.java
deleted file mode 100644
index 501ae2d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/domelements/ScenarioCellTextAreaDOMElementTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.domelements;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.user.client.Element;
-import com.google.gwt.user.client.ui.AbsolutePanel;
-import com.google.gwt.user.client.ui.SimplePanel;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetGridCellValueEvent;
-import org.drools.workbench.screens.scenariosimulation.client.factories.AbstractFactoriesTest;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridCellValue;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioCellTextAreaDOMElementTest extends AbstractFactoriesTest {
-
-    @Mock
-    private ScenarioGridCell scenarioGridCellMock;
-    @Mock
-    private GridCellValue gridCellValueMock;
-    @Mock
-    private Element elementMock;
-    @Mock
-    private Style styleMock;
-    @Mock
-    private SimplePanel simplePanelMock;
-
-    private ScenarioCellTextAreaDOMElement scenarioCellTextAreaDOMElementSpy;
-
-    @Before
-    public void setup() {
-        super.setup();
-        when(scenarioGridLayerMock.getDomElementContainer()).thenReturn(new AbsolutePanel());
-        when(scenarioGridCellMock.getValue()).thenReturn(gridCellValueMock);
-        when(textAreaMock.getElement()).thenReturn(elementMock);
-        when(elementMock.getStyle()).thenReturn(styleMock);
-        scenarioCellTextAreaDOMElementSpy = spy(new ScenarioCellTextAreaDOMElement(textAreaMock, scenarioGridLayerMock, scenarioGridMock) {
-            {
-                this.context = contextMock;
-                this.scenarioGridCell = scenarioGridCellMock;
-            }
-
-            @Override
-            protected SimplePanel getContainer() {
-                return simplePanelMock;
-            }
-        });
-    }
-
-    @Test
-    public void init() {
-        verify(styleMock, times(1)).setWidth(100, Style.Unit.PCT);
-        verify(styleMock, times(1)).setHeight(100, Style.Unit.PCT);
-        verify(styleMock, times(1)).setFontSize(12, Style.Unit.PX);
-        verify(styleMock, times(1)).setProperty("resize", "none");
-
-        verify(simplePanelMock, times(1)).setWidget(eq(textAreaMock));
-    }
-
-    @Test
-    public void flushSameValue() {
-        when(gridCellValueMock.getValue()).thenReturn(MULTIPART_VALUE);
-        scenarioCellTextAreaDOMElementSpy.flush(MULTIPART_VALUE);
-        verify(scenarioGridCellMock, times(1)).setEditingMode(eq(false));
-        verify(scenarioCellTextAreaDOMElementSpy, never()).internalFlush(anyString());
-    }
-
-    @Test
-    public void flushDifferentValue() {
-        when(gridCellValueMock.getValue()).thenReturn(TEST);
-        scenarioCellTextAreaDOMElementSpy.flush(MULTIPART_VALUE);
-        verify(scenarioGridCellMock, times(1)).setEditingMode(eq(false));
-        verify(scenarioCellTextAreaDOMElementSpy, times(1)).internalFlush(eq(MULTIPART_VALUE));
-    }
-
-    @Test
-    public void flushNullString() {
-        when(gridCellValueMock.getValue()).thenReturn("");
-        scenarioCellTextAreaDOMElementSpy.flush(null);
-        verify(scenarioGridCellMock, times(1)).setEditingMode(eq(false));
-        verify(scenarioCellTextAreaDOMElementSpy, times(1)).internalFlush(eq(null));
-    }
-
-    @Test
-    public void flushEmptyStringToNullConversion() {
-        when(gridCellValueMock.getValue()).thenReturn("");
-        scenarioCellTextAreaDOMElementSpy.flush("");
-        verify(scenarioGridCellMock, times(1)).setEditingMode(eq(false));
-        // empty strings are converted to null during flush
-        verify(scenarioCellTextAreaDOMElementSpy, times(1)).internalFlush(eq(null));
-    }
-
-    @Test
-    public void internalFlush() {
-        scenarioCellTextAreaDOMElementSpy.internalFlush(MULTIPART_VALUE);
-        verify(eventBusMock, times(1)).fireEvent(isA(SetGridCellValueEvent.class));
-    }
-
-    @Test
-    public void testDetachCancelEditMode() {
-        scenarioCellTextAreaDOMElementSpy.detach();
-
-        verify(scenarioGridCellMock).setEditingMode(false);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/domelements/ScenarioHeaderTextAreaDOMElementTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/domelements/ScenarioHeaderTextAreaDOMElementTest.java
deleted file mode 100644
index 60e17b2..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/domelements/ScenarioHeaderTextAreaDOMElementTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.domelements;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.user.client.ui.AbsolutePanel;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioNotificationEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetHeaderCellValueEvent;
-import org.drools.workbench.screens.scenariosimulation.client.factories.AbstractFactoriesTest;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioHeaderTextAreaDOMElementTest extends AbstractFactoriesTest {
-
-    private ScenarioHeaderTextAreaDOMElement scenarioHeaderTextAreaDOMElement;
-
-    @Mock
-    private ScenarioHeaderMetaData scenarioHeaderMetaDataMock;
-    @Mock
-    private ScenarioGridCell scenarioGridCellMock;
-
-    @Before
-    public void setup() {
-        super.setup();
-        when(scenarioGridLayerMock.getDomElementContainer()).thenReturn(new AbsolutePanel());
-        scenarioHeaderTextAreaDOMElement = spy(new ScenarioHeaderTextAreaDOMElement(textAreaMock, scenarioGridLayerMock, scenarioGridMock) {
-            {
-                this.context = contextMock;
-                this.scenarioGridCell = scenarioGridCellMock;
-            }
-        });
-    }
-
-    @Test
-    public void flushMetadataEqualsValue() {
-        when(scenarioHeaderMetaDataMock.getTitle()).thenReturn(MULTIPART_VALUE);
-        scenarioHeaderTextAreaDOMElement.setScenarioHeaderMetaData(scenarioHeaderMetaDataMock);
-        scenarioHeaderTextAreaDOMElement.flush(MULTIPART_VALUE);
-        verify(scenarioHeaderTextAreaDOMElement, never()).internalFlush(eq(MULTIPART_VALUE));
-    }
-
-    @Test
-    public void flushMetadataNotEqualsValue() {
-        when(scenarioHeaderMetaDataMock.getTitle()).thenReturn("NOT_VALUE");
-        scenarioHeaderTextAreaDOMElement.setScenarioHeaderMetaData(scenarioHeaderMetaDataMock);
-        scenarioHeaderTextAreaDOMElement.flush(MULTIPART_VALUE);
-        verify(scenarioHeaderTextAreaDOMElement, times(1)).internalFlush(eq(MULTIPART_VALUE));
-    }
-
-    @Test
-    public void flushNullString() {
-        scenarioHeaderTextAreaDOMElement.flush(null);
-        verify(eventBusMock, times(1)).fireEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioHeaderTextAreaDOMElement, never()).internalFlush(any());
-    }
-
-    @Test
-    public void flushEmptyString() {
-        scenarioHeaderTextAreaDOMElement.flush("");
-        verify(eventBusMock, times(1)).fireEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioHeaderTextAreaDOMElement, never()).internalFlush(any());
-    }
-
-    @Test
-    public void flushEmptyStringMultipleSpaces() {
-        scenarioHeaderTextAreaDOMElement.flush("            ");
-        verify(eventBusMock, times(1)).fireEvent(isA(ScenarioNotificationEvent.class));
-        verify(scenarioHeaderTextAreaDOMElement, never()).internalFlush(any());
-    }
-
-    @Test
-    public void flushNullMetadata() {
-        scenarioHeaderTextAreaDOMElement.setScenarioHeaderMetaData(null);
-        scenarioHeaderTextAreaDOMElement.flush(MULTIPART_VALUE);
-        verify(scenarioHeaderTextAreaDOMElement, times(1)).internalFlush(eq(MULTIPART_VALUE));
-    }
-
-    @Test
-    public void internalFlushInvalidHeader() {
-        scenarioHeaderTextAreaDOMElement.internalFlush(MULTIPART_VALUE);
-        verify(scenarioGridModelMock, never()).updateHeader(eq(COLUMN_INDEX), eq(ROW_INDEX), eq(MULTIPART_VALUE));
-    }
-
-    @Test
-    public void internalFlushValidHeader() {
-        scenarioHeaderTextAreaDOMElement.internalFlush(MULTIPART_VALUE);
-        verify(eventBusMock, times(1)).fireEvent(isA(SetHeaderCellValueEvent.class));
-    }
-
-    @Test
-    public void testDetachCancelEditMode() {
-        scenarioHeaderTextAreaDOMElement.setScenarioHeaderMetaData(scenarioHeaderMetaDataMock);
-        scenarioHeaderTextAreaDOMElement.detach();
-
-        verify(scenarioGridCellMock).setEditingMode(false);
-        verify(scenarioHeaderMetaDataMock).setEditingMode(false);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/AbstractScenarioSimulationDropdownTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/AbstractScenarioSimulationDropdownTest.java
deleted file mode 100644
index f95b804..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/AbstractScenarioSimulationDropdownTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.dropdown;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import elemental2.dom.HTMLElement;
-import org.junit.Test;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdown;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownView;
-import org.mockito.Mock;
-import org.uberfire.mvp.Command;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DEFAULT_VALUE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractScenarioSimulationDropdownTest {
-
-    protected static final int ITEM_NUMBER = 3;
-
-    @Mock
-    protected KieAssetsDropdownItem kieAssetsDropdownItemMock;
-
-    @Mock
-    protected ScenarioSimulationAssetsDropdownProvider dataProviderMock;
-
-    @Mock
-    protected Command onValueChangeHandlerMock;
-
-    @Mock
-    protected HTMLElement htmlElementMock;
-
-    protected List<KieAssetsDropdownItem> assetList = IntStream.range(0, ITEM_NUMBER)
-            .mapToObj(i -> new KieAssetsDropdownItem("File_" + i + ".txt", "", DEFAULT_VALUE, new HashMap<>()))
-            .collect(Collectors.toList());
-    protected KieAssetsDropdown assetsDropdown;
-    protected KieAssetsDropdownView viewMock;
-
-    public void setup() {
-        when(viewMock.getElement()).thenReturn(htmlElementMock);
-        when(viewMock.getValue()).thenReturn(DEFAULT_VALUE);
-    }
-
-    @Test
-    public void init() {
-        assetsDropdown.init();
-        verify(viewMock, times(1)).init(eq(assetsDropdown));
-    }
-
-    @Test
-    public void loadAssets() {
-        assetsDropdown.loadAssets();
-        verify(assetsDropdown, times(1)).clear();
-        verify(assetsDropdown, times(1)).initializeDropdown();
-    }
-
-    @Test
-    public void initialize() {
-        assetsDropdown.initialize();
-        verify(viewMock, times(1)).refreshSelectPicker();
-    }
-
-    @Test
-    public void clear() {
-        assetsDropdown.clear();
-        verify(viewMock, times(1)).clear();
-    }
-
-    @Test
-    public void getElement() {
-        final HTMLElement retrieved = assetsDropdown.getElement();
-        verify(viewMock, times(1)).getElement();
-        assertEquals(htmlElementMock, retrieved);
-    }
-
-    @Test
-    public void getValue() {
-        when(viewMock.getValue()).thenReturn(DEFAULT_VALUE);
-        Optional<KieAssetsDropdownItem> retrieved = assetsDropdown.getValue();
-        assertNotNull(retrieved);
-        assertTrue(retrieved.isPresent());
-        verify(viewMock, times(1)).getValue();
-        reset(viewMock);
-        when(viewMock.getValue()).thenReturn("UNKNOWN");
-        retrieved = assetsDropdown.getValue();
-        assertNotNull(retrieved);
-        assertFalse(retrieved.isPresent());
-    }
-
-    @Test
-    public void onValueChanged() {
-        assetsDropdown.onValueChanged();
-        verify(onValueChangeHandlerMock, times(1)).execute();
-    }
-
-    @Test
-    public void initializeDropdown() {
-        assetsDropdown.initializeDropdown();
-        verify(dataProviderMock, times(1)).getItems(isA(Consumer.class));
-    }
-
-    @Test
-    public void addValue() {
-        assetsDropdown.addValue(kieAssetsDropdownItemMock);
-        verify(viewMock, times(1)).addValue(eq(kieAssetsDropdownItemMock));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/AbstractScenarioSimulationDropdownViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/AbstractScenarioSimulationDropdownViewTest.java
deleted file mode 100644
index bb7d579..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/AbstractScenarioSimulationDropdownViewTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.dropdown;
-
-import elemental2.dom.DOMTokenList;
-import elemental2.dom.HTMLOptionElement;
-import elemental2.dom.HTMLSelectElement;
-import org.jboss.errai.ui.client.local.spi.TranslationService;
-import org.junit.Test;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownView;
-import org.mockito.Mock;
-import org.uberfire.client.views.pfly.selectpicker.JQuerySelectPicker;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DEFAULT_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.KIEASSETSDROPDOWNVIEW_SELECT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.kie.workbench.common.widgets.client.resources.i18n.KieWorkbenchWidgetsConstants.KieAssetsDropdownView_Select;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractScenarioSimulationDropdownViewTest {
-
-    @Mock
-    protected HTMLSelectElement nativeSelectMock;
-
-    @Mock
-    protected DOMTokenList nativeSelectClassListMock;
-
-    @Mock
-    protected HTMLOptionElement htmlOptionElementMock;
-
-    @Mock
-    protected HTMLOptionElement htmlOptionElementClonedMock;
-
-    @Mock
-    protected TranslationService translationServiceMock;
-
-    @Mock
-    protected ScenarioSimulationDropdown presenterMock;
-
-    @Mock
-    protected JQuerySelectPicker dropdownMock;
-
-    @Mock
-    protected JQuerySelectPicker.CallbackFunction onDropdownChangeHandlerMock;
-
-    @Mock
-    protected KieAssetsDropdownItem kieAssetsDropdownItemMock;
-
-    protected KieAssetsDropdownView assetsDropdownView;
-
-    protected void setup() {
-        nativeSelectMock.classList = nativeSelectClassListMock;
-        when(htmlOptionElementMock.cloneNode(eq(false))).thenReturn(htmlOptionElementClonedMock);
-        when(translationServiceMock.format(eq(KieAssetsDropdownView_Select))).thenReturn(KIEASSETSDROPDOWNVIEW_SELECT);
-        doReturn(DEFAULT_VALUE).when(dropdownMock).val();
-    }
-
-    @Test
-    public void init() {
-        assetsDropdownView.init();
-        assertFalse(nativeSelectMock.hidden);
-        verify(dropdownMock, times(1)).on(eq("hidden.bs.select"), eq(onDropdownChangeHandlerMock));
-    }
-
-    @Test
-    public void addValue() {
-        assetsDropdownView.addValue(kieAssetsDropdownItemMock);
-        verify(nativeSelectMock, times(1)).appendChild(isA(HTMLOptionElement.class));
-    }
-
-    @Test
-    public void initialize() {
-        assetsDropdownView.initialize();
-        verify(dropdownMock, times(1)).selectpicker(eq("val"), eq(""));
-    }
-
-    @Test
-    public void refreshSelectPicker() {
-        assetsDropdownView.refreshSelectPicker();
-        verify(dropdownMock, times(1)).selectpicker(eq("refresh"));
-    }
-
-    @Test
-    public void getValue() {
-        final String retrieved = assetsDropdownView.getValue();
-        assertEquals(DEFAULT_VALUE, retrieved);
-        verify(dropdownMock, times(1)).val();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationDropdownTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationDropdownTest.java
deleted file mode 100644
index 741eb9e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationDropdownTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.dropdown;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationDropdownTest extends AbstractScenarioSimulationDropdownTest {
-
-    @Before
-    public void setup() {
-        viewMock = mock(ScenarioSimulationDropdownView.class);
-        assetsDropdown = spy(new ScenarioSimulationDropdown((ScenarioSimulationDropdownView) viewMock, dataProviderMock) {
-            {
-                onValueChangeHandler = onValueChangeHandlerMock;
-                this.kieAssets.addAll(assetList);
-            }
-        });
-        super.setup();
-    }
-
-    @Test
-    public void asWidget() {
-        ((ScenarioSimulationDropdown) assetsDropdown).asWidget();
-        verify(((ScenarioSimulationDropdownView) viewMock), times(1)).asWidget();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationDropdownViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationDropdownViewTest.java
deleted file mode 100644
index ba441e5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/ScenarioSimulationDropdownViewTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.dropdown;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.uberfire.client.views.pfly.selectpicker.JQuerySelectPicker;
-
-import static org.mockito.Mockito.spy;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationDropdownViewTest extends AbstractScenarioSimulationDropdownViewTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        assetsDropdownView = spy(new ScenarioSimulationDropdownView(nativeSelectMock,
-                                                                    htmlOptionElementMock,
-                                                                    translationServiceMock) {
-            {
-                this.presenter = presenterMock;
-            }
-
-            @Override
-            protected JQuerySelectPicker dropdown() {
-                return dropdownMock;
-            }
-
-            @Override
-            protected JQuerySelectPicker.CallbackFunction getOnDropdownChangeHandler() {
-                return onDropdownChangeHandlerMock;
-            }
-
-        });
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/SettingsScenarioSimulationDropdownTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/SettingsScenarioSimulationDropdownTest.java
deleted file mode 100644
index d0809cd..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/SettingsScenarioSimulationDropdownTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.dropdown;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.mockito.Mock;
-import org.uberfire.mvp.Command;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DEFAULT_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LOWER_CASE_VALUE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class SettingsScenarioSimulationDropdownTest extends AbstractScenarioSimulationDropdownTest {
-
-    @Mock
-    protected Command onMissingValueHandlerMock;
-
-    @Before
-    public void setup() {
-        viewMock = mock(SettingsScenarioSimulationDropdownView.class);
-        assetsDropdown = spy(new SettingsScenarioSimulationDropdown((SettingsScenarioSimulationDropdownView) viewMock, dataProviderMock) {
-            {
-                onValueChangeHandler = onValueChangeHandlerMock;
-                onMissingValueHandler = onMissingValueHandlerMock;
-                kieAssets.addAll(assetList);
-                currentValue = DEFAULT_VALUE;
-            }
-        });
-        super.setup();
-    }
-
-    @Test
-    public void asWidget() {
-        ((SettingsScenarioSimulationDropdown) assetsDropdown).asWidget();
-        verify(((SettingsScenarioSimulationDropdownView) viewMock), times(1)).asWidget();
-    }
-
-    @Test
-    public void loadAssets() {
-        ((SettingsScenarioSimulationDropdown) assetsDropdown).loadAssets(LOWER_CASE_VALUE);
-        /* Can't directly call super.loadAssets() method, so here it verifies clear() and
-           initialize() method which represents the body of super.loadAssets() method   */
-        verify(assetsDropdown, times(1)).clear();
-        verify(assetsDropdown, times(1)).initializeDropdown();
-        assertEquals(LOWER_CASE_VALUE, ((SettingsScenarioSimulationDropdown) assetsDropdown).currentValue);
-    }
-
-    @Test
-    public void loadAssetsSameValue() {
-        when(viewMock.getValue()).thenReturn(DEFAULT_VALUE);
-        ((SettingsScenarioSimulationDropdown) assetsDropdown).loadAssets(DEFAULT_VALUE);
-        /* Can't directly call super.loadAssets() method, so here it verifies clear() and
-           initialize() method which represents the body of super.loadAssets() method   */
-        verify(assetsDropdown, never()).clear();
-        verify(assetsDropdown, never()).initializeDropdown();
-    }
-
-    @Test
-    public void loadAssetsEmptyValue() {
-        when(viewMock.getValue()).thenReturn(null);
-        ((SettingsScenarioSimulationDropdown) assetsDropdown).loadAssets(DEFAULT_VALUE);
-        /* Can't directly call super.loadAssets() method, so here it verifies clear() and
-           initialize() method which represents the body of super.loadAssets() method   */
-        verify(assetsDropdown, times(1)).clear();
-        verify(assetsDropdown, times(1)).initializeDropdown();
-        assertEquals(DEFAULT_VALUE, ((SettingsScenarioSimulationDropdown) assetsDropdown).currentValue);
-    }
-
-    @Test
-    public void assetListConsumerMethod_Present() {
-        ((SettingsScenarioSimulationDropdown) assetsDropdown).assetListConsumerMethod(assetList);
-        verify(assetsDropdown, times(ITEM_NUMBER)).addValue(isA(KieAssetsDropdownItem.class));
-        verify(viewMock, times(1)).refreshSelectPicker();
-        verify(((SettingsScenarioSimulationDropdown) assetsDropdown), times(1)).isValuePresentInKieAssets(eq(DEFAULT_VALUE));
-        verify(((SettingsScenarioSimulationDropdownView) viewMock)).initialize(eq(DEFAULT_VALUE));
-        verify(onMissingValueHandlerMock, never()).execute();
-        assertNull(((SettingsScenarioSimulationDropdown) assetsDropdown).currentValue);
-    }
-
-    @Test
-    public void assetListConsumerMethod_NotPresent() {
-        ((SettingsScenarioSimulationDropdown) assetsDropdown).currentValue = LOWER_CASE_VALUE;
-        ((SettingsScenarioSimulationDropdown) assetsDropdown).assetListConsumerMethod(assetList);
-        verify(assetsDropdown, times(ITEM_NUMBER)).addValue(isA(KieAssetsDropdownItem.class));
-        verify(viewMock, times(1)).refreshSelectPicker();
-        verify(((SettingsScenarioSimulationDropdown) assetsDropdown), times(1)).isValuePresentInKieAssets(eq(LOWER_CASE_VALUE));
-        verify(((SettingsScenarioSimulationDropdownView) viewMock), times(1)).initialize();
-        verify(onMissingValueHandlerMock, times(1)).execute();
-        assertNull(((SettingsScenarioSimulationDropdown) assetsDropdown).currentValue);
-    }
-
-    @Test
-    public void isValuePresentInKieAssets_Present() {
-        assertTrue(((SettingsScenarioSimulationDropdown) assetsDropdown).isValuePresentInKieAssets(DEFAULT_VALUE));
-    }
-
-    @Test
-    public void isValuePresentInKieAssets_NotPresent() {
-        assertFalse(((SettingsScenarioSimulationDropdown) assetsDropdown).isValuePresentInKieAssets("ANOTHER_VALUE"));
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/SettingsScenarioSimulationDropdownViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/SettingsScenarioSimulationDropdownViewTest.java
deleted file mode 100644
index eb416d4..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/dropdown/SettingsScenarioSimulationDropdownViewTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.dropdown;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.uberfire.client.views.pfly.selectpicker.JQuerySelectPicker;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DEFAULT_VALUE;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class SettingsScenarioSimulationDropdownViewTest extends AbstractScenarioSimulationDropdownViewTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-        assetsDropdownView = spy(new SettingsScenarioSimulationDropdownView(nativeSelectMock,
-                                                                    htmlOptionElementMock,
-                                                                    translationServiceMock) {
-            {
-                this.presenter = presenterMock;
-            }
-
-            @Override
-            protected JQuerySelectPicker dropdown() {
-                return dropdownMock;
-            }
-
-            @Override
-            protected JQuerySelectPicker.CallbackFunction getOnDropdownChangeHandler() {
-                return onDropdownChangeHandlerMock;
-            }
-
-        });
-    }
-
-    @Test
-    public void initialize() {
-        ((SettingsScenarioSimulationDropdownView) assetsDropdownView).initialize(DEFAULT_VALUE);
-        verify(dropdownMock, times(1)).selectpicker(eq("val"), eq(DEFAULT_VALUE));
-        verify(dropdownMock, times(1)).selectpicker(eq("show"));
-    }
-
-    @Test
-    public void clear() {
-        assetsDropdownView.clear();
-        verify(assetsDropdownView, times(1)).refreshSelectPicker();
-        verify(nativeSelectMock, never()).appendChild(any());
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/AbstractScenarioSimulationEditorTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/AbstractScenarioSimulationEditorTest.java
deleted file mode 100644
index 3f43c2e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/AbstractScenarioSimulationEditorTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor;
-
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.Scenario;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.BaseMenuView;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.GridContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.HeaderGivenContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.CheatSheetPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsPresenter;
-import org.drools.workbench.screens.scenariosimulation.service.DMNTypeService;
-import org.mockito.Mock;
-import org.uberfire.backend.vfs.ObservablePath;
-
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractScenarioSimulationEditorTest extends AbstractScenarioSimulationTest {
-
-    protected static final String SCENARIO_PACKAGE = "scenario.package";
-
-    @Mock
-    protected DMNTypeService dmnTypeServiceMock;
-    @Mock
-    protected ObservablePath observablePathMock;
-    @Mock
-    protected GridContextMenu gridContextMenuMock;
-    @Mock
-    protected HeaderGivenContextMenu headerGivenContextMenuMock;
-    @Mock
-    protected BaseMenuView gridContextMenuViewMock;
-    @Mock
-    protected BaseMenuView headerContextMenuViewMock;
-    @Mock
-    protected TestToolsPresenter testToolsPresenterMock;
-    @Mock
-    protected CheatSheetPresenter cheatSheetPresenterMock;
-    @Mock
-    protected SettingsPresenter settingsPresenterMock;
-
-    protected ScenarioSimulationModel modelLocal;
-
-    public void setup() {
-        super.setup();
-        when(gridContextMenuMock.getView()).thenReturn(gridContextMenuViewMock);
-        when(headerGivenContextMenuMock.getView()).thenReturn(headerContextMenuViewMock);
-        this.modelLocal = new ScenarioSimulationModel();
-        modelLocal.setSimulation(getSimulation());
-        modelLocal.setSettings(settingsLocal);
-        settingsLocal.setType(ScenarioSimulationModel.Type.RULE);
-        settingsLocal.setDmoSession(null);
-        modelLocal.setBackground(backgroundLocal);
-    }
-
-    protected Simulation getSimulation() {
-        Simulation toReturn = new Simulation();
-        ScesimModelDescriptor simulationDescriptor = toReturn.getScesimModelDescriptor();
-        simulationDescriptor.addFactMapping(FactIdentifier.INDEX.getName(), FactIdentifier.INDEX, ExpressionIdentifier.INDEX);
-        simulationDescriptor.addFactMapping(FactIdentifier.DESCRIPTION.getName(), FactIdentifier.DESCRIPTION, ExpressionIdentifier.DESCRIPTION);
-
-        Scenario scenario = toReturn.addData();
-        int row = toReturn.getUnmodifiableData().indexOf(scenario);
-        scenario.setDescription(null);
-
-        // Add GIVEN Fact
-        int id = 1;
-        ExpressionIdentifier givenExpression = ExpressionIdentifier.create(row + "|" + id, FactMappingType.GIVEN);
-        final FactMapping givenFactMapping = simulationDescriptor.addFactMapping(FactMapping.getInstancePlaceHolder(id), FactIdentifier.EMPTY, givenExpression);
-        givenFactMapping.setExpressionAlias(FactMapping.getPropertyPlaceHolder(id));
-        scenario.addMappingValue(FactIdentifier.EMPTY, givenExpression, null);
-
-        // Add EXPECT Fact
-        id = 2;
-        ExpressionIdentifier expectedExpression = ExpressionIdentifier.create(row + "|" + id, FactMappingType.EXPECT);
-        final FactMapping expectedFactMapping = simulationDescriptor.addFactMapping(FactMapping.getInstancePlaceHolder(id), FactIdentifier.EMPTY, expectedExpression);
-        expectedFactMapping.setExpressionAlias(FactMapping.getPropertyPlaceHolder(id));
-        scenario.addMappingValue(FactIdentifier.EMPTY, expectedExpression, null);
-        return toReturn;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationEditorPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationEditorPresenterTest.java
deleted file mode 100644
index 615409d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationEditorPresenterTest.java
+++ /dev/null
@@ -1,657 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Supplier;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.BackgroundData;
-import org.drools.scenariosimulation.api.model.BackgroundDataWithIndex;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValue;
-import org.drools.scenariosimulation.api.model.Scenario;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScenarioWithIndex;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.scenariosimulation.api.model.SimulationRunMetadata;
-import org.drools.workbench.screens.scenariosimulation.client.editor.strategies.DataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.ImportEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.RedoEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioNotificationEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.UndoEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.AbstractScenarioSimulationDocksHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationHasBusyIndicatorDefaultErrorCallback;
-import org.drools.workbench.screens.scenariosimulation.client.popup.ConfirmPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.producers.AbstractScenarioSimulationProducer;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.CheatSheetPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.drools.workbench.screens.scenariosimulation.client.type.ScenarioSimulationResourceType;
-import org.drools.workbench.screens.scenariosimulation.model.FactMappingValidationError;
-import org.drools.workbench.screens.scenariosimulation.model.SimulationRunResult;
-import org.drools.workbench.screens.scenariosimulation.utils.ScenarioSimulationI18nServerMessage;
-import org.guvnor.common.services.shared.test.TestResultMessage;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.uberfire.backend.vfs.ObservablePath;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.client.workbench.docks.UberfireDock;
-import org.uberfire.client.workbench.docks.UberfireDocksInteractionEvent;
-import org.uberfire.ext.editor.commons.client.file.exports.TextFileExport;
-import org.uberfire.workbench.events.NotificationEvent;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LOWER_CASE_VALUE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.contains;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.ArgumentMatchers.same;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationEditorPresenterTest extends AbstractScenarioSimulationEditorTest {
-
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
-    @Mock
-    private ScenarioSimulationEditorWrapper scenarioSimulationEditorWrapperMock;
-    @Mock
-    private ScenarioSimulationView scenarioSimulationViewMock;
-    @Mock
-    private AbstractScenarioSimulationProducer abstractScenarioSimulationProducerMock;
-    @Mock
-    private TestToolsView testToolsViewMock;
-    @Mock
-    private ObservablePath pathMock;
-    @Mock
-    private AbstractScenarioSimulationDocksHandler abstractScenarioSimulationDocksHandlerMock;
-    @Mock
-    private DataManagementStrategy dataManagementStrategyMock;
-    @Mock
-    private TextFileExport textFileExportMock;
-    @Mock
-    private ConfirmPopupPresenter confirmPopupPresenterMock;
-    @Captor
-    private ArgumentCaptor<List<ScenarioWithIndex>> scenarioWithIndexCaptor;
-    @Captor
-    private ArgumentCaptor<ScenarioNotificationEvent> scenarioNotificationEventArgumentCaptor;
-
-    private ScenarioSimulationEditorPresenter presenterSpy;
-
-    @Before
-    public void setup() {
-        super.setup();
-        when(abstractScenarioSimulationProducerMock.getScenarioSimulationView()).thenReturn(scenarioSimulationViewMock);
-        when(scenarioSimulationViewMock.getScenarioGridWidget()).thenReturn(scenarioGridWidgetSpy);
-        when(abstractScenarioSimulationProducerMock.getScenarioBackgroundGridWidget()).thenReturn(backgroundGridWidgetSpy);
-        when(testToolsViewMock.getPresenter()).thenReturn(testToolsPresenterMock);
-        when(simulationMock.getUnmodifiableData()).thenReturn(Arrays.asList(new Scenario()));
-        when(abstractScenarioSimulationDocksHandlerMock.getTestToolsPresenter()).thenReturn(testToolsPresenterMock);
-        when(abstractScenarioSimulationDocksHandlerMock.getSettingsPresenter()).thenReturn(settingsPresenterMock);
-
-        this.presenterSpy = spy(new ScenarioSimulationEditorPresenter(abstractScenarioSimulationProducerMock,
-                                                                      mock(ScenarioSimulationResourceType.class),
-                                                                      abstractScenarioSimulationDocksHandlerMock,
-                                                                      textFileExportMock,
-                                                                      confirmPopupPresenterMock) {
-            {
-                this.path = pathMock;
-                this.packageName = SCENARIO_PACKAGE;
-                this.eventBus = eventBusMock;
-                this.context = scenarioSimulationContextLocal;
-                this.dataManagementStrategy = dataManagementStrategyMock;
-                this.model = scenarioSimulationModelMock;
-                this.scenarioSimulationEditorWrapper = scenarioSimulationEditorWrapperMock;
-            }
-
-            @Override
-            protected void open(String downloadURL) {
-
-            }
-
-            @Override
-            public String getJsonModel(ScenarioSimulationModel model) {
-                return "";
-            }
-        });
-    }
-
-    @Test
-    public void setWrapper() {
-        presenterSpy.setWrapper(scenarioSimulationEditorWrapperMock);
-        assertSame(scenarioSimulationEditorWrapperMock, presenterSpy.scenarioSimulationEditorWrapper);
-    }
-
-    @Test
-    public void setPath() {
-        presenterSpy.setPath(observablePathMock);
-        assertSame(observablePathMock, presenterSpy.path);
-    }
-
-   @Test
-    public void onClose() {
-        presenterSpy.onClose();
-        verify(scenarioGridWidgetSpy, times(1)).unregister();
-        verify(backgroundGridWidgetSpy, times(1)).unregister();
-    }
-
-    @Test
-    public void initializeDocks_PlaceStatusOpen() {
-        presenterSpy.initializeDocks();
-        verify(abstractScenarioSimulationDocksHandlerMock, times(1)).addDocks();
-        verify(abstractScenarioSimulationDocksHandlerMock, times(1)).setScesimEditorId(String.valueOf(presenterSpy.scenarioPresenterId));
-        verify(presenterSpy, times(1)).registerTestToolsCallback();
-        verify(presenterSpy, times(1)).resetDocks();
-    }
-
-    @Test
-    public void initializeDocks_PlaceStatusClose() {
-        presenterSpy.initializeDocks();
-        verify(abstractScenarioSimulationDocksHandlerMock, times(1)).addDocks();
-        verify(abstractScenarioSimulationDocksHandlerMock, times(1)).setScesimEditorId(String.valueOf(presenterSpy.scenarioPresenterId));
-        verify(presenterSpy, times(1)).expandToolsDock();
-        verify(presenterSpy, times(1)).registerTestToolsCallback();
-        verify(presenterSpy, times(1)).resetDocks();
-    }
-
-    @Test
-    public void hideDocks() {
-        presenterSpy.hideDocks();
-        verify(abstractScenarioSimulationDocksHandlerMock).removeDocks();
-        verify(scenarioGridWidgetSpy, times(1)).clearSelections();
-        verify(backgroundGridWidgetSpy, times(1)).clearSelections();
-        verify(presenterSpy).unRegisterTestToolsCallback();
-        verify(presenterSpy).clearTestToolsStatus();
-    }
-
-    @Test
-    public void expandToolsDock() {
-        presenterSpy.expandToolsDock();
-        verify(abstractScenarioSimulationDocksHandlerMock, times(1)).expandToolsDock();
-    }
-
-    @Test
-    public void reloadTestTools_NotDisable() {
-        presenterSpy.reloadTestTools(false);
-        verify(presenterSpy, times(1)).populateRightDocks(TestToolsPresenter.IDENTIFIER);
-        verify(abstractScenarioSimulationDocksHandlerMock, never()).getTestToolsPresenter();
-        verify(testToolsPresenterMock, never()).onDisableEditorTab();
-    }
-
-    @Test
-    public void reloadTestTools_Disable() {
-        presenterSpy.reloadTestTools(true);
-        verify(presenterSpy, times(1)).populateRightDocks(TestToolsPresenter.IDENTIFIER);
-        verify(abstractScenarioSimulationDocksHandlerMock, times(1)).getTestToolsPresenter();
-        verify(testToolsPresenterMock, times(1)).onDisableEditorTab();
-    }
-
-    @Test
-    public void clearTestTools() {
-        presenterSpy.clearTestToolsStatus();
-        verify(abstractScenarioSimulationDocksHandlerMock, times(1)).getTestToolsPresenter();
-        verify(testToolsPresenterMock, times(1)).onClearStatus();
-    }
-
-    @Test
-    public void onRunTest() {
-        presenterSpy.onRunScenario();
-        verify(presenterSpy, times(1)).onRunScenario(Arrays.asList(0));
-    }
-
-    @Test
-    public void onRunScenario() {
-        scenarioWithIndexLocal.add(new ScenarioWithIndex(1, new Scenario()));
-        scenarioWithIndexLocal.add(new ScenarioWithIndex(2, new Scenario()));
-        scenarioWithIndexLocal.add(new ScenarioWithIndex(3, new Scenario()));
-        when(simulationMock.getDataByIndex(anyInt())).thenReturn(mock(Scenario.class));
-        List<Integer> indexList = Arrays.asList(0, 2);
-
-        presenterSpy.onRunScenario(indexList);
-        verify(scenarioGridWidgetSpy, times(1)).resetErrors();
-        verify(backgroundGridWidgetSpy, times(1)).resetErrors();
-        verify(scenarioSimulationModelMock, times(1)).setSimulation(simulationMock);
-        verify(scenarioSimulationModelMock, times(1)).setBackground(backgroundMock);
-        verify(scenarioSimulationViewMock, times(1)).showBusyIndicator(anyString());
-        verify(scenarioSimulationEditorWrapperMock, times(1)).onRunScenario(any(), any(), any(), eq(settingsLocal), scenarioWithIndexCaptor.capture(), any());
-
-        List<ScenarioWithIndex> capturedValue = scenarioWithIndexCaptor.getValue();
-        assertEquals(2, capturedValue.size());
-
-        for (Integer requestedIndex : indexList) {
-            assertEquals(1, capturedValue.stream().filter(elem -> elem.getIndex() == (requestedIndex + 1)).count());
-        }
-    }
-
-    @Test
-    public void onUndo() {
-        presenterSpy.onUndo();
-        verify(eventBusMock, times(1)).fireEvent(isA(UndoEvent.class));
-    }
-
-    @Test
-    public void onRedo() {
-        presenterSpy.onRedo();
-        verify(eventBusMock, times(1)).fireEvent(isA(RedoEvent.class));
-    }
-
-    @Test
-    public void onImportSIMULATION() {
-        String FILE_CONTENT = "FILE_CONTENT";
-        presenterSpy.onImport(FILE_CONTENT, GridWidget.SIMULATION);
-        verify(scenarioSimulationEditorWrapperMock, times(1)).onImport(eq(FILE_CONTENT), isA(RemoteCallback.class), isA(ErrorCallback.class), same(simulationMock));
-    }
-
-    @Test
-    public void onImportBACKGROUND() {
-        String FILE_CONTENT = "FILE_CONTENT";
-        presenterSpy.onImport(FILE_CONTENT, GridWidget.BACKGROUND);
-        verify(scenarioSimulationEditorWrapperMock, times(1)).onImport(eq(FILE_CONTENT), isA(RemoteCallback.class), isA(ErrorCallback.class), same(backgroundMock));
-    }
-
-    @Test
-    public void onImportCheckSwitch() {
-        // Test to verify there are not new, un-managed, GridWidget
-        String FILE_CONTENT = "FILE_CONTENT";
-        for (GridWidget gridWidget : GridWidget.values()) {
-            presenterSpy.onImport(FILE_CONTENT, gridWidget);
-        }
-        verify(scenarioSimulationEditorWrapperMock, times(1)).onImport(eq(FILE_CONTENT),
-                                                                       isA(RemoteCallback.class),
-                                                                       isA(ErrorCallback.class),
-                                                                       eq(simulationMock));
-        verify(scenarioSimulationEditorWrapperMock, times(1)).onImport(eq(FILE_CONTENT),
-                                                                       isA(RemoteCallback.class),
-                                                                       isA(ErrorCallback.class),
-                                                                       eq(backgroundMock));
-    }
-
-    @Test
-    public void resetDocks() {
-        presenterSpy.resetDocks();
-        verify(abstractScenarioSimulationDocksHandlerMock, times(1)).resetDocks();
-    }
-
-    @Test
-    public void onUberfireDocksInteractionEvent() {
-        UberfireDocksInteractionEvent uberfireDocksInteractionEventMock = mock(UberfireDocksInteractionEvent.class);
-        doReturn(false).when(presenterSpy).isUberfireDocksInteractionEventToManage(uberfireDocksInteractionEventMock);
-        presenterSpy.onUberfireDocksInteractionEvent(uberfireDocksInteractionEventMock);
-        verify(presenterSpy, times(1)).isUberfireDocksInteractionEventToManage(uberfireDocksInteractionEventMock);
-        verify(uberfireDocksInteractionEventMock, never()).getTargetDock();
-        verify(presenterSpy, never()).populateRightDocks(anyString());
-        verify(scenarioSimulationEditorWrapperMock, never()).populateDocks(anyString());
-        //
-        reset(presenterSpy);
-        presenterSpy.dataManagementStrategy = null;
-        doReturn(mock(UberfireDock.class)).when(uberfireDocksInteractionEventMock).getTargetDock();
-        presenterSpy.onUberfireDocksInteractionEvent(uberfireDocksInteractionEventMock);
-        verify(presenterSpy, times(1)).isUberfireDocksInteractionEventToManage(uberfireDocksInteractionEventMock);
-        verify(presenterSpy, never()).populateRightDocks(anyString());
-        verify(scenarioSimulationEditorWrapperMock, never()).populateDocks(anyString());
-        //
-        reset(presenterSpy);
-        reset(uberfireDocksInteractionEventMock);
-        presenterSpy.dataManagementStrategy = dataManagementStrategyMock;
-        UberfireDock targetDockMock = mock(UberfireDock.class);
-        when(uberfireDocksInteractionEventMock.getTargetDock()).thenReturn(targetDockMock);
-        doReturn(true).when(presenterSpy).isUberfireDocksInteractionEventToManage(uberfireDocksInteractionEventMock);
-        when(targetDockMock.getIdentifier()).thenReturn(SettingsPresenter.IDENTIFIER);
-        presenterSpy.onUberfireDocksInteractionEvent(uberfireDocksInteractionEventMock);
-        verify(presenterSpy, times(1)).isUberfireDocksInteractionEventToManage(uberfireDocksInteractionEventMock);
-        verify(uberfireDocksInteractionEventMock, times(2)).getTargetDock(); // It's invoked twice
-        verify(presenterSpy, times(1)).populateRightDocks(SettingsPresenter.IDENTIFIER);
-        verify(scenarioSimulationEditorWrapperMock, times(1)).populateDocks(SettingsPresenter.IDENTIFIER);
-        //
-        reset(presenterSpy);
-        reset(uberfireDocksInteractionEventMock);
-        presenterSpy.dataManagementStrategy = dataManagementStrategyMock;
-        when(uberfireDocksInteractionEventMock.getTargetDock()).thenReturn(targetDockMock);
-        doReturn(true).when(presenterSpy).isUberfireDocksInteractionEventToManage(uberfireDocksInteractionEventMock);
-        when(targetDockMock.getIdentifier()).thenReturn(CheatSheetPresenter.IDENTIFIER);
-        presenterSpy.onUberfireDocksInteractionEvent(uberfireDocksInteractionEventMock);
-        verify(presenterSpy, times(1)).isUberfireDocksInteractionEventToManage(uberfireDocksInteractionEventMock);
-        verify(uberfireDocksInteractionEventMock, times(2)).getTargetDock(); // It's invoked twice
-        verify(presenterSpy, times(1)).populateRightDocks(CheatSheetPresenter.IDENTIFIER);
-        verify(scenarioSimulationEditorWrapperMock, times(1)).populateDocks(CheatSheetPresenter.IDENTIFIER);
-        //
-        reset(presenterSpy, scenarioSimulationEditorWrapperMock, uberfireDocksInteractionEventMock);
-        presenterSpy.dataManagementStrategy = dataManagementStrategyMock;
-        when(uberfireDocksInteractionEventMock.getTargetDock()).thenReturn(targetDockMock);
-        doReturn(true).when(presenterSpy).isUberfireDocksInteractionEventToManage(uberfireDocksInteractionEventMock);
-        when(targetDockMock.getIdentifier()).thenReturn(TestToolsPresenter.IDENTIFIER);
-        presenterSpy.onUberfireDocksInteractionEvent(uberfireDocksInteractionEventMock);
-        verify(presenterSpy, times(1)).isUberfireDocksInteractionEventToManage(uberfireDocksInteractionEventMock);
-        verify(uberfireDocksInteractionEventMock, times(1)).getTargetDock();
-        verify(presenterSpy, never()).populateRightDocks(anyString());
-        verify(scenarioSimulationEditorWrapperMock, never()).populateDocks(anyString());
-    }
-
-    @Test
-    public void refreshModelContent() {
-        when(scenarioSimulationModelMock.getSimulation()).thenReturn(simulationMock);
-        List<ScenarioWithIndex> scenarioWithIndex = new ArrayList<>();
-        int scenarioNumber = 1;
-        int scenarioIndex = scenarioNumber - 1;
-        Scenario scenario = mock(Scenario.class);
-        scenarioWithIndex.add(new ScenarioWithIndex(scenarioNumber, scenario));
-
-        List<BackgroundDataWithIndex> backgroundDataWithIndex = new ArrayList<>();
-        BackgroundData backgroundData = mock(BackgroundData.class);
-        backgroundDataWithIndex.add(new BackgroundDataWithIndex(scenarioNumber, backgroundData));
-
-        TestResultMessage testResultMessage = mock(TestResultMessage.class);
-        SimulationRunResult testRunResult = new SimulationRunResult(scenarioWithIndex, backgroundDataWithIndex, new SimulationRunMetadata(), testResultMessage);
-        presenterSpy.refreshModelContent(testRunResult);
-        verify(scenarioSimulationViewMock, times(1)).hideBusyIndicator();
-
-        verify(simulationMock, times(1)).replaceData(scenarioIndex, scenario);
-        assertEquals(scenarioSimulationModelMock, presenterSpy.getModel());
-        verify(scenarioGridWidgetSpy, times(1)).refreshContent(simulationMock);
-        assertEquals(scenarioSimulationContextLocal.getStatus().getSimulation(), simulationMock);
-
-        verify(backgroundMock, times(1)).replaceData(scenarioIndex, backgroundData);
-        verify(backgroundGridWidgetSpy, times(1)).refreshContent(backgroundMock);
-        assertEquals(scenarioSimulationContextLocal.getStatus().getBackground(), backgroundMock);
-
-        assertEquals(scenarioSimulationModelMock, presenterSpy.getModel());
-        verify(abstractScenarioSimulationDocksHandlerMock, times(1)).expandTestResultsDock();
-        verify(dataManagementStrategyMock, times(1)).setModel(scenarioSimulationModelMock);
-        verify(scenarioSimulationEditorWrapperMock, times(1)).onRefreshedModelContent(testRunResult);
-    }
-
-    @Test
-    public void isDirty() {
-        when(scenarioSimulationViewMock.getScenarioGridWidget()).thenThrow(new RuntimeException());
-        assertFalse(presenterSpy.isDirty());
-    }
-
-    @Test
-    public void onEditTabSelected() {
-        presenterSpy.onEditTabSelected();
-        InOrder inOrder = inOrder(presenterSpy, scenarioGridWidgetSpy, backgroundGridWidgetSpy);
-        inOrder.verify(scenarioGridWidgetSpy, times(1)).selectAndFocus();
-        inOrder.verify(backgroundGridWidgetSpy, times(1)).deselectAndUnFocus();
-    }
-
-    @Test
-    public void onBackgroundTabSelected() {
-        presenterSpy.onBackgroundTabSelected();
-        InOrder inOrder = inOrder(presenterSpy, scenarioGridWidgetSpy, backgroundGridWidgetSpy);
-        inOrder.verify(backgroundGridWidgetSpy, times(1)).selectAndFocus();
-        inOrder.verify(scenarioGridWidgetSpy, times(1)).deselectAndUnFocus();
-    }
-
-    @Test
-    public void onImportsTabSelected() {
-        presenterSpy.onImportsTabSelected();
-        verify(scenarioGridWidgetSpy, times(1)).deselectAndUnFocus();
-        verify(backgroundGridWidgetSpy, times(1)).deselectAndUnFocus();
-    }
-
-    @Test
-    public void validateSimulation() {
-        presenterSpy.validateSimulation();
-        verify(scenarioSimulationEditorWrapperMock, times(1)).validate(eq(simulationMock), eq(settingsLocal), isA(RemoteCallback.class));
-    }
-
-    @Test
-    public void selectSimulationTab() {
-        presenterSpy.selectSimulationTab();
-        verify(scenarioSimulationEditorWrapperMock, times(1)).selectSimulationTab();
-    }
-
-    @Test
-    public void selectBackgroundTab() {
-        presenterSpy.selectBackgroundTab();
-        verify(scenarioSimulationEditorWrapperMock, times(1)).selectBackgroundTab();
-    }
-
-    @Test
-    public void onDownload() {
-        String DOWNLOAD_URL = "DOWNLOAD_URL";
-        Supplier<Path> pathSupplierMock = mock(Supplier.class);
-        doReturn(DOWNLOAD_URL).when(presenterSpy).getFileDownloadURL(pathSupplierMock);
-        presenterSpy.onDownload(pathSupplierMock);
-        verify(presenterSpy, times(1)).getFileDownloadURL(pathSupplierMock);
-        verify(presenterSpy, times(1)).open(DOWNLOAD_URL);
-    }
-
-    @Test
-    public void showImportDialogSIMULATION() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(true);
-        presenterSpy.showImportDialog();
-        verify(eventBusMock, times(1)).fireEvent(isA(ImportEvent.class));
-    }
-
-    @Test
-    public void showImportDialogBACKGROUND() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(true);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        presenterSpy.showImportDialog();
-        verify(eventBusMock, times(1)).fireEvent(isA(ImportEvent.class));
-    }
-
-    @Test
-    public void showImportDialogNone() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(false);
-        presenterSpy.showImportDialog();
-        verify(eventBusMock, never()).fireEvent(isA(ImportEvent.class));
-    }
-
-    @Test
-    public void setTestTools() {
-        presenterSpy.setTestTools(testToolsPresenterMock);
-        assertEquals(scenarioSimulationContextLocal.getTestToolsPresenter(), testToolsPresenterMock);
-        verify(testToolsPresenterMock, times(1)).setEventBus(eventBusMock);
-        verify(dataManagementStrategyMock, times(1)).populateTestTools(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-    }
-
-    @Test
-    public void setCheatSheet() {
-        presenterSpy.setCheatSheet(cheatSheetPresenterMock);
-        verify(cheatSheetPresenterMock, times(1)).initCheatSheet(isA(ScenarioSimulationModel.Type.class));
-    }
-
-    @Test
-    public void setSettings() {
-        presenterSpy.setSettings(settingsPresenterMock);
-        verify(settingsPresenterMock, times(1)).setScenarioType(isA(ScenarioSimulationModel.Type.class), any(), any());
-    }
-
-    @Test
-    public void populateRightDocks() {
-        presenterSpy.populateRightDocks(TestToolsPresenter.IDENTIFIER);
-        verify(scenarioSimulationEditorWrapperMock, times(1)).populateDocks(TestToolsPresenter.IDENTIFIER);
-    }
-
-    @Test
-    public void populateRightDocksEmptyDataStrategy() {
-        presenterSpy.dataManagementStrategy = null;
-        presenterSpy.populateRightDocks(TestToolsPresenter.IDENTIFIER);
-        verify(scenarioSimulationEditorWrapperMock, never()).populateDocks(anyString());
-    }
-
-    @Test
-    public void getModelSuccessCallbackMethod() {
-        scenarioGridWidgetSpy.selectAndFocus();
-        presenterSpy.getModelSuccessCallbackMethod(dataManagementStrategyMock, modelLocal);
-        verify(presenterSpy, times(1)).initializeDocks();
-        verify(presenterSpy, times(1)).populateRightDocks(TestToolsPresenter.IDENTIFIER);
-        verify(presenterSpy, times(1)).populateRightDocks(SettingsPresenter.IDENTIFIER);
-        verify(scenarioGridWidgetSpy, times(1)).setContent(modelLocal.getSimulation(), settingsLocal.getType());
-        assertEquals(scenarioSimulationContextLocal.getStatus().getSimulation(), modelLocal.getSimulation());
-        assertEquals(scenarioSimulationContextLocal.getStatus().getBackground(), modelLocal.getBackground());
-        verify(presenterSpy, times(1)).getValidateCommand();
-        verify(scenarioGridWidgetSpy, atLeastOnce()).selectAndFocus();
-    }
-
-    @Test
-    public void onExportToCsvSIMULATION() {
-        when(backgroundGridWidgetSpy.isSelected()).thenReturn(false);
-        when(scenarioGridWidgetSpy.isSelected()).thenReturn(true);
-        presenterSpy.onExportToCsv();
-        verify(scenarioSimulationEditorWrapperMock, times(1)).onExportToCsv(isA(RemoteCallback.class), isA(ScenarioSimulationHasBusyIndicatorDefaultErrorCallback.class), eq(simulationMock));
-    }
-
-    @Test
-    public void cleanReadOnlyColumn() {
-        Simulation simulation = new Simulation();
-        ScesimModelDescriptor simulationDescriptor = simulation.getScesimModelDescriptor();
-        FactMapping test1 = simulationDescriptor
-                .addFactMapping(FactIdentifier.create("test1", String.class.getCanonicalName()),
-                                ExpressionIdentifier.create("", FactMappingType.GIVEN));
-        FactMapping test2 = simulationDescriptor
-                .addFactMapping(FactIdentifier.create("test2", String.class.getCanonicalName()),
-                                ExpressionIdentifier.create("", FactMappingType.GIVEN));
-
-        test1.addExpressionElement("test", String.class.getCanonicalName());
-        Scenario scenario = simulation.addData();
-        scenario.addMappingValue(test1.getFactIdentifier(), test1.getExpressionIdentifier(), LOWER_CASE_VALUE);
-        scenario.addMappingValue(test2.getFactIdentifier(), test2.getExpressionIdentifier(), LOWER_CASE_VALUE);
-
-        presenterSpy.cleanReadOnlyColumn(simulation);
-
-        assertNotNull(scenario.getFactMappingValue(test1.getFactIdentifier(), test1.getExpressionIdentifier()).get().getRawValue());
-        assertNull(scenario.getFactMappingValue(test2.getFactIdentifier(), test2.getExpressionIdentifier()).get().getRawValue());
-    }
-
-    @Test
-    public void getValidationCallback() {
-        presenterSpy.getValidationCallback().callback(null);
-        verify(confirmPopupPresenterMock, never()).show(anyString(), anyString());
-
-        List<FactMappingValidationError> validationErrors = new ArrayList<>();
-        presenterSpy.getValidationCallback().callback(validationErrors);
-        verify(confirmPopupPresenterMock, never()).show(anyString(), anyString());
-
-        String errorMessage = "errorMessage";
-        String errorId = "errorId";
-        String errorId2 = "errorId2";
-        validationErrors.add(new FactMappingValidationError(errorId, errorMessage));
-        validationErrors.add(new FactMappingValidationError("errorId2", ScenarioSimulationI18nServerMessage.SCENARIO_VALIDATION_NODE_CHANGED_ERROR, "p1", "p2"));
-        presenterSpy.getValidationCallback().callback(validationErrors);
-        verify(confirmPopupPresenterMock, times(1)).show(anyString(), contains(errorId));
-        verify(confirmPopupPresenterMock, times(1)).show(anyString(), contains(errorMessage));
-        verify(confirmPopupPresenterMock, times(1)).show(anyString(), contains(errorId2));
-        verify(confirmPopupPresenterMock, times(1)).show(anyString(), contains(ScenarioSimulationEditorConstants.INSTANCE.scenarioValidationNodeChangedError("p1", "p2")));
-    }
-
-    @Test
-    public void getImportCallback() {
-        List<AbstractScesimModel> toTest = Arrays.asList(new Simulation(), new Background());
-
-        for (AbstractScesimModel abstractScesimModel : toTest) {
-            FactMapping factMapping = abstractScesimModel.getScesimModelDescriptor().addFactMapping(FactIdentifier.EMPTY, ExpressionIdentifier.create("empty", FactMappingType.GIVEN));
-            FactMappingValue toBeRemoved = abstractScesimModel.addData().addOrUpdateMappingValue(factMapping.getFactIdentifier(), factMapping.getExpressionIdentifier(), "toBeRemoved");
-
-            presenterSpy.getImportCallBack().callback(abstractScesimModel);
-
-            verify(presenterSpy, times(1)).cleanReadOnlyColumn(abstractScesimModel);
-            assertNull(toBeRemoved.getRawValue());
-
-            reset(presenterSpy);
-        }
-    }
-
-    @Test
-    public void sendNotification() {
-        presenterSpy.sendNotification("message", NotificationEvent.NotificationType.ERROR);
-        verify(eventBusMock, times(1)).fireEvent(scenarioNotificationEventArgumentCaptor.capture());
-        assertEquals("message", scenarioNotificationEventArgumentCaptor.getValue().getMessage());
-        assertEquals(NotificationEvent.NotificationType.ERROR, scenarioNotificationEventArgumentCaptor.getValue().getNotificationType());
-        assertTrue(scenarioNotificationEventArgumentCaptor.getValue().isAutoHide());
-    }
-
-    @Test
-    public void sendNotificationAutoHide() {
-        presenterSpy.sendNotification("message", NotificationEvent.NotificationType.ERROR, false);
-        verify(eventBusMock, times(1)).fireEvent(scenarioNotificationEventArgumentCaptor.capture());
-        assertEquals("message", scenarioNotificationEventArgumentCaptor.getValue().getMessage());
-        assertEquals(NotificationEvent.NotificationType.ERROR, scenarioNotificationEventArgumentCaptor.getValue().getNotificationType());
-        assertFalse(scenarioNotificationEventArgumentCaptor.getValue().isAutoHide());
-    }
-
-    @Test
-    public void expandSettingsDock() {
-        presenterSpy.expandSettingsDock();
-        verify(abstractScenarioSimulationDocksHandlerMock, times(1)).expandSettingsDock();
-    }
-
-    @Test
-    public void reloadSettingsDock() {
-        presenterSpy.reloadSettingsDock();
-        verify(abstractScenarioSimulationDocksHandlerMock, times(1)).getSettingsPresenter();
-        verify(presenterSpy, times(1)).updateSettings(settingsPresenterMock);
-    }
-
-    @Test
-    public void unpublishTestResultsAlerts(){
-        presenterSpy.unpublishTestResultsAlerts();
-        verify(scenarioSimulationEditorWrapperMock, times(1)).unpublishTestResultsAlerts();
-    }
-
-    @Test
-    public void getUpdateDMNMetadataCommand() {
-        presenterSpy.getUpdateDMNMetadataCommand().execute();
-        verify(scenarioSimulationEditorWrapperMock, times(1)).getDMNMetadata();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationViewImplTest.java
deleted file mode 100644
index a389cea..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/ScenarioSimulationViewImplTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor;
-
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationViewImplTest extends AbstractScenarioSimulationTest {
-
-    public static final int WIDTH = 44;
-    public static final int HEIGHT = 82;
-
-    @Mock
-    private Widget parentWidget;
-
-    private ScenarioSimulationViewImpl scenarioViewImpl;
-
-    @Before
-    public void setup() {
-        super.setup();
-        scenarioViewImpl = spy(new ScenarioSimulationViewImpl() {
-            {
-                this.scenarioGridWidget = scenarioGridWidgetSpy;
-            }
-        });
-        when(scenarioViewImpl.getParent()).thenReturn(parentWidget);
-        when(parentWidget.getOffsetHeight()).thenReturn(HEIGHT);
-        when(parentWidget.getOffsetWidth()).thenReturn(WIDTH);
-    }
-
-    @Test
-    public void onResize() {
-        scenarioViewImpl.onResize();
-        verify(scenarioViewImpl, times(1)).setPixelSize(eq(WIDTH), eq(HEIGHT));
-        verify(scenarioGridWidgetSpy, times(1)).onResize();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractColumnMenuPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractColumnMenuPresenterTest.java
deleted file mode 100644
index 80ea593..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractColumnMenuPresenterTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import java.util.Objects;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.DeleteColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DuplicateInstanceEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.InsertColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class AbstractColumnMenuPresenterTest extends AbstractMenuTest {
-
-    @Before
-    public void setup() {
-        abstractColumnMenuPresenter = new AbstractColumnMenuPresenter() {
-
-            @Override
-            protected void updateExecutableMenuItemAttributes(LIElement toUpdate, String id, String label, String i18n) {
-                //Do nothing
-            }
-
-            @Override
-            public void show(GridWidget gridWidget, int mx, int my) {
-                //Do nothing
-            }
-        };
-        super.setup();
-    }
-
-    @Test
-    public void initMenu() {
-        assertNull(abstractColumnMenuPresenter.columnContextLIElement);
-        assertNull(abstractColumnMenuPresenter.insertColumnLeftLIElement);
-        assertNull(abstractColumnMenuPresenter.insertColumnRightLIElement);
-        assertNull(abstractColumnMenuPresenter.deleteColumnInstanceLIElement);
-        assertNull(abstractColumnMenuPresenter.duplicateInstanceLIElement);
-        abstractColumnMenuPresenter.initMenu();
-        assertNotNull(abstractColumnMenuPresenter.columnContextLIElement);
-        assertNotNull(abstractColumnMenuPresenter.insertColumnLeftLIElement);
-        assertNotNull(abstractColumnMenuPresenter.insertColumnRightLIElement);
-        assertNotNull(abstractColumnMenuPresenter.deleteColumnInstanceLIElement);
-        assertNotNull(abstractColumnMenuPresenter.duplicateInstanceLIElement);
-    }
-
-    @Test
-    public void showFalseFalseSimulation() {
-        commonShow(GridWidget.SIMULATION, 4, 5, false, false, false);
-    }
-
-    @Test
-    public void showFalseTrueSimulation() {
-        commonShow(GridWidget.SIMULATION, 4, 5, false, true, false);
-    }
-
-    @Test
-    public void showTrueFalseSimulation() {
-        commonShow(GridWidget.SIMULATION, 4, 5, true, false, false);
-    }
-
-    @Test
-    public void showTrueTrueSimulation() {
-        commonShow(GridWidget.SIMULATION, 4, 5, true, true, false);
-    }
-
-    @Test
-    public void showTrueTrueSimulation_NullDuplicateElement() {
-        commonShow(GridWidget.SIMULATION, 4, 5, true, true, true);
-    }
-
-    @Test
-    public void showFalseFalseBackground() {
-        commonShow(GridWidget.BACKGROUND, 4, 5, false, false, false);
-    }
-
-    @Test
-    public void showFalseTrueBackground() {
-        commonShow(GridWidget.BACKGROUND, 4, 5, false, true, false);
-    }
-
-    @Test
-    public void showTrueFalseBackground() {
-        commonShow(GridWidget.BACKGROUND, 4, 5, true, false, false);
-    }
-
-    @Test
-    public void showTrueTrueBackground_NotNullDuplicateInstanceLIElement() {
-        commonShow(GridWidget.BACKGROUND, 4, 5, true, true, false);
-    }
-
-    @Test
-    public void showTrueTrueBackground_NullDuplicateInstanceLIElement() {
-        commonShow(GridWidget.BACKGROUND, 4, 5, true, true, true);
-    }
-
-    private void commonShow(GridWidget gridWidget, int mx, int my, boolean asProperty, boolean showDuplicateInstance, boolean nullDuplicateElement) {
-        abstractColumnMenuPresenterSpy.initMenu();
-        if (nullDuplicateElement) {
-            abstractColumnMenuPresenterSpy.duplicateInstanceLIElement = null;
-        }
-        final LIElement duplicateInstanceLIElementOriginal = abstractColumnMenuPresenterSpy.duplicateInstanceLIElement;
-        final LIElement deleteColumnInstanceLIElementOriginal = abstractColumnMenuPresenterSpy.deleteColumnInstanceLIElement;
-        abstractColumnMenuPresenterSpy.show(gridWidget, mx, my, 1, "GIVEN", asProperty, showDuplicateInstance);
-        if (Objects.equals(GridWidget.BACKGROUND, gridWidget)) {
-            verify(abstractColumnMenuPresenterSpy, times(1)).updateMenuItemAttributes(eq(gridTitleElementMock), any(), eq(ScenarioSimulationEditorConstants.INSTANCE.background()), eq("background"));
-        } else {
-            verify(abstractColumnMenuPresenterSpy, times(1)).updateMenuItemAttributes(eq(gridTitleElementMock), any(), eq(ScenarioSimulationEditorConstants.INSTANCE.scenario()), eq("scenario"));
-        }
-        if (!(Objects.equals(GridWidget.SIMULATION, gridWidget) && showDuplicateInstance)) {
-            if (!nullDuplicateElement) {
-               verify(abstractColumnMenuPresenterSpy, times(1)).removeMenuItem(eq(duplicateInstanceLIElementOriginal));
-            }
-            assertNull(abstractColumnMenuPresenterSpy.duplicateInstanceLIElement);
-        } else if (nullDuplicateElement) {
-            verify(abstractColumnMenuPresenterSpy, times(1)).addExecutableMenuItemAfter(eq(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DUPLICATE_INSTANCE), eq(abstractColumnMenuPresenter.constants.duplicateInstance()), eq("duplicateInstance"), eq(deleteColumnInstanceLIElementOriginal));
-        }
-        verify(abstractColumnMenuPresenterSpy, atLeastOnce()).mapEvent(eq(abstractColumnMenuPresenterSpy.insertColumnLeftLIElement), isA(InsertColumnEvent.class));
-        verify(abstractColumnMenuPresenterSpy, atLeastOnce()).mapEvent(eq(abstractColumnMenuPresenterSpy.insertColumnRightLIElement), isA(InsertColumnEvent.class));
-        if (asProperty) {
-            verify(abstractColumnMenuPresenterSpy, atLeastOnce()).updateExecutableMenuItemAttributes(eq(abstractColumnMenuPresenterSpy.deleteColumnInstanceLIElement), eq(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DELETE_COLUMN), eq(abstractColumnMenuPresenter.constants.deleteColumn()), eq("deleteColumn"));
-            verify(abstractColumnMenuPresenterSpy, atLeastOnce()).mapEvent(eq(abstractColumnMenuPresenterSpy.deleteColumnInstanceLIElement), isA(DeleteColumnEvent.class));
-        } else {
-            verify(abstractColumnMenuPresenterSpy, atLeastOnce()).updateExecutableMenuItemAttributes(eq(deleteColumnInstanceLIElementOriginal), eq(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DELETE_INSTANCE), eq(abstractColumnMenuPresenter.constants.deleteInstance()), eq("deleteInstance"));
-            verify(abstractColumnMenuPresenterSpy, atLeastOnce()).mapEvent(eq(abstractColumnMenuPresenterSpy.deleteColumnInstanceLIElement), isA(DeleteColumnEvent.class));
-        }
-        if (abstractColumnMenuPresenter.duplicateInstanceLIElement != null) {
-            verify(abstractColumnMenuPresenterSpy, atLeastOnce()).mapEvent(eq(abstractColumnMenuPresenterSpy.duplicateInstanceLIElement), isA(DuplicateInstanceEvent.class));
-        }
-        verify(abstractColumnMenuPresenterSpy, atLeastOnce()).show(eq(gridWidget), eq(mx), eq(my));
-        reset(abstractColumnMenuPresenterSpy);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractMenuTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractMenuTest.java
deleted file mode 100644
index bb90476..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/AbstractMenuTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.NodeList;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import com.google.web.bindery.event.shared.Event;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public abstract class AbstractMenuTest {
-
-    protected AbstractColumnMenuPresenter abstractColumnMenuPresenter;
-
-    protected AbstractColumnMenuPresenter abstractColumnMenuPresenterSpy;
-
-    @Mock
-    protected MenuItemPresenter menuItemPresenterMock;
-    @Mock
-    protected ExecutableMenuItemPresenter executableMenuItemPresenterMock;
-    @Mock
-    protected UListElement contextMenuDropdownMock;
-    @Mock
-    protected BaseMenuView viewMock;
-    @Mock
-    protected LIElement menuItemMock;
-    @Mock
-    protected LIElement executableMenuItemMock;
-    @Mock
-    protected LIElement gridTitleElementMock;
-    @Mock
-    protected NodeList<Element> elementsByTagNameMock;
-    @Mock
-    protected Element itemMock;
-
-
-    protected void setup() {
-        when(elementsByTagNameMock.getItem(0)).thenReturn(itemMock);
-        doReturn(menuItemMock).when(menuItemPresenterMock).getLabelMenuElement(any(), any());
-        doReturn(gridTitleElementMock).when(menuItemPresenterMock).getLabelMenuElement(any(), eq("scenario"));
-        doReturn(executableMenuItemMock).when(executableMenuItemPresenterMock).getLExecutableMenuElement(any(), any(), isA(Event.class));
-        doReturn(executableMenuItemMock).when(executableMenuItemPresenterMock).getLExecutableMenuElement(any(), any());
-        //doReturn(du).when(executableMenuItemPresenterMock).getLExecutableMenuElement(anyString(), eq("duplicateInstance"));
-
-        when(menuItemMock.getElementsByTagName("span")).thenReturn(elementsByTagNameMock);
-        when(executableMenuItemMock.getElementsByTagName("span")).thenReturn(elementsByTagNameMock);
-        when(viewMock.getContextMenuDropdown()).thenReturn(contextMenuDropdownMock);
-        abstractColumnMenuPresenter.menuItemPresenter = menuItemPresenterMock;
-        abstractColumnMenuPresenter.executableMenuItemPresenter = executableMenuItemPresenterMock;
-        abstractColumnMenuPresenter.view = viewMock;
-        abstractColumnMenuPresenter.gridTitleElement = gridTitleElementMock;
-        abstractColumnMenuPresenterSpy = spy(abstractColumnMenuPresenter);
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuTest.java
deleted file mode 100644
index ab1d530..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuTest.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.NodeList;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import com.google.gwt.user.client.ui.RootPanel;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import com.google.web.bindery.event.shared.Event;
-import org.gwtbootstrap3.client.ui.constants.Styles;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class BaseMenuTest {
-
-    @Mock
-    private RootPanel rootPanelMock;
-
-    @Mock
-    private MenuItemPresenter menuItemPresenterMock;
-
-    @Mock
-    private ExecutableMenuItemPresenter executableMenuItemPresenterMock;
-
-    @Mock
-    private BaseMenuView viewMock;
-
-    @Mock
-    private UListElement contextMenuDropdownMock;
-
-    @Mock
-    private Style styleMock;
-
-    private BaseMenu baseMenu;
-
-    @Before
-    public void setup() {
-        when(contextMenuDropdownMock.getStyle()).thenReturn(styleMock);
-        when(viewMock.getContextMenuDropdown()).thenReturn(contextMenuDropdownMock);
-        this.baseMenu = spy(new BaseMenu() {
-            {
-                this.view = viewMock;
-                this.menuItemPresenter = menuItemPresenterMock;
-                this.executableMenuItemPresenter = executableMenuItemPresenterMock;
-            }
-
-            @Override
-            protected RootPanel getRootPanel() {
-                return rootPanelMock;
-            }
-        });
-    }
-
-    @Test
-    public void initialise() {
-        baseMenu.initialise();
-        verify(viewMock, times(1)).init(baseMenu);
-    }
-
-    @Test
-    public void addMenuItem() {
-        String id = "TEST-ID";
-        String label = "TEST-LABEL";
-        String i18n = "TEST-i18n";
-        baseMenu.addMenuItem(id, label, i18n);
-        verify(contextMenuDropdownMock, times(1)).appendChild(menuItemPresenterMock.getLabelMenuElement(id, label));
-    }
-
-    @Test
-    public void addExecutableMenuItemWithEvent() {
-        Event mockEvent = mock(Event.class);
-        String id = "TEST-ID";
-        String label = "TEST-LABEL";
-        String i18n = "TEST-i18n";
-        baseMenu.addExecutableMenuItem(id, label, i18n, mockEvent);
-        verify(contextMenuDropdownMock, times(1)).appendChild(executableMenuItemPresenterMock.getLExecutableMenuElement(id, label, mockEvent));
-    }
-
-    @Test
-    public void addExecutableMenuItemWithoutEvent() {
-        String id = "TEST-ID";
-        String label = "TEST-LABEL";
-        String i18n = "TEST-i18n";
-        baseMenu.addExecutableMenuItem(id, label, i18n);
-        verify(contextMenuDropdownMock, times(1)).appendChild(executableMenuItemPresenterMock.getLExecutableMenuElement(id, label));
-    }
-
-    @Test
-    public void removeMenuItem() {
-        LIElement toRemoveMock = mock(LIElement.class);
-        baseMenu.removeMenuItem(toRemoveMock);
-        verify(contextMenuDropdownMock, times(1)).removeChild(eq(toRemoveMock));
-    }
-
-    @Test
-    public void mapEvent() {
-        LIElement executableMenuItemMock = mock(LIElement.class);
-        Event toBeMappedMock = mock(Event.class);
-        baseMenu.mapEvent(executableMenuItemMock, toBeMappedMock);
-        verify(executableMenuItemPresenterMock, times(1)).mapEvent(eq(executableMenuItemMock), eq(toBeMappedMock));
-    }
-
-    @Test
-    public void asWidget() {
-        baseMenu.asWidget();
-        verify(viewMock, times(1)).asWidget();
-    }
-
-    @Test
-    public void show() {
-        int x = 10;
-        int y = 20;
-        baseMenu.show(x, y);
-        verify(baseMenu, times(1)).hide();
-        verify(styleMock, times(1)).setLeft(x, Style.Unit.PX);
-        verify(styleMock, times(1)).setTop(y, Style.Unit.PX);
-        verify(styleMock, times(1)).setDisplay(Style.Display.BLOCK);
-    }
-
-    @Test
-    public void hide() {
-        when(rootPanelMock.getWidgetIndex(viewMock)).thenReturn(1);
-        baseMenu.hide();
-        verify(baseMenu, times(1)).isShown();
-        verify(styleMock, times(1)).setDisplay(Style.Display.NONE);
-        when(rootPanelMock.getWidgetIndex(viewMock)).thenReturn(-1);
-        reset(baseMenu);
-        reset(styleMock);
-        baseMenu.hide();
-        verify(baseMenu, times(1)).isShown();
-        verify(styleMock, times(0)).setDisplay(Style.Display.NONE);
-    }
-
-    @Test
-    public void getView() {
-        BaseMenuView retrieved = baseMenu.getView();
-        assertNotNull(retrieved);
-    }
-
-    @Test
-    public void isShown() {
-        when(rootPanelMock.getWidgetIndex(viewMock)).thenReturn(1);
-        assertTrue(baseMenu.isShown());
-        when(rootPanelMock.getWidgetIndex(viewMock)).thenReturn(-1);
-        assertFalse(baseMenu.isShown());
-    }
-
-    @Test
-    public void onContextMenuEvent() {
-        ContextMenuEvent mockEvent = mock(ContextMenuEvent.class);
-        baseMenu.onContextMenuEvent(mockEvent);
-        verify(mockEvent, times(1)).preventDefault();
-        verify(mockEvent, times(1)).stopPropagation();
-        verify(baseMenu, times(1)).hide();
-    }
-
-    @Test
-    public void enableElement() {
-        Element mockElement = mock(Element.class);
-        baseMenu.enableElement(mockElement, true);
-        verify(mockElement, times(1)).removeClassName(Styles.DISABLED);
-        reset(mockElement);
-        baseMenu.enableElement(mockElement, false);
-        verify(mockElement, times(1)).addClassName(Styles.DISABLED);
-    }
-
-    @Test
-    public void isDisabled() {
-        Element elementMock = mock(Element.class);
-        when(elementMock.getClassName()).thenReturn(Styles.DISABLED);
-        assertTrue(baseMenu.isDisabled(elementMock));
-        when(elementMock.getClassName()).thenReturn(Styles.DROPDOWN_MENU);
-        assertFalse(baseMenu.isDisabled(elementMock));
-    }
-
-    @Test
-    public void updateExecutableMenuItemAttributes() {
-        LIElement toUpdateMock = mock(LIElement.class);
-        NodeList<Element> elementsByTagNameMock = mock(NodeList.class);
-        Element itemMock = mock(Element.class);
-        when(elementsByTagNameMock.getItem(0)).thenReturn(itemMock);
-        when(toUpdateMock.getElementsByTagName("span")).thenReturn(elementsByTagNameMock);
-        String id = "TEST-ID";
-        String label = "TEST-LABEL";
-        String i18n = "TEST-i18n";
-        baseMenu.updateExecutableMenuItemAttributes(toUpdateMock, id, label, i18n);
-        verify(toUpdateMock, times(1)).setId(eq(id));
-        verify(itemMock, times(1)).setInnerHTML(eq(label));
-    }
-
-    @Test
-    public void updateMenuItemAttributes() {
-        LIElement toUpdateMock = mock(LIElement.class);
-        NodeList<Element> elementsByTagNameMock = mock(NodeList.class);
-        Element itemMock = mock(Element.class);
-        when(elementsByTagNameMock.getItem(0)).thenReturn(itemMock);
-        when(toUpdateMock.getElementsByTagName("span")).thenReturn(elementsByTagNameMock);
-        String id = "TEST-ID";
-        String label = "TEST-LABEL";
-        String i18n = "TEST-i18n";
-        String boldLabel = "<b>" + label + "</b>";
-        baseMenu.updateMenuItemAttributes(toUpdateMock, id, label, i18n);
-        verify(toUpdateMock, times(1)).setId(eq(id));
-        verify(itemMock, times(1)).setInnerHTML(eq(boldLabel));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuViewImplTest.java
deleted file mode 100644
index d4a9e9d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/BaseMenuViewImplTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class BaseMenuViewImplTest {
-
-    @Mock
-    private BaseMenu mockBaseMenu;
-
-    private BaseMenuViewImpl baseMenuView;
-
-    @Before
-    public void setup() {
-        this.baseMenuView = spy(new BaseMenuViewImpl() {
-        });
-        baseMenuView.init(mockBaseMenu);
-    }
-
-    @Test
-    public void onContextMenuEvent() {
-        ContextMenuEvent mockEvent = mock(ContextMenuEvent.class);
-        baseMenuView.onContextMenuEvent(mockEvent);
-        verify(mockBaseMenu, times(1)).onContextMenuEvent(mockEvent);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemPresenterTest.java
deleted file mode 100644
index 3de7a86..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemPresenterTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import java.util.Map;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import com.google.web.bindery.event.shared.Event;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertNotNull;
-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;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ExecutableMenuItemPresenterTest {
-
-    @Mock
-    private ExecutableMenuItemViewImpl mockExecutableMenuItemViewImpl;
-
-    @Mock
-    private LIElement mockLIElement;
-
-    @Mock
-    private Map<LIElement, Event> mockMenuItemsEventMap;
-
-    @Mock
-    private Event mockEvent;
-
-    @Mock
-    private EventBus mockEventBus;
-
-    @Mock
-    private BaseMenu mockparent;
-
-    private ExecutableMenuItemPresenter executableMenuItemPresenter;
-
-    @Before
-    public void setup() {
-        when(mockExecutableMenuItemViewImpl.getLExecutableMenuElement()).thenReturn(mockLIElement);
-        when(mockMenuItemsEventMap.containsKey(mockLIElement)).thenReturn(true);
-        when(mockMenuItemsEventMap.get(mockLIElement)).thenReturn(mockEvent);
-
-        this.executableMenuItemPresenter = spy(new ExecutableMenuItemPresenter() {
-            {
-                menuItemsEventMap = mockMenuItemsEventMap;
-                eventBus = mockEventBus;
-                parent = mockparent;
-            }
-
-            @Override
-            protected ExecutableMenuItemView getMenuItemView() {
-                return mockExecutableMenuItemViewImpl;
-            }
-        });
-    }
-
-    @Test
-    public void onClickEvent() {
-        ClickEvent mockClickEvent = mock(ClickEvent.class);
-        executableMenuItemPresenter.onClickEvent(mockClickEvent, mockLIElement);
-        verify(mockClickEvent, times(1)).preventDefault();
-        verify(mockClickEvent, times(1)).stopPropagation();
-        verify(mockparent, times(1)).hide();
-        verify(executableMenuItemPresenter, times(1)).fireEvent(eq(mockLIElement));
-    }
-
-    @Test
-    public void fireEvent() {
-        executableMenuItemPresenter.fireEvent(mockLIElement);
-        verify(mockMenuItemsEventMap, times(1)).containsKey(mockLIElement);
-        verify(mockEventBus, times(1)).fireEvent(eq(mockEvent));
-    }
-
-    @Test
-    public void getLIElement() {
-        LIElement liElement = executableMenuItemPresenter.getLExecutableMenuElement("TEST-ID", "TEST-LABEL", mockEvent);
-        assertNotNull(liElement);
-        verify(mockMenuItemsEventMap, times(1)).put(liElement, mockEvent);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemViewImplTest.java
deleted file mode 100644
index 4aebfe4..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExecutableMenuItemViewImplTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ExecutableMenuItemViewImplTest {
-
-    private MenuItemViewImpl menuItemView;
-
-    @Mock
-    private MenuItemPresenter mockMenuItemPresenter;
-
-    @Before
-    public void setup() {
-        this.menuItemView = spy(new MenuItemViewImpl() {
-            {
-
-            }
-        });
-        menuItemView.setPresenter(mockMenuItemPresenter);
-    }
-
-    @Test
-    public void onClickEvent() {
-        ClickEvent mockClickEvent = mock(ClickEvent.class);
-        menuItemView.onClickEvent(mockClickEvent);
-        verify(mockMenuItemPresenter, times(1)).onClickEvent(mockClickEvent);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExpectedContextMenuTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExpectedContextMenuTest.java
deleted file mode 100644
index eb04202..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/ExpectedContextMenuTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ExpectedContextMenuTest extends AbstractMenuTest {
-
-    @Before
-    public void setup() {
-        abstractColumnMenuPresenter = new ExpectedContextMenu();
-        super.setup();
-    }
-
-    @Test
-    public void initMenu() {
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_COLUMN);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_INSERT_COLUMN_LEFT);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_INSERT_COLUMN_RIGHT);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DELETE_COLUMN);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DELETE_INSTANCE);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DUPLICATE_INSTANCE);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_LABEL);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_I18N);
-        abstractColumnMenuPresenter.initMenu();
-        assertEquals(ExpectedContextMenu.EXPECTCONTEXTMENU_EXPECT, abstractColumnMenuPresenter.COLUMNCONTEXTMENU_COLUMN);
-        assertEquals(ExpectedContextMenu.EXPECTCONTEXTMENU_INSERT_COLUMN_LEFT, abstractColumnMenuPresenter.COLUMNCONTEXTMENU_INSERT_COLUMN_LEFT);
-        assertEquals(ExpectedContextMenu.EXPECTCONTEXTMENU_INSERT_COLUMN_RIGHT, abstractColumnMenuPresenter.COLUMNCONTEXTMENU_INSERT_COLUMN_RIGHT);
-        assertEquals(ExpectedContextMenu.EXPECTCONTEXTMENU_DELETE_COLUMN, abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DELETE_COLUMN);
-        assertEquals(ExpectedContextMenu.EXPECTCONTEXTMENU_DELETE_INSTANCE, abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DELETE_INSTANCE);
-        assertEquals(abstractColumnMenuPresenter.constants.expect().toUpperCase(), abstractColumnMenuPresenter.COLUMNCONTEXTMENU_LABEL);
-        assertEquals("expect", abstractColumnMenuPresenter.COLUMNCONTEXTMENU_I18N);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/GivenContextMenuTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/GivenContextMenuTest.java
deleted file mode 100644
index 6f712ee..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/GivenContextMenuTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class GivenContextMenuTest extends AbstractMenuTest {
-
-    @Before
-    public void setup() {
-        abstractColumnMenuPresenter = new GivenContextMenu();
-        super.setup();
-    }
-
-    @Test
-    public void initMenu() {
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_COLUMN);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_INSERT_COLUMN_LEFT);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_INSERT_COLUMN_RIGHT);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DELETE_COLUMN);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DELETE_INSTANCE);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DUPLICATE_INSTANCE);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_LABEL);
-        assertNull(abstractColumnMenuPresenter.COLUMNCONTEXTMENU_I18N);
-        abstractColumnMenuPresenter.initMenu();
-        assertEquals(GivenContextMenu.GIVENCONTEXTMENU_GIVEN, abstractColumnMenuPresenter.COLUMNCONTEXTMENU_COLUMN);
-        assertEquals(GivenContextMenu.GIVENCONTEXTMENU_INSERT_COLUMN_LEFT, abstractColumnMenuPresenter.COLUMNCONTEXTMENU_INSERT_COLUMN_LEFT);
-        assertEquals(GivenContextMenu.GIVENCONTEXTMENU_INSERT_COLUMN_RIGHT, abstractColumnMenuPresenter.COLUMNCONTEXTMENU_INSERT_COLUMN_RIGHT);
-        assertEquals(GivenContextMenu.GIVENCONTEXTMENU_DELETE_COLUMN, abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DELETE_COLUMN);
-        assertEquals(GivenContextMenu.GIVENCONTEXTMENU_DELETE_INSTANCE, abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DELETE_INSTANCE);
-        assertEquals(GivenContextMenu.GIVENCONTEXTMENU_DUPLICATE_INSTANCE, abstractColumnMenuPresenter.COLUMNCONTEXTMENU_DUPLICATE_INSTANCE);
-        assertEquals(abstractColumnMenuPresenter.constants.given().toUpperCase(), abstractColumnMenuPresenter.COLUMNCONTEXTMENU_LABEL);
-        assertEquals("given", abstractColumnMenuPresenter.COLUMNCONTEXTMENU_I18N);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/GridContextMenuTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/GridContextMenuTest.java
deleted file mode 100644
index fc66831..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/GridContextMenuTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import com.google.web.bindery.event.shared.Event;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.DeleteRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DuplicateRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.InsertRowEvent;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.editor.menu.GridContextMenu.GRIDCONTEXTMENU_DELETE_ROW;
-import static org.drools.workbench.screens.scenariosimulation.client.editor.menu.GridContextMenu.GRIDCONTEXTMENU_DUPLICATE_ROW;
-import static org.drools.workbench.screens.scenariosimulation.client.editor.menu.GridContextMenu.GRIDCONTEXTMENU_GRID_TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.editor.menu.GridContextMenu.GRIDCONTEXTMENU_INSERT_ROW_ABOVE;
-import static org.drools.workbench.screens.scenariosimulation.client.editor.menu.GridContextMenu.GRIDCONTEXTMENU_INSERT_ROW_BELOW;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class GridContextMenuTest {
-
-    @Mock
-    protected LIElement insertRowAboveLIElementMock;
-    @Mock
-    protected LIElement insertRowBelowLIElementMock;
-    @Mock
-    protected LIElement duplicateRowLIElementMock;
-    @Mock
-    protected LIElement deleteRowLIElementMock;
-    @Mock
-    protected LIElement createdElementMock;
-    @Mock
-    protected LIElement gridTitleElementMock;
-
-    protected GridContextMenu gridContextMenuSpy;
-
-    @Before
-    public void setup() {
-        gridContextMenuSpy = spy(new GridContextMenu() {
-
-            {
-                this.insertRowAboveLIElement = insertRowAboveLIElementMock;
-                this.insertRowBelowLIElement= insertRowBelowLIElementMock;
-                this.duplicateRowLIElement = duplicateRowLIElementMock;
-                this.deleteRowLIElement = deleteRowLIElementMock;
-                this.gridTitleElement = gridTitleElementMock;
-            }
-
-            @Override
-            public LIElement addExecutableMenuItem(String id, String label, String i18n) {
-                return createdElementMock;
-            }
-
-            @Override
-            public void mapEvent(LIElement executableMenuItem, Event toBeMapped) {
-                //Do nothing
-            }
-
-            @Override
-            protected void updateExecutableMenuItemAttributes(LIElement toUpdate, String id, String label, String i18n) {
-                //Do nothing
-            }
-
-            @Override
-            public LIElement addMenuItem(String id, String label, String i18n) {
-                return createdElementMock;
-            }
-
-            @Override
-            public void removeMenuItem(LIElement toRemove) {
-                //Do nothing
-            }
-
-            @Override
-            public void show(GridWidget gridWidget, int mx, int my) {
-                //Do nothing
-            }
-        });
-    }
-
-    @Test
-    public void initMenu() {
-        initMenu(gridContextMenuSpy);
-    }
-
-    @Test
-    public void show_Simulation() {
-        show(gridContextMenuSpy, GridWidget.SIMULATION, ScenarioSimulationEditorConstants.INSTANCE.scenario(), "scenario", 0, 0, 1);
-    }
-
-    @Test
-    public void show_Background() {        String expectedLabel;
-        show(gridContextMenuSpy, GridWidget.BACKGROUND, ScenarioSimulationEditorConstants.INSTANCE.background(), "background", 0, 0, 1);
-    }
-
-    protected void initMenu(GridContextMenu gridContextMenu) {
-        gridContextMenu.initMenu();
-        verify(gridContextMenu, times(1)).addExecutableMenuItem(eq(GRIDCONTEXTMENU_INSERT_ROW_ABOVE), eq(ScenarioSimulationEditorConstants.INSTANCE.insertRowAbove()), eq("insertRowAbove"));
-        verify(gridContextMenu, times(1)).addExecutableMenuItem(eq(GRIDCONTEXTMENU_INSERT_ROW_BELOW), eq(ScenarioSimulationEditorConstants.INSTANCE.insertRowBelow()), eq("insertRowBelow"));
-        verify(gridContextMenu, times(1)).addExecutableMenuItem(eq(GRIDCONTEXTMENU_DUPLICATE_ROW), eq(ScenarioSimulationEditorConstants.INSTANCE.duplicateRow()), eq("duplicateRow"));
-        verify(gridContextMenu, times(1)).addExecutableMenuItem(eq(GRIDCONTEXTMENU_DELETE_ROW), eq(ScenarioSimulationEditorConstants.INSTANCE.deleteRow()), eq("deleteRow"));
-    }
-
-    protected void show(GridContextMenu gridContextMenu, GridWidget gridWidget, String expectedLabel, String expectedI18n, int mx, int my, int rowIndex) {
-        gridContextMenu.show(gridWidget, mx, my, rowIndex);
-        verify(gridContextMenu, times(1)).show(eq(gridWidget), eq(0), eq(0));
-        verify(gridContextMenu, times(1)).mapEvent(eq(insertRowAboveLIElementMock), isA(InsertRowEvent.class));
-        verify(gridContextMenu, times(1)).mapEvent(eq(insertRowBelowLIElementMock), isA(InsertRowEvent.class));
-        verify(gridContextMenu, times(1)).mapEvent(eq(duplicateRowLIElementMock), isA(DuplicateRowEvent.class));
-        verify(gridContextMenu, times(1)).mapEvent(eq(deleteRowLIElementMock), isA(DeleteRowEvent.class));
-        verify(gridContextMenu, times(1)).updateMenuItemAttributes(eq(gridTitleElementMock), eq(GRIDCONTEXTMENU_GRID_TITLE), eq(expectedLabel), eq(expectedI18n));
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/HeaderGivenColumnGridContextMenuTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/HeaderGivenColumnGridContextMenuTest.java
deleted file mode 100644
index 497e7e7..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/HeaderGivenColumnGridContextMenuTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.user.client.ui.RootPanel;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import com.google.web.bindery.event.shared.Event;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.AppendColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.PrependColumnEvent;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.editor.menu.HeaderGivenContextMenu.HEADERGIVENCONTEXTMENU_GRID_TITLE;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class HeaderGivenColumnGridContextMenuTest {
-
-    @Mock
-    private RootPanel rootPanelMock;
-
-    @Mock
-    private LIElement appendColumnElementMock;
-    @Mock
-    private LIElement prependColumnElementMock;
-    @Mock
-    private LIElement gridTitleElementMock;
-    @Mock
-    private BaseMenuView viewMock;
-    @Mock
-    private UListElement contextMenuDropdownMock;
-    @Mock
-    private Style styleMock;
-
-    private HeaderGivenContextMenu headerGivenContextMenuSpy;
-
-    @Before
-    public void setup() {
-        when(contextMenuDropdownMock.getStyle()).thenReturn(styleMock);
-        when(viewMock.getContextMenuDropdown()).thenReturn(contextMenuDropdownMock);
-        headerGivenContextMenuSpy = spy(new HeaderGivenContextMenu() {
-
-            {
-                this.appendColumnElement = appendColumnElementMock;
-                this.prependColumnElement = prependColumnElementMock;
-                this.gridTitleElement = gridTitleElementMock;
-                this.view = viewMock;
-            }
-
-            @Override
-            public void mapEvent(LIElement executableMenuItem, Event toBeMapped) {
-                //Do nothing
-            }
-
-            @Override
-            protected void updateExecutableMenuItemAttributes(LIElement toUpdate, String id, String label, String i18n) {
-                //Do nothing
-            }
-
-            @Override
-            public void show(final int mx, final int my) {
-                //Do nothing
-            }
-
-            @Override
-            public void hide() {
-
-            }
-
-            @Override
-            protected RootPanel getRootPanel() {
-                return rootPanelMock;
-            }
-        });
-    }
-
-    @Test
-    public void show_Simulation() {
-        headerGivenContextMenuSpy.show(GridWidget.SIMULATION, 0, 0);
-        verify(headerGivenContextMenuSpy, never()).updateMenuItemAttributes(eq(gridTitleElementMock), eq(HEADERGIVENCONTEXTMENU_GRID_TITLE), eq(ScenarioSimulationEditorConstants.INSTANCE.background()), eq("background"));
-        verify(headerGivenContextMenuSpy, times(1)).updateMenuItemAttributes(eq(gridTitleElementMock), eq(HEADERGIVENCONTEXTMENU_GRID_TITLE), eq(ScenarioSimulationEditorConstants.INSTANCE.scenario()), eq("scenario"));
-        verify(headerGivenContextMenuSpy, times(1)).mapEvent(eq(appendColumnElementMock), isA(AppendColumnEvent.class));
-        verify(headerGivenContextMenuSpy, times(1)).mapEvent(eq(prependColumnElementMock), isA(PrependColumnEvent.class));
-    }
-
-    @Test
-    public void show_Background() {
-        headerGivenContextMenuSpy.show(GridWidget.BACKGROUND, 0, 0);
-        verify(headerGivenContextMenuSpy, times(1)).updateMenuItemAttributes(eq(gridTitleElementMock), eq(HEADERGIVENCONTEXTMENU_GRID_TITLE), eq(ScenarioSimulationEditorConstants.INSTANCE.background()), eq("background"));
-        verify(headerGivenContextMenuSpy, never()).updateMenuItemAttributes(eq(gridTitleElementMock), eq(HEADERGIVENCONTEXTMENU_GRID_TITLE), eq(ScenarioSimulationEditorConstants.INSTANCE.scenario()), eq("scenario"));
-        verify(headerGivenContextMenuSpy, times(1)).mapEvent(eq(appendColumnElementMock), isA(AppendColumnEvent.class));
-        verify(headerGivenContextMenuSpy, times(1)).mapEvent(eq(prependColumnElementMock), isA(PrependColumnEvent.class));
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemPresenterTest.java
deleted file mode 100644
index 36f429b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemPresenterTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertNotNull;
-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;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class MenuItemPresenterTest {
-
-    @Mock
-    private MenuItemViewImpl mockMenuItemViewImpl;
-
-    @Mock
-    private LIElement mockLIElement;
-
-    @Mock
-    private ViewsProvider mockViewsProvider;
-
-    private MenuItemPresenter menuItemPresenter;
-
-    @Before
-    public void setup() {
-        when(mockViewsProvider.getMenuItemView()).thenReturn(mockMenuItemViewImpl);
-        when(mockMenuItemViewImpl.getLabelMenuElement()).thenReturn(mockLIElement);
-
-        this.menuItemPresenter = spy(new MenuItemPresenter() {
-            {
-                this.viewsProvider = mockViewsProvider;
-            }
-        });
-    }
-
-    @Test
-    public void onClickEvent() {
-        ClickEvent mockClickEvent = mock(ClickEvent.class);
-        menuItemPresenter.onClickEvent(mockClickEvent);
-        verify(mockClickEvent, times(1)).preventDefault();
-        verify(mockClickEvent, times(1)).stopPropagation();
-    }
-
-    @Test
-    public void getLIElement() {
-        LIElement liElement = menuItemPresenter.getLabelMenuElement("TEST-ID", "TEST-LABEL");
-        assertNotNull(liElement);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemViewImplTest.java
deleted file mode 100644
index 3d10543..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/menu/MenuItemViewImplTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.menu;
-
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class MenuItemViewImplTest {
-
-    private MenuItemViewImpl menuItemView;
-
-    @Mock
-    private MenuItemPresenter mockMenuItemPresenter;
-
-    @Before
-    public void setup() {
-        this.menuItemView = spy(new MenuItemViewImpl() {
-            {
-
-            }
-        });
-        menuItemView.setPresenter(mockMenuItemPresenter);
-    }
-
-    @Test
-    public void onClickEvent() {
-        ClickEvent mockClickEvent = mock(ClickEvent.class);
-        menuItemView.onClickEvent(mockClickEvent);
-        verify(mockMenuItemPresenter, times(1)).onClickEvent(mockClickEvent);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDMNDataManagementStrategyTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDMNDataManagementStrategyTest.java
deleted file mode 100644
index eb27656..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDMNDataManagementStrategyTest.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.strategies;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.editor.AbstractScenarioSimulationEditorTest;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.uberfire.backend.vfs.Path;
-
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class AbstractDMNDataManagementStrategyTest extends AbstractScenarioSimulationEditorTest {
-
-    private AbstractDMNDataManagementStrategy abstractDMNDataManagementStrategySpy;
-    private AbstractDMNDataManagementStrategy.ResultHolder factModelTreeHolderlocal;
-
-    private FactModelTuple factModelTupleLocal;
-    private SortedMap<String, FactModelTree> visibleFactsLocal = new TreeMap<>();
-    private SortedMap<String, FactModelTree> hiddenFactsLocal = new TreeMap<>();
-
-    private final String DMN_FILE_PATH = "DMN_FILE_PATH";
-
-    @Before
-    public void setup() {
-        super.setup();
-        factModelTupleLocal = new FactModelTuple(visibleFactsLocal, hiddenFactsLocal);
-        factModelTreeHolderlocal = new AbstractDataManagementStrategy.ResultHolder();
-        factModelTreeHolderlocal.setFactModelTuple(factModelTupleLocal);
-        when(dmnTypeServiceMock.retrieveFactModelTuple(any(), anyString())).thenReturn(factModelTupleLocal);
-        modelLocal.getSettings().setDmnFilePath(DMN_FILE_PATH);
-        abstractDMNDataManagementStrategySpy = spy(new AbstractDMNDataManagementStrategy(mock(EventBus.class)) {
-            @Override
-            protected void retrieveFactModelTuple(TestToolsView.Presenter testToolsPresenter, ScenarioSimulationContext context, GridWidget gridWidget) {
-
-            }
-
-            {
-                this.currentPath = mock(Path.class);
-                this.model = modelLocal;
-                this.factModelTreeHolder = factModelTreeHolderlocal;
-                this.dmnFilePath = DMN_FILE_PATH;
-            }
-        });
-    }
-
-    @Test
-    public void populateTestToolsWithoutFactModelTuple() {
-        factModelTreeHolderlocal.setFactModelTuple(null);
-        abstractDMNDataManagementStrategySpy.populateTestTools(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMNDataManagementStrategySpy, times(1)).retrieveFactModelTuple(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMNDataManagementStrategySpy, never()).getSuccessCallback(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMNDataManagementStrategySpy, never()).getSuccessCallbackMethod(factModelTupleLocal, testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-    }
-
-    @Test
-    public void populateTestToolsWithoutFactModelTupleAndDifferentDMNPath() {
-        factModelTreeHolderlocal.setFactModelTuple(null);
-        modelLocal.getSettings().setDmnName("/src/test.dmn");
-        abstractDMNDataManagementStrategySpy.populateTestTools(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMNDataManagementStrategySpy, times(1)).retrieveFactModelTuple(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMNDataManagementStrategySpy, never()).getSuccessCallback(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMNDataManagementStrategySpy, never()).getSuccessCallbackMethod(factModelTupleLocal, testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-    }
-
-    @Test
-    public void populateTestToolsWithFactDifferentDMNPath() {
-        modelLocal.getSettings().setDmnName("/src/test.dmn");
-        abstractDMNDataManagementStrategySpy.populateTestTools(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMNDataManagementStrategySpy, never()).retrieveFactModelTuple(any(), any(), any());
-        verify(abstractDMNDataManagementStrategySpy, times(1)).getSuccessCallback(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMNDataManagementStrategySpy, times(1)).getSuccessCallbackMethod(factModelTupleLocal, testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-    }
-
-    @Test
-    public void populateTestToolsWithFactModelTuple() {
-        abstractDMNDataManagementStrategySpy.populateTestTools(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMNDataManagementStrategySpy, never()).retrieveFactModelTuple(any(), any(), any());
-        verify(abstractDMNDataManagementStrategySpy, times(1)).getSuccessCallback(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMNDataManagementStrategySpy, times(1)).getSuccessCallbackMethod(factModelTupleLocal, testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-    }
-
-    @Test
-    public void isADataType() {
-        visibleFactsLocal.clear();
-        hiddenFactsLocal.clear();
-        commonIsADataType("TEST", false);
-        visibleFactsLocal.put("TEST", new FactModelTree());
-        commonIsADataType("TOAST", false);
-        commonIsADataType("TEST", true);
-        visibleFactsLocal.clear();
-        hiddenFactsLocal.put("TEST", new FactModelTree());
-        commonIsADataType("TOAST", false);
-        commonIsADataType("TEST", true);
-    }
-
-    private void commonIsADataType(String value, boolean expected) {
-        boolean retrieved = abstractDMNDataManagementStrategySpy.isADataType(value);
-        if (expected) {
-            assertTrue(retrieved);
-        } else {
-            assertFalse(retrieved);
-        }
-    }
-
-    @Test
-    public void getSuccessCallbackMethod() {
-        Map<String, List<String>> alreadyAssignedProperties = new HashMap<>();
-        factModelTreeHolderlocal.setFactModelTuple(null);
-        doReturn(alreadyAssignedProperties).when(abstractDMNDataManagementStrategySpy).getPropertiesToHide(scenarioGridModelMock);
-        abstractDMNDataManagementStrategySpy.getSuccessCallbackMethod(factModelTupleLocal, testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMNDataManagementStrategySpy, times(1)).getPropertiesToHide(scenarioGridModelMock);
-        verify(abstractDMNDataManagementStrategySpy, times(1)).storeData(factModelTupleLocal, testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMNDataManagementStrategySpy, times(1)).showErrorsAndCleanupState(factModelTupleLocal);
-        assertEquals(factModelTupleLocal, factModelTreeHolderlocal.getFactModelTuple());
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDMODataManagementStrategyTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDMODataManagementStrategyTest.java
deleted file mode 100644
index e49586b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDMODataManagementStrategyTest.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.strategies;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.TestProperties;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.editor.AbstractScenarioSimulationEditorTest;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.drools.workbench.screens.scenariosimulation.model.dmo.FieldAccessorsAndMutators;
-import org.drools.workbench.screens.scenariosimulation.model.dmo.ModelField;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.uberfire.client.callbacks.Callback;
-
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PACKAGE;
-import static org.drools.workbench.screens.scenariosimulation.model.dmo.ModelField.FIELD_CLASS_TYPE.REGULAR_CLASS;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class AbstractDMODataManagementStrategyTest extends AbstractScenarioSimulationEditorTest {
-
-    private final static String PARAMETRIC_FIELD_TYPE = "ParametricFieldType";
-    private AbstractDMODataManagementStrategy abstractDMODataManagementStrategySpy;
-    private AbstractDMODataManagementStrategy.ResultHolder factModelTreeHolderlocal;
-
-    private FactModelTuple factModelTupleLocal;
-    private SortedMap<String, FactModelTree> visibleFactsLocal;
-    private SortedMap<String, FactModelTree> hiddenFactsLocal;
-    private List<String> factTypes;
-
-    @Before
-    public void setup() {
-        super.setup();
-        factTypes = new ArrayList<>();
-        visibleFactsLocal = new TreeMap<>();
-        hiddenFactsLocal = new TreeMap<>();
-        factModelTupleLocal = new FactModelTuple(visibleFactsLocal, hiddenFactsLocal);
-        factModelTreeHolderlocal = new AbstractDataManagementStrategy.ResultHolder();
-        factModelTreeHolderlocal.setFactModelTuple(factModelTupleLocal);
-        abstractDMODataManagementStrategySpy = spy(new AbstractDMODataManagementStrategy() {
-
-            @Override
-            public boolean isADataType(String value) {
-                return false;
-            }
-
-            @Override
-            protected String getFQCNByFactName(String factName) {
-                return FULL_CLASS_NAME;
-            }
-
-            @Override
-            protected String getParametricFieldType(String factName, String propertyName) {
-                return PARAMETRIC_FIELD_TYPE;
-            }
-
-            @Override
-            protected List<String> getFactTypes() {
-                return factTypes;
-            }
-
-            @Override
-            protected void getSuperType(String factType, Callback<String> callback) {
-                // Do Nothing
-            }
-
-            @Override
-            protected boolean skipPopulateTestTools() {
-                return false;
-            }
-
-            @Override
-            protected void manageDataObjects(List<String> dataObjectsTypes, Map<String, String> superTypeMap, TestToolsView.Presenter testToolsPresenter, int expectedElements, SortedMap<String, FactModelTree> dataObjectsFieldsMap, ScenarioSimulationContext context, List<String> simpleJavaTypes, GridWidget gridWidget) {
-
-            }
-
-            {
-                this.model = modelLocal;
-                this.factModelTreeHolder = factModelTreeHolderlocal;
-            }
-
-
-        });
-    }
-
-    @Test
-    public void populateTestToolsWithoutFactModelTuple() {
-        factModelTreeHolderlocal.setFactModelTuple(null);
-        abstractDMODataManagementStrategySpy.populateTestTools(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMODataManagementStrategySpy, never()).storeData(factModelTupleLocal, testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMODataManagementStrategySpy, times(1)).aggregatorCallbackMethod(eq(testToolsPresenterMock), eq(0), isA(SortedMap.class), eq(scenarioSimulationContextLocal), eq(null), isA(List.class), eq(GridWidget.SIMULATION));
-        verify(abstractDMODataManagementStrategySpy, never()).loadSuperTypes(any(), any(), anyInt(), any(), any(), any(), any(), any());
-    }
-
-    @Test
-    public void populateTestToolsWithoutFactModelTupleWithFactTypes() {
-        factTypes.add(TestProperties.CLASS_NAME);
-        factModelTreeHolderlocal.setFactModelTuple(null);
-        abstractDMODataManagementStrategySpy.populateTestTools(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMODataManagementStrategySpy, never()).storeData(factModelTupleLocal, testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMODataManagementStrategySpy, never()).aggregatorCallbackMethod(any(), anyInt(), any(), any(), any(), any(), any());
-        verify(abstractDMODataManagementStrategySpy, times(1)).loadSuperTypes(isA(List.class), eq(testToolsPresenterMock), eq(1), isA(SortedMap.class), isA(Map.class), eq(scenarioSimulationContextLocal), isA(List.class), eq(GridWidget.SIMULATION));
-    }
-
-    @Test
-    public void populateTestToolsWithFactModelTuple() {
-        abstractDMODataManagementStrategySpy.populateTestTools(testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMODataManagementStrategySpy, times(1)).storeData(factModelTupleLocal, testToolsPresenterMock, scenarioSimulationContextLocal, GridWidget.SIMULATION);
-        verify(abstractDMODataManagementStrategySpy, never()).loadSuperTypes(any(), any(), anyInt(), any(), any(), any(), any(), any());
-        verify(abstractDMODataManagementStrategySpy, never()).aggregatorCallbackMethod(any(), anyInt(), any(), any(), any(), any(), any());
-    }
-
-    @Test
-    public void loadSuperTypes() {
-        String factType = "factType";
-        int expectedElement = 1;
-        List<String> dataObjectsType = Arrays.asList(factType);
-        SortedMap<String, FactModelTree> dataObjectsFieldMap = new TreeMap<>();
-        Map<String, String> superTypesMap = new HashMap<>();
-        List<String> javaSimpleType = new ArrayList<>();
-        abstractDMODataManagementStrategySpy.loadSuperTypes(dataObjectsType, testToolsPresenterMock, expectedElement, dataObjectsFieldMap, superTypesMap, scenarioSimulationContextLocal, javaSimpleType, GridWidget.SIMULATION);
-        verify(abstractDMODataManagementStrategySpy, times(1)).superTypeAggregatorCallBack(dataObjectsType, superTypesMap, testToolsPresenterMock, expectedElement, dataObjectsFieldMap, scenarioSimulationContextLocal, javaSimpleType, GridWidget.SIMULATION, factType);
-        verify(abstractDMODataManagementStrategySpy, times(1)).getSuperType(eq(factType), isA(Callback.class));
-    }
-
-    @Test
-    public void superTypeAggregatorCallBack() {
-        String factType = "factType";
-        String factType2 = "factType2";
-        int expectedElement = 2;
-        List<String> dataObjectsType = Arrays.asList(factType, factType2);
-        SortedMap<String, FactModelTree> dataObjectsFieldMap = new TreeMap<>();
-        Map<String, String> superTypesMap = new HashMap<>();
-        List<String> javaSimpleType = new ArrayList<>();
-        Callback<String> callback = abstractDMODataManagementStrategySpy.superTypeAggregatorCallBack(dataObjectsType, superTypesMap, testToolsPresenterMock, expectedElement, dataObjectsFieldMap, scenarioSimulationContextLocal, javaSimpleType, GridWidget.SIMULATION, factType);
-        callback.callback(Object.class.getCanonicalName());
-        assertTrue(superTypesMap.containsKey(factType));
-        assertEquals(Object.class.getCanonicalName(), superTypesMap.get(factType));
-        Callback<String> callback2 = abstractDMODataManagementStrategySpy.superTypeAggregatorCallBack(dataObjectsType, superTypesMap, testToolsPresenterMock, expectedElement, dataObjectsFieldMap, scenarioSimulationContextLocal, javaSimpleType, GridWidget.SIMULATION, factType2);
-        callback2.callback(Class.class.getCanonicalName());
-        assertTrue(superTypesMap.containsKey(factType2));
-        assertEquals(Class.class.getCanonicalName(), superTypesMap.get(factType2));
-        verify(abstractDMODataManagementStrategySpy, times(1)).manageDataObjects(dataObjectsType, superTypesMap, testToolsPresenterMock, expectedElement, dataObjectsFieldMap, scenarioSimulationContextLocal, javaSimpleType, GridWidget.SIMULATION);
-    }
-
-    @Test
-    public void defineClassNameField_SimpleType() {
-        Map<String, String> superTypesMap = new HashMap<>();
-        String retrieved = abstractDMODataManagementStrategySpy.defineClassNameField(String.class.getSimpleName(), superTypesMap);
-        assertEquals(String.class.getCanonicalName(), retrieved);
-    }
-
-    @Test
-    public void defineClassNameField_NotSimpleNotEnum() {
-        Map<String, String> superTypesMap = new HashMap<>();
-        String retrieved = abstractDMODataManagementStrategySpy.defineClassNameField(TestProperties.CLASS_NAME, superTypesMap);
-        assertEquals(TestProperties.CLASS_NAME, retrieved);
-    }
-
-    @Test
-    public void defineClassNameField_NotSimpleEnum() {
-        Map<String, String> superTypesMap = new HashMap<>();
-        superTypesMap.put(TestProperties.CLASS_NAME, Enum.class.getCanonicalName());
-        String retrieved = abstractDMODataManagementStrategySpy.defineClassNameField(TestProperties.CLASS_NAME, superTypesMap);
-        assertEquals(FULL_CLASS_NAME, retrieved);
-    }
-
-    @Test
-    public void getFactModelTree() {
-        Map<String, FactModelTree.PropertyTypeName> simpleProperties = getSimplePropertiesInner();
-        final ModelField[] modelFields = getModelFieldsInner(simpleProperties);
-        final FactModelTree retrieved = abstractDMODataManagementStrategySpy.getFactModelTree(FACT_NAME, Collections.emptyMap(), modelFields);
-        assertNotNull(retrieved);
-        assertEquals(FACT_NAME, retrieved.getFactName());
-        assertEquals(FULL_PACKAGE, retrieved.getFullPackage());
-        assertFalse(retrieved.getSimpleProperties().isEmpty());
-        retrieved.getSimpleProperties().entrySet().forEach(
-                entry -> {
-                    assertFalse(entry.getValue().getBaseTypeName().isPresent());
-                    assertEquals(entry.getValue().getTypeName(), entry.getValue().getPropertyTypeNameToVisualize());
-                }
-        );
-    }
-
-    @Test
-    public void getFactModelTreeEnumClass() {
-        final ModelField[] modelFields = {};
-        Map<String, String> superTypesMap = new HashMap<>();
-        superTypesMap.put(FACT_NAME, Enum.class.getCanonicalName());
-        final FactModelTree retrieved = abstractDMODataManagementStrategySpy.getFactModelTree(FACT_NAME, superTypesMap, modelFields);
-        assertNotNull(retrieved);
-        assertEquals(FACT_NAME, retrieved.getFactName());
-        assertEquals(FULL_PACKAGE, retrieved.getFullPackage());
-        assertTrue(retrieved.getSimpleProperties().containsKey(TestProperties.LOWER_CASE_VALUE));
-        assertEquals(FULL_CLASS_NAME, retrieved.getSimpleProperties().get(TestProperties.LOWER_CASE_VALUE).getTypeName());
-        assertEquals(FULL_CLASS_NAME, retrieved.getSimpleProperties().get(TestProperties.LOWER_CASE_VALUE).getPropertyTypeNameToVisualize());
-        assertFalse(retrieved.getSimpleProperties().get(TestProperties.LOWER_CASE_VALUE).getBaseTypeName().isPresent());
-        assertEquals(FULL_CLASS_NAME, retrieved.getSimpleProperties().get(TestProperties.LOWER_CASE_VALUE).getPropertyTypeNameToVisualize());
-    }
-
-    private ModelField[] getModelFieldsInner(Map<String, FactModelTree.PropertyTypeName> simpleProperties) {
-        List<ModelField> toReturn = new ArrayList<>();
-        simpleProperties.forEach((key, value) -> toReturn.add(getModelFieldInner(key, value.getTypeName(), "String")));
-        return toReturn.toArray(new ModelField[toReturn.size()]);
-    }
-
-    private ModelField getModelFieldInner(final String name,
-                                          final String clazz,
-                                          final String type) {
-        return new ModelField(name,
-                              clazz,
-                              REGULAR_CLASS,
-                              ModelField.FIELD_ORIGIN.DECLARED,
-                              FieldAccessorsAndMutators.BOTH, type);
-    }
-
-    private Map<String, FactModelTree.PropertyTypeName> getSimplePropertiesInner() {
-        String[] keys = getRandomStringArray();
-        return Arrays.stream(keys)
-                .collect(Collectors.toMap(key -> key,
-                        key -> new FactModelTree.PropertyTypeName(key += "_VALUE")));
-    }
-
-    private String[] getRandomStringArray() {
-        return new String[]{randomAlphabetic(3), randomAlphabetic(4), randomAlphabetic(5)};
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDataManagementStrategyTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDataManagementStrategyTest.java
deleted file mode 100644
index d8a3dce..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/editor/strategies/AbstractDataManagementStrategyTest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.editor.strategies;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.TestProperties;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.editor.AbstractScenarioSimulationEditorTest;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsPresenterData;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class AbstractDataManagementStrategyTest extends AbstractScenarioSimulationEditorTest {
-
-    protected AbstractDataManagementStrategy abstractDataManagementStrategySpy;
-
-    @Captor
-    ArgumentCaptor<TestToolsPresenterData> testToolsPresenterDataArgumentCaptor;
-
-    public void setup() {
-        super.setup();
-        abstractDataManagementStrategySpy = spy(new AbstractDataManagementStrategy() {
-
-            @Override
-            public void populateTestTools(TestToolsView.Presenter testToolsPresenter, ScenarioSimulationContext context, GridWidget gridWidget) {
-
-            }
-
-            @Override
-            public boolean isADataType(String value) {
-                return false;
-            }
-        });
-    }
-
-    @Test
-    public void getSimpleClassFactModelTree() {
-        Class[] expectedClazzes = {String.class, Boolean.class, Integer.class, Double.class, Number.class};
-        for (Class expectedClazz : expectedClazzes) {
-            final FactModelTree retrieved = AbstractDataManagementStrategy.getSimpleClassFactModelTree(
-                    expectedClazz.getSimpleName(),
-                    expectedClazz.getCanonicalName());
-            assertNotNull(retrieved);
-            String key = expectedClazz.getSimpleName();
-            assertEquals(key, retrieved.getFactName());
-            String fullName = expectedClazz.getCanonicalName();
-            String packageName = fullName.substring(0, fullName.lastIndexOf("."));
-            assertEquals(packageName, retrieved.getFullPackage());
-            Map<String, FactModelTree.PropertyTypeName> simpleProperties = retrieved.getSimpleProperties();
-            assertNotNull(simpleProperties);
-            assertEquals(1, simpleProperties.size());
-            assertTrue(simpleProperties.containsKey(TestProperties.LOWER_CASE_VALUE));
-            FactModelTree.PropertyTypeName simplePropertyValue = simpleProperties.get(TestProperties.LOWER_CASE_VALUE);
-            assertNotNull(simplePropertyValue);
-            assertEquals(fullName, simplePropertyValue.getTypeName());
-            assertEquals(fullName, simplePropertyValue.getPropertyTypeNameToVisualize());
-            assertFalse(simplePropertyValue.getBaseTypeName().isPresent());
-        }
-    }
-
-    @Test
-    public void setModel() {
-        abstractDataManagementStrategySpy.model = null;
-        ScenarioSimulationModel modelMock = mock(ScenarioSimulationModel.class);
-        abstractDataManagementStrategySpy.setModel(modelMock);
-        assertEquals(modelMock, abstractDataManagementStrategySpy.model);
-    }
-
-    @Test
-    public void getPropertiesToHideMapNotSelectedColumnNotInstanceAssigned() {
-        commonGetPropertiesToHideMap(true, false);
-    }
-
-    @Test
-    public void getPropertiesToHideMapSelectedColumnNotInstanceAssigned() {
-        commonGetPropertiesToHideMap(false, false);
-    }
-
-    @Test
-    public void getPropertiesToHideMapSelectedColumnInstanceAssigned() {
-        commonGetPropertiesToHideMap(false, true);
-    }
-
-    @Test
-    public void getPropertiesToHideListNoPropertyAssigned() {
-        commonGetPropertiesToHideList(false);
-    }
-
-    @Test
-    public void getPropertiesToHideListPropertyAssigned() {
-        commonGetPropertiesToHideList(true);
-    }
-
-    @Test
-    public void storeDataSimulation() {
-        ScenarioSimulationContext scenarioSimulationContextSpy = spy(scenarioSimulationContextLocal);
-        doReturn(simulationMock).when(scenarioSimulationContextSpy).getAbstractScesimModelByGridWidget(GridWidget.SIMULATION);
-        final FactModelTuple factModelTuple = getFactTuple();
-        abstractDataManagementStrategySpy.storeData(factModelTuple, testToolsPresenterMock, scenarioSimulationContextSpy, GridWidget.SIMULATION);
-        verify(testToolsPresenterMock, times(1)).populateTestTools(testToolsPresenterDataArgumentCaptor.capture());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue().getDataObjectFieldsMap());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue().getHiddenFieldsMap());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue().getInstanceFieldsMap());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue().getPropertiesToHide());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue().getSimpleJavaInstanceFieldsMap());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue().getSimpleJavaTypeFieldsMap());
-        assertEquals(GridWidget.SIMULATION, testToolsPresenterDataArgumentCaptor.getValue().getGridWidget());
-        verify(scenarioSimulationContextSpy, times(1)).setDataObjectFieldsMap(isA(SortedMap.class));
-        verify(scenarioSimulationContextSpy, times(1)).setDataObjectsInstancesName(isA(Set.class));
-        verify(scenarioGridModelMock, times(1)).setSimpleJavaTypeInstancesName(isA(Set.class));
-    }
-
-    @Test
-    public void storeDataBackground() {
-        ScenarioSimulationContext scenarioSimulationContextSpy = spy(scenarioSimulationContextLocal);
-        doReturn(backgroundMock).when(scenarioSimulationContextSpy).getAbstractScesimModelByGridWidget(GridWidget.BACKGROUND);
-        final FactModelTuple factModelTuple = getFactTuple();
-        abstractDataManagementStrategySpy.storeData(factModelTuple, testToolsPresenterMock, scenarioSimulationContextSpy, GridWidget.BACKGROUND);
-        verify(testToolsPresenterMock, times(1)).populateTestTools(testToolsPresenterDataArgumentCaptor.capture());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue().getDataObjectFieldsMap());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue().getHiddenFieldsMap());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue().getInstanceFieldsMap());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue().getPropertiesToHide());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue().getSimpleJavaInstanceFieldsMap());
-        assertNotNull(testToolsPresenterDataArgumentCaptor.getValue().getSimpleJavaTypeFieldsMap());
-        assertEquals(GridWidget.BACKGROUND, testToolsPresenterDataArgumentCaptor.getValue().getGridWidget());
-        verify(scenarioSimulationContextSpy, times(1)).setDataObjectFieldsMap(isA(SortedMap.class));
-        verify(scenarioSimulationContextSpy, never()).setDataObjectsInstancesName(isA(Set.class));
-        verify(backgroundGridModelMock, never()).setSimpleJavaTypeInstancesName(isA(Set.class));
-    }
-
-    @Test
-    public void getInstanceMap() {
-        SortedMap<String, FactModelTree> sourceMap = getSourceMap();
-        SortedMap<String, FactModelTree> retrieved = abstractDataManagementStrategySpy.getInstanceMap(sourceMap);
-        assertNotNull(retrieved);
-        assertTrue(retrieved.isEmpty());
-        abstractDataManagementStrategySpy.setModel(modelLocal);
-        retrieved = abstractDataManagementStrategySpy.getInstanceMap(sourceMap);
-        assertNotNull(retrieved);
-        // " is the number of factmappings - inside modelLocal - whose class is "Void"
-        assertEquals(2, retrieved.size());
-    }
-
-    private SortedMap<String, FactModelTree> getSourceMap() {
-        SortedMap<String, FactModelTree> toReturn = new TreeMap<>();
-        FactModelTree toPut = new FactModelTree("Void", "package", new HashMap<>(), new HashMap<>());
-        toReturn.put("Void", toPut);
-        return toReturn;
-    }
-
-    private FactModelTuple getFactTuple() {
-        return new FactModelTuple(new TreeMap<>(), new TreeMap<>());
-    }
-
-    private void commonGetPropertiesToHideMap(boolean selectedColumnNull, boolean isInstanceAssigned) {
-        if (selectedColumnNull) {
-            doReturn(null).when(scenarioGridModelMock).getSelectedColumn();
-        } else if (isInstanceAssigned) {
-            doReturn(gridColumnMock).when(scenarioGridModelMock).getSelectedColumn();
-            doReturn(true).when(gridColumnMock).isInstanceAssigned();
-            doReturn(new ArrayList<>()).when(abstractDataManagementStrategySpy).getPropertiesToHide(gridColumnMock, scenarioGridModelMock);
-        }
-        final Map<String, List<List<String>>> retrieved = abstractDataManagementStrategySpy.getPropertiesToHide(scenarioGridModelMock);
-        if (selectedColumnNull) {
-            assertTrue(retrieved.isEmpty());
-            verify(abstractDataManagementStrategySpy, never()).getPropertiesToHide(isA(ScenarioGridColumn.class), eq(scenarioGridModelMock));
-        } else if (isInstanceAssigned) {
-            verify(abstractDataManagementStrategySpy, times(1)).getPropertiesToHide(gridColumnMock, scenarioGridModelMock);
-        } else {
-            verify(abstractDataManagementStrategySpy, never()).getPropertiesToHide(isA(ScenarioGridColumn.class), eq(scenarioGridModelMock));
-        }
-        reset(abstractDataManagementStrategySpy);
-    }
-
-    private void commonGetPropertiesToHideList(boolean isPropertyAssigned) {
-        doReturn(isPropertyAssigned).when(gridColumnMock).isPropertyAssigned();
-        List<List<String>> retrieved = abstractDataManagementStrategySpy.getPropertiesToHide(gridColumnMock, scenarioGridModelMock);
-        if (isPropertyAssigned) {
-            assertTrue(retrieved.isEmpty());
-            verify(scenarioGridModelMock, never()).getAbstractScesimModel();
-        } else {
-            verify(scenarioGridModelMock, times(1)).getAbstractScesimModel();
-            verify(scenarioGridModelMock, times(1)).getInstanceScenarioGridColumns(gridColumnMock);
-        }
-        reset(scenarioGridModelMock);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/factories/AbstractFactoriesTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/factories/AbstractFactoriesTest.java
deleted file mode 100644
index 4c82c5b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/factories/AbstractFactoriesTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.factories;
-
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.user.client.Element;
-import com.google.gwtmockito.GwtMockito;
-import com.google.gwtmockito.fakes.FakeProvider;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.gwtbootstrap3.client.ui.TextArea;
-import org.junit.Before;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.widget.context.GridBodyCellRenderContext;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractFactoriesTest extends AbstractScenarioSimulationTest {
-
-    @Mock
-    protected TextArea textAreaMock;
-    @Mock
-    protected GridBodyCellRenderContext contextMock;
-    @Mock
-    protected Element elementMock;
-    @Mock
-    protected Style styleMock;
-
-    @Before
-    public void setup() {
-        super.setup();
-        when(elementMock.getStyle()).thenReturn(styleMock);
-        when(textAreaMock.getElement()).thenReturn(elementMock);
-        when(contextMock.getRowIndex()).thenReturn(ROW_INDEX);
-        when(contextMock.getColumnIndex()).thenReturn(COLUMN_INDEX);
-
-        GwtMockito.useProviderForType(TextArea.class, (FakeProvider<TextArea>) aClass -> textAreaMock);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactoryTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactoryTest.java
deleted file mode 100644
index 552fc85..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactoryTest.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.factories;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import com.google.gwt.event.dom.client.ContextMenuHandler;
-import com.google.gwt.event.dom.client.MouseWheelEvent;
-import com.google.gwt.event.dom.client.MouseWheelHandler;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.CollectionPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.CollectionViewImpl;
-import org.drools.workbench.screens.scenariosimulation.client.domelements.CollectionEditorDOMElement;
-import org.drools.workbench.screens.scenariosimulation.client.events.CloseCompositeEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SaveEditorEvent;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.CloseCompositeEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.SaveEditorEventHandler;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-
-import static org.drools.scenariosimulation.api.model.ScenarioSimulationModel.Type.DMN;
-import static org.drools.scenariosimulation.api.model.ScenarioSimulationModel.Type.RULE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.EXPECTED_MAP_FOR_EXPANDABLE_TYPE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.EXPECTED_MAP_FOR_EXPANDABLE_TYPE_2;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.EXPECTED_MAP_FOR_SIMPLE_TYPE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.EXPECTED_MAP_FOR_SIMPLE_TYPE_2;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_FACT_CLASSNAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LIST_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LOWER_CASE_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAP_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.NUMBER_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.STRING_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationUtils.isSimpleJavaType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class CollectionEditorSingletonDOMElementFactoryTest extends AbstractFactoriesTest {
-
-    protected CollectionEditorSingletonDOMElementFactory collectionEditorSingletonDOMElementFactorySpy;
-    protected CollectionViewImpl collectionEditorViewImpl;
-
-    @Mock
-    protected CollectionPresenter collectionPresenterMock;
-
-    @Mock
-    protected DivElement collectionEditorModalBodyMock;
-
-    @Mock
-    protected FactModelTree factModelTreeMock;
-
-    @Mock
-    protected FactModelTree factModelTreeMock1;
-
-    @Mock
-    protected FactModelTree factModelTreeMock2;
-
-    @Mock
-    protected FactModelTree factModelTreeMock3;
-
-    @Before
-    public void setup() {
-        super.setup();
-        this.collectionEditorViewImpl = spy(new CollectionViewImpl() {
-            {
-                this.presenter = collectionPresenterMock;
-                this.collectionEditorModalBody = collectionEditorModalBodyMock;
-            }
-        });
-
-        this.collectionEditorSingletonDOMElementFactorySpy = spy(new CollectionEditorSingletonDOMElementFactory(scenarioGridPanelMock,
-                                                                                                                scenarioGridLayerMock,
-                                                                                                                scenarioGridMock,
-                                                                                                                scenarioSimulationContextLocal,
-                                                                                                                viewsProviderMock));
-        factMappingMock.getGenericTypes().add(STRING_CLASS_NAME);
-        factMappingMock.getGenericTypes().add(NUMBER_CLASS_NAME);
-        when(factMappingMock.getFactAlias()).thenReturn(FULL_CLASS_NAME);
-        when(scenarioSimulationContextLocal.getDataObjectFieldsMap().get(any())).thenReturn(factModelTreeMock);
-        when(collectionEditorSingletonDOMElementFactorySpy.createWidget()).thenReturn(collectionEditorViewImpl);
-        /* This FactModelTree is used to test setCollectionEditorStructureData() method (return null in any case) */
-        when(factModelTreeMock.getSimpleProperties()).thenReturn(new HashMap<>());
-        when(factModelTreeMock.getExpandableProperties()).thenReturn(new HashMap<>());
-        /* This FactModelTree is used to test manageList and manageMap methods*/
-        when(factModelTreeMock1.getSimpleProperties()).thenReturn(EXPECTED_MAP_FOR_SIMPLE_TYPE);
-        when(factModelTreeMock1.getExpandableProperties()).thenReturn(EXPECTED_MAP_FOR_EXPANDABLE_TYPE);
-        when(scenarioSimulationContextLocal.getDataObjectFieldsMap().get(FULL_CLASS_NAME)).thenReturn(factModelTreeMock1);
-        EXPECTED_MAP_FOR_SIMPLE_TYPE.put("x", new FactModelTree.PropertyTypeName("y"));
-        EXPECTED_MAP_FOR_EXPANDABLE_TYPE.put("a", "b");
-        when(scenarioSimulationContextLocal.getDataObjectFieldsMap().get("testclass")).thenReturn(factModelTreeMock2);
-        when(factModelTreeMock2.getSimpleProperties()).thenReturn(EXPECTED_MAP_FOR_SIMPLE_TYPE_2);
-        when(factModelTreeMock2.getExpandableProperties()).thenReturn(EXPECTED_MAP_FOR_EXPANDABLE_TYPE);
-        EXPECTED_MAP_FOR_SIMPLE_TYPE_2.put("z", new FactModelTree.PropertyTypeName("w"));
-        when(scenarioSimulationContextLocal.getDataObjectFieldsMap().get(FULL_FACT_CLASSNAME)).thenReturn(factModelTreeMock3);
-        when(scenarioSimulationContextLocal.getDataObjectFieldsMap().get(CLASS_NAME)).thenReturn(factModelTreeMock3);
-        when(factModelTreeMock3.getSimpleProperties()).thenReturn(EXPECTED_MAP_FOR_SIMPLE_TYPE_2);
-        when(factModelTreeMock3.getExpandableProperties()).thenReturn(EXPECTED_MAP_FOR_EXPANDABLE_TYPE_2);
-        EXPECTED_MAP_FOR_EXPANDABLE_TYPE_2.put("a", FULL_CLASS_NAME);
-    }
-
-    @Test
-    public void createDomElement() {
-        when(scenarioGridModelMock.getSelectedCellsOrigin()).thenReturn(new GridData.SelectedCell(0, 0));
-        when(factMappingMock.getExpressionAlias()).thenReturn(MAP_CLASS_NAME);
-        when(factMappingMock.getClassName()).thenReturn(MAP_CLASS_NAME);
-        collectionEditorSingletonDOMElementFactorySpy.createDomElement(scenarioGridLayerMock, scenarioGridMock);
-        verify(collectionEditorViewImpl, times(1)).addDomHandler(isA(MouseWheelHandler.class), eq(MouseWheelEvent.getType()));
-        verify(collectionEditorViewImpl, times(1)).addDomHandler(isA(ContextMenuHandler.class), eq(ContextMenuEvent.getType()));
-    }
-
-    @Test
-    public void manageList() {
-        String key = FULL_CLASS_NAME + "#" + LIST_CLASS_NAME;
-        collectionEditorSingletonDOMElementFactorySpy.manageList(collectionEditorViewImpl, key, STRING_CLASS_NAME, ScenarioSimulationModel.Type.RULE);
-        Map<String, String> expectedMap1 = new HashMap<>();
-        expectedMap1.put(LOWER_CASE_VALUE, STRING_CLASS_NAME);
-        verify(collectionEditorViewImpl, times(1)).initListStructure(eq(key), eq(expectedMap1), isA(Map.class), eq(ScenarioSimulationModel.Type.RULE));
-        verify(collectionEditorSingletonDOMElementFactorySpy, times(1)).getExpandablePropertiesMap(eq(STRING_CLASS_NAME));
-    }
-
-    @Test
-    public void getExpandableProperties_SimpleType() {
-        Map<String, Map<String, String>> resultMap = collectionEditorSingletonDOMElementFactorySpy.getExpandablePropertiesMap(STRING_CLASS_NAME);
-        assertTrue(resultMap.isEmpty());
-    }
-
-    @Test
-    public void getExpandableProperties_NotSimpleType() {
-        Map<String, Map<String, String>> expectedResult = new HashMap<>();
-        expectedResult.put("a", Collections.singletonMap("z", "w"));
-        Map<String, Map<String, String>> resultMap = collectionEditorSingletonDOMElementFactorySpy.getExpandablePropertiesMap(FULL_FACT_CLASSNAME);
-        assertEquals(expectedResult, resultMap);
-    }
-
-    @Test
-    public void manageMap_RuleSimpleType() {
-        Map<String, String> expectedMap1 = new HashMap<>();
-        expectedMap1.put(LOWER_CASE_VALUE, NUMBER_CLASS_NAME);
-        manageMap(NUMBER_CLASS_NAME, RULE, expectedMap1);
-    }
-
-    @Test
-    public void manageMap_NotRuleSimpleType() {
-        Map<String, String> expectedMap1 = new HashMap<>();
-        expectedMap1.put(LOWER_CASE_VALUE, NUMBER_CLASS_NAME);
-        manageMap(NUMBER_CLASS_NAME, DMN, expectedMap1);
-    }
-
-    @Test
-    public void manageMap_NotRuleNotSimpleType() {
-        manageMap(FULL_CLASS_NAME, DMN, EXPECTED_MAP_FOR_EXPANDABLE_TYPE);
-    }
-
-    private void manageMap(String genericType1, ScenarioSimulationModel.Type type, Map<String, String> expectedMap1) {
-        String key = FULL_CLASS_NAME + "#" + LIST_CLASS_NAME;
-        Map<String, String> expectedMap0 = new HashMap<>();
-        doReturn(expectedMap0).when(collectionEditorSingletonDOMElementFactorySpy).getSimplePropertiesMap(eq(STRING_CLASS_NAME));
-        doReturn(expectedMap1).when(collectionEditorSingletonDOMElementFactorySpy).getSimplePropertiesMap(eq(genericType1));
-        collectionEditorSingletonDOMElementFactorySpy.manageMap(collectionEditorViewImpl, key, STRING_CLASS_NAME, genericType1, type);
-        verify(collectionEditorSingletonDOMElementFactorySpy, times(1)).getSimplePropertiesMap(STRING_CLASS_NAME);
-        verify(collectionEditorSingletonDOMElementFactorySpy, times(1)).getSimplePropertiesMap(genericType1);
-        verify(collectionEditorViewImpl, times(1)).initMapStructure(eq(key), eq(expectedMap0), eq(expectedMap1), eq(type));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void setCollectionEditorStructureData_EmptyPropertyClass() {
-        when(factMappingMock.getExpressionAlias()).thenReturn(MAP_CLASS_NAME);
-
-        setCollectionEditorStructureData();
-    }
-
-    @Test
-    public void setCollectionEditorStructureData_ManageMapRuleSimpleType() {
-        when(factMappingMock.getExpressionAlias()).thenReturn(MAP_CLASS_NAME);
-        when(factMappingMock.getClassName()).thenReturn(MAP_CLASS_NAME);
-        setCollectionEditorStructureData();
-    }
-
-    @Test
-    public void setCollectionEditorStructureData_ManageMapRule_NotSimpleType() {
-        when(factMappingMock.getExpressionAlias()).thenReturn(MAP_CLASS_NAME);
-        when(factMappingMock.getClassName()).thenReturn(MAP_CLASS_NAME);
-        factMappingMock.getGenericTypes().clear();
-        factMappingMock.getGenericTypes().add(FULL_CLASS_NAME);
-        factMappingMock.getGenericTypes().add(FULL_CLASS_NAME + "1");
-
-        setCollectionEditorStructureData();
-    }
-
-    @Test
-    public void setCollectionEditorStructureData_ManageMapRule() {
-        when(factMappingMock.getExpressionAlias()).thenReturn(MAP_CLASS_NAME);
-        when(factMappingMock.getClassName()).thenReturn(MAP_CLASS_NAME);
-
-        setCollectionEditorStructureData();
-    }
-
-    @Test
-    public void setCollectionEditorStructureData_ManageListRule() {
-        when(factMappingMock.getExpressionAlias()).thenReturn(LIST_CLASS_NAME);
-        when(factMappingMock.getClassName()).thenReturn(LIST_CLASS_NAME);
-
-        setCollectionEditorStructureData();
-    }
-
-    @Test
-    public void setCollectionEditorStructureData_ManageListDMN() {
-        when(factMappingMock.getExpressionAlias()).thenReturn(LIST_CLASS_NAME);
-        when(factMappingMock.getClassName()).thenReturn(LIST_CLASS_NAME);
-        settingsLocal.setType(DMN);
-        setCollectionEditorStructureData();
-    }
-
-    private void setCollectionEditorStructureData() {
-        collectionEditorSingletonDOMElementFactorySpy.setCollectionEditorStructureData(collectionEditorViewImpl, factMappingMock);
-        boolean isRule = RULE.equals(settingsLocal.getType());
-        String genericTypeName0 = factMappingMock.getGenericTypes().get(0);
-        String genericTypeName1 = factMappingMock.getGenericTypes().get(1);
-        if (isRule && !isSimpleJavaType(genericTypeName0)) {
-            verify(collectionEditorSingletonDOMElementFactorySpy, times(1)).getRuleComplexType(eq(genericTypeName0));
-            genericTypeName0 = genericTypeName0.substring(genericTypeName0.lastIndexOf(".") + 1);
-        }
-        String key = factMappingMock.getFactAlias() + "#" + factMappingMock.getExpressionAlias();
-        if (ScenarioSimulationSharedUtils.isList(factMappingMock.getExpressionAlias())) {
-            verify(collectionEditorSingletonDOMElementFactorySpy, times(1)).manageList(
-                    eq(collectionEditorViewImpl), eq(key), eq(genericTypeName0), eq(settingsLocal.getType()));
-        } else {
-            verify(collectionEditorSingletonDOMElementFactorySpy, times(1)).manageMap(
-                    eq(collectionEditorViewImpl), eq(key), eq(genericTypeName0), eq(genericTypeName1), eq(settingsLocal.getType()));
-        }
-    }
-
-    @Test
-    public void getRuleComplexType() {
-        String ruleComplexType = collectionEditorSingletonDOMElementFactorySpy.getRuleComplexType(FULL_CLASS_NAME);
-        assertEquals(CLASS_NAME, ruleComplexType);
-        //
-        ruleComplexType = collectionEditorSingletonDOMElementFactorySpy.getRuleComplexType("com.Test$Nested");
-        assertEquals("Test.Nested", ruleComplexType);
-    }
-
-    @Test
-    public void registerHandlers() {
-        CollectionEditorDOMElement collectionEditorDOMElementMock = mock(CollectionEditorDOMElement.class);
-        collectionEditorSingletonDOMElementFactorySpy.registerHandlers(collectionEditorViewImpl, collectionEditorDOMElementMock);
-
-        ArgumentCaptor<CloseCompositeEventHandler> closeHandler = ArgumentCaptor.forClass(CloseCompositeEventHandler.class);
-        verify(collectionEditorViewImpl, times(1)).addCloseCompositeEventHandler(closeHandler.capture());
-        closeHandler.getValue().onEvent(mock(CloseCompositeEvent.class));
-        verify(collectionEditorSingletonDOMElementFactorySpy).destroyResources();
-        verify(scenarioGridLayerMock).batch();
-        verify(scenarioGridPanelMock).setFocus(eq(true));
-        verify(collectionEditorDOMElementMock).stopEditingMode();
-
-        reset(collectionEditorSingletonDOMElementFactorySpy);
-        reset(scenarioGridLayerMock);
-        reset(scenarioGridPanelMock);
-
-        ArgumentCaptor<SaveEditorEventHandler> saveHandler = ArgumentCaptor.forClass(SaveEditorEventHandler.class);
-        verify(collectionEditorViewImpl, times(1)).addSaveEditorEventHandler(saveHandler.capture());
-
-        saveHandler.getValue().onEvent(mock(SaveEditorEvent.class));
-        verify(collectionEditorSingletonDOMElementFactorySpy).flush();
-        verify(scenarioGridLayerMock).batch();
-        verify(scenarioGridPanelMock).setFocus(eq(true));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractNewScenarioTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractNewScenarioTest.java
deleted file mode 100644
index d61bb09..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractNewScenarioTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import org.drools.workbench.screens.scenariosimulation.client.dropdown.ScenarioSimulationDropdown;
-import org.junit.Before;
-import org.mockito.Mock;
-
-public abstract class AbstractNewScenarioTest {
-
-    @Mock
-    protected ScenarioSimulationDropdown scenarioSimulationDropdownMock;
-
-    @Before
-    public void setup() throws Exception {
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractScenarioSimulationDocksHandlerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractScenarioSimulationDocksHandlerTest.java
deleted file mode 100644
index 3e72d2f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractScenarioSimulationDocksHandlerTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import java.util.Collection;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.CheatSheetPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsPresenter;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.widgets.client.docks.AuthoringEditorDock;
-import org.mockito.Mock;
-import org.uberfire.client.workbench.docks.UberfireDock;
-import org.uberfire.client.workbench.docks.UberfireDockPosition;
-import org.uberfire.mvp.PlaceRequest;
-
-import static org.drools.workbench.screens.scenariosimulation.client.handlers.AbstractScenarioSimulationDocksHandler.SCESIMEDITOR_ID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class AbstractScenarioSimulationDocksHandlerTest {
-
-    @Mock
-    private AuthoringEditorDock authoringWorkbenchDocksMock;
-    @Mock
-    private CheatSheetPresenter cheatSheetPresenterMock;
-    @Mock
-    private TestToolsPresenter testToolsPresenterMock;
-    @Mock
-    private SettingsPresenter settingsPresenterMock;
-
-    private AbstractScenarioSimulationDocksHandler abstractScenarioSimulationDocksHandlerSpy;
-
-    private enum MANAGED_DOCKS {
-        SETTINGS,
-        TOOLS,
-        CHEATSHEET
-    }
-
-    @Before
-    public void setup() {
-        abstractScenarioSimulationDocksHandlerSpy = spy(new AbstractScenarioSimulationDocksHandler() {
-
-            {
-                this.authoringWorkbenchDocks = authoringWorkbenchDocksMock;
-                this.cheatSheetPresenter = cheatSheetPresenterMock;
-                this.settingsPresenter = settingsPresenterMock;
-                this.testToolsPresenter = testToolsPresenterMock;
-            }
-
-            @Override
-            public void expandTestResultsDock() {
-                //Do nothing
-            }
-        });
-    }
-
-    @Test
-    public void provideDocks() {
-        final Collection<UberfireDock> docks = abstractScenarioSimulationDocksHandlerSpy.provideDocks("id");
-        assertEquals(MANAGED_DOCKS.values().length, docks.size());
-        final UberfireDock cheetSheetDock = (UberfireDock) docks.toArray()[MANAGED_DOCKS.CHEATSHEET.ordinal()];
-        assertNotNull(cheetSheetDock);
-        assertEquals(CheatSheetPresenter.IDENTIFIER, cheetSheetDock.getPlaceRequest().getIdentifier());
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.scenarioCheatSheet(), cheetSheetDock.getLabel());
-        assertEquals(UberfireDockPosition.EAST, cheetSheetDock.getDockPosition());
-        assertEquals("FILE_TEXT", cheetSheetDock.getIconType());
-        final UberfireDock settingsDock = (UberfireDock) docks.toArray()[MANAGED_DOCKS.SETTINGS.ordinal()];
-        assertNotNull(settingsDock);
-        assertEquals(SettingsPresenter.IDENTIFIER, settingsDock.getPlaceRequest().getIdentifier());
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.settings(), settingsDock.getLabel());
-        assertEquals(UberfireDockPosition.EAST, settingsDock.getDockPosition());
-        assertEquals("SLIDERS", settingsDock.getIconType());
-        final UberfireDock testToolsDock = (UberfireDock) docks.toArray()[MANAGED_DOCKS.TOOLS.ordinal()];
-        assertNotNull(testToolsDock);
-        assertEquals(TestToolsPresenter.IDENTIFIER, testToolsDock.getPlaceRequest().getIdentifier());
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.testTools(), testToolsDock.getLabel());
-        assertEquals(UberfireDockPosition.EAST, testToolsDock.getDockPosition());
-        assertEquals("INFO_CIRCLE", testToolsDock.getIconType());    }
-
-    @Test
-    public void expandToolsDockClose() {
-        final Collection<UberfireDock> docks = abstractScenarioSimulationDocksHandlerSpy.provideDocks("id");
-        final UberfireDock toolsDock = (UberfireDock) docks.toArray()[MANAGED_DOCKS.TOOLS.ordinal()];
-
-        abstractScenarioSimulationDocksHandlerSpy.expandToolsDock();
-
-        verify(authoringWorkbenchDocksMock, times(1)).expandAuthoringDock(eq(toolsDock));
-    }
-
-    @Test
-    public void expandToolsDockOpen() {
-        final Collection<UberfireDock> docks = abstractScenarioSimulationDocksHandlerSpy.provideDocks("id");
-        final UberfireDock toolsDock = (UberfireDock) docks.toArray()[MANAGED_DOCKS.TOOLS.ordinal()];
-
-        doReturn(true).when(testToolsPresenterMock).isOpen();
-
-        abstractScenarioSimulationDocksHandlerSpy.expandToolsDock();
-
-        verify(authoringWorkbenchDocksMock, never()).expandAuthoringDock(eq(toolsDock));
-    }
-
-    @Test
-    public void expandSettingsDockClose() {
-        final Collection<UberfireDock> docks = abstractScenarioSimulationDocksHandlerSpy.provideDocks("id");
-        final UberfireDock settingsDock = (UberfireDock) docks.toArray()[MANAGED_DOCKS.SETTINGS.ordinal()];
-
-        abstractScenarioSimulationDocksHandlerSpy.expandSettingsDock();
-
-        verify(authoringWorkbenchDocksMock, times(1)).expandAuthoringDock(eq(settingsDock));
-    }
-
-    @Test
-    public void expandSettingsDockOpen() {
-        final Collection<UberfireDock> docks = abstractScenarioSimulationDocksHandlerSpy.provideDocks("id");
-        final UberfireDock settingsDock = (UberfireDock) docks.toArray()[MANAGED_DOCKS.SETTINGS.ordinal()];
-
-        doReturn(true).when(settingsPresenterMock).isOpen();
-
-        abstractScenarioSimulationDocksHandlerSpy.expandSettingsDock();
-
-        verify(authoringWorkbenchDocksMock, never()).expandAuthoringDock(eq(settingsDock));
-    }
-
-
-    @Test
-    public void setScesimPath() {
-        final Collection<UberfireDock> docks = abstractScenarioSimulationDocksHandlerSpy.provideDocks("id");
-        final UberfireDock settingsDock = (UberfireDock) docks.toArray()[MANAGED_DOCKS.SETTINGS.ordinal()];
-        final UberfireDock toolsDock = (UberfireDock) docks.toArray()[MANAGED_DOCKS.TOOLS.ordinal()];
-        final UberfireDock cheatSheetDock = (UberfireDock) docks.toArray()[MANAGED_DOCKS.CHEATSHEET.ordinal()];
-        String TEST_PATH = "TEST_PATH";
-        abstractScenarioSimulationDocksHandlerSpy.setScesimEditorId(TEST_PATH);
-        assertTrue(settingsDock.getPlaceRequest().getParameters().containsKey(SCESIMEDITOR_ID));
-        assertEquals(TEST_PATH, settingsDock.getPlaceRequest().getParameter(SCESIMEDITOR_ID, "null"));
-        assertTrue(toolsDock.getPlaceRequest().getParameters().containsKey(SCESIMEDITOR_ID));
-        assertEquals(TEST_PATH, toolsDock.getPlaceRequest().getParameter(SCESIMEDITOR_ID, "null"));
-        assertTrue(cheatSheetDock.getPlaceRequest().getParameters().containsKey(SCESIMEDITOR_ID));
-        assertEquals(TEST_PATH, cheatSheetDock.getPlaceRequest().getParameter(SCESIMEDITOR_ID, "null"));
-    }
-
-    @Test
-    public void resetDocks() {
-        abstractScenarioSimulationDocksHandlerSpy.resetDocks();
-        verify(testToolsPresenterMock, times(1)).reset();
-        verify(settingsPresenterMock, times(1)).reset();
-        verify(cheatSheetPresenterMock, times(1)).reset();
-    }
-
-    @Test
-    public void addDocks() {
-        abstractScenarioSimulationDocksHandlerSpy.addDocks();
-        verify(abstractScenarioSimulationDocksHandlerSpy, times(1)).refreshDocks(eq(true), eq(false));
-    }
-
-    @Test
-    public void removeDocks() {
-        abstractScenarioSimulationDocksHandlerSpy.removeDocks();
-        verify(abstractScenarioSimulationDocksHandlerSpy, times(1)).refreshDocks(eq(true), eq(true));
-    }
-
-    @Test
-    public void getCurrentRightDockPlaceRequest() {
-        PlaceRequest placeRequest = abstractScenarioSimulationDocksHandlerSpy.getCurrentRightDockPlaceRequest("identifier");
-        assertNotNull(placeRequest);
-        assertEquals("identifier", placeRequest.getIdentifier());
-        assertNotNull(placeRequest.getParameter(SCESIMEDITOR_ID, ""));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractScenarioSimulationGridHandlerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractScenarioSimulationGridHandlerTest.java
deleted file mode 100644
index 09befca..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/AbstractScenarioSimulationGridHandlerTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.ait.lienzo.client.core.shape.Viewport;
-import com.ait.lienzo.client.core.types.Point2D;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.junit.Before;
-import org.mockito.AdditionalMatchers;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.impl.BaseBounds;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.GridRenderer;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.impl.BaseGridRendererHelper;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLICK_POINT_X;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_HEIGHT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_WIDTH;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.HEADER_HEIGHT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.HEADER_ROW_HEIGHT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OFFSET_X;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.UI_COLUMN_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.UI_ROW_INDEX;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractScenarioSimulationGridHandlerTest extends AbstractScenarioSimulationTest {
-
-    @Mock
-    protected Point2D point2DMock;
-
-    @Mock
-    protected Viewport viewportMock;
-
-    @Mock
-    protected ScenarioGridCell scenarioGridCellMock;
-
-    @Mock
-    protected ContextMenuEvent contextMenuEventMock;
-
-    protected List<GridColumn<?>> columnsMock;
-
-    @Mock
-    protected BaseGridRendererHelper scenarioGridRendererHelperMock;
-
-    @Mock
-    private BaseGridRendererHelper.RenderingInformation scenarioRenderingInformationMock;
-
-    @Mock
-    private GridRenderer scenarioGridRendererMock;
-
-    @Mock
-    private BaseGridRendererHelper.RenderingBlockInformation floatingBlockInformationMock;
-
-    @Before
-    public void setUp() {
-        super.setup();
-        doReturn(scenarioGridCellMock).when(scenarioGridModelMock).getCell(UI_ROW_INDEX, UI_COLUMN_INDEX);
-        when(scenarioGridPanelMock.getScenarioGrid()).thenReturn(scenarioGridMock);
-        when(scenarioGridMock.getWidth()).thenReturn(GRID_WIDTH);
-        when(scenarioGridMock.getModel()).thenReturn(scenarioGridModelMock);
-        when(scenarioGridMock.getRenderer()).thenReturn(scenarioGridRendererMock);
-        when(scenarioGridMock.getRendererHelper()).thenReturn(scenarioGridRendererHelperMock);
-        when(scenarioGridMock.getViewport()).thenReturn(viewportMock);
-        when(scenarioGridMock.getComputedLocation()).thenReturn(new Point2D(0.0, 0.0));
-        when(scenarioGridRendererMock.getHeaderHeight()).thenReturn(HEADER_HEIGHT);
-        when(scenarioGridRendererMock.getHeaderRowHeight()).thenReturn(HEADER_ROW_HEIGHT);
-        when(scenarioGridRendererHelperMock.getRenderingInformation()).thenReturn(scenarioRenderingInformationMock);
-
-        // mock single column in grid
-        when(scenarioGridModelMock.getHeaderRowCount()).thenReturn(1);
-        columnsMock = Arrays.asList(gridColumnMock, gridColumnMock);
-        when(scenarioGridModelMock.getColumns()).thenReturn(columnsMock);
-        when(scenarioGridModelMock.getColumnCount()).thenReturn(2);
-
-        // mock that column to index 0
-        BaseGridRendererHelper.ColumnInformation columnInformation =
-                new BaseGridRendererHelper.ColumnInformation(gridColumnMock, UI_COLUMN_INDEX, OFFSET_X);
-        when(scenarioGridRendererHelperMock.getColumnInformation(AdditionalMatchers.or(eq(0.0), eq(CLICK_POINT_X))))
-                .thenReturn(columnInformation);
-        when(scenarioRenderingInformationMock.getFloatingBlockInformation()).thenReturn(floatingBlockInformationMock);
-
-        when(scenarioRenderingInformationMock.getBounds()).thenReturn(new BaseBounds(0, 0, GRID_WIDTH, GRID_HEIGHT));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioInvokeContextMenuForSelectedCellTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioInvokeContextMenuForSelectedCellTest.java
deleted file mode 100644
index fdca959..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioInvokeContextMenuForSelectedCellTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import com.ait.lienzo.client.core.types.Point2D;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.menu.ScenarioContextMenuRegistry;
-import org.drools.workbench.screens.scenariosimulation.client.models.ScenarioGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioInvokeContextMenuForSelectedCellTest {
-
-    @Mock
-    private GridLayer gridLayerMock;
-
-    @Mock
-    private ScenarioGrid scenarioGridMock;
-
-    @Mock
-    private ScenarioGridModel scenarioGridModelMock;
-
-    @Mock
-    private ScenarioGridColumn gridColumnMock;
-
-    @Mock
-    private ScenarioGridColumn gridColumnMock2;
-
-    @Mock
-    private ScenarioContextMenuRegistry scenarioContextMenuRegistry;
-
-    @Mock
-    private Point2D pointMock;
-
-    private ScenarioInvokeContextMenuForSelectedCell handler;
-    private GridData.SelectedCell selectedCell;
-    private GridData.SelectedCell selectedCell2;
-
-    @Before
-    public void setup() {
-        selectedCell = new GridData.SelectedCell(0, 0);
-        selectedCell2 = new GridData.SelectedCell(1, 1);
-        handler = spy(new ScenarioInvokeContextMenuForSelectedCell(gridLayerMock, scenarioContextMenuRegistry) {
-            @Override
-            protected Point2D getMiddleXYCell(GridWidget gridWidget, GridColumn column, boolean isHeader, int uiRowIndex, GridLayer gridLayer) {
-                return pointMock;
-            }
-        });
-        when(scenarioGridMock.getModel()).thenReturn(scenarioGridModelMock);
-        when(scenarioGridModelMock.getColumns()).thenReturn(Arrays.asList(gridColumnMock, gridColumnMock2));
-    }
-
-    @Test
-    public void isExecutable_NoSelection() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.emptyList());
-        assertFalse(handler.isExecutable(scenarioGridMock));
-    }
-
-    @Test
-    public void isExecutable_CellSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Arrays.asList(selectedCell));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.emptyList());
-        assertTrue(handler.isExecutable(scenarioGridMock));
-    }
-
-    @Test
-    public void isExecutable_CellsSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Arrays.asList(selectedCell, selectedCell2));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.emptyList());
-        assertFalse(handler.isExecutable(scenarioGridMock));
-    }
-
-    @Test
-    public void isExecutable_HeaderCellSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Arrays.asList(selectedCell));
-        assertTrue(handler.isExecutable(scenarioGridMock));
-    }
-
-    @Test
-    public void isExecutable_HeaderCellsSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Arrays.asList(selectedCell, selectedCell2));
-        assertTrue(handler.isExecutable(scenarioGridMock));
-    }
-
-    @Test
-    public void isExecutable_CellsAndHeaderCellsSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Arrays.asList(selectedCell));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Arrays.asList(selectedCell2));
-        assertFalse(handler.isExecutable(scenarioGridMock));
-    }
-
-    @Test
-    public void perform_NoSelection() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.emptyList());
-        assertFalse(handler.perform(scenarioGridMock, false, false));
-        verify(scenarioContextMenuRegistry, never()).manageRightClick(any(), anyInt(), anyInt(), anyInt(), anyInt(), anyBoolean());
-    }
-
-    @Test
-    public void perform_CellSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Arrays.asList(selectedCell));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedCellsOrigin()).thenReturn(selectedCell);
-        handler.perform(scenarioGridMock, false, false);
-        verify(scenarioContextMenuRegistry, times(1)).manageRightClick(eq(scenarioGridMock), eq(0), eq(0), anyInt(), anyInt(), eq(false));
-    }
-
-    @Test
-    public void perform_CellsSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Arrays.asList(selectedCell, selectedCell2));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedCellsOrigin()).thenReturn(selectedCell);
-        assertFalse(handler.perform(scenarioGridMock, false, false));
-        verify(scenarioContextMenuRegistry, never()).manageRightClick(any(), anyInt(), anyInt(), anyInt(), anyInt(), anyBoolean());
-    }
-
-    @Test
-    public void perform_HeaderCellSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Arrays.asList(selectedCell));
-        handler.perform(scenarioGridMock, false, false);
-        verify(scenarioContextMenuRegistry, times(1)).manageRightClick(eq(scenarioGridMock), eq(0), eq(0), anyInt(), anyInt(), eq(true));
-    }
-
-    @Test
-    public void perform_HeaderCellsSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Arrays.asList(selectedCell, selectedCell2));
-        handler.perform(scenarioGridMock, false, false);
-        verify(scenarioContextMenuRegistry, times(1)).manageRightClick(eq(scenarioGridMock), eq(0), eq(0), anyInt(), anyInt(), eq(true));
-    }
-
-    @Test
-    public void perform_CellAndHeaderCellsSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Arrays.asList(selectedCell));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Arrays.asList(selectedCell2));
-        assertFalse(handler.perform(scenarioGridMock, false, false));
-        verify(scenarioContextMenuRegistry, never()).manageRightClick(any(), anyInt(), anyInt(), anyInt(), anyInt(), anyBoolean());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationGridWidgetMouseEventHandlerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationGridWidgetMouseEventHandlerTest.java
deleted file mode 100644
index 2632374..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationGridWidgetMouseEventHandlerTest.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import java.util.stream.IntStream;
-
-import com.ait.lienzo.client.core.event.NodeMouseClickEvent;
-import com.ait.lienzo.client.core.event.NodeMouseDoubleClickEvent;
-import com.ait.lienzo.client.core.types.Point2D;
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import elemental2.dom.HTMLElement;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridCellEditAction;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.impl.BaseGridRendererHelper;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COMPUTED_LOCATION_X;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COMPUTED_LOCATION_Y;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MOUSE_EVENT_X;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MOUSE_EVENT_Y;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyDouble;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioSimulationGridWidgetMouseEventHandlerTest extends AbstractScenarioSimulationGridHandlerTest {
-
-    @Mock
-    private BaseGridRendererHelper rendererHelper;
-
-    @Mock
-    private BaseGridRendererHelper.RenderingInformation renderingInformation;
-
-    @Mock
-    private BaseGridRendererHelper.ColumnInformation columnInformation;
-
-    @Mock
-    private BaseGridRendererHelper.RenderingBlockInformation renderingBlockInformation;
-
-    @Mock
-    private HTMLElement element;
-
-    private NodeMouseClickEvent clickEvent;
-
-    private NodeMouseDoubleClickEvent doubleClickEvent;
-
-    private ScenarioSimulationGridWidgetMouseEventHandler handler;
-
-    private Point2D relativeLocation = new Point2D(MOUSE_EVENT_X, MOUSE_EVENT_Y);
-
-    private Point2D computedLocation = new Point2D(GRID_COMPUTED_LOCATION_X, GRID_COMPUTED_LOCATION_Y);
-
-    @Before
-    @SuppressWarnings("unchecked")
-    public void setup() {
-        super.setUp();
-        this.clickEvent = new NodeMouseClickEvent(element);
-        this.doubleClickEvent = new NodeMouseDoubleClickEvent(element);
-        when(scenarioGridMock.getRendererHelper()).thenReturn(rendererHelper);
-        when(scenarioGridMock.getViewport()).thenReturn(viewportMock);
-        when(scenarioGridMock.getComputedLocation()).thenReturn(computedLocation);
-        when(rendererHelper.getRenderingInformation()).thenReturn(renderingInformation);
-        when(rendererHelper.getColumnInformation(anyDouble())).thenReturn(columnInformation);
-        when(columnInformation.getColumn()).thenReturn((GridColumn) gridColumnMock);
-        when(renderingInformation.getBodyBlockInformation()).thenReturn(renderingBlockInformation);
-        when(renderingInformation.getFloatingBlockInformation()).thenReturn(renderingBlockInformation);
-        when(renderingInformation.getAllColumns()).thenReturn(columnsMock);
-        when(informationHeaderMetaDataMock.getSupportedEditAction()).thenReturn(GridCellEditAction.SINGLE_CLICK);
-        this.handler = spy(new ScenarioSimulationGridWidgetMouseEventHandler());
-    }
-
-    @Test
-    public void handleHeaderCell_NullColumn() {
-        when(columnInformation.getColumn()).thenReturn(null);
-        commonHandleHeaderCell(true, true, 1, false, false);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void handleHeaderCell_NonEditableColumn() {
-        commonHandleHeaderCell(false, false, 1, false, true);
-    }
-
-    @Test
-    public void handleHeaderCell_NonSelectedCells() {
-        commonHandleHeaderCell(false, false, 0, false, true);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void handleHeaderCell_EditableColumn_NotStartEdit() {
-        commonHandleHeaderCell(true, false, 1, true, false);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void handleHeaderCell_EditableColumn_StartEdit() {
-        commonHandleHeaderCell(true, true, 1, true, true);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void handleHeaderCell_EditableColumn_MultiSelectedSize() {
-        commonHandleHeaderCell(true, true, 3, true, true);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void handleBodyCell_NotEditSupportedLocal() {
-        commonHandleBodyCell(false, true, 1, false, false);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void handleBodyCell_NotStartEditLocal() {
-        commonHandleBodyCell(true, false, 1, true, false);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void handleBodyCell_StartEditLocal() {
-        commonHandleBodyCell(true, true, 1, true, true);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void handleBodyCell_WrongSelectedSize() {
-        commonHandleBodyCell(true, true, 3, false, false);
-    }
-
-    private void commonHandleHeaderCell(boolean editSupportedLocal, boolean startEditLocal, int selectedHeaderCellsSize, boolean startEditLocalCalled, boolean expectedResult) {
-        int uiHeaderColumnIndex = 0;
-        int uiHeaderRowIndex = 0;
-        scenarioGridMock.getModel().getSelectedHeaderCells().clear();
-        IntStream.range(0, selectedHeaderCellsSize).forEach(i -> scenarioGridMock.getModel().getSelectedHeaderCells().add(mock(GridData.SelectedCell.class)));
-        doReturn(editSupportedLocal).when(handler).editSupportedLocal(any(), any());
-        doReturn(startEditLocal).when(handler).startEditLocal(eq(scenarioGridMock), eq(uiHeaderColumnIndex), eq(gridColumnMock), eq(uiHeaderRowIndex), eq(true));
-        if (expectedResult) {
-            assertTrue(handler.handleHeaderCell(scenarioGridMock,
-                                                relativeLocation,
-                                                uiHeaderRowIndex,
-                                                uiHeaderColumnIndex,
-                                                clickEvent));
-        } else {
-            assertFalse(handler.handleHeaderCell(scenarioGridMock,
-                                                 relativeLocation,
-                                                 uiHeaderRowIndex,
-                                                 uiHeaderColumnIndex,
-                                                 clickEvent));
-        }
-        if (startEditLocalCalled) {
-            verify(handler, times(1)).startEditLocal(eq(scenarioGridMock), eq(uiHeaderColumnIndex), eq(gridColumnMock), eq(uiHeaderRowIndex), eq(true));
-        } else {
-            verify(handler, never()).startEditLocal(eq(scenarioGridMock), eq(uiHeaderColumnIndex), eq(gridColumnMock), eq(uiHeaderRowIndex), eq(true));
-        }
-    }
-
-    private void commonHandleBodyCell(boolean editSupportedLocal, boolean startEditLocal, int selectedCellsSize, boolean startEditLocalCalled, boolean expectedResult) {
-        int uiHeaderColumnIndex = 0;
-        int uiHeaderRowIndex = 0;
-        scenarioGridMock.getModel().getSelectedCells().clear();
-        IntStream.range(0, selectedCellsSize).forEach(i -> scenarioGridMock.getModel().getSelectedCells().add(mock(GridData.SelectedCell.class)));
-        doReturn(editSupportedLocal).when(handler).editSupportedLocal(any(), any());
-        doReturn(startEditLocal).when(handler).startEditLocal(eq(scenarioGridMock), eq(uiHeaderColumnIndex), eq(gridColumnMock), eq(uiHeaderRowIndex), eq(false));
-        if (expectedResult) {
-            assertTrue(handler.handleBodyCell(scenarioGridMock,
-                                                relativeLocation,
-                                                uiHeaderRowIndex,
-                                                uiHeaderColumnIndex,
-                                                clickEvent));
-        } else {
-            assertFalse(handler.handleBodyCell(scenarioGridMock,
-                                                 relativeLocation,
-                                                 uiHeaderRowIndex,
-                                                 uiHeaderColumnIndex,
-                                                 clickEvent));
-        }
-        int columnPosition = columnsMock.indexOf(gridColumnMock);
-        if (startEditLocalCalled) {
-            verify(handler, times(1)).startEditLocal(eq(scenarioGridMock), eq(columnPosition), eq(gridColumnMock), eq(uiHeaderRowIndex), eq(false));
-        } else {
-            verify(handler, never()).startEditLocal(eq(scenarioGridMock), eq(columnPosition), eq(gridColumnMock), eq(uiHeaderRowIndex), eq(false));
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationHasBusyIndicatorDefaultErrorCallbackTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationHasBusyIndicatorDefaultErrorCallbackTest.java
deleted file mode 100644
index 20efb2f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationHasBusyIndicatorDefaultErrorCallbackTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.editor.AbstractScenarioSimulationEditorTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-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;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationHasBusyIndicatorDefaultErrorCallbackTest extends AbstractScenarioSimulationEditorTest {
-
-    private ScenarioSimulationHasBusyIndicatorDefaultErrorCallback scenarioSimulationHasBusyIndicatorDefaultErrorCallback;
-
-    @Before
-    public void setup() {
-        super.setup();
-        scenarioSimulationHasBusyIndicatorDefaultErrorCallback = spy(new ScenarioSimulationHasBusyIndicatorDefaultErrorCallback(scenarioSimulationViewMock) {
-            {
-                this.view = scenarioSimulationViewMock;
-            }
-
-            @Override
-            protected boolean errorLocal(Object message, Throwable throwable) {
-                return false;
-            }
-        });
-    }
-
-    @Test
-    public void error() {
-        Object messageMock = mock(Object.class);
-        Throwable throwableMock = mock(Throwable.class);
-        scenarioSimulationHasBusyIndicatorDefaultErrorCallback.error(messageMock, throwableMock);
-        verify(scenarioSimulationHasBusyIndicatorDefaultErrorCallback, times(1)).errorLocal(eq(messageMock), eq(throwableMock));
-    }
-
-    @Test
-    public void hideBusyIndicator() {
-        scenarioSimulationHasBusyIndicatorDefaultErrorCallback.hideBusyIndicator();
-        verify(scenarioSimulationViewMock, times(1)).hideBusyIndicator();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationKeyboardEditHandlerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationKeyboardEditHandlerTest.java
deleted file mode 100644
index 3a8f37f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationKeyboardEditHandlerTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.models.ScenarioGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-import org.uberfire.ext.wires.core.grids.client.widget.layer.GridLayer;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationKeyboardEditHandlerTest {
-
-    @Mock
-    private GridLayer gridLayerMock;
-
-    @Mock
-    private ScenarioGrid scenarioGridMock;
-
-    @Mock
-    private ScenarioGridModel scenarioGridModelMock;
-
-    @Mock
-    private ScenarioGridColumn gridColumnMock;
-
-    @Mock
-    private ScenarioGridColumn gridColumnMock2;
-
-    private ScenarioSimulationKeyboardEditHandler handler;
-    private GridData.SelectedCell selectedCell;
-    private GridData.SelectedCell selectedCell2;
-
-    @Before
-    public void setup() {
-        selectedCell = new GridData.SelectedCell(0, 0);
-        selectedCell2 = new GridData.SelectedCell(1, 1);
-        handler = spy(new ScenarioSimulationKeyboardEditHandler(gridLayerMock) {
-            @Override
-            protected boolean startEdit(ScenarioGrid scenarioGrid, int uiColumnIndex, int uiRowIndex, ScenarioGridColumn column, boolean isHeader) {
-                return true;
-            }
-        });
-        when(scenarioGridMock.getModel()).thenReturn(scenarioGridModelMock);
-        when(scenarioGridModelMock.getColumns()).thenReturn(Arrays.asList(gridColumnMock, gridColumnMock2));
-    }
-
-    @Test
-    public void isExecutable_NoSelection() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.emptyList());
-        assertFalse(handler.isExecutable(scenarioGridMock));
-    }
-
-    @Test
-    public void isExecutable_CellSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Arrays.asList(selectedCell));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.emptyList());
-        assertTrue(handler.isExecutable(scenarioGridMock));
-    }
-
-    @Test
-    public void isExecutable_CellsSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Arrays.asList(selectedCell, selectedCell2));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.emptyList());
-        assertFalse(handler.isExecutable(scenarioGridMock));
-    }
-
-    @Test
-    public void isExecutable_HeaderCellSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Arrays.asList(selectedCell, selectedCell2));
-        assertTrue(handler.isExecutable(scenarioGridMock));
-    }
-
-    @Test
-    public void isExecutable_HeaderCellsSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Arrays.asList(selectedCell));
-        assertTrue(handler.isExecutable(scenarioGridMock));
-    }
-
-    @Test
-    public void isExecutable_CellsAndHeaderCellsSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Arrays.asList(selectedCell));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Arrays.asList(selectedCell2));
-        assertFalse(handler.isExecutable(scenarioGridMock));
-    }
-
-    @Test
-    public void perform_NoSelection() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.emptyList());
-        assertFalse(handler.perform(scenarioGridMock, false, false));
-        verify(handler, never()).startEdit(any(), anyInt(), anyInt(), any(), anyBoolean());
-    }
-
-    @Test
-    public void perform_CellSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Arrays.asList(selectedCell));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedCellsOrigin()).thenReturn(selectedCell);
-        handler.perform(scenarioGridMock, false, false);
-        verify(handler, times(1)).startEdit(eq(scenarioGridMock), eq(0), eq(0), eq(gridColumnMock), eq(false));
-    }
-
-    @Test
-    public void perform_CellsSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Arrays.asList(selectedCell, selectedCell2));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedCellsOrigin()).thenReturn(selectedCell);
-        assertFalse(handler.perform(scenarioGridMock, false, false));
-        verify(handler, never()).startEdit(any(), anyInt(), anyInt(), any(), anyBoolean());
-    }
-
-    @Test
-    public void perform_HeaderCellSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Arrays.asList(selectedCell));
-        handler.perform(scenarioGridMock, false, false);
-        verify(handler, times(1)).startEdit(eq(scenarioGridMock), eq(0), eq(0), eq(gridColumnMock), eq(true));
-    }
-
-    @Test
-    public void perform_HeaderCellsSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Collections.emptyList());
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Arrays.asList(selectedCell, selectedCell2));
-        handler.perform(scenarioGridMock, false, false);
-        verify(handler, times(1)).startEdit(eq(scenarioGridMock), eq(0), eq(0), eq(gridColumnMock), eq(true));
-    }
-
-    @Test
-    public void perform_CellAndHeaderCellsSelected() {
-        when(scenarioGridModelMock.getSelectedCells()).thenReturn(Arrays.asList(selectedCell));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Arrays.asList(selectedCell2));
-        assertFalse(handler.perform(scenarioGridMock, false, false));
-        verify(handler, never()).startEdit(any(), anyInt(), anyInt(), any(), anyBoolean());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationMainGridPanelClickHandlerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationMainGridPanelClickHandlerTest.java
deleted file mode 100644
index e5bcbc0..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationMainGridPanelClickHandlerTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.ait.lienzo.client.core.types.Point2D;
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.event.shared.GwtEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.DisableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.EnableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.menu.ScenarioContextMenuRegistry;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLICK_POINT_X;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLICK_POINT_Y;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_WIDTH;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.HEADER_HEIGHT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.UI_COLUMN_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.UI_ROW_INDEX;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyDouble;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioSimulationMainGridPanelClickHandlerTest extends AbstractScenarioSimulationGridHandlerTest {
-
-    private ScenarioSimulationMainGridPanelClickHandler scenarioSimulationMainGridPanelClickHandler;
-
-    @Mock
-    private EventBus eventBusMock;
-    @Mock
-    private ScenarioContextMenuRegistry scenarioContextMenuRegistryMock;
-
-    @Before
-    public void setUp() {
-        super.setUp();
-        scenarioSimulationMainGridPanelClickHandler = spy(new ScenarioSimulationMainGridPanelClickHandler() {
-            {
-                scenarioGrid = scenarioGridMock;
-                scenarioContextMenuRegistry = scenarioContextMenuRegistryMock;
-                eventBus = eventBusMock;
-                rendererHelper = scenarioGridRendererHelperMock;
-            }
-        });
-    }
-
-    @Test
-    public void setScenarioGridPanel() {
-        scenarioSimulationMainGridPanelClickHandler.setScenarioGridPanel(scenarioGridPanelMock);
-        assertEquals(scenarioGridMock, scenarioSimulationMainGridPanelClickHandler.scenarioGrid);
-    }
-
-    @Test
-    public void setEventBus() {
-        scenarioSimulationMainGridPanelClickHandler.setEventBus(eventBusMock);
-        assertSame(scenarioSimulationMainGridPanelClickHandler.eventBus, eventBusMock);
-    }
-
-    @Test
-    public void onContextMenu() {
-        doReturn(true).when(scenarioContextMenuRegistryMock).manageRightClick(scenarioGridMock, contextMenuEventMock);
-        scenarioSimulationMainGridPanelClickHandler.onContextMenu(contextMenuEventMock);
-        verify(contextMenuEventMock, times(1)).preventDefault();
-        verify(contextMenuEventMock, times(1)).stopPropagation();
-        verify(scenarioContextMenuRegistryMock, times(1)).hideMenus();
-    }
-
-    @Test
-    public void hideMenus() {
-        scenarioSimulationMainGridPanelClickHandler.hideMenus();
-        verify(scenarioContextMenuRegistryMock, times(1)).hideMenus();
-    }
-
-    @Test
-    public void testManageLeftClick() {
-        when(point2DMock.getX()).thenReturn(Double.valueOf(CLICK_POINT_X));
-        when(point2DMock.getY()).thenReturn(Double.valueOf(CLICK_POINT_Y));
-        assertTrue("testManageLeftClick fail", scenarioSimulationMainGridPanelClickHandler.manageCoordinates((int) CLICK_POINT_X,
-                                                                                                             (int) CLICK_POINT_Y));
-    }
-
-    @Test
-    public void testManageLeftClick_ReadOnly() {
-        when(informationHeaderMetaDataMock.isReadOnly()).thenReturn(true);
-        scenarioSimulationMainGridPanelClickHandler.setEventBus(eventBusMock);
-        assertTrue("Click to readonly header cell.",
-                   scenarioSimulationMainGridPanelClickHandler.manageCoordinates((int) CLICK_POINT_X,
-                                                                                 (int) CLICK_POINT_Y));
-        verify(scenarioGridMock, times(1)).setSelectedColumn(anyInt());
-        verify(eventBusMock, times(1)).fireEvent(any(EnableTestToolsEvent.class));
-    }
-
-    @Test
-    public void testManageLeftClick_NextToGrid() {
-        assertFalse("Click to point next to table.",
-                    scenarioSimulationMainGridPanelClickHandler.manageCoordinates(GRID_WIDTH.intValue() + (int) CLICK_POINT_X,
-                                                                                  (int) CLICK_POINT_Y));
-        verify(scenarioGridMock, never()).setSelectedColumnAndHeader(anyInt(), anyInt());
-        verify(eventBusMock, never()).fireEvent(any(EnableTestToolsEvent.class));
-    }
-
-    @Test
-    public void testManageLeftClick_BelowHeader() {
-        assertFalse("Click to point below header.",
-                    scenarioSimulationMainGridPanelClickHandler.manageCoordinates((int) CLICK_POINT_X,
-                                                                                  HEADER_HEIGHT.intValue() + (int) CLICK_POINT_Y));
-        verify(scenarioGridMock, never()).setSelectedColumnAndHeader(anyInt(), anyInt());
-        verify(eventBusMock, never()).fireEvent(any(EnableTestToolsEvent.class));
-    }
-
-    @Test
-    public void testManageHeaderLeftClick_NoEditableHeader() {
-        when(informationHeaderMetaDataMock.isReadOnly()).thenReturn(true);
-        assertTrue("NoEditableHeader fail", scenarioSimulationMainGridPanelClickHandler.manageCoordinates((int) CLICK_POINT_X,
-                                                                                                          (int) CLICK_POINT_Y));
-    }
-
-    @Test
-    public void testManageHeaderLeftClick_NullUIHeaderRowIndex() {
-        assertFalse("NullUIHeaderRowIndex fail", scenarioSimulationMainGridPanelClickHandler.manageCoordinates((int) CLICK_POINT_X,
-                                                                                                               (int) CLICK_POINT_Y + 10));
-    }
-
-    @Test
-    public void testManageHeaderLeftClick_NullMetadata() {
-        when(headerMetaDatasMock.get(anyInt())).thenReturn(null);
-        assertFalse("NullMetadata fail", scenarioSimulationMainGridPanelClickHandler.manageCoordinates((int) CLICK_POINT_X,
-                                                                                                       (int) CLICK_POINT_Y));
-    }
-
-    @Test
-    public void testManageHeaderLeftClick_GIVENGroup() {
-        commonTestManageHeaderLeftClick_Group("GIVEN", true);
-    }
-
-    @Test
-    public void testManageHeaderLeftClick_EXPECTGroup() {
-        commonTestManageHeaderLeftClick_Group("EXPECT", true);
-    }
-
-    @Test
-    public void testManageHeaderLeftClick_OTHERGroup() {
-        commonTestManageHeaderLeftClick_Group("OTHER", false);
-    }
-
-    @Test
-    public void testManageGridLeftClickReadOnlyTrue() {
-        when(informationHeaderMetaDataMock.isReadOnly()).thenReturn(true);
-        scenarioSimulationMainGridPanelClickHandler.setEventBus(eventBusMock);
-        when(scenarioGridCellMock.isEditingMode()).thenReturn(false);
-        doReturn(null).when(scenarioSimulationMainGridPanelClickHandler).getUiHeaderRowIndexLocal(isA(Point2D.class));
-        doReturn(UI_ROW_INDEX).when(scenarioSimulationMainGridPanelClickHandler).getUiRowIndexLocal(anyDouble());
-        doReturn(UI_COLUMN_INDEX).when(scenarioSimulationMainGridPanelClickHandler).getUiColumnIndexLocal(anyDouble());
-        assertTrue(scenarioSimulationMainGridPanelClickHandler.manageCoordinates((int) CLICK_POINT_X, (int) CLICK_POINT_Y));
-        verify(scenarioGridModelMock, times(1)).selectCell(eq(1), eq(0));
-    }
-
-    @Test
-    public void testManageGridLeftClickReadOnlyFalse() {
-        when(scenarioGridMock.startEditingCell(UI_ROW_INDEX, UI_COLUMN_INDEX)).thenReturn(true);
-        when(informationHeaderMetaDataMock.isReadOnly()).thenReturn(false);
-        scenarioSimulationMainGridPanelClickHandler.setEventBus(eventBusMock);
-        when(scenarioGridCellMock.isEditingMode()).thenReturn(false);
-        doReturn(null).when(scenarioSimulationMainGridPanelClickHandler).getUiHeaderRowIndexLocal(isA(Point2D.class));
-        doReturn(UI_ROW_INDEX).when(scenarioSimulationMainGridPanelClickHandler).getUiRowIndexLocal(anyDouble());
-        doReturn(UI_COLUMN_INDEX).when(scenarioSimulationMainGridPanelClickHandler).getUiColumnIndexLocal(anyDouble());
-        doReturn(scenarioGridCellMock).when(scenarioGridModelMock).getCell(UI_ROW_INDEX, UI_COLUMN_INDEX);
-        assertTrue(scenarioSimulationMainGridPanelClickHandler.manageCoordinates((int) CLICK_POINT_X, (int) CLICK_POINT_Y));
-        verify(scenarioGridModelMock, times(1)).selectCell(eq(1), eq(0));
-    }
-
-    private void commonTestManageHeaderLeftClick_Group(String group, boolean assertExpected) {
-        doReturn(1).when(scenarioSimulationMainGridPanelClickHandler).getUiHeaderRowIndexLocal(point2DMock);
-        when(informationHeaderMetaDataMock.isReadOnly()).thenReturn(false);
-        when(informationHeaderMetaDataMock.getColumnGroup()).thenReturn(group);
-        String message = group + "Group fail";
-        if (assertExpected) {
-            assertTrue(message, scenarioSimulationMainGridPanelClickHandler.manageCoordinates((int) CLICK_POINT_X, (int) CLICK_POINT_Y));
-            verify(scenarioGridMock, times(1)).setSelectedColumn(eq(0));
-            verify(eventBusMock, times(1)).fireEvent(isA(GwtEvent.class));
-        } else {
-            assertFalse(message, scenarioSimulationMainGridPanelClickHandler.manageCoordinates((int) CLICK_POINT_X, (int) CLICK_POINT_Y));
-            verify(scenarioGridMock, never()).setSelectedColumn(anyInt());
-            verify(eventBusMock, never()).fireEvent(any());
-            return;
-        }
-    }
-
-    @Test
-    public void manageBodyCoordinates_NullCell() {
-        scenarioSimulationMainGridPanelClickHandler.manageBodyCoordinates(ROW_INDEX, COLUMN_INDEX);
-        verify(scenarioGridMock.getModel(), times(1)).getCell(eq(ROW_INDEX), eq(COLUMN_INDEX));
-        verify(scenarioGridMock.getModel(), never()).selectCell(anyInt(), anyInt());
-        verify(eventBusMock, times(0)).fireEvent(isA(GwtEvent.class));
-    }
-
-    @Test
-    public void manageBodyCoordinates_WithCell() {
-        doReturn(scenarioGridCellMock).when(scenarioGridModelMock).getCell(ROW_INDEX, COLUMN_INDEX);
-        scenarioSimulationMainGridPanelClickHandler.manageBodyCoordinates(ROW_INDEX, COLUMN_INDEX);
-        verify(scenarioGridMock.getModel(), times(1)).getCell(eq(ROW_INDEX), eq(COLUMN_INDEX));
-        verify(scenarioGridMock.getModel(), times(1)).selectCell(ROW_INDEX, COLUMN_INDEX);
-        verify(eventBusMock, times(1)).fireEvent(isA(DisableTestToolsEvent.class));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationMainGridPanelMouseMoveHandlerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationMainGridPanelMouseMoveHandlerTest.java
deleted file mode 100644
index f21b05f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/ScenarioSimulationMainGridPanelMouseMoveHandlerTest.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Optional;
-
-import com.ait.lienzo.client.core.event.NodeMouseMoveEvent;
-import com.ait.lienzo.client.core.types.Point2D;
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.user.client.Element;
-import com.google.gwt.user.client.ui.AbsolutePanel;
-import elemental2.dom.HTMLDivElement;
-import org.drools.scenariosimulation.api.model.FactMappingValue;
-import org.drools.scenariosimulation.api.model.FactMappingValueStatus;
-import org.drools.scenariosimulation.api.model.Scenario;
-import org.drools.workbench.screens.scenariosimulation.client.popover.ErrorReportPopoverPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popover.PopoverView;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.mvp.Command;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CELL_WIDTH;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DY;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ERROR_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.EXCEPTION;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LARGE_LAYER;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MY;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.NULL;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.RAW_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.SCROLL_LEFT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.SCROLL_TOP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.SMALLEST_LAYER;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TINY_LAYER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioSimulationMainGridPanelMouseMoveHandlerTest extends AbstractScenarioSimulationGridHandlerTest {
-
-    private final int ABSOLUTE_LEFT = 0;
-    private final int CELL_HEIGHT = 30;
-    private static final String BR = "<br>";
-
-    private ScenarioSimulationMainGridPanelMouseMoveHandler mouseMoveHandler;
-    @Mock
-    private ErrorReportPopoverPresenter errorReportPopupPresenterMock;
-    @Mock
-    private Scenario scenarioMock;
-    @Mock
-    private FactMappingValue factMappingValueMock;
-    @Mock
-    private AbsolutePanel scrollPanelMock;
-    @Mock
-    private NodeMouseMoveEvent mouseMoveEvent;
-    @Mock
-    private Element elementMock;
-    @Mock
-    private HTMLDivElement layerElementMock;
-
-    @Before
-    public void setup() {
-        super.setup();
-        mouseMoveHandler = spy(new ScenarioSimulationMainGridPanelMouseMoveHandler() {
-            {
-                errorReportPopupPresenter = errorReportPopupPresenterMock;
-                scenarioGrid = scenarioGridMock;
-                scenarioGridPanel = scenarioGridPanelMock;
-            }
-
-            @Override
-            protected Point2D retrieveCellMiddleXYPosition(GridColumn<?> column, int uiRowIndex) {
-                return new Point2D(DX, DY);
-            }
-
-            @Override
-            protected Point2D convertDOMToGridCoordinateLocal(double canvasX, double canvasY) {
-                return new Point2D(MX, MY);
-            }
-
-            @Override
-            protected int getCellHeight(GridColumn<?> column, int uiRowIndex) {
-                return CELL_HEIGHT;
-            }
-        });
-        when(simulationMock.getDataByIndex(isA(Integer.class))).thenReturn(scenarioMock);
-        when(scenarioMock.getFactMappingValue(any())).thenReturn(Optional.of(factMappingValueMock));
-        when(factMappingValueMock.getStatus()).thenReturn(FactMappingValueStatus.FAILED_WITH_ERROR);
-        when(factMappingValueMock.getRawValue()).thenReturn(RAW_VALUE);
-        when(factMappingValueMock.getErrorValue()).thenReturn(ERROR_VALUE);
-        when(scenarioGridLayerMock.getWidth()).thenReturn(LARGE_LAYER);
-        when(gridColumnMock.getWidth()).thenReturn(CELL_WIDTH);
-        when(scenarioGridPanelMock.getScrollPanel()).thenReturn(scrollPanelMock);
-        when(scrollPanelMock.getElement()).thenReturn(elementMock);
-        when(elementMock.getScrollTop()).thenReturn(0);
-        when(elementMock.getScrollLeft()).thenReturn(0);
-        when(errorReportPopupPresenterMock.isShown()).thenReturn(Boolean.FALSE);
-        when(mouseMoveEvent.getX()).thenReturn(MX);
-        when(mouseMoveEvent.getY()).thenReturn(MY);
-        layerElementMock.offsetLeft = ABSOLUTE_LEFT;
-        when(scenarioGridLayerMock.getElement()).thenReturn(layerElementMock);
-    }
-
-    @Test
-    public void onNodeMouseMove() {
-        mouseMoveHandler.onNodeMouseMove(mouseMoveEvent);
-        verify(mouseMoveHandler, times(1)).manageCoordinates(eq(MX), eq(MY));
-    }
-
-    @Test
-    public void hidePopover() {
-        mouseMoveHandler.hidePopover();
-        verify(errorReportPopupPresenterMock, times(1)).hide();
-    }
-
-    @Test
-    public void manageBodyCoordinatesNotInGrid() {
-        boolean inGrid = mouseMoveHandler.manageBodyCoordinates(-1, -1);
-        verify(simulationMock, never()).getDataByIndex(isA(Integer.class));
-        verify(simulationDescriptorMock, never()).getFactMappingByIndex(isA(Integer.class));
-        verify(scenarioMock, never()).getFactMappingValue(any());
-        verify(mouseMoveHandler, never()).retrieveCellMiddleXYPosition(any(), isA(Integer.class));
-        verify(errorReportPopupPresenterMock, never()).setup(any(), any(), any(), any(), any(), anyInt(), anyInt(), any());
-        assertFalse(inGrid);
-    }
-
-    @Test
-    public void manageBodyCoordinatesSameCellIsShown() {
-        mouseMoveHandler.currentlyShownBodyRowIndex = ROW_INDEX;
-        mouseMoveHandler.currentlyShownBodyColumnIndex = COLUMN_INDEX;
-        doReturn(true).when(errorReportPopupPresenterMock).isShown();
-        mouseMoveHandler.manageBodyCoordinates(ROW_INDEX, COLUMN_INDEX);
-        verify(scenarioGridMock, never()).getModel();
-        verify(simulationMock, never()).getDataByIndex(eq(ROW_INDEX));
-    }
-
-    @Test
-    public void manageBodyCoordinatesSameCellNotShown() {
-        mouseMoveHandler.currentlyShownBodyRowIndex = ROW_INDEX;
-        mouseMoveHandler.currentlyShownBodyColumnIndex = COLUMN_INDEX;
-        doReturn(false).when(errorReportPopupPresenterMock).isShown();
-        doNothing().when(mouseMoveHandler).manageFactMappingValue(eq(factMappingValueMock),
-                                                                  eq(ROW_INDEX),
-                                                                  eq(COLUMN_INDEX));
-        mouseMoveHandler.manageBodyCoordinates(ROW_INDEX, COLUMN_INDEX);
-        verify(scenarioGridMock, times(1)).getModel();
-        verify(simulationMock, times(1)).getDataByIndex(eq(ROW_INDEX));
-    }
-
-    @Test
-    public void manageBodyCoordinatesNotShownWithoutFactMappingValue() {
-        doReturn(false).when(errorReportPopupPresenterMock).isShown();
-        doReturn(Optional.empty()).when(scenarioMock).getFactMappingValue(eq(factMappingMock));
-        mouseMoveHandler.manageBodyCoordinates(ROW_INDEX, COLUMN_INDEX);
-        verify(scenarioGridMock, times(1)).getModel();
-        verify(simulationMock, times(1)).getDataByIndex(eq(ROW_INDEX));
-        verify(simulationDescriptorMock, times(1)).getFactMappingByIndex(eq(COLUMN_INDEX));
-        verify(scenarioMock, times(1)).getFactMappingValue(eq(factMappingMock));
-        verify(mouseMoveHandler, never()).manageFactMappingValue(
-                isA(FactMappingValue.class),
-                anyInt(),
-                anyInt());
-    }
-
-    @Test
-    public void manageBodyCoordinatesNotShownWithFactMappingValue() {
-        doReturn(false).when(errorReportPopupPresenterMock).isShown();
-        doReturn(Optional.of(factMappingValueMock)).when(scenarioMock).getFactMappingValue(eq(factMappingMock));
-        doNothing().when(mouseMoveHandler).manageFactMappingValue(eq(factMappingValueMock),
-                                                                  eq(ROW_INDEX),
-                                                                  eq(COLUMN_INDEX));
-        mouseMoveHandler.manageBodyCoordinates(ROW_INDEX, COLUMN_INDEX);
-        verify(scenarioGridMock, times(1)).getModel();
-        verify(simulationMock, times(1)).getDataByIndex(eq(ROW_INDEX));
-        verify(simulationDescriptorMock, times(1)).getFactMappingByIndex(eq(COLUMN_INDEX));
-        verify(scenarioMock, times(1)).getFactMappingValue(eq(factMappingMock));
-        verify(mouseMoveHandler, times(1)).manageFactMappingValue(
-                eq(factMappingValueMock),
-                eq(ROW_INDEX),
-                eq(COLUMN_INDEX));
-    }
-
-    @Test
-    public void manageFactMappingValueSuccess() {
-        when(factMappingValueMock.getStatus()).thenReturn(FactMappingValueStatus.SUCCESS);
-        mouseMoveHandler.manageFactMappingValue(factMappingValueMock, ROW_INDEX, COLUMN_INDEX);
-        verify(mouseMoveHandler, never()).manageFailedFactMappingValue(eq(factMappingValueMock),
-                                                                       eq(ROW_INDEX),
-                                                                       eq(COLUMN_INDEX));
-    }
-
-    @Test
-    public void manageFactMappingValueNotSuccess() {
-        when(factMappingValueMock.getStatus()).thenReturn(FactMappingValueStatus.FAILED_WITH_EXCEPTION);
-        doNothing().when(mouseMoveHandler).manageFailedFactMappingValue(eq(factMappingValueMock),
-                                                                        eq(ROW_INDEX),
-                                                                        eq(COLUMN_INDEX));
-        mouseMoveHandler.manageFactMappingValue(factMappingValueMock, ROW_INDEX, COLUMN_INDEX);
-        verify(mouseMoveHandler, times(1)).manageFailedFactMappingValue(eq(factMappingValueMock),
-                                                                        eq(ROW_INDEX),
-                                                                        eq(COLUMN_INDEX));
-    }
-
-    @Test
-    public void manageFailedFactMappingValueRight() {
-        int expectedDx = (int) (CELL_WIDTH / 2) + DX;
-        doNothing().when(mouseMoveHandler).setupPopupPresenter(eq(factMappingValueMock),
-                                                               eq(0),
-                                                               eq(COLUMN_INDEX),
-                                                               eq(expectedDx),
-                                                               eq(DY),
-                                                               eq(PopoverView.Position.RIGHT));
-        mouseMoveHandler.manageFailedFactMappingValue(factMappingValueMock, 0, COLUMN_INDEX);
-        verify(mouseMoveHandler, times(1)).retrieveCellMiddleXYPosition(gridColumnMock, 0);
-        verify(mouseMoveHandler, times(1)).setupPopupPresenter(eq(factMappingValueMock),
-                                                               eq(0),
-                                                               eq(COLUMN_INDEX),
-                                                               eq(expectedDx),
-                                                               eq(DY),
-                                                               eq(PopoverView.Position.RIGHT));
-        verify(errorReportPopupPresenterMock, times(1)).show();
-    }
-
-    @Test
-    public void manageFailedFactMappingValueLeft() {
-        when(scenarioGridLayerMock.getWidth()).thenReturn(TINY_LAYER);
-        int expectedDx = (int) (DX - (CELL_WIDTH / 2));
-        doNothing().when(mouseMoveHandler).setupPopupPresenter(eq(factMappingValueMock),
-                                                               eq(0),
-                                                               eq(COLUMN_INDEX),
-                                                               eq(expectedDx),
-                                                               eq(DY),
-                                                               eq(PopoverView.Position.RIGHT));
-        mouseMoveHandler.manageFailedFactMappingValue(factMappingValueMock, 0, COLUMN_INDEX);
-        verify(mouseMoveHandler, times(1)).retrieveCellMiddleXYPosition(gridColumnMock, 0);
-        verify(mouseMoveHandler, times(1)).setupPopupPresenter(eq(factMappingValueMock),
-                                                               eq(0),
-                                                               eq(COLUMN_INDEX),
-                                                               eq(expectedDx),
-                                                               eq(DY),
-                                                               eq(PopoverView.Position.LEFT));
-        verify(errorReportPopupPresenterMock, times(1)).show();
-    }
-
-    @Test
-    public void manageFailedFactMappingValueTop() {
-        when(scenarioGridLayerMock.getWidth()).thenReturn(SMALLEST_LAYER);
-        layerElementMock.offsetLeft = 4000;
-        int expectedDy = DY - (CELL_HEIGHT / 2);
-        doNothing().when(mouseMoveHandler).setupPopupPresenter(eq(factMappingValueMock),
-                                                               eq(0),
-                                                               eq(COLUMN_INDEX),
-                                                               eq(DX),
-                                                               eq(expectedDy),
-                                                               eq(PopoverView.Position.RIGHT));
-        mouseMoveHandler.manageFailedFactMappingValue(factMappingValueMock, 0, COLUMN_INDEX);
-        verify(mouseMoveHandler, times(1)).retrieveCellMiddleXYPosition(gridColumnMock, 0);
-
-        verify(mouseMoveHandler, times(1)).setupPopupPresenter(eq(factMappingValueMock),
-                                                               eq(0),
-                                                               eq(COLUMN_INDEX),
-                                                               eq(DX),
-                                                               eq(expectedDy),
-                                                               eq(PopoverView.Position.TOP));
-
-        verify(errorReportPopupPresenterMock, times(1)).show();
-    }
-
-    @Test
-    public void setupPopupPresenterWithScrollFailedWithError_NullPath() {
-        when(elementMock.getScrollTop()).thenReturn(SCROLL_TOP);
-        when(elementMock.getScrollLeft()).thenReturn(SCROLL_LEFT);
-        when(factMappingValueMock.getStatus()).thenReturn(FactMappingValueStatus.FAILED_WITH_ERROR);
-        when(factMappingValueMock.getCollectionPathToValue()).thenReturn(null);
-        mouseMoveHandler.setupPopupPresenter(factMappingValueMock, ROW_INDEX, COLUMN_INDEX, DX, DY, PopoverView.Position.RIGHT);
-        verify(mouseMoveHandler, times(1)).showErrorPopoverWithSuggestion(eq(RAW_VALUE), eq(ERROR_VALUE), eq(ROW_INDEX), eq(COLUMN_INDEX), eq(DX), eq(DY), eq(PopoverView.Position.RIGHT));
-    }
-
-    @Test
-    public void setupPopupPresenterWithScrollFailedWithError_WithPath() {
-        when(elementMock.getScrollTop()).thenReturn(SCROLL_TOP);
-        when(elementMock.getScrollLeft()).thenReturn(SCROLL_LEFT);
-        when(factMappingValueMock.getStatus()).thenReturn(FactMappingValueStatus.FAILED_WITH_ERROR);
-        when(factMappingValueMock.getCollectionPathToValue()).thenReturn(Arrays.asList("field1"));
-        mouseMoveHandler.setupPopupPresenter(factMappingValueMock, ROW_INDEX, COLUMN_INDEX, DX, DY, PopoverView.Position.RIGHT);
-        String errorMessage = mouseMoveHandler.getCollectionHTMLErrorMessage(ERROR_VALUE, Arrays.asList("field1"));
-        verify(mouseMoveHandler, times(1)).showErrorPopoverWithoutSuggestion(eq(errorMessage), eq(DX), eq(DY), eq(PopoverView.Position.RIGHT));
-    }
-
-    @Test
-    public void setupPopupPresenterWithScrollFailedWithException() {
-        when(elementMock.getScrollTop()).thenReturn(SCROLL_TOP);
-        when(elementMock.getScrollLeft()).thenReturn(SCROLL_LEFT);
-        when(factMappingValueMock.getStatus()).thenReturn(FactMappingValueStatus.FAILED_WITH_EXCEPTION);
-        when(factMappingValueMock.getExceptionMessage()).thenReturn(EXCEPTION);
-        mouseMoveHandler.setupPopupPresenter(factMappingValueMock, ROW_INDEX, COLUMN_INDEX, DX, DY, PopoverView.Position.RIGHT);
-        verify(mouseMoveHandler, times(1)).showErrorPopoverWithoutSuggestion(eq(EXCEPTION), eq(DX), eq(DY), eq(PopoverView.Position.RIGHT));
-    }
-
-    @Test
-    public void showErrorPopoverWithoutSuggestion() {
-        mouseMoveHandler.showErrorPopoverWithoutSuggestion(ERROR_VALUE, DX, DY, PopoverView.Position.RIGHT);
-        verify(errorReportPopupPresenterMock, times(1)).setup(
-                eq(ScenarioSimulationEditorConstants.INSTANCE.errorReason()),
-                eq(ERROR_VALUE),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.close()),
-                eq(DX),
-                eq(DY),
-                eq(PopoverView.Position.RIGHT));
-    }
-
-    @Test
-    public void showErrorPopoverWithSuggestion() {
-        when(elementMock.getScrollTop()).thenReturn(SCROLL_TOP);
-        when(elementMock.getScrollLeft()).thenReturn(SCROLL_LEFT);
-        when(factMappingValueMock.getStatus()).thenReturn(FactMappingValueStatus.FAILED_WITH_ERROR);
-        mouseMoveHandler.showErrorPopoverWithSuggestion(RAW_VALUE, ERROR_VALUE, ROW_INDEX, COLUMN_INDEX, DX, DY, PopoverView.Position.RIGHT);
-        String expectedValue = mouseMoveHandler.decorateWithStrongHTMLTag(RAW_VALUE);
-        String wrongValue = mouseMoveHandler.decorateWithStrongHTMLTag(ERROR_VALUE);
-        verify(errorReportPopupPresenterMock, times(1)).setup(
-                eq(ScenarioSimulationEditorConstants.INSTANCE.errorReason()),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.errorPopoverMessageFailedWithError(expectedValue, wrongValue)),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.keep()),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.apply()),
-                isA(Command.class),
-                eq(DX),
-                eq(DY),
-                eq(PopoverView.Position.RIGHT));
-    }
-
-    @Test
-    public void showErrorPopoverWithSuggestion_NULLValues() {
-        when(elementMock.getScrollTop()).thenReturn(SCROLL_TOP);
-        when(elementMock.getScrollLeft()).thenReturn(SCROLL_LEFT);
-        when(factMappingValueMock.getStatus()).thenReturn(FactMappingValueStatus.FAILED_WITH_ERROR);
-        mouseMoveHandler.showErrorPopoverWithSuggestion(null, null, ROW_INDEX, COLUMN_INDEX, DX, DY, PopoverView.Position.RIGHT);
-        String expectedValue = mouseMoveHandler.decorateWithStrongHTMLTag(NULL);
-        String wrongValue = mouseMoveHandler.decorateWithStrongHTMLTag(NULL);
-        verify(errorReportPopupPresenterMock, times(1)).setup(
-                eq(ScenarioSimulationEditorConstants.INSTANCE.errorReason()),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.errorPopoverMessageFailedWithError(expectedValue, wrongValue)),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.keep()),
-                eq(ScenarioSimulationEditorConstants.INSTANCE.apply()),
-                isA(Command.class),
-                eq(DX),
-                eq(DY),
-                eq(PopoverView.Position.RIGHT));
-    }
-
-    @Test
-    public void getCollectionHTMLErrorMessage_EmptyPath() {
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.errorPopoverGenericCollectionErrorMessage(),
-                     mouseMoveHandler.getCollectionHTMLErrorMessage(ERROR_VALUE, Collections.emptyList()));
-    }
-
-    @Test
-    public void getCollectionHTMLErrorMessage_OnePathItemWithWrongValue() {
-        String field1 = "Field1";
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLFailureMessage(mouseMoveHandler.decorateWithEMHTMLTag(field1))
-                             + BR
-                             + ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLValue(mouseMoveHandler.decorateWithStrongHTMLTag(ERROR_VALUE)),
-                     mouseMoveHandler.getCollectionHTMLErrorMessage(ERROR_VALUE, Arrays.asList(field1)));
-    }
-
-    @Test
-    public void getCollectionHTMLErrorMessage_OnePathItemWithoutWrongValue() {
-        String field1 = "Field1";
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLFailureMessage(mouseMoveHandler.decorateWithEMHTMLTag(field1)),
-                     mouseMoveHandler.getCollectionHTMLErrorMessage(null, Arrays.asList(field1)));
-    }
-
-    @Test
-    public void getCollectionHTMLErrorMessage_PathItemsWithWrongValue() {
-        String field1 = "Field1";
-        String field2 = "Field2";
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLFailureMessage(mouseMoveHandler.decorateWithEMHTMLTag(field1))
-                             + BR
-                             + ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLField(mouseMoveHandler.decorateWithEMHTMLTag(mouseMoveHandler.generateFieldsHierarchy(Arrays.asList(field2))))
-                             + ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLValue(mouseMoveHandler.decorateWithStrongHTMLTag(ERROR_VALUE)),
-                     mouseMoveHandler.getCollectionHTMLErrorMessage(ERROR_VALUE, Arrays.asList(field1, field2)));
-    }
-
-    @Test
-    public void getCollectionHTMLErrorMessage_PathItemsWithoutWrongValue() {
-        String field1 = "Field1";
-        String field2 = "Field2";
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLFailureMessage(mouseMoveHandler.decorateWithEMHTMLTag(field1))
-                             + BR
-                             + ScenarioSimulationEditorConstants.INSTANCE.errorPopoverCollectionHTMLField(mouseMoveHandler.decorateWithEMHTMLTag(mouseMoveHandler.generateFieldsHierarchy(Arrays.asList(field2)))),
-                     mouseMoveHandler.getCollectionHTMLErrorMessage(null, Arrays.asList(field1, field2))
-        );
-    }
-
-    @Test
-    public void decorateWithStrongHTMLTag() {
-        assertEquals("<strong>\"" + RAW_VALUE + "\"</strong>", mouseMoveHandler.decorateWithStrongHTMLTag(RAW_VALUE));
-    }
-
-    @Test
-    public void decorateWithEMHTMLTag() {
-        assertEquals("<em>" + RAW_VALUE + "</em>", mouseMoveHandler.decorateWithEMHTMLTag(RAW_VALUE));
-    }
-
-    @Test
-    public void generateFieldsHierarchy() {
-        assertEquals("Field1<br>", mouseMoveHandler.generateFieldsHierarchy(Arrays.asList("Field1")));
-        assertEquals("<ul><li>Field1<ul><li>Field2<ul><li>Field3</li></ul></li></ul></li></ul>",
-                     mouseMoveHandler.generateFieldsHierarchy(Arrays.asList("Field1", "Field2", "Field3")));
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SourceTypeSelectorTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SourceTypeSelectorTest.java
deleted file mode 100644
index 29ef366..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/SourceTypeSelectorTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.event.logical.shared.ValueChangeEvent;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class SourceTypeSelectorTest {
-
-    @Mock
-    private TitledAttachmentFileWidget uploadWidgetMock;
-
-    private SourceTypeSelector sourceTypeSelector;
-
-    @Before
-    public void setUp() throws Exception {
-        sourceTypeSelector = spy(new SourceTypeSelector(uploadWidgetMock));
-    }
-
-    @Test
-    public void onValueChange() {
-        reset(uploadWidgetMock);
-        ValueChangeEvent eventMock = mock(ValueChangeEvent.class);
-        doReturn(false).when(sourceTypeSelector).isDMNSelected();
-        sourceTypeSelector.onValueChange(eventMock);
-        verify(uploadWidgetMock, never()).updateAssetList();
-        doReturn(true).when(sourceTypeSelector).isDMNSelected();
-        sourceTypeSelector.onValueChange(eventMock);
-        verify(uploadWidgetMock, times(1)).updateAssetList();
-    }
-
-    @Test
-    public void validateDMO() {
-        commonValidate(false, false, true);
-    }
-
-    @Test
-    public void validateInvalidDMN() {
-        commonValidate(true, false, false);
-    }
-
-    @Test
-    public void validateValidDMN() {
-        commonValidate(true, true, true);
-    }
-
-    @Test
-    public void addRadioButtons() {
-        reset(uploadWidgetMock);
-        sourceTypeSelector.addRadioButtons();
-        assertEquals(2, sourceTypeSelector.radioButtonList.size());
-        verify(uploadWidgetMock, times(1)).setVisible(false);
-
-    }
-
-    private void commonValidate(boolean isDMNSelected, boolean validate, boolean expected) {
-        doReturn(isDMNSelected).when(sourceTypeSelector).isDMNSelected();
-        doReturn(validate).when(uploadWidgetMock).validate();
-        boolean retrieved = sourceTypeSelector.validate();
-        if (isDMNSelected) {
-            verify(uploadWidgetMock, times(1)).validate();
-        }
-        if (expected) {
-            assertTrue(retrieved);
-        } else {
-            assertFalse(retrieved);
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/TitledAttachmentFileWidgetTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/TitledAttachmentFileWidgetTest.java
deleted file mode 100644
index 15c7254..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/TitledAttachmentFileWidgetTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.handlers;
-
-import com.google.gwt.user.client.ui.FlowPanel;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.gwtbootstrap3.client.ui.FormLabel;
-import org.gwtbootstrap3.client.ui.html.Span;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class TitledAttachmentFileWidgetTest extends AbstractNewScenarioTest {
-
-    @Mock
-    private FlowPanel fieldsMock;
-    @Mock
-    private FormLabel titleLabelMock;
-    @Mock
-    private Span errorLabelMock;
-
-    private TitledAttachmentFileWidget titledAttachmentFileWidget;
-
-    @Before
-    public void setup() throws Exception {
-        super.setup();
-        titledAttachmentFileWidget = spy(new TitledAttachmentFileWidget(ScenarioSimulationEditorConstants.INSTANCE.chooseDMN(),
-                                                                        scenarioSimulationDropdownMock) {
-            {
-                this.fields = fieldsMock;
-                this.titleLabel = titleLabelMock;
-                this.errorLabel = errorLabelMock;
-            }
-        });
-    }
-
-    @Test
-    public void clearStatus() {
-        titledAttachmentFileWidget.selectedPath = "SELECTED_PATH";
-        assertNotNull(titledAttachmentFileWidget.selectedPath);
-        titledAttachmentFileWidget.clearStatus();
-        verify(titledAttachmentFileWidget, times(1)).updateAssetList();
-        verify(errorLabelMock, times(1)).setText(eq(null));
-        assertNull(titledAttachmentFileWidget.selectedPath);
-    }
-
-    @Test
-    public void updateAssetList() {
-        titledAttachmentFileWidget.updateAssetList();
-        verify(scenarioSimulationDropdownMock, times(1)).loadAssets();
-    }
-
-    @Test
-    public void validateNullPath() {
-        commonValidate(null, false);
-    }
-
-    @Test
-    public void validateEmptyPath() {
-        commonValidate("", false);
-    }
-
-    @Test
-    public void validatePopulatedPath() {
-        commonValidate("SELECTED_PATH", true);
-    }
-
-    private void commonValidate(String selectedPath, boolean expected) {
-        titledAttachmentFileWidget.selectedPath = selectedPath;
-        boolean retrieved = titledAttachmentFileWidget.validate();
-        if (expected) {
-            verify(errorLabelMock, times(1)).setText(eq(null));
-            assertTrue(retrieved);
-        } else {
-            verify(errorLabelMock, times(1)).setText(eq(ScenarioSimulationEditorConstants.INSTANCE.chooseValidDMNAsset()));
-            assertFalse(retrieved);
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/menu/ScenarioContextMenuRegistryTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/menu/ScenarioContextMenuRegistryTest.java
deleted file mode 100644
index 194a2f2..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/menu/ScenarioContextMenuRegistryTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.menu;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.NativeEvent;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.ExpectedContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.GivenContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.GridContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.HeaderExpectedContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.HeaderGivenContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.OtherContextMenu;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.AbstractScenarioSimulationGridHandlerTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridRow;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLICK_POINT_X;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_HEIGHT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.HEADER_HEIGHT;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioContextMenuRegistryTest extends AbstractScenarioSimulationGridHandlerTest {
-
-    @Mock
-    private OtherContextMenu otherContextMenuMock;
-    @Mock
-    private HeaderGivenContextMenu headerGivenContextMenuMock;
-    @Mock
-    private HeaderExpectedContextMenu headerExpectedContextMenuMock;
-    @Mock
-    private GivenContextMenu givenContextMenuMock;
-    @Mock
-    private ExpectedContextMenu expectedContextMenuMock;
-    @Mock
-    private GridContextMenu gridContextMenuMock;
-    @Mock
-    private ContextMenuEvent contextMenuEventMock;
-    @Mock
-    private NativeEvent contextNativeEventMock;
-    @Mock
-    private Element contextMenuEventTargetMock;
-    @Mock
-    private Document contextMenuEventTargetOwnerMock;
-
-    private ScenarioContextMenuRegistry scenarioContextMenuRegistry;
-
-    @Before
-    @Override
-    public void setUp() {
-        super.setUp();
-        doReturn(contextNativeEventMock).when(contextMenuEventMock).getNativeEvent();
-        doReturn(contextMenuEventTargetMock).when(contextMenuEventMock).getRelativeElement();
-        doReturn(contextMenuEventTargetOwnerMock).when(contextMenuEventTargetMock).getOwnerDocument();
-
-        scenarioContextMenuRegistry = new ScenarioContextMenuRegistry(otherContextMenuMock,
-                                                                      headerGivenContextMenuMock,
-                                                                      headerExpectedContextMenuMock,
-                                                                      givenContextMenuMock,
-                                                                      expectedContextMenuMock,
-                                                                      gridContextMenuMock);
-    }
-
-    @Test
-    public void testManageHeaderRightClick() {
-        final int clickPointX = 5;
-        final int clickPointy = 6;
-        doReturn(clickPointX).when(contextNativeEventMock).getClientX();
-        doReturn(clickPointy).when(contextNativeEventMock).getClientY();
-        assertThat(scenarioContextMenuRegistry.manageRightClick(scenarioGridMock, contextMenuEventMock))
-                .as("Click to [0,0] header cell")
-                .isTrue();
-        verify(scenarioGridMock, times(1)).clearSelections();
-        verify(expectedContextMenuMock).show(GridWidget.SIMULATION,
-                                             clickPointX,
-                                             clickPointy,
-                                             0,
-                                             COLUMN_GROUP, false,
-                                             settingsLocal.getType().equals(ScenarioSimulationModel.Type.RULE));
-        verify(scenarioGridMock, times(1)).setSelectedColumnAndHeader(eq(0), eq(0));
-        verifyZeroInteractions(headerExpectedContextMenuMock);
-    }
-
-    @Test
-    public void testManageHeaderRightClick_ClickOutsideHeader() {
-        final int clickPointX = 5;
-        final int clickPointY = 11;
-        doReturn(clickPointX).when(contextNativeEventMock).getClientX();
-        doReturn(clickPointY).when(contextNativeEventMock).getClientY();
-        assertThat(scenarioContextMenuRegistry.manageRightClick(scenarioGridMock, contextMenuEventMock))
-                .as("Click point y more then header max y")
-                .isFalse();
-
-        verifyZeroInteractions(expectedContextMenuMock);
-        verifyZeroInteractions(headerExpectedContextMenuMock);
-    }
-
-    @Test
-    public void testManageHeaderRightClick_NoColumnGroup() {
-        final int clickPointX = 5;
-        final int clickPointY = 6;
-        doReturn(clickPointX).when(contextNativeEventMock).getClientX();
-        doReturn(clickPointY).when(contextNativeEventMock).getClientY();
-        doReturn("").when(informationHeaderMetaDataMock).getColumnGroup();
-        doReturn("EXPECT").when(informationHeaderMetaDataMock).getTitle();
-        assertThat(scenarioContextMenuRegistry.manageRightClick(scenarioGridMock, contextMenuEventMock))
-                .as("Context menu according to column title")
-                .isTrue();
-
-        verify(headerExpectedContextMenuMock).show(eq(GridWidget.SIMULATION),  eq(clickPointX), eq(clickPointY));
-        verifyZeroInteractions(expectedContextMenuMock);
-    }
-
-    @Test
-    public void testManageBodyRightClick() {
-        final int clickPointX = 5;
-        final int clickPointY = 11;
-        final double widgetHeight = 50.0;
-        final double rowHeight = widgetHeight - HEADER_HEIGHT;
-        doReturn(clickPointX).when(contextNativeEventMock).getClientX();
-        doReturn(clickPointY).when(contextNativeEventMock).getClientY();
-        doReturn(widgetHeight).when(scenarioGridMock).getHeight();
-        doReturn(1).when(scenarioGridModelMock).getRowCount();
-        final GridRow gridRowMock = mock(GridRow.class);
-        doReturn(gridRowMock).when(scenarioGridModelMock).getRow(0);
-        doReturn(rowHeight).when(gridRowMock).getHeight();
-        assertThat(scenarioContextMenuRegistry.manageRightClick(scenarioGridMock, contextMenuEventMock))
-                .as("Click to expect/given body cell")
-                .isTrue();
-        verify(scenarioGridMock, times(1)).clearSelections();
-        verify(gridContextMenuMock).show(GridWidget.SIMULATION,
-                                         clickPointX,
-                                         clickPointY,
-                                         0);
-        verify(scenarioGridMock, times(1)).setSelectedCell(eq(0), eq(0));
-    }
-
-    @Test
-    public void testManageBodyRightClickNotEnoughSpaceForMenu() {
-        final int clickPointX = (int) CLICK_POINT_X;
-        final int clickPointY = (int) (GRID_HEIGHT - 10);
-        final double widgetHeight = GRID_HEIGHT;
-        final double rowHeight = widgetHeight - HEADER_HEIGHT;
-        doReturn(clickPointX).when(contextNativeEventMock).getClientX();
-        doReturn(clickPointY).when(contextNativeEventMock).getClientY();
-        doReturn(widgetHeight).when(scenarioGridMock).getHeight();
-        doReturn(1).when(scenarioGridModelMock).getRowCount();
-        final GridRow gridRowMock = mock(GridRow.class);
-        doReturn(gridRowMock).when(scenarioGridModelMock).getRow(0);
-        doReturn(rowHeight).when(gridRowMock).getHeight();
-        assertThat(scenarioContextMenuRegistry.manageRightClick(scenarioGridMock, contextMenuEventMock))
-                .as("Click to expect/given body cell")
-                .isTrue();
-        verify(scenarioGridMock, times(1)).clearSelections();
-
-        final int expectedClickPointY = 260; // clickPointY - Scenario.ContextMenuRegistry.BIGGEST_MENU_HEIGHT_PX
-        verify(gridContextMenuMock)
-                .show(GridWidget.SIMULATION,
-                        clickPointX,
-                        expectedClickPointY,
-                        0);
-        verify(scenarioGridMock, times(1)).setSelectedCell(eq(0), eq(0));
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/metadata/ScenarioHeaderMetaDataTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/metadata/ScenarioHeaderMetaDataTest.java
deleted file mode 100644
index c35f282..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/metadata/ScenarioHeaderMetaDataTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.metadata;
-
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.uberfire.ext.wires.core.grids.client.model.GridCellEditAction;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ScenarioHeaderMetaDataTest {
-
-    @Mock
-    private ScenarioHeaderTextBoxSingletonDOMElementFactory factoryMock;
-
-    @Test(expected = IllegalStateException.class)
-    public void constructorFail() {
-        new ScenarioHeaderMetaData("", "", "", factoryMock, true, true);
-    }
-
-    @Test
-    public void edit_ReadOnly() {
-        ScenarioHeaderMetaData scenarioHeaderMetaData = new ScenarioHeaderMetaData("", "", "", factoryMock, true, false);
-        scenarioHeaderMetaData.setReadOnly(true);
-
-        assertThatThrownBy(() -> scenarioHeaderMetaData.edit(null))
-                .isInstanceOf(IllegalStateException.class)
-                .hasMessage("A read only header cannot be edited");
-    }
-
-    @Test
-    public void editTest_EditingMode() {
-        ScenarioHeaderMetaData scenarioHeaderMetaData = new ScenarioHeaderMetaData("", "", "", factoryMock, false, false);
-        scenarioHeaderMetaData.setReadOnly(false);
-        scenarioHeaderMetaData.setEditingMode(true);
-        scenarioHeaderMetaData.edit(null);
-        verify(factoryMock, never()).attachDomElement(any(), any(), any());
-    }
-
-    @Test
-    public void editTest_NotEditingMode() {
-        ScenarioHeaderMetaData scenarioHeaderMetaData = new ScenarioHeaderMetaData("", "", "", factoryMock, false, false);
-        scenarioHeaderMetaData.setReadOnly(false);
-        scenarioHeaderMetaData.setEditingMode(false);
-        scenarioHeaderMetaData.edit(null);
-        verify(factoryMock, times(1)).attachDomElement(any(), any(), any());
-    }
-
-    @Test
-    public void testSupportedEditAction() {
-        ScenarioHeaderMetaData scenarioHeaderMetaData = new ScenarioHeaderMetaData("", "", "", factoryMock, false, false);
-        assertEquals(GridCellEditAction.DOUBLE_CLICK, scenarioHeaderMetaData.getSupportedEditAction());
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/models/AbstractScesimGridModelTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/models/AbstractScesimGridModelTest.java
deleted file mode 100644
index 04778f8..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/models/AbstractScesimGridModelTest.java
+++ /dev/null
@@ -1,765 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.models;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.ExpressionElement;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingValue;
-import org.drools.scenariosimulation.api.model.FactMappingValueStatus;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.model.Scenario;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.ReloadTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.values.ScenarioGridCellValue;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridCell;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridRow;
-import org.uberfire.ext.wires.core.grids.client.model.impl.BaseGridRow;
-import org.uberfire.ext.wires.core.grids.client.widget.dom.single.impl.BaseSingletonDOMElementFactory;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_NUMBER;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_CELL_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_PROPERTY_TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_ROWS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.HEADER_META_DATA;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE_ELEMENTS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_COUNT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.VALUE_CLASS_NAME;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyDouble;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class AbstractScesimGridModelTest extends AbstractScenarioSimulationTest {
-
-    private AbstractScesimGridModel abstractScesimGridModelSpy;
-
-    @Mock
-    private ScenarioGridColumn scenarioIndexGridColumnMock;
-
-    @Mock
-    private BaseGridRow gridRowMock;
-
-    @Mock
-    private ScenarioHeaderMetaData groupHeaderMetaDataMock;
-
-    @Mock
-    private ScenarioHeaderMetaData indexHeaderMetaDataMock;
-
-    @Mock
-    private ScenarioGridCell gridCellMock;
-
-    @Mock
-    private ScenarioGridCellValue gridCellValueMock;
-
-    @Mock
-    private Scenario scenarioMock;
-
-    private Supplier<GridCell<?>> gridCellSupplier;
-
-    @Before
-    public void setup() {
-        super.setup();
-        HEADER_META_DATA.add(groupHeaderMetaDataMock);
-        HEADER_META_DATA.add(informationHeaderMetaDataMock);
-        HEADER_META_DATA.add(propertyHeaderMetaDataMock);
-
-        doReturn(gridCellValueMock).when(gridCellMock).getValue();
-
-        when(informationHeaderMetaDataMock.getMetadataType()).thenReturn(ScenarioHeaderMetaData.MetadataType.INSTANCE);
-        when(informationHeaderMetaDataMock.getTitle()).thenReturn(GRID_COLUMN_TITLE);
-        when(informationHeaderMetaDataMock.getColumnGroup()).thenReturn(GRID_COLUMN_GROUP);
-        when(informationHeaderMetaDataMock.getColumnId()).thenReturn(GRID_COLUMN_ID);
-        when(indexHeaderMetaDataMock.getTitle()).thenReturn(ExpressionIdentifier.INDEX.getName());
-        when(scenarioIndexGridColumnMock.getInformationHeaderMetaData()).thenReturn(indexHeaderMetaDataMock);
-
-        when(gridColumnMock.getHeaderMetaData()).thenReturn(HEADER_META_DATA);
-
-        when(gridCellMock.getValue()).thenReturn(gridCellValueMock);
-        when(gridCellValueMock.getValue()).thenReturn(GRID_CELL_TEXT);
-
-        when(scenarioMock.getUnmodifiableFactMappingValues()).thenReturn(factMappingValuesLocal);
-        GRID_ROWS.clear();
-        IntStream.range(0, ROW_COUNT).forEach(rowIndex -> {
-            when(simulationMock.addData(rowIndex)).thenReturn(scenarioMock);
-            when(simulationMock.getDataByIndex(rowIndex)).thenReturn(scenarioMock);
-            when(simulationMock.cloneData(rowIndex, rowIndex + 1)).thenReturn(scenarioMock);
-            GRID_ROWS.add(gridRowMock);
-        });
-        when(simulationMock.addData(ROW_COUNT)).thenReturn(scenarioMock);
-        when(simulationMock.getDataByIndex(ROW_COUNT)).thenReturn(scenarioMock);
-        when(simulationMock.cloneData(ROW_COUNT, ROW_COUNT + 1)).thenReturn(scenarioMock);
-
-        when(scenarioMock.getFactMappingValue(any(), any())).thenReturn(Optional.of(factMappingValueMock));
-        when(scenarioMock.getFactMappingValue(isA(FactMapping.class))).thenReturn(Optional.of(factMappingValueMock));
-        when(factMappingValueMock.getStatus()).thenReturn(FactMappingValueStatus.FAILED_WITH_ERROR);
-
-        gridCellSupplier = () -> gridCellMock;
-        abstractScesimGridModelSpy = spy(new AbstractScesimGridModel(false) {
-
-            {
-                this.abstractScesimModel = simulationMock;
-                this.eventBus = eventBusMock;
-                this.rows = GRID_ROWS;
-                this.columns = gridColumns;
-                this.scenarioExpressionCellTextAreaSingletonDOMElementFactory = scenarioExpressionCellTextAreaSingletonDOMElementFactorySpy;
-                this.collectionEditorSingletonDOMElementFactory = collectionEditorSingletonDOMElementFactoryTest;
-                this.scenarioCellTextAreaSingletonDOMElementFactory = scenarioCellTextAreaSingletonDOMElementFactorySpy;
-                this.scenarioHeaderTextBoxSingletonDOMElementFactory = scenarioHeaderTextBoxSingletonDOMElementFactorySpy;
-            }
-
-            @Override
-            public void insertRowGridOnly(int rowIndex, GridRow row, AbstractScesimData abstractScesimData) {
-
-            }
-
-            @Override
-            public void deleteColumn(GridColumn<?> column) {
-            }
-
-            @Override
-            public GridCell<?> getCell(final int rowIndex,
-                                       final int columnIndex) {
-                if (rowIndex < 0 || rowIndex > rows.size() - 1) {
-                    return null;
-                }
-                return gridCellMock;
-            }
-
-            @Override
-            public GridWidget getGridWidget() {
-                return GridWidget.SIMULATION;
-            }
-
-            @Override
-            protected void commonAddRow(int rowIndex) {
-
-            }
-
-            @Override
-            public Range getInstanceLimits(int columnIndex) {
-                return new Range(0, 0);
-            }
-        });
-    }
-
-    @Test
-    public void bindContent() {
-        assertTrue(abstractScesimGridModelSpy.getAbstractScesimModel().isPresent());
-    }
-
-    @Test
-    public void setEventBus() {
-        abstractScesimGridModelSpy.setEventBus(eventBusMock);
-        assertEquals(eventBusMock, abstractScesimGridModelSpy.eventBus);
-    }
-
-    @Test
-    public void getValidPlaceholders() {
-        doReturn(false).when(abstractScesimGridModelSpy).isSameInstanceType(FactMapping.getInstancePlaceHolder(0));
-        doReturn(false).when(abstractScesimGridModelSpy).isSameInstanceType(FactMapping.getInstancePlaceHolder(1));
-        doReturn(true).when(abstractScesimGridModelSpy).isSameInstanceType(FactMapping.getInstancePlaceHolder(2));
-        doReturn(false).when(abstractScesimGridModelSpy).isNewPropertyName(FactMapping.getPropertyPlaceHolder(0));
-        doReturn(false).when(abstractScesimGridModelSpy).isNewPropertyName(FactMapping.getPropertyPlaceHolder(1));
-        doReturn(false).when(abstractScesimGridModelSpy).isNewPropertyName(FactMapping.getPropertyPlaceHolder(2));
-        final Map.Entry<String, String> retrieved = abstractScesimGridModelSpy.getValidPlaceholders();
-        assertNotNull(retrieved);
-        assertEquals(FactMapping.getInstancePlaceHolder(3), retrieved.getKey());
-        assertEquals(FactMapping.getPropertyPlaceHolder(3), retrieved.getValue());
-    }
-
-    @Test
-    public void appendRow() {
-        abstractScesimGridModelSpy.appendRow(gridRowMock);
-        verify(abstractScesimGridModelSpy, atLeast(1)).checkSimulation();
-        verify(abstractScesimGridModelSpy, times(1)).commonAddRow(ROW_COUNT);
-    }
-
-    @Test
-    public void insertRow() {
-        abstractScesimGridModelSpy.insertRow(ROW_INDEX, gridRowMock);
-        verify(abstractScesimGridModelSpy, atLeast(1)).checkSimulation();
-        verify(abstractScesimGridModelSpy, times(1)).commonAddRow(ROW_INDEX);
-    }
-
-    @Test
-    public void deleteRow() {
-        abstractScesimGridModelSpy.deleteRow(ROW_INDEX);
-        verify(abstractScesimGridModelSpy, atLeast(1)).checkSimulation();
-        verify(simulationMock, times(1)).removeDataByIndex(ROW_INDEX);
-        verify(abstractScesimGridModelSpy, times(1)).updateIndexColumn();
-    }
-
-    @Test
-    public void duplicateRow() {
-        abstractScesimGridModelSpy.duplicateRow(ROW_INDEX, gridRowMock);
-        verify(abstractScesimGridModelSpy, atLeast(1)).checkSimulation();
-        verify(simulationMock, times(1)).cloneData(ROW_INDEX, ROW_INDEX + 1);
-        verify(abstractScesimGridModelSpy, times(1)).insertRowGridOnly(eq(ROW_INDEX + 1), eq(gridRowMock), isA(Scenario.class));
-        verify(abstractScesimGridModelSpy, never()).insertRow(ROW_INDEX, gridRowMock);
-    }
-
-    @Test
-    public void duplicateColumnValues() {
-        abstractScesimGridModelSpy.duplicateColumnValues(COLUMN_INDEX, COLUMN_INDEX - 1);
-        verify(abstractScesimGridModelSpy, times(abstractScesimGridModelSpy.getRowCount())).getCell(anyInt(), eq(COLUMN_INDEX));
-        verify(abstractScesimGridModelSpy, times(abstractScesimGridModelSpy.getRowCount())).setCellValue(anyInt(), eq(COLUMN_INDEX - 1), any());
-        assertTrue(IntStream.range(0, abstractScesimGridModelSpy.getRowCount())
-                           .allMatch(i -> abstractScesimGridModelSpy.getCell(i, COLUMN_INDEX).getValue().equals(abstractScesimGridModelSpy.getCell(i, COLUMN_INDEX).getValue())));
-    }
-
-    @Test
-    public void insertColumnGridOnly() {
-        abstractScesimGridModelSpy.insertColumnGridOnly(COLUMN_INDEX, gridColumnMock);
-        verify(abstractScesimGridModelSpy, times(1)).checkSimulation();
-    }
-
-    @Test
-    public void insertColumn() {
-        abstractScesimGridModelSpy.insertColumn(COLUMN_INDEX, gridColumnMock);
-        verify(abstractScesimGridModelSpy, times(1)).checkSimulation();
-        verify(abstractScesimGridModelSpy, times(1)).commonAddColumn(COLUMN_INDEX, gridColumnMock);
-    }
-
-    @Test
-    public void deleteColumn() {
-        abstractScesimGridModelSpy.deleteColumn(COLUMN_INDEX);
-        verify(abstractScesimGridModelSpy, times(1)).checkSimulation();
-        verify(abstractScesimGridModelSpy, times(1)).deleteColumn(gridColumnMock);
-        verify(simulationMock, times(1)).removeFactMappingByIndex(COLUMN_INDEX);
-    }
-
-    @Test
-    public void updateColumnTypeFalse() {
-        abstractScesimGridModelSpy.updateColumnProperty(COLUMN_INDEX, gridColumnMock, MULTIPART_VALUE_ELEMENTS, VALUE_CLASS_NAME, false, FactMappingValueType.NOT_EXPRESSION, ScenarioSimulationModel.Type.RULE);
-        verify(abstractScesimGridModelSpy, times(2)).checkSimulation();
-        verify(factMappingMock, times(1)).setFactMappingValueType(FactMappingValueType.NOT_EXPRESSION);
-        verify(abstractScesimGridModelSpy, times(1)).deleteColumn(COLUMN_INDEX);
-        verify(abstractScesimGridModelSpy, times(1)).commonAddColumn(eq(COLUMN_INDEX), eq(gridColumnMock), isA(ExpressionIdentifier.class));
-        verify(abstractScesimGridModelSpy, never()).setCellValue(anyInt(), anyInt(), any());
-    }
-
-    @Test
-    public void updateColumnTypeTrue() {
-        abstractScesimGridModelSpy.updateColumnProperty(COLUMN_INDEX, gridColumnMock, MULTIPART_VALUE_ELEMENTS, VALUE_CLASS_NAME, true, FactMappingValueType.NOT_EXPRESSION, ScenarioSimulationModel.Type.RULE);
-        verify(abstractScesimGridModelSpy, atLeast(2)).checkSimulation();
-        verify(abstractScesimGridModelSpy, atLeast(ROW_COUNT - 1)).getCell(anyInt(), eq(COLUMN_INDEX));
-        verify(factMappingMock, times(1)).setFactMappingValueType(FactMappingValueType.NOT_EXPRESSION);
-        verify(abstractScesimGridModelSpy, times(1)).deleteColumn(COLUMN_INDEX);
-        verify(abstractScesimGridModelSpy, times(1)).commonAddColumn(eq(COLUMN_INDEX), eq(gridColumnMock), isA(ExpressionIdentifier.class));
-        verify(abstractScesimGridModelSpy, atLeast(ROW_COUNT - 1)).setCellValue(anyInt(), eq(COLUMN_INDEX), isA(ScenarioGridCellValue.class));
-    }
-
-    @Test
-    public void replaceColumnTest() {
-        abstractScesimGridModelSpy.replaceColumn(ROW_INDEX, gridColumnMock);
-        verify(gridColumnMock, times(COLUMN_NUMBER)).getWidth();
-        verify(gridColumnMock, times(COLUMN_NUMBER)).setWidth(anyDouble());
-        verify(abstractScesimGridModelSpy, times(1)).deleteColumn(ROW_INDEX);
-        verify(abstractScesimGridModelSpy, times(1)).commonAddColumn(eq(ROW_INDEX), eq(gridColumnMock), isA(ExpressionIdentifier.class));
-    }
-
-    @Test
-    public void setCellGridOnly() {
-        abstractScesimGridModelSpy.setCellGridOnly(ROW_INDEX, COLUMN_INDEX, gridCellSupplier);
-        verify(abstractScesimGridModelSpy, times(1)).checkSimulation();
-    }
-
-    @Test
-    public void setCell() {
-        abstractScesimGridModelSpy.setCell(ROW_INDEX, COLUMN_INDEX, gridCellSupplier);
-        verify(abstractScesimGridModelSpy, times(1)).setCell(ROW_INDEX, COLUMN_INDEX, gridCellSupplier);
-    }
-
-    @Test
-    public void setSelectedColumn() {
-        abstractScesimGridModelSpy.selectColumn(COLUMN_INDEX);
-        assertEquals(gridColumnMock, abstractScesimGridModelSpy.getSelectedColumn());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void setSelectedColumn_NegativeIndex() {
-        int columnIndex = -1;
-        abstractScesimGridModelSpy.selectColumn(columnIndex);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void setSelectedColumn_OverflowIndex() {
-        int columnIndex = 7;
-        abstractScesimGridModelSpy.selectColumn(columnIndex);
-    }
-
-    @Test
-    public void getInstancesCount() {
-        long count = abstractScesimGridModelSpy.getInstancesCount(FULL_CLASS_NAME);
-        assertEquals(1, count);
-    }
-
-    @Test
-    public void getInstanceScenarioGridColumns() {
-        final List<ScenarioGridColumn> retrieved = abstractScesimGridModelSpy.getInstanceScenarioGridColumns((ScenarioGridColumn) gridColumns.get(3));
-        assertNotNull(retrieved);
-        assertEquals(1, retrieved.size());
-    }
-
-    @Test
-    public void updateHeader() {
-        String newValue = "NEW_VALUE";
-        abstractScesimGridModelSpy.updateHeader(COLUMN_INDEX, 1, newValue); // This is instance header
-        verify(eventBusMock, times(1)).fireEvent(isA(ReloadTestToolsEvent.class));
-        reset(eventBusMock);
-        abstractScesimGridModelSpy.updateHeader(COLUMN_INDEX, 2, newValue); // This is property header
-        verify(eventBusMock, never()).fireEvent(any());
-        reset(eventBusMock);
-        // if update with same value, no event should be raised
-        String title = abstractScesimGridModelSpy.getColumns().get(COLUMN_INDEX).getHeaderMetaData().get(1).getTitle();
-        abstractScesimGridModelSpy.updateHeader(COLUMN_INDEX, 1, title);
-        verify(eventBusMock, never()).fireEvent(any());
-    }
-
-    @Test
-    public void updateFactMappingInstance() {
-        final int INDEX = 0;
-        final String ALIAS_1 = "ALIAS_1";
-        final String ALIAS_2 = "ALIAS_2";
-        FactMapping factMappingReference = mock(FactMapping.class);
-        FactMapping factMappingToCheck = mock(FactMapping.class);
-        FactIdentifier factIdentifier1 = mock(FactIdentifier.class);
-        FactIdentifier factIdentifier2 = mock(FactIdentifier.class);
-        // Should execute the if in the first if
-        when(factMappingReference.getFactIdentifier()).thenReturn(FactIdentifier.EMPTY);
-        when(factMappingToCheck.getFactIdentifier()).thenReturn(FactIdentifier.EMPTY);
-        when(factMappingReference.getFactAlias()).thenReturn(ALIAS_1);
-        when(factMappingToCheck.getFactAlias()).thenReturn(ALIAS_1);
-        when(simulationDescriptorMock.getFactMappingByIndex(INDEX)).thenReturn(factMappingToCheck);
-        abstractScesimGridModelSpy.updateFactMapping(simulationDescriptorMock, factMappingReference, INDEX, MULTIPART_VALUE, ScenarioHeaderMetaData.MetadataType.INSTANCE);
-        verify(informationHeaderMetaDataMock, times(1)).setTitle(MULTIPART_VALUE);
-        verify(factMappingToCheck, times(1)).setFactAlias(MULTIPART_VALUE);
-        reset(informationHeaderMetaDataMock);
-        reset(factMappingToCheck);
-        // Should not execute the if in the first if
-        when(factMappingToCheck.getFactAlias()).thenReturn(ALIAS_2);
-        abstractScesimGridModelSpy.updateFactMapping(simulationDescriptorMock, factMappingReference, INDEX, MULTIPART_VALUE, ScenarioHeaderMetaData.MetadataType.INSTANCE);
-        verify(informationHeaderMetaDataMock, never()).setTitle(MULTIPART_VALUE);
-        verify(factMappingToCheck, never()).setFactAlias(MULTIPART_VALUE);
-        reset(informationHeaderMetaDataMock);
-        reset(factMappingToCheck);
-        // Should not execute the if in the first if
-        when(factMappingReference.getFactIdentifier()).thenReturn(factIdentifier1);
-        when(factMappingToCheck.getFactAlias()).thenReturn(ALIAS_1);
-        abstractScesimGridModelSpy.updateFactMapping(simulationDescriptorMock, factMappingReference, INDEX, MULTIPART_VALUE, ScenarioHeaderMetaData.MetadataType.INSTANCE);
-        verify(informationHeaderMetaDataMock, never()).setTitle(MULTIPART_VALUE);
-        verify(factMappingToCheck, never()).setFactAlias(MULTIPART_VALUE);
-        reset(informationHeaderMetaDataMock);
-        reset(factMappingToCheck);
-        // Should execute the second if
-        when(factMappingToCheck.getFactIdentifier()).thenReturn(factIdentifier1);
-        abstractScesimGridModelSpy.updateFactMapping(simulationDescriptorMock, factMappingReference, INDEX, MULTIPART_VALUE, ScenarioHeaderMetaData.MetadataType.INSTANCE);
-        verify(informationHeaderMetaDataMock, times(1)).setTitle(MULTIPART_VALUE);
-        verify(factMappingToCheck, times(1)).setFactAlias(MULTIPART_VALUE);
-        reset(informationHeaderMetaDataMock);
-        reset(factMappingToCheck);
-        // Should not execute the second if
-        when(factMappingToCheck.getFactIdentifier()).thenReturn(factIdentifier2);
-        abstractScesimGridModelSpy.updateFactMapping(simulationDescriptorMock, factMappingReference, INDEX, MULTIPART_VALUE, ScenarioHeaderMetaData.MetadataType.INSTANCE);
-        verify(informationHeaderMetaDataMock, never()).setTitle(MULTIPART_VALUE);
-        verify(factMappingToCheck, never()).setFactAlias(MULTIPART_VALUE);
-    }
-
-    @Test
-    public void updateFactMappingProperty() {
-        final int INDEX = 0;
-        final String ALIAS_1 = "ALIAS_1";
-        final String ALIAS_2 = "ALIAS_2";
-        FactMapping factMappingReference = mock(FactMapping.class);
-        FactMapping factMappingToCheck = mock(FactMapping.class);
-        FactIdentifier factIdentifier1 = mock(FactIdentifier.class);
-        // Should execute
-        when(factMappingReference.getFactIdentifier()).thenReturn(FactIdentifier.EMPTY);
-        when(factMappingToCheck.getFactIdentifier()).thenReturn(FactIdentifier.EMPTY);
-        when(factMappingReference.getFactAlias()).thenReturn(ALIAS_1);
-        when(factMappingToCheck.getFactAlias()).thenReturn(ALIAS_1);
-        when(factMappingReference.getFullExpression()).thenReturn(ALIAS_1);
-        when(factMappingToCheck.getFullExpression()).thenReturn(ALIAS_1);
-        when(simulationDescriptorMock.getFactMappingByIndex(INDEX)).thenReturn(factMappingToCheck);
-        abstractScesimGridModelSpy.updateFactMapping(simulationDescriptorMock, factMappingReference, INDEX, MULTIPART_VALUE, ScenarioHeaderMetaData.MetadataType.PROPERTY);
-        verify(propertyHeaderMetaDataMock, times(1)).setTitle(MULTIPART_VALUE);
-        verify(factMappingToCheck, times(1)).setExpressionAlias(MULTIPART_VALUE);
-        reset(propertyHeaderMetaDataMock);
-        reset(factMappingToCheck);
-        // Should not execute
-        when(factMappingToCheck.getFactAlias()).thenReturn(ALIAS_2);
-        abstractScesimGridModelSpy.updateFactMapping(simulationDescriptorMock, factMappingReference, INDEX, MULTIPART_VALUE, ScenarioHeaderMetaData.MetadataType.PROPERTY);
-        verify(propertyHeaderMetaDataMock, never()).setTitle(MULTIPART_VALUE);
-        verify(factMappingToCheck, never()).setExpressionAlias(MULTIPART_VALUE);
-        reset(propertyHeaderMetaDataMock);
-        reset(factMappingToCheck);
-        // Should not execute
-        when(factMappingReference.getFactIdentifier()).thenReturn(factIdentifier1);
-        when(factMappingToCheck.getFactAlias()).thenReturn(ALIAS_1);
-        when(factMappingToCheck.getFullExpression()).thenReturn(ALIAS_2);
-        abstractScesimGridModelSpy.updateFactMapping(simulationDescriptorMock, factMappingReference, INDEX, MULTIPART_VALUE, ScenarioHeaderMetaData.MetadataType.PROPERTY);
-        verify(propertyHeaderMetaDataMock, never()).setTitle(MULTIPART_VALUE);
-        verify(factMappingToCheck, never()).setExpressionAlias(MULTIPART_VALUE);
-    }
-
-    @Test
-    public void commonAddColumn() {
-        abstractScesimGridModelSpy.commonAddColumn(COLUMN_INDEX, gridColumnMock);
-        verify(abstractScesimGridModelSpy, times(0)).checkSimulation();
-    }
-
-    @Test
-    public void updateIndexColumn() {
-        abstractScesimGridModelSpy.updateIndexColumn();
-        verify(abstractScesimGridModelSpy, never()).setCellValue(anyInt(), anyInt(), isA(ScenarioGridCellValue.class));
-        reset(abstractScesimGridModelSpy);
-        when(abstractScesimGridModelSpy.getRowCount()).thenReturn(ROW_COUNT);
-        int indexColumnPosition = 0;
-        gridColumns.add(indexColumnPosition, scenarioIndexGridColumnMock);
-        when(abstractScesimGridModelSpy.getColumns()).thenReturn(gridColumns);
-        abstractScesimGridModelSpy.updateIndexColumn();
-    }
-
-    @Test
-    public void isSameInstanceHeaderDifferent() {
-        commonCheckSameInstanceHeader(CLASS_NAME, "TOAST", false);
-    }
-
-    @Test
-    public void isSameInstanceHeaderEqualWithoutPackage() {
-        commonCheckSameInstanceHeader(CLASS_NAME, CLASS_NAME, true);
-    }
-
-    @Test
-    public void isSameInstanceHeaderEqualWithPackage() {
-        commonCheckSameInstanceHeader(FULL_CLASS_NAME, CLASS_NAME, false);
-    }
-
-    @Test
-    public void isSameInstanceHeader_Different() {
-        isSameInstanceType(CLASS_NAME, "TOAST", false);
-    }
-
-    @Test
-    public void isSameInstanceHeader_Equal() {
-        isSameInstanceType(CLASS_NAME, CLASS_NAME, true);
-    }
-
-    @Test
-    public void refreshErrorsTest() {
-        int expectedCalls = abstractScesimGridModelSpy.getRowCount() * abstractScesimGridModelSpy.getColumnCount();
-        abstractScesimGridModelSpy.refreshErrors();
-        verify(gridCellMock, times(expectedCalls)).setErrorMode(true);
-
-        when(factMappingValueMock.getStatus()).thenReturn(FactMappingValueStatus.SUCCESS);
-        abstractScesimGridModelSpy.refreshErrors();
-        verify(gridCellMock, times(expectedCalls)).setErrorMode(false);
-    }
-
-    @Test
-    public void refreshErrorsRow() {
-        int expectedCalls = abstractScesimGridModelSpy.getColumnCount();
-        FactMappingValue factMappingValue = mock(FactMappingValue.class);
-        when(factMappingValue.getStatus()).thenReturn(FactMappingValueStatus.FAILED_WITH_ERROR);
-
-        when(scenarioMock.getFactMappingValue(any(), any())).thenReturn(Optional.empty());
-        abstractScesimGridModelSpy.refreshErrorsRow(0);
-        verify(gridCellMock, times(expectedCalls)).setErrorMode(false);
-
-        when(scenarioMock.getFactMappingValue(any(), any())).thenReturn(Optional.of(factMappingValue));
-        abstractScesimGridModelSpy.refreshErrorsRow(0);
-        verify(gridCellMock, times(expectedCalls)).setErrorMode(true);
-    }
-
-    @Test
-    public void validateInstanceHeaderUpdate() throws Exception {
-        commonValidateInstanceHeaderUpdate(1, false, false, false, false);
-        commonValidateInstanceHeaderUpdate(1, false, false, true, true);
-        commonValidateInstanceHeaderUpdate(1, false, true, false, false);
-        commonValidateInstanceHeaderUpdate(1, false, true, true, true);
-        commonValidateInstanceHeaderUpdate(1, true, false, false, false);
-        commonValidateInstanceHeaderUpdate(1, true, false, true, false);
-        commonValidateInstanceHeaderUpdate(1, true, true, false, false);
-        commonValidateInstanceHeaderUpdate(1, true, true, true, false);
-    }
-
-    @Test
-    public void validatePropertyHeaderUpdate() throws Exception {
-        commonValidatePropertyUpdate(1, false, false, false, false);
-        commonValidatePropertyUpdate(1, false, false, true, true);
-        commonValidatePropertyUpdate(1, false, true, false, false);
-        commonValidatePropertyUpdate(1, false, true, true, true);
-        commonValidatePropertyUpdate(1, true, false, false, false);
-        commonValidatePropertyUpdate(1, true, false, true, false);
-        commonValidatePropertyUpdate(1, true, true, false, false);
-        commonValidatePropertyUpdate(1, true, true, true, false);
-    }
-
-    private void isSameInstanceType(String columnClassName, String value, boolean expectedResult) {
-        FactIdentifier factIdentifierMock = mock(FactIdentifier.class);
-        when(factIdentifierMock.getClassNameWithoutPackage()).thenReturn(columnClassName);
-        when(factMappingMock.getFactIdentifier()).thenReturn(factIdentifierMock);
-        when(simulationDescriptorMock.getFactMappingByIndex(COLUMN_INDEX)).thenReturn(factMappingMock);
-        boolean result = abstractScesimGridModelSpy.isSameInstanceType(COLUMN_INDEX, value);
-        verify(simulationMock, times(1)).getScesimModelDescriptor();
-        verify(simulationDescriptorMock, times(1)).getFactMappingByIndex(COLUMN_INDEX);
-        assertEquals(result, expectedResult);
-    }
-
-    private void commonCheckSameInstanceHeader(String columnClassName, String value, boolean expected)  {
-        FactIdentifier factIdentifierMock = mock(FactIdentifier.class);
-        when(factIdentifierMock.getClassNameWithoutPackage()).thenReturn(columnClassName);
-        when(factMappingMock.getFactIdentifier()).thenReturn(factIdentifierMock);
-        when(simulationDescriptorMock.getFactMappingByIndex(COLUMN_INDEX)).thenReturn(factMappingMock);
-        try {
-            abstractScesimGridModelSpy.checkSameInstanceHeader(COLUMN_INDEX, value);
-            verify(abstractScesimGridModelSpy, times(1)).isSameInstanceType(COLUMN_INDEX, value);
-        } catch (Exception e) {
-            if (expected) {
-                fail("No exception expected, retrieved " + e.getMessage());
-            }
-        }
-    }
-
-    private void commonValidateInstanceHeaderUpdate(int columnIndex, boolean isADataType, boolean isSameInstanceHeader, boolean isUnique, boolean expectedValid) throws Exception {
-        if (isSameInstanceHeader) {
-            doThrow(new IllegalArgumentException("isSameInstanceHeader")).when(abstractScesimGridModelSpy).checkSameInstanceHeader(columnIndex, MULTIPART_VALUE_ELEMENTS.get(MULTIPART_VALUE_ELEMENTS.size() - 1));
-        } else {
-            doNothing().when(abstractScesimGridModelSpy).checkSameInstanceHeader(columnIndex, MULTIPART_VALUE_ELEMENTS.get(MULTIPART_VALUE_ELEMENTS.size() - 1));
-        }
-        if (isUnique) {
-            doNothing().when(abstractScesimGridModelSpy).checkValidAndUniqueInstanceHeaderTitle(MULTIPART_VALUE, columnIndex);
-        } else {
-            doThrow(new IllegalArgumentException("isUnique")).when(abstractScesimGridModelSpy).checkValidAndUniqueInstanceHeaderTitle(MULTIPART_VALUE, columnIndex);
-        }
-        try {
-            abstractScesimGridModelSpy.validateInstanceHeaderUpdate(MULTIPART_VALUE, columnIndex, isADataType);
-        } catch (Exception e) {
-            if (expectedValid) {
-                fail("No exception expected, retrieved:  " + e.getMessage());
-            }
-        }
-        reset(eventBusMock);
-    }
-
-    private void commonValidatePropertyUpdate(int columnIndex, boolean isPropertyType, boolean isSamePropertyHeader, boolean isUnique, boolean expectedValid) throws Exception {
-        if (isSamePropertyHeader) {
-            doThrow(new IllegalArgumentException("isSamePropertyHeader")).when(abstractScesimGridModelSpy).checkSamePropertyHeader(columnIndex, MULTIPART_VALUE_ELEMENTS);
-        } else {
-            doNothing().when(abstractScesimGridModelSpy).checkSamePropertyHeader(columnIndex, MULTIPART_VALUE_ELEMENTS);
-        }
-        if (isUnique) {
-            doNothing().when(abstractScesimGridModelSpy).checkValidAndUniquePropertyHeaderTitle(MULTIPART_VALUE, columnIndex);
-        } else {
-            doThrow(new IllegalArgumentException("isUnique")).when(abstractScesimGridModelSpy).checkValidAndUniquePropertyHeaderTitle(MULTIPART_VALUE, columnIndex);
-        }
-        try {
-            abstractScesimGridModelSpy.validatePropertyHeaderUpdate(MULTIPART_VALUE, columnIndex, isPropertyType);
-        } catch (Exception e) {
-            if (expectedValid) {
-                fail("No exception expected, retrieved:  " + e.getMessage());
-            }
-        }
-        reset(eventBusMock);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void checkUniquePropertyHeaderTitle_AssignedLabel() {
-        abstractScesimGridModelSpy.checkUniquePropertyHeaderTitle(GRID_PROPERTY_TITLE, COLUMN_INDEX);
-    }
-
-    @Test
-    public void resetError() {
-        abstractScesimGridModelSpy = spy(new ScenarioGridModel(false) {
-            {
-                this.abstractScesimModel = simulationMock;
-                this.eventBus = eventBusMock;
-                this.rows = GRID_ROWS;
-                this.columns = gridColumns;
-            }
-
-            @Override
-            public void refreshErrors() {
-                //Do nothing
-            }
-
-            @Override
-            public GridCell<?> getCell(final int rowIndex,
-                                       final int columnIndex) {
-                if (rowIndex < 0 || rowIndex > rows.size() - 1) {
-                    return null;
-                }
-                return gridCellMock;
-            }
-        });
-        abstractScesimGridModelSpy.resetError(ROW_INDEX, COLUMN_INDEX);
-        verify(simulationMock, times(1)).getDataByIndex(ROW_INDEX);
-        verify(simulationDescriptorMock, times(1)).getFactMappingByIndex(COLUMN_INDEX);
-        verify(scenarioMock, times(1)).getFactMappingValue(factMappingMock);
-        verify(factMappingValueMock, times(1)).resetStatus();
-        verify(abstractScesimGridModelSpy, times(1)).refreshErrors();
-    }
-
-    @Test
-    public void synchronizeFactMappingsWidths() {
-        abstractScesimGridModelSpy.synchronizeFactMappingsWidths();
-        verify(abstractScesimGridModelSpy, times(gridColumns.size())).synchronizeFactMappingWidth(isA(GridColumn.class));
-    }
-
-    @Test
-    public void synchronizeFactMappingWidth() {
-        when(gridColumnMock.isVisible()).thenReturn(true);
-        abstractScesimGridModelSpy.synchronizeFactMappingWidth(gridColumnMock);
-        verify(factMappingMock, times(1)).setColumnWidth(gridColumnMock.getWidth());
-    }
-
-    @Test
-    public void synchronizeFactMappingWidth_NotVisibleColumn() {
-        when(gridColumnMock.isVisible()).thenReturn(false);
-        abstractScesimGridModelSpy.synchronizeFactMappingWidth(gridColumnMock);
-        verify(factMappingMock, never()).setColumnWidth(any());
-    }
-
-    @Test
-    public void loadFactMappingsWidth_FactMappingWithoutWidth() {
-        when(factMappingMock.getColumnWidth()).thenReturn(null);
-        gridColumns.clear();
-        gridColumns.add(gridColumnMock);
-        abstractScesimGridModelSpy.loadFactMappingsWidth();
-        verify(gridColumnMock, never()).setWidth(anyDouble());
-    }
-
-    @Test
-    public void loadFactMappingsWidth_FactMappingWithWidth() {
-        when(factMappingMock.getColumnWidth()).thenReturn(54.32);
-        gridColumns.clear();
-        gridColumns.add(gridColumnMock);
-        abstractScesimGridModelSpy.loadFactMappingsWidth();
-        verify(factMappingMock, never()).setColumnWidth(anyDouble());
-        verify(gridColumnMock, times(1)).setWidth(factMappingMock.getColumnWidth());
-    }
-
-    @Test
-    public void getDOMElementFactory_Collection() {
-        BaseSingletonDOMElementFactory factory = abstractScesimGridModelSpy.getDOMElementFactory("java.util.List", ScenarioSimulationModel.Type.RULE, FactMappingValueType.NOT_EXPRESSION);
-        assertSame(collectionEditorSingletonDOMElementFactoryTest, factory);
-        factory = abstractScesimGridModelSpy.getDOMElementFactory("java.util.Map", ScenarioSimulationModel.Type.RULE, FactMappingValueType.NOT_EXPRESSION);
-        assertSame(collectionEditorSingletonDOMElementFactoryTest, factory);
-        factory = abstractScesimGridModelSpy.getDOMElementFactory("java.util.List", ScenarioSimulationModel.Type.DMN, FactMappingValueType.NOT_EXPRESSION);
-        assertSame(collectionEditorSingletonDOMElementFactoryTest, factory);
-        factory = abstractScesimGridModelSpy.getDOMElementFactory("java.util.List", ScenarioSimulationModel.Type.DMN, FactMappingValueType.EXPRESSION);
-        assertSame(scenarioCellTextAreaSingletonDOMElementFactorySpy, factory);
-        factory = abstractScesimGridModelSpy.getDOMElementFactory("java.util.List", ScenarioSimulationModel.Type.RULE, FactMappingValueType.EXPRESSION);
-        assertSame(scenarioExpressionCellTextAreaSingletonDOMElementFactorySpy, factory);
-    }
-
-    @Test
-    public void getDOMElementFactory_Expression() {
-        BaseSingletonDOMElementFactory factory = abstractScesimGridModelSpy.getDOMElementFactory("com.Test", ScenarioSimulationModel.Type.DMN, FactMappingValueType.EXPRESSION);
-        assertSame(scenarioCellTextAreaSingletonDOMElementFactorySpy, factory);
-        factory = abstractScesimGridModelSpy.getDOMElementFactory("com.Test", ScenarioSimulationModel.Type.RULE, FactMappingValueType.EXPRESSION);
-        assertSame(scenarioExpressionCellTextAreaSingletonDOMElementFactorySpy, factory);
-    }
-
-    @Test
-    public void getDOMElementFactory_NotExpressionNotCollection() {
-        BaseSingletonDOMElementFactory factory = abstractScesimGridModelSpy.getDOMElementFactory("com.Test", ScenarioSimulationModel.Type.DMN, FactMappingValueType.NOT_EXPRESSION);
-        assertSame(scenarioCellTextAreaSingletonDOMElementFactorySpy, factory);
-        factory = abstractScesimGridModelSpy.getDOMElementFactory("com.Test", ScenarioSimulationModel.Type.RULE, FactMappingValueType.NOT_EXPRESSION);
-        assertSame(scenarioCellTextAreaSingletonDOMElementFactorySpy, factory);
-    }
-
-    @Test
-    public void destroyAllTextAreaDOMElementFactoryResources() {
-        abstractScesimGridModelSpy.flushAllTextAreaDOMElementFactoryResources();
-        verify(scenarioCellTextAreaSingletonDOMElementFactorySpy, times(1)).flush();
-        verify(scenarioExpressionCellTextAreaSingletonDOMElementFactorySpy, times(1)).flush();
-        verify(scenarioHeaderTextBoxSingletonDOMElementFactorySpy, times(1)).flush();
-    }
-
-    @Test
-    public void isSameSelectedColumnProperty() {
-        List<ExpressionElement> expressionList = Arrays.asList(new ExpressionElement("Fact"), new ExpressionElement("property"));
-        when(factMappingMock.getExpressionElements()).thenReturn(expressionList);
-        when(factMappingMock.getFactMappingValueType()).thenReturn(FactMappingValueType.NOT_EXPRESSION);
-        assertTrue(abstractScesimGridModelSpy.isSameSelectedColumnProperty(1, Arrays.asList("Fact", "property"), FactMappingValueType.NOT_EXPRESSION));
-        assertFalse(abstractScesimGridModelSpy.isSameSelectedColumnProperty(1, Arrays.asList("Fact", "property2"), FactMappingValueType.NOT_EXPRESSION));
-        assertFalse(abstractScesimGridModelSpy.isSameSelectedColumnProperty(1, Arrays.asList("property2"), FactMappingValueType.NOT_EXPRESSION));
-        assertFalse(abstractScesimGridModelSpy.isSameSelectedColumnProperty(1, Arrays.asList("Fact", "property"), FactMappingValueType.EXPRESSION));
-        assertFalse(abstractScesimGridModelSpy.isSameSelectedColumnProperty(1, Arrays.asList("Fact", "property2"), FactMappingValueType.EXPRESSION));
-        assertFalse(abstractScesimGridModelSpy.isSameSelectedColumnProperty(1, Arrays.asList("property2"), FactMappingValueType.EXPRESSION));
-        when(factMappingMock.getFactMappingValueType()).thenReturn(FactMappingValueType.EXPRESSION);
-        assertFalse(abstractScesimGridModelSpy.isSameSelectedColumnProperty(1, Arrays.asList("Fact", "property"), FactMappingValueType.NOT_EXPRESSION));
-        assertFalse(abstractScesimGridModelSpy.isSameSelectedColumnProperty(1, Arrays.asList("Fact", "property2"), FactMappingValueType.NOT_EXPRESSION));
-        assertFalse(abstractScesimGridModelSpy.isSameSelectedColumnProperty(1, Arrays.asList("property2"), FactMappingValueType.NOT_EXPRESSION));
-        assertTrue(abstractScesimGridModelSpy.isSameSelectedColumnProperty(1, Arrays.asList("Fact", "property"), FactMappingValueType.EXPRESSION));
-        assertFalse(abstractScesimGridModelSpy.isSameSelectedColumnProperty(1, Arrays.asList("Fact", "property2"), FactMappingValueType.EXPRESSION));
-        assertFalse(abstractScesimGridModelSpy.isSameSelectedColumnProperty(1, Arrays.asList("property2"), FactMappingValueType.EXPRESSION));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/models/BackgroundGridModelTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/models/BackgroundGridModelTest.java
deleted file mode 100644
index 47733a7..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/models/BackgroundGridModelTest.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.models;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.BackgroundData;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingValueStatus;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.values.ScenarioGridCellValue;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridCell;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-import org.uberfire.ext.wires.core.grids.client.model.impl.BaseGridRow;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_CELL_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_ROWS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.HEADER_META_DATA;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_COUNT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class BackgroundGridModelTest extends AbstractScenarioSimulationTest {
-
-    private BackgroundGridModel backgroundGridModelSpy;
-
-    @Mock
-    private ScenarioGridColumn scenarioIndexGridColumnMock;
-
-    @Mock
-    private BaseGridRow gridRowMock;
-
-    @Mock
-    private ScenarioHeaderMetaData groupHeaderMetaDataMock;
-
-    @Mock
-    private ScenarioHeaderMetaData indexHeaderMetaDataMock;
-
-    @Mock
-    private ScenarioGridCell gridCellMock;
-
-    @Mock
-    private ScenarioGridCellValue gridCellValueMock;
-
-    @Mock
-    private BackgroundData backgroundDataMock;
-
-    @Before
-    public void setup() {
-        super.setup();
-        HEADER_META_DATA.add(groupHeaderMetaDataMock);
-        HEADER_META_DATA.add(informationHeaderMetaDataMock);
-        HEADER_META_DATA.add(propertyHeaderMetaDataMock);
-
-        doReturn(gridCellValueMock).when(gridCellMock).getValue();
-
-        when(informationHeaderMetaDataMock.getMetadataType()).thenReturn(ScenarioHeaderMetaData.MetadataType.INSTANCE);
-        when(informationHeaderMetaDataMock.getTitle()).thenReturn(GRID_COLUMN_TITLE);
-        when(informationHeaderMetaDataMock.getColumnGroup()).thenReturn(GRID_COLUMN_GROUP);
-        when(informationHeaderMetaDataMock.getColumnId()).thenReturn(GRID_COLUMN_ID);
-        when(indexHeaderMetaDataMock.getTitle()).thenReturn(ExpressionIdentifier.INDEX.getName());
-        when(scenarioIndexGridColumnMock.getInformationHeaderMetaData()).thenReturn(indexHeaderMetaDataMock);
-
-        when(gridColumnMock.getHeaderMetaData()).thenReturn(HEADER_META_DATA);
-
-        when(gridCellMock.getValue()).thenReturn(gridCellValueMock);
-        when(gridCellValueMock.getValue()).thenReturn(GRID_CELL_TEXT);
-
-        when(backgroundDataMock.getUnmodifiableFactMappingValues()).thenReturn(factMappingValuesLocal);
-        GRID_ROWS.clear();
-        IntStream.range(0, ROW_COUNT).forEach(rowIndex -> {
-            when(backgroundMock.addData(rowIndex)).thenReturn(backgroundDataMock);
-            when(backgroundMock.getDataByIndex(rowIndex)).thenReturn(backgroundDataMock);
-            when(backgroundMock.cloneData(rowIndex, rowIndex + 1)).thenReturn(backgroundDataMock);
-            GRID_ROWS.add(gridRowMock);
-        });
-        when(backgroundMock.addData(ROW_COUNT)).thenReturn(backgroundDataMock);
-        when(backgroundMock.getDataByIndex(ROW_COUNT)).thenReturn(backgroundDataMock);
-        when(backgroundMock.cloneData(ROW_COUNT, ROW_COUNT + 1)).thenReturn(backgroundDataMock);
-
-        when(backgroundDataMock.getFactMappingValue(any(), any())).thenReturn(Optional.of(factMappingValueMock));
-        when(backgroundDataMock.getFactMappingValue(isA(FactMapping.class))).thenReturn(Optional.of(factMappingValueMock));
-        when(factMappingValueMock.getStatus()).thenReturn(FactMappingValueStatus.FAILED_WITH_ERROR);
-
-        backgroundGridModelSpy = spy(new BackgroundGridModel(false) {
-            {
-                this.abstractScesimModel = backgroundMock;
-                this.eventBus = eventBusMock;
-                this.rows = GRID_ROWS;
-                this.columns = gridColumns;
-            }
-
-            @Override
-            public void deleteColumn(GridColumn<?> column) {
-            }
-
-            @Override
-            public GridCell<?> getCell(final int rowIndex,
-                                       final int columnIndex) {
-                if (rowIndex < 0 || rowIndex > rows.size() - 1) {
-                    return null;
-                }
-                return gridCellMock;
-            }
-        });
-    }
-
-    @Test
-    public void getGridWidget() {
-        assertEquals(GridWidget.BACKGROUND, backgroundGridModelSpy.getGridWidget());
-    }
-
-    @Test
-    public void getInstanceLimits() {
-        final GridData.Range retrieved = backgroundGridModelSpy.getInstanceLimits(1);
-        assertNotNull(retrieved);
-        assertEquals(0, retrieved.getMinRowIndex());
-        assertEquals(3, retrieved.getMaxRowIndex());
-    }
-
-    @Test
-    public void insertRowGridOnly() {
-        int setCellInvocations = backgroundDataMock.getUnmodifiableFactMappingValues().size();
-        backgroundGridModelSpy.insertRowGridOnly(ROW_INDEX, gridRowMock, backgroundDataMock);
-        verify(backgroundGridModelSpy, atLeast(1)).checkSimulation();
-        verify(backgroundGridModelSpy, never()).insertRow(eq(ROW_INDEX), eq(gridRowMock));
-        verify(backgroundGridModelSpy, times(setCellInvocations)).setCell(anyInt(), anyInt(), isA(Supplier.class));
-        reset(backgroundGridModelSpy);
-        FactMapping factMappingByIndexMock = mock(FactMapping.class);
-        when(factMappingByIndexMock.getClassName()).thenReturn(List.class.getName());
-        when(simulationDescriptorMock.getFactMappingByIndex(2)).thenReturn(factMappingByIndexMock);
-        backgroundGridModelSpy.insertRowGridOnly(ROW_INDEX, gridRowMock, backgroundDataMock);
-        verify(backgroundGridModelSpy, atLeast(1)).checkSimulation();
-        verify(backgroundGridModelSpy, never()).insertRow(eq(ROW_INDEX), eq(gridRowMock));
-        verify(backgroundGridModelSpy, times(setCellInvocations)).setCell(anyInt(), anyInt(), isA(Supplier.class));
-    }
-
-    @Test
-    public void commonAddRow() {
-        backgroundGridModelSpy.commonAddRow(1);
-        verify(backgroundGridModelSpy, times(1)).commonAddRow(1, 0);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/models/SimulationGridModelTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/models/SimulationGridModelTest.java
deleted file mode 100644
index 9107d50..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/models/SimulationGridModelTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.models;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingValueStatus;
-import org.drools.scenariosimulation.api.model.Scenario;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.values.ScenarioGridCellValue;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridCell;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-import org.uberfire.ext.wires.core.grids.client.model.impl.BaseGridRow;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_CELL_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_ROWS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.HEADER_META_DATA;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_COUNT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ROW_INDEX;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class SimulationGridModelTest extends AbstractScenarioSimulationTest {
-
-    private ScenarioGridModel scenarioGridModelSpy;
-
-    @Mock
-    private ScenarioGridColumn scenarioIndexGridColumnMock;
-
-    @Mock
-    private BaseGridRow gridRowMock;
-
-    @Mock
-    private ScenarioHeaderMetaData groupHeaderMetaDataMock;
-
-    @Mock
-    private ScenarioHeaderMetaData indexHeaderMetaDataMock;
-
-    @Mock
-    private ScenarioGridCell gridCellMock;
-
-    @Mock
-    private ScenarioGridCellValue gridCellValueMock;
-
-    @Mock
-    private Scenario scenarioMock;
-
-
-    @Before
-    public void setup() {
-        super.setup();
-        HEADER_META_DATA.add(groupHeaderMetaDataMock);
-        HEADER_META_DATA.add(informationHeaderMetaDataMock);
-        HEADER_META_DATA.add(propertyHeaderMetaDataMock);
-
-        doReturn(gridCellValueMock).when(gridCellMock).getValue();
-
-        when(informationHeaderMetaDataMock.getMetadataType()).thenReturn(ScenarioHeaderMetaData.MetadataType.INSTANCE);
-        when(informationHeaderMetaDataMock.getTitle()).thenReturn(GRID_COLUMN_TITLE);
-        when(informationHeaderMetaDataMock.getColumnGroup()).thenReturn(GRID_COLUMN_GROUP);
-        when(informationHeaderMetaDataMock.getColumnId()).thenReturn(GRID_COLUMN_ID);
-        when(indexHeaderMetaDataMock.getTitle()).thenReturn(ExpressionIdentifier.INDEX.getName());
-        when(scenarioIndexGridColumnMock.getInformationHeaderMetaData()).thenReturn(indexHeaderMetaDataMock);
-
-        when(gridColumnMock.getHeaderMetaData()).thenReturn(HEADER_META_DATA);
-
-        when(gridCellMock.getValue()).thenReturn(gridCellValueMock);
-        when(gridCellValueMock.getValue()).thenReturn(GRID_CELL_TEXT);
-
-        when(scenarioMock.getUnmodifiableFactMappingValues()).thenReturn(factMappingValuesLocal);
-        GRID_ROWS.clear();
-        IntStream.range(0, ROW_COUNT).forEach(rowIndex -> {
-            when(simulationMock.addData(rowIndex)).thenReturn(scenarioMock);
-            when(simulationMock.getDataByIndex(rowIndex)).thenReturn(scenarioMock);
-            when(simulationMock.cloneData(rowIndex, rowIndex + 1)).thenReturn(scenarioMock);
-            GRID_ROWS.add(gridRowMock);
-        });
-        when(simulationMock.addData(ROW_COUNT)).thenReturn(scenarioMock);
-        when(simulationMock.getDataByIndex(ROW_COUNT)).thenReturn(scenarioMock);
-        when(simulationMock.cloneData(ROW_COUNT, ROW_COUNT + 1)).thenReturn(scenarioMock);
-
-        when(scenarioMock.getFactMappingValue(any(), any())).thenReturn(Optional.of(factMappingValueMock));
-        when(scenarioMock.getFactMappingValue(isA(FactMapping.class))).thenReturn(Optional.of(factMappingValueMock));
-        when(factMappingValueMock.getStatus()).thenReturn(FactMappingValueStatus.FAILED_WITH_ERROR);
-
-        scenarioGridModelSpy = spy(new ScenarioGridModel(false) {
-            {
-                this.abstractScesimModel = simulationMock;
-                this.eventBus = eventBusMock;
-                this.rows = GRID_ROWS;
-                this.columns = gridColumns;
-            }
-
-            @Override
-            public void deleteColumn(GridColumn<?> column) {
-            }
-
-            @Override
-            public GridCell<?> getCell(final int rowIndex,
-                                       final int columnIndex) {
-                if (rowIndex < 0 || rowIndex > rows.size() - 1) {
-                    return null;
-                }
-                return gridCellMock;
-            }
-        });
-    }
-
-    @Test
-    public void getGridWidget() {
-        assertEquals(GridWidget.SIMULATION, scenarioGridModelSpy.getGridWidget());
-    }
-
-    @Test
-    public void getInstanceLimits() {
-        final GridData.Range retrieved = scenarioGridModelSpy.getInstanceLimits(2);
-        assertNotNull(retrieved);
-        assertEquals(1, retrieved.getMinRowIndex());
-        assertEquals(3, retrieved.getMaxRowIndex());
-    }
-
-    @Test
-    public void insertRowGridOnly() {
-        int setCellInvocations = scenarioMock.getUnmodifiableFactMappingValues().size();
-        scenarioGridModelSpy.insertRowGridOnly(ROW_INDEX, gridRowMock, scenarioMock);
-        verify(scenarioGridModelSpy, atLeast(1)).checkSimulation();
-        verify(scenarioGridModelSpy, never()).insertRow(eq(ROW_INDEX), eq(gridRowMock));
-        verify(scenarioGridModelSpy, times(1)).updateIndexColumn();
-        verify(scenarioGridModelSpy, times(setCellInvocations)).setCell(anyInt(), anyInt(), isA(Supplier.class));
-        reset(scenarioGridModelSpy);
-        FactMapping factMappingByIndexMock = mock(FactMapping.class);
-        when(factMappingByIndexMock.getClassName()).thenReturn(List.class.getName());
-        when(simulationDescriptorMock.getFactMappingByIndex(2)).thenReturn(factMappingByIndexMock);
-        scenarioGridModelSpy.insertRowGridOnly(ROW_INDEX, gridRowMock, scenarioMock);
-        verify(scenarioGridModelSpy, atLeast(1)).checkSimulation();
-        verify(scenarioGridModelSpy, never()).insertRow(eq(ROW_INDEX), eq(gridRowMock));
-        verify(scenarioGridModelSpy, times(1)).updateIndexColumn();
-        verify(scenarioGridModelSpy, times(setCellInvocations)).setCell(anyInt(), anyInt(), isA(Supplier.class));
-    }
-
-    @Test
-    public void commonAddRow() {
-        scenarioGridModelSpy.commonAddRow(1);
-        verify(scenarioGridModelSpy, times(1)).commonAddRow(1, 1);
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popover/AbstractPopoverViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popover/AbstractPopoverViewTest.java
deleted file mode 100644
index 53d7f40..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popover/AbstractPopoverViewTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popover;
-
-import java.util.Optional;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.jboss.errai.common.client.dom.CSSStyleDeclaration;
-import org.jboss.errai.common.client.dom.Div;
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.jboss.errai.common.client.ui.ElementWrapperWidget;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.client.views.pfly.widgets.JQueryProducer;
-import org.uberfire.client.views.pfly.widgets.Popover;
-import org.uberfire.client.views.pfly.widgets.PopoverOptions;
-
-import static org.drools.workbench.screens.scenariosimulation.client.popover.AbstractPopoverView.ABSOLUTE;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.AbstractPopoverView.LEFT;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.AbstractPopoverView.POSITION;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.AbstractPopoverView.TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.AbstractPopoverView.TOP;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class AbstractPopoverViewTest {
-
-    public final static String EDITOR_TITLE_TEXT = "EDITOR_TITLE_TEXT";
-    public final static int MX = 36;
-    public final static int MY = 52;
-    public final static String TOP_PX = MY + "px";
-    public final static String LEFT_PX = MX + "px";
-
-    private AbstractPopoverView abstractPopoverView;
-
-    @Mock
-    private HTMLElement elementMock;
-
-    @Mock
-    private CSSStyleDeclaration styleMock;
-
-    @Mock
-    private Div popoverElementMock;
-
-    @Mock
-    private Div popoverContainerMock;
-
-    @Mock
-    private Div popoverContentMock;
-
-    @Mock
-    private Popover popoverMock;
-
-    @Mock
-    protected JQueryProducer.JQuery<Popover> jQueryPopoverMock;
-
-    @Mock private ElementWrapperWidget<Object> wrappedWidgetMock;
-
-    @Before
-    public void setup() {
-        abstractPopoverView = spy(new AbstractPopoverView() {
-            {
-                this.wrappedWidget = wrappedWidgetMock;
-                this.popover = popoverMock;
-                this.popoverElement = popoverElementMock;
-                this.popoverContentElement = popoverContentMock;
-                this.popoverContainerElement = popoverContainerMock;
-                this.jQueryPopover = jQueryPopoverMock;
-            }
-
-            @Override
-            public HTMLElement getElement() {
-                return elementMock;
-            }
-        });
-        when(jQueryPopoverMock.wrap(any())).thenReturn(popoverMock);
-        when(popoverElementMock.getStyle()).thenReturn(styleMock);
-    }
-
-    @Test
-    public void setupIsShown() {
-        doReturn(Boolean.TRUE).when(abstractPopoverView).isShown();
-        abstractPopoverView.setup(Optional.of(EDITOR_TITLE_TEXT), MX, MY, PopoverView.Position.RIGHT);
-        verify(abstractPopoverView, times(1)).hide();
-        verify(abstractPopoverView, times(1)).addWidgetToRootPanel();
-        verify(popoverElementMock, times(1)).setAttribute(TITLE, EDITOR_TITLE_TEXT);
-        verify(jQueryPopoverMock, times(1)).wrap(elementMock);
-        verify(popoverMock, times(1)).popover(isA(PopoverOptions.class));
-        verify(styleMock, times(1)).setProperty(eq(TOP),eq(TOP_PX));
-        verify(styleMock, times(1)).setProperty(eq(LEFT), eq(LEFT_PX));
-        verify(styleMock, times(1)).setProperty(eq(POSITION),eq(ABSOLUTE));
-    }
-
-    @Test
-    public void setupIsNotShown() {
-        doReturn(Boolean.FALSE).when(abstractPopoverView).isShown();
-        abstractPopoverView.setup(Optional.of(EDITOR_TITLE_TEXT), MX, MY, PopoverView.Position.RIGHT);
-        verify(abstractPopoverView, never()).hide();
-        verify(abstractPopoverView, times(1)).addWidgetToRootPanel();
-        verify(popoverElementMock, times(1)).setAttribute(TITLE, EDITOR_TITLE_TEXT);
-        verify(jQueryPopoverMock, times(1)).wrap(elementMock);
-        verify(popoverMock, times(1)).popover(isA(PopoverOptions.class));
-        verify(styleMock, times(1)).setProperty(eq(TOP),eq(TOP_PX));
-        verify(styleMock, times(1)).setProperty(eq(LEFT), eq(LEFT_PX));
-        verify(styleMock, times(1)).setProperty(eq(POSITION),eq(ABSOLUTE));
-    }
-
-    @Test
-    public void show() {
-        abstractPopoverView.show();
-        verify(abstractPopoverView, times(1)).scheduleTask();
-    }
-
-    @Test
-    public void hideIsShown() {
-        doReturn(Boolean.TRUE).when(abstractPopoverView).isShown();
-        assertNotNull(abstractPopoverView.wrappedWidget);
-        abstractPopoverView.hide();
-        verify(popoverMock, times(1)).destroy();
-        verify(abstractPopoverView, times(1)).removeWidgetFromRootPanel();
-        assertNull(abstractPopoverView.wrappedWidget);
-    }
-
-    @Test
-    public void hideNotIsShown() {
-        doReturn(Boolean.FALSE).when(abstractPopoverView).isShown();
-        abstractPopoverView.hide();
-        verify(popoverMock, never()).hide();
-        verify(popoverMock, never()).destroy();
-        verify(abstractPopoverView, never()).removeWidgetFromRootPanel();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverPresenterTest.java
deleted file mode 100644
index 484f40f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverPresenterTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popover;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.mvp.Command;
-
-import static org.drools.workbench.screens.scenariosimulation.client.popover.ErrorReportPopoverViewTest.APPLY_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.ErrorReportPopoverViewTest.ERROR_CONTENT_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.ErrorReportPopoverViewTest.ERROR_TITLE_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.ErrorReportPopoverViewTest.KEEP_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.ErrorReportPopoverViewTest.MX;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.ErrorReportPopoverViewTest.MY;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ErrorReportPopoverPresenterTest {
-
-    private ErrorReportPopoverPresenter errorReportPopupPresenter;
-
-    @Mock
-    private ErrorReportPopoverView errorReportPopoverViewMock;
-
-    @Mock
-    private Command applyCommandMock;
-
-    @Before
-    public void setUp() {
-        errorReportPopupPresenter = spy(new ErrorReportPopoverPresenter() {
-            {
-                this.errorReportPopupView = errorReportPopoverViewMock;
-            }
-        });
-    }
-
-    @Test
-    public void setupWithCommand() {
-        errorReportPopupPresenter.setup(ERROR_TITLE_TEXT, ERROR_CONTENT_TEXT, KEEP_TEXT, APPLY_TEXT, applyCommandMock, MX, MY, PopoverView.Position.RIGHT);
-        verify(errorReportPopoverViewMock, times(1)).setup(eq(ERROR_TITLE_TEXT),
-                                                           eq(ERROR_CONTENT_TEXT),
-                                                           eq(KEEP_TEXT),
-                                                           eq(APPLY_TEXT),
-                                                           eq(applyCommandMock),
-                                                           eq(MX),
-                                                           eq(MY),
-                                                           eq(PopoverView.Position.RIGHT));
-    }
-
-    @Test
-    public void setupWithoutCommand() {
-        errorReportPopupPresenter.setup(ERROR_TITLE_TEXT, ERROR_CONTENT_TEXT, KEEP_TEXT, MX, MY, PopoverView.Position.RIGHT);
-        verify(errorReportPopoverViewMock, times(1)).setup(eq(ERROR_TITLE_TEXT),
-                                                           eq(ERROR_CONTENT_TEXT),
-                                                           eq(KEEP_TEXT),
-                                                           eq(MX),
-                                                           eq(MY),
-                                                           eq(PopoverView.Position.RIGHT));
-    }
-
-    @Test
-    public void show() {
-        errorReportPopupPresenter.show();
-        verify(errorReportPopoverViewMock, times(1)).show();
-    }
-
-    @Test
-    public void hide() {
-        errorReportPopupPresenter.hide();
-        verify(errorReportPopoverViewMock, times(1)).hide();
-    }
-
-    @Test
-    public void isShown() {
-        errorReportPopupPresenter.isShown();
-        verify(errorReportPopoverViewMock, times(1)).isShown();
-    }
-
-    @Test
-    public void getActualHeight() {
-        errorReportPopupPresenter.getActualHeight();
-        verify(errorReportPopoverViewMock, times(1)).getActualHeight();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverViewTest.java
deleted file mode 100644
index f7366f5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popover/ErrorReportPopoverViewTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popover;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.dom.client.ButtonElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.jboss.errai.common.client.dom.CSSStyleDeclaration;
-import org.jboss.errai.common.client.dom.Div;
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.jboss.errai.common.client.ui.ElementWrapperWidget;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.client.views.pfly.widgets.JQueryProducer;
-import org.uberfire.client.views.pfly.widgets.Popover;
-import org.uberfire.client.views.pfly.widgets.PopoverOptions;
-import org.uberfire.mvp.Command;
-
-import static org.drools.workbench.screens.scenariosimulation.client.popover.AbstractPopoverView.ABSOLUTE;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.AbstractPopoverView.LEFT;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.AbstractPopoverView.POSITION;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.AbstractPopoverView.TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.popover.AbstractPopoverView.TOP;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-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;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ErrorReportPopoverViewTest {
-
-    public final static String ERROR_TITLE_TEXT = "ERROR_TITLE_TEXT";
-    public final static String ERROR_CONTENT_TEXT = "ERROR_CONTENT_TEXT";
-    public final static String KEEP_TEXT = "KEEP_TEXT";
-    public final static String APPLY_TEXT = "APPLY_TEXT";
-    public final static int MX = 36;
-    public final static int MY = 52;
-    public final static String TOP_PX = MY + "px";
-    public final static String LEFT_PX = MX + "px";
-
-    private ErrorReportPopoverView errorReportPopupView;
-
-    @Mock
-    private HTMLElement elementMock;
-
-    @Mock
-    private CSSStyleDeclaration styleMock;
-
-    @Mock
-    private Div errorContentMock;
-
-    @Mock
-    private Div popoverElementMock;
-
-    @Mock
-    private Div popoverContainerMock;
-
-    @Mock
-    private Div popoverContentMock;
-
-    @Mock
-    private Popover popoverMock;
-
-    @Mock
-    private ButtonElement keepButtonMock;
-
-    @Mock
-    private ButtonElement applyButtonMock;
-
-    @Mock
-    private Style applyButtonStyleMock;
-
-    @Mock
-    private Command applyCommandMock;
-
-    @Mock
-    protected JQueryProducer.JQuery<Popover> jQueryPopoverMock;
-
-    @Mock private ElementWrapperWidget<Object> wrappedWidgetMock;
-
-    @Before
-    public void setUp() {
-        errorReportPopupView = spy(new ErrorReportPopoverView() {
-            {
-                this.keepButton = keepButtonMock;
-                this.applyButton = applyButtonMock;
-                this.applyCommand = applyCommandMock;
-                this.errorContent = errorContentMock;
-                this.wrappedWidget = wrappedWidgetMock;
-                this.popover = popoverMock;
-                this.popoverElement = popoverElementMock;
-                this.popoverContentElement = popoverContentMock;
-                this.popoverContainerElement = popoverContainerMock;
-                this.jQueryPopover = jQueryPopoverMock;
-            }
-
-            @Override
-            public HTMLElement getElement() {
-                return elementMock;
-            }
-        });
-        when(jQueryPopoverMock.wrap(any())).thenReturn(popoverMock);
-        when(popoverElementMock.getStyle()).thenReturn(styleMock);
-        when(applyButtonMock.getStyle()).thenReturn(applyButtonStyleMock);
-    }
-
-    @Test
-    public void setupWithCommand() {
-        errorReportPopupView.setup(ERROR_TITLE_TEXT, ERROR_CONTENT_TEXT, KEEP_TEXT, APPLY_TEXT, applyCommandMock, MX, MY, PopoverView.Position.RIGHT);
-        verify(errorReportPopupView, times(1)).addWidgetToRootPanel();
-        verify(popoverElementMock, times(1)).setAttribute(TITLE, ERROR_TITLE_TEXT);
-        verify(jQueryPopoverMock, times(1)).wrap(elementMock);
-        verify(popoverMock, times(1)).popover(isA(PopoverOptions.class));
-        verify(styleMock, times(1)).setProperty(eq(TOP),eq(TOP_PX));
-        verify(styleMock, times(1)).setProperty(eq(LEFT), eq(LEFT_PX));
-        verify(styleMock, times(1)).setProperty(eq(POSITION),eq(ABSOLUTE));
-        verify(errorContentMock, times(1)).setInnerHTML(eq(ERROR_CONTENT_TEXT));
-        verify(keepButtonMock, times(1)).setInnerText(eq(KEEP_TEXT));
-        verify(applyButtonMock, times(1)).setInnerText(eq(APPLY_TEXT));
-        verify(applyButtonMock.getStyle(), times(1)).setDisplay(eq(Style.Display.INLINE));
-    }
-
-    @Test
-    public void setupWithoutCommand() {
-        errorReportPopupView.setup(ERROR_TITLE_TEXT, ERROR_CONTENT_TEXT, KEEP_TEXT, MX, MY, PopoverView.Position.RIGHT);
-        verify(errorReportPopupView, times(1)).addWidgetToRootPanel();
-        verify(popoverElementMock, times(1)).setAttribute(TITLE, ERROR_TITLE_TEXT);
-        verify(jQueryPopoverMock, times(1)).wrap(elementMock);
-        verify(popoverMock, times(1)).popover(isA(PopoverOptions.class));
-        verify(styleMock, times(1)).setProperty(eq(TOP),eq(TOP_PX));
-        verify(styleMock, times(1)).setProperty(eq(LEFT), eq(LEFT_PX));
-        verify(styleMock, times(1)).setProperty(eq(POSITION),eq(ABSOLUTE));
-        verify(errorContentMock, times(1)).setInnerHTML(eq(ERROR_CONTENT_TEXT));
-        verify(keepButtonMock, times(1)).setInnerText(eq(KEEP_TEXT));
-        verify(applyButtonMock.getStyle(), times(1)).setDisplay(eq(Style.Display.NONE));
-    }
-
-    @Test
-    public void onKeepButtonClicked() {
-        errorReportPopupView.onKeepButtonClicked(mock(ClickEvent.class));
-        verify(errorReportPopupView, times(1)).hide();
-    }
-
-    @Test
-    public void onApplyButtonClicked() {
-        errorReportPopupView.onApplyButtonClicked(mock(ClickEvent.class));
-        verify(applyCommandMock, times(1)).execute();
-        verify(errorReportPopupView, times(1)).hide();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractDeletePopupViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractDeletePopupViewTest.java
deleted file mode 100644
index e37c5d4..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractDeletePopupViewTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.google.gwt.dom.client.HeadingElement;
-import org.jboss.errai.common.client.dom.CSSStyleDeclaration;
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.jboss.errai.ui.client.local.spi.TranslationService;
-import org.mockito.Mock;
-import org.uberfire.client.views.pfly.widgets.Modal;
-import org.uberfire.mvp.Command;
-
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractDeletePopupViewTest {
-
-    @Mock
-    protected Command okDeleteCommandMock;
-
-    @Mock
-    protected Command okPreserveCommandMock;
-
-    @Mock
-    protected HTMLElement elementMock;
-
-    @Mock
-    protected TranslationService translationServiceMock;
-
-    @Mock
-    protected Modal modalMock;
-
-    @Mock
-    protected CSSStyleDeclaration styleMock;
-
-    @Mock
-    protected HeadingElement mainTitleMock;
-
-    @Mock
-    protected HeadingElement mainQuestionMock;
-
-
-
-    protected void commonSetup() {
-        when(elementMock.getStyle()).thenReturn(styleMock);
-        when(modalMock.getElement()).thenReturn(elementMock);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioConfirmationPopupViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioConfirmationPopupViewTest.java
deleted file mode 100644
index 3f3d930..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioConfirmationPopupViewTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.google.gwt.dom.client.ParagraphElement;
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.jboss.errai.common.client.dom.MouseEvent;
-import org.jboss.errai.ui.client.local.spi.TranslationService;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.uberfire.client.views.pfly.widgets.Button;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_QUESTION_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_TITLE_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OKDELETE_BUTTON_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT1_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT_QUESTION_TEXT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-public abstract class AbstractScenarioConfirmationPopupViewTest extends AbstractDeletePopupViewTest {
-
-    protected AbstractScenarioConfirmationPopupView popupView;
-
-    @Mock
-    protected ParagraphElement text1Mock;
-
-    @Mock
-    protected ParagraphElement textQuestionMock;
-
-    @Mock
-    protected Button cancelButtonMock;
-
-    @Mock
-    protected Button okDeleteButtonMock;
-
-    @Mock
-    protected MouseEvent mouseEventMock;
-
-    @Mock
-    protected TranslationService translationServiceMock;
-
-    @Before
-    public void setup() {
-        super.commonSetup();
-    }
-
-    @Test
-    public void init() {
-        popupView.init();
-        verify(cancelButtonMock, times(1)).setText(any());
-    }
-
-    @Test
-    public void show() {
-        popupView.show(MAIN_TITLE_TEXT,
-                       MAIN_QUESTION_TEXT,
-                       TEXT1_TEXT,
-                       TEXT_QUESTION_TEXT,
-                       OKDELETE_BUTTON_TEXT,
-                       okDeleteCommandMock);
-        verifyShow(MAIN_TITLE_TEXT,
-                   MAIN_QUESTION_TEXT,
-                   TEXT1_TEXT,
-                   TEXT_QUESTION_TEXT);
-        assertEquals(okDeleteCommandMock, popupView.okCommand);
-    }
-
-    @Test
-    public void getElement() {
-        final HTMLElement retrieved = popupView.getElement();
-        assertNotNull(retrieved);
-    }
-
-    @Test
-    public void hide() {
-        popupView.hide();
-        verify(modalMock, times(1)).hide();
-    }
-
-    @Test
-    public void onOkDeleteClick() {
-        popupView.okCommand = null;
-        popupView.onOkClick(mouseEventMock);
-        verify(okDeleteCommandMock, never()).execute();
-        verify(popupView, times(1)).hide();
-        reset(popupView);
-        popupView.okCommand = okDeleteCommandMock;
-        popupView.onOkClick(mouseEventMock);
-        verify(okDeleteCommandMock, times(1)).execute();
-        verify(popupView, times(1)).hide();
-    }
-
-    @Test
-    public void onCancelClick() {
-        popupView.onCancelClick(mouseEventMock);
-        verify(popupView, times(1)).hide();
-    }
-
-    protected void verifyShow(String mainTitleText, String mainQuestionText, String text1Text, String textQuestionText) {
-        verify(popupView, times(1)).conditionalShow(eq(mainTitleMock), eq(mainTitleText));
-        verify(popupView, times(1)).conditionalShow(eq(mainQuestionMock), eq(mainQuestionText));
-        verify(popupView, times(1)).conditionalShow(eq(text1Mock), eq(text1Text));
-        verify(popupView, times(1)).conditionalShow(eq(textQuestionMock), eq(textQuestionText));
-        verify(popupView, times(1)).conditionalShow(eq(okDeleteButtonMock), any(), any());
-        verify(modalMock, times(1)).show();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioPopupViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioPopupViewTest.java
deleted file mode 100644
index 361e17f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractScenarioPopupViewTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.google.gwt.dom.client.HeadingElement;
-import org.jboss.errai.common.client.dom.CSSStyleDeclaration;
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.jboss.errai.common.client.dom.MouseEvent;
-import org.jboss.errai.ui.client.local.spi.TranslationService;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.uberfire.client.views.pfly.widgets.Button;
-import org.uberfire.client.views.pfly.widgets.Modal;
-import org.uberfire.mvp.Command;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_TITLE_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OK_BUTTON_TEXT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractScenarioPopupViewTest {
-
-    protected AbstractScenarioPopupView popupView;
-
-    @Mock
-    protected Command okCommandMock;
-
-    @Mock
-    protected Button cancelButtonMock;
-
-    @Mock
-    protected Button okButtonMock;
-
-
-    @Mock
-    protected MouseEvent mouseEventMock;
-
-    @Mock
-    protected HTMLElement elementMock;
-
-    @Mock
-    protected TranslationService translationServiceMock;
-
-    @Mock
-    protected Modal modalMock;
-
-    @Mock
-    protected CSSStyleDeclaration styleMock;
-
-    @Mock
-    protected HeadingElement mainTitleMock;
-
-
-
-    @Test
-    public void init() {
-        popupView.init();
-        verify(cancelButtonMock, times(1)).setText(anyString());
-    }
-
-
-    @Test
-    public void show() {
-        popupView.show(MAIN_TITLE_TEXT,
-                       OK_BUTTON_TEXT,
-                       okCommandMock);
-        verifyShow(MAIN_TITLE_TEXT);
-        assertEquals(okCommandMock, popupView.okCommand);
-    }
-
-    @Test
-    public void getElement() {
-        final HTMLElement retrieved = popupView.getElement();
-        assertNotNull(retrieved);
-    }
-
-    @Test
-    public void hide() {
-        popupView.hide();
-        verify(modalMock, times(1)).hide();
-    }
-
-    @Test
-    public void onOkClick() {
-        popupView.okCommand = null;
-        popupView.onOkClick(mouseEventMock);
-        verify(okCommandMock, never()).execute();
-        verify(popupView, times(1)).hide();
-        reset(popupView);
-        popupView.okCommand = okCommandMock;
-        popupView.onOkClick(mouseEventMock);
-        verify(okCommandMock, times(1)).execute();
-        verify(popupView, times(1)).hide();
-    }
-
-    @Test
-    public void onCancelClick() {
-        popupView.onCancelClick(mouseEventMock);
-        verify(popupView, times(1)).hide();
-    }
-
-    protected void verifyShow(String mainTitleText) {
-        verify(popupView, times(1)).conditionalShow(eq(mainTitleMock), eq(mainTitleText));
-        verify(modalMock, times(1)).show();
-    }
-
-    protected void commonSetup() {
-        when(elementMock.getStyle()).thenReturn(styleMock);
-        when(modalMock.getElement()).thenReturn(elementMock);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractYesNoConfirmYesNoConfirmPopupViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractYesNoConfirmYesNoConfirmPopupViewTest.java
deleted file mode 100644
index 5bb8db1..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/AbstractYesNoConfirmYesNoConfirmPopupViewTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.client.views.pfly.widgets.Button;
-import org.uberfire.client.views.pfly.widgets.InlineNotification;
-import org.uberfire.mvp.Command;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public abstract class AbstractYesNoConfirmYesNoConfirmPopupViewTest {
-
-    @Mock
-    protected Command okCommandMock;
-
-    @Mock
-    protected Command yesCommandMock;
-
-    @Mock
-    protected Command noCommandMock;
-
-    protected final Button.ButtonStyleType BUTTON_STYLE_TYPE = Button.ButtonStyleType.SUCCESS;
-    protected final InlineNotification.InlineNotificationType INLINE_NOTIFICATION_TYPE = InlineNotification.InlineNotificationType.SUCCESS;
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupPresenterTest.java
deleted file mode 100644
index 1b22bb8..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupPresenterTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_TITLE_TEXT;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ConfirmPopupPresenterTest extends AbstractDeletePopupViewTest {
-
-    @Mock
-    private ConfirmPopupView confirmPopupViewMock;
-
-    private ConfirmPopupPresenter confirmPopupPresenter;
-
-
-
-    @Before
-    public void setup() {
-        confirmPopupPresenter = spy(new ConfirmPopupPresenter() {
-            {
-                this.confirmPopupView = confirmPopupViewMock;
-            }
-        });
-    }
-
-    @Test
-    public void show() {
-        confirmPopupPresenter.show(MAIN_TITLE_TEXT,
-                                   MAIN_TEXT);
-        verify(confirmPopupViewMock, times(1)).show(eq(MAIN_TITLE_TEXT), eq(MAIN_TEXT));
-    }
-
-    @Test
-    public void hide() {
-        confirmPopupPresenter.hide();
-        verify(confirmPopupViewMock, times(1)).hide();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupViewTest.java
deleted file mode 100644
index fd35eea..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/ConfirmPopupViewTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_TITLE_TEXT;
-import static org.mockito.Mockito.spy;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ConfirmPopupViewTest extends AbstractScenarioConfirmationPopupViewTest {
-
-    @Before
-    public void setup() {
-        super.commonSetup();
-        popupView = spy(new ConfirmPopupView() {
-            {
-                this.mainTitle = mainTitleMock;
-                this.mainQuestion = mainQuestionMock;
-                this.text1 = text1Mock;
-                this.textQuestion = textQuestionMock;
-                this.cancelButton = cancelButtonMock;
-                this.okButton = okDeleteButtonMock;
-                this.modal = modalMock;
-                this.translationService = translationServiceMock;
-            }
-        });
-    }
-
-    @Test
-    public void show() {
-        ((ConfirmPopupView) popupView).show(MAIN_TITLE_TEXT,
-                                            MAIN_TEXT);
-        verifyShow(MAIN_TITLE_TEXT,
-                   null, MAIN_TEXT, null);
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupPresenterTest.java
deleted file mode 100644
index cb58b09..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupPresenterTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_QUESTION_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_TITLE_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OKDELETE_BUTTON_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT1_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT_DANGER_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT_QUESTION_TEXT;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class DeletePopupPresenterTest extends AbstractDeletePopupViewTest {
-
-    @Mock
-    private DeletePopupView deletePopupViewMock;
-
-    private DeletePopupPresenter deletePopupPresenter;
-
-
-
-    @Before
-    public void setup() {
-        deletePopupPresenter = spy(new DeletePopupPresenter() {
-            {
-                this.deletePopupView = deletePopupViewMock;
-            }
-        });
-    }
-
-    @Test
-    public void show() {
-        deletePopupPresenter.show(MAIN_TITLE_TEXT,
-                                  MAIN_QUESTION_TEXT,
-                                  TEXT1_TEXT,
-                                  TEXT_QUESTION_TEXT,
-                                  TEXT_DANGER_TEXT,
-                                  OKDELETE_BUTTON_TEXT,
-                                  okDeleteCommandMock);
-        verify(deletePopupViewMock, times(1)).show(eq(MAIN_TITLE_TEXT), eq(MAIN_QUESTION_TEXT), eq(TEXT1_TEXT), eq(TEXT_QUESTION_TEXT), eq(TEXT_DANGER_TEXT), eq(OKDELETE_BUTTON_TEXT), eq(okDeleteCommandMock));
-    }
-
-    @Test
-    public void hide() {
-        deletePopupPresenter.hide();
-        verify(deletePopupViewMock, times(1)).hide();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupViewTest.java
deleted file mode 100644
index d02c31f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/DeletePopupViewTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.dom.client.ParagraphElement;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_QUESTION_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_TITLE_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OKDELETE_BUTTON_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT1_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT_DANGER_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT_QUESTION_TEXT;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class DeletePopupViewTest extends AbstractScenarioConfirmationPopupViewTest {
-
-    @Mock
-    private ParagraphElement textDangerMock;
-
-    @Before
-    public void setup() {
-        super.commonSetup();
-        popupView = spy(new DeletePopupView() {
-            {
-                this.mainTitle = mainTitleMock;
-                this.mainQuestion = mainQuestionMock;
-                this.text1 = text1Mock;
-                this.textQuestion = textQuestionMock;
-                this.textDanger = textDangerMock;
-                this.cancelButton = cancelButtonMock;
-                this.okButton = okDeleteButtonMock;
-                this.modal = modalMock;
-                this.translationService = translationServiceMock;
-            }
-        });
-    }
-
-    @Test
-    public void show() {
-        ((DeletePopupView) popupView).show(MAIN_TITLE_TEXT,
-                                           MAIN_QUESTION_TEXT,
-                                           TEXT1_TEXT,
-                                           TEXT_QUESTION_TEXT,
-                                           TEXT_DANGER_TEXT,
-                                           OKDELETE_BUTTON_TEXT,
-                                           okDeleteCommandMock);
-        verifyShow(MAIN_TITLE_TEXT,
-                   MAIN_QUESTION_TEXT,
-                   TEXT1_TEXT,
-                   TEXT_QUESTION_TEXT);
-        verify(((DeletePopupView) popupView), times(1)).conditionalShow(textDangerMock, TEXT_DANGER_TEXT);
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupPresenterTest.java
deleted file mode 100644
index f6f4049..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupPresenterTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationEditorPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.mvp.Command;
-
-import static org.junit.Assert.assertEquals;
-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;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class FileUploadPopupPresenterTest {
-
-    @Mock
-    private FileUploadPopupView fileUploadPopupViewMock;
-
-    @Mock
-    private ScenarioSimulationEditorPresenter scenarioSimulationPresenterMock;
-
-    @Mock
-    private ViewsProvider viewsProviderMock;
-
-
-    private FileUploadPopupPresenter fileUploadPopupPresenter;
-
-    @Before
-    public void setup() {
-        when(viewsProviderMock.getFileUploadPopup()).thenReturn(fileUploadPopupViewMock);
-        fileUploadPopupPresenter = spy(new FileUploadPopupPresenter() {
-            {
-                this.viewsProvider = viewsProviderMock;
-                this.fileUploadPopup = fileUploadPopupViewMock;
-            }
-        });
-    }
-
-    @Test
-    public void show() {
-        Command okCommand = mock(Command.class);
-        fileUploadPopupPresenter.show(ScenarioSimulationEditorConstants.INSTANCE.selectImportFile(), ScenarioSimulationEditorConstants.INSTANCE.importLabel(), okCommand);
-        verify(fileUploadPopupViewMock, times(1)).show(eq(ScenarioSimulationEditorConstants.INSTANCE.selectImportFile()), eq(ScenarioSimulationEditorConstants.INSTANCE.importLabel()), eq(okCommand));
-    }
-
-    @Test
-    public void getFileContents() {
-        String FILE_CONTENTS = "FILE_CONTENTS";
-        when(fileUploadPopupViewMock.getFileContents()).thenReturn(FILE_CONTENTS);
-        assertEquals(FILE_CONTENTS, fileUploadPopupPresenter.getFileContents());
-        verify(fileUploadPopupViewMock, times(1)).getFileContents();
-    }
-
-    @Test
-    public void getFileName() {
-        String fileName = "fileName";
-        when(fileUploadPopupViewMock.getFileName()).thenReturn(fileName);
-        assertEquals(fileName, fileUploadPopupPresenter.getFileName());
-        verify(fileUploadPopupViewMock, times(1)).getFileName();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupViewTest.java
deleted file mode 100644
index 8e2d76f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/FileUploadPopupViewTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.ParagraphElement;
-import com.google.gwt.event.dom.client.ChangeEvent;
-import com.google.gwt.event.dom.client.ClickEvent;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.mvp.Command;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-import static org.mockito.ArgumentMatchers.anyString;
-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;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class FileUploadPopupViewTest extends AbstractScenarioPopupViewTest {
-
-    @Mock
-    private InputElement fileMock;
-
-    @Mock
-    private ParagraphElement uploadWarningMock;
-
-    @Mock
-    private InputElement fileTextMock;
-
-    @Mock
-    private JavaScriptObject filesMock;
-
-    @Mock
-    private JavaScriptObject castMock;
-
-    @Mock
-    private Command okButtonCommandMock;
-
-    @Before
-    public void setup() {
-        super.commonSetup();
-        when(fileMock.getPropertyJSO(anyString())).thenReturn(filesMock);
-        when(fileMock.cast()).thenReturn(castMock);
-        popupView = spy(new FileUploadPopupView() {
-            {
-                this.mainTitle = mainTitleMock;
-                this.uploadWarning = uploadWarningMock;
-                this.cancelButton = cancelButtonMock;
-                this.okButton = okButtonMock;
-                this.modal = modalMock;
-                this.translationService = translationServiceMock;
-                this.file = fileMock;
-                this.fileText = fileTextMock;
-            }
-        });
-    }
-
-    @Test
-    public void show() {
-        popupView.show("mainText",
-                       "okButtonText",
-                       okButtonCommandMock);
-        verify(fileTextMock, times(1)).setValue(eq(""));
-        verify(okButtonMock, times(1)).setEnabled(eq(false));
-    }
-
-    @Test
-    public void showWithUploadWarning() {
-        ((FileUploadPopupView) popupView).show("mainText",
-                                               "uploadWarning",
-                                               "okButtonText",
-                                               okButtonCommandMock);
-        verify(uploadWarningMock, times(1)).setInnerText(eq("uploadWarning"));
-        verify(((FileUploadPopupView) popupView), times(1)).show(eq("mainText"),
-                                                                                      eq("okButtonText"),
-                                                                                      eq(okButtonCommandMock));
-    }
-
-    @Test
-    public void onChooseButtonClickEvent() {
-        ClickEvent clickEventMock = mock(ClickEvent.class);
-        ((FileUploadPopupView) popupView).onChooseButtonClickEvent(clickEventMock);
-        verify(fileMock, times(1)).click();
-    }
-
-    @Test
-    public void onFileChangeEvent() {
-        when(fileMock.getValue()).thenReturn(VALUE);
-        ChangeEvent changeEventMock = mock(ChangeEvent.class);
-        ((FileUploadPopupView) popupView).onFileChangeEvent(changeEventMock);
-        verify(fileMock, times(1)).getValue();
-        verify(fileTextMock, times(1)).setValue(eq(VALUE));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupPresenterTest.java
deleted file mode 100644
index ab5bf04..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupPresenterTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_QUESTION_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_TITLE_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OKDELETE_BUTTON_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OKPRESERVE_BUTTON_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OPTION1_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OPTION2_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT1_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT_QUESTION_TEXT;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class PreserveDeletePopupPresenterTest extends AbstractDeletePopupViewTest {
-
-    @Mock
-    private PreserveDeletePopupView preserveDeletePopupViewMock;
-
-    private PreserveDeletePopupPresenter preserveDeletePopupPresenter;
-
-
-    @Before
-    public void setup() {
-        preserveDeletePopupPresenter = spy(new PreserveDeletePopupPresenter() {
-            {
-                this.preserveDeletePopupView = preserveDeletePopupViewMock;
-            }
-        });
-    }
-
-    @Test
-    public void show() {
-        preserveDeletePopupPresenter.show(MAIN_TITLE_TEXT,
-                                          MAIN_QUESTION_TEXT,
-                                          TEXT1_TEXT,
-                                          TEXT_QUESTION_TEXT,
-                                          OPTION1_TEXT,
-                                          OPTION2_TEXT,
-                                          OKPRESERVE_BUTTON_TEXT,
-                                          OKDELETE_BUTTON_TEXT,
-                                          okPreserveCommandMock,
-                                          okDeleteCommandMock);
-        verify(preserveDeletePopupViewMock, times(1)).show(eq(MAIN_TITLE_TEXT), eq(MAIN_QUESTION_TEXT), eq(TEXT1_TEXT), eq(TEXT_QUESTION_TEXT), eq(OPTION1_TEXT), eq(OPTION2_TEXT), eq(OKPRESERVE_BUTTON_TEXT), eq(OKDELETE_BUTTON_TEXT), eq(okPreserveCommandMock), eq(okDeleteCommandMock));
-    }
-
-    @Test
-    public void hide() {
-        preserveDeletePopupPresenter.hide();
-        verify(preserveDeletePopupViewMock, times(1)).hide();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupViewTest.java
deleted file mode 100644
index 80cec8a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/PreserveDeletePopupViewTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.dom.client.HeadingElement;
-import com.google.gwt.dom.client.LIElement;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.client.views.pfly.widgets.Button;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_QUESTION_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_TITLE_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OKDELETE_BUTTON_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OKPRESERVE_BUTTON_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OPTION1_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OPTION2_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT1_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT_QUESTION_TEXT;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class PreserveDeletePopupViewTest extends AbstractScenarioConfirmationPopupViewTest {
-
-    @Mock
-    private LIElement option1Mock;
-
-    @Mock
-    private LIElement option2Mock;
-
-    @Mock
-    protected Button okPreserveButtonMock;
-
-    @Before
-    public void setup() {
-        super.commonSetup();
-        popupView = spy(new PreserveDeletePopupView() {
-            {
-                this.mainTitle = (HeadingElement) mainTitleMock;
-                this.mainQuestion = mainQuestionMock;
-                this.text1 = text1Mock;
-                this.textQuestion = textQuestionMock;
-                this.option1 = option1Mock;
-                this.option2 = option2Mock;
-                this.cancelButton = cancelButtonMock;
-                this.okPreserveButton = okPreserveButtonMock;
-                this.okButton = okDeleteButtonMock;
-                this.modal = modalMock;
-                this.translationService = translationServiceMock;
-            }
-        });
-    }
-
-
-    @Test
-    public void show() {
-        ((PreserveDeletePopupView)popupView).show(MAIN_TITLE_TEXT,
-                                                          MAIN_QUESTION_TEXT,
-                                                          TEXT1_TEXT,
-                                                          TEXT_QUESTION_TEXT,
-                                                          OPTION1_TEXT,
-                                                          OPTION2_TEXT,
-                                                          OKPRESERVE_BUTTON_TEXT,
-                                                          OKDELETE_BUTTON_TEXT,
-                                                          okPreserveCommandMock,
-                                                          okDeleteCommandMock);
-        verifyShow(MAIN_TITLE_TEXT,
-                   MAIN_QUESTION_TEXT,
-                   TEXT1_TEXT,
-                   TEXT_QUESTION_TEXT);
-        assertEquals(okPreserveCommandMock, ((PreserveDeletePopupView)popupView).okPreserveCommand);
-        verify(option1Mock, times(1)).setInnerText(eq(OPTION1_TEXT));
-        verify(option2Mock, times(1)).setInnerText(eq(OPTION2_TEXT));
-    }
-
-    @Test
-    public void onOkPreserveButton() {
-        ((PreserveDeletePopupView)popupView).okPreserveCommand = null;
-        ((PreserveDeletePopupView)popupView).onOkPreserveButton(mouseEventMock);
-        verify(okPreserveCommandMock, never()).execute();
-        verify(popupView, times(1)).hide();
-        reset(popupView);
-        ((PreserveDeletePopupView)popupView).okPreserveCommand = okPreserveCommandMock;
-        ((PreserveDeletePopupView)popupView).onOkPreserveButton(mouseEventMock);
-        verify(okPreserveCommandMock, times(1)).execute();
-        verify(popupView, times(1)).hide();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupViewPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupViewPresenterTest.java
deleted file mode 100644
index 67d6e32..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupViewPresenterTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_QUESTION_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAIN_TITLE_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OKDELETE_BUTTON_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT1_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT_QUESTION_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEXT_WARNING_TEXT;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioConfirmationPopupViewPresenterTest extends AbstractDeletePopupViewTest {
-
-    @Mock
-    private ScenarioConfirmationPopupView scenarioConfirmationPopupViewMock;
-
-    private ScenarioConfirmationPopupPresenter scenarioConfirmationPopupPresenter;
-
-    @Before
-    public void setup() {
-        scenarioConfirmationPopupPresenter = spy(new ScenarioConfirmationPopupPresenter() {
-            {
-                this.scenarioConfirmationPopupView = scenarioConfirmationPopupViewMock;
-            }
-        });
-    }
-
-    @Test
-    public void show() {
-        scenarioConfirmationPopupPresenter.show(MAIN_TITLE_TEXT,
-                                                MAIN_QUESTION_TEXT,
-                                                TEXT1_TEXT,
-                                                TEXT_QUESTION_TEXT,
-                                                TEXT_WARNING_TEXT,
-                                                OKDELETE_BUTTON_TEXT,
-                                                okDeleteCommandMock);
-        verify(scenarioConfirmationPopupViewMock, times(1)).show(eq(MAIN_TITLE_TEXT), eq(MAIN_QUESTION_TEXT), eq(TEXT1_TEXT), eq(TEXT_QUESTION_TEXT), eq(TEXT_WARNING_TEXT), eq(OKDELETE_BUTTON_TEXT), eq(okDeleteCommandMock));
-    }
-
-    @Test
-    public void hide() {
-        scenarioConfirmationPopupPresenter.hide();
-        verify(scenarioConfirmationPopupViewMock, times(1)).hide();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupViewTest.java
deleted file mode 100644
index 6701212..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/ScenarioConfirmationPopupViewTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-
-import static org.mockito.Mockito.spy;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioConfirmationPopupViewTest extends AbstractScenarioConfirmationPopupViewTest {
-
-    @Before
-    public void setup() {
-        super.commonSetup();
-        popupView = spy(new ScenarioConfirmationPopupView() {
-            {
-                this.mainTitle = mainTitleMock;
-                this.mainQuestion = mainQuestionMock;
-                this.text1 = text1Mock;
-                this.textQuestion = textQuestionMock;
-                this.cancelButton = cancelButtonMock;
-                this.okButton = okDeleteButtonMock;
-                this.modal = modalMock;
-                this.translationService = translationServiceMock;
-            }
-        });
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmYesNoConfirmPopupViewPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmYesNoConfirmPopupViewPresenterTest.java
deleted file mode 100644
index 379af9e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmYesNoConfirmPopupViewPresenterTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.client.views.pfly.widgets.Button;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CONFIRM_MESSAGE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.INLINE_NOTIFICATION_MESSAGE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.NO_BUTTON_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OK_BUTTON_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.YES_BUTTON_TEXT;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class YesNoConfirmYesNoConfirmPopupViewPresenterTest extends AbstractYesNoConfirmYesNoConfirmPopupViewTest {
-
-    @Mock
-    private YesNoConfirmPopupView yesNoConfirmPopupViewMock;
-
-    private YesNoConfirmPopupPresenter yesNoConfirmPopupPresenter;
-
-    @Before
-    public void setup() {
-        yesNoConfirmPopupPresenter = spy(new YesNoConfirmPopupPresenter() {
-            {
-                this.yesNoConfirmPopupView = YesNoConfirmYesNoConfirmPopupViewPresenterTest.this.yesNoConfirmPopupViewMock;
-            }
-        });
-    }
-
-    @Test
-    public void showOkCancel() {
-        yesNoConfirmPopupPresenter.show(TITLE, OK_BUTTON_TEXT, CONFIRM_MESSAGE, okCommandMock);
-        verify(yesNoConfirmPopupPresenter, times(1)).show(TITLE, null, null, OK_BUTTON_TEXT, Button.ButtonStyleType.DANGER, CONFIRM_MESSAGE, okCommandMock);
-    }
-
-    @Test
-    public void showOkCancelFull() {
-        yesNoConfirmPopupPresenter.show(TITLE, INLINE_NOTIFICATION_MESSAGE, INLINE_NOTIFICATION_TYPE, OK_BUTTON_TEXT, BUTTON_STYLE_TYPE, CONFIRM_MESSAGE, okCommandMock);
-        verify(yesNoConfirmPopupViewMock, times(1)).show(eq(TITLE), eq(INLINE_NOTIFICATION_MESSAGE), eq(INLINE_NOTIFICATION_TYPE), eq(OK_BUTTON_TEXT), eq(BUTTON_STYLE_TYPE), eq(CONFIRM_MESSAGE), eq(okCommandMock));
-    }
-
-    @Test
-    public void showYesNoCancel() {
-        yesNoConfirmPopupPresenter.show(TITLE, YES_BUTTON_TEXT, NO_BUTTON_TEXT, CONFIRM_MESSAGE, yesCommandMock, noCommandMock);
-        verify(yesNoConfirmPopupPresenter, times(1)).show(TITLE, null, null, YES_BUTTON_TEXT, NO_BUTTON_TEXT, Button.ButtonStyleType.DANGER, Button.ButtonStyleType.DEFAULT, CONFIRM_MESSAGE, yesCommandMock, noCommandMock);
-    }
-
-    @Test
-    public void showYesNoCancelFull() {
-        yesNoConfirmPopupPresenter.show(TITLE, INLINE_NOTIFICATION_MESSAGE, INLINE_NOTIFICATION_TYPE, YES_BUTTON_TEXT, NO_BUTTON_TEXT, BUTTON_STYLE_TYPE, BUTTON_STYLE_TYPE, CONFIRM_MESSAGE, yesCommandMock, noCommandMock);
-        verify(yesNoConfirmPopupViewMock, times(1)).show(eq(TITLE), eq(INLINE_NOTIFICATION_MESSAGE), eq(INLINE_NOTIFICATION_TYPE), eq(YES_BUTTON_TEXT), eq(NO_BUTTON_TEXT), eq(BUTTON_STYLE_TYPE), eq(BUTTON_STYLE_TYPE), eq(CONFIRM_MESSAGE), eq(yesCommandMock), eq(noCommandMock));
-    }
-
-    @Test
-    public void hide() {
-        yesNoConfirmPopupPresenter.hide();
-        verify(yesNoConfirmPopupViewMock, times(1)).hide();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmYesNoConfirmPopupViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmYesNoConfirmPopupViewTest.java
deleted file mode 100644
index 650f7e1..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/popup/YesNoConfirmYesNoConfirmPopupViewTest.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.popup;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.jboss.errai.common.client.dom.CSSStyleDeclaration;
-import org.jboss.errai.common.client.dom.HTMLElement;
-import org.jboss.errai.common.client.dom.MouseEvent;
-import org.jboss.errai.common.client.dom.Span;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.client.views.pfly.widgets.Button;
-import org.uberfire.client.views.pfly.widgets.InlineNotification;
-import org.uberfire.client.views.pfly.widgets.Modal;
-import org.uberfire.mvp.Command;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CONFIRM_MESSAGE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.INLINE_NOTIFICATION_MESSAGE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.NO_BUTTON_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.OK_BUTTON_TEXT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.YES_BUTTON_TEXT;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class YesNoConfirmYesNoConfirmPopupViewTest extends AbstractYesNoConfirmYesNoConfirmPopupViewTest {
-
-    private YesNoConfirmPopupView yesNoConfirmPopupView;
-
-    @Mock
-    private Span modalTitleMock;
-
-    @Mock
-    private InlineNotification confirmInlineNotificationMock;
-
-    @Mock
-    private Span modalConfirmationMessageLabelMock;
-
-    @Mock
-    private Modal modalMock;
-
-    @Mock
-    private Button okButtonMock;
-
-    @Mock
-    private Button yesButtonMock;
-
-    @Mock
-    private Button noButtonMock;
-
-    @Mock
-    private Command yesCommandMock;
-
-    @Mock
-    private Command noCommandMock;
-
-    @Mock
-    private MouseEvent mouseEventMock;
-
-    @Mock
-    private HTMLElement elementMock;
-
-    @Mock
-    private CSSStyleDeclaration styleMock;
-
-    @Before
-    public void setup() {
-        when(elementMock.getStyle()).thenReturn(styleMock);
-        when(confirmInlineNotificationMock.getElement()).thenReturn(elementMock);
-        yesNoConfirmPopupView = spy(new YesNoConfirmPopupView() {
-            {
-                this.modalConfirmationMessageLabel = modalConfirmationMessageLabelMock;
-                this.confirmInlineNotification = confirmInlineNotificationMock;
-                this.modalTitle = modalTitleMock;
-                this.modal = modalMock;
-                this.okButton = okButtonMock;
-                this.noButton = noButtonMock;
-                this.yesButton = yesButtonMock;
-            }
-        });
-    }
-
-    @Test
-    public void showOkCancel() {
-        yesNoConfirmPopupView.show(TITLE, OK_BUTTON_TEXT, CONFIRM_MESSAGE, okCommandMock);
-        verify(yesNoConfirmPopupView, times(1)).show(TITLE, null, null, OK_BUTTON_TEXT, Button.ButtonStyleType.DANGER, CONFIRM_MESSAGE, okCommandMock);
-        verify(yesNoConfirmPopupView, times(1)).commonShow(eq(TITLE), any(), any(), eq(CONFIRM_MESSAGE));
-    }
-
-    @Test
-    public void showOkCancelFull() {
-        yesNoConfirmPopupView.show(TITLE, INLINE_NOTIFICATION_MESSAGE, INLINE_NOTIFICATION_TYPE, OK_BUTTON_TEXT, BUTTON_STYLE_TYPE, CONFIRM_MESSAGE, okCommandMock);
-        verify(okButtonMock, never()).hide();
-        verify(okButtonMock, times(1)).show();
-        verify(yesButtonMock, times(1)).hide();
-        verify(noButtonMock, times(1)).hide();
-        verify(okButtonMock, times(1)).setText(eq(OK_BUTTON_TEXT));
-        verify(okButtonMock, times(1)).setButtonStyleType(eq(BUTTON_STYLE_TYPE));
-        verify(yesNoConfirmPopupView, times(1)).commonShow(eq(TITLE), eq(INLINE_NOTIFICATION_MESSAGE), eq(INLINE_NOTIFICATION_TYPE), eq(CONFIRM_MESSAGE));
-    }
-
-    @Test
-    public void showYesNoCancel() {
-        yesNoConfirmPopupView.show(TITLE, YES_BUTTON_TEXT, NO_BUTTON_TEXT, CONFIRM_MESSAGE, yesCommandMock, noCommandMock);
-        verify(yesNoConfirmPopupView, times(1)).show(TITLE, null, null, YES_BUTTON_TEXT, NO_BUTTON_TEXT, Button.ButtonStyleType.DANGER, Button.ButtonStyleType.DEFAULT, CONFIRM_MESSAGE, yesCommandMock, noCommandMock);
-        verify(yesNoConfirmPopupView, times(1)).commonShow(eq(TITLE), any(), any(), eq(CONFIRM_MESSAGE));
-    }
-
-    @Test
-    public void showYesNoCancelFull() {
-        yesNoConfirmPopupView.show(TITLE, INLINE_NOTIFICATION_MESSAGE, INLINE_NOTIFICATION_TYPE, YES_BUTTON_TEXT, NO_BUTTON_TEXT, BUTTON_STYLE_TYPE, BUTTON_STYLE_TYPE, CONFIRM_MESSAGE, yesCommandMock, noCommandMock);
-        verify(okButtonMock, times(1)).hide();
-        verify(yesButtonMock, times(1)).show();
-        verify(noButtonMock, times(1)).show();
-        verify(yesButtonMock, never()).hide();
-        verify(noButtonMock, never()).hide();
-        verify(yesButtonMock, times(1)).setText(eq(YES_BUTTON_TEXT));
-        verify(noButtonMock, times(1)).setText(eq(NO_BUTTON_TEXT));
-        verify(yesButtonMock, times(1)).setButtonStyleType(eq(BUTTON_STYLE_TYPE));
-        verify(noButtonMock, times(1)).setButtonStyleType(eq(BUTTON_STYLE_TYPE));
-        verify(yesNoConfirmPopupView, times(1)).commonShow(eq(TITLE), eq(INLINE_NOTIFICATION_MESSAGE), eq(INLINE_NOTIFICATION_TYPE), eq(CONFIRM_MESSAGE));
-    }
-
-    @Test
-    public void hide() {
-        yesNoConfirmPopupView.hide();
-        verify(modalMock, times(1)).hide();
-    }
-
-    @Test
-    public void onOkClick() {
-        yesNoConfirmPopupView.okCommand = null;
-        yesNoConfirmPopupView.onOkClick(mouseEventMock);
-        verify(okCommandMock, never()).execute();
-        verify(yesNoConfirmPopupView, times(1)).hide();
-        reset(yesNoConfirmPopupView);
-        yesNoConfirmPopupView.yesCommand = okCommandMock;
-        yesNoConfirmPopupView.onYesClick(mouseEventMock);
-        verify(okCommandMock, times(1)).execute();
-        verify(yesNoConfirmPopupView, times(1)).hide();
-    }
-
-    @Test
-    public void onCancelClick() {
-        yesNoConfirmPopupView.onCancelClick(mouseEventMock);
-        verify(yesNoConfirmPopupView, times(1)).hide();
-    }
-
-    @Test
-    public void onCloseClick() {
-        yesNoConfirmPopupView.onCancelClick(mouseEventMock);
-        verify(yesNoConfirmPopupView, times(1)).hide();
-    }
-
-    @Test
-    public void onYesClick() {
-        yesNoConfirmPopupView.yesCommand = null;
-        yesNoConfirmPopupView.onYesClick(mouseEventMock);
-        verify(yesCommandMock, never()).execute();
-        verify(yesNoConfirmPopupView, times(1)).hide();
-        reset(yesNoConfirmPopupView);
-        yesNoConfirmPopupView.yesCommand = yesCommandMock;
-        yesNoConfirmPopupView.onYesClick(mouseEventMock);
-        verify(yesCommandMock, times(1)).execute();
-        verify(yesNoConfirmPopupView, times(1)).hide();
-    }
-
-    @Test
-    public void onNoClick() {
-        yesNoConfirmPopupView.noCommand = null;
-        yesNoConfirmPopupView.onNoClick(mouseEventMock);
-        verify(noCommandMock, never()).execute();
-        verify(yesNoConfirmPopupView, times(1)).hide();
-        reset(yesNoConfirmPopupView);
-        yesNoConfirmPopupView.noCommand = noCommandMock;
-        yesNoConfirmPopupView.onNoClick(mouseEventMock);
-        verify(noCommandMock, times(1)).execute();
-        verify(yesNoConfirmPopupView, times(1)).hide();
-    }
-
-    @Test
-    public void commonShow() {
-        yesNoConfirmPopupView.commonShow(TITLE, null, null, CONFIRM_MESSAGE);
-        verify(modalTitleMock, times(1)).setTextContent(eq(TITLE));
-        verify(confirmInlineNotificationMock, never()).setMessage(anyString());
-        verify(confirmInlineNotificationMock, never()).setType(eq(INLINE_NOTIFICATION_TYPE));
-        verify(styleMock, never()).removeProperty(eq("display"));
-        verify(styleMock, times(1)).setProperty(eq("display"), eq("none"));
-        verify(modalConfirmationMessageLabelMock, times(1)).setTextContent(eq(CONFIRM_MESSAGE));
-        verify(modalMock, times(1)).show();
-
-        reset(modalTitleMock);
-        reset(confirmInlineNotificationMock);
-        when(elementMock.getStyle()).thenReturn(styleMock);
-        when(confirmInlineNotificationMock.getElement()).thenReturn(elementMock);
-        reset(styleMock);
-        reset(modalConfirmationMessageLabelMock);
-        reset(modalMock);
-
-        yesNoConfirmPopupView.commonShow(TITLE, INLINE_NOTIFICATION_MESSAGE, INLINE_NOTIFICATION_TYPE, CONFIRM_MESSAGE);
-        verify(modalTitleMock, times(1)).setTextContent(eq(TITLE));
-        verify(confirmInlineNotificationMock, times(1)).setMessage(eq(INLINE_NOTIFICATION_MESSAGE));
-        verify(confirmInlineNotificationMock, times(1)).setType(eq(INLINE_NOTIFICATION_TYPE));
-        verify(styleMock, times(1)).removeProperty(eq("display"));
-        verify(styleMock, never()).setProperty(eq("display"), eq("none"));
-        verify(modalConfirmationMessageLabelMock, times(1)).setTextContent(eq(CONFIRM_MESSAGE));
-        verify(modalMock, times(1)).show();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/producers/AbstractProducerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/producers/AbstractProducerTest.java
deleted file mode 100644
index 5316f81..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/producers/AbstractProducerTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.producers;
-
-import com.google.gwt.event.shared.EventBus;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationView;
-import org.drools.workbench.screens.scenariosimulation.client.menu.ScenarioContextMenuRegistry;
-import org.drools.workbench.screens.scenariosimulation.client.popup.ConfirmPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.DeletePopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.FileUploadPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.popup.PreserveDeletePopupPresenter;
-import org.junit.Before;
-import org.mockito.Mock;
-
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractProducerTest extends AbstractScenarioSimulationTest {
-
-    @Mock
-    protected EventBusProducer eventBusProducerMock;
-    @Mock
-    protected ScenarioGridPanelProducer scenarioGridPanelProducerMock;
-    @Mock
-    protected DeletePopupPresenter deletePopupPresenterMock;
-    @Mock
-    protected PreserveDeletePopupPresenter preserveDeletePopupPresenterMock;
-    @Mock
-    protected ConfirmPopupPresenter confirmPopupPresenterMock;
-    @Mock
-    protected FileUploadPopupPresenter fileUploadPopupPresenterMock;
-    @Mock
-    protected ScenarioSimulationEventHandler scenarioSimulationEventHandlerMock;
-    @Mock
-    protected ScenarioSimulationView scenarioSimulationViewMock;
-    @Mock
-    protected ScenarioContextMenuRegistry scenarioContextMenuRegistryMock;
-
-    @Before
-    public void setup() {
-        super.setup();
-        when(eventBusProducerMock.getEventBus()).thenReturn(eventBusMock);
-        when(scenarioGridPanelProducerMock.getScenarioSimulationView(isA(EventBus.class))).thenReturn(scenarioSimulationViewMock);
-        when(scenarioGridPanelProducerMock.getScenarioContextMenuRegistry()).thenReturn(scenarioContextMenuRegistryMock);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/producers/AbstractScenarioSimulationProducerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/producers/AbstractScenarioSimulationProducerTest.java
deleted file mode 100644
index 9cb0611..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/producers/AbstractScenarioSimulationProducerTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.producers;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.event.shared.EventBus;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationView;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class AbstractScenarioSimulationProducerTest extends AbstractProducerTest {
-
-    private AbstractScenarioSimulationProducer abstractScenarioSimulationProducer;
-
-    @Before
-    public void setup() {
-        super.setup();
-        abstractScenarioSimulationProducer = new AbstractScenarioSimulationProducer() {
-            {
-                this.scenarioSimulationEventHandler = scenarioSimulationEventHandlerMock;
-                this.deletePopupPresenter = deletePopupPresenterMock;
-                this.preserveDeletePopupPresenter = preserveDeletePopupPresenterMock;
-                this.confirmPopupPresenter = confirmPopupPresenterMock;
-                this.fileUploadPopupPresenter = fileUploadPopupPresenterMock;
-                this.eventBusProducer = eventBusProducerMock;
-                this.scenarioGridPanelProducer = scenarioGridPanelProducerMock;
-                this.scenarioCommandManager = scenarioCommandManagerMock;
-                this.scenarioCommandRegistryManager = scenarioCommandRegistryManagerMock;
-            }
-        };
-    }
-
-    @Test
-    public void init() {
-        abstractScenarioSimulationProducer.init();
-        scenarioContextMenuRegistryMock.setEventBus(eq(eventBusMock));
-        verify(scenarioSimulationEventHandlerMock, times(1)).setEventBus(eq(eventBusMock));
-        verify(scenarioSimulationEventHandlerMock, times(1)).setDeletePopupPresenter(eq(deletePopupPresenterMock));
-        verify(scenarioSimulationEventHandlerMock, times(1)).setPreserveDeletePopupPresenter(eq(preserveDeletePopupPresenterMock));
-        verify(scenarioSimulationEventHandlerMock, times(1)).setConfirmPopupPresenter(eq(confirmPopupPresenterMock));
-        verify(scenarioSimulationEventHandlerMock, times(1)).setFileUploadPopupPresenter(eq(fileUploadPopupPresenterMock));
-        verify(scenarioSimulationEventHandlerMock, times(1)).setScenarioCommandManager(eq(scenarioCommandManagerMock));
-        verify(scenarioSimulationEventHandlerMock, times(1)).setScenarioCommandRegistryManager(eq(scenarioCommandRegistryManagerMock));
-    }
-
-    @Test
-    public void getEventBus() {
-        EventBus retrieved = abstractScenarioSimulationProducer.getEventBus();
-        assertNotNull(retrieved);
-        assertEquals(retrieved, eventBusMock);
-        verify(eventBusProducerMock, times(1)).getEventBus();
-    }
-
-    @Test
-    public void getScenarioSimulationView() {
-        ScenarioSimulationView retrieved = abstractScenarioSimulationProducer.getScenarioSimulationView();
-        assertNotNull(retrieved);
-        assertEquals(retrieved, scenarioSimulationViewMock);
-        verify(scenarioGridPanelProducerMock, times(1)).getScenarioSimulationView(eq(eventBusMock));
-    }
-
-    @Test
-    public void getScenarioBackgroundGridView() {
-        abstractScenarioSimulationProducer.getScenarioBackgroundGridWidget();
-        verify(scenarioGridPanelProducerMock, times(1)).getBackgroundGridWidget(eq(eventBusMock));
-    }
-
-    @Test
-    public void setScenarioSimulationEditorPresenter() {
-        abstractScenarioSimulationProducer.setScenarioSimulationEditorPresenter(scenarioSimulationEditorPresenterMock);
-        verify(scenarioSimulationEventHandlerMock, times(1)).setScenarioSimulationPresenter(eq(scenarioSimulationEditorPresenterMock));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/producers/EventBusProducerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/producers/EventBusProducerTest.java
deleted file mode 100644
index c89de8e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/producers/EventBusProducerTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.producers;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.event.shared.EventBus;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class EventBusProducerTest {
-
-    private EventBusProducer eventBusProducer;
-
-    @Before
-    public void setup() {
-        eventBusProducer = new EventBusProducer();
-    }
-
-    @Test
-    public void getEventBus() {
-        final EventBus retrieved = eventBusProducer.getEventBus();
-        assertNotNull(retrieved);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/producers/ScenarioGridPanelProducerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/producers/ScenarioGridPanelProducerTest.java
deleted file mode 100644
index 7d2b230..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/producers/ScenarioGridPanelProducerTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.producers;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.user.client.Command;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationView;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationMainGridPanelClickHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationMainGridPanelMouseMoveHandler;
-import org.drools.workbench.screens.scenariosimulation.client.menu.ScenarioContextMenuRegistry;
-import org.drools.workbench.screens.scenariosimulation.client.models.BackgroundGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.models.ScenarioGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.popover.ErrorReportPopoverPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGrid;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridPanel;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridWidget;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.BaseGridWidgetKeyboardHandler;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioGridPanelProducerTest extends AbstractProducerTest {
-
-    @Mock
-    private ScenarioContextMenuRegistry scenarioContextMenuRegistryMock;
-
-    @Mock
-    private ErrorReportPopoverPresenter errorReportPopupPresenterMock;
-
-    @Mock
-    private ScenarioSimulationMainGridPanelClickHandler clickHandlerMock;
-
-    @Mock
-    private ScenarioSimulationMainGridPanelMouseMoveHandler mouseMoveHandlerMock;
-
-    @Captor
-    private ArgumentCaptor<ScenarioGrid> scenarioGridArgumentCaptor;
-
-    private ScenarioGridPanelProducer scenarioGridPanelProducer;
-
-    @Before
-    public void setup() {
-        super.setup();
-        scenarioGridPanelProducer = spy(new ScenarioGridPanelProducer() {
-            {
-                this.simulationGridLayer = scenarioGridLayerMock;
-                this.simulationGridPanel = scenarioGridPanelMock;
-                this.backgroundGridLayer = backgroundGridLayerMock;
-                this.backgroundGridPanel = backgroundGridPanelMock;
-                this.scenarioContextMenuRegistry = scenarioContextMenuRegistryMock;
-                this.simulationGridWidget = scenarioGridWidgetSpy;
-                this.backgroundGridWidget = backgroundGridWidgetSpy;
-                this.scenarioSimulationView = scenarioSimulationViewMock;
-                this.errorReportPopupPresenter = errorReportPopupPresenterMock;
-                this.simulationGridPanelClickHandler = clickHandlerMock;
-                this.simulationGridPanelMouseMoveHandler = mouseMoveHandlerMock;
-                this.backgroundGridPanelClickHandler = clickHandlerMock;
-                this.backgroundGridPanelMouseMoveHandler = mouseMoveHandlerMock;
-            }
-        });
-        when(backgroundGridPanelMock.getScenarioGridLayer()).thenReturn(backgroundGridLayerMock);
-        when(backgroundGridLayerMock.getScenarioGrid()).thenReturn(backgroundGridMock);
-    }
-
-    @Test
-    public void init() {
-        assertNull(scenarioGridPanelProducer.scenarioSimulationContext);
-        scenarioGridPanelProducer.init();
-        ScenarioSimulationContext retrieved = scenarioGridPanelProducer.scenarioSimulationContext;
-        assertNotNull(retrieved);
-        verify(scenarioGridPanelProducer, times(1)).initializeGrid(eq(scenarioGridLayerMock), eq(scenarioGridPanelMock), isA(ScenarioGridModel.class), eq(retrieved), eq(1), eq(0));
-        verify(scenarioGridPanelProducer, times(1)).initializeGrid(eq(backgroundGridLayerMock), eq(backgroundGridPanelMock), isA(BackgroundGridModel.class), eq(retrieved), eq(0), eq(0));
-    }
-
-    @Test
-    public void initializeGrid() {
-        scenarioGridPanelProducer.initializeGrid(scenarioGridLayerMock, scenarioGridPanelMock, scenarioGridModelMock, scenarioSimulationContextLocal, 0, 0);
-        verify(scenarioGridLayerMock, times(1)).addScenarioGrid(isA(ScenarioGrid.class));
-        verify(scenarioGridLayerMock, times(1)).addScenarioGrid(scenarioGridArgumentCaptor.capture());
-        verify(scenarioGridLayerMock, times(1)).enterPinnedMode(eq(scenarioGridArgumentCaptor.getValue()), isA(Command.class));
-        verify(scenarioGridPanelMock, times(1)).add(eq(scenarioGridLayerMock));
-        verify(scenarioGridPanelMock, times(1)).addKeyDownHandler(isA(BaseGridWidgetKeyboardHandler.class));
-        assertNotNull(scenarioGridArgumentCaptor.getValue().getScenarioSimulationContext());
-        assertNotNull(scenarioGridArgumentCaptor.getValue().getModel());
-        assertNotNull(scenarioGridArgumentCaptor.getValue().getModel().getCollectionEditorSingletonDOMElementFactory());
-        assertNotNull(scenarioGridArgumentCaptor.getValue().getModel().getScenarioCellTextAreaSingletonDOMElementFactory());
-        assertNotNull(scenarioGridArgumentCaptor.getValue().getModel().getScenarioHeaderTextBoxSingletonDOMElementFactory());
-        assertNotNull(scenarioGridArgumentCaptor.getValue().getModel().getScenarioExpressionCellTextAreaSingletonDOMElementFactory());
-    }
-
-    @Test
-    public void getSimulationGridPanel() {
-        final ScenarioGridPanel retrieved = scenarioGridPanelProducer.getSimulationGridPanel();
-        assertEquals(scenarioGridPanelMock, retrieved);
-    }
-
-    @Test
-    public void getBackgroundGridPanel() {
-        final ScenarioGridPanel retrieved = scenarioGridPanelProducer.getBackgroundGridPanel();
-        assertEquals(backgroundGridPanelMock, retrieved);
-    }
-
-    @Test
-    public void getScenarioSimulationView() {
-        final ScenarioSimulationView retrieved = scenarioGridPanelProducer.getScenarioSimulationView(eventBusMock);
-        assertEquals(scenarioSimulationViewMock, retrieved);
-        verify(scenarioGridPanelProducer, times(1)).getScenarioMainGridWidget(eq(eventBusMock));
-        verify(scenarioSimulationViewMock, times(1)).setScenarioGridWidget(scenarioGridWidgetSpy);
-    }
-
-    @Test
-    public void getBackgroundGridWidget() {
-        ScenarioGridWidget retrieved = scenarioGridPanelProducer.getBackgroundGridWidget(eventBusMock);
-        assertEquals(backgroundGridWidgetSpy, retrieved);
-        verify(scenarioGridPanelProducer, times(1)).initGridWidget(eq(backgroundGridWidgetSpy), eq(backgroundGridPanelMock), eq(clickHandlerMock), eq(mouseMoveHandlerMock), eq(eventBusMock));
-    }
-
-    @Test
-    public void initGridWidget() {
-        scenarioGridPanelProducer.initGridWidget(scenarioGridWidgetSpy, scenarioGridPanelMock, clickHandlerMock, mouseMoveHandlerMock, eventBusMock);
-        verify(scenarioGridPanelMock, times(1)).setEventBus(eq(eventBusMock));
-        verify(scenarioContextMenuRegistryMock).setEventBus(eventBusMock);
-        verify(clickHandlerMock, times(1)).setScenarioContextMenuRegistry(eq(scenarioGridPanelProducer.getScenarioContextMenuRegistry()));
-        verify(clickHandlerMock, times(1)).setScenarioGridPanel(eq(scenarioGridPanelMock));
-        verify(clickHandlerMock, times(1)).setEventBus(eq(eventBusMock));
-        verify(scenarioContextMenuRegistryMock, times(1)).setErrorReportPopoverPresenter(errorReportPopupPresenterMock);
-        verify(mouseMoveHandlerMock, times(1)).setScenarioGridPanel(eq(scenarioGridPanelMock));
-        verify(mouseMoveHandlerMock, times(1)).setErrorReportPopupPresenter(eq(errorReportPopupPresenterMock));
-        verify(scenarioGridPanelMock, times(1)).addHandlers(eq(clickHandlerMock), eq(mouseMoveHandlerMock));
-        verify(scenarioGridWidgetSpy, times(1)).setScenarioGridPanel(eq(scenarioGridPanelMock));
-    }
-
-    @Test
-    public void getScenarioContextMenuRegistry() {
-        assertEquals(scenarioContextMenuRegistryMock, scenarioGridPanelProducer.getScenarioContextMenuRegistry());
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRendererTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRendererTest.java
deleted file mode 100644
index ad505b9..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRendererTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.renderers;
-
-import com.ait.lienzo.client.core.shape.Group;
-import com.ait.lienzo.client.core.shape.Node;
-import com.ait.lienzo.client.core.shape.Rectangle;
-import com.ait.lienzo.client.core.shape.Text;
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.values.ScenarioGridCellValue;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridCell;
-import org.uberfire.ext.wires.core.grids.client.model.GridCellValue;
-import org.uberfire.ext.wires.core.grids.client.widget.context.GridBodyCellRenderContext;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.GridRenderer;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.EXPRESSION_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LIST_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAP_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.PLACEHOLDER;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioGridColumnRendererTest {
-
-    @Mock
-    private GridBodyCellRenderContext contextMock;
-    @Mock
-    private GridRenderer rendererMock;
-    @Mock
-    private ScenarioGridRendererTheme themeMock;
-    @Mock
-    private Text textMock;
-    @Mock
-    private Text placeholderMock;
-    @Mock
-    private Text errorTextMock;
-    @Mock
-    private Rectangle rectangle;
-    @Mock
-    private ScenarioGridCell scenarioGridCell;
-    @Mock
-    private Node<?> nodeMock;
-
-    private ScenarioGridColumnRenderer scenarioGridColumnRenderer;
-
-    @Before
-    public void setUp() {
-        doReturn(nodeMock).when(textMock).asNode();
-        doReturn(nodeMock).when(placeholderMock).asNode();
-        doReturn(nodeMock).when(errorTextMock).asNode();
-        doReturn(nodeMock).when(rectangle).asNode();
-        when(themeMock.getPlaceholderText()).thenReturn(placeholderMock);
-        when(themeMock.getBodyText()).thenReturn(textMock);
-        when(rendererMock.getTheme()).thenReturn(themeMock);
-        when(contextMock.getRenderer()).thenReturn(rendererMock);
-        when(themeMock.getErrorText()).thenReturn(errorTextMock);
-        when(themeMock.getBodyErrorBackground(any())).thenReturn(rectangle);
-        scenarioGridColumnRenderer = spy(new ScenarioGridColumnRenderer() {
-            @Override
-            protected String getCollectionString(String jsonString, boolean isList) {
-                return jsonString;
-            }
-        });
-    }
-
-    @Test
-    public void renderCell() {
-        GridCell<String> cell = null;
-        Group retrieved = scenarioGridColumnRenderer.renderCell(cell, contextMock);
-        assertNull(retrieved);
-        verify(scenarioGridColumnRenderer, never()).internalRenderCell(any(), eq(contextMock), any(), anyString());
-        verify(scenarioGridColumnRenderer, never()).getCollectionString(anyString(), anyBoolean());
-
-        cell = new ScenarioGridCell(null);
-        retrieved = scenarioGridColumnRenderer.renderCell(cell, contextMock);
-        assertNull(retrieved);
-        verify(scenarioGridColumnRenderer, never()).getCollectionString(anyString(), anyBoolean());
-        verify(scenarioGridColumnRenderer, never()).internalRenderCell(any(), eq(contextMock), eq(textMock), eq(null));
-        reset(scenarioGridColumnRenderer);
-
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(null));
-        retrieved = scenarioGridColumnRenderer.renderCell(cell, contextMock);
-        assertNull(retrieved);
-        verify(scenarioGridColumnRenderer, never()).getCollectionString(anyString(), anyBoolean());
-        verify(scenarioGridColumnRenderer, never()).internalRenderCell(any(), eq(contextMock), eq(textMock), eq(null));
-        reset(scenarioGridColumnRenderer);
-
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(MULTIPART_VALUE));
-        retrieved = scenarioGridColumnRenderer.renderCell(cell, contextMock);
-        assertNotNull(retrieved);
-        verify(scenarioGridColumnRenderer, never()).getCollectionString(anyString(), anyBoolean());
-        verify(scenarioGridColumnRenderer, times(1)).internalRenderCell(any(), eq(contextMock), eq(textMock), eq(MULTIPART_VALUE));
-        reset(scenarioGridColumnRenderer);
-
-        ScenarioGridCell scenarioGridCell = new ScenarioGridCell(new ScenarioGridCellValue(MULTIPART_VALUE, PLACEHOLDER));
-        retrieved = scenarioGridColumnRenderer.renderCell(scenarioGridCell, contextMock);
-        assertNotNull(retrieved);
-        verify(scenarioGridColumnRenderer, never()).getCollectionString(anyString(), anyBoolean());
-        verify(scenarioGridColumnRenderer, times(1)).internalRenderCell(any(), eq(contextMock), eq(textMock), eq(MULTIPART_VALUE));
-        reset(scenarioGridColumnRenderer);
-
-        scenarioGridCell = new ScenarioGridCell(new ScenarioGridCellValue(null, PLACEHOLDER));
-        retrieved = scenarioGridColumnRenderer.renderCell(scenarioGridCell, contextMock);
-        assertNotNull(retrieved);
-        verify(scenarioGridColumnRenderer, times(1)).internalRenderCell(any(), eq(contextMock), eq(placeholderMock), eq(PLACEHOLDER));
-        verify(scenarioGridColumnRenderer, never()).getCollectionString(anyString(), anyBoolean());
-        reset(scenarioGridColumnRenderer);
-
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(LIST_VALUE));
-        ((ScenarioGridCell) cell).setListMap(true);
-        retrieved = scenarioGridColumnRenderer.renderCell(cell, contextMock);
-        assertNotNull(retrieved);
-        verify(scenarioGridColumnRenderer, times(1)).internalRenderCell(any(), eq(contextMock), eq(textMock), eq(LIST_VALUE));
-        verify(scenarioGridColumnRenderer, times(1)).getCollectionString(eq(LIST_VALUE), eq(true));
-        reset(scenarioGridColumnRenderer);
-
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(MAP_VALUE));
-        ((ScenarioGridCell) cell).setListMap(false);
-        retrieved = scenarioGridColumnRenderer.renderCell(cell, contextMock);
-        assertNotNull(retrieved);
-        verify(scenarioGridColumnRenderer, times(1)).internalRenderCell(any(), eq(contextMock), eq(textMock), eq(MAP_VALUE));
-        verify(scenarioGridColumnRenderer, times(1)).getCollectionString(eq(MAP_VALUE), eq(false));
-        reset(scenarioGridColumnRenderer);
-
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(EXPRESSION_VALUE));
-        ((ScenarioGridCell) cell).setListMap(true);
-        retrieved = scenarioGridColumnRenderer.renderCell(cell, contextMock);
-        assertNotNull(retrieved);
-        verify(scenarioGridColumnRenderer, times(1)).internalRenderCell(any(), eq(contextMock), eq(textMock), eq(EXPRESSION_VALUE));
-        verify(scenarioGridColumnRenderer, times(1)).getCollectionString(eq(EXPRESSION_VALUE), eq(true));
-        reset(scenarioGridColumnRenderer);
-
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(EXPRESSION_VALUE));
-        ((ScenarioGridCell) cell).setListMap(false);
-        retrieved = scenarioGridColumnRenderer.renderCell(cell, contextMock);
-        assertNotNull(retrieved);
-        verify(scenarioGridColumnRenderer, times(1)).internalRenderCell(any(), eq(contextMock), eq(textMock), eq(EXPRESSION_VALUE));
-        verify(scenarioGridColumnRenderer, times(1)).getCollectionString(eq(EXPRESSION_VALUE), eq(false));
-        reset(scenarioGridColumnRenderer);
-
-
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(MULTIPART_VALUE));
-        ((ScenarioGridCell) cell).setErrorMode(true);
-        retrieved = scenarioGridColumnRenderer.renderCell(cell, contextMock);
-        assertNotNull(retrieved);
-        verify(scenarioGridColumnRenderer, never()).getCollectionString(anyString(), anyBoolean());
-        verify(scenarioGridColumnRenderer, times(1)).internalRenderCell(any(), eq(contextMock), eq(errorTextMock), eq(MULTIPART_VALUE));
-        reset(scenarioGridColumnRenderer);
-    }
-
-    @Test
-    public void internalRenderCell() {
-        assertNull(scenarioGridColumnRenderer.internalRenderCell(null, null, null, null));
-        assertNull(scenarioGridColumnRenderer.internalRenderCell(scenarioGridCell, null, null, null));
-        when(scenarioGridCell.getValue()).thenReturn(mock(GridCellValue.class));
-        assertNull(scenarioGridColumnRenderer.internalRenderCell(scenarioGridCell, null, null, null));
-    }
-
-    @Test
-    public void applyBackgroundColor() {
-        Group group = mock(Group.class);
-
-        when(scenarioGridCell.isErrorMode()).thenReturn(true);
-        scenarioGridColumnRenderer.applyBackgroundColor(scenarioGridCell, contextMock, group, themeMock);
-        verify(group, times(1)).add(any());
-
-        reset(group);
-
-        when(scenarioGridCell.isErrorMode()).thenReturn(false);
-        scenarioGridColumnRenderer.applyBackgroundColor(scenarioGridCell, contextMock, group, themeMock);
-        verify(group, never()).add(any());
-    }
-
-
-    @Test
-    public void getValueToShow(){
-        ScenarioGridCell cell = new ScenarioGridCell(null);
-        commonGetValueToShow(cell, true, null, false);
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(null));
-        commonGetValueToShow(cell, true, null, false);
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(MULTIPART_VALUE));
-        commonGetValueToShow(cell, false, null, false);
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(LIST_VALUE));
-        cell.setListMap(true);
-        commonGetValueToShow(cell, false, LIST_VALUE, true);
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(MAP_VALUE));
-        cell.setListMap(false);
-        commonGetValueToShow(cell, false, MAP_VALUE, false);
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(EXPRESSION_VALUE));
-        cell.setListMap(true);
-        commonGetValueToShow(cell, false, EXPRESSION_VALUE, true);
-        cell = new ScenarioGridCell(new ScenarioGridCellValue(EXPRESSION_VALUE));
-        cell.setListMap(false);
-        commonGetValueToShow(cell, false, EXPRESSION_VALUE, false);
-    }
-
-    private void commonGetValueToShow(ScenarioGridCell scenarioGridCell, boolean expectedNull, String jsonString, boolean isList) {
-        final String retrieved = scenarioGridColumnRenderer.getValueToShow(scenarioGridCell);
-        if (expectedNull) {
-            assertNull(retrieved);
-        } else {
-            assertNotNull(retrieved);
-            if (jsonString != null) {
-                verify(scenarioGridColumnRenderer, times(1)).getCollectionString(eq(jsonString), eq(isList));
-            }
-    }
-        reset(scenarioGridColumnRenderer);
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorI18nServerManagerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorI18nServerManagerTest.java
deleted file mode 100644
index 6794789..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorI18nServerManagerTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.resources.i18n;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.workbench.screens.scenariosimulation.model.FactMappingValidationError;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-import static org.junit.Assert.assertEquals;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationEditorI18nServerManagerTest {
-
-    private FactMapping factMapping;
-
-    @Before
-    public void setup() {
-        factMapping = new FactMapping(FactIdentifier.create("myType", "tMYTYPE"),
-                                      ExpressionIdentifier.create(VALUE, FactMappingType.GIVEN));
-        factMapping.setFactAlias("FactAlias");
-        factMapping.setExpressionAlias("ExpressionAlias");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void retrieveMessageNullParameter() {
-        ScenarioSimulationEditorI18nServerManager.retrieveMessage(null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void retrieveMessageNullServerMessage() {
-        ScenarioSimulationEditorI18nServerManager.retrieveMessage(FactMappingValidationError.createGenericError(factMapping, "error"));
-    }
-
-    @Test
-    public void retrieveMessageFieldAddedConstraint() {
-        FactMappingValidationError error = FactMappingValidationError.createFieldAddedConstraintError(factMapping);
-        String message = ScenarioSimulationEditorI18nServerManager.retrieveMessage(error);
-        String expected = ScenarioSimulationEditorConstants.INSTANCE.scenarioValidationFieldAddedConstraintError();
-        assertEquals(expected, message);
-    }
-
-    @Test
-    public void retrieveMessageFieldRemovedConstraint() {
-        FactMappingValidationError error = FactMappingValidationError.createFieldRemovedConstraintError(factMapping);
-        String message = ScenarioSimulationEditorI18nServerManager.retrieveMessage(error);
-        String expected = ScenarioSimulationEditorConstants.INSTANCE.scenarioValidationFieldRemovedConstraintError();
-        assertEquals(expected, message);
-    }
-
-    @Test
-    public void retrieveMessageFieldChangedError() {
-        String newType = "newType";
-        FactMappingValidationError error = FactMappingValidationError.createFieldChangedError(factMapping, newType);
-        String message = ScenarioSimulationEditorI18nServerManager.retrieveMessage(error);
-        String expected = ScenarioSimulationEditorConstants.INSTANCE.scenarioValidationFieldChangedError("tMYTYPE", newType);
-        assertEquals(expected, message);
-    }
-
-    @Test
-    public void retrieveMessageNodeChangedError() {
-        String newType = "newType";
-        FactMappingValidationError error = FactMappingValidationError.createNodeChangedError(factMapping, newType);
-        String message = ScenarioSimulationEditorI18nServerManager.retrieveMessage(error);
-        String expected = ScenarioSimulationEditorConstants.INSTANCE.scenarioValidationNodeChangedError("tMYTYPE", newType);
-        assertEquals(expected, message);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/AbstractSettingsTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/AbstractSettingsTest.java
deleted file mode 100644
index 3bbfe40..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/AbstractSettingsTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.LabelElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import org.drools.workbench.screens.scenariosimulation.client.MockProducer;
-
-abstract class AbstractSettingsTest {
-
-    protected DivElement kieSettingsContentMock;
-
-    protected LabelElement nameLabelMock;
-
-    protected InputElement fileNameMock;
-
-    protected LabelElement typeLabelMock;
-
-    protected SpanElement scenarioTypeMock;
-
-    protected DivElement ruleSettingsMock;
-
-    protected Style ruleSettingsStyleMock;
-
-    protected InputElement dmoSessionMock;
-
-    protected InputElement ruleFlowGroupMock;
-
-    protected DivElement dmnSettingsMock;
-
-    protected Style dmnSettingsStyleMock;
-
-    protected LabelElement dmnModelLabelMock;
-
-    protected DivElement dmnFilePathPlaceholderMock;
-
-    protected SpanElement dmnFilePathErrorLabelMock;
-
-    protected Style dmnFilePathErrorLabelStyleMock;
-
-    protected LabelElement dmnNamespaceLabelMock;
-
-    protected InputElement dmnNamespaceMock;
-
-    protected LabelElement dmnNameLabelMock;
-
-    protected InputElement dmnNameMock;
-
-    protected InputElement skipFromBuildMock;
-
-    protected InputElement statelessMock;
-
-    protected SettingsView settingsViewMock;
-
-    protected SpanElement statelessLabelMock;
-
-    protected void setup() {
-        settingsViewMock = MockProducer.getSettingsViewMock();
-        kieSettingsContentMock = MockProducer.kieSettingsContentMock();
-        nameLabelMock = settingsViewMock.getNameLabel();
-        fileNameMock = settingsViewMock.getFileName();
-        typeLabelMock = settingsViewMock.getTypeLabel();
-        scenarioTypeMock = settingsViewMock.getScenarioType();
-        ruleSettingsMock = settingsViewMock.getRuleSettings();
-        ruleSettingsStyleMock = ruleSettingsMock.getStyle();
-        dmoSessionMock = settingsViewMock.getDmoSession();
-        ruleFlowGroupMock = settingsViewMock.getRuleFlowGroup();
-        dmnSettingsMock = settingsViewMock.getDmnSettings();
-        dmnSettingsStyleMock = dmnSettingsMock.getStyle();
-        dmnModelLabelMock = settingsViewMock.getDmnNameLabel();
-        dmnFilePathPlaceholderMock = settingsViewMock.getDmnFilePathPlaceholder();
-        dmnFilePathErrorLabelMock = settingsViewMock.getDmnFilePathErrorLabel();
-        dmnFilePathErrorLabelStyleMock = dmnFilePathErrorLabelMock.getStyle();
-        dmnNamespaceLabelMock = settingsViewMock.getDmnNamespaceLabel();
-        dmnNamespaceMock = settingsViewMock.getDmnNamespace();
-        dmnNameLabelMock = settingsViewMock.getDmnNameLabel();
-        dmnNameMock = settingsViewMock.getDmnName();
-        skipFromBuildMock = settingsViewMock.getSkipFromBuild();
-        statelessMock = settingsViewMock.getStateless();
-        statelessLabelMock = MockProducer.statlessLabelMock();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/AbstractTestToolsTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/AbstractTestToolsTest.java
deleted file mode 100644
index 169a169..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/AbstractTestToolsTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.stream.IntStream;
-
-import com.google.gwt.dom.client.LIElement;
-import org.drools.workbench.screens.scenariosimulation.client.editor.strategies.DataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ViewsProvider;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.junit.Before;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_PACKAGE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LOWER_CASE_VALUE;
-
-abstract class AbstractTestToolsTest {
-
-    @Mock
-    protected LIElement lIElementMock;
-
-    @Mock
-    protected ViewsProvider viewsProviderMock;
-
-    protected SortedMap<String, FactModelTree> dataObjectFactTreeMap;
-    protected SortedMap<String, FactModelTree> simpleJavaTypeTreeMap;
-    protected SortedMap<String, FactModelTree> instanceFactTreeMap;
-    protected SortedMap<String, FactModelTree> simpleJavaInstanceFactTreeMap;
-
-    protected FactModelTree FACT_MODEL_TREE;
-
-    protected String localFactName;
-
-    @Before
-    public void setup() {
-        dataObjectFactTreeMap = getDataObjectFactTreeMap();
-        simpleJavaTypeTreeMap = getSimpleJavaTypeFieldsMap();
-        instanceFactTreeMap = new TreeMap<>();
-        dataObjectFactTreeMap.keySet().forEach(key -> instanceFactTreeMap.put(getRandomString(), dataObjectFactTreeMap.get(key)));
-        simpleJavaInstanceFactTreeMap = new TreeMap<>();
-        localFactName = new ArrayList<>(dataObjectFactTreeMap.keySet()).get(0);
-        FACT_MODEL_TREE = dataObjectFactTreeMap.get(localFactName);
-    }
-
-    protected String getRandomFactModelTree(Map<String, FactModelTree> source, int position) {
-        return new ArrayList<>(source.keySet()).get(position);
-    }
-
-    protected SortedMap<String, FactModelTree> getDataObjectFactTreeMap() {
-        SortedMap<String, FactModelTree> toReturn = new TreeMap<>();
-        IntStream
-                .range(0, 3)
-                .forEach(id -> {
-                    String key = getRandomString();
-                    FactModelTree value = new FactModelTree(key, FACT_PACKAGE, getMockSimpleProperties(), new HashMap<>());
-                    toReturn.put(key, value);
-                    if (id == 1) {
-                        value.addSimpleProperty(getRandomString(), getRandomType());
-                    }
-                    if (id == 2) {
-                        value.addSimpleProperty(getRandomString(), getRandomType());
-                        // Recursion
-                        value.addSimpleProperty(getRandomString(), getRandomType());
-                    }
-                });
-        return toReturn;
-    }
-
-    protected SortedMap<String, FactModelTree> getSimpleJavaTypeFieldsMap() {
-        SortedMap<String, FactModelTree> toReturn = new TreeMap<>();
-        for (String key : DataManagementStrategy.SIMPLE_CLASSES_MAP.keySet()) {
-            Map<String, FactModelTree.PropertyTypeName> simpleProperties = new HashMap<>();
-            FactModelTree.PropertyTypeName fullName = new FactModelTree.PropertyTypeName(DataManagementStrategy.SIMPLE_CLASSES_MAP.get(key).getCanonicalName());
-            simpleProperties.put(LOWER_CASE_VALUE, fullName);
-            String packageName = fullName.getTypeName().substring(0, fullName.getTypeName().lastIndexOf("."));
-            FactModelTree value = new FactModelTree(key, packageName, simpleProperties, new HashMap<>());
-            toReturn.put(key, value);
-        }
-        return toReturn;
-    }
-
-    protected Map<String, FactModelTree.PropertyTypeName> getMockSimpleProperties() {
-        Map<String, FactModelTree.PropertyTypeName> toReturn = new HashMap<>();
-        IntStream
-                .range(0, +3)
-                .forEach(id -> toReturn.put(getRandomString(), getRandomType()));
-        return toReturn;
-    }
-
-    protected String getRandomString() {
-        String letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        StringBuilder builder = new StringBuilder();
-        int numberOfLetters = letters.length();
-        Random random = new Random();
-        int sizeOfRandomString = random.nextInt(6) + 3;
-        IntStream
-                .range(0, sizeOfRandomString)
-                .forEach(position -> builder.append(letters.charAt(random.nextInt(numberOfLetters))));
-        return builder.toString();
-    }
-
-    protected FactModelTree.PropertyTypeName getRandomType() {
-        int type = new Random().nextInt(4);
-        switch (type) {
-            case 0:
-                return new FactModelTree.PropertyTypeName("lava.lang.String");
-            case 1:
-                return new FactModelTree.PropertyTypeName("byte");
-            case 2:
-                return new FactModelTree.PropertyTypeName("java.lang.Integer");
-            case 3:
-                return new FactModelTree.PropertyTypeName("java.lang.Boolean");
-            default:
-                return new FactModelTree.PropertyTypeName("int");
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetPresenterTest.java
deleted file mode 100644
index 9da789a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetPresenterTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class CheatSheetPresenterTest extends AbstractTestToolsTest {
-
-    @Mock
-    private CheatSheetView cheatSheetViewMock;
-
-    private CheatSheetPresenter cheatSheetPresenter;
-
-    @Before
-    public void setup() {
-        super.setup();
-        this.cheatSheetPresenter = spy(new CheatSheetPresenter(cheatSheetViewMock) {
-            {
-            }
-        });
-    }
-
-    @Test
-    public void onSetup() {
-        cheatSheetPresenter.setup();
-        verify(cheatSheetViewMock, times(1)).init(cheatSheetPresenter);
-    }
-
-    @Test
-    public void getTitle() {
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.scenarioCheatSheet(), cheatSheetPresenter.getTitle());
-    }
-
-    @Test
-    public void initCheatSheetRule() {
-        cheatSheetPresenter.initCheatSheet(ScenarioSimulationModel.Type.RULE);
-        verify(cheatSheetViewMock, times(1)).setRuleCheatSheetContent();
-    }
-
-    @Test
-    public void initCheatSheetDMN() {
-        cheatSheetPresenter.initCheatSheet(ScenarioSimulationModel.Type.DMN);
-        verify(cheatSheetViewMock, times(1)).setDMNCheatSheetContent();
-    }
-
-    @Test
-    public void reset() {
-        cheatSheetPresenter.reset();
-        verify(cheatSheetViewMock, times(1)).reset();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetViewImplTest.java
deleted file mode 100644
index 344667f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/CheatSheetViewImplTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.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;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class CheatSheetViewImplTest {
-
-    private CheatSheetViewImpl cheatSheetView;
-
-    @Mock
-    private CheatSheetPresenter cheatSheetPresenterMock;
-
-
-    @Mock
-    private DivElement ruleCheatSheetMock;
-
-    @Mock
-    private DivElement dmnCheatSheetMock;
-
-    @Mock
-    private Style ruleCheatSheetStyleMock;
-
-    @Mock
-    private Style dmnCheatSheetStyleMock;
-
-    @Before
-    public void setup() {
-        this.cheatSheetView = spy(new CheatSheetViewImpl() {
-            {
-                this.ruleCheatSheet = ruleCheatSheetMock;
-                this.dmnCheatSheet = dmnCheatSheetMock;
-            }
-        });
-        cheatSheetView.init(cheatSheetPresenterMock);
-        when(ruleCheatSheetMock.getStyle()).thenReturn(ruleCheatSheetStyleMock);
-        when(dmnCheatSheetMock.getStyle()).thenReturn(dmnCheatSheetStyleMock);
-    }
-
-    @Test
-    public void setRuleCheatSheetContent() {
-        cheatSheetView.setRuleCheatSheetContent();
-        verify(ruleCheatSheetStyleMock, times(1)).setDisplay(Style.Display.BLOCK);
-        verify(dmnCheatSheetStyleMock, times(1)).setDisplay(Style.Display.NONE);
-    }
-
-    @Test
-    public void setDMNCheatSheetContent() {
-        cheatSheetView.setDMNCheatSheetContent();
-        verify(ruleCheatSheetStyleMock, times(1)).setDisplay(Style.Display.NONE);
-        verify(dmnCheatSheetStyleMock, times(1)).setDisplay(Style.Display.BLOCK);
-    }
-
-
-    @Test
-    public void reset() {
-        cheatSheetView.reset();
-        verify(ruleCheatSheetStyleMock, times(1)).setDisplay(Style.Display.NONE);
-        verify(dmnCheatSheetStyleMock, times(1)).setDisplay(Style.Display.NONE);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemPresenterTest.java
deleted file mode 100644
index 8d6ca14..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemPresenterTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_NAME;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class FieldItemPresenterTest extends AbstractTestToolsTest {
-
-    @Mock
-    protected FieldItemView mockFieldItemView;
-
-    private FieldItemPresenter fieldItemPresenter;
-
-    private Map<String, FieldItemView> fieldItemViewMapSpy;
-
-    @Before
-    public void setup() {
-        super.setup();
-        when(viewsProviderMock.getFieldItemView()).thenReturn(mockFieldItemView);
-        when(mockFieldItemView.getLIElement()).thenReturn(lIElementMock);
-        fieldItemViewMapSpy = spy(new HashMap<>());
-        this.fieldItemPresenter = spy(new FieldItemPresenter() {
-            {
-                viewsProvider = viewsProviderMock;
-                fieldItemMap = fieldItemViewMapSpy;
-            }
-        });
-    }
-
-    @Test
-    public void getLIElement() {
-        List<String> parentPath = Collections.EMPTY_LIST;
-        fieldItemPresenter.getLIElement(parentPath, FACT_NAME, FACT_NAME, FACT_MODEL_TREE.getFactName(), CLASS_NAME);
-        verify(viewsProviderMock, times(1)).getFieldItemView();
-        verify(mockFieldItemView, times(1)).setFieldData(eq(parentPath), eq(FACT_NAME), eq(FACT_NAME), eq(FACT_MODEL_TREE.getFactName()), eq(CLASS_NAME));
-        verify(mockFieldItemView, times(1)).setPresenter(eq(fieldItemPresenter));
-    }
-
-    @Test
-    public void reset() {
-        fieldItemPresenter.reset();
-        verify(fieldItemViewMapSpy, times(1)).clear();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemViewTest.java
deleted file mode 100644
index 9724b77..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/FieldItemViewTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FIELD_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PROPERTY_PATH;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PROPERTY_PATH_ELEMENTS;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class FieldItemViewTest extends AbstractTestToolsTest {
-
-    @Mock
-    private SpanElement fieldNameElementMock;
-
-    @Mock
-    private SpanElement checkElementMock;
-
-    @Mock
-    private Style checkElementStyleMock;
-
-    @Mock
-    private FieldItemPresenter fieldItemPresenter;
-
-    private FieldItemViewImpl fieldItemViewSpy;
-
-    private String INNER_HTML;
-    private String ID_ATTRIBUTE;
-
-    @Before
-    public void setup() {
-        super.setup();
-        INNER_HTML = "<a>" + FIELD_NAME + "</a> [" + CLASS_NAME + "]";
-        ID_ATTRIBUTE = "fieldElement-" + FACT_NAME + "-" + FIELD_NAME;
-        this.fieldItemViewSpy = spy(new FieldItemViewImpl() {
-            {
-                this.fieldNameElement = fieldNameElementMock;
-                this.fieldElement = lIElementMock;
-                this.checkElement = checkElementMock;
-            }
-        });
-        fieldItemViewSpy.setPresenter(fieldItemPresenter);
-        when(checkElementMock.getStyle()).thenReturn(checkElementStyleMock);
-    }
-
-    @Test
-    public void setFieldData() {
-        fieldItemViewSpy.setFieldData(FULL_PROPERTY_PATH_ELEMENTS, FACT_NAME, FIELD_NAME, FACT_MODEL_TREE.getFactName(), CLASS_NAME);
-        assertEquals(FULL_PROPERTY_PATH_ELEMENTS, fieldItemViewSpy.getFullPath());
-        assertEquals(FACT_NAME, fieldItemViewSpy.getFactName());
-        assertEquals(FIELD_NAME, fieldItemViewSpy.getFieldName());
-        assertEquals(FACT_MODEL_TREE.getFactName(), fieldItemViewSpy.getClassName());
-        assertEquals(CLASS_NAME, fieldItemViewSpy.getClassTypeName());
-        verify(fieldNameElementMock, times(1)).setInnerHTML(eq(INNER_HTML));
-        verify(fieldNameElementMock, times(1)).setAttribute(eq("id"), eq(ID_ATTRIBUTE));
-        verify(fieldNameElementMock, times(1)).setAttribute(eq("fieldName"), eq(FIELD_NAME));
-        verify(fieldNameElementMock, times(1)).setAttribute(eq("className"), eq(FACT_MODEL_TREE.getFactName()));
-        verify(fieldNameElementMock, times(1)).setAttribute(eq("fullPath"), eq(FULL_PROPERTY_PATH));
-    }
-
-    @Test
-    public void onFieldElementSelected() {
-        fieldItemViewSpy.onFieldElementSelected();
-        verify(lIElementMock, times(1)).addClassName(eq(ConstantHolder.SELECTED));
-        verify(fieldItemViewSpy, times(1)).showCheck(eq(true));
-        verify(fieldItemPresenter, times(1)).onFieldElementClick(eq(fieldItemViewSpy));
-    }
-
-    @Test
-    public void onFieldElementClicked() {
-        InOrder inOrder = inOrder(fieldItemViewSpy, lIElementMock, fieldItemPresenter);
-        fieldItemViewSpy.onFieldElementClick(mock(ClickEvent.class));
-        inOrder.verify(lIElementMock, times(1)).addClassName(eq(ConstantHolder.SELECTED));
-        inOrder.verify(fieldItemViewSpy, times(1)).showCheck(eq(true));
-        inOrder.verify(fieldItemPresenter, times(1)).onFieldElementClick(eq(fieldItemViewSpy));
-    }
-
-    @Test
-    public void showCheck() {
-        fieldItemViewSpy.showCheck(true);
-        verify(checkElementStyleMock, times(1)).setDisplay(eq(Style.Display.BLOCK));
-        //
-        reset();
-        fieldItemViewSpy.showCheck(false);
-        verify(checkElementStyleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-    }
-
-    @Test
-    public void isCheckShown() {
-        when(checkElementStyleMock.getDisplay()).thenReturn(Style.Display.NONE.getCssName());
-        assertFalse(fieldItemViewSpy.isCheckShown());
-        //
-        reset();
-        when(checkElementStyleMock.getDisplay()).thenReturn(Style.Display.BLOCK.getCssName());
-        assertTrue(fieldItemViewSpy.isCheckShown());
-    }
-
-    @Test
-    public void unselect() {
-        fieldItemViewSpy.unselect();
-        verify(lIElementMock, times(1)).removeClassName(eq(ConstantHolder.SELECTED));
-        verify(checkElementStyleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemPresenterTest.java
deleted file mode 100644
index 189728d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemPresenterTest.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.Spy;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FULL_PACKAGE_ELEMENTS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.VALUE_CLASS_NAME;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ListGroupItemPresenterTest extends AbstractTestToolsTest {
-
-    private ListGroupItemPresenter listGroupItemPresenter;
-
-    @Mock
-    private ListGroupItemView listGroupItemViewMock;
-
-    @Mock
-    private DivElement divElementMock;
-
-    @Spy
-    private FieldItemPresenter fieldItemPresenterSpy = new FieldItemPresenter();
-
-    @Mock
-    private FieldItemView fieldItemViewMock;
-
-    @Mock
-    private Map<String, ListGroupItemView> listGroupItemViewMapMock;
-
-    @Mock
-    private List<ListGroupItemView> listGroupItemViewValuesMock;
-
-    @Mock
-    private TestToolsPresenter testToolsPresenterMock;
-
-    @Before
-    public void setup() {
-        super.setup();
-        when(viewsProviderMock.getListGroupItemView()).thenReturn(listGroupItemViewMock);
-        when(viewsProviderMock.getFieldItemView()).thenReturn(fieldItemViewMock);
-        when(listGroupItemViewMock.getListGroupItem()).thenReturn(divElementMock);
-        when(listGroupItemViewMock.getListGroupExpansion()).thenReturn(divElementMock);
-        when(listGroupItemViewMapMock.values()).thenReturn(listGroupItemViewValuesMock);
-        this.listGroupItemPresenter = spy(new ListGroupItemPresenter() {
-            {
-                listGroupItemViewMap = listGroupItemViewMapMock;
-                fieldItemPresenter = fieldItemPresenterSpy;
-                viewsProvider = viewsProviderMock;
-                testToolsPresenter = testToolsPresenterMock;
-            }
-        });
-        fieldItemPresenterSpy.viewsProvider = viewsProviderMock;
-    }
-
-    @Test
-    public void getDivElementByFactModel() {
-        DivElement retrieved = listGroupItemPresenter.getDivElement(FACT_NAME, FACT_MODEL_TREE);
-        assertNotNull(retrieved);
-        assertEquals(divElementMock, retrieved);
-        verify(listGroupItemPresenter, times(1)).commonGetListGroupItemView(Collections.emptyList(), FACT_NAME, false);
-        verify(listGroupItemPresenter, times(1)).populateListGroupItemView(listGroupItemViewMock, Collections.emptyList(), FACT_NAME, FACT_MODEL_TREE);
-    }
-
-    @Test
-    public void getDivElementByStrings() {
-        DivElement retrieved = listGroupItemPresenter.getDivElement(FULL_PACKAGE_ELEMENTS, MULTIPART_VALUE, VALUE_CLASS_NAME);
-        assertNotNull(retrieved);
-        assertEquals(divElementMock, retrieved);
-        verify(listGroupItemPresenter, times(1)).commonGetListGroupItemView(FULL_PACKAGE_ELEMENTS, MULTIPART_VALUE, true);
-        verify(listGroupItemPresenter, times(1)).populateListGroupItemView(listGroupItemViewMock, MULTIPART_VALUE, VALUE_CLASS_NAME);
-    }
-
-    @Test
-    public void onToggleRowExpansionDisabled() {
-        listGroupItemPresenter.disable();
-        reset(listGroupItemViewMapMock);
-        when(listGroupItemViewValuesMock.contains(listGroupItemViewMock)).thenReturn(true);
-        listGroupItemPresenter.onToggleRowExpansion(listGroupItemViewMock, true);
-        verify(listGroupItemViewValuesMock, never()).contains(listGroupItemViewMock);
-        verify(listGroupItemViewMock, never()).closeRow();
-        reset(listGroupItemViewMapMock);
-        when(listGroupItemViewValuesMock.contains(listGroupItemViewMock)).thenReturn(true);
-        reset(listGroupItemViewMock);
-        listGroupItemPresenter.onToggleRowExpansion(listGroupItemViewMock, false);
-        verify(listGroupItemViewValuesMock, never()).contains(listGroupItemViewMock);
-        verify(listGroupItemViewMock, never()).expandRow();
-    }
-
-    @Test
-    public void onToggleRowExpansionWithoutFactName() {
-        listGroupItemPresenter.enable();
-        reset(listGroupItemViewMapMock);
-        when(listGroupItemViewValuesMock.contains(listGroupItemViewMock)).thenReturn(true);
-        listGroupItemPresenter.onToggleRowExpansion(listGroupItemViewMock, true);
-        verify(listGroupItemViewMock, times(1)).closeRow();
-        reset(listGroupItemViewMapMock);
-        when(listGroupItemViewValuesMock.contains(listGroupItemViewMock)).thenReturn(true);
-        reset(listGroupItemViewMock);
-        listGroupItemPresenter.onToggleRowExpansion(listGroupItemViewMock, false);
-        verify(listGroupItemViewMock, times(1)).expandRow();
-    }
-
-    @Test
-    public void onToggleRowExpansionWithFactName() {
-        listGroupItemPresenter.enable(FACT_NAME);
-        reset(listGroupItemViewMapMock);
-        when(listGroupItemViewValuesMock.contains(listGroupItemViewMock)).thenReturn(true);
-        listGroupItemPresenter.onToggleRowExpansion(listGroupItemViewMock, true);
-        verify(listGroupItemViewMock, times(1)).closeRow();
-        reset(listGroupItemViewMapMock);
-        when(listGroupItemViewValuesMock.contains(listGroupItemViewMock)).thenReturn(true);
-        reset(listGroupItemViewMock);
-        listGroupItemPresenter.onToggleRowExpansion(listGroupItemViewMock, false);
-        verify(listGroupItemViewMock, times(1)).expandRow();
-    }
-
-    @Test
-    public void onToggleRowExpansionWithFactNameHidden() {
-        listGroupItemPresenter.enable(FACT_NAME);
-        when(listGroupItemViewMock.isToExpand()).thenReturn(true);
-        when(testToolsPresenterMock.getFactModelTreeFromFactTypeMap(anyString())).thenReturn(Optional.empty());
-        listGroupItemPresenter.onToggleRowExpansion(listGroupItemViewMock, false);
-        verify(testToolsPresenterMock, times(1)).getFactModelTreeFromFactTypeMap(any());
-        verify(testToolsPresenterMock, times(1)).getFactModelTreeFromHiddenMap(any());
-        verify(listGroupItemViewMock, times(1)).expandRow();
-    }
-
-    @Test
-    public void populateListGroupItemView() {
-        listGroupItemPresenter.populateListGroupItemView(listGroupItemViewMock, Collections.emptyList(), FACT_MODEL_TREE.getFactName(), FACT_MODEL_TREE);
-        verify(listGroupItemViewMock, times(1)).setFactName(FACT_MODEL_TREE.getFactName());
-        Map<String, FactModelTree.PropertyTypeName> simpleProperties = FACT_MODEL_TREE.getSimpleProperties();
-        InOrder inOrder = inOrder(fieldItemPresenterSpy);
-        simpleProperties.keySet().stream().sorted().forEach(key -> {
-            FactModelTree.PropertyTypeName value = simpleProperties.get(key);
-            inOrder.verify(fieldItemPresenterSpy, times(1)).getLIElement(Arrays.asList(FACT_MODEL_TREE.getFactName()), FACT_MODEL_TREE.getFactName(), key, value.getTypeName(), value.getPropertyTypeNameToVisualize());
-        });
-        verify(listGroupItemViewMock, times(simpleProperties.size())).addFactField(any());
-        reset(listGroupItemViewMock);
-        Map<String, String> expandableProperties = FACT_MODEL_TREE.getExpandableProperties();
-        expandableProperties.entrySet().stream().sorted().forEach(entry -> inOrder.verify(listGroupItemPresenter, times(1)).getDivElement(Collections.emptyList(), entry.getKey(), entry.getValue()));
-        verify(listGroupItemViewMock, times(expandableProperties.size())).addExpandableFactField(isA(DivElement.class));
-    }
-
-    @Test
-    public void resetTest() {
-        listGroupItemPresenter.reset();
-        verify(listGroupItemViewMapMock, times(1)).clear();
-        verify(fieldItemPresenterSpy, times(1)).reset();
-    }
-
-    @Test
-    public void testSelectPropertyNoFieldAvailableJustExpression() {
-        final String instance = "Applicant";
-        final String property = "expression";
-
-        when(listGroupItemViewMapMock.get(instance)).thenReturn(listGroupItemViewMock);
-        fieldItemPresenterSpy.fieldItemMap = Collections.emptyMap();
-
-        listGroupItemPresenter.selectProperty(instance, Collections.singletonList(property));
-
-        verify(listGroupItemViewMock).showCheck(true);
-        verify(listGroupItemPresenter).onSelectedElement(listGroupItemViewMock);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemViewImplTest.java
deleted file mode 100644
index 1c11e27..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/ListGroupItemViewImplTest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.LIElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.UListElement;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.CLASS_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LIST_GROUP_ITEM;
-import static org.drools.workbench.screens.scenariosimulation.client.rightpanel.ListGroupItemViewImpl.LIST_VIEW_PF_EXPAND_ACTIVE;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.FA_ANGLE_DOWN;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.HIDDEN;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.SELECTED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyObject;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ListGroupItemViewImplTest extends AbstractTestToolsTest {
-
-    @Mock
-    private ListGroupItemPresenter listGroupItemPresenterMock;
-
-    @Mock
-    private DivElement listGroupItemMock;
-
-    @Mock
-    private DivElement listGroupItemHeaderMock;
-
-    @Mock
-    private DivElement listGroupItemContainerMock;
-
-    @Mock
-    private DivElement listGroupElementMock;
-
-    @Mock
-    private SpanElement fullClassNameMock;
-
-    @Mock
-    private SpanElement faAngleRightMock;
-
-    @Mock
-    private SpanElement checkElementMock;
-
-    @Mock
-    private Style checkElementStyleMock;
-
-    @Mock
-    private UListElement factPropertiesMock;
-
-    @Mock
-    private LIElement factFieldMock;
-
-    private ListGroupItemViewImpl listGroupItemViewSpy;
-
-    @Before
-    public void setup() {
-        this.listGroupItemViewSpy = spy(new ListGroupItemViewImpl() {
-            {
-                this.factName = FACT_NAME;
-                this.listGroupItem = listGroupItemMock;
-                this.listGroupItemHeader = listGroupItemHeaderMock;
-                this.listGroupItemContainer = listGroupItemContainerMock;
-                this.listGroupElement = listGroupElementMock;
-                this.faAngleRight = faAngleRightMock;
-                this.fullClassName = fullClassNameMock;
-                this.factProperties = factPropertiesMock;
-                this.checkElement = checkElementMock;
-            }
-        });
-        listGroupItemViewSpy.init(listGroupItemPresenterMock);
-        when(checkElementMock.getStyle()).thenReturn(checkElementStyleMock);
-    }
-
-    @Test
-    public void onFullClassNameClick() {
-        when(listGroupElementMock.getClassName()).thenReturn("not-empty disabled");
-        listGroupItemViewSpy.onFullClassNameClick(mock(ClickEvent.class));
-        verify(listGroupItemMock, never()).addClassName(eq(ConstantHolder.SELECTED));
-        verify(listGroupItemPresenterMock, never()).onSelectedElement(eq(listGroupItemViewSpy));
-        //
-        when(listGroupElementMock.getClassName()).thenReturn("empty");
-        listGroupItemViewSpy.onFullClassNameClick(mock(ClickEvent.class));
-        verify(listGroupItemMock, times(1)).addClassName(eq(ConstantHolder.SELECTED));
-        verify(listGroupItemPresenterMock, times(1)).onSelectedElement(eq(listGroupItemViewSpy));
-    }
-
-    @Test
-    public void unselect() {
-        listGroupItemViewSpy.unselect();
-        verify(listGroupItemMock, times(1)).removeClassName(eq(ConstantHolder.SELECTED));
-        verify(listGroupItemViewSpy, times(1)).showCheck(eq(false));
-    }
-
-    @Test
-    public void showCheck() {
-        listGroupItemViewSpy.showCheck(true);
-        verify(checkElementStyleMock, times(1)).setDisplay(eq(Style.Display.BLOCK));
-        verify(listGroupItemMock, times(1)).addClassName(eq(SELECTED));
-        //
-        reset();
-        listGroupItemViewSpy.showCheck(false);
-        verify(checkElementStyleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(listGroupItemMock, times(1)).removeClassName(eq(SELECTED));
-    }
-
-    @Test
-    public void isCheckShown() {
-        when(checkElementStyleMock.getDisplay()).thenReturn(Style.Display.NONE.getCssName());
-        assertFalse(listGroupItemViewSpy.isCheckShown());
-        //
-        reset();
-        when(checkElementStyleMock.getDisplay()).thenReturn(Style.Display.BLOCK.getCssName());
-        assertTrue(listGroupItemViewSpy.isCheckShown());
-    }
-
-    @Test
-    public void onFaAngleRightClick() {
-        String toReturn =  LIST_GROUP_ITEM + " " + LIST_VIEW_PF_EXPAND_ACTIVE;
-        when(listGroupItemHeaderMock.getClassName()).thenReturn(toReturn);
-        listGroupItemViewSpy.onFaAngleRightClick(mock(ClickEvent.class));
-        verify(listGroupItemPresenterMock, times(1)).onToggleRowExpansion(eq(listGroupItemViewSpy), eq(true));
-        when(listGroupItemHeaderMock.getClassName()).thenReturn(LIST_GROUP_ITEM);
-        listGroupItemViewSpy.onFaAngleRightClick(mock(ClickEvent.class));
-        verify(listGroupItemPresenterMock, times(1)).onToggleRowExpansion(eq(listGroupItemViewSpy), eq(false));
-    }
-
-    @Test
-    public void setFactName() {
-        listGroupItemViewSpy.setFactName(FACT_NAME);
-        assertEquals(FACT_NAME, listGroupItemViewSpy.factName);
-        assertEquals(FACT_NAME, listGroupItemViewSpy.factType);
-        verify(fullClassNameMock, times(1)).setInnerText(eq(FACT_NAME));
-        verify(listGroupItemMock, times(1)).setAttribute(eq("id"), eq("listGroupItem-" + FACT_NAME));
-    }
-
-    @Test
-    public void addFactField() {
-        listGroupItemViewSpy.addFactField(factFieldMock);
-        verify(factPropertiesMock, times(1)).appendChild(anyObject());
-    }
-
-    @Test
-    public void closeRow() {
-        listGroupItemViewSpy.closeRow();
-        verify(listGroupItemHeaderMock, times(1)).removeClassName(eq(LIST_VIEW_PF_EXPAND_ACTIVE));
-        verify(listGroupItemContainerMock, times(1)).addClassName(eq(HIDDEN));
-        verify(faAngleRightMock, times(1)).removeClassName(eq(FA_ANGLE_DOWN));
-    }
-
-    @Test
-    public void expandRow() {
-        listGroupItemViewSpy.expandRow();
-        verify(listGroupItemHeaderMock, times(1)).addClassName(eq(LIST_VIEW_PF_EXPAND_ACTIVE));
-        verify(listGroupItemContainerMock, times(1)).removeClassName(eq(HIDDEN));
-        verify(faAngleRightMock, times(1)).addClassName(eq(FA_ANGLE_DOWN));
-    }
-
-    @Test
-    public void getActualClassNameEmptyParentPath() {
-        String actualClassName = listGroupItemViewSpy.getActualClassName();
-        assertEquals(FACT_NAME, actualClassName);
-    }
-
-    @Test
-    public void getActualClassNameWithParentPath() {
-        listGroupItemViewSpy.setParentPath(Arrays.asList("com", "test"));
-        String actualClassName = listGroupItemViewSpy.getActualClassName();
-        assertEquals("com.test." + FACT_NAME, actualClassName);
-    }
-
-    @Test
-    public void setParentPathEmpty() {
-        List<String> list = Arrays.asList("com");
-        listGroupItemViewSpy.setParentPath(list);
-        assertEquals(list, listGroupItemViewSpy.getParentPath());
-    }
-
-    @Test
-    public void setParentPathNotEmpty() {
-        listGroupItemViewSpy.parentPath = new ArrayList<>(Arrays.asList("com"));
-        listGroupItemViewSpy.setParentPath(Arrays.asList("test"));
-        assertEquals(Arrays.asList("com", "test"), listGroupItemViewSpy.getParentPath());
-    }
-
-    @Test
-    public void setFactNameAndType() {
-        listGroupItemViewSpy.setFactNameAndType(FACT_NAME, CLASS_NAME);
-        assertEquals(FACT_NAME, listGroupItemViewSpy.factName);
-        assertEquals(CLASS_NAME, listGroupItemViewSpy.factType);
-        verify(fullClassNameMock, times(1)).setInnerHTML(eq(FACT_NAME + " [" + CLASS_NAME + "]"));
-        verify(fullClassNameMock, times(1)).setAttribute(eq("factName"), eq(FACT_NAME));
-        verify(fullClassNameMock, times(1)).setAttribute(eq("factType"), eq(CLASS_NAME));
-        verify(fullClassNameMock, times(1)).setAttribute(eq("parentPath"), eq(""));
-        verify(listGroupItemMock, times(1)).setAttribute(eq("id"), eq("listGroupItem-" + FACT_NAME));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsPresenterTest.java
deleted file mode 100644
index e275a7b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsPresenterTest.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.Optional;
-
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.workbench.screens.scenariosimulation.client.dropdown.SettingsScenarioSimulationDropdown;
-import org.drools.workbench.screens.scenariosimulation.client.events.UpdateSettingsDataEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ValidateSimulationEvent;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.uberfire.mvp.Command;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DMN_FILE_PATH;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DMN_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DMN_NAMESPACE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.DMO_SESSION;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FILE_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.RULE_FLOW_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.SKIP_FROM_BUILD;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.STATELESS;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class SettingsPresenterTest extends AbstractSettingsTest {
-
-    private SettingsPresenter settingsPresenterSpy;
-
-    @Mock
-    private Command saveCommandMock;
-
-    @Mock
-    private SettingsScenarioSimulationDropdown settingsScenarioSimulationDropdownMock;
-
-    @Mock
-    private EventBus eventBusMock;
-
-    @Captor
-    private ArgumentCaptor<UpdateSettingsDataEvent> updateSettingsDataEventArgumentCaptor;
-
-    protected Settings settingsSpy;
-
-    @Before
-    public void setup() {
-        super.setup();
-        Settings settings = new Settings();
-        settings.setRuleFlowGroup(RULE_FLOW_GROUP);
-        settings.setDmoSession(DMO_SESSION);
-        settings.setDmnFilePath(DMN_FILE_PATH);
-        settings.setDmnNamespace(DMN_NAMESPACE);
-        settings.setDmnName(DMN_NAME);
-        settings.setStateless(STATELESS);
-        settings.setSkipFromBuild(SKIP_FROM_BUILD);
-        // spy after initialization to avoid double counting
-        settingsSpy = spy(settings);
-
-        KieAssetsDropdownItem item = new KieAssetsDropdownItem("DMNFile", "", DMN_FILE_PATH, null);
-        when(settingsScenarioSimulationDropdownMock.getValue()).thenReturn(Optional.of(item));
-
-        this.settingsPresenterSpy = spy(new SettingsPresenter(settingsScenarioSimulationDropdownMock, settingsViewMock) {
-            {
-                this.settingsScenarioSimulationDropdown = settingsScenarioSimulationDropdownMock;
-                this.saveCommand = saveCommandMock;
-                this.eventBus = eventBusMock;
-            }
-        });
-    }
-
-    @Test
-    public void onSetup() {
-        settingsPresenterSpy.setup();
-        verify(settingsViewMock, times(1)).init(settingsPresenterSpy);
-    }
-
-    @Test
-    public void getTitle() {
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.settings(), settingsPresenterSpy.getTitle());
-    }
-
-    @Test
-    public void setEventBus() {
-        settingsPresenterSpy.setEventBus(eventBusMock);
-        assertEquals(eventBusMock, settingsPresenterSpy.eventBus);
-    }
-
-    @Test
-    public void setScenarioTypeRULESkipTrue() {
-        settingsSpy.setSkipFromBuild(true);
-        settingsPresenterSpy.setScenarioType(ScenarioSimulationModel.Type.RULE, settingsSpy, FILE_NAME);
-        verify(scenarioTypeMock, times(1)).setInnerText(eq(ScenarioSimulationModel.Type.RULE.name()));
-        verify(fileNameMock, times(1)).setValue(eq(FILE_NAME));
-        verify(skipFromBuildMock, times(1)).setChecked(eq(true));
-        verify(settingsPresenterSpy, times(1)).setRuleSettings(settingsSpy);
-    }
-
-    @Test
-    public void setScenarioTypeRULESkipFalse() {
-        settingsSpy.setSkipFromBuild(false);
-        settingsPresenterSpy.setScenarioType(ScenarioSimulationModel.Type.RULE, settingsSpy, FILE_NAME);
-        verify(scenarioTypeMock, times(1)).setInnerText(eq(ScenarioSimulationModel.Type.RULE.name()));
-        verify(fileNameMock, times(1)).setValue(eq(FILE_NAME));
-        verify(skipFromBuildMock, times(1)).setChecked(eq(false));
-        verify(settingsPresenterSpy, times(1)).setRuleSettings(settingsSpy);
-    }
-
-    @Test
-    public void setScenarioTypeDMNSkipTrue() {
-        settingsSpy.setSkipFromBuild(true);
-        settingsPresenterSpy.setScenarioType(ScenarioSimulationModel.Type.DMN, settingsSpy, FILE_NAME);
-        verify(scenarioTypeMock, times(1)).setInnerText(eq(ScenarioSimulationModel.Type.DMN.name()));
-        verify(fileNameMock, times(1)).setValue(eq(FILE_NAME));
-        verify(skipFromBuildMock, times(1)).setChecked(eq(true));
-        verify(settingsPresenterSpy, times(1)).setDMNSettings(settingsSpy);
-    }
-
-    @Test
-    public void setScenarioTypeDMNSkipFalse() {
-        settingsSpy.setSkipFromBuild(false);
-        settingsPresenterSpy.setScenarioType(ScenarioSimulationModel.Type.DMN, settingsSpy, FILE_NAME);
-        verify(scenarioTypeMock, times(1)).setInnerText(eq(ScenarioSimulationModel.Type.DMN.name()));
-        verify(fileNameMock, times(1)).setValue(eq(FILE_NAME));
-        verify(skipFromBuildMock, times(1)).setChecked(eq(false));
-        verify(settingsPresenterSpy, times(1)).setDMNSettings(settingsSpy);
-    }
-
-    @Test
-    public void setRuleSettings() {
-        settingsPresenterSpy.setRuleSettings(settingsSpy);
-        verify(dmnSettingsStyleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(ruleSettingsStyleMock, times(1)).setDisplay(eq(Style.Display.INLINE));
-        verify(settingsPresenterSpy, times(1)).updateRuleSettings(eq(settingsSpy));
-
-    }
-
-    @Test
-    public void updateRuleSettings() {
-        settingsPresenterSpy.updateRuleSettings(settingsSpy);
-        verify(dmoSessionMock, times(1)).setValue(eq(DMO_SESSION));
-        verify(ruleFlowGroupMock, times(1)).setValue(eq(RULE_FLOW_GROUP));
-        verify(statelessMock, times(1)).setChecked(eq(settingsSpy.isStateless()));
-    }
-
-    @Test
-    public void setDMNSettings() {
-        settingsPresenterSpy.setDMNSettings(settingsSpy);
-        verify(ruleSettingsStyleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(dmnSettingsStyleMock, times(1)).setDisplay(eq(Style.Display.INLINE));
-        verify(settingsScenarioSimulationDropdownMock, times(1)).registerOnMissingValueHandler(isA(Command.class));
-        verify(settingsScenarioSimulationDropdownMock, times(1)).registerOnChangeHandler(isA(Command.class));
-        verify(settingsScenarioSimulationDropdownMock, times(1)).loadAssets(eq(DMN_FILE_PATH));
-        verify(settingsPresenterSpy, times(1)).updateDMNSettings(settingsSpy);
-    }
-
-    @Test
-    public void updateDMNSettings() {
-        settingsPresenterSpy.updateDMNSettings(settingsSpy);
-        verify(dmnNameMock, times(1)).setValue(eq(DMN_NAME));
-        verify(dmnNamespaceMock, times(1)).setValue(eq(DMN_NAMESPACE));
-        verify(dmnFilePathErrorLabelStyleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(dmnFilePathErrorLabelMock, times(1)).setInnerText(eq(""));
-        verify(settingsScenarioSimulationDropdownMock, times(1)).loadAssets(eq(DMN_FILE_PATH));
-    }
-
-    @Test
-    public void updateSettingsDataRule() {
-        settingsSpy.setType(ScenarioSimulationModel.Type.RULE);
-        when(ruleSettingsStyleMock.getDisplay()).thenReturn(Style.Display.INLINE.getCssName());
-        settingsPresenterSpy.updateSettingsData(settingsSpy);
-        verify(settingsPresenterSpy, times(1)).setRuleSettings(eq(settingsSpy));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void updateSettingsDataRuleWrongState() {
-        settingsSpy.setType(ScenarioSimulationModel.Type.RULE);
-        when(ruleSettingsStyleMock.getDisplay()).thenReturn(Style.Display.NONE.getCssName());
-        settingsPresenterSpy.updateSettingsData(settingsSpy);
-        verify(settingsPresenterSpy, never()).setRuleSettings(eq(settingsSpy));
-    }
-
-    @Test
-    public void updateSettingsDataDMN() {
-        settingsSpy.setType(ScenarioSimulationModel.Type.DMN);
-        when(dmnSettingsStyleMock.getDisplay()).thenReturn(Style.Display.INLINE.getCssName());
-        settingsPresenterSpy.updateSettingsData(settingsSpy);
-        verify(settingsPresenterSpy, times(1)).setDMNSettings(eq(settingsSpy));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void updateSettingsDataDMNWrongState() {
-        settingsSpy.setType(ScenarioSimulationModel.Type.DMN);
-        when(dmnSettingsStyleMock.getDisplay()).thenReturn(Style.Display.NONE.getCssName());
-        settingsPresenterSpy.updateSettingsData(settingsSpy);
-        verify(settingsPresenterSpy, never()).setDMNSettings(eq(settingsSpy));
-    }
-
-    @Test
-    public void resetTest() {
-        settingsPresenterSpy.reset();
-        verify(settingsViewMock, times(1)).reset();
-        verify(settingsScenarioSimulationDropdownMock, times(1)).clear();
-    }
-
-    @Test
-    public void setDmnErrorPath() {
-        settingsPresenterSpy.setDmnErrorPath(settingsSpy.getDmnFilePath());
-        verify(dmnFilePathErrorLabelStyleMock, times(1)).setDisplay(eq(Style.Display.INLINE));
-        verify(dmnFilePathErrorLabelMock, times(1)).setInnerText(
-                eq(ScenarioSimulationEditorConstants.INSTANCE.dmnPathErrorLabel(settingsSpy.getDmnFilePath())));
-    }
-
-    @Test
-    public void validateDmnPath_Valid() {
-        settingsPresenterSpy.validateSimulation();
-        verify(settingsScenarioSimulationDropdownMock, times(2)).getValue();
-        verify(dmnFilePathErrorLabelStyleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(dmnFilePathErrorLabelMock, times(1)).setInnerText(eq(""));
-        verify(settingsPresenterSpy, times(1)).syncDmnFilePath();
-        verify(eventBusMock, times(1)).fireEvent(isA(ValidateSimulationEvent.class));
-    }
-
-    @Test
-    public void validateDmnPath_Invalid() {
-        KieAssetsDropdownItem item = new KieAssetsDropdownItem("DMNFile", "", "", null);
-        when(settingsScenarioSimulationDropdownMock.getValue()).thenReturn(Optional.of(item));
-        settingsPresenterSpy.validateSimulation();
-        verify(settingsScenarioSimulationDropdownMock, times(1)).getValue();
-        verify(dmnFilePathErrorLabelStyleMock, times(1)).setDisplay(eq(Style.Display.INLINE));
-        verify(dmnFilePathErrorLabelMock, times(1)).setInnerText(eq(ScenarioSimulationEditorConstants.INSTANCE.chooseValidDMNAsset()));
-        verify(settingsPresenterSpy, never()).syncDmnFilePath();
-        verify(eventBusMock, never()).fireEvent(isA(ValidateSimulationEvent.class));
-    }
-
-    @Test
-    public void syncDmoSessionSameValue() {
-        settingsPresenterSpy.syncDmoSession();
-        verify(eventBusMock, times(1)).fireEvent(updateSettingsDataEventArgumentCaptor.capture());
-        assertFalse(updateSettingsDataEventArgumentCaptor.getValue().getSettingsValueChanged().test(settingsSpy));
-        updateSettingsDataEventArgumentCaptor.getValue().getSettingsChangeToApply().accept(settingsSpy);
-        verify(settingsSpy, times(1)).setDmoSession(eq(DMO_SESSION));
-    }
-
-    @Test
-    public void syncDmoSessionChangedValue() {
-        InputElement inputElementMock = mock(InputElement.class);
-        when(inputElementMock.getValue()).thenReturn(DMO_SESSION + "2");
-        doReturn(inputElementMock).when(settingsViewMock).getDmoSession();
-        settingsPresenterSpy.syncDmoSession();
-        verify(eventBusMock, times(1)).fireEvent(updateSettingsDataEventArgumentCaptor.capture());
-        assertTrue(updateSettingsDataEventArgumentCaptor.getValue().getSettingsValueChanged().test(settingsSpy));
-        updateSettingsDataEventArgumentCaptor.getValue().getSettingsChangeToApply().accept(settingsSpy);
-        verify(settingsSpy, times(1)).setDmoSession(eq(DMO_SESSION + "2"));
-        assertEquals(DMO_SESSION + "2", settingsSpy.getDmoSession());
-    }
-
-    @Test
-    public void syncRuleFlowGroupSameValue() {
-        settingsPresenterSpy.syncRuleFlowGroup();
-        verify(eventBusMock, times(1)).fireEvent(updateSettingsDataEventArgumentCaptor.capture());
-        assertFalse(updateSettingsDataEventArgumentCaptor.getValue().getSettingsValueChanged().test(settingsSpy));
-        updateSettingsDataEventArgumentCaptor.getValue().getSettingsChangeToApply().accept(settingsSpy);
-        verify(settingsSpy, times(1)).setRuleFlowGroup(eq(RULE_FLOW_GROUP));
-    }
-
-    @Test
-    public void syncRuleFlowGroupChangedValue() {
-        InputElement inputElementMock = mock(InputElement.class);
-        when(inputElementMock.getValue()).thenReturn(RULE_FLOW_GROUP + "2");
-        doReturn(inputElementMock).when(settingsViewMock).getRuleFlowGroup();
-        settingsPresenterSpy.syncRuleFlowGroup();
-        verify(eventBusMock, times(1)).fireEvent(updateSettingsDataEventArgumentCaptor.capture());
-        assertTrue(updateSettingsDataEventArgumentCaptor.getValue().getSettingsValueChanged().test(settingsSpy));
-        updateSettingsDataEventArgumentCaptor.getValue().getSettingsChangeToApply().accept(settingsSpy);
-        verify(settingsSpy, times(1)).setRuleFlowGroup(eq(RULE_FLOW_GROUP + "2"));
-        assertEquals(RULE_FLOW_GROUP + "2", settingsSpy.getRuleFlowGroup());
-    }
-
-    @Test
-    public void syncStateless() {
-        settingsPresenterSpy.syncStateless();
-        verify(eventBusMock, times(1)).fireEvent(updateSettingsDataEventArgumentCaptor.capture());
-        updateSettingsDataEventArgumentCaptor.getValue().getSettingsChangeToApply().accept(settingsSpy);
-        verify(settingsSpy, times(1)).setStateless(eq(STATELESS));
-    }
-
-    @Test
-    public void syncDmnFilePathSameValue() {
-        settingsPresenterSpy.syncDmnFilePath();
-        verify(eventBusMock, times(1)).fireEvent(updateSettingsDataEventArgumentCaptor.capture());
-        assertFalse(updateSettingsDataEventArgumentCaptor.getValue().getSettingsValueChanged().test(settingsSpy));
-        updateSettingsDataEventArgumentCaptor.getValue().getSettingsChangeToApply().accept(settingsSpy);
-        verify(settingsSpy, times(1)).setDmnFilePath(eq(DMN_FILE_PATH));
-    }
-
-    @Test
-    public void syncDmnFilePathChangedValue() {
-        KieAssetsDropdownItem item = new KieAssetsDropdownItem("DMNFile", "", DMN_FILE_PATH + "2", null);
-        when(settingsScenarioSimulationDropdownMock.getValue()).thenReturn(Optional.of(item));
-        settingsPresenterSpy.syncDmnFilePath();
-        verify(eventBusMock, times(1)).fireEvent(updateSettingsDataEventArgumentCaptor.capture());
-        assertTrue(updateSettingsDataEventArgumentCaptor.getValue().getSettingsValueChanged().test(settingsSpy));
-        updateSettingsDataEventArgumentCaptor.getValue().getSettingsChangeToApply().accept(settingsSpy);
-        verify(settingsSpy, times(1)).setDmnFilePath(eq(DMN_FILE_PATH + "2"));
-        assertEquals(DMN_FILE_PATH + "2", settingsSpy.getDmnFilePath());
-    }
-
-    @Test
-    public void syncSkipFromBuild() {
-        settingsPresenterSpy.syncSkipFromBuild();
-        verify(eventBusMock, times(1)).fireEvent(updateSettingsDataEventArgumentCaptor.capture());
-        updateSettingsDataEventArgumentCaptor.getValue().getSettingsChangeToApply().accept(settingsSpy);
-        verify(settingsSpy, times(1)).setSkipFromBuild(eq(SKIP_FROM_BUILD));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsViewImplTest.java
deleted file mode 100644
index 7d8d2ee..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/SettingsViewImplTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.event.dom.client.BlurEvent;
-import com.google.gwt.event.dom.client.ChangeEvent;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsViewImpl.DMN_MODEL_LABEL;
-import static org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsViewImpl.DMN_NAMESPACE_LABEL;
-import static org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsViewImpl.DMN_NAME_LABEL;
-import static org.drools.workbench.screens.scenariosimulation.client.rightpanel.SettingsViewImpl.STATELESS_LABEL;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class SettingsViewImplTest extends AbstractSettingsTest {
-
-    private SettingsViewImpl settingsViewSpy;
-
-    @Mock
-    private ChangeEvent changeEventMock;
-
-    @Mock
-    private BlurEvent blurEventMock;
-
-    @Mock
-    private SettingsPresenter settingsPresenterMock;
-
-    @Before
-    public void setup() {
-        super.setup();
-        this.settingsViewSpy = spy(new SettingsViewImpl() {
-            {
-                this.kieSettingsContent = kieSettingsContentMock;
-                this.nameLabel = nameLabelMock;
-                this.fileName = fileNameMock;
-                this.typeLabel = typeLabelMock;
-                this.scenarioType = scenarioTypeMock;
-                this.ruleSettings = ruleSettingsMock;
-                this.dmoSession = dmoSessionMock;
-                this.ruleFlowGroup = ruleFlowGroupMock;
-                this.dmnSettings = dmnSettingsMock;
-                this.dmnFileLabel = dmnModelLabelMock;
-                this.dmnFilePathPlaceholder = dmnFilePathPlaceholderMock;
-                this.dmnFilePathErrorLabel = dmnFilePathErrorLabelMock;
-                this.dmnNamespaceLabel = dmnNamespaceLabelMock;
-                this.dmnNamespace = dmnNamespaceMock;
-                this.dmnNameLabel = dmnNameLabelMock;
-                this.dmnName = dmnNameMock;
-                this.skipFromBuild = skipFromBuildMock;
-                this.stateless = statelessMock;
-                this.statelessLabel = statelessLabelMock;
-            }
-        });
-        settingsViewSpy.init(settingsPresenterMock);
-    }
-
-    @Test
-    public void init() {
-        settingsViewSpy.init(settingsPresenterMock);
-        assertEquals(settingsPresenterMock, settingsViewSpy.presenter);
-        nameLabelMock.setInnerText(eq(ScenarioSimulationEditorConstants.INSTANCE.name()));
-        typeLabelMock.setInnerText(eq(ScenarioSimulationEditorConstants.INSTANCE.type()));
-        statelessLabelMock.setInnerText(eq(STATELESS_LABEL));
-        dmnModelLabelMock.setInnerText(eq(DMN_MODEL_LABEL));
-        dmnNamespaceLabelMock.setInnerText(eq(DMN_NAMESPACE_LABEL));
-        dmnNameLabelMock.setInnerText(eq(DMN_NAME_LABEL));
-    }
-
-    @Test
-    public void resetTest() {
-        settingsViewSpy.reset();
-        verify(scenarioTypeMock, times(1)).setInnerText(eq(""));
-        verify(fileNameMock, times(1)).setValue(eq(""));
-        verify(dmnNameMock, times(1)).setValue(eq(""));
-        verify(dmnNamespaceMock, times(1)).setValue(eq(""));
-        verify(dmnFilePathErrorLabelStyleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(dmnFilePathErrorLabelMock, times(1)).setInnerText(eq(""));
-        verify(skipFromBuildMock, times(1)).setChecked(eq(false));
-        verify(statelessMock, times(1)).setChecked(eq(false));
-        verify(ruleSettingsStyleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(dmnSettingsStyleMock, times(1)).setDisplay(eq(Style.Display.NONE));
-    }
-
-    @Test
-    public void syncDmoSession() {
-        settingsViewSpy.syncDmoSession(blurEventMock);
-        verify(settingsPresenterMock, times(1)).syncDmoSession();
-    }
-
-    @Test
-    public void syncRuleFlowGroup() {
-        settingsViewSpy.syncRuleFlowGroup(blurEventMock);
-        verify(settingsPresenterMock, times(1)).syncRuleFlowGroup();
-    }
-
-    @Test
-    public void syncStateless() {
-        settingsViewSpy.syncStateless(changeEventMock);
-        verify(settingsPresenterMock, times(1)).syncStateless();
-    }
-
-    @Test
-    public void syncSkipFromBuild() {
-        settingsViewSpy.syncSkipFromBuild(changeEventMock);
-        verify(settingsPresenterMock, times(1)).syncSkipFromBuild();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsPresenterTest.java
deleted file mode 100644
index 79ec749..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsPresenterTest.java
+++ /dev/null
@@ -1,671 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetInstanceHeaderEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.SetPropertyHeaderEvent;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static junit.framework.TestCase.assertNull;
-import static junit.framework.TestCase.assertTrue;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_NAME_2;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FACT_PACKAGE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.FILTER_TERM;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.PROPERTY_NAME;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyObject;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class TestToolsPresenterTest extends AbstractTestToolsTest {
-
-    @Mock
-    private TestToolsView testToolsViewMock;
-
-    @Mock
-    private DivElement divItemContainerMock;
-
-    @Mock
-    private ListGroupItemPresenter listGroupItemPresenterMock;
-
-    @Mock
-    private ListGroupItemView selectedListGroupItemViewMock;
-
-    @Mock
-    private FieldItemView selectedFieldItemViewMock;
-
-    @Mock
-    private EventBus eventBusMock;
-
-    private TestToolsPresenter testToolsPresenterSpy;
-
-    @Before
-    public void setup() {
-        super.setup();
-        final String firstKey = dataObjectFactTreeMap.firstKey();
-        final FactModelTree factModelTree = dataObjectFactTreeMap.get(firstKey);
-        final String firstPropertyKey = (String) new ArrayList(factModelTree.getSimpleProperties().keySet()).get(0);
-        final FactModelTree.PropertyTypeName firstPropertyClass = factModelTree.getSimpleProperties().get(firstPropertyKey);
-
-        when(selectedListGroupItemViewMock.getActualClassName()).thenReturn(firstKey);
-
-        when(selectedFieldItemViewMock.getFullPath()).thenReturn(Arrays.asList(firstKey));
-        when(selectedFieldItemViewMock.getFieldName()).thenReturn(firstPropertyKey);
-        when(selectedFieldItemViewMock.getClassName()).thenReturn(firstPropertyClass.getTypeName());
-
-        when(listGroupItemPresenterMock.getDivElement(FACT_NAME, FACT_MODEL_TREE)).thenReturn(divItemContainerMock);
-        this.testToolsPresenterSpy = spy(new TestToolsPresenter(testToolsViewMock, listGroupItemPresenterMock) {
-            {
-                this.dataObjectFieldsMap = dataObjectFactTreeMap;
-                this.simpleJavaTypeFieldsMap = simpleJavaTypeTreeMap;
-                this.instanceFieldsMap = instanceFactTreeMap;
-                this.simpleJavaInstanceFieldsMap = simpleJavaInstanceFactTreeMap;
-                this.eventBus = eventBusMock;
-            }
-        });
-    }
-
-    @Test
-    public void onSetup() {
-        testToolsPresenterSpy.setup();
-        verify(testToolsViewMock, times(1)).init(testToolsPresenterSpy);
-    }
-
-    @Test
-    public void getTitle() {
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.testTools(), testToolsPresenterSpy.getTitle());
-    }
-
-    @Test
-    public void onClearSearch() {
-        testToolsPresenterSpy.onClearSearch();
-        verify(testToolsViewMock, times(1)).clearInputSearch();
-        verify(testToolsViewMock, times(1)).hideClearButton();
-        verify(testToolsPresenterSpy, times(1)).onSearchedEvent(eq(""));
-    }
-
-    @Test
-    public void onUndoSearch() {
-        when(listGroupItemPresenterMock.getFilterTerm()).thenReturn(FILTER_TERM);
-        testToolsPresenterSpy.onUndoSearch();
-        verify(testToolsViewMock, times(1)).clearInputSearch();
-        verify(testToolsViewMock, times(1)).hideClearButton();
-        verify(listGroupItemPresenterMock, times(1)).getFilterTerm();
-        verify(testToolsPresenterSpy, times(1)).onPerfectMatchSearchedEvent(eq(FILTER_TERM), eq(true));
-    }
-
-    @Test
-    public void onClearStatus() {
-        testToolsPresenterSpy.onClearStatus();
-        verify(testToolsPresenterSpy, times(1)).onClearSearch();
-        verify(testToolsPresenterSpy, times(1)).clearDataObjectList();
-    }
-
-    @Test
-    public void clearDataObjectList() {
-        testToolsPresenterSpy.clearDataObjectList();
-        verify(testToolsViewMock, times(1)).clearDataObjectList();
-    }
-
-    @Test
-    public void clearSimpleJavaTypeList() {
-        testToolsPresenterSpy.clearSimpleJavaTypeList();
-        verify(testToolsViewMock, times(1)).clearSimpleJavaTypeList();
-    }
-
-    @Test
-    public void clearInstanceList() {
-        testToolsPresenterSpy.clearInstanceList();
-        verify(testToolsViewMock, times(1)).clearInstanceList();
-    }
-
-    @Test
-    public void clearSimpleJavaInstanceFieldList() {
-        testToolsPresenterSpy.clearSimpleJavaInstanceFieldList();
-        verify(testToolsViewMock, times(1)).clearSimpleJavaInstanceFieldList();
-    }
-
-   @Test
-    public void updateInstanceListSeparatorNotEmptySIMULATION() {
-        testToolsPresenterSpy.gridWidget = GridWidget.SIMULATION;
-        testToolsPresenterSpy.updateInstanceListSeparator();
-        verify(testToolsViewMock, times(1)).updateInstanceListSeparator(eq(true));
-    }
-
-    @Test
-    public void updateInstanceListSeparatorNotEmptyBACKGROUND() {
-        testToolsPresenterSpy.gridWidget = GridWidget.BACKGROUND;
-        testToolsPresenterSpy.updateInstanceListSeparator();
-        verify(testToolsViewMock, times(1)).updateInstanceListSeparator(eq(false));
-    }
-
-    @Test
-    public void updateInstanceListSeparatorEmpty() {
-        testToolsPresenterSpy.updateInstanceListSeparator();
-        verify(testToolsViewMock, times(1)).updateInstanceListSeparator(eq(false));
-    }
-
-    @Test
-    public void showInstanceListContainerSeparator() {
-        testToolsPresenterSpy.showInstanceListContainerSeparator(true);
-        verify(testToolsViewMock, times(1)).showInstanceListContainerSeparator(eq(true));
-    }
-
-    @Test
-    public void getFactModelTree() {
-        testToolsPresenterSpy.setDataObjectFieldsMap(dataObjectFactTreeMap);
-        String factName = getRandomFactModelTree(dataObjectFactTreeMap, 0);
-        Optional<FactModelTree> retrieved = testToolsPresenterSpy.getFactModelTreeFromFactTypeMap(factName);
-        assertNotNull(retrieved);
-        assertTrue(retrieved.isPresent());
-        assertEquals(dataObjectFactTreeMap.get(factName), retrieved.get());
-    }
-
-    @Test
-    public void setFactTypeFieldsMap() {
-        testToolsPresenterSpy.setDataObjectFieldsMap(dataObjectFactTreeMap);
-        verify(testToolsPresenterSpy, times(dataObjectFactTreeMap.size())).addDataObjectListGroupItemView(anyString(), anyObject());
-    }
-
-    @Test
-    public void onShowClearButton() {
-        testToolsPresenterSpy.onShowClearButton();
-        verify(testToolsViewMock, times(1)).showClearButton();
-    }
-
-    @Test
-    public void populateTestTools() {
-        SortedMap<String, FactModelTree> dataObjects = new TreeMap<>();
-        SortedMap<String, FactModelTree> simpleJava = new TreeMap<>();
-        SortedMap<String, FactModelTree> instanceField = new TreeMap<>();
-        SortedMap<String, FactModelTree> simpleJavaInstance = new TreeMap<>();
-        SortedMap<String, FactModelTree> hiddenFields = new TreeMap<>();
-        Map<String, List<List<String>>> hideProperties = new HashMap<>();
-        TestToolsPresenterData data = new TestToolsPresenterData(dataObjects,
-                                                                 simpleJava,
-                                                                 instanceField,
-                                                                 simpleJavaInstance,
-                                                                 hiddenFields,
-                                                                 hideProperties,
-                                                                 GridWidget.SIMULATION);
-        testToolsPresenterSpy.populateTestTools(data);
-        verify(testToolsPresenterSpy, times(1)).setDataObjectFieldsMap(eq(dataObjects));
-        verify(testToolsPresenterSpy, times(1)).setSimpleJavaTypeFieldsMap(eq(simpleJava));
-        verify(testToolsPresenterSpy, times(1)).setInstanceFieldsMap(eq(instanceField));
-        verify(testToolsPresenterSpy, times(1)).setSimpleJavaInstanceFieldsMap(eq(simpleJavaInstance));
-        verify(testToolsPresenterSpy, times(1)).setHiddenFieldsMap(eq(hiddenFields));
-        verify(testToolsPresenterSpy, times(1)).hideProperties(eq(hideProperties));
-        verify(testToolsPresenterSpy, times(1)).setGridWidget(eq(GridWidget.SIMULATION));
-    }
-
-    @Test
-    public void setEventBus() {
-        testToolsPresenterSpy.setEventBus(eventBusMock);
-        assertEquals(eventBusMock, testToolsPresenterSpy.eventBus);
-    }
-
-    @Test
-    public void setGridWidgetSIMULATION() {
-        testToolsPresenterSpy.setGridWidget(GridWidget.SIMULATION);
-        verify(testToolsPresenterSpy, never()).hideInstances();
-    }
-
-    @Test
-    public void setGridWidgetBACKGROUND() {
-        testToolsPresenterSpy.setGridWidget(GridWidget.BACKGROUND);
-        verify(testToolsPresenterSpy, times(1)).hideInstances();
-    }
-
-    @Test
-    public void onSearchedEvent() {
-        String searched = "";
-        testToolsPresenterSpy.onSearchedEvent(searched);
-        verify(testToolsPresenterSpy, times(1)).clearLists();
-        testToolsPresenterSpy.dataObjectFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getKey().toLowerCase().contains(searched))
-                .forEach(filteredEntry -> verify(testToolsPresenterSpy, times(1)).addDataObjectListGroupItemView(eq(filteredEntry.getKey()), eq(filteredEntry.getValue())));
-        testToolsPresenterSpy.simpleJavaTypeFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getKey().toLowerCase().contains(searched))
-                .forEach(filteredEntry -> verify(testToolsPresenterSpy, times(1)).addSimpleJavaTypeListGroupItemView(eq(filteredEntry.getKey()), eq(filteredEntry.getValue())));
-        testToolsPresenterSpy.instanceFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getKey().toLowerCase().contains(searched))
-                .forEach(filteredEntry -> verify(testToolsPresenterSpy, times(1)).addInstanceListGroupItemView(eq(filteredEntry.getKey()), eq(filteredEntry.getValue())));
-        testToolsPresenterSpy.simpleJavaInstanceFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getKey().toLowerCase().contains(searched))
-                .forEach(filteredEntry -> verify(testToolsPresenterSpy, times(1)).addSimpleJavaInstanceListGroupItemView(eq(filteredEntry.getKey()), eq(filteredEntry.getValue())));
-        verify(testToolsPresenterSpy, times(1)).updateInstanceListSeparator();
-    }
-
-    @Test
-    public void onPerfectMatchSearchedEventNotEquals() {
-        String search = "";
-        testToolsPresenterSpy.onPerfectMatchSearchedEvent(search, true);
-        verify(testToolsPresenterSpy, times(1)).clearLists();
-        testToolsPresenterSpy.dataObjectFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> testToolsPresenterSpy.filterTerm(entry.getKey(), search, true))
-                .forEach(filteredEntry -> verify(testToolsPresenterSpy, times(1)).addDataObjectListGroupItemView(eq(filteredEntry.getKey()), eq(filteredEntry.getValue())));
-        testToolsPresenterSpy.simpleJavaTypeFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> testToolsPresenterSpy.filterTerm(entry.getKey(), search, true))
-                .forEach(filteredEntry -> verify(testToolsPresenterSpy, times(1)).addSimpleJavaTypeListGroupItemView(eq(filteredEntry.getKey()), eq(filteredEntry.getValue())));
-        testToolsPresenterSpy.instanceFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> testToolsPresenterSpy.filterTerm(entry.getKey(), search, true))
-                .forEach(filteredEntry -> verify(testToolsPresenterSpy, times(1)).addInstanceListGroupItemView(eq(filteredEntry.getKey()), eq(filteredEntry.getValue())));
-        testToolsPresenterSpy.simpleJavaInstanceFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> testToolsPresenterSpy.filterTerm(entry.getKey(), search, true))
-                .forEach(filteredEntry -> verify(testToolsPresenterSpy, times(1)).addSimpleJavaInstanceListGroupItemView(eq(filteredEntry.getKey()), eq(filteredEntry.getValue())));
-        verify(testToolsPresenterSpy, times(1)).updateInstanceListSeparator();
-    }
-
-    @Test
-    public void onPerfectMatchSearchedEventEquals() {
-        String search = "";
-        testToolsPresenterSpy.onPerfectMatchSearchedEvent(search, false);
-        verify(testToolsPresenterSpy, times(1)).clearLists();
-        testToolsPresenterSpy.dataObjectFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> testToolsPresenterSpy.filterTerm(entry.getKey(), search, false))
-                .forEach(filteredEntry -> verify(testToolsPresenterSpy, times(1)).addDataObjectListGroupItemView(eq(filteredEntry.getKey()), eq(filteredEntry.getValue())));
-        testToolsPresenterSpy.simpleJavaTypeFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> testToolsPresenterSpy.filterTerm(entry.getKey(), search, false))
-                .forEach(filteredEntry -> verify(testToolsPresenterSpy, times(1)).addSimpleJavaTypeListGroupItemView(eq(filteredEntry.getKey()), eq(filteredEntry.getValue())));
-        testToolsPresenterSpy.instanceFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> testToolsPresenterSpy.filterTerm(entry.getKey(), search, false))
-                .forEach(filteredEntry -> verify(testToolsPresenterSpy, times(1)).addInstanceListGroupItemView(eq(filteredEntry.getKey()), eq(filteredEntry.getValue())));
-        testToolsPresenterSpy.simpleJavaInstanceFieldsMap
-                .entrySet()
-                .stream()
-                .filter(entry -> testToolsPresenterSpy.filterTerm(entry.getKey(), search, false))
-                .forEach(filteredEntry -> verify(testToolsPresenterSpy, times(1)).addSimpleJavaInstanceListGroupItemView(eq(filteredEntry.getKey()), eq(filteredEntry.getValue())));
-        verify(testToolsPresenterSpy, times(1)).updateInstanceListSeparator();
-    }
-
-    @Test
-    public void addListGroupItemView() {
-        testToolsPresenterSpy.addDataObjectListGroupItemView(FACT_NAME, FACT_MODEL_TREE);
-        verify(testToolsViewMock, times(1)).addDataObjectListGroupItem(eq(divItemContainerMock));
-    }
-
-    @Test
-    public void addInstanceListGroupItemView() {
-        testToolsPresenterSpy.addInstanceListGroupItemView(FACT_NAME, FACT_MODEL_TREE);
-        verify(testToolsViewMock, times(1)).addInstanceListGroupItem(eq(divItemContainerMock));
-    }
-
-    @Test
-    public void addSimpleJavaTypeListGroupItemView() {
-        testToolsPresenterSpy.addSimpleJavaTypeListGroupItemView(FACT_NAME, FACT_MODEL_TREE);
-        verify(testToolsViewMock, times(1)).addSimpleJavaTypeListGroupItem(eq(divItemContainerMock));
-    }
-
-    @Test
-    public void addSimpleJavaInstanceListGroupItemView() {
-        testToolsPresenterSpy.addSimpleJavaInstanceListGroupItemView(FACT_NAME, FACT_MODEL_TREE);
-        verify(testToolsViewMock, times(1)).addSimpleJavaInstanceListGroupItem(eq(divItemContainerMock));
-    }
-
-    @Test
-    public void onEnableEditorTabWithoutFactName() {
-        testToolsPresenterSpy.onEnableEditorTab();
-        verify(testToolsPresenterSpy, times(1)).onDisableEditorTab();
-        verify(testToolsPresenterSpy, times(1)).onSearchedEvent(eq(""));
-        verify(listGroupItemPresenterMock, times(1)).enable();
-        verify(listGroupItemPresenterMock, never()).enable(anyString());
-        verify(testToolsViewMock, times(1)).enableEditorTab();
-        verify(testToolsViewMock, times(1)).enableSearch();
-    }
-
-    @Test
-    public void onEnableEditorTabWithFactName_NotEqualsSearch() {
-        testToolsPresenterSpy.onEnableEditorTab(FACT_NAME, null, false);
-        verify(testToolsPresenterSpy, times(1)).onDisableEditorTab();
-        verify(testToolsPresenterSpy, times(1)).onPerfectMatchSearchedEvent(eq(FACT_NAME), eq(false));
-        verify(testToolsPresenterSpy, times(1)).updateInstanceIsAssignedStatus(eq(FACT_NAME));
-        verify(testToolsViewMock, never()).enableSearch();
-        verify(listGroupItemPresenterMock, times(1)).enable(eq(FACT_NAME));
-        verify(listGroupItemPresenterMock, never()).enable();
-        verify(testToolsViewMock, times(1)).enableEditorTab();
-        verify(listGroupItemPresenterMock, never()).selectProperty(anyString(), any());
-    }
-
-    @Test
-    public void onEnableEditorTabWithFactName_EqualSearch() {
-        testToolsPresenterSpy.onEnableEditorTab(FACT_NAME, null, true);
-        verify(testToolsPresenterSpy, times(1)).onDisableEditorTab();
-        verify(testToolsPresenterSpy, times(1)).onPerfectMatchSearchedEvent(eq(FACT_NAME), eq(true));
-        verify(testToolsPresenterSpy, never()).updateInstanceIsAssignedStatus(anyString());
-        verify(testToolsViewMock, times(1)).enableSearch();
-        verify(listGroupItemPresenterMock, times(1)).enable(eq(FACT_NAME));
-        verify(listGroupItemPresenterMock, never()).enable();
-        verify(testToolsViewMock, times(1)).enableEditorTab();
-        verify(listGroupItemPresenterMock, never()).selectProperty(anyString(), any());
-    }
-
-    @Test
-    public void onEnableEditorTabWithProperties() {
-        List<String> propertiesName = Arrays.asList("property1", "property2");
-        testToolsPresenterSpy.onEnableEditorTab(FACT_NAME, propertiesName, false);
-        verify(testToolsPresenterSpy, times(1)).onDisableEditorTab();
-        verify(testToolsPresenterSpy, times(1)).onPerfectMatchSearchedEvent(eq(FACT_NAME), eq(false));
-        verify(listGroupItemPresenterMock, times(1)).enable(eq(FACT_NAME));
-        verify(listGroupItemPresenterMock, never()).enable();
-        verify(testToolsViewMock, never()).disableSearch();
-        verify(testToolsViewMock, times(1)).enableEditorTab();
-        verify(listGroupItemPresenterMock, times(1)).selectProperty(eq(FACT_NAME), eq(propertiesName));
-    }
-
-    @Test
-    public void onDisableEditorTab() {
-        testToolsPresenterSpy.onDisableEditorTab();
-        verify(listGroupItemPresenterMock, times(1)).disable();
-        verify(listGroupItemPresenterMock, never()).enable();
-        verify(testToolsViewMock, times(1)).disableEditorTab();
-    }
-
-    @Test
-    public void setSelectedElement_InstanceAssigned() {
-        when(selectedListGroupItemViewMock.getFactName()).thenReturn(FACT_NAME);
-        when(listGroupItemPresenterMock.getFilterTerm()).thenReturn(FILTER_TERM);
-        testToolsPresenterSpy.setSelectedElement(selectedListGroupItemViewMock);
-        verify(testToolsPresenterSpy, times(1)).filterTerm(eq(FACT_NAME), eq(FILTER_TERM), eq(false));
-        verify(testToolsViewMock, times(1)).disableAddButton();
-        assertNull(testToolsPresenterSpy.selectedFieldItemView);
-        assertEquals(selectedListGroupItemViewMock, testToolsPresenterSpy.selectedListGroupItemView);
-    }
-
-    @Test
-    public void setSelectedElement_InstanceNotAssigned() {
-        when(selectedListGroupItemViewMock.getFactName()).thenReturn(FACT_NAME_2);
-        when(listGroupItemPresenterMock.getFilterTerm()).thenReturn(FILTER_TERM);
-        testToolsPresenterSpy.setSelectedElement(selectedListGroupItemViewMock);
-        verify(testToolsPresenterSpy, times(1)).filterTerm(eq(FACT_NAME_2), eq(FILTER_TERM), eq(false));
-        verify(testToolsViewMock, times(1)).enableAddButton();
-        assertNull(testToolsPresenterSpy.selectedFieldItemView);
-        assertEquals(selectedListGroupItemViewMock, testToolsPresenterSpy.selectedListGroupItemView);
-    }
-
-    @Test
-    public void setSelectedElementProperty_InstanceAssigned() {
-        when(selectedFieldItemViewMock.isCheckShown()).thenReturn(true);
-        when(listGroupItemPresenterMock.isInstanceAssigned(FACT_NAME)).thenReturn(true);
-        when(selectedFieldItemViewMock.getFullPath()).thenReturn(Arrays.asList(FACT_NAME));
-        when(listGroupItemPresenterMock.getFilterTerm()).thenReturn(FILTER_TERM);
-        testToolsPresenterSpy.setSelectedElement(selectedFieldItemViewMock);
-        verify(listGroupItemPresenterMock, times(1)).isInstanceAssigned(eq(FACT_NAME));
-        verify(testToolsPresenterSpy, times(1)).filterTerm(eq(FACT_NAME), eq(FILTER_TERM), eq(true));
-        verify(testToolsViewMock, times(1)).enableAddButton();
-        assertNull(testToolsPresenterSpy.selectedListGroupItemView);
-        assertEquals(selectedFieldItemViewMock, testToolsPresenterSpy.selectedFieldItemView);
-    }
-
-    @Test
-    public void setSelectedElementProperty_CheckNotShown() {
-        when(selectedFieldItemViewMock.isCheckShown()).thenReturn(false);
-        when(listGroupItemPresenterMock.isInstanceAssigned(FACT_NAME)).thenReturn(true);
-        when(selectedFieldItemViewMock.getFullPath()).thenReturn(Arrays.asList(FACT_NAME));
-        when(listGroupItemPresenterMock.getFilterTerm()).thenReturn(FILTER_TERM);
-        testToolsPresenterSpy.setSelectedElement(selectedFieldItemViewMock);
-        verify(listGroupItemPresenterMock, times(1)).isInstanceAssigned(eq(FACT_NAME));
-        verify(testToolsPresenterSpy, never()).filterTerm(anyString(), anyString(), anyBoolean());
-        verify(testToolsViewMock, times(1)).disableAddButton();
-        assertNull(testToolsPresenterSpy.selectedListGroupItemView);
-        assertEquals(selectedFieldItemViewMock, testToolsPresenterSpy.selectedFieldItemView);
-    }
-
-    @Test
-    public void setSelectedElementProperty_InstanceNotAssignedFactNameAlreadyAssigned() {
-        when(selectedFieldItemViewMock.isCheckShown()).thenReturn(true);
-        when(listGroupItemPresenterMock.isInstanceAssigned(FACT_NAME)).thenReturn(false);
-        when(selectedFieldItemViewMock.getFullPath()).thenReturn(Arrays.asList(FACT_NAME));
-        when(listGroupItemPresenterMock.getFilterTerm()).thenReturn(FILTER_TERM);
-        testToolsPresenterSpy.setSelectedElement(selectedFieldItemViewMock);
-        verify(listGroupItemPresenterMock, times(1)).isInstanceAssigned(eq(FACT_NAME));
-        verify(testToolsPresenterSpy, times(1)).filterTerm(eq(FACT_NAME), eq(FILTER_TERM), eq(false));
-        verify(testToolsViewMock, times(1)).disableAddButton();
-        assertNull(testToolsPresenterSpy.selectedListGroupItemView);
-        assertEquals(selectedFieldItemViewMock, testToolsPresenterSpy.selectedFieldItemView);
-    }
-
-    @Test
-    public void setSelectedElementProperty_InstanceNotAssignedFactNameAlreadyAssigned_NestedProperties() {
-        when(selectedFieldItemViewMock.isCheckShown()).thenReturn(true);
-        when(listGroupItemPresenterMock.isInstanceAssigned(FACT_NAME)).thenReturn(false);
-        when(selectedFieldItemViewMock.getFullPath()).thenReturn(Arrays.asList(FACT_NAME, PROPERTY_NAME));
-        when(listGroupItemPresenterMock.getFilterTerm()).thenReturn(FILTER_TERM);
-        testToolsPresenterSpy.setSelectedElement(selectedFieldItemViewMock);
-        verify(listGroupItemPresenterMock, times(1)).isInstanceAssigned(eq(FACT_NAME));
-        verify(testToolsPresenterSpy, times(1)).filterTerm(eq(FACT_NAME), eq(FILTER_TERM), eq(false));
-        verify(testToolsViewMock, times(1)).disableAddButton();
-        assertNull(testToolsPresenterSpy.selectedListGroupItemView);
-        assertEquals(selectedFieldItemViewMock, testToolsPresenterSpy.selectedFieldItemView);
-    }
-
-    @Test
-    public void setSelectedElementProperty_InstanceNotAssignedFactNameNotAssigned() {
-        when(selectedFieldItemViewMock.isCheckShown()).thenReturn(true);
-        when(listGroupItemPresenterMock.isInstanceAssigned(FACT_NAME_2)).thenReturn(false);
-        when(selectedFieldItemViewMock.getFullPath()).thenReturn(Arrays.asList(FACT_NAME_2));
-        when(listGroupItemPresenterMock.getFilterTerm()).thenReturn(FILTER_TERM);
-        testToolsPresenterSpy.setSelectedElement(selectedFieldItemViewMock);
-        verify(listGroupItemPresenterMock, times(1)).isInstanceAssigned(eq(FACT_NAME_2));
-        verify(testToolsPresenterSpy, times(1)).filterTerm(eq(FACT_NAME_2), eq(FILTER_TERM), eq(false));
-        verify(testToolsViewMock, times(1)).enableAddButton();
-        assertNull(testToolsPresenterSpy.selectedListGroupItemView);
-        assertEquals(selectedFieldItemViewMock, testToolsPresenterSpy.selectedFieldItemView);
-    }
-
-    @Test
-    public void onModifyColumn_NoSelection() {
-        testToolsPresenterSpy.editingColumnEnabled = true;
-        testToolsPresenterSpy.selectedFieldItemView = null;
-        testToolsPresenterSpy.selectedListGroupItemView = null;
-        testToolsPresenterSpy.onModifyColumn();
-        verify(selectedListGroupItemViewMock, never()).getActualClassName();
-        verify(selectedFieldItemViewMock, never()).getFullPath();
-        verify(selectedFieldItemViewMock, never()).getFieldName();
-        verify(selectedFieldItemViewMock, never()).getClassName();
-        verify(eventBusMock, never()).fireEvent(isA(SetInstanceHeaderEvent.class));
-        verify(eventBusMock, never()).fireEvent(isA(SetPropertyHeaderEvent.class));
-    }
-
-    @Test
-    public void onModifyColumn_FieldItemSelected() {
-        testToolsPresenterSpy.editingColumnEnabled = true;
-        testToolsPresenterSpy.selectedListGroupItemView = null;
-        testToolsPresenterSpy.selectedFieldItemView = selectedFieldItemViewMock;
-        testToolsPresenterSpy.onModifyColumn();
-        verify(selectedListGroupItemViewMock, never()).getActualClassName();
-        verify(selectedFieldItemViewMock, times(2)).getFullPath();
-        verify(selectedFieldItemViewMock, times(1)).getFieldName();
-        verify(selectedFieldItemViewMock, times(1)).getClassName();
-        verify(eventBusMock, times(1)).fireEvent(isA(SetPropertyHeaderEvent.class));
-        verify(eventBusMock, never()).fireEvent(isA(SetInstanceHeaderEvent.class));
-    }
-
-    @Test
-    public void onModifyColumn_ListGroupSelected() {
-        testToolsPresenterSpy.editingColumnEnabled = true;
-        testToolsPresenterSpy.selectedListGroupItemView = selectedListGroupItemViewMock;
-        testToolsPresenterSpy.selectedFieldItemView = null;
-        testToolsPresenterSpy.onModifyColumn();
-        verify(selectedListGroupItemViewMock, times(1)).getActualClassName();
-        verify(selectedFieldItemViewMock, never()).getFullPath();
-        verify(selectedFieldItemViewMock, never()).getFieldName();
-        verify(selectedFieldItemViewMock, never()).getClassName();
-        verify(eventBusMock, times(1)).fireEvent(isA(SetPropertyHeaderEvent.class));
-        verify(eventBusMock, never()).fireEvent(isA(SetInstanceHeaderEvent.class));
-    }
-
-    @Test
-    public void clearLists() {
-        testToolsPresenterSpy.clearLists();
-        verify(testToolsPresenterSpy, times(1)).clearDataObjectList();
-        verify(testToolsPresenterSpy, times(1)).clearSimpleJavaTypeList();
-        verify(testToolsPresenterSpy, times(1)).clearInstanceList();
-        verify(testToolsPresenterSpy, times(1)).clearSimpleJavaInstanceFieldList();
-    }
-
-    @Test
-    public void filterTerm() {
-        String key = getRandomString();
-        String search = String.join(";", IntStream.range(0, 4)
-                .mapToObj(i -> getRandomString())
-                .collect(Collectors.toSet()));
-        assertTrue(testToolsPresenterSpy.filterTerm(key, key, false));
-        assertFalse(testToolsPresenterSpy.filterTerm(key, key, true));
-
-        assertFalse(testToolsPresenterSpy.filterTerm(key, search, false));
-        assertTrue(testToolsPresenterSpy.filterTerm(key, search, true));
-
-        search += ";" + key;
-        assertTrue(testToolsPresenterSpy.filterTerm(key, search, false));
-        assertFalse(testToolsPresenterSpy.filterTerm(key, search, true));
-    }
-
-    @Test
-    public void resetTest() {
-        testToolsPresenterSpy.reset();
-        verify(testToolsViewMock, times(1)).reset();
-        verify(listGroupItemPresenterMock, times(1)).reset();
-        verify(testToolsPresenterSpy, times(1)).clearFieldsMaps();
-    }
-
-    @Test
-    public void clearFieldsMaps() {
-        testToolsPresenterSpy.setDataObjectFieldsMap(getDataObjectFactTreeMap());
-        testToolsPresenterSpy.setSimpleJavaTypeFieldsMap(getSimpleJavaTypeFieldsMap());
-        testToolsPresenterSpy.setInstanceFieldsMap(getDataObjectFactTreeMap());
-        testToolsPresenterSpy.setSimpleJavaInstanceFieldsMap(getSimpleJavaTypeFieldsMap());
-        testToolsPresenterSpy.clearFieldsMaps();
-        assertTrue(testToolsPresenterSpy.dataObjectFieldsMap.isEmpty());
-        assertTrue(testToolsPresenterSpy.simpleJavaTypeFieldsMap.isEmpty());
-        assertTrue(testToolsPresenterSpy.instanceFieldsMap.isEmpty());
-        assertTrue(testToolsPresenterSpy.simpleJavaInstanceFieldsMap.isEmpty());
-        assertTrue(testToolsPresenterSpy.hiddenFieldsMap.isEmpty());
-    }
-
-    @Test
-    public void updateInstanceIsAssignedStatus_NotPresent() {
-        String instance = "CHECK_INSTANCE";
-        testToolsPresenterSpy.updateInstanceIsAssignedStatus(instance);
-        verify(listGroupItemPresenterMock, times(1)).setInstanceAssigned(eq(instance), eq(false));
-    }
-
-    @Test
-    public void updateInstanceIsAssignedStatus_Present() {
-        String instance = "CHECK_INSTANCE";
-        FactModelTree factModel = new FactModelTree(instance, FACT_PACKAGE, getMockSimpleProperties(), new HashMap<>());
-        dataObjectFactTreeMap.put(instance, factModel);
-        testToolsPresenterSpy.updateInstanceIsAssignedStatus(instance);
-        verify(listGroupItemPresenterMock, times(1)).setInstanceAssigned(eq(instance), eq(true));
-    }
-
-    @Test
-    public void updateInstanceIsAssignedStatus_EmptyString() {
-        String instance = "";
-        testToolsPresenterSpy.updateInstanceIsAssignedStatus(instance);
-        verify(listGroupItemPresenterMock, never()).setInstanceAssigned(anyString(), anyBoolean());
-    }
-
-    @Test
-    public void hideInstances() {
-        testToolsPresenterSpy.hideInstances();
-        verify(testToolsPresenterSpy, times(1)).clearInstanceList();
-        verify(testToolsPresenterSpy, times(1)).clearSimpleJavaInstanceFieldList();
-        verify(testToolsPresenterSpy, times(1)).showInstanceListContainerSeparator(eq(false));
-    }
-
-    @Test
-    public void clearSelection_ListGroup() {
-        testToolsPresenterSpy.selectedListGroupItemView = selectedListGroupItemViewMock;
-        testToolsPresenterSpy.selectedFieldItemView = null;
-        testToolsPresenterSpy.clearSelection();
-        verify(selectedListGroupItemViewMock, times(1)).showCheck(eq(false));
-        verify(testToolsViewMock, times(1)).disableAddButton();
-    }
-
-    @Test
-    public void clearSelection_FieldItem() {
-        testToolsPresenterSpy.selectedListGroupItemView = null;
-        testToolsPresenterSpy.selectedFieldItemView = selectedFieldItemViewMock;
-        testToolsPresenterSpy.clearSelection();
-        verify(selectedFieldItemViewMock, times(1)).showCheck(eq(false));
-        verify(testToolsViewMock, times(1)).disableAddButton();
-    }
-
-    @Test
-    public void isSimple() {
-        assertTrue(testToolsPresenterSpy.isSimple("String"));
-        assertFalse(testToolsPresenterSpy.isSimple("Test"));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsViewImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsViewImplTest.java
deleted file mode 100644
index 81516e8..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/rightpanel/TestToolsViewImplTest.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.rightpanel;
-
-import com.google.gwt.dom.client.AnchorElement;
-import com.google.gwt.dom.client.ButtonElement;
-import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.InputElement;
-import com.google.gwt.dom.client.LabelElement;
-import com.google.gwt.dom.client.ParagraphElement;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.KeyUpEvent;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertSame;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class TestToolsViewImplTest {
-
-    private TestToolsViewImpl testToolsViewSpy;
-
-    @Mock
-    private AnchorElement clearSelectionElementMock;
-
-    @Mock
-    private ParagraphElement testToolsDescriptionElementMock;
-
-    @Mock
-    private LabelElement testToolObjectSelectionTitleElementMock;
-
-    @Mock
-    private TestToolsPresenter testToolsPresenterMock;
-
-    @Mock
-    private InputElement inputSearchMock;
-
-    @Mock
-    private ButtonElement clearSearchButtonMock;
-
-    @Mock
-    private ButtonElement searchButtonMock;
-
-    @Mock
-    private DivElement dataObjectListContainerMock;
-
-    @Mock
-    private DivElement simpleJavaTypeListContainerMock;
-
-    @Mock
-    private SpanElement instanceListContainerSeparatorMock;
-
-    @Mock
-    private Style instanceListStyleMock;
-
-    @Mock
-    private DivElement instanceListContainerMock;
-
-    @Mock
-    private DivElement simpleJavaInstanceListContainerMock;
-
-    @Mock
-    private DivElement kieTestToolsContentMock;
-
-    @Mock
-    private ButtonElement addButtonMock;
-
-    @Mock
-    private DivElement addButtonLabelMock;
-
-    @Mock
-    private SpanElement infoSelectDataObjectElementMock;
-
-    @Mock
-    private Style dataObjectListContainerStyleMock;
-
-    @Mock
-    private Style simpleJavaTypeListContainerStyleMock;
-
-    @Mock
-    private Style instanceListContainerStyleMock;
-
-    @Mock
-    private Style simpleJavaInstanceListStyleMock;
-
-    @Mock
-    private Style instanceListSeparatorStyleMock;
-
-    @Before
-    public void setup() {
-        this.testToolsViewSpy = spy(new TestToolsViewImpl() {
-            {
-                this.inputSearch = inputSearchMock;
-                this.clearSearchButton = clearSearchButtonMock;
-                this.searchButton = searchButtonMock;
-                this.addButton = addButtonMock;
-                this.addButtonLabel = addButtonLabelMock;
-                this.testToolsDescriptionElement = testToolsDescriptionElementMock;
-                this.testToolObjectSelectionTitleElement = testToolObjectSelectionTitleElementMock;
-                this.clearSelectionElement = clearSelectionElementMock;
-                this.kieTestToolsContent = kieTestToolsContentMock;
-                this.dataObjectListContainer = dataObjectListContainerMock;
-                this.simpleJavaTypeListContainer = simpleJavaTypeListContainerMock;
-                this.instanceListContainer = instanceListContainerMock;
-                this.instanceListContainerSeparator = instanceListContainerSeparatorMock;
-                this.simpleJavaInstanceListContainer = simpleJavaInstanceListContainerMock;
-                this.infoSelectDataObjectElement = infoSelectDataObjectElementMock;
-            }
-        });
-        when(instanceListContainerSeparatorMock.getStyle()).thenReturn(instanceListStyleMock);
-        when(dataObjectListContainerMock.getStyle()).thenReturn(dataObjectListContainerStyleMock);
-        when(simpleJavaTypeListContainerMock.getStyle()).thenReturn(simpleJavaTypeListContainerStyleMock);
-        when(instanceListContainerMock.getStyle()).thenReturn(instanceListContainerStyleMock);
-        when(simpleJavaInstanceListContainerMock.getStyle()).thenReturn(simpleJavaInstanceListStyleMock);
-        when(instanceListContainerSeparatorMock.getStyle()).thenReturn(instanceListSeparatorStyleMock);
-    }
-
-    @Test
-    public void init() {
-        testToolsViewSpy.init(testToolsPresenterMock);
-        assertSame(testToolsPresenterMock, testToolsViewSpy.presenter);
-        verify(testToolsViewSpy, times(1)).disableEditorTab();
-        verify(testToolsDescriptionElementMock, times(1)).setInnerText(eq(ScenarioSimulationEditorConstants.INSTANCE.testToolsDescription()));
-        verify(testToolObjectSelectionTitleElementMock, times(1)).setInnerText(eq(ScenarioSimulationEditorConstants.INSTANCE.testToolObjectSelectionTitle()));
-        verify(clearSelectionElementMock, times(1)).setInnerText(eq(ScenarioSimulationEditorConstants.INSTANCE.testToolClearSelection()));
-        verify(addButtonMock, times(1)).setInnerText(eq(ScenarioSimulationEditorConstants.INSTANCE.testToolsAddButton()));
-        verify(addButtonLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.testToolsAddButtonLabel());
-        verify(instanceListContainerSeparatorMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.dataObjectInstances());
-        verify(infoSelectDataObjectElementMock, times(1)).setAttribute(eq("title"), eq(ScenarioSimulationEditorConstants.INSTANCE.testToolObjectSelectionTooltip()));
-    }
-
-    @Test
-    public void onClearSearchButtonClick() {
-        testToolsViewSpy.init(testToolsPresenterMock);
-        testToolsViewSpy.onClearSearchButtonClick(mock(ClickEvent.class));
-        verify(testToolsPresenterMock, times(1)).onUndoSearch();
-    }
-
-    @Test
-    public void onInputSearchKeyUp() {
-        testToolsViewSpy.init(testToolsPresenterMock);
-        testToolsViewSpy.onInputSearchKeyUp(mock(KeyUpEvent.class));
-        verify(testToolsPresenterMock, times(1)).onShowClearButton();
-    }
-
-    @Test
-    public void clearInputSearch() {
-        testToolsViewSpy.clearInputSearch();
-        verify(inputSearchMock, times(1)).setValue(eq(""));
-    }
-
-    @Test
-    public void hideClearButton() {
-        reset(clearSearchButtonMock);
-        testToolsViewSpy.hideClearButton();
-        verify(clearSearchButtonMock, times(1)).setDisabled(eq(true));
-        verify(clearSearchButtonMock, times(1)).setAttribute(eq("style"), eq("display: none;"));
-    }
-
-    @Test
-    public void showClearButton() {
-        reset(clearSearchButtonMock);
-        testToolsViewSpy.showClearButton();
-        verify(clearSearchButtonMock, times(1)).setDisabled(eq(false));
-        verify(clearSearchButtonMock, times(1)).removeAttribute(eq("style"));
-    }
-
-    @Test
-    public void testReset() {
-        testToolsViewSpy.reset();
-        verify(testToolsViewSpy, times(1)).clearDataObjectList();
-        verify(testToolsViewSpy, times(1)).clearSimpleJavaTypeList();
-        verify(testToolsViewSpy, times(1)).showInstanceListContainerSeparator(eq(false));
-        verify(testToolsViewSpy, times(1)).clearInstanceList();
-        verify(testToolsViewSpy, times(1)).clearSimpleJavaInstanceFieldList();
-    }
-
-    @Test
-    public void onClearSelectionElementClicked() {
-        testToolsViewSpy.init(testToolsPresenterMock);
-        testToolsViewSpy.onClearSelectionElementClicked(mock(ClickEvent.class));
-        verify(testToolsPresenterMock, times(1)).clearSelection();
-    }
-
-    @Test
-    public void clearDataObjectList() {
-        testToolsViewSpy.clearDataObjectList();
-        verify(dataObjectListContainerMock.getStyle(), times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(dataObjectListContainerMock, times(1)).removeAllChildren();
-    }
-
-    @Test
-    public void clearSimpleJavaTypeList() {
-        testToolsViewSpy.clearSimpleJavaTypeList();
-        verify(simpleJavaTypeListContainerMock.getStyle(), times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(simpleJavaTypeListContainerMock, times(1)).removeAllChildren();
-    }
-
-    @Test
-    public void clearInstanceList() {
-        testToolsViewSpy.clearInstanceList();
-        verify(instanceListContainerMock.getStyle(), times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(instanceListContainerMock, times(1)).removeAllChildren();
-    }
-
-    @Test
-    public void clearSimpleJavaInstanceFieldList() {
-        testToolsViewSpy.clearSimpleJavaInstanceFieldList();
-        verify(simpleJavaInstanceListContainerMock.getStyle(), times(1)).setDisplay(eq(Style.Display.NONE));
-        verify(simpleJavaInstanceListContainerMock, times(1)).removeAllChildren();
-    }
-
-    @Test
-    public void addDataObjectListGroupItem() {
-        DivElement divElementMock = mock(DivElement.class);
-        testToolsViewSpy.addDataObjectListGroupItem(divElementMock);
-        verify(dataObjectListContainerMock, times(1)).appendChild(eq(divElementMock));
-        verify(dataObjectListContainerMock.getStyle(), times(1)).setDisplay(eq(Style.Display.BLOCK));
-    }
-
-    @Test
-    public void addSimpleJavaTypeListGroupItem() {
-        DivElement divElementMock = mock(DivElement.class);
-        testToolsViewSpy.addSimpleJavaTypeListGroupItem(divElementMock);
-        verify(simpleJavaTypeListContainerMock, times(1)).appendChild(eq(divElementMock));
-        verify(simpleJavaTypeListContainerMock.getStyle(), times(1)).setDisplay(eq(Style.Display.BLOCK));
-    }
-
-    @Test
-    public void addInstanceListGroupItem() {
-        DivElement divElementMock = mock(DivElement.class);
-        testToolsViewSpy.addInstanceListGroupItem(divElementMock);
-        verify(instanceListContainerMock, times(1)).appendChild(eq(divElementMock));
-        verify(instanceListContainerMock.getStyle(), times(1)).setDisplay(eq(Style.Display.BLOCK));
-    }
-
-    @Test
-    public void addSimpleJavaInstanceListGroupItem() {
-        DivElement divElementMock = mock(DivElement.class);
-        testToolsViewSpy.addSimpleJavaInstanceListGroupItem(divElementMock);
-        verify(simpleJavaInstanceListContainerMock, times(1)).appendChild(eq(divElementMock));
-        verify(simpleJavaInstanceListContainerMock.getStyle(), times(1)).setDisplay(eq(Style.Display.BLOCK));
-    }
-
-    @Test
-    public void updateInstanceListSeparatorNotEmptyTrueParameter() {
-        when(instanceListContainerMock.getChildCount()).thenReturn(2);
-        testToolsViewSpy.updateInstanceListSeparator(true);
-        verify(instanceListContainerMock, times(1)).getChildCount();
-        verify(instanceListContainerSeparatorMock.getStyle(), times(1)).setDisplay(eq(Style.Display.BLOCK));
-    }
-
-    @Test
-    public void updateInstanceListSeparatorNotEmptiesTrueParameter() {
-        when(instanceListContainerMock.getChildCount()).thenReturn(2);
-        when(simpleJavaInstanceListContainerMock.getChildCount()).thenReturn(2);
-        testToolsViewSpy.updateInstanceListSeparator(true);
-        verify(instanceListContainerMock, times(1)).getChildCount();
-        verify(instanceListContainerSeparatorMock.getStyle(), times(1)).setDisplay(eq(Style.Display.BLOCK));
-    }
-
-    @Test
-    public void updateInstanceListSeparatorNotEmptyFalseParameter() {
-        when(instanceListContainerMock.getChildCount()).thenReturn(2);
-        testToolsViewSpy.updateInstanceListSeparator(false);
-        verify(instanceListContainerMock, never()).getChildCount();
-        verify(instanceListContainerSeparatorMock.getStyle(), times(1)).setDisplay(eq(Style.Display.NONE));
-    }
-
-    @Test
-    public void updateInstanceListSeparatorNotEmptiesFalseParameter() {
-        when(instanceListContainerMock.getChildCount()).thenReturn(2);
-        when(simpleJavaInstanceListContainerMock.getChildCount()).thenReturn(2);
-        testToolsViewSpy.updateInstanceListSeparator(false);
-        verify(instanceListContainerMock, never()).getChildCount();
-        verify(instanceListContainerSeparatorMock.getStyle(), times(1)).setDisplay(eq(Style.Display.NONE));
-    }
-
-    @Test
-    public void updateInstanceListSeparatorEmptyFalseParameter() {
-        when(instanceListContainerMock.getChildCount()).thenReturn(0);
-        when(simpleJavaInstanceListContainerMock.getChildCount()).thenReturn(0);
-        testToolsViewSpy.updateInstanceListSeparator(false);
-        verify(instanceListContainerMock, never()).getChildCount();
-        verify(instanceListContainerSeparatorMock.getStyle(), times(1)).setDisplay(eq(Style.Display.NONE));
-    }
-
-    @Test
-    public void updateInstanceListSeparatorEmptyTrueParameter() {
-        when(instanceListContainerMock.getChildCount()).thenReturn(0);
-        when(simpleJavaInstanceListContainerMock.getChildCount()).thenReturn(0);
-        testToolsViewSpy.updateInstanceListSeparator(true);
-        verify(instanceListContainerMock, times(1)).getChildCount();
-        verify(instanceListContainerSeparatorMock.getStyle(), times(1)).setDisplay(eq(Style.Display.NONE));
-    }
-
-    @Test
-    public void showInstanceListContainerSeparator() {
-        testToolsViewSpy.showInstanceListContainerSeparator(true);
-        verify(instanceListContainerSeparatorMock.getStyle(), times(1)).setDisplay(eq(Style.Display.BLOCK));
-        //
-        testToolsViewSpy.showInstanceListContainerSeparator(false);
-        verify(instanceListContainerSeparatorMock.getStyle(), times(1)).setDisplay(eq(Style.Display.NONE));
-    }
-
-    @Test
-    public void setClearSelectionAnchorDisabledStatus() {
-        testToolsViewSpy.setClearSelectionAnchorDisabledStatus(true);
-        verify(clearSelectionElementMock, times(1)).addClassName(eq(ConstantHolder.DISABLED));
-        //
-        testToolsViewSpy.setClearSelectionAnchorDisabledStatus(false);
-        verify(clearSelectionElementMock, times(1)).removeClassName(eq(ConstantHolder.DISABLED));
-    }
-
-    @Test
-    public void setInfoSelectDataObjectElementDisabledStatus() {
-        testToolsViewSpy.setInfoSelectDataObjectElementDisabledStatus(true);
-        verify(infoSelectDataObjectElementMock, times(1)).addClassName(eq(ConstantHolder.DISABLED));
-        //
-        testToolsViewSpy.setInfoSelectDataObjectElementDisabledStatus(false);
-        verify(infoSelectDataObjectElementMock, times(1)).removeClassName(eq(ConstantHolder.DISABLED));
-    }
-
-    @Test
-    public void setDisabledStatusTrue() {
-        testToolsViewSpy.setDisabledStatus(true);
-        verify(testToolsViewSpy, times(1)).setClearSelectionAnchorDisabledStatus(eq(true));
-        verify(testToolsViewSpy, times(1)).setInfoSelectDataObjectElementDisabledStatus(eq(true));
-        verify(testToolsViewSpy, times(1)).setContainersDisabledStatus(eq(true));
-        verify(kieTestToolsContentMock, times(1)).addClassName(ConstantHolder.DISABLED);
-        verify(testToolsViewSpy, times(1)).disableSearch();
-        verify(testToolsViewSpy, times(1)).disableAddButton();
-        verify(kieTestToolsContentMock, never()).removeClassName(anyString());
-    }
-
-    @Test
-    public void setDisabledStatusFalse() {
-        testToolsViewSpy.setDisabledStatus(false);
-        verify(testToolsViewSpy, times(1)).setClearSelectionAnchorDisabledStatus(eq(false));
-        verify(testToolsViewSpy, times(1)).setInfoSelectDataObjectElementDisabledStatus(eq(false));
-        verify(testToolsViewSpy, times(1)).setContainersDisabledStatus(eq(false));
-        verify(kieTestToolsContentMock, never()).addClassName(anyString());
-        verify(testToolsViewSpy, never()).disableSearch();
-        verify(testToolsViewSpy, never()).disableAddButton();
-        verify(kieTestToolsContentMock, times(1)).removeClassName(ConstantHolder.DISABLED);
-    }
-
-    @Test
-    public void enableSearch() {
-        testToolsViewSpy.enableSearch();
-        verify(clearSearchButtonMock, times(1)).setDisabled(eq(false));
-        verify(searchButtonMock, times(1)).setDisabled(eq(false));
-        verify(inputSearchMock, times(1)).setDisabled(eq(false));
-    }
-
-    @Test
-    public void disableSearch() {
-        testToolsViewSpy.disableSearch();
-        verify(testToolsViewSpy, times(1)).hideClearButton();
-        verify(searchButtonMock, times(1)).setDisabled(eq(true));
-        verify(inputSearchMock, times(1)).setDisabled(eq(true));
-        verify(inputSearchMock, times(1)).setValue((eq("")));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/AbstractUtilsTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/AbstractUtilsTest.java
deleted file mode 100644
index 185022c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/AbstractUtilsTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.utils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.workbench.screens.scenariosimulation.client.TestProperties;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioHeaderTextBoxSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.junit.Before;
-import org.mockito.Mock;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_ID;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-public abstract class AbstractUtilsTest {
-
-    @Mock
-    protected ScenarioCellTextAreaSingletonDOMElementFactory scenarioCellTextAreaSingletonDOMElementFactoryMock;
-
-    @Mock
-    protected ScenarioHeaderTextBoxSingletonDOMElementFactory scenarioHeaderTextBoxSingletonDOMElementFactoryMock;
-
-    @Mock
-    protected ScenarioSimulationBuilders.HeaderBuilder headerBuilderMock;
-
-    @Mock
-    protected ScenarioHeaderMetaData scenarioHeaderMetaDataMock;
-
-    protected List<ScenarioHeaderMetaData> scenarioHeaderMetaDataList = new ArrayList<>();
-
-
-    protected final FactMappingType factMappingType = FactMappingType.valueOf(TestProperties.COLUMN_GROUP_FIRST);
-
-    @Before
-    public void setup() {
-        when(headerBuilderMock.getColumnId()).thenReturn(COLUMN_ID);
-        scenarioHeaderMetaDataList = Collections.singletonList(scenarioHeaderMetaDataMock);
-        doReturn(scenarioHeaderMetaDataList).when(headerBuilderMock).build();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ExpressionUtilsTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ExpressionUtilsTest.java
deleted file mode 100644
index 7689204..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ExpressionUtilsTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.utils;
-
-import org.drools.scenariosimulation.api.utils.ConstantsHolder;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-public class ExpressionUtilsTest {
-
-    @Test
-    public void checkExpressionSyntax_Null() {
-        assertNull(ExpressionUtils.ensureExpressionSyntax(null));
-    }
-
-    @Test
-    public void checkExpressionSyntax_Empty() {
-        assertEquals(ConstantHolder.EXPRESSION_VALUE_PREFIX, ExpressionUtils.ensureExpressionSyntax(""));
-    }
-
-    @Test
-    public void checkExpressionSyntax_StringWithNoPrefix() {
-        assertEquals(ConstantHolder.EXPRESSION_VALUE_PREFIX + "Test", ExpressionUtils.ensureExpressionSyntax("Test"));
-    }
-
-    @Test
-    public void checkExpressionSyntax_StringWithSpacePrefix() {
-        assertEquals(ConstantHolder.EXPRESSION_VALUE_PREFIX + "Test", ExpressionUtils.ensureExpressionSyntax(" Test"));
-    }
-
-    @Test
-    public void checkExpressionSyntax_StringWithMVelPrefix() {
-        assertEquals(ConstantHolder.EXPRESSION_VALUE_PREFIX + "Test", ExpressionUtils.ensureExpressionSyntax(ConstantsHolder.MVEL_ESCAPE_SYMBOL + "Test"));
-    }
-
-    @Test
-    public void checkExpressionSyntax_StringWithExpressionValuePrefix() {
-        assertEquals(ConstantHolder.EXPRESSION_VALUE_PREFIX + "Test", ExpressionUtils.ensureExpressionSyntax(ConstantHolder.EXPRESSION_VALUE_PREFIX + "Test"));
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationBuildersTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationBuildersTest.java
deleted file mode 100644
index dece098..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationBuildersTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.utils;
-
-import java.util.List;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_GROUP_FIRST;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INSTANCE_TITLE_FIRST;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.PLACEHOLDER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.uberfire.ext.wires.core.grids.client.model.GridColumn.ColumnWidthMode;
-import static org.uberfire.ext.wires.core.grids.client.model.GridColumn.HeaderMetaData;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationBuildersTest extends AbstractUtilsTest {
-
-    @Before
-    public void setup() {
-        super.setup();
-    }
-
-    @Test
-    public void testScenarioGridColumnBuilder() {
-        ScenarioSimulationBuilders.ScenarioGridColumnBuilder builder = ScenarioSimulationBuilders.ScenarioGridColumnBuilder.get(scenarioCellTextAreaSingletonDOMElementFactoryMock, headerBuilderMock);
-        builder.setPlaceHolder(PLACEHOLDER);
-        ScenarioGridColumn retrieved = builder.build();
-        assertNotNull(retrieved);
-        assertEquals(PLACEHOLDER, retrieved.getPlaceHolder());
-        assertTrue(retrieved.isReadOnly());
-        assertFalse(retrieved.isMovable());
-        assertNotNull(retrieved.getHeaderMetaData());
-        assertFalse(retrieved.getHeaderMetaData().isEmpty());
-        assertEquals(ColumnWidthMode.AUTO, retrieved.getColumnWidthMode());
-    }
-
-    @Test
-    public void testHeaderBuilder() {
-        ScenarioSimulationBuilders.HeaderBuilder builder = ScenarioSimulationBuilders.HeaderBuilder.get(scenarioHeaderTextBoxSingletonDOMElementFactoryMock);
-        builder.setColumnTitle(COLUMN_INSTANCE_TITLE_FIRST);
-        builder.setColumnGroup(COLUMN_GROUP_FIRST);
-        builder.setInstanceHeader(true);
-        List<HeaderMetaData> retrieved = builder.build();
-        assertNotNull(retrieved);
-        assertEquals(1, retrieved.size());
-        ScenarioHeaderMetaData headerMetaData = (ScenarioHeaderMetaData) retrieved.get(0);
-        assertNotNull(headerMetaData);
-        assertEquals(COLUMN_INSTANCE_TITLE_FIRST, headerMetaData.getTitle());
-        assertEquals(COLUMN_GROUP_FIRST, headerMetaData.getColumnGroup());
-        assertTrue(headerMetaData.getMetadataType().equals(ScenarioHeaderMetaData.MetadataType.INSTANCE));
-        assertFalse(headerMetaData.isReadOnly());
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationGridHeaderUtilitiesTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationGridHeaderUtilitiesTest.java
deleted file mode 100644
index 21963f0..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationGridHeaderUtilitiesTest.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.utils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import com.ait.lienzo.client.core.shape.Viewport;
-import com.ait.lienzo.client.core.types.Point2D;
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.events.EnableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.util.CellContextUtilities;
-import org.uberfire.ext.wires.core.grids.client.widget.context.GridBodyCellRenderContext;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.GridRenderer;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.impl.BaseGridRendererHelper;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_ONE_TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_TWO_TITLE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.HEADER_HEIGHT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.HEADER_ROW_HEIGHT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.UI_COLUMN_INDEX;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioSimulationGridHeaderUtilitiesTest extends AbstractScenarioSimulationTest {
-
-    private ScenarioGridColumn scenarioGridColumnOne;
-    private ScenarioGridColumn scenarioGridColumnTwo;
-
-    @Mock
-    private GridRenderer gridRenderer;
-
-    @Mock
-    private BaseGridRendererHelper gridRendererHelper;
-
-    @Mock
-    private BaseGridRendererHelper.RenderingInformation ri;
-
-    @Mock
-    private BaseGridRendererHelper.ColumnInformation ci;
-
-    @Mock
-    private BaseGridRendererHelper.RenderingBlockInformation floatingBlockInformation;
-
-    @Mock
-    private ScenarioHeaderMetaData clickedScenarioHeaderMetadataMock;
-
-    private Point2D rp = new Point2D(0, 0);
-
-    @Before
-    public void setup() {
-        super.setup();
-        doReturn(gridRenderer).when(scenarioGridMock).getRenderer();
-        doReturn(gridRendererHelper).when(scenarioGridMock).getRendererHelper();
-        doReturn(ri).when(gridRendererHelper).getRenderingInformation();
-        doReturn(HEADER_HEIGHT).when(gridRenderer).getHeaderHeight();
-        doReturn(HEADER_ROW_HEIGHT).when(gridRenderer).getHeaderRowHeight();
-
-        doReturn(floatingBlockInformation).when(ri).getFloatingBlockInformation();
-        doReturn(0.0).when(floatingBlockInformation).getX();
-        doReturn(0.0).when(floatingBlockInformation).getWidth();
-
-        doReturn(mock(Viewport.class)).when(scenarioGridMock).getViewport();
-        when(scenarioGridMock.getModel()).thenReturn(scenarioGridModelMock);
-
-        final ScenarioHeaderMetaData clickedScenarioHeaderMetadataMock = mock(ScenarioHeaderMetaData.class);
-        scenarioGridColumnOne =
-                mockGridColumn(100.0,
-                               Collections.singletonList(clickedScenarioHeaderMetadataMock),
-                               COLUMN_ONE_TITLE,
-                               COLUMN_GROUP);
-        scenarioGridColumnTwo =
-                mockGridColumn(100.0,
-                               Collections.singletonList(clickedScenarioHeaderMetadataMock),
-                               COLUMN_TWO_TITLE,
-                               COLUMN_GROUP);
-        gridColumns.add(scenarioGridColumnOne);
-        gridColumns.add(scenarioGridColumnTwo);
-    }
-
-    @Test
-    public void testMakeRenderContextNoBlock() {
-        final List<GridColumn<?>> allColumns = new ArrayList<>();
-        final GridColumn<?> uiColumn = mockGridColumn(100.0);
-        allColumns.add(uiColumn);
-
-        doReturn(allColumns).when(ri).getAllColumns();
-        doReturn(uiColumn).when(ci).getColumn();
-        doReturn(0.0).when(ci).getOffsetX();
-        doReturn(0).when(ci).getUiColumnIndex();
-
-        final GridBodyCellRenderContext context = CellContextUtilities.makeHeaderCellRenderContext(scenarioGridMock,
-                                                                                                   ri,
-                                                                                                   ci,
-                                                                                                   rp,
-                                                                                                   0);
-
-        assertNotNull(context);
-        assertEquals(0.0,
-                     context.getAbsoluteCellX(),
-                     0.0);
-        assertEquals(100.0,
-                     context.getCellWidth(),
-                     0.0);
-    }
-
-    @Test
-    public void testEnableTestToolsEventInstanceNotAssigned() {
-        when(scenarioGridColumnOne.isInstanceAssigned()).thenReturn(false);
-
-        final EnableTestToolsEvent event = ScenarioSimulationGridHeaderUtilities.getEnableTestToolsEvent(scenarioGridMock,
-                                                                                                         scenarioGridColumnOne,
-                                                                                                         clickedScenarioHeaderMetadataMock,
-                                                                                                         UI_COLUMN_INDEX,
-                                                                                                         COLUMN_GROUP);
-
-        assertThat(event.getFilterTerm()).isEqualTo(COLUMN_ONE_TITLE + ";" + COLUMN_TWO_TITLE + ";" + MULTIPART_VALUE);
-        assertThat(event.isNotEqualsSearch()).isTrue();
-    }
-
-    @Test
-    public void testEnableTestToolsEventInstanceAssigned() {
-        when(scenarioGridColumnOne.isInstanceAssigned()).thenReturn(true);
-
-        final EnableTestToolsEvent event = ScenarioSimulationGridHeaderUtilities.getEnableTestToolsEvent(scenarioGridMock,
-                                                                                                         scenarioGridColumnOne,
-                                                                                                         clickedScenarioHeaderMetadataMock,
-                                                                                                         UI_COLUMN_INDEX,
-                                                                                                         COLUMN_GROUP);
-
-        assertThat(event.getFilterTerm()).isEqualTo(COLUMN_ONE_TITLE);
-        assertThat(event.isNotEqualsSearch()).isFalse();
-    }
-
-    @Test
-    public void testEnableTestToolsEventPropertyHeaderPropertyNotAssigned() {
-        when(clickedScenarioHeaderMetadataMock.getMetadataType()).thenReturn(ScenarioHeaderMetaData.MetadataType.PROPERTY);
-        when(scenarioGridColumnOne.isInstanceAssigned()).thenReturn(true);
-
-        final EnableTestToolsEvent event = ScenarioSimulationGridHeaderUtilities.getEnableTestToolsEvent(scenarioGridMock,
-                                                                                                         scenarioGridColumnOne,
-                                                                                                         clickedScenarioHeaderMetadataMock,
-                                                                                                         UI_COLUMN_INDEX,
-                                                                                                         COLUMN_GROUP);
-
-        assertThat(event.getFilterTerm()).isEqualTo(COLUMN_ONE_TITLE);
-        assertThat(event.getPropertyNameElements()).isNull();
-        assertThat(event.isNotEqualsSearch()).isFalse();
-    }
-
-    @Test
-    public void testIsHeaderEditableNorInstanceNorPropertyAssigned() {
-        final boolean result = ScenarioSimulationGridHeaderUtilities.isEditableHeader(scenarioGridColumnOne, 0);
-
-        assertThat(result).as("Nor Instance nor Property assigned").isFalse();
-    }
-
-    @Test
-    public void testIsHeaderEditableInstanceAssignedAndSelected() {
-        when(scenarioGridColumnOne.isInstanceAssigned()).thenReturn(true);
-
-        final ScenarioHeaderMetaData metaDataMock = (ScenarioHeaderMetaData) scenarioGridColumnOne.getHeaderMetaData().get(0);
-        when(metaDataMock.isInstanceHeader()).thenReturn(true);
-
-        final boolean result = ScenarioSimulationGridHeaderUtilities.isEditableHeader(scenarioGridColumnOne, 0);
-
-        assertThat(result).as("Instance Assigned and selected").isTrue();
-    }
-
-    @Test
-    public void testIsHeaderEditableInstanceAssignedButPropertySelected() {
-        when(scenarioGridColumnOne.isInstanceAssigned()).thenReturn(true);
-
-        final ScenarioHeaderMetaData metaDataMock = (ScenarioHeaderMetaData) scenarioGridColumnOne.getHeaderMetaData().get(0);
-        when(metaDataMock.isPropertyHeader()).thenReturn(true);
-
-        final boolean result = ScenarioSimulationGridHeaderUtilities.isEditableHeader(scenarioGridColumnOne, 0);
-
-        assertThat(result).as("Instance Assigned but Property selected").isFalse();
-    }
-
-    @Test
-    public void testIsHeaderEditableInstanceAndPropertyAssignedButNotSelected() {
-        when(scenarioGridColumnOne.isInstanceAssigned()).thenReturn(true);
-        when(scenarioGridColumnOne.isPropertyAssigned()).thenReturn(true);
-
-        final ScenarioHeaderMetaData metaDataMock = (ScenarioHeaderMetaData) scenarioGridColumnOne.getHeaderMetaData().get(0);
-        when(metaDataMock.isPropertyHeader()).thenReturn(false);
-        when(metaDataMock.isInstanceHeader()).thenReturn(false);
-
-        final boolean result = ScenarioSimulationGridHeaderUtilities.isEditableHeader(scenarioGridColumnOne, 0);
-
-        assertThat(result).as("Instance and Property Assigned but not selected").isFalse();
-    }
-
-    @Test
-    public void testIsHeaderEditableInstanceAndPropertyAssignedAndPropertySelected() {
-        when(scenarioGridColumnOne.isInstanceAssigned()).thenReturn(true);
-        when(scenarioGridColumnOne.isPropertyAssigned()).thenReturn(true);
-
-        final ScenarioHeaderMetaData metaDataMock = (ScenarioHeaderMetaData) scenarioGridColumnOne.getHeaderMetaData().get(0);
-        when(metaDataMock.isPropertyHeader()).thenReturn(true);
-
-        final boolean result = ScenarioSimulationGridHeaderUtilities.isEditableHeader(scenarioGridColumnOne, 0);
-
-        assertThat(result).as("Instance and Property Assigned and Property selected").isTrue();
-    }
-
-    @Test
-    public void testHeaderMetadataInstanceOf() {
-        final ScenarioGridColumn invalidColumn = mockGridColumn(100,
-                                                                Collections.singletonList(mock(GridColumn.HeaderMetaData.class)));
-
-        assertThatThrownBy(() -> ScenarioSimulationGridHeaderUtilities.isEditableHeader(invalidColumn,
-                                                                                        0))
-                .isInstanceOf(IllegalStateException.class)
-                .hasMessage("Header metadata has to be an instance of ScenarioHeaderMetaData");
-    }
-
-    private ScenarioGridColumn mockGridColumn(final double width) {
-        final List<GridColumn.HeaderMetaData> headerMetaData = new ArrayList<>();
-        headerMetaData.add(mock(GridColumn.HeaderMetaData.class));
-        headerMetaData.add(mock(GridColumn.HeaderMetaData.class));
-
-        return mockGridColumn(width,
-                              headerMetaData);
-    }
-
-    private ScenarioGridColumn mockGridColumn(final double width,
-                                              final List<GridColumn.HeaderMetaData> headerMetaData) {
-        return mockGridColumn(width, headerMetaData, null, null);
-    }
-
-    private ScenarioGridColumn mockGridColumn(final double width,
-                                              final List<GridColumn.HeaderMetaData> headerMetaData,
-                                              final String columnTitle,
-                                              final String COLUMN_GROUP) {
-        final ScenarioGridColumn uiColumn = mock(ScenarioGridColumn.class);
-
-        doReturn(headerMetaData).when(uiColumn).getHeaderMetaData();
-        doReturn(width).when(uiColumn).getWidth();
-
-        final ScenarioHeaderMetaData informationHeader = mock(ScenarioHeaderMetaData.class);
-        when(informationHeader.getColumnGroup()).thenReturn(COLUMN_GROUP);
-        when(informationHeader.getTitle()).thenReturn(columnTitle);
-
-        when(uiColumn.getInformationHeaderMetaData()).thenReturn(informationHeader);
-        when(uiColumn.isEditableHeaders()).thenReturn(true);
-
-        return uiColumn;
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationUtilsTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationUtilsTest.java
deleted file mode 100644
index aaabf7e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ScenarioSimulationUtilsTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.utils;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridColumn;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_GROUP_FIRST;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_ID;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_INSTANCE_TITLE_FIRST;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMN_PROPERTY_TITLE_FIRST;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.PLACEHOLDER;
-import static org.drools.workbench.screens.scenariosimulation.client.editor.strategies.DataManagementStrategy.SIMPLE_CLASSES_MAP;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.DMN_DATE;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.LOCALDATETIME_CANONICAL_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.LOCALDATE_CANONICAL_NAME;
-import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.LOCALTIME_CANONICAL_NAME;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationUtilsTest extends AbstractUtilsTest {
-
-    @Test
-    public void getColumnSubGroup() {
-        String subGroup = ScenarioSimulationUtils.getColumnSubGroup(COLUMN_GROUP);
-        assertEquals(subGroup, COLUMN_GROUP + "-0");
-        String subGroup2 = ScenarioSimulationUtils.getColumnSubGroup(COLUMN_GROUP);
-        assertEquals(subGroup2, COLUMN_GROUP + "-1");
-    }
-
-    @Test
-    public void getOriginalColumnGroup() {
-        String subGroup = ScenarioSimulationUtils.getOriginalColumnGroup(COLUMN_GROUP + "-3");
-        assertEquals(COLUMN_GROUP, subGroup);
-    }
-
-    @Test
-    public void getScenarioGridColumn2() {
-        final ScenarioGridColumn retrieved = ScenarioSimulationUtils.getScenarioGridColumn(COLUMN_INSTANCE_TITLE_FIRST, COLUMN_PROPERTY_TITLE_FIRST, COLUMN_ID, COLUMN_GROUP_FIRST, factMappingType, scenarioHeaderTextBoxSingletonDOMElementFactoryMock, scenarioCellTextAreaSingletonDOMElementFactoryMock, PLACEHOLDER);
-        assertNotNull(retrieved);
-    }
-
-    @Test
-    public void getScenarioGridColumn4() {
-        final ScenarioGridColumn retrieved = ScenarioSimulationUtils.getScenarioGridColumn(headerBuilderMock, scenarioCellTextAreaSingletonDOMElementFactoryMock, PLACEHOLDER);
-        assertNotNull(retrieved);
-    }
-
-    @Test
-    public void getScenarioGridColumnBuilder() {
-        final ScenarioSimulationBuilders.ScenarioGridColumnBuilder retrieved = ScenarioSimulationUtils.getScenarioGridColumnBuilder(scenarioCellTextAreaSingletonDOMElementFactoryMock, headerBuilderMock, PLACEHOLDER);
-        assertNotNull(retrieved);
-    }
-
-    @Test
-    public void getHeaderBuilder() {
-        final ScenarioSimulationBuilders.HeaderBuilder retrieved = ScenarioSimulationUtils.getHeaderBuilder(COLUMN_INSTANCE_TITLE_FIRST, COLUMN_PROPERTY_TITLE_FIRST, COLUMN_ID, COLUMN_GROUP_FIRST, factMappingType, scenarioHeaderTextBoxSingletonDOMElementFactoryMock);
-        assertNotNull(retrieved);
-    }
-
-    @Test
-    public void getColumnWidth() {
-        assertEquals(70, ScenarioSimulationUtils.getColumnWidth(ExpressionIdentifier.NAME.Index.name()), 0);
-        assertEquals(300, ScenarioSimulationUtils.getColumnWidth(ExpressionIdentifier.NAME.Description.name()), 0);
-        assertEquals(114, ScenarioSimulationUtils.getColumnWidth(ExpressionIdentifier.NAME.Given.name()), 0);
-        assertEquals(114, ScenarioSimulationUtils.getColumnWidth(ExpressionIdentifier.NAME.Expected.name()), 0);
-        assertEquals(114, ScenarioSimulationUtils.getColumnWidth(ExpressionIdentifier.NAME.Other.name()), 0);
-    }
-
-    @Test
-    public void isSimpleJavaType() {
-        SIMPLE_CLASSES_MAP.values().forEach(clazz -> assertTrue(ScenarioSimulationUtils.isSimpleJavaType(clazz.getCanonicalName())));
-        assertFalse(ScenarioSimulationUtils.isSimpleJavaType("com.TestBean"));
-    }
-
-    @Test
-    public void getPropertyNameElementsWithoutAlias() {
-        FactIdentifier factIdentifierMock = mock(FactIdentifier.class);
-        String packageName = "com";
-        String className = "ClassName";
-        String fullClassName = packageName + "." + className;
-        String propertyName = "propertyName";
-        String aliasName = "AliasName";
-        when(factIdentifierMock.getClassName()).thenReturn(fullClassName);
-        when(factIdentifierMock.getClassNameWithoutPackage()).thenReturn(className);
-        List<String> retrieved = ScenarioSimulationUtils.getPropertyNameElementsWithoutAlias(Collections.singletonList(propertyName), factIdentifierMock, ScenarioSimulationModel.Type.RULE);
-        assertEquals(Collections.singletonList(propertyName), retrieved);
-        retrieved = ScenarioSimulationUtils.getPropertyNameElementsWithoutAlias(Collections.singletonList(propertyName), factIdentifierMock, ScenarioSimulationModel.Type.DMN);
-        assertEquals(Collections.singletonList(propertyName), retrieved);
-        retrieved = ScenarioSimulationUtils.getPropertyNameElementsWithoutAlias(Arrays.asList(aliasName, propertyName), factIdentifierMock, ScenarioSimulationModel.Type.RULE);
-        assertEquals(Arrays.asList(className, propertyName), retrieved);
-        retrieved = ScenarioSimulationUtils.getPropertyNameElementsWithoutAlias(Arrays.asList(aliasName, propertyName), factIdentifierMock, ScenarioSimulationModel.Type.DMN);
-        assertEquals(Arrays.asList(fullClassName, propertyName), retrieved);
-    }
-
-    @Test
-    public void getPlaceholder_InstanceNotAssigned() {
-        String placeholder = ScenarioSimulationUtils.getPlaceHolder(false, false, FactMappingValueType.NOT_EXPRESSION, "com.Test");
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.defineValidType(), placeholder);
-        placeholder = ScenarioSimulationUtils.getPlaceHolder(false, true, FactMappingValueType.NOT_EXPRESSION, "com.Test");
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.defineValidType(), placeholder);
-        placeholder = ScenarioSimulationUtils.getPlaceHolder(false, false, FactMappingValueType.EXPRESSION, "com.Test");
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.defineValidType(), placeholder);
-        placeholder = ScenarioSimulationUtils.getPlaceHolder(false, true, FactMappingValueType.EXPRESSION, "com.Test");
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.defineValidType(), placeholder);
-    }
-
-    @Test
-    public void getPlaceholder_InstanceAssignedPropertyNot() {
-        String placeholder = ScenarioSimulationUtils.getPlaceHolder(true, false, FactMappingValueType.NOT_EXPRESSION, "com.Test");
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.defineValidType(), placeholder);
-        placeholder = ScenarioSimulationUtils.getPlaceHolder(true, false, FactMappingValueType.EXPRESSION, "com.Test");
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.defineValidType(), placeholder);
-    }
-
-    @Test
-    public void getPlaceholder_InstanceAndPropertyAssigned() {
-        String placeholder = ScenarioSimulationUtils.getPlaceHolder(true, true, FactMappingValueType.EXPRESSION, "com.Test");
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.insertExpression(), placeholder);
-        placeholder = ScenarioSimulationUtils.getPlaceHolder(true, true, FactMappingValueType.NOT_EXPRESSION, "com.Test");
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.insertValue(), placeholder);
-        placeholder = ScenarioSimulationUtils.getPlaceHolder(true, true, FactMappingValueType.NOT_EXPRESSION, LOCALDATE_CANONICAL_NAME);
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.dateFormatPlaceholder(), placeholder);
-        placeholder = ScenarioSimulationUtils.getPlaceHolder(true, true, FactMappingValueType.NOT_EXPRESSION, LOCALDATETIME_CANONICAL_NAME);
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.dateTimeFormatPlaceholder(), placeholder);
-        placeholder = ScenarioSimulationUtils.getPlaceHolder(true, true, FactMappingValueType.NOT_EXPRESSION, LOCALTIME_CANONICAL_NAME);
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.timeFormatPlaceholder(), placeholder);
-        placeholder = ScenarioSimulationUtils.getPlaceHolder(true, true, FactMappingValueType.NOT_EXPRESSION, DMN_DATE);
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.dmnDateFormatPlaceholder(), placeholder);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridPanelTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridPanelTest.java
deleted file mode 100644
index 562239a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridPanelTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.widgets;
-
-import com.ait.lienzo.client.core.event.NodeMouseWheelEvent;
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ContextMenuEvent;
-import com.google.gwt.event.dom.client.ScrollEvent;
-import com.google.gwt.user.client.ui.AbsolutePanel;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationGridPanelClickHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationGridPanelMouseMoveHandler;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioGridPanelTest extends AbstractScenarioSimulationTest {
-
-    @Mock
-    private NodeMouseWheelEvent nodeMouseWheelEvent;
-
-    @Mock
-    private ScenarioSimulationGridPanelClickHandler clickHandlerMock;
-
-    @Mock
-    private ScenarioSimulationGridPanelMouseMoveHandler scenarioSimulationGridPanelMouseMoveHandlerMock;
-
-    @Mock
-    private AbsolutePanel domElementContainerMock;
-
-    @Mock
-    private AbsolutePanel scrollPanelMock;
-
-    private ScenarioGridPanel scenarioGridPanelSpy;
-
-    @Before
-    public void setup() {
-        super.setup();
-        scenarioGridPanelSpy = spy(new ScenarioGridPanel());
-        when(scenarioGridPanelSpy.getDefaultGridLayer()).thenReturn(scenarioGridLayerMock);
-        when(scenarioGridPanelSpy.getDomElementContainer()).thenReturn(domElementContainerMock);
-        when(scenarioGridPanelSpy.getScrollPanel()).thenReturn(scrollPanelMock);
-    }
-
-    @Test
-    public void addHandlers() {
-        scenarioGridPanelSpy.addHandlers(clickHandlerMock, scenarioSimulationGridPanelMouseMoveHandlerMock);
-        assertEquals(clickHandlerMock, scenarioGridPanelSpy.clickHandler);
-        assertEquals(scenarioSimulationGridPanelMouseMoveHandlerMock, scenarioGridPanelSpy.mouseMoveHandler);
-        verify(scenarioGridPanelSpy, times(1)).unregister();
-        verify(domElementContainerMock, times(1)).addDomHandler(clickHandlerMock, ClickEvent.getType());
-        verify(domElementContainerMock, times(1)).addDomHandler(clickHandlerMock, ContextMenuEvent.getType());
-        verify(scenarioGridLayerMock, times(1)).addNodeMouseOutHandler(scenarioGridPanelSpy);
-        verify(scenarioGridLayerMock, times(1)).addNodeMouseMoveHandler(scenarioSimulationGridPanelMouseMoveHandlerMock);
-        verify(scenarioGridLayerMock, times(1)).addNodeMouseWheelHandler(scenarioGridPanelSpy);
-        verify(scrollPanelMock, times(1)).addDomHandler(scenarioGridPanelSpy, ScrollEvent.getType());
-    }
-
-    @Test
-    public void onNodeMouseWheel() {
-        scenarioGridPanelSpy.onNodeMouseWheel(nodeMouseWheelEvent);
-        verify(scenarioGridModelMock, times(1)).flushAllTextAreaDOMElementFactoryResources();
-    }
-
-    @Test
-    public void onResize() {
-        scenarioGridPanelSpy.addHandlers(clickHandlerMock, scenarioSimulationGridPanelMouseMoveHandlerMock);
-        scenarioGridPanelSpy.onResize();
-        verify(scenarioGridLayerMock, times(1)).batch();
-        verify(clickHandlerMock, times(1)).hideMenus();
-        verify(scenarioSimulationGridPanelMouseMoveHandlerMock, times(1)).hidePopover();
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridTest.java
deleted file mode 100644
index 6ec67db..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridTest.java
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.widgets;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.IntStream;
-
-import com.ait.lienzo.client.core.shape.Layer;
-import com.ait.lienzo.client.core.shape.Viewport;
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.google.gwt.event.shared.EventBus;
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.ExpressionElement;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.model.Scenario;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.events.EnableTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.events.ReloadTestToolsEvent;
-import org.drools.workbench.screens.scenariosimulation.client.factories.CollectionEditorSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.factories.ScenarioExpressionCellTextAreaSingletonDOMElementFactory;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationGridWidgetMouseEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.menu.ScenarioContextMenuRegistry;
-import org.drools.workbench.screens.scenariosimulation.client.metadata.ScenarioHeaderMetaData;
-import org.drools.workbench.screens.scenariosimulation.client.models.ScenarioGridModel;
-import org.drools.workbench.screens.scenariosimulation.client.renderers.ScenarioGridRenderer;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ScenarioSimulationBuilders;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn;
-import org.uberfire.ext.wires.core.grids.client.model.GridColumn.ColumnWidthMode;
-import org.uberfire.ext.wires.core.grids.client.model.GridData;
-import org.uberfire.ext.wires.core.grids.client.model.GridRow;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.NodeMouseEventHandler;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.impl.DefaultGridWidgetCellSelectorMouseEventHandler;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.impl.BaseGridRendererHelper;
-import org.uberfire.ext.wires.core.grids.client.widget.grid.selections.SelectionExtension;
-
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.COLUMNS;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.EXPRESSION_ALIAS_DESCRIPTION;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.EXPRESSION_ALIAS_GIVEN;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.EXPRESSION_ALIAS_INTEGER;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.GRID_COLUMN_GROUP;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.HEADER_ROWS_HEIGHT;
-import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(LienzoMockitoTestRunner.class)
-public class ScenarioGridTest {
-
-    @Mock
-    private ScenarioGridModel scenarioGridModelMock;
-    @Mock
-    private ScenarioGridLayer scenarioGridLayerMock;
-    @Mock
-    private ScenarioGridRenderer scenarioGridRendererMock;
-    @Mock
-    private ScenarioSimulationBuilders.HeaderBuilder headerBuilderMock;
-    @Mock
-    private ScenarioGridColumn scenarioGridColumnMock;
-    @Mock
-    private ScenarioHeaderMetaData propertyHeaderMetadataMock;
-    @Mock
-    private EventBus eventBusMock;
-    @Mock
-    private BaseGridRendererHelper rendererHelperMock;
-    @Mock
-    private BaseGridRendererHelper.RenderingInformation renderingInformationMock;
-    @Mock
-    private BaseGridRendererHelper.ColumnInformation columnInformationMock;
-    @Mock
-    private BaseGridRendererHelper.RenderingBlockInformation floatingBlockInformationMock;
-    @Mock
-    private Viewport viewportMock;
-    @Mock
-    private ScenarioContextMenuRegistry scenarioContextMenuRegistryMock;
-    @Mock
-    private ScenarioExpressionCellTextAreaSingletonDOMElementFactory expressionCellTextAreaSingletonDOMElementFactoryMock;
-    @Mock
-    private CollectionEditorSingletonDOMElementFactory collectionEditorSingletonDOMElementFactory;
-
-    private FactMapping factMappingDescription;
-    private FactMapping factMappingGiven;
-    private FactMapping factMappingInteger;
-    private FactIdentifier factIdentifierGiven;
-    private FactIdentifier factIdentifierInteger;
-
-    private Simulation simulation;
-    private ScenarioGrid scenarioGridSpy;
-
-    @Before
-    public void setup() {
-        simulation = getSimulation();
-        when(scenarioGridColumnMock.getPropertyHeaderMetaData()).thenReturn(propertyHeaderMetadataMock);
-        when(scenarioGridModelMock.getAbstractScesimModel()).thenReturn(Optional.of(simulation));
-        when(scenarioGridModelMock.getGridWidget()).thenReturn(GridWidget.SIMULATION);
-        when(scenarioGridModelMock.getScenarioExpressionCellTextAreaSingletonDOMElementFactory()).thenReturn(expressionCellTextAreaSingletonDOMElementFactoryMock);
-        when(scenarioGridModelMock.getCollectionEditorSingletonDOMElementFactory()).thenReturn(collectionEditorSingletonDOMElementFactory);
-        factIdentifierGiven = FactIdentifier.create("GIVEN", "GIVEN");
-        factIdentifierInteger = FactIdentifier.create("Integer", "java.lang.Integer");
-        factMappingDescription = new FactMapping(EXPRESSION_ALIAS_DESCRIPTION, FactIdentifier.DESCRIPTION, ExpressionIdentifier.DESCRIPTION);
-        factMappingGiven = new FactMapping(EXPRESSION_ALIAS_GIVEN, factIdentifierGiven, new ExpressionIdentifier("GIVEN", FactMappingType.GIVEN));
-        factMappingInteger = new FactMapping(EXPRESSION_ALIAS_INTEGER, factIdentifierInteger, new ExpressionIdentifier("GIVEN", FactMappingType.GIVEN));
-
-        scenarioGridSpy = spy(new ScenarioGrid(scenarioGridModelMock,
-                                               scenarioGridLayerMock,
-                                               scenarioGridRendererMock,
-                                               scenarioContextMenuRegistryMock) {
-
-            @Override
-            protected <T extends AbstractScesimData> void appendRow(int rowIndex, T scesimData) {
-                // do nothing
-            }
-
-            @Override
-            protected ScenarioSimulationBuilders.HeaderBuilder getHeaderBuilderLocal(String instanceTitle, String
-                    propertyTitle, String columnId, String columnGroup, FactMappingType factMappingType) {
-                return headerBuilderMock;
-            }
-
-            @Override
-            protected ScenarioGridColumn getScenarioGridColumnLocal(ScenarioSimulationBuilders.HeaderBuilder headerBuilder, String placeHolder) {
-                return scenarioGridColumnMock;
-            }
-
-            @Override
-            protected BaseGridRendererHelper getBaseGridRendererHelper() {
-                return rendererHelperMock;
-            }
-
-            @Override
-            public Viewport getViewport() {
-                return viewportMock;
-            }
-
-            @Override
-            protected ScenarioHeaderMetaData getColumnScenarioHeaderMetaData(final ScenarioGridColumn scenarioGridColumn,
-                                                                             final int rowIndex) {
-                return propertyHeaderMetadataMock;
-            }
-
-            @Override
-            protected EnableTestToolsEvent getEnableTestToolsEvent(final ScenarioGrid scenarioGrid,
-                                                                   final ScenarioGridColumn scenarioGridColumn,
-                                                                   final ScenarioHeaderMetaData scenarioHeaderMetaData,
-                                                                   int uiColumnIndex,
-                                                                   String group) {
-                return new EnableTestToolsEvent();
-            }
-
-            @Override
-            public Layer getLayer() {
-                return scenarioGridLayerMock;
-            }
-        });
-        when(rendererHelperMock.getRenderingInformation()).thenReturn(renderingInformationMock);
-        when(renderingInformationMock.getHeaderRowsHeight()).thenReturn(HEADER_ROWS_HEIGHT);
-        when(renderingInformationMock.getFloatingBlockInformation()).thenReturn(floatingBlockInformationMock);
-        when(propertyHeaderMetadataMock.getColumnGroup()).thenReturn(GRID_COLUMN_GROUP);
-        scenarioGridSpy.setEventBus(eventBusMock);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void testDefaultNodeMouseClickHandlers() {
-        final List<NodeMouseEventHandler> handlers = scenarioGridSpy.getNodeMouseClickEventHandlers(scenarioGridLayerMock);
-
-        assertEquals(1, handlers.size());
-        assertTrue(handlers.get(0) instanceof DefaultGridWidgetCellSelectorMouseEventHandler);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void testDefaultNodeMouseDoubleClickHandlers() {
-        final List<NodeMouseEventHandler> handlers = scenarioGridSpy.getNodeMouseDoubleClickEventHandlers(scenarioGridLayerMock,
-                                                                                                          scenarioGridLayerMock);
-
-        assertEquals(1, handlers.size());
-        assertTrue(handlers.get(0) instanceof ScenarioSimulationGridWidgetMouseEventHandler);
-    }
-
-    @Test
-    public void setContent() {
-        InOrder callsOrder = inOrder(scenarioGridModelMock, scenarioGridSpy);
-        scenarioGridSpy.setContent(simulation, ScenarioSimulationModel.Type.RULE);
-        callsOrder.verify(scenarioGridModelMock, times(1)).clear();
-        callsOrder.verify(scenarioGridModelMock, times(1)).bindContent(eq(simulation));
-        callsOrder.verify(scenarioGridSpy, times(1)).setHeaderColumns(eq(simulation), eq(ScenarioSimulationModel.Type.RULE));
-        callsOrder.verify(scenarioGridSpy, times(1)).appendRows(eq(simulation));
-        callsOrder.verify(scenarioGridModelMock, times(1)).loadFactMappingsWidth();
-        callsOrder.verify(scenarioGridModelMock, times(1)).forceRefreshWidth();
-    }
-
-    @Test
-    public void getGridWidget() {
-        final GridWidget retrieved = scenarioGridSpy.getGridWidget();
-        assertNotNull(retrieved);
-        assertEquals(GridWidget.SIMULATION, retrieved);
-        verify(scenarioGridSpy.getModel(), times(1)).getGridWidget();
-    }
-
-
-    @Test
-    public void clearSelections() {
-        scenarioGridSpy.clearSelections();
-        verify(scenarioGridModelMock, times(1)).clearSelections();
-        verify(scenarioGridLayerMock, times(1)).batch();
-    }
-
-    @Test
-    public void setSelectedColumn() {
-        int columnIndex = 1;
-        scenarioGridSpy.setSelectedColumn(columnIndex);
-        verify(scenarioGridModelMock, times(1)).selectColumn(eq(columnIndex));
-    }
-
-    @Test
-    public void setSelectedColumnAndHeader() {
-        int headerRowIndex = 1;
-        int columnIndex = 1;
-        scenarioGridSpy.setSelectedColumnAndHeader(headerRowIndex, columnIndex);
-        InOrder callsOrder = inOrder(scenarioGridSpy, scenarioGridLayerMock);
-        callsOrder.verify(scenarioGridSpy, times(1)).selectHeaderCell(eq(headerRowIndex), eq(columnIndex), eq(false), eq(false));
-        callsOrder.verify(scenarioGridSpy, times(1)).setSelectedColumn(eq(columnIndex));
-        callsOrder.verify(scenarioGridLayerMock, times(1)).batch();
-    }
-
-    @Test
-    public void setSelectedCell() {
-        int rowIndex = 1;
-        int columnIndex = 1;
-        scenarioGridSpy.setSelectedCell(rowIndex, columnIndex);
-        verify(scenarioGridSpy, times(1)).selectCell(eq(rowIndex), eq(columnIndex), eq(false), eq(false));
-        verify(scenarioGridLayerMock, times(1)).batch();
-    }
-
-    @Test
-    public void setHeaderColumns() {
-        scenarioGridSpy.setHeaderColumns(simulation, ScenarioSimulationModel.Type.RULE);
-        verify(scenarioGridSpy, times(COLUMNS)).setHeaderColumn(anyInt(), isA(FactMapping.class), eq(true));
-        scenarioGridSpy.setHeaderColumns(simulation, ScenarioSimulationModel.Type.DMN);
-        verify(scenarioGridSpy, times(COLUMNS)).setHeaderColumn(anyInt(), isA(FactMapping.class), eq(false));
-        Background background = new Background();
-        scenarioGridSpy.setHeaderColumns(background, ScenarioSimulationModel.Type.RULE);
-        verify(scenarioGridSpy, times(COLUMNS)).setHeaderColumn(anyInt(), isA(FactMapping.class), eq(false));
-        scenarioGridSpy.setHeaderColumns(background, ScenarioSimulationModel.Type.DMN);
-        verify(scenarioGridSpy, times(COLUMNS)).setHeaderColumn(anyInt(), isA(FactMapping.class), eq(false));
-    }
-
-    @Test
-    public void setHeaderColumn() {
-        String columnId = factMappingDescription.getExpressionIdentifier().getName();
-        FactMappingType type = factMappingDescription.getExpressionIdentifier().getType();
-        String columnGroup = type.name();
-        scenarioGridSpy.setType(ScenarioSimulationModel.Type.RULE);
-        scenarioGridSpy.setHeaderColumn(1, factMappingDescription, true);
-        verify(scenarioGridSpy, times(1)).isPropertyAssigned(eq(true), eq(factMappingDescription));
-        verify(scenarioGridSpy, times(1)).getPlaceHolder(eq(true), eq(true), isA(FactMappingValueType.class), anyString());
-        verify(scenarioGridSpy, times(1)).getScenarioGridColumnLocal(eq(EXPRESSION_ALIAS_DESCRIPTION),
-                                                                  any(),
-                                                                  eq(columnId),
-                                                                  eq(columnGroup),
-                                                                  eq(type),
-                                                                  anyString());
-        verify(scenarioGridColumnMock, times(1)).setColumnWidthMode(ColumnWidthMode.FIXED);
-        verify(scenarioGridModelMock, times(1)).getDOMElementFactory(anyString(), eq(ScenarioSimulationModel.Type.RULE), eq(FactMappingValueType.NOT_EXPRESSION));
-
-        reset(scenarioGridSpy);
-        reset(scenarioGridColumnMock);
-        reset(scenarioGridModelMock);
-        columnId = factMappingGiven.getExpressionIdentifier().getName();
-        type = factMappingGiven.getExpressionIdentifier().getType();
-        columnGroup = type.name();
-        scenarioGridSpy.setHeaderColumn(1, factMappingGiven, true);
-        verify(scenarioGridSpy, times(1)).isPropertyAssigned(eq(true), eq(factMappingGiven));
-        verify(scenarioGridSpy, times(1)).getPlaceHolder(eq(true), eq(false), eq(FactMappingValueType.NOT_EXPRESSION), anyString());
-        verify(scenarioGridSpy, times(1)).getScenarioGridColumnLocal(eq(EXPRESSION_ALIAS_GIVEN),
-                                                                     any(),
-                                                                     eq(columnId),
-                                                                     eq(columnGroup),
-                                                                     eq(type),
-                                                                     anyString());
-        verify(scenarioGridColumnMock, never()).setColumnWidthMode(any());
-        verify(scenarioGridModelMock, never()).getDOMElementFactory(any(), any(), any());
-    }
-
-    @Test
-    public void getScenarioGridColumnLocal() {
-        String columnId = factMappingDescription.getExpressionIdentifier().getName();
-        String instanceTitle = factMappingDescription.getFactIdentifier().getName();
-        String propertyTitle = "PROPERTY TITLE";
-        final FactMappingType type = factMappingDescription.getExpressionIdentifier().getType();
-        String columnGroup = type.name();
-        scenarioGridSpy.getScenarioGridColumnLocal(instanceTitle, propertyTitle, columnId, columnGroup, type, ScenarioSimulationEditorConstants.INSTANCE.insertValue());
-        verify(scenarioGridSpy, times(1)).getHeaderBuilderLocal(eq(instanceTitle),
-                                                                eq(propertyTitle),
-                                                                eq(columnId),
-                                                                eq(columnGroup),
-                                                                eq(type));
-    }
-
-    @Test
-    public void isInstanceAssigned() {
-        assertTrue(scenarioGridSpy.isInstanceAssigned(FactIdentifier.DESCRIPTION));
-        assertFalse(scenarioGridSpy.isInstanceAssigned(FactIdentifier.INDEX));
-        assertFalse(scenarioGridSpy.isInstanceAssigned(FactIdentifier.EMPTY));
-        assertTrue(scenarioGridSpy.isInstanceAssigned(factIdentifierGiven));
-    }
-
-    @Test
-    public void isPropertyAssigned() {
-        factMappingDescription.getExpressionElements().clear();
-        assertTrue(scenarioGridSpy.isPropertyAssigned(false, factMappingDescription));
-        assertTrue(scenarioGridSpy.isPropertyAssigned(true, factMappingDescription));
-        factMappingDescription.getExpressionElements().add(new ExpressionElement(TEST));
-        assertTrue(scenarioGridSpy.isPropertyAssigned(false, factMappingDescription));
-        assertTrue(scenarioGridSpy.isPropertyAssigned(true, factMappingDescription));
-        factMappingGiven.getExpressionElements().clear();
-        assertFalse(scenarioGridSpy.isPropertyAssigned(false, factMappingGiven));
-        assertFalse(scenarioGridSpy.isPropertyAssigned(true, factMappingGiven));
-        factMappingGiven.getExpressionElements().add(new ExpressionElement("test"));
-        assertFalse(scenarioGridSpy.isPropertyAssigned(false, factMappingGiven));
-        assertTrue(scenarioGridSpy.isPropertyAssigned(true, factMappingGiven));
-        factMappingInteger.getExpressionElements().clear();
-        assertFalse(scenarioGridSpy.isPropertyAssigned(false, factMappingInteger));
-        assertTrue(scenarioGridSpy.isPropertyAssigned(true, factMappingInteger));
-    }
-
-    @Test
-    public void appendRows() {
-        scenarioGridSpy.appendRows(simulation);
-        verify(scenarioGridSpy, times(1)).appendRow(anyInt(), isA(Scenario.class));
-    }
-
-    @Test
-    public void testAdjustSelection() {
-        final int uiColumnIndex = 0;
-        final int uiRowIndex = 0;
-        final ScenarioGridColumn columnMock = mock(ScenarioGridColumn.class);
-        when(columnMock.getIndex()).thenReturn(uiColumnIndex);
-        when(scenarioGridModelMock.getColumns()).thenReturn(Collections.singletonList(columnMock));
-
-        final GridData.SelectedCell selectedHeaderCell = mock(GridData.SelectedCell.class);
-        when(selectedHeaderCell.getColumnIndex()).thenReturn(uiColumnIndex);
-        when(selectedHeaderCell.getRowIndex()).thenReturn(uiRowIndex);
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.singletonList(selectedHeaderCell));
-
-        scenarioGridSpy.adjustSelection(mock(SelectionExtension.class), false);
-
-        verify(scenarioGridSpy).signalTestTools();
-        verify(scenarioGridSpy).setSelectedColumn(eq(uiColumnIndex));
-        verify(eventBusMock).fireEvent(any());
-
-        // context menus could be shown
-        verify(scenarioContextMenuRegistryMock, times(1)).hideMenus();
-        verify(scenarioContextMenuRegistryMock, times(1)).hideErrorReportPopover();
-    }
-
-    @Test
-    public void testShowContextMenuDescription() {
-        final int uiColumnIndex = 0;
-        final int uiRowIndex = 0;
-        final double columnWidth = 100.0;
-        final GridColumn columnMock = mock(ScenarioGridColumn.class);
-        when(columnMock.getIndex()).thenReturn(uiColumnIndex);
-        when(columnMock.getWidth()).thenReturn(columnWidth);
-        when(((ScenarioGridColumn) columnMock).getFactIdentifier()).thenReturn(FactIdentifier.DESCRIPTION);
-        when(columnMock.getHeaderMetaData()).thenReturn(Collections.singletonList(mock(GridColumn.HeaderMetaData.class)));
-        when(scenarioGridModelMock.getColumns()).thenReturn(Collections.singletonList(columnMock));
-
-        final double rowHeight = 40.0;
-        final GridRow gridRow = mock(ScenarioGridRow.class);
-        when(gridRow.getHeight()).thenReturn(rowHeight);
-        when(scenarioGridModelMock.getRow(uiRowIndex)).thenReturn(gridRow);
-
-        when(rendererHelperMock.getColumnInformation(50.0)).thenReturn(columnInformationMock);
-        when(columnInformationMock.getColumn()).thenReturn(columnMock);
-    }
-
-    @Test
-    public void testShowContextMenuGivenOrExpect() {
-        final String columnGroup = "grp";
-        final ScenarioHeaderMetaData scenarioHeaderMetaDataMock = mock(ScenarioHeaderMetaData.class);
-        when(scenarioHeaderMetaDataMock.getColumnGroup()).thenReturn(columnGroup);
-
-        final int uiColumnIndex = 0;
-        final int uiRowIndex = 0;
-        final double columnWidth = 100.0;
-        final GridColumn columnMock = mock(ScenarioGridColumn.class);
-        when(columnMock.getIndex()).thenReturn(uiColumnIndex);
-        when(columnMock.getWidth()).thenReturn(columnWidth);
-        when(((ScenarioGridColumn) columnMock).getFactIdentifier()).thenReturn(FactIdentifier.EMPTY);
-        when(columnMock.getHeaderMetaData()).thenReturn(Collections.singletonList(scenarioHeaderMetaDataMock));
-        when(((ScenarioGridColumn) columnMock).getInformationHeaderMetaData()).thenReturn(scenarioHeaderMetaDataMock);
-        when(scenarioGridModelMock.getColumns()).thenReturn(Collections.singletonList(columnMock));
-
-        final double rowHeight = 40.0;
-        final GridRow gridRow = mock(ScenarioGridRow.class);
-        when(gridRow.getHeight()).thenReturn(rowHeight);
-        when(scenarioGridModelMock.getRow(uiRowIndex)).thenReturn(gridRow);
-
-        when(rendererHelperMock.getColumnInformation(50.0)).thenReturn(columnInformationMock);
-        when(columnInformationMock.getColumn()).thenReturn(columnMock);
-    }
-
-    private Simulation getSimulation() {
-        Simulation toReturn = new Simulation();
-        ScesimModelDescriptor simulationDescriptor = toReturn.getScesimModelDescriptor();
-        simulationDescriptor.addFactMapping(FactIdentifier.INDEX.getName(), FactIdentifier.INDEX, ExpressionIdentifier.INDEX);
-        simulationDescriptor.addFactMapping(FactIdentifier.DESCRIPTION.getName(), FactIdentifier.DESCRIPTION, ExpressionIdentifier.DESCRIPTION);
-
-        Scenario scenario = toReturn.addData();
-        int row = toReturn.getUnmodifiableData().indexOf(scenario);
-        scenario.setDescription(null);
-
-        // Add GIVEN Facts
-        IntStream.range(2, 4).forEach(id -> {
-            ExpressionIdentifier givenExpression = ExpressionIdentifier.create(row + "|" + id, FactMappingType.GIVEN);
-            simulationDescriptor.addFactMapping(FactMapping.getInstancePlaceHolder(id), FactIdentifier.EMPTY, givenExpression);
-            scenario.addMappingValue(FactIdentifier.EMPTY, givenExpression, null);
-        });
-
-        // Add EXPECT Facts
-        IntStream.range(2, 4).forEach(id -> {
-            id += 2; // This is to have consistent labels/names even when adding columns at runtime
-            ExpressionIdentifier expectedExpression = ExpressionIdentifier.create(row + "|" + id, FactMappingType.EXPECT);
-            simulationDescriptor.addFactMapping(FactMapping.getInstancePlaceHolder(id), FactIdentifier.EMPTY, expectedExpression);
-            scenario.addMappingValue(FactIdentifier.EMPTY, expectedExpression, null);
-        });
-        return toReturn;
-    }
-
-    @Test
-    public void signalTestToolsHeaderCellSelected() {
-        final int uiColumnIndex = 0;
-        final int uiRowIndex = 0;
-        final ScenarioGridColumn columnMock = mock(ScenarioGridColumn.class);
-        when(columnMock.getIndex()).thenReturn(uiColumnIndex);
-        when(scenarioGridModelMock.getColumns()).thenReturn(Collections.singletonList(columnMock));
-
-        final GridData.SelectedCell selectedHeaderCell = mock(GridData.SelectedCell.class);
-        when(selectedHeaderCell.getColumnIndex()).thenReturn(uiColumnIndex);
-        when(selectedHeaderCell.getRowIndex()).thenReturn(uiRowIndex);
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.singletonList(selectedHeaderCell));
-        scenarioGridSpy.signalTestToolsHeaderCellSelected(columnMock, selectedHeaderCell, uiColumnIndex);
-        verify(eventBusMock, times(1)).fireEvent(isA(EnableTestToolsEvent.class));
-    }
-
-    @Test
-    public void signalTestToolsHeaderCellSelected_EmptyInstance() {
-        final int uiColumnIndex = 0;
-        final int uiRowIndex = 0;
-        final ScenarioGridColumn columnMock = mock(ScenarioGridColumn.class);
-        when(columnMock.getIndex()).thenReturn(uiColumnIndex);
-        when(scenarioGridModelMock.getColumns()).thenReturn(Collections.singletonList(columnMock));
-        when(columnMock.isInstanceAssigned()).thenReturn(true);
-        when(propertyHeaderMetadataMock.getMetadataType()).thenReturn(ScenarioHeaderMetaData.MetadataType.INSTANCE);
-
-        final GridData.SelectedCell selectedHeaderCell = mock(GridData.SelectedCell.class);
-        when(selectedHeaderCell.getColumnIndex()).thenReturn(uiColumnIndex);
-        when(selectedHeaderCell.getRowIndex()).thenReturn(uiRowIndex);
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(Collections.singletonList(selectedHeaderCell));
-        scenarioGridSpy.signalTestToolsHeaderCellSelected(columnMock, selectedHeaderCell, uiColumnIndex);
-        verify(eventBusMock, times(1)).fireEvent(isA(ReloadTestToolsEvent.class));
-    }
-
-    @Test
-    public void ensureCellIsSelected_EmptyGrid() {
-        when(scenarioGridModelMock.getColumnCount()).thenReturn(0);
-        scenarioGridSpy.ensureCellIsSelected();
-        verify(scenarioGridSpy, never()).selectCell(anyInt(), anyInt(), anyBoolean(), anyBoolean());
-        verify(scenarioGridSpy, never()).signalTestTools();
-    }
-
-    @Test
-    public void reselectCurrentHeaderCell() {
-        final ScenarioGridColumn columnMock = mock(ScenarioGridColumn.class);
-        when(columnMock.getIndex()).thenReturn(0);
-        when(scenarioGridModelMock.getColumns()).thenReturn(Collections.singletonList(columnMock));
-        List<GridData.SelectedCell> selectedHeaderCells = new ArrayList<>();
-        selectedHeaderCells.add(new GridData.SelectedCell(0, 0));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(selectedHeaderCells);
-        scenarioGridSpy.selectCurrentHeaderCellGroup();
-        verify(scenarioGridSpy, times(1)).setSelectedColumnAndHeader(eq(0), eq(0));
-    }
-
-    @Test
-    public void reselectCurrentHeaderCellMultipleColumns() {
-        final ScenarioGridColumn columnMock = mock(ScenarioGridColumn.class);
-        when(columnMock.getIndex()).thenReturn(0);
-        final ScenarioGridColumn columnMock2 = mock(ScenarioGridColumn.class);
-        when(columnMock2.getIndex()).thenReturn(1);
-        final ScenarioGridColumn columnMock3 = mock(ScenarioGridColumn.class);
-        when(columnMock3.getIndex()).thenReturn(2);
-        when(scenarioGridModelMock.getColumns()).thenReturn(Arrays.asList(columnMock, columnMock2, columnMock3));
-        List<GridData.SelectedCell> selectedHeaderCells = new ArrayList<>();
-        selectedHeaderCells.add(new GridData.SelectedCell(0, 0));
-        selectedHeaderCells.add(new GridData.SelectedCell(0, 1));
-        selectedHeaderCells.add(new GridData.SelectedCell(0, 2));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(selectedHeaderCells);
-        scenarioGridSpy.selectCurrentHeaderCellGroup();
-        verify(scenarioGridSpy, times(1)).setSelectedColumnAndHeader(eq(0), eq(0));
-    }
-
-    @Test
-    public void reselectCurrentHeaderCellMultipleMiddleColumns() {
-        final ScenarioGridColumn columnMock = mock(ScenarioGridColumn.class);
-        when(columnMock.getIndex()).thenReturn(0);
-        final ScenarioGridColumn columnMock2 = mock(ScenarioGridColumn.class);
-        when(columnMock2.getIndex()).thenReturn(1);
-        final ScenarioGridColumn columnMock3 = mock(ScenarioGridColumn.class);
-        when(columnMock3.getIndex()).thenReturn(2);
-        when(scenarioGridModelMock.getColumns()).thenReturn(Arrays.asList(columnMock, columnMock2, columnMock3));
-        List<GridData.SelectedCell> selectedHeaderCells = new ArrayList<>();
-        selectedHeaderCells.add(new GridData.SelectedCell(0, 1));
-        selectedHeaderCells.add(new GridData.SelectedCell(0, 2));
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(selectedHeaderCells);
-        scenarioGridSpy.selectCurrentHeaderCellGroup();
-        verify(scenarioGridSpy, times(1)).setSelectedColumnAndHeader(eq(0), eq(1));
-    }
-
-    @Test
-    public void reselectCurrentHeaderCell_NoHeaderCellsSelected() {
-        List<GridData.SelectedCell> selectedHeaderCells = new ArrayList<>();
-        when(scenarioGridModelMock.getSelectedHeaderCells()).thenReturn(selectedHeaderCells);
-        scenarioGridSpy.selectCurrentHeaderCellGroup();
-        verify(scenarioGridSpy, never()).setSelectedColumnAndHeader(anyInt(), anyInt());
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridWidgetTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridWidgetTest.java
deleted file mode 100644
index 9b6f6d1..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridWidgetTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.client.widgets;
-
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.AbstractScenarioSimulationTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioGridWidgetTest extends AbstractScenarioSimulationTest {
-
-    public static final int WIDTH = 44;
-    public static final int HEIGHT = 82;
-
-    @Mock
-    private Widget parentWidget;
-
-    private ScenarioGridWidget scenarioGridWidget;
-
-    @Before
-    public void setup() {
-        super.setup();
-        scenarioGridWidget = spy(new ScenarioGridWidget());
-        scenarioGridWidget.setScenarioGridPanel(scenarioGridPanelMock);
-
-        when(scenarioGridWidget.getParent()).thenReturn(parentWidget);
-        when(parentWidget.getOffsetHeight()).thenReturn(HEIGHT);
-        when(parentWidget.getOffsetWidth()).thenReturn(WIDTH);
-    }
-
-    @Test
-    public void refreshContent() {
-        scenarioGridWidget.refreshContent(simulationMock);
-        verify(scenarioGridModelMock, times(1)).bindContent(eq(simulationMock));
-        verify(scenarioGridModelMock, times(1)).refreshErrors();
-        verify(scenarioGridWidget, times(1)).onResize();
-    }
-
-    @Test
-    public void onResize() {
-        scenarioGridWidget.onResize();
-        verify(scenarioGridWidget, times(1)).setPixelSize(eq(WIDTH), eq(HEIGHT));
-        verify(scenarioGridPanelMock, times(1)).onResize();
-    }
-
-    @Test
-    public void unregister() {
-        scenarioGridWidget.unregister();
-        verify(scenarioGridPanelMock, times(1)).unregister();
-    }
-
-    @Test
-    public void clearSelection() {
-        scenarioGridWidget.clearSelections();
-        verify(scenarioGridModelMock, times(1)).clearSelections();
-    }
-
-    @Test
-    public void resetErrors() {
-        scenarioGridWidget.resetErrors();
-        verify(scenarioGridModelMock, times(1)).resetErrors();
-    }
-
-    @Test
-    public void selectAndFocus() {
-        scenarioGridWidget.selectAndFocus();
-        verify(scenarioGridMock, times(1)).select();
-        verify(scenarioGridPanelMock, times(1)).setFocus(eq(true));
-        verify(scenarioGridPanelMock, times(1)).ensureCellIsSelected();
-        assertTrue(scenarioGridWidget.selected);
-    }
-
-    @Test
-    public void deselectAndUnFocus() {
-        scenarioGridWidget.deselectAndUnFocus();
-        verify(scenarioGridMock, times(1)).deselect();
-        verify(scenarioGridPanelMock, times(1)).setFocus(eq(false));
-        assertFalse(scenarioGridWidget.selected);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/uberfire/mocks/EventSourceMock.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/uberfire/mocks/EventSourceMock.java
deleted file mode 100644
index b572754..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/uberfire/mocks/EventSourceMock.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.uberfire.mocks;
-
-import java.lang.annotation.Annotation;
-import java.util.concurrent.CompletionStage;
-
-import javax.enterprise.event.Event;
-import javax.enterprise.event.NotificationOptions;
-import javax.enterprise.util.TypeLiteral;
-
-public class EventSourceMock<T> implements Event<T> {
-
-    @Override
-    public void fire(T event) {
-        throw new UnsupportedOperationException("mocking testing class");
-    }
-
-    @Override
-    public Event<T> select(Annotation... qualifiers) {
-        throw new UnsupportedOperationException("mocking testing class");
-    }
-
-    @Override
-    public <U extends T> Event<U> select(Class<U> subtype,
-                                         Annotation... qualifiers) {
-        throw new UnsupportedOperationException("mocking testing class");
-    }
-
-    @Override
-    public <U extends T> CompletionStage<U> fireAsync(U event) {
-        throw new UnsupportedOperationException("mocking testing class");
-    }
-
-    @Override
-    public <U extends T> CompletionStage<U> fireAsync(U event, NotificationOptions options) {
-        throw new UnsupportedOperationException("mocking testing class");
-    }
-
-    @Override
-    public <U extends T> Event<U> select(TypeLiteral<U> subtype, Annotation... qualifiers) {
-        throw new UnsupportedOperationException("mocking testing class");
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/README.md b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/README.md
deleted file mode 100644
index d14da2c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-   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.
--->
-
-# Kogito SCESIM Client Module
-
-This module scope is to provide the client layer (i.e. all the frontend view and presenter)
-for Kogito Scesim editor project.
-
-The entrypoint of the client layer is **ScenarioSimulationEditorKogitoWrapper**, which represents
-the whole Editor widget.
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/pom.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/pom.xml
deleted file mode 100644
index d56927a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/pom.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.kie.kogito.stunner.editors</groupId>
-    <artifactId>drools-wb-scenario-simulation-editor</artifactId>
-    <version>${revision}</version>
-  </parent>
-
-  <artifactId>drools-wb-scenario-simulation-editor-kogito-client</artifactId>
-  <packaging>jar</packaging>
-
-  <name>Drools Workbench - Scenario Simulation Editor - Kogito - Client</name>
-  <description>Drools Workbench - Scenario Simulation Editor - Kogito - Client</description>
-
-  <properties>
-    <java.module.name>org.drools.wb.scenariosimulation.editor.kogito</java.module.name>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-dmn-webapp-kogito-marshaller</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-scenario-simulation-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>drools-wb-scenario-simulation-editor-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>drools-wb-scenario-simulation-editor-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.gwtproject</groupId>
-      <artifactId>gwt-user</artifactId>
-    </dependency>
-
-    <!-- Transitive -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-ui</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-client-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>appformer-kogito-bridge</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-workbench-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.elemental2</groupId>
-      <artifactId>elemental2-promise</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.gwtbootstrap3</groupId>
-      <artifactId>gwtbootstrap3</artifactId>
-    </dependency>
-
-    <!-- Transitive dependencies -->
-    <dependency>
-      <groupId>com.google.elemental2</groupId>
-      <artifactId>elemental2-dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-ioc</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.spec.javax.annotation</groupId>
-          <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-ui</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-workbench-client-views-patternfly</artifactId>
-    </dependency>
-
-    <!-- MARSHALLING -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>drools-wb-scenario-simulation-editor-kogito-marshaller</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>base</artifactId>
-    </dependency>
-    <!-- END MARSHALLING -->
-
-    <!-- TEST -->
-    <dependency>
-      <groupId>com.google.gwt.gwtmockito</groupId>
-      <artifactId>gwtmockito</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-kogito-client</artifactId>
-    </dependency>
-    <!-- END TEST -->
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.kie.kogito.stunner.editors</groupId>
-        <artifactId>drools-wb-scenario-simulation-editor-client</artifactId>
-        <classifier>tests</classifier>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/commands/ScenarioSimulationKogitoStateControlManager.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/commands/ScenarioSimulationKogitoStateControlManager.java
deleted file mode 100644
index 0215e0e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/commands/ScenarioSimulationKogitoStateControlManager.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.commands;
-
-import java.util.function.Supplier;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import org.appformer.kogito.bridge.client.interop.WindowRef;
-import org.appformer.kogito.bridge.client.stateControl.interop.StateControl;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioCommandRegistryManager;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-
-@Dependent
-public class ScenarioSimulationKogitoStateControlManager {
-
-    protected Supplier<Boolean> envelopeAvailableSupplier;
-    protected Supplier<StateControl> stateControlSupplier;
-
-    @Inject
-    public ScenarioSimulationKogitoStateControlManager() {
-         envelopeAvailableSupplier = WindowRef::isEnvelopeAvailable;
-         stateControlSupplier = StateControl::get;
-    }
-
-    public void initialize(final ScenarioCommandRegistryManager scenarioCommandRegistryManager,
-                           final ScenarioSimulationContext scenarioSimulationContext) {
-        if (isEnvelopeAvailable()) {
-            stateControlSupplier.get().setUndoCommand(() -> scenarioCommandRegistryManager.undo(scenarioSimulationContext));
-            stateControlSupplier.get().setRedoCommand(() -> scenarioCommandRegistryManager.redo(scenarioSimulationContext));
-        }
-    }
-
-    private boolean isEnvelopeAvailable() {
-        return envelopeAvailableSupplier.get();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/converters/ApiJSInteropConverter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/converters/ApiJSInteropConverter.java
deleted file mode 100644
index abf3203..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/converters/ApiJSInteropConverter.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.converters;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import jsinterop.base.Js;
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.BackgroundData;
-import org.drools.scenariosimulation.api.model.ExpressionElement;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingValue;
-import org.drools.scenariosimulation.api.model.Scenario;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.scenariosimulation.api.model.imports.Import;
-import org.drools.scenariosimulation.api.model.imports.Imports;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIBackgroundDataType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIBackgroundDatasType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIBackgroundType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIExpressionElementType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIExpressionElementsType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIExpressionIdentifierType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIFactIdentifierType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIFactMappingType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIFactMappingValueType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIFactMappingValuesType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIFactMappingsType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIGenericTypes;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIImportType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIImportsType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIRawValueType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIScenarioSimulationModelType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIScenarioType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIScenariosType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIScesimModelDescriptorType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSISettingsType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSISimulationType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIWrappedImportsType;
-
-/**
- * Class used to convert from <b>api</b> bean to <b>JSInterop</b> one
- */
-public class ApiJSInteropConverter {
-
-    private ApiJSInteropConverter() {
-        // Not instantiable
-    }
-
-    public static JSIScenarioSimulationModelType getJSIScenarioSimulationModelType(ScenarioSimulationModel source) {
-        JSIScenarioSimulationModelType toReturn = JSIScenarioSimulationModelType.newInstance();
-        toReturn.setVersion(source.getVersion());
-        toReturn.setSettings(getSettings(source.getSettings()));
-        toReturn.setImports(getImports(source.getImports()));
-        toReturn.setSimulation(getSimulation(source.getSimulation()));
-        toReturn.setBackground(getBackground(source.getBackground()));
-        return toReturn;
-    }
-
-    protected static JSISettingsType getSettings(Settings source) {
-        JSISettingsType toReturn = JSISettingsType.newInstance();
-        toReturn.setDmoSession(source.getDmoSession());
-        toReturn.setType(source.getType().name());
-        toReturn.setFileName(source.getFileName());
-        toReturn.setKieSession(source.getKieSession());
-        toReturn.setKieBase(source.getKieBase());
-        toReturn.setRuleFlowGroup(source.getRuleFlowGroup());
-        toReturn.setDmnFilePath(source.getDmnFilePath());
-        toReturn.setDmnNamespace(source.getDmnNamespace());
-        toReturn.setDmnName(source.getDmnName());
-        toReturn.setSkipFromBuild(source.isSkipFromBuild());
-        toReturn.setStateless(source.isStateless());
-        return toReturn;
-    }
-
-    protected static JSIImportsType getImports(Imports source) {
-        JSIImportsType toReturn = JSIImportsType.newInstance();
-        final List<Import> imports = source.getImports();
-        JSIWrappedImportsType jsiWrappedImportsType = JSIWrappedImportsType.newInstance();
-        toReturn.setImports(jsiWrappedImportsType);
-        if (imports != null) {
-            List<JSIImportType> toSet = imports.stream().map(ApiJSInteropConverter::getImport).collect(Collectors.toList());
-            jsiWrappedImportsType.setImport(toSet);
-        }
-        return toReturn;
-    }
-
-    protected static JSIImportType getImport(Import source) {
-        JSIImportType toReturn = JSIImportType.newInstance();
-        toReturn.setType(source.getType());
-        return toReturn;
-    }
-
-    protected static JSISimulationType getSimulation(Simulation source) {
-        JSISimulationType toReturn = JSISimulationType.newInstance();
-        JSIScesimModelDescriptorType jsiScesimModelDescriptorType = getScesimModelDescriptor(source.getScesimModelDescriptor());
-        toReturn.setScesimModelDescriptor(jsiScesimModelDescriptorType);
-        final List<Scenario> unmodifiableScenarios = source.getUnmodifiableData();
-        JSIScenariosType jsiScenariosType = JSIScenariosType.newInstance();
-        toReturn.setScesimData(jsiScenariosType);
-        List<JSIScenarioType> toSet = unmodifiableScenarios.stream()
-                .map(ApiJSInteropConverter::getScenario).collect(Collectors.toList());
-        jsiScenariosType.setScenario(toSet);
-        return toReturn;
-    }
-
-    protected static JSIScenarioType getScenario(Scenario source) {
-        JSIScenarioType toReturn = JSIScenarioType.newInstance();
-        JSIFactMappingValuesType factMappingValuesType = JSIFactMappingValuesType.newInstance();
-        toReturn.setFactMappingValues(factMappingValuesType);
-        final List<FactMappingValue> unmodifiableFactMappingValues = source.getUnmodifiableFactMappingValues();
-        List<JSIFactMappingValueType> toSet = populateJSIFactMappingValuesType(unmodifiableFactMappingValues);
-        factMappingValuesType.setFactMappingValue(toSet);
-        return toReturn;
-    }
-
-    protected static JSIBackgroundType getBackground(Background source) {
-        JSIBackgroundType toReturn = JSIBackgroundType.newInstance();
-        JSIScesimModelDescriptorType jsiScesimModelDescriptorType = getScesimModelDescriptor(source.getScesimModelDescriptor());
-        toReturn.setScesimModelDescriptor(jsiScesimModelDescriptorType);
-        final List<BackgroundData> unmodifiableBackgroundDatas = source.getUnmodifiableData();
-        JSIBackgroundDatasType jsiBackgroundDatasType = JSIBackgroundDatasType.newInstance();
-        toReturn.setScesimData(jsiBackgroundDatasType);
-        List<JSIBackgroundDataType> toSet = unmodifiableBackgroundDatas.stream()
-                .map(ApiJSInteropConverter::getBackgroundData).collect(Collectors.toList());
-        jsiBackgroundDatasType.setBackgroundData(toSet);
-        return toReturn;
-    }
-
-    protected static JSIBackgroundDataType getBackgroundData(BackgroundData source) {
-        JSIBackgroundDataType toReturn = JSIBackgroundDataType.newInstance();
-        JSIFactMappingValuesType factMappingValuesType = JSIFactMappingValuesType.newInstance();
-        toReturn.setFactMappingValues(factMappingValuesType);
-        final List<FactMappingValue> unmodifiableFactMappingValues = source.getUnmodifiableFactMappingValues();
-        List<JSIFactMappingValueType> toSet = populateJSIFactMappingValuesType(unmodifiableFactMappingValues);
-        factMappingValuesType.setFactMappingValue(toSet);
-        return toReturn;
-    }
-
-    protected static List<JSIFactMappingValueType> populateJSIFactMappingValuesType(List<FactMappingValue> source) {
-        List<JSIFactMappingValueType> toReturn = new ArrayList<>();
-        for (int i = 0; i < source.size(); i++) {
-            FactMappingValue factMappingValue = source.get(i);
-            toReturn.add(Js.uncheckedCast(getFactMappingValue(factMappingValue)));
-        }
-        return toReturn;
-    }
-
-    protected static JSIScesimModelDescriptorType getScesimModelDescriptor(ScesimModelDescriptor source) {
-        JSIScesimModelDescriptorType toReturn = JSIScesimModelDescriptorType.newInstance();
-        final List<FactMapping> factMappings = source.getFactMappings();
-        JSIFactMappingsType jsiFactMappingsType = JSIFactMappingsType.newInstance();
-        toReturn.setFactMappings(jsiFactMappingsType);
-        List<JSIFactMappingType> toSet = factMappings.stream()
-                .map(ApiJSInteropConverter::getFactMapping).collect(Collectors.toList());
-        jsiFactMappingsType.setFactMapping(toSet);
-        return toReturn;
-    }
-
-    protected static JSIFactMappingValueType getFactMappingValue(FactMappingValue source) {
-        JSIFactMappingValueType toReturn = JSIFactMappingValueType.newInstance();
-        final JSIExpressionIdentifierType expressionIdentifierType = Js.uncheckedCast(getExpressionIdentifier(source.getExpressionIdentifier()));
-        toReturn.setExpressionIdentifier(expressionIdentifierType);
-        final JSIFactIdentifierType jsiFactIdentifierReferenceType = Js.uncheckedCast(getFactIdentifier(source.getFactIdentifier()));
-        toReturn.setFactIdentifier(jsiFactIdentifierReferenceType);
-        Object rawValue = source.getRawValue();
-        if (rawValue != null) {
-            JSIRawValueType jsiRawValueType = Js.uncheckedCast(getRawValueReference(rawValue));
-            toReturn.setRawValue(jsiRawValueType);
-        }
-        return toReturn;
-    }
-
-    protected static JSIRawValueType getRawValueReference(Object rawValue) {
-        JSIRawValueType toReturn = JSIRawValueType.newInstance();
-        toReturn.setClazz("string");
-        toReturn.setValue(rawValue.toString());
-        return toReturn;
-    }
-
-    protected static JSIFactMappingType getFactMapping(FactMapping source) {
-        JSIFactMappingType toReturn = JSIFactMappingType.newInstance();
-        toReturn.setClassName(source.getClassName());
-        toReturn.setExpressionAlias(source.getExpressionAlias());
-        JSIExpressionElementsType jsiExpressionElementsType = Js.uncheckedCast(getExpressionElements(source.getExpressionElements()));
-        toReturn.setExpressionElements(jsiExpressionElementsType);
-        JSIExpressionIdentifierType jsiExpressionIdentifierType = Js.uncheckedCast(getExpressionIdentifier(source.getExpressionIdentifier()));
-        toReturn.setExpressionIdentifier(jsiExpressionIdentifierType);
-        toReturn.setFactAlias(source.getFactAlias());
-        JSIFactIdentifierType jsiFactIdentifierType = Js.uncheckedCast(getFactIdentifier(source.getFactIdentifier()));
-        toReturn.setFactIdentifier(jsiFactIdentifierType);
-        toReturn.setFactMappingValueType(source.getFactMappingValueType().toString());
-        toReturn.setColumnWidth(source.getColumnWidth());
-        List<String> genericTypes = source.getGenericTypes();
-        if (genericTypes != null) {
-            JSIGenericTypes toSet = JSIGenericTypes.newInstance();
-            toSet.setString(genericTypes);
-            toReturn.setGenericTypes(toSet);
-        }
-        return toReturn;
-    }
-
-    protected static JSIExpressionElementsType getExpressionElements(List<ExpressionElement> expressionElements) {
-        JSIExpressionElementsType toReturn = JSIExpressionElementsType.newInstance();
-        List<JSIExpressionElementType> toSet = expressionElements.stream()
-                .map(ApiJSInteropConverter::getExpressionElement).collect(Collectors.toList());
-        toReturn.setExpressionElement(toSet);
-        return toReturn;
-    }
-
-    protected static JSIExpressionElementType getExpressionElement(ExpressionElement expressionElement) {
-        JSIExpressionElementType toReturn = JSIExpressionElementType.newInstance();
-        toReturn.setStep(expressionElement.getStep());
-        return toReturn;
-    }
-
-    protected static JSIExpressionIdentifierType getExpressionIdentifier(ExpressionIdentifier source) {
-        JSIExpressionIdentifierType toReturn = JSIExpressionIdentifierType.newInstance();
-        toReturn.setName(source.getName());
-        toReturn.setType(source.getType().name());
-        return toReturn;
-    }
-
-    protected static JSIFactIdentifierType getFactIdentifier(FactIdentifier factIdentifier) {
-        JSIFactIdentifierType toReturn = JSIFactIdentifierType.newInstance();
-        toReturn.setName(factIdentifier.getName());
-        toReturn.setClassName(factIdentifier.getClassName());
-        toReturn.setImportPrefix(factIdentifier.getImportPrefix());
-        return toReturn;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/converters/JSInteropApiConverter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/converters/JSInteropApiConverter.java
deleted file mode 100644
index fc38480..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/converters/JSInteropApiConverter.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.converters;
-
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.BackgroundData;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.model.Scenario;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.scenariosimulation.api.model.imports.Import;
-import org.drools.scenariosimulation.api.model.imports.Imports;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIBackgroundDatasType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIBackgroundType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIExpressionElementsType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIExpressionIdentifierType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIFactIdentifierType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIFactMappingValuesType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIGenericTypes;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIImportType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIImportsType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIScenarioSimulationModelType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIScenariosType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIScesimModelDescriptorType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSISettingsType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSISimulationType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIWrappedImportsType;
-
-/**
- * Class used to convert from <b>JSInterop</b> bean to <b>api</b> one
- */
-public class JSInteropApiConverter {
-
-    private JSInteropApiConverter() {
-        // Not instantiable
-    }
-
-    public static ScenarioSimulationModel getScenarioSimulationModel(JSIScenarioSimulationModelType source) {
-        ScenarioSimulationModel toReturn = new ScenarioSimulationModel();
-        toReturn.setSettings(getSettings(source.getSettings()));
-        toReturn.setImports(getImports(source.getImports()));
-        toReturn.setSimulation(getSimulation(source.getSimulation()));
-        toReturn.setBackground(getBackground(source.getBackground()));
-        return toReturn;
-    }
-
-    protected static Settings getSettings(JSISettingsType source) {
-        Settings toReturn = new Settings();
-        if (source != null) {
-            toReturn.setDmoSession(source.getDmoSession());
-            toReturn.setType(ScenarioSimulationModel.Type.valueOf(source.getType()));
-            toReturn.setFileName(source.getFileName());
-            toReturn.setKieSession(source.getKieSession());
-            toReturn.setKieBase(source.getKieBase());
-            toReturn.setRuleFlowGroup(source.getRuleFlowGroup());
-            toReturn.setDmnFilePath(source.getDmnFilePath());
-            toReturn.setDmnNamespace(source.getDmnNamespace());
-            toReturn.setDmnName(source.getDmnName());
-            toReturn.setSkipFromBuild(source.getSkipFromBuild());
-            toReturn.setStateless(source.getStateless());
-        }
-        return toReturn;
-    }
-
-    protected static Imports getImports(JSIImportsType source) {
-        Imports toReturn = new Imports();
-        if (source != null && source.getImports() != null) {
-            final JSIWrappedImportsType imports = source.getImports();
-            imports.getImport().forEach(importsType -> toReturn.addImport(getImport(importsType)));
-        }
-        return toReturn;
-    }
-
-    protected static Import getImport(JSIImportType source) {
-        Import toReturn = new Import();
-        toReturn.setType(source.getType());
-        return toReturn;
-    }
-
-    protected static Simulation getSimulation(JSISimulationType source) {
-        Simulation toReturn = new Simulation();
-        populateScesimModelDescriptor(toReturn.getScesimModelDescriptor(), source.getScesimModelDescriptor());
-        final JSIScenariosType jsiScenariosType = source.getScesimData();
-        jsiScenariosType.getScenario().forEach(jsiScenarioType -> {
-            Scenario added = toReturn.addData();
-            populateAbstractScesimData(added, jsiScenarioType.getFactMappingValues());
-        });
-        return toReturn;
-    }
-
-    protected static Background getBackground(JSIBackgroundType source) {
-        Background toReturn = new Background();
-        populateScesimModelDescriptor(toReturn.getScesimModelDescriptor(), source.getScesimModelDescriptor());
-        final JSIBackgroundDatasType jsiBackgroundDatasType = source.getScesimData();
-        jsiBackgroundDatasType.getBackgroundData().forEach(jsiScenarioType -> {
-            BackgroundData added = toReturn.addData();
-            populateAbstractScesimData(added, jsiScenarioType.getFactMappingValues());
-        });
-        return toReturn;
-    }
-
-    protected static void populateAbstractScesimData(AbstractScesimData toPopulate, JSIFactMappingValuesType source) {
-        source.getFactMappingValue().forEach(jsiFactMappingValueType -> {
-            JSIFactIdentifierType factIdentifierType = jsiFactMappingValueType.getFactIdentifier();
-            final JSIExpressionIdentifierType expressionIdentifierType = jsiFactMappingValueType.getExpressionIdentifier();
-            if (factIdentifierType != null && expressionIdentifierType != null) {
-                String value = jsiFactMappingValueType.getRawValue() != null ? jsiFactMappingValueType.getRawValue().getValue() : null;
-                toPopulate.addMappingValue(getFactIdentifier(factIdentifierType), getExpressionIdentifier(expressionIdentifierType), value);
-            }
-        });
-    }
-
-    protected static void populateScesimModelDescriptor(ScesimModelDescriptor toPopulate, JSIScesimModelDescriptorType source) {
-        source.getFactMappings().getFactMapping().forEach(jsiFactMappingType -> {
-            final FactMapping added = toPopulate.addFactMapping(getFactIdentifier(jsiFactMappingType.getFactIdentifier()), getExpressionIdentifier(jsiFactMappingType.getExpressionIdentifier()));
-            added.setFactAlias(jsiFactMappingType.getFactAlias());
-            added.setExpressionAlias(jsiFactMappingType.getExpressionAlias());
-            added.setFactMappingValueType(FactMappingValueType.valueOf(jsiFactMappingType.getFactMappingValueType()));
-            added.setColumnWidth(jsiFactMappingType.getColumnWidth());
-            final JSIGenericTypes genericTypes = jsiFactMappingType.getGenericTypes();
-            if (genericTypes != null && genericTypes.getString() != null) {
-                added.setGenericTypes(genericTypes.getString());
-            }
-            final JSIExpressionElementsType expressionElements = jsiFactMappingType.getExpressionElements();
-            if (expressionElements != null) {
-                expressionElements.getExpressionElement().forEach(jsiExpressionElementType -> added.addExpressionElement(jsiExpressionElementType.getStep(), jsiFactMappingType.getClassName()));
-            }
-        });
-    }
-
-    protected static ExpressionIdentifier getExpressionIdentifier(JSIExpressionIdentifierType source) {
-        return new ExpressionIdentifier(source.getName(), FactMappingType.valueOf(source.getType()));
-    }
-
-    protected static FactIdentifier getFactIdentifier(JSIFactIdentifierType source) {
-        return FactIdentifier.create(source.getName(), source.getClassName(), source.getImportPrefix());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/ClientDMNType.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/ClientDMNType.java
deleted file mode 100644
index 5b7afc4..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/ClientDMNType.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dmn;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.feel.BuiltInType;
-
-public class ClientDMNType {
-
-    private String namespace;
-    private String name;
-    private String id;
-    private boolean collection;
-    private boolean composite;
-    private Map<String, ClientDMNType> fields = new HashMap<>();
-    private BuiltInType feelType;
-    private ClientDMNType baseType;
-
-    public ClientDMNType(String namespace, String name, String id, boolean isCollection, BuiltInType feelType) {
-        this.namespace = namespace;
-        this.name = name;
-        this.id = id;
-        this.collection = isCollection;
-        this.feelType = feelType;
-        this.composite = false;
-    }
-
-    public ClientDMNType(String namespace, String name, String id, boolean isCollection, boolean isComposite) {
-        this.namespace = namespace;
-        this.name = name;
-        this.id = id;
-        this.collection = isCollection;
-        this.composite = isComposite;
-    }
-
-    public ClientDMNType(String namespace, String name, String id, boolean isCollection, boolean isComposite, Map<String, ClientDMNType> fields, BuiltInType feelType) {
-        this(namespace, name, id, isCollection, feelType);
-        this.fields = fields;
-        this.composite = isComposite;
-    }
-
-    /**
-     * It *copies* the current ClientDMNType, setting it as Collection, with isCollection = true.
-     * Please note, fields parameter reference should be the same for both object, the original one
-     * and the copied one.
-     * @return A new instance of ClientDMNType with the *same* fields value of the current one but isCollection set true
-     */
-    public ClientDMNType copyAsCollection() {
-        return new ClientDMNType(namespace, name, id, true, composite, fields, feelType);
-    }
-
-    public String getNamespace() {
-        return namespace;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public boolean isCollection() {
-        return collection;
-    }
-
-    public void setCollection(final boolean collection) {
-        this.collection = collection;
-    }
-
-    public boolean isComposite() {
-        return composite;
-    }
-
-    public void setIsComposite(final boolean isComposite) {
-        this.composite = isComposite;
-    }
-
-    public Map<String, ClientDMNType> getFields() {
-        return Collections.unmodifiableMap(fields);
-    }
-
-    public void addField(String fieldName, ClientDMNType clientDMNType) {
-        this.fields.put(fieldName, clientDMNType);
-    }
-
-    public void addFields(Map<String, ClientDMNType> fields) {
-        this.fields.putAll(fields);
-    }
-
-    public BuiltInType getFeelType() {
-        return feelType;
-    }
-
-    public void setFeelType(BuiltInType feelType) {
-        this.feelType = feelType;
-    }
-
-    public ClientDMNType getBaseType() {
-        return baseType;
-    }
-
-    public void setBaseType(ClientDMNType baseType) {
-        this.baseType = baseType;
-    }
-
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/KogitoScenarioSimulationBuilder.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/KogitoScenarioSimulationBuilder.java
deleted file mode 100644
index 988f980..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/KogitoScenarioSimulationBuilder.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dmn;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.BiFunction;
-
-import javax.inject.Inject;
-
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.BackgroundData;
-import org.drools.scenariosimulation.api.model.BackgroundDataWithIndex;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScenarioWithIndex;
-import org.drools.scenariosimulation.api.model.ScesimDataWithIndex;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.model.KogitoDMNModel;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.services.ScenarioSimulationKogitoDMNMarshallerService;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.backend.vfs.PathFactory;
-import org.uberfire.client.callbacks.Callback;
-
-import static org.drools.scenariosimulation.api.model.FactMappingType.EXPECT;
-import static org.drools.scenariosimulation.api.model.FactMappingType.GIVEN;
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-
-/**
- * Class used to populate <code>ScenarioSimulationModel</code> inside <code>Callback</code>s
- * <p>
- * Mostly copied from <code>org.drools.workbench.screens.scenariosimulation.backend.server.util.SimulationSettingsCreationStrategy</code> and its children.
- * <p>
- * Implemented to manage the nested callbacks for <b>DMN</b>
- */
-public class KogitoScenarioSimulationBuilder {
-
-    @Inject
-    private ScenarioSimulationKogitoDMNDataManager dmnDataManager;
-    @Inject
-    private ScenarioSimulationKogitoDMNMarshallerService dmnMarshallerService;
-
-    private static FactMappingType convert(final FactModelTree.Type modelTreeType) {
-        switch (modelTreeType) {
-            case INPUT:
-                return GIVEN;
-            case DECISION:
-                return EXPECT;
-            default:
-                throw new IllegalArgumentException("Impossible to map");
-        }
-    }
-
-    public void populateScenarioSimulationModelRULE(final String dmoSession,
-                                                    final Callback<ScenarioSimulationModel> populateEditorCommand) {
-        ScenarioSimulationModel model = new ScenarioSimulationModel();
-        model.setSimulation(createRULESimulation());
-        model.setBackground(createBackground());
-        model.setSettings(createRULESettings(dmoSession));
-        populateEditorCommand.callback(model);
-    }
-
-    public void populateScenarioSimulationModelDMN(final String dmnFilePath,
-                                                   final Callback<ScenarioSimulationModel> populateEditorCommand,
-                                                   final ErrorCallback<Object> dmnContentErrorCallback) {
-        ScenarioSimulationModel model = new ScenarioSimulationModel();
-        model.setBackground(createBackground());
-        populateDMNSimulationAndSettings(model, dmnFilePath, populateEditorCommand, dmnContentErrorCallback);
-    }
-
-    protected Simulation createRULESimulation() {
-        Simulation toReturn = createSimulation();
-        ScenarioWithIndex scenarioWithIndex = createScesimDataWithIndex(toReturn, ScenarioWithIndex::new);
-
-        // Add GIVEN Fact
-        createEmptyColumn(toReturn.getScesimModelDescriptor(),
-                          scenarioWithIndex,
-                          1,
-                          GIVEN,
-                          toReturn.getScesimModelDescriptor().getFactMappings().size());
-
-        // Add EXPECT Fact
-        createEmptyColumn(toReturn.getScesimModelDescriptor(),
-                          scenarioWithIndex,
-                          2,
-                          EXPECT,
-                          toReturn.getScesimModelDescriptor().getFactMappings().size());
-        return toReturn;
-    }
-
-    private void populateDMNSimulationAndSettings(final ScenarioSimulationModel toPopulate,
-                                                  final String dmnFilePath,
-                                                  final Callback<ScenarioSimulationModel> populateEditorCommand,
-                                                  final ErrorCallback<Object> dmnContentErrorCallback) {
-        String dmnFileName = dmnFilePath.substring(dmnFilePath.lastIndexOf('/') + 1);
-        final Path dmnPath = PathFactory.newPath(dmnFileName, dmnFilePath);
-        dmnMarshallerService.getDMNContent(dmnPath,
-                                           getDMNContentCallback(toPopulate, populateEditorCommand, dmnPath),
-                                           dmnContentErrorCallback);
-    }
-
-    private Callback<KogitoDMNModel> getDMNContentCallback(final ScenarioSimulationModel toPopulate,
-                                                           final Callback<ScenarioSimulationModel> populateEditorCommand,
-                                                           final Path dmnPath) {
-        return kogitoDMNModel -> {
-            final FactModelTuple factModelTuple = dmnDataManager.getFactModelTuple(kogitoDMNModel);
-            toPopulate.setSimulation(createDMNSimulation(factModelTuple));
-            toPopulate.setSettings(createDMNSettings(kogitoDMNModel.getName(),
-                                                     kogitoDMNModel.getNamespace(),
-                                                     dmnPath.toURI()));
-            populateEditorCommand.callback(toPopulate);
-        };
-    }
-
-    protected Background createBackground() {
-        Background toReturn = new Background();
-        ScesimModelDescriptor simulationDescriptor = toReturn.getScesimModelDescriptor();
-        int index = toReturn.getUnmodifiableData().size() + 1;
-        BackgroundData backgroundData = toReturn.addData();
-        BackgroundDataWithIndex backgroundDataWithIndex = new BackgroundDataWithIndex(index, backgroundData);
-
-        // Add GIVEN Fact
-        createEmptyColumn(simulationDescriptor,
-                          backgroundDataWithIndex,
-                          1,
-                          GIVEN,
-                          simulationDescriptor.getFactMappings().size());
-        return toReturn;
-    }
-    protected Settings createRULESettings(final String dmoSession) {
-        Settings toReturn = new Settings();
-        toReturn.setType(ScenarioSimulationModel.Type.RULE);
-        toReturn.setDmoSession(dmoSession);
-        return toReturn;
-    }
-
-    protected Settings createDMNSettings(final String name, final String nameSpace, final String dmnFilePath) {
-        Settings toReturn = new Settings();
-        toReturn.setType(ScenarioSimulationModel.Type.DMN);
-        toReturn.setDmnFilePath(dmnFilePath);
-        toReturn.setDmnName(name);
-        toReturn.setDmnNamespace(nameSpace);
-        return toReturn;
-    }
-
-    private <T extends AbstractScesimData, E extends ScesimDataWithIndex<T>> E createScesimDataWithIndex(final AbstractScesimModel<T> abstractScesimModel,
-                                                                                                         final BiFunction<Integer, T, E> producer) {
-        T scenario = abstractScesimModel.addData();
-        scenario.setDescription(null);
-        int index = abstractScesimModel.getUnmodifiableData().indexOf(scenario) + 1;
-        return producer.apply(index, scenario);
-    }
-
-    /**
-     * Create an empty column using factMappingType defined. The new column will be added as last column of
-     * the group (GIVEN/EXPECT) (see findLastIndexOfGroup)
-     * @param simulationDescriptor
-     * @param scesimDataWithIndex
-     * @param placeholderId
-     * @param factMappingType
-     * @param columnIndex
-     */
-    private void createEmptyColumn(final ScesimModelDescriptor simulationDescriptor,
-                                   final ScesimDataWithIndex scesimDataWithIndex,
-                                   final int placeholderId,
-                                   final FactMappingType factMappingType,
-                                   final int columnIndex) {
-        int row = scesimDataWithIndex.getIndex();
-        final ExpressionIdentifier expressionIdentifier = ExpressionIdentifier.create(row + "|" + placeholderId, factMappingType);
-
-        final FactMapping factMapping = simulationDescriptor
-                .addFactMapping(
-                        columnIndex,
-                        FactMapping.getInstancePlaceHolder(placeholderId),
-                        FactIdentifier.EMPTY,
-                        expressionIdentifier);
-        factMapping.setColumnWidth(getColumnWidth(expressionIdentifier.getName()));
-        factMapping.setExpressionAlias(FactMapping.getPropertyPlaceHolder(placeholderId));
-        scesimDataWithIndex.getScesimData().addMappingValue(FactIdentifier.EMPTY, expressionIdentifier, null);
-    }
-
-    /**
-     * If DMN model is empty, contains only inputs or only outputs this method add one GIVEN and/or EXPECT empty column
-     * @param simulation
-     * @param scenarioWithIndex
-     */
-    private void addEmptyColumnsIfNeeded(final Simulation simulation, final ScenarioWithIndex scenarioWithIndex) {
-        boolean hasGiven = false;
-        boolean hasExpect = false;
-        ScesimModelDescriptor simulationDescriptor = simulation.getScesimModelDescriptor();
-        for (FactMapping factMapping : simulationDescriptor.getFactMappings()) {
-            FactMappingType factMappingType = factMapping.getExpressionIdentifier().getType();
-            if (!hasGiven && GIVEN.equals(factMappingType)) {
-                hasGiven = true;
-            } else if (!hasExpect && EXPECT.equals(factMappingType)) {
-                hasExpect = true;
-            }
-        }
-        if (!hasGiven) {
-            createEmptyColumn(simulationDescriptor,
-                              scenarioWithIndex,
-                              1,
-                              GIVEN,
-                              findNewIndexOfGroup(simulationDescriptor, GIVEN));
-        }
-        if (!hasExpect) {
-            createEmptyColumn(simulationDescriptor,
-                              scenarioWithIndex,
-                              2,
-                              EXPECT,
-                              findNewIndexOfGroup(simulationDescriptor, EXPECT));
-        }
-    }
-
-    private int findNewIndexOfGroup(final ScesimModelDescriptor simulationDescriptor, final FactMappingType factMappingType) {
-        List<FactMapping> factMappings = simulationDescriptor.getFactMappings();
-        if (GIVEN.equals(factMappingType)) {
-            for (int i = 0; i < factMappings.size(); i += 1) {
-                if (EXPECT.equals(factMappings.get(i).getExpressionIdentifier().getType())) {
-                    return i;
-                }
-            }
-            return factMappings.size();
-        } else if (EXPECT.equals(factMappingType)) {
-            return factMappings.size();
-        } else {
-            throw new IllegalArgumentException("This method can be invoked only with GIVEN or EXPECT as FactMappingType");
-        }
-    }
-
-    protected Simulation createDMNSimulation(final FactModelTuple factModelTuple) {
-        Simulation toReturn = createSimulation();
-        ScenarioWithIndex scenarioWithIndex = createScesimDataWithIndex(toReturn, ScenarioWithIndex::new);
-
-        AtomicInteger id = new AtomicInteger(1);
-        final Collection<FactModelTree> visibleFactTrees = factModelTuple.getVisibleFacts().values();
-        final Map<String, FactModelTree> hiddenValues = factModelTuple.getHiddenFacts();
-
-        visibleFactTrees.stream().sorted((a, b) -> {
-            FactModelTree.Type aType = a.getType();
-            FactModelTree.Type bType = b.getType();
-            int inputFirstOrder = FactModelTree.Type.INPUT.equals(aType) ? -1 : 1;
-            return aType.equals(bType) ? 0 : inputFirstOrder;
-        }).forEach(factModelTree -> {
-            FactIdentifier factIdentifier = FactIdentifier.create(factModelTree.getFactName(), factModelTree.getFactName(), factModelTree.getImportPrefix());
-            FactMappingExtractor factMappingExtractor = new FactMappingExtractor(factIdentifier,
-                                                                                 scenarioWithIndex.getIndex(),
-                                                                                 id,
-                                                                                 convert(factModelTree.getType()),
-                                                                                 toReturn.getScesimModelDescriptor(),
-                                                                                 scenarioWithIndex.getScesimData());
-            addFactMapping(factMappingExtractor, factModelTree, new ArrayList<>(), hiddenValues);
-        });
-
-        addEmptyColumnsIfNeeded(toReturn, scenarioWithIndex);
-        return toReturn;
-    }
-
-    protected Simulation createSimulation() {
-        Simulation simulation = new Simulation();
-        ScesimModelDescriptor simulationDescriptor = simulation.getScesimModelDescriptor();
-        FactMapping indexFactMapping = simulationDescriptor.addFactMapping(FactIdentifier.INDEX.getName(), FactIdentifier.INDEX, ExpressionIdentifier.INDEX);
-        indexFactMapping.setColumnWidth(getColumnWidth(ExpressionIdentifier.INDEX.getName()));
-        FactMapping descriptionFactMapping = simulationDescriptor.addFactMapping(FactIdentifier.DESCRIPTION.getName(), FactIdentifier.DESCRIPTION, ExpressionIdentifier.DESCRIPTION);
-        descriptionFactMapping.setColumnWidth(getColumnWidth(ExpressionIdentifier.DESCRIPTION.getName()));
-        return simulation;
-    }
-
-    /**
-     * It defines the column width of a new column, based on its
-     * <code>FactMapping.expressionIdentifier.getName()</code> field
-     * @param expressionIdentifierName
-     * @return
-     */
-    protected static double getColumnWidth(String expressionIdentifierName) {
-        ExpressionIdentifier.NAME expressionName;
-        try {
-            expressionName = ExpressionIdentifier.NAME.valueOf(expressionIdentifierName);
-        } catch (IllegalArgumentException e) {
-            expressionName = ExpressionIdentifier.NAME.Other;
-        }
-        switch (expressionName) {
-            case Index:
-                return 70;
-            case Description:
-                return 300;
-            default:
-                return 114;
-        }
-    }
-
-    protected void addFactMapping(final FactMappingExtractor factMappingExtractor,
-                                  final FactModelTree factModelTree,
-                                  final List<String> previousSteps,
-                                  final Map<String, FactModelTree> hiddenValues) {
-        internalAddToScenario(factMappingExtractor,
-                              factModelTree,
-                              previousSteps,
-                              hiddenValues,
-                              new HashSet<>());
-    }
-
-    private void internalAddToScenario(final FactMappingExtractor factMappingExtractor,
-                                       final FactModelTree factModelTree,
-                                       final List<String> readOnlyPreviousSteps,
-                                       final Map<String, FactModelTree> hiddenValues,
-                                       final Set<String> alreadyVisited) {
-
-        List<String> previousSteps = new ArrayList<>(readOnlyPreviousSteps);
-        // if is a simple type it generates a single column
-        if (factModelTree.isSimple()) {
-            FactModelTree.PropertyTypeName factType = factModelTree.getSimpleProperties().get(VALUE);
-            factMappingExtractor.getFactMapping(factModelTree, VALUE, previousSteps, factType.getTypeName());
-        }
-        // otherwise it adds a column for each simple properties direct or nested
-        else {
-            factModelTree.getSimpleProperties().entrySet().stream().sorted(Map.Entry.comparingByKey()).forEach(entry -> {
-                String factName = entry.getKey();
-                String factTypeName = entry.getValue().getTypeName();
-
-                FactMapping factMapping = factMappingExtractor.getFactMapping(factModelTree, factName, previousSteps, factTypeName);
-                if (ScenarioSimulationSharedUtils.isList(factTypeName)) {
-                    factMapping.setGenericTypes(factModelTree.getGenericTypeInfo(factName));
-                }
-                factMapping.addExpressionElement(factName, factTypeName);
-           });
-
-            factModelTree.getExpandableProperties().entrySet().stream().sorted(Map.Entry.comparingByValue()).forEach(entry -> {
-                String factType = entry.getValue();
-                FactModelTree nestedModelTree = hiddenValues.get(factType);
-
-                if (previousSteps.isEmpty()) {
-                    previousSteps.add(factModelTree.getFactName());
-                }
-
-                ArrayList<String> currentSteps = new ArrayList<>(previousSteps);
-                currentSteps.add(entry.getKey());
-
-                if (!alreadyVisited.contains(nestedModelTree.getFactName())) {
-                    alreadyVisited.add(factModelTree.getFactName());
-                    internalAddToScenario(factMappingExtractor, nestedModelTree, currentSteps, hiddenValues, alreadyVisited);
-                }
-            });
-        }
-    }
-
-    protected static class FactMappingExtractor {
-
-        private final FactIdentifier factIdentifier;
-        private final int row;
-        private final AtomicInteger id;
-        private final FactMappingType type;
-        private final ScesimModelDescriptor simulationDescriptor;
-        private final AbstractScesimData abstractScesimData;
-
-        public FactMappingExtractor(final FactIdentifier factIdentifier,
-                                    final int row,
-                                    final AtomicInteger id,
-                                    final FactMappingType type,
-                                    final ScesimModelDescriptor simulationDescriptor,
-                                    final AbstractScesimData abstractScesimData) {
-            this.factIdentifier = factIdentifier;
-            this.row = row;
-            this.id = id;
-            this.type = type;
-            this.simulationDescriptor = simulationDescriptor;
-            this.abstractScesimData = abstractScesimData;
-        }
-
-        public FactMapping getFactMapping(final FactModelTree factModelTree,
-                                          final String propertyName,
-                                          final List<String> previousSteps,
-                                          final String factType) {
-
-            String factAlias = !previousSteps.isEmpty() ? previousSteps.get(0) : factModelTree.getFactName();
-
-            ExpressionIdentifier expressionIdentifier = ExpressionIdentifier.create(row + "|" + id.getAndIncrement(), type);
-            final FactMapping factMapping = simulationDescriptor.addFactMapping(factAlias, factIdentifier, expressionIdentifier);
-
-            List<String> localPreviousStep = new ArrayList<>(previousSteps);
-            localPreviousStep.add(propertyName);
-            String expressionAlias = String.join(".",
-                                                 localPreviousStep.size() > 1 ?
-                                                         localPreviousStep.subList(1, localPreviousStep.size()) :
-                                                         localPreviousStep);
-            factMapping.setExpressionAlias(expressionAlias);
-            factMapping.setGenericTypes(factModelTree.getGenericTypeInfo(VALUE));
-            factMapping.setColumnWidth(getColumnWidth(factIdentifier.getName()));
-
-            previousSteps.forEach(step -> factMapping.addExpressionElement(step, factType));
-
-            if (previousSteps.isEmpty()) {
-                factMapping.addExpressionElement(factModelTree.getFactName(), factType);
-            }
-            abstractScesimData.addMappingValue(factIdentifier, expressionIdentifier, null);
-
-            return factMapping;
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/ScenarioSimulationKogitoDMNDataManager.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/ScenarioSimulationKogitoDMNDataManager.java
deleted file mode 100644
index 0fbe35e..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/ScenarioSimulationKogitoDMNDataManager.java
+++ /dev/null
@@ -1,654 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dmn;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import javax.xml.namespace.QName;
-
-import jsinterop.base.Js;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.feel.BuiltInType;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.model.KogitoDMNModel;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITDMNElement;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITDRGElement;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITDecision;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITDefinitions;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITImport;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITInformationItem;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITInputData;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITItemDefinition;
-
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-
-public class ScenarioSimulationKogitoDMNDataManager {
-
-    protected static final String URI_FEEL = "http://www.omg.org/spec/DMN/20180521/FEEL/";
-    protected static final String WRONG_DMN_MESSAGE = "Wrong DMN Type";
-    protected static final QName TYPEREF_QNAME = new QName("", "typeRef", "");
-
-    public FactModelTuple getFactModelTuple(final KogitoDMNModel kogitoDMNModel) {
-        SortedMap<String, FactModelTree> visibleFacts = new TreeMap<>();
-        SortedMap<String, FactModelTree> hiddenFacts = new TreeMap<>();
-        ErrorHolder errorHolder = new ErrorHolder();
-
-        JSITDefinitions jsitDefinitions = kogitoDMNModel.getJsitDefinitions();
-        Map<String, JSITDefinitions> importedDefinitions = kogitoDMNModel.getImportsDefinitions();
-        Map<String, ClientDMNType> dmnTypesMap = new HashMap<>();
-        Map<String, String> importedModelsMap = new HashMap<>();
-
-        for (int i = 0; i < jsitDefinitions.getImport().size(); i++) {
-            JSITImport importItem = Js.uncheckedCast(jsitDefinitions.getImport().get(i));
-            importedModelsMap.put(importItem.getNamespace(), importItem.getName());
-        }
-
-        importedDefinitions.forEach((namespace, definition) ->
-                                            dmnTypesMap.putAll(getDMNDataTypesMap(definition.getItemDefinition(), namespace)));
-        dmnTypesMap.putAll(getDMNDataTypesMap(jsitDefinitions.getItemDefinition(), jsitDefinitions.getNamespace()));
-
-        importedDefinitions.forEach((namespace, definition) ->
-                                            populateFacts(visibleFacts, hiddenFacts, errorHolder, dmnTypesMap, definition.getDrgElement(), importedModelsMap.get(namespace)));
-        populateFacts(visibleFacts, hiddenFacts, errorHolder, dmnTypesMap, jsitDefinitions.getDrgElement(), null);
-
-        FactModelTuple toReturn = new FactModelTuple(visibleFacts, hiddenFacts);
-        errorHolder.getMultipleNestedCollection().forEach(toReturn::addMultipleNestedCollectionError);
-        errorHolder.getMultipleNestedObject().forEach(toReturn::addMultipleNestedObjectError);
-        return toReturn;
-    }
-
-    private void populateFacts(final SortedMap<String, FactModelTree> visibleFacts,
-                               final SortedMap<String, FactModelTree> hiddenFacts,
-                               final ErrorHolder errorHolder,
-                               final Map<String, ClientDMNType> dmnTypesMap,
-                               final List<JSITDRGElement> jsitdrgElements,
-                               final String importPrefix) {
-        for (int i = 0; i < jsitdrgElements.size(); i++) {
-            final JSITDRGElement jsitdrgElement = Js.uncheckedCast(jsitdrgElements.get(i));
-            if (isJSITInputData(jsitdrgElement)) {
-                final JSITInputData jsitInputData = Js.uncheckedCast(jsitdrgElement);
-                final JSITInformationItem jsitInputDataVariable = jsitInputData.getVariable();
-                final ClientDMNType type = getDMNTypeFromMaps(dmnTypesMap, getOtherAttributesMap(jsitInputDataVariable));
-                final String name = importPrefix != null ? importPrefix + "." + jsitInputData.getName() : jsitInputData.getName();
-                checkTypeSupport(type, errorHolder, name);
-                visibleFacts.put(name, createTopLevelFactModelTree(name, importPrefix, type, hiddenFacts, FactModelTree.Type.INPUT));
-            } else if (isJSITDecision(jsitdrgElement)) {
-                final JSITDecision jsitDecision = Js.uncheckedCast(jsitdrgElement);
-                final JSITInformationItem jsitDecisionVariable = jsitDecision.getVariable();
-                final ClientDMNType type = getDMNTypeFromMaps(dmnTypesMap, getOtherAttributesMap(jsitDecisionVariable));
-                final String name = importPrefix != null ? importPrefix + "." + jsitDecision.getName() : jsitDecision.getName();
-                checkTypeSupport(type, errorHolder, name);
-                visibleFacts.put(name, createTopLevelFactModelTree(name, importPrefix, type, hiddenFacts, FactModelTree.Type.DECISION));
-            }
-        }
-    }
-
-    /**
-     * It retrieves the <code>ClientDMNType</code> of the current typeRef source (Decision or Input Data).
-     * If the source has an empty typeRef, the default value <code>BuiltInType.ANY</code> is assigned.
-     * @param dmnTypesMap
-     * @param source
-     * @return
-     */
-    protected ClientDMNType getDMNTypeFromMaps(final Map<String, ClientDMNType> dmnTypesMap,
-                                               final Map<QName, String> source) {
-        String typeRef = getFilteredTypeRef(source.get(TYPEREF_QNAME));
-        if (typeRef == null) {
-            typeRef = BuiltInType.ANY.getName();
-        }
-        return dmnTypesMap.get(typeRef);
-    }
-
-    /**
-     * This method retrieves all DMN Data Types are composed by
-     * - DEFAULT types, listed inside <code>BuiltInType</code> enum
-     * - CUSTOM types, which are available inside <code>jsitItemDefinitions</code> list
-     * @param jsitItemDefinitions List of CUSTOM Data Type in raw format
-     * @param nameSpace namespace
-     * @return An UNMODIFIABLE map containing all DEFAULT and CUSTOM Data Types.
-     */
-    protected Map<String, ClientDMNType> getDMNDataTypesMap(final List<JSITItemDefinition> jsitItemDefinitions,
-                                                            final String nameSpace) {
-        Map<String, ClientDMNType> dmnDataTypesMap = new HashMap<>();
-
-        /* Adding DEFAULT types */
-        for (BuiltInType type : BuiltInType.values()) {
-
-            for (String name : type.getNames()) {
-                ClientDMNType feelPrimitiveType;
-                /* CONTEXT is a particular case of DEFAULT type */
-                if (type == BuiltInType.CONTEXT) {
-                    feelPrimitiveType = new ClientDMNType(URI_FEEL, name, null, false, true, Collections.emptyMap(), type);
-                } else {
-                    feelPrimitiveType = new ClientDMNType(URI_FEEL, name, null, false, type);
-                }
-                dmnDataTypesMap.put(name, feelPrimitiveType);
-            }
-        }
-
-        final Map<String, JSITItemDefinition> itemDefinitionMap = indexDefinitionsByName(jsitItemDefinitions);
-        /* Adding CUSTOM Types, extracted from jsitItemDefinitions map */
-        for (int i = 0; i < jsitItemDefinitions.size(); i++) {
-            final JSITItemDefinition jsitItemDefinition = Js.uncheckedCast(jsitItemDefinitions.get(i));
-            getOrCreateDMNType(itemDefinitionMap, jsitItemDefinition.getName(), nameSpace, dmnDataTypesMap);
-        }
-
-        return Collections.unmodifiableMap(dmnDataTypesMap);
-    }
-
-    /**
-     * It checks if the given *requiredType*'s <code>ClientDMNType</code> is already present into given createdTypes
-     * map If yes, it return it. It creates it otherwise.
-     * @param allDefinitions
-     * @param requiredType
-     * @param namespace
-     * @param createdTypes
-     * @return *requiredType*'s <code>ClientDMNType</code>
-     */
-    ClientDMNType getOrCreateDMNType(final Map<String, JSITItemDefinition> allDefinitions,
-                                     final String requiredType,
-                                     final String namespace,
-                                     final Map<String, ClientDMNType> createdTypes) {
-
-        if (createdTypes.containsKey(requiredType)) {
-            return createdTypes.get(requiredType);
-        }
-
-        /* This method can handle ONLY CUSTOM types (DEFAULT must be already present into createdTypes map) */
-        if (!allDefinitions.containsKey(requiredType)) {
-            throw new IllegalStateException("Type '" + requiredType + "' not found.");
-        }
-
-        final JSITItemDefinition value = Js.uncheckedCast(allDefinitions.get(requiredType));
-        return createDMNType(allDefinitions, value, namespace, createdTypes);
-    }
-
-    /**
-     * It creates an *unmodifiable* map of JSITItemDefinition object, with its name as a key. These are the first
-     * level user defined types (CUSTOM Data Type)
-     * @param allDefinitions
-     * @return
-     */
-    Map<String, JSITItemDefinition> indexDefinitionsByName(final List<JSITItemDefinition> allDefinitions) {
-        final HashMap<String, JSITItemDefinition> index = new HashMap<>();
-        for (int i = 0; i < allDefinitions.size(); i++) {
-            final JSITItemDefinition value = Js.uncheckedCast(allDefinitions.get(i));
-            index.put(value.getName(), value);
-        }
-        return Collections.unmodifiableMap(index);
-    }
-
-    /**
-     * This method creates a <code>ClientDMNType</code> object of a given <code>JSITItemDefinition</code> object or
-     * a <code>JSITItemComponent</code> as well.
-     * @param allDefinitions
-     * @param itemDefinition
-     * @param namespace
-     * @param dmnTypesDataMap
-     * @return
-     */
-    protected ClientDMNType createDMNType(final Map<String, JSITItemDefinition> allDefinitions,
-                                          final JSITItemDefinition itemDefinition,
-                                          final String namespace,
-                                          final Map<String, ClientDMNType> dmnTypesDataMap) {
-        /* It initializes a ClientDMNType which represents the given itemDefinition */
-        ClientDMNType itemDefinitionDMNType = new ClientDMNType(namespace,
-                                                                itemDefinition.getName(),
-                                                                itemDefinition.getId(),
-                                                                itemDefinition.getIsCollection(),
-                                                                itemDefinition.getItemComponent() != null &&
-                                                                        !itemDefinition.getItemComponent().isEmpty());
-        /* It adds the created ClientDMNType into dmnTypesDataMap ONLY if is a CUSTOM data type, and not a ItemComponent (a field) */
-        if (allDefinitions.containsKey(itemDefinition.getName())) {
-            dmnTypesDataMap.put(itemDefinition.getName(), itemDefinitionDMNType);
-        }
-
-        /* Inheriting fields defined from item's typeRef, which represent its "super item" */
-        /* This is required to define DMNType fields and isCollection / isComposite fields */
-        String typeRef = getFilteredTypeRef(itemDefinition.getTypeRef());
-        if (typeRef != null) {
-            final ClientDMNType superDmnType = getOrCreateDMNType(allDefinitions,
-                                                                  typeRef,
-                                                                  namespace,
-                                                                  dmnTypesDataMap);
-            if (superDmnType != null) {
-                /* Current clientDmnType item must inherits these properties from its super type */
-                itemDefinitionDMNType.addFields(superDmnType.getFields());
-                itemDefinitionDMNType.setCollection(superDmnType.isCollection() || itemDefinitionDMNType.isCollection());
-                itemDefinitionDMNType.setIsComposite(superDmnType.isComposite() || itemDefinitionDMNType.isComposite());
-                itemDefinitionDMNType.setFeelType(superDmnType.getFeelType());
-                itemDefinitionDMNType.setBaseType(getBaseTypeForItemDefinition(itemDefinition, superDmnType));
-            } else {
-                throw new IllegalStateException(
-                        "Item: " + itemDefinition.getName() + " refers to typeRef: " + itemDefinition.getTypeRef()
-                                + " which can't be found.");
-            }
-        }
-        populateItemDefinitionFields(allDefinitions,
-                                     itemDefinition,
-                                     namespace,
-                                     dmnTypesDataMap,
-                                     itemDefinitionDMNType);
-
-        return itemDefinitionDMNType;
-   }
-
-    protected ClientDMNType getBaseTypeForItemDefinition(JSITItemDefinition itemDefinition, ClientDMNType superDmnType) {
-        final boolean hasAllowedValues = itemDefinition.getAllowedValues() != null
-                && !itemDefinition.getAllowedValues().getText().isEmpty();
-        return hasAllowedValues ? superDmnType : superDmnType.getBaseType();
-    }
-
-    /**
-     * This method aim is to populate all fields and subfields present in a given <code>JSITItemDefinitionItem</code>
-     * Considering a field can contains subfields, this method is *recursive*. Be sure an exit condition is correctly set.
-     * Currently, the methods exits if there are not fields inside the given itemDefinition.
-     * @param allItemDefinitions
-     * @param itemDefinition
-     * @param namespace
-     * @param dmnTypesMap
-     * @param clientDMNType
-     */
-    protected void populateItemDefinitionFields(final Map<String, JSITItemDefinition> allItemDefinitions,
-                                                final JSITItemDefinition itemDefinition,
-                                                final String namespace,
-                                                final Map<String, ClientDMNType> dmnTypesMap,
-                                                final ClientDMNType clientDMNType) {
-        final List<JSITItemDefinition> jsitItemDefinitionFields = itemDefinition.getItemComponent();
-        /* Exit condition: if current itemDefinition hasn't fields, it returns */
-        if (jsitItemDefinitionFields != null && !jsitItemDefinitionFields.isEmpty()) {
-
-            for (int i = 0; i < jsitItemDefinitionFields.size(); i++) {
-                final JSITItemDefinition jsitItemDefinitionField = Js.uncheckedCast(jsitItemDefinitionFields.get(i));
-                final String typeRef = getFilteredTypeRef(jsitItemDefinitionField.getTypeRef());
-                final List<JSITItemDefinition> subfields = jsitItemDefinitionField.getItemComponent();
-                final boolean hasSubFields = subfields != null && !subfields.isEmpty();
-                final boolean hasAllowedValues = jsitItemDefinitionField.getAllowedValues() != null
-                        && !jsitItemDefinitionField.getAllowedValues().getText().isEmpty();
-
-                ClientDMNType fieldDMNType;
-                /* Retrieving field ClientDMNType */
-                if (typeRef != null && !hasSubFields && !hasAllowedValues) {
-                    /* The field refers to a DMType which is present in dmnTypesMap or needs to be created */
-                    fieldDMNType = getOrCreateDMNType(allItemDefinitions, typeRef, namespace, dmnTypesMap);
-                } else if (typeRef != null && !hasSubFields && hasAllowedValues) {
-                    /* This case requires to create a new "Anonymous" DMNType to handle the allowed values */
-                    fieldDMNType = createDMNType(allItemDefinitions, jsitItemDefinitionField, namespace, dmnTypesMap);
-                } else if (typeRef == null && hasSubFields) {
-                    /* In this case we are handling an "Anonymous" type not defined in allItemDefinition list.
-                     * Therefore, a new DMNType must be created and then it manages its defined subfields in recursive way */
-                    fieldDMNType = createDMNType(allItemDefinitions, jsitItemDefinitionField, namespace, dmnTypesMap);
-                } else {
-                    /* Remaining cases are not managed, because invalid. Eg typeRef empty and no subfields OR typeRef
-                     * empty and at least one subfield */
-                    continue;
-                }
-
-                /* Managing the case where the field in analysis is set as collection where its retrieved DMNType is not
-                 * This can happen when the DMNType is declared as notCollection and a field referring to it is declared
-                 * as collection. In this case, a new DMNType is *copied* with set collection true. */
-                if (jsitItemDefinitionField.getIsCollection() && !fieldDMNType.isCollection()) {
-                    fieldDMNType = fieldDMNType.copyAsCollection();
-                }
-
-                clientDMNType.addField(jsitItemDefinitionField.getName(), fieldDMNType);
-            }
-        }
-    }
-
-    /**
-     * Recursively visit a <i>composite</i> <code>DMNType</code> to eventually detect and add errors to given <code>ErrorHolder</code>
-     *
-     * @param type
-     * @param errorHolder
-     * @param fullPropertyPath
-     */
-    protected void checkTypeSupport(final ClientDMNType type,
-                                    final ErrorHolder errorHolder,
-                                    final String fullPropertyPath) {
-        internalCheckTypeSupport(type, false, errorHolder, fullPropertyPath, new HashSet<>());
-    }
-
-    /**
-     * @param type
-     * @param alreadyInCollection
-     * @param errorHolder
-     * @param fullPropertyPath
-     * @param alreadyVisited
-     */
-    protected void internalCheckTypeSupport(final ClientDMNType type,
-                                            final boolean alreadyInCollection,
-                                            final ErrorHolder errorHolder,
-                                            final String fullPropertyPath,
-                                            final Set<String> alreadyVisited) {
-        alreadyVisited.add(type.getName());
-        if (type.isComposite()) {
-            for (Map.Entry<String, ClientDMNType> entry : type.getFields().entrySet()) {
-                String name = entry.getKey();
-                ClientDMNType nestedType = entry.getValue();
-                String nestedPath = fullPropertyPath + "." + name;
-                if (alreadyInCollection && nestedType.isCollection()) {
-                    errorHolder.getMultipleNestedCollection().add(nestedPath);
-                }
-                if (alreadyInCollection && nestedType.isComposite()) {
-                    errorHolder.getMultipleNestedObject().add(nestedPath);
-                }
-                if (!alreadyVisited.contains(nestedType.getName())) {
-                    internalCheckTypeSupport(nestedType,
-                                             alreadyInCollection || nestedType.isCollection(),
-                                             errorHolder,
-                                             nestedPath,
-                                             alreadyVisited);
-                }
-            }
-        }
-    }
-
-    /**
-     * This method is the <b>entry point</b> for <code>FactModelTree</code>. It is the one to be called from the very top level <code>DMNType</code>
-     *
-     * @param factName
-     * @param type
-     * @param hiddenFacts
-     * @param fmType
-     * @return
-     */
-    protected FactModelTree createTopLevelFactModelTree(final String factName,
-                                                        final String importPrefix,
-                                                        final ClientDMNType type,
-                                                        final SortedMap<String, FactModelTree> hiddenFacts,
-                                                        final FactModelTree.Type fmType) {
-        return isToBeManagedAsCollection(type) ?
-                createFactModelTreeForCollection(new HashMap<>(), factName, importPrefix, type, hiddenFacts, fmType, new ArrayList<>()) :
-                createFactModelTreeForNoCollection(new HashMap<>(), factName, importPrefix, factName, type.getName(), type, hiddenFacts, fmType, new ArrayList<>());
-    }
-
-    /**
-     * Return <code>true</code> if the given <code>DMNType</code> has to be managed as <b>collection</b>
-     *
-     * @param type
-     * @return <code>true</code> if <code>DMNType.isCollection() == true</code> <b>and</b> <code>BaseDMNTypeImpl.getFeelType() != BuiltInType.UNKNOWN</code>
-     */
-    protected boolean isToBeManagedAsCollection(final ClientDMNType type) {
-        boolean toReturn = type.isCollection();
-        if (toReturn) {
-            BuiltInType feelType = type.getFeelType();
-            // BuiltInType.CONTEXT is a special case: it is instantiated as composite but has no nested fields
-            // so it should be considered as simple for editing
-            if (Objects.equals(BuiltInType.CONTEXT, feelType)) {
-                toReturn = false;
-            }
-        }
-        return toReturn;
-    }
-
-    /**
-     * Return <code>true</code> if the given <code>DMNType</code> has to be managed as <b>composite</b>
-     *
-     * @param type
-     * @return <code>true</code> if <code>DMNType.isCollection() == true</code> <b>and</b> <code>BaseDMNTypeImpl.getFeelType() != BuiltInType.UNKNOWN</code>
-     */
-    protected boolean isToBeManagedAsComposite(final ClientDMNType type) {
-        boolean toReturn = type.isComposite();
-        if (toReturn) {
-            BuiltInType feelType = type.getFeelType();
-            // BuiltInType.CONTEXT is a special case: it is instantiated as composite but has no nested fields so it should be considered as simple for editing
-            if (Objects.equals(BuiltInType.CONTEXT, feelType)) {
-                toReturn = false;
-            }
-        }
-        return toReturn;
-    }
-
-    /**
-     * Creates a <code>FactModelTree</code> for <code>DMNType</code> where <code>DMNType.isCollection()</code> == <code>true</code>
-     *
-     * @param genericTypeInfoMap
-     * @param factName
-     * @param type
-     * @param hiddenFacts
-     * @param fmType
-     * @param alreadyVisited
-     * @return
-     * @throws Exception if <code>DMNType.isCollection()</code> != <code>true</code>
-     */
-    protected FactModelTree createFactModelTreeForCollection(final Map<String, List<String>> genericTypeInfoMap,
-                                                             final String factName,
-                                                             final String importPrefix,
-                                                             final ClientDMNType type,
-                                                             final SortedMap<String, FactModelTree> hiddenFacts,
-                                                             final FactModelTree.Type fmType,
-                                                             final List<String> alreadyVisited) {
-        if (!type.isCollection() && !isToBeManagedAsCollection(type)) {
-            throw new IllegalStateException(WRONG_DMN_MESSAGE);
-        }
-        String typeName = type.getName();
-        populateGeneric(genericTypeInfoMap, VALUE, typeName);
-        FactModelTree toReturn = createFactModelTreeForSimple(factName, importPrefix, typeName, List.class.getCanonicalName(), genericTypeInfoMap, fmType);
-        if (!hiddenFacts.containsKey(typeName) && !alreadyVisited.contains(typeName)) {
-            alreadyVisited.add(typeName);
-            FactModelTree genericFactModelTree = createFactModelTreeForGenericType(new HashMap<>(), typeName, importPrefix, typeName, typeName, type, hiddenFacts, fmType, alreadyVisited);
-            hiddenFacts.put(typeName, genericFactModelTree);
-        }
-        return toReturn;
-    }
-
-    /**
-     * This method map the given <b>name</b> to <b>List.class.getCanonicalName()</b> inside <b>simpleFields</b>,
-     * and map <b>name</b>  to a singleton list containing a newly generated <b>key</b> (path + "." + type) inside <b>genericTypeInfoMap</b>
-     *
-     * @param genericTypeInfoMap
-     * @param fullPropertyPath
-     * @param type
-     * @return
-     */
-    protected String populateGeneric(final Map<String, List<String>> genericTypeInfoMap,
-                                     final String fullPropertyPath,
-                                     final String type) {
-        String toReturn = fullPropertyPath;
-        genericTypeInfoMap.put(fullPropertyPath, Collections.singletonList(type));
-        return toReturn;
-    }
-
-    /**
-     * Creates a <code>FactModelTree</code> for <code>DMNType</code> where <code>DMNType.isCollection()</code> != <code>true</code>
-     *
-     * @param genericTypeInfoMap
-     * @param factName
-     * @param propertyName
-     * @param fullPropertyPath
-     * @param type
-     * @param hiddenFacts
-     * @param fmType
-     * @param alreadyVisited
-     * @return
-     * @throws Exception if <code>DMNType.isCollection()</code> == <code>true</code>
-     */
-    protected FactModelTree createFactModelTreeForNoCollection(final Map<String, List<String>> genericTypeInfoMap,
-                                                               final String factName,
-                                                               final String importPrefix,
-                                                               final String propertyName,
-                                                               final String fullPropertyPath,
-                                                               final ClientDMNType type,
-                                                               final SortedMap<String, FactModelTree> hiddenFacts,
-                                                               final FactModelTree.Type fmType,
-                                                               final List<String> alreadyVisited) {
-        if (type.isCollection() && isToBeManagedAsCollection(type)) {
-            throw new IllegalStateException(WRONG_DMN_MESSAGE);
-        }
-        return isToBeManagedAsComposite(type) ?
-                createFactModelTreeForComposite(genericTypeInfoMap, propertyName, importPrefix, fullPropertyPath, type, hiddenFacts, fmType, alreadyVisited) :
-                createFactModelTreeForSimple(factName, importPrefix, type.getName(), type.getName(), genericTypeInfoMap, fmType);
-    }
-
-    /**
-     * Creates a <code>FactModelTree</code> for <code>DMNType</code>
-     *
-     * @param genericTypeInfoMap
-     * @param factName
-     * @param propertyName
-     * @param fullPropertyPath
-     * @param type
-     * @param hiddenFacts
-     * @param fmType
-     * @param alreadyVisited
-     * @return
-     * @throws Exception
-     */
-    protected FactModelTree createFactModelTreeForGenericType(final Map<String, List<String>> genericTypeInfoMap,
-                                                              final String factName,
-                                                              final String importPrefix,
-                                                              final String propertyName,
-                                                              final String fullPropertyPath,
-                                                              final ClientDMNType type,
-                                                              final SortedMap<String, FactModelTree> hiddenFacts,
-                                                              final FactModelTree.Type fmType,
-                                                              final List<String> alreadyVisited) {
-        return type.isComposite() ?
-                createFactModelTreeForComposite(genericTypeInfoMap, propertyName, importPrefix, fullPropertyPath, type, hiddenFacts, fmType, alreadyVisited) :
-                createFactModelTreeForSimple(factName, importPrefix, type.getName(), type.getName(), genericTypeInfoMap, fmType);
-    }
-
-    /**
-     * Creates a <code>FactModelTree</code> for <code>DMNType</code> where <code>DMNType.isComposite()</code> != <code>true</code>.
-     * Returned <code>FactModelTree</code> will have only one single property, whose name is <b>VALUE</b> and whose value is the given <b>propertyClass</b>
-     *
-     * @param genericTypeInfoMap
-     * @param factName
-     * @param propertyClass
-     * @param fmType
-     * @return
-     */
-    protected FactModelTree createFactModelTreeForSimple(final String factName,
-                                                         final String importPrefix,
-                                                         final String typeName,
-                                                         final String propertyClass,
-                                                         final Map<String, List<String>> genericTypeInfoMap,
-                                                         final FactModelTree.Type fmType) {
-        return FactModelTree.ofSimpleDMN(factName, importPrefix, propertyClass, genericTypeInfoMap, typeName, fmType);
-    }
-
-    /**
-     * Creates a <code>FactModelTree</code> for <code>DMNType</code> where <code>DMNType.isComposite()</code> == <code>true</code>
-     *
-     * @param genericTypeInfoMap
-     * @param name
-     * @param fullPropertyPath
-     * @param type
-     * @param hiddenFacts
-     * @param fmType
-     * @param alreadyVisited
-     * @return
-     * @throws Exception if <code>DMNType.isComposite()</code> != <code>true</code>
-     */
-    protected FactModelTree createFactModelTreeForComposite(final Map<String, List<String>> genericTypeInfoMap,
-                                                            final String name,
-                                                            final String importPrefix,
-                                                            final String fullPropertyPath,
-                                                            final ClientDMNType type,
-                                                            final SortedMap<String, FactModelTree> hiddenFacts,
-                                                            final FactModelTree.Type fmType,
-                                                            final List<String> alreadyVisited) {
-        if (!type.isComposite() && !isToBeManagedAsComposite(type)) {
-            throw new IllegalStateException(WRONG_DMN_MESSAGE);
-        }
-        Map<String, FactModelTree.PropertyTypeName> simpleFields = new HashMap<>();
-        FactModelTree toReturn = FactModelTree.ofDMN(name, importPrefix, simpleFields, genericTypeInfoMap, type.getName(), fmType);
-        for (Map.Entry<String, ClientDMNType> entry : type.getFields().entrySet()) {
-            String expandablePropertyName = fullPropertyPath + "." + entry.getKey();
-            if (isToBeManagedAsCollection(entry.getValue())) {  // if it is a collection, generate the generic and add as hidden fact a simple or composite fact model tree
-                FactModelTree fact = createFactModelTreeForCollection(new HashMap<>(), entry.getKey(), importPrefix, entry.getValue(), hiddenFacts, FactModelTree.Type.UNDEFINED, alreadyVisited);
-                simpleFields.put(entry.getKey(), new FactModelTree.PropertyTypeName(List.class.getCanonicalName()));
-                genericTypeInfoMap.put(entry.getKey(), fact.getGenericTypeInfo(VALUE));
-            } else {
-                String typeName = entry.getValue().getName();
-                if (entry.getValue().isComposite()) { // a complex type needs the expandable property and then in the hidden map, its fact model tree
-                    if (!hiddenFacts.containsKey(typeName) && !alreadyVisited.contains(typeName)) {
-                        alreadyVisited.add(typeName);
-                        FactModelTree fact = createFactModelTreeForNoCollection(genericTypeInfoMap, entry.getKey(), importPrefix, VALUE, expandablePropertyName, entry.getValue(), hiddenFacts, FactModelTree.Type.UNDEFINED, alreadyVisited);
-                        hiddenFacts.put(typeName, fact);
-                    }
-                    toReturn.addExpandableProperty(entry.getKey(), typeName);
-                } else {
-                    FactModelTree.PropertyTypeName propertyTypeName = entry.getValue().getBaseType() != null ?
-                            new FactModelTree.PropertyTypeName(typeName, entry.getValue().getBaseType().getName()) :
-                            new FactModelTree.PropertyTypeName(typeName);
-                    simpleFields.put(entry.getKey(), propertyTypeName);
-                }
-            }
-        }
-        return toReturn;
-    }
-
-    /**
-     * In case of typeRef which points to an imported DMN model, eg. external.tType, the type is normalized
-     * to remove the prefix, in order to handle a DMNType without a prefix in Test Scenario Editor.
-     * This should be used everywhere a typeRef is retrieved
-     * @param typeRef
-     * @return
-     */
-    private String getFilteredTypeRef(String typeRef) {
-        if (typeRef != null && typeRef.contains(".")) {
-            return typeRef.substring(typeRef.lastIndexOf('.') + 1);
-        } else {
-            return typeRef;
-        }
-    }
-
-    // Indirection required for tests
-    public boolean isJSITInputData(JSITDRGElement jsitdrgElement) {
-        return JSITInputData.instanceOf(jsitdrgElement);
-    }
-
-    // Indirection required for tests
-    public boolean isJSITDecision(JSITDRGElement jsitdrgElement) {
-        return JSITDecision.instanceOf(jsitdrgElement);
-    }
-
-    // Indirection required for tests
-    public Map<QName, String> getOtherAttributesMap(JSITDMNElement jsitInputDataVariable) {
-        return JSITDMNElement.getOtherAttributesMap(jsitInputDataVariable);
-    }
-
-    private static class ErrorHolder {
-
-        Set<String> multipleNestedObject = new TreeSet<>();
-        Set<String> multipleNestedCollection = new TreeSet<>();
-
-        public Set<String> getMultipleNestedObject() {
-            return multipleNestedObject;
-        }
-
-        public Set<String> getMultipleNestedCollection() {
-            return multipleNestedCollection;
-        }
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/feel/BuiltInType.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/feel/BuiltInType.java
deleted file mode 100644
index a87a166..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/feel/BuiltInType.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dmn.feel;
-
-/**
- * FEEL Types managed by DMN Editor. Copied from org.kie.workbench.common.dmn.api module
- */
-public enum BuiltInType {
-
-    NUMBER("number"),
-    STRING("string"),
-    BOOLEAN("boolean"),
-    DURATION_DAYS_TIME("days and time duration", "dayTimeDuration"),
-    DURATION_YEAR_MONTH("years and months duration", "yearMonthDuration"),
-    TIME("time"),
-    DATE_TIME("date and time", "dateTime"),
-
-    ANY("Any"),
-    DATE("date"),
-    CONTEXT("context"),
-    UNDEFINED("<Undefined>");
-
-    private final String[] names;
-
-    BuiltInType(String... names) {
-        this.names = names;
-    }
-
-    public String getName() {
-        return names[0];
-    }
-
-    public String[] getNames() {
-        return names;
-    }
-
-    @Override
-    public String toString() {
-        return "Type{ " +
-               names[0] +
-               " }";
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/model/KogitoDMNModel.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/model/KogitoDMNModel.java
deleted file mode 100644
index d698ef9..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/model/KogitoDMNModel.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dmn.model;
-
-import java.util.Map;
-
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITDefinitions;
-
-public class KogitoDMNModel {
-
-    final JSITDefinitions jsitDefinitions;
-    final Map<String, JSITDefinitions> importsDefinitions;
-
-    public KogitoDMNModel(JSITDefinitions jsitDefinitions, Map<String, JSITDefinitions> importsDefinitions) {
-        this.jsitDefinitions = jsitDefinitions;
-        this.importsDefinitions = importsDefinitions;
-    }
-
-    public JSITDefinitions getJsitDefinitions() {
-        return jsitDefinitions;
-    }
-
-    public Map<String, JSITDefinitions> getImportsDefinitions() {
-        return importsDefinitions;
-    }
-
-    public String getName() {
-        return jsitDefinitions.getName();
-    }
-
-    public String getNamespace() {
-        return  jsitDefinitions.getNamespace();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/package-info.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/package-info.java
deleted file mode 100644
index 382dc10..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dmn;
-
-/**
- * Aim of this module is to manage a DMN file and use it to define Data Objects usable inside Scenario Simulation.
- * Most of these classes are copied from other external modules, which are not compatible with GWT.
- * Class on dmn/feel package is copied from kie-wb-common-dmn-api (BuiltInType)
- * Classes on dmn package contains code copied from backend side of ScenarioSimulation and kie-dmn-core module
- **/
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmo/KogitoAsyncPackageDataModelOracle.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmo/KogitoAsyncPackageDataModelOracle.java
deleted file mode 100644
index ac996f2..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmo/KogitoAsyncPackageDataModelOracle.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dmo;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import org.drools.workbench.screens.scenariosimulation.model.dmo.ModelField;
-import org.uberfire.backend.vfs.Path;
-
-/**
- * It provides an emulatation to the "Oracle" implementation used inside Business Central
- */
-public abstract class KogitoAsyncPackageDataModelOracle {
-
-    protected Path resourcePath;
-    protected Map<String, String> parametricFieldMap;
-    protected List<String> packageNames;
-    protected String[] factTypes;
-    protected String[] fqcnNames;
-    protected Map<String, String> fqcnNamesMap;
-    protected Map<String, Boolean> collectionTypes;
-    protected Map<String, ModelField[]> modelFieldsMap;
-
-    public void init(Path resourcePath) {
-        this.resourcePath = resourcePath;
-        this.parametricFieldMap = retrieveParametricFieldMap();
-        this.packageNames = retrievePackageNames();
-        this.factTypes = retrieveFactTypes();
-        this.fqcnNames = retrieveFqcnNames();
-        this.fqcnNamesMap = retrieveFqcnNamesMap();
-        this.collectionTypes = retrieveCollectionTypes();
-        this.modelFieldsMap = retrieveModelFieldsMap();
-    }
-
-    protected abstract Map<String, ModelField[]> retrieveModelFieldsMap();
-
-    protected abstract Map<String, Boolean> retrieveCollectionTypes();
-
-    protected abstract Map<String, String> retrieveFqcnNamesMap();
-
-    protected abstract String[] retrieveFqcnNames();
-
-    protected abstract String[] retrieveFactTypes();
-
-    protected abstract List<String> retrievePackageNames();
-
-    protected abstract Map<String, String> retrieveParametricFieldMap();
-
-    public Path getResourcePath() {
-        return resourcePath;
-    }
-
-    public List<String> getPackageNames() {
-        return packageNames;
-    }
-
-    public String[] getFactTypes() {
-        return factTypes;
-    }
-
-    public String[] getAllFactTypes() {
-        return factTypes;
-    }
-
-    public String[] getInternalFactTypes() {
-        return factTypes;
-    }
-
-    public String[] getExternalFactTypes() {
-        return new String[0];
-    }
-
-    public String getFQCNByFactName(String factName) {
-        return fqcnNamesMap.get(factName);
-    }
-
-    public ModelField[] getFieldCompletions(String factType) {
-        return modelFieldsMap.get(factType);
-    }
-
-    public String getFieldType(String variableClass, String fieldName) {
-        String toReturn = null;
-        ModelField modelField = getModelField(variableClass, fieldName);
-        if (modelField != null) {
-            toReturn = modelField.getType();
-        }
-        return toReturn;
-    }
-
-    public String getFieldClassName(String factName, String fieldName) {
-        String toReturn = null;
-        ModelField modelField = getModelField(factName, fieldName);
-        if (modelField != null) {
-            toReturn = modelField.getClassName();
-        }
-        return toReturn;
-    }
-
-    public String getParametricFieldType(String factType, String fieldName) {
-        String key = factType + "." + fieldName;
-        return parametricFieldMap.get(key);
-    }
-
-    private ModelField getModelField(String factName, String fieldName) {
-        ModelField toReturn = null;
-        if (modelFieldsMap.containsKey(factName)) {
-            final ModelField[] modelFields = modelFieldsMap.get(factName);
-            for (ModelField modelField : modelFields) {
-                if (Objects.equals(modelField.getName(), fieldName)) {
-                    toReturn = modelField;
-                    break;
-                }
-            }
-        }
-        return toReturn;
-    }
-    
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/docks/KogitoEditorDock.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/docks/KogitoEditorDock.java
deleted file mode 100644
index 6880f2b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/docks/KogitoEditorDock.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.docks;
-
-import java.util.Collection;
-import java.util.Objects;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import org.jboss.errai.ioc.client.api.ManagedInstance;
-import org.kie.workbench.common.widgets.client.docks.AuthoringEditorDock;
-import org.kie.workbench.common.widgets.client.docks.WorkbenchDocksHandler;
-import org.uberfire.client.workbench.docks.UberfireDock;
-import org.uberfire.client.workbench.docks.UberfireDockPosition;
-import org.uberfire.client.workbench.docks.UberfireDocks;
-import org.uberfire.mvp.Command;
-import org.uberfire.mvp.PlaceRequest;
-
-@ApplicationScoped
-public class KogitoEditorDock implements AuthoringEditorDock {
-
-    protected UberfireDocks uberfireDocks;
-    protected ManagedInstance<WorkbenchDocksHandler> installedHandlers;
-    protected String authoringPerspectiveIdentifier = null;
-    protected WorkbenchDocksHandler activeHandler = null;
-    protected UberfireDock[] activeDocks;
-
-    @Inject
-    public KogitoEditorDock(final UberfireDocks uberfireDocks,
-                            final ManagedInstance<WorkbenchDocksHandler> installedHandlers) {
-        this.uberfireDocks = uberfireDocks;
-        this.installedHandlers = installedHandlers;
-    }
-
-    @PostConstruct
-    public void initialize() {
-        // Initializing the handlers
-        installedHandlers.iterator().forEachRemaining(handler -> {
-            Command initCommand = () -> setActiveHandler(handler);
-            handler.init(initCommand);
-        });
-    }
-
-    @Override
-    public boolean isSetup() {
-        return authoringPerspectiveIdentifier != null;
-    }
-
-    @Override
-    public void setup(String authoringPerspectiveIdentifier, PlaceRequest defaultPlaceRequest) {
-        this.authoringPerspectiveIdentifier = authoringPerspectiveIdentifier;
-    }
-
-    @Override
-    public void show() {
-    }
-
-    @Override
-    public void hide() {
-    }
-
-    @Override
-    public void expandAuthoringDock(UberfireDock dockToOpen) {
-        uberfireDocks.show(UberfireDockPosition.EAST);
-        if (dockToOpen != null) {
-            uberfireDocks.open(dockToOpen);
-        }
-    }
-
-    protected void setActiveHandler(WorkbenchDocksHandler handler) {
-        // If there's an active handler let's check if it should refresh docks
-        if (Objects.equals(activeHandler, handler) && !activeHandler.shouldRefreshDocks()) {
-            return;
-        }
-
-        // setting the new handler as active
-        activeHandler = handler;
-
-        if (activeHandler.shouldDisableDocks()) {
-            // disable docks
-            if (activeDocks != null) {
-                uberfireDocks.remove(activeDocks);
-            }
-        } else {
-            // first remove the existing docks
-            if (activeDocks != null) {
-                uberfireDocks.remove(activeDocks);
-            }
-
-            // getting docks from the handler and  refreshing
-            Collection<UberfireDock> docks = activeHandler.provideDocks(authoringPerspectiveIdentifier);
-            activeDocks = docks.toArray(new UberfireDock[docks.size()]);
-            uberfireDocks.add(activeDocks);
-            uberfireDocks.show(UberfireDockPosition.EAST);
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoCreationAssetsDropdown.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoCreationAssetsDropdown.java
deleted file mode 100644
index 156a4ed..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoCreationAssetsDropdown.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dropdown;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.drools.workbench.screens.scenariosimulation.client.dropdown.ScenarioSimulationDropdownView;
-import org.kie.workbench.common.widgets.client.assets.dropdown.AbstractKieAssetsDropdown;
-
-@Dependent
-public class ScenarioSimulationKogitoCreationAssetsDropdown extends AbstractKieAssetsDropdown {
-
-    @Inject
-    public ScenarioSimulationKogitoCreationAssetsDropdown(@Named(ScenarioSimulationDropdownView.BEAN_NAME) ScenarioSimulationDropdownView view,
-                                                          ScenarioSimulationKogitoCreationAssetsDropdownProvider dataProvider) {
-        super(view, dataProvider);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoCreationAssetsDropdownProvider.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoCreationAssetsDropdownProvider.java
deleted file mode 100644
index 8aa5b0c..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoCreationAssetsDropdownProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dropdown;
-
-import org.drools.workbench.screens.scenariosimulation.client.dropdown.ScenarioSimulationAssetsDropdownProvider;
-
-/**
- * To be implemented in runtime and testing submodules, defining the source of the DMN files lists.
- */
-public interface ScenarioSimulationKogitoCreationAssetsDropdownProvider extends ScenarioSimulationAssetsDropdownProvider {
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoScesimFilesDropdown.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoScesimFilesDropdown.java
deleted file mode 100644
index 3666361..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoScesimFilesDropdown.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dropdown;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import com.google.gwt.user.client.ui.IsWidget;
-import org.kie.workbench.common.widgets.client.assets.dropdown.AbstractKieAssetsDropdown;
-
-@Dependent
-public class ScenarioSimulationKogitoScesimFilesDropdown extends AbstractKieAssetsDropdown {
-
-    @Inject
-    public ScenarioSimulationKogitoScesimFilesDropdown(ScenarioSimulationKogitoScesimFilesDropdownView view, ScenarioSimulationKogitoScesimFilesDropdownProviderKogitoImpl dataProvider) {
-        super(view, dataProvider);
-    }
-
-    public IsWidget asWidget() {
-        return ((ScenarioSimulationKogitoScesimFilesDropdownView) view).asWidget();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoScesimFilesDropdownProviderKogitoImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoScesimFilesDropdownProviderKogitoImpl.java
deleted file mode 100644
index d13bf82..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoScesimFilesDropdownProviderKogitoImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dropdown;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-
-import javax.enterprise.context.Dependent;
-
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItemsProvider;
-
-@Dependent
-public class ScenarioSimulationKogitoScesimFilesDropdownProviderKogitoImpl implements KieAssetsDropdownItemsProvider {
-
-    @Override
-    public void getItems(Consumer<List<KieAssetsDropdownItem>> assetListConsumer) {
-        assetListConsumer.accept(new ArrayList<>());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoScesimFilesDropdownView.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoScesimFilesDropdownView.html
deleted file mode 100644
index 5b6d855..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoScesimFilesDropdownView.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  ~ 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.      
--->
-
-<div>
-  <label>
-    <select class="selectpicker" data-field="native-select"></select>
-  </label>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoScesimFilesDropdownView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoScesimFilesDropdownView.java
deleted file mode 100644
index 07c7c67..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dropdown/ScenarioSimulationKogitoScesimFilesDropdownView.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dropdown;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import com.google.gwt.user.client.ui.IsWidget;
-import elemental2.dom.HTMLOptionElement;
-import elemental2.dom.HTMLSelectElement;
-import org.jboss.errai.common.client.ui.ElementWrapperWidget;
-import org.jboss.errai.ui.client.local.spi.TranslationService;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownView;
-
-@Dependent
-@Templated
-public class ScenarioSimulationKogitoScesimFilesDropdownView extends KieAssetsDropdownView implements ScenarioSimulationKogitoScesimFilesDropdown.View {
-
-    @Inject
-    public ScenarioSimulationKogitoScesimFilesDropdownView(HTMLSelectElement nativeSelect, HTMLOptionElement htmlOptionElement, TranslationService translationService) {
-        super(nativeSelect, htmlOptionElement, translationService);
-    }
-
-    public IsWidget asWidget() {
-        return ElementWrapperWidget.getWidget(getElement());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/ScenarioSimulationEditorKogitoWrapper.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/ScenarioSimulationEditorKogitoWrapper.java
deleted file mode 100644
index 749fc56..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/ScenarioSimulationEditorKogitoWrapper.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.editor;
-
-import java.util.List;
-import java.util.function.Supplier;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.PopupPanel;
-import elemental2.dom.CSSProperties;
-import elemental2.dom.DomGlobal;
-import elemental2.dom.Element;
-import elemental2.dom.HTMLCollection;
-import elemental2.dom.HTMLDivElement;
-import elemental2.promise.Promise;
-import jsinterop.base.Js;
-import org.drools.scenariosimulation.api.model.AbstractScesimData;
-import org.drools.scenariosimulation.api.model.AbstractScesimModel;
-import org.drools.scenariosimulation.api.model.Background;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScenarioWithIndex;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.scenariosimulation.api.model.SimulationRunMetadata;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.SCESIMMainJs;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.callbacks.SCESIMMarshallCallback;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.callbacks.SCESIMUnmarshallCallback;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIScenarioSimulationModelType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.SCESIM;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.mapper.JSIName;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.mapper.JsUtils;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationEditorPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationEditorWrapper;
-import org.drools.workbench.screens.scenariosimulation.client.editor.strategies.DataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.AbstractScenarioSimulationDocksHandler;
-import org.drools.workbench.screens.scenariosimulation.client.handlers.ScenarioSimulationHasBusyIndicatorDefaultErrorCallback;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridWidget;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.KogitoScenarioSimulationBuilder;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.ScenarioSimulationKogitoDMNDataManager;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.model.KogitoDMNModel;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmo.KogitoAsyncPackageDataModelOracle;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.editor.strategies.KogitoDMNDataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.editor.strategies.KogitoDMODataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.handlers.ScenarioSimulationKogitoDocksHandler;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.popup.ScenarioSimulationKogitoCreationPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.services.ScenarioSimulationKogitoDMNMarshallerService;
-import org.drools.workbench.screens.scenariosimulation.model.SimulationRunResult;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.jboss.errai.ui.client.local.spi.TranslationService;
-import org.kie.workbench.common.kogito.client.editor.MultiPageEditorContainerPresenter;
-import org.kie.workbench.common.kogito.client.editor.MultiPageEditorContainerView;
-import org.kie.workbench.common.widgets.client.docks.AuthoringEditorDock;
-import org.kie.workbench.common.widgets.client.errorpage.ErrorPage;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.backend.vfs.PathFactory;
-import org.uberfire.backend.vfs.impl.ObservablePathImpl;
-import org.uberfire.client.callbacks.Callback;
-import org.uberfire.client.promise.Promises;
-import org.uberfire.client.views.pfly.multipage.PageImpl;
-import org.uberfire.mvp.Command;
-import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.workbench.events.NotificationEvent;
-
-import static org.drools.workbench.screens.scenariosimulation.kogito.client.converters.ApiJSInteropConverter.getJSIScenarioSimulationModelType;
-import static org.drools.workbench.screens.scenariosimulation.kogito.client.converters.JSInteropApiConverter.getScenarioSimulationModel;
-
-/**
- * Wrapper to be used inside Kogito
- */
-@Dependent
-public class ScenarioSimulationEditorKogitoWrapper extends MultiPageEditorContainerPresenter<ScenarioSimulationModel>
-        implements ScenarioSimulationEditorWrapper {
-
-    protected static final String DEFAULT_PACKAGE = "com";
-    protected static final String NEW_FILE_NAME = "new-file.scesim";
-    protected static final String SCESIM = "scesim";
-
-    protected ScenarioSimulationEditorPresenter scenarioSimulationEditorPresenter;
-    protected AuthoringEditorDock authoringWorkbenchDocks;
-    protected SCESIM scesimContainer;
-    protected Promises promises;
-    protected Path currentPath;
-    protected ScenarioSimulationKogitoDMNDataManager dmnDataManager;
-    protected KogitoAsyncPackageDataModelOracle kogitoOracle;
-    protected TranslationService translationService;
-    protected ScenarioSimulationKogitoCreationPopupPresenter scenarioSimulationKogitoCreationPopupPresenter;
-    protected KogitoScenarioSimulationBuilder scenarioSimulationBuilder;
-    protected ScenarioSimulationKogitoDocksHandler scenarioSimulationKogitoDocksHandler;
-    protected ScenarioSimulationKogitoDMNMarshallerService scenarioSimulationKogitoDMNMarshallerService;
-    protected ErrorPage errorPage;
-
-    public ScenarioSimulationEditorKogitoWrapper() {
-        //Zero-parameter constructor for CDI proxies
-    }
-
-    @Inject
-    public ScenarioSimulationEditorKogitoWrapper(
-            final ScenarioSimulationEditorPresenter scenarioSimulationEditorPresenter,
-            final MultiPageEditorContainerView multiPageEditorContainerView,
-            final AuthoringEditorDock authoringWorkbenchDocks,
-            final Promises promises,
-            final ScenarioSimulationKogitoDMNDataManager dmnDataManager,
-            final KogitoAsyncPackageDataModelOracle kogitoOracle,
-            final TranslationService translationService,
-            final ScenarioSimulationKogitoCreationPopupPresenter scenarioSimulationKogitoCreationPopupPresenter,
-            final KogitoScenarioSimulationBuilder scenarioSimulationBuilder,
-            final ScenarioSimulationKogitoDocksHandler scenarioSimulationKogitoDocksHandler,
-            final ScenarioSimulationKogitoDMNMarshallerService scenarioSimulationKogitoDMNMarshallerService,
-            final ErrorPage errorPage) {
-        super(scenarioSimulationEditorPresenter.getView(), multiPageEditorContainerView);
-        this.scenarioSimulationEditorPresenter = scenarioSimulationEditorPresenter;
-        this.authoringWorkbenchDocks = authoringWorkbenchDocks;
-        this.promises = promises;
-        this.dmnDataManager = dmnDataManager;
-        this.kogitoOracle = kogitoOracle;
-        this.translationService = translationService;
-        this.scenarioSimulationBuilder = scenarioSimulationBuilder;
-        this.scenarioSimulationKogitoCreationPopupPresenter = scenarioSimulationKogitoCreationPopupPresenter;
-        this.scenarioSimulationKogitoDocksHandler = scenarioSimulationKogitoDocksHandler;
-        this.scenarioSimulationKogitoDMNMarshallerService = scenarioSimulationKogitoDMNMarshallerService;
-        this.errorPage = errorPage;
-    }
-
-    @PostConstruct
-    public void init() {
-        scenarioSimulationEditorPresenter.getView().onResize();
-        HTMLCollection<Element> elements = DomGlobal.document.getElementsByClassName("tab-content");
-        if(elements.length == 1) {
-            HTMLDivElement element = (HTMLDivElement) elements.getAt(0);
-            element.style.height = CSSProperties.HeightUnionType.of("calc(100vh - 36px)");
-        }
-    }
-
-    @Override
-    public Promise<String> getContent() {
-        return promises.create(this::prepareContent);
-    }
-
-    @Override
-    public Promise<Void> setContent(String fullPath, String content) {
-        return promises.create((success, failure) -> manageContent(fullPath, content, success, failure));
-    }
-
-    /**
-     * It manages the logic invoked in the Promise created during a <code>setContent()</code> call
-     * @param fullPath
-     * @param content
-     * @param success
-     * @param failure
-     */
-    protected void manageContent(String fullPath,
-                                 String content,
-                                 Promise.PromiseExecutorCallbackFn.ResolveCallbackFn<Void> success,
-                                 Promise.PromiseExecutorCallbackFn.RejectCallbackFn failure) {
-        try {
-            /* Retrieving file name and its relative path */
-            String finalName = NEW_FILE_NAME;
-            String pathString = "/";
-            if (fullPath != null && !fullPath.isEmpty()) {
-                int idx = fullPath.replaceAll("\\\\", "/").lastIndexOf('/');
-                finalName = idx >= 0 ? fullPath.substring(idx + 1) : fullPath;
-                pathString = idx >= 0 ? fullPath.substring(0, idx + 1) : pathString;
-            }
-            final Path path = PathFactory.newPath(finalName, pathString);
-            /* If given content is null, a new file has to be created. */
-            /* Otherwise, the content is un-marshalled and shown in the editor */
-            if (content == null || content.isEmpty()) {
-                showScenarioSimulationCreationPopup(path);
-            } else {
-                gotoPath(path);
-                unmarshallContent(content);
-            }
-            success.onInvoke((Void) null);
-        } catch (Exception e) {
-            /* If any exception occurs, promise returns a failure */
-            setErrorPage(e.getMessage());
-            failure.onInvoke(e.getMessage());
-        }
-    }
-
-    private void setErrorPage(final String errorMessage) {
-        errorPage.setTitle(ScenarioSimulationEditorConstants.INSTANCE.scenarioParsingError());
-        errorPage.setContent(ScenarioSimulationEditorConstants.INSTANCE.scenarioParsingErrorContent());
-        errorPage.setErrorContent(errorMessage);
-        scenarioSimulationEditorPresenter.getView().setContentWidget(errorPage);
-        scenarioSimulationEditorPresenter.hideDocks();
-        scenarioSimulationEditorPresenter.getView().setScenarioTabBarVisibility(false);
-    }
-
-    private void ensureScenarioGridIsSet() {
-        scenarioSimulationEditorPresenter.getView().setScenarioGridWidgetAsContent();
-        scenarioSimulationEditorPresenter.getView().setScenarioTabBarVisibility(true);
-    }
-
-    public void prepareContent(Promise.PromiseExecutorCallbackFn.ResolveCallbackFn<String> success,
-                               Promise.PromiseExecutorCallbackFn.RejectCallbackFn failure) {
-        try {
-            synchronizeColumnsDimension(scenarioSimulationEditorPresenter.getContext().getScenarioGridPanelByGridWidget(GridWidget.SIMULATION),
-                                        scenarioSimulationEditorPresenter.getContext().getScenarioGridPanelByGridWidget(GridWidget.BACKGROUND));
-            marshallContent(scenarioSimulationEditorPresenter.getModel(), success);
-        } catch (Exception e) {
-            /* If any exception occurs, promise returns a failure */
-            scenarioSimulationEditorPresenter.sendNotification(e.getMessage(), NotificationEvent.NotificationType.ERROR);
-            failure.onInvoke(e.getMessage());
-        }
-    }
-
-    @Override
-    public void wrappedRegisterDock(String id, IsWidget widget) {
-        //
-    }
-
-    @Override
-    public void onImport(String fileContents, RemoteCallback<AbstractScesimModel> importCallBack, ErrorCallback<Object> importErrorCallback, AbstractScesimModel<? extends AbstractScesimData> scesimModel) {
-        //
-    }
-
-    @Override
-    public void onExportToCsv(RemoteCallback<String> exportCallBack, ScenarioSimulationHasBusyIndicatorDefaultErrorCallback scenarioSimulationHasBusyIndicatorDefaultErrorCallback, AbstractScesimModel<? extends AbstractScesimData> scesimModel) {
-        //
-    }
-
-    @Override
-    public void onDownloadReportToCsv(RemoteCallback<String> exportCallBack, ScenarioSimulationHasBusyIndicatorDefaultErrorCallback scenarioSimulationHasBusyIndicatorDefaultErrorCallback, SimulationRunMetadata simulationRunMetadata, ScenarioSimulationModel.Type modelType) {
-        //
-    }
-
-    @Override
-    public void validate(Simulation simulation, Settings settings, RemoteCallback<?> callback) {
-        //
-    }
-
-    @Override
-    public void onRefreshedModelContent(SimulationRunResult testResultMessage) {
-        /* No actions required after data refresh in Kogito */
-    }
-
-    /**
-     * This method is called when the main grid tab (Model) is focused
-     */
-    public void onEditTabSelected() {
-        scenarioSimulationEditorPresenter.onEditTabSelected();
-    }
-
-    /**
-     * This method adds specifically the Background grid and its related onFocus behavior
-     * @param backgroundGridWidget
-     */
-    @Override
-    public void addBackgroundPage(final ScenarioGridWidget backgroundGridWidget) {
-        final String backgroundPageTitle = ScenarioSimulationEditorConstants.INSTANCE.backgroundTabTitle();
-        getWidget().getMultiPage().addPage(new PageImpl(backgroundGridWidget, backgroundPageTitle) {
-            @Override
-            public void onFocus() {
-                super.onFocus();
-                onBackgroundTabSelected();
-            }
-        });
-    }
-
-    @Override
-    public void selectSimulationTab() {
-    }
-
-    @Override
-    public void selectBackgroundTab() {
-    }
-
-    @Override
-    public void unpublishTestResultsAlerts() {
-        // Not used in Kogito
-    }
-
-    @Override
-    public void getDMNMetadata() {
-        final String dmnFilePath = getScenarioSimulationEditorPresenter().getModel().getSettings().getDmnFilePath();
-        final String dmnFileName = dmnFilePath.substring(dmnFilePath.lastIndexOf('/') + 1);
-        final Path dmnPath = PathFactory.newPath(dmnFileName, dmnFilePath);
-        scenarioSimulationKogitoDMNMarshallerService.getDMNContent(
-                dmnPath,
-                getUpdateDMNMetadataCallback(),
-                getDMNContentErrorCallback(dmnFilePath));
-    }
-
-    private Callback<KogitoDMNModel> getUpdateDMNMetadataCallback() {
-        return kogitoDMNModel -> {
-            getScenarioSimulationEditorPresenter().getModel().getSettings().setDmnName(kogitoDMNModel.getName());
-            getScenarioSimulationEditorPresenter().getModel().getSettings().setDmnNamespace(kogitoDMNModel.getNamespace());
-            getScenarioSimulationEditorPresenter().reloadSettingsDock();
-        };
-    }
-
-    @Override
-    public AbstractScenarioSimulationDocksHandler getScenarioSimulationDocksHandler() {
-        return scenarioSimulationKogitoDocksHandler;
-    }
-
-    @Override
-    public ScenarioSimulationEditorPresenter getScenarioSimulationEditorPresenter() {
-        return scenarioSimulationEditorPresenter;
-    }
-
-    public void resetContentHash() {
-        //
-    }
-
-    public void onStartup(final PlaceRequest place) {
-        super.init(place);
-        resetEditorPages();
-        authoringWorkbenchDocks.setup("AuthoringPerspective", place);
-        scenarioSimulationEditorPresenter.setWrapper(this);
-    }
-
-    public void gotoPath(Path path) {
-        kogitoOracle.init(path);
-        currentPath = path;
-        scenarioSimulationEditorPresenter.setPath(new ObservablePathImpl().wrap(path));
-    }
-
-    public Path getCurrentPath() {
-        return currentPath;
-    }
-
-    public boolean mayClose() {
-        return !scenarioSimulationEditorPresenter.isDirty();
-    }
-
-    @Override
-    public MultiPageEditorContainerView getWidget() {
-        return super.getWidget();
-    }
-
-    @Override
-    public void onRunScenario(RemoteCallback<SimulationRunResult> refreshModelCallback, ScenarioSimulationHasBusyIndicatorDefaultErrorCallback scenarioSimulationHasBusyIndicatorDefaultErrorCallback, ScesimModelDescriptor simulationDescriptor, Settings settings, List<ScenarioWithIndex> toRun, Background background) {
-        scenarioSimulationEditorPresenter.getView().hideBusyIndicator();
-        new PopupPanel().show();
-    }
-
-    @Override
-    public Integer getOriginalHash() {
-        return -1;
-    }
-
-    protected Supplier<ScenarioSimulationModel> getContentSupplier() {
-        return () -> scenarioSimulationEditorPresenter.getModel();
-    }
-
-    protected void marshallContent(ScenarioSimulationModel scenarioSimulationModel, Promise.PromiseExecutorCallbackFn.ResolveCallbackFn<String> resolveCallbackFn) {
-        if (scesimContainer == null) {
-            scesimContainer = Js.uncheckedCast(JsUtils.newWrappedInstance());
-            JsUtils.setNameOnWrapped(scesimContainer, makeJSINameForSCESIM());
-        }
-        JsUtils.setValueOnWrapped(scesimContainer, getJSIScenarioSimulationModelType(scenarioSimulationModel));
-        SCESIMMainJs.marshall(scesimContainer, null, getJSInteropMarshallCallback(resolveCallbackFn));
-    }
-
-    protected void unmarshallContent(String toUnmarshal) {
-        /* Removing the default namespace introduced in the new Test Scenario editor, that is incompatible with this unmarshaller implementation. */
-        toUnmarshal = toUnmarshal.replace("xmlns=\"https://kie.org/scesim/1.8\"", "");
-        SCESIMMainJs.unmarshall(toUnmarshal, SCESIM, getJSInteropUnmarshallCallback());
-    }
-
-    private JSIName makeJSINameForSCESIM() {
-        final JSIName jsiName = JSIScenarioSimulationModelType.getJSIName();
-        jsiName.setPrefix("");
-        jsiName.setLocalPart("ScenarioSimulationModel");
-        final String key = "{" + jsiName.getNamespaceURI() + "}" + jsiName.getLocalPart();
-        final String keyString = "{" + jsiName.getNamespaceURI() + "}" + jsiName.getPrefix() + ":" + jsiName.getLocalPart();
-        jsiName.setKey(key);
-        jsiName.setString(keyString);
-        return jsiName;
-    }
-
-    protected SCESIMMarshallCallback getJSInteropMarshallCallback(Promise.PromiseExecutorCallbackFn.ResolveCallbackFn<String> resolveCallbackFn) {
-        return resolveCallbackFn::onInvoke;
-    }
-
-    protected SCESIMUnmarshallCallback getJSInteropUnmarshallCallback() {
-        return scesim -> {
-            this.scesimContainer = scesim;
-            final JSIScenarioSimulationModelType scenarioSimulationModelType = Js.uncheckedCast(JsUtils.getUnwrappedElement(scesim));
-            final ScenarioSimulationModel scenarioSimulationModel = getScenarioSimulationModel(scenarioSimulationModelType);
-            onModelSuccessCallbackMethod(scenarioSimulationModel);
-        };
-    }
-
-    protected void onModelSuccessCallbackMethod(ScenarioSimulationModel model) {
-        scenarioSimulationEditorPresenter.setPackageName(DEFAULT_PACKAGE);
-        DataManagementStrategy dataManagementStrategy;
-        if (ScenarioSimulationModel.Type.RULE.equals(model.getSettings().getType())) {
-            scenarioSimulationEditorPresenter.sendNotification(ScenarioSimulationEditorConstants.INSTANCE.ruleScenarioNotSupportedNotification(),
-                                                               NotificationEvent.NotificationType.WARNING,
-                                                               false);
-            dataManagementStrategy = new KogitoDMODataManagementStrategy(kogitoOracle);
-        } else {
-            dataManagementStrategy = new KogitoDMNDataManagementStrategy(dmnDataManager,
-                                                                         scenarioSimulationKogitoDMNMarshallerService,
-                                                                         scenarioSimulationEditorPresenter);
-        }
-        dataManagementStrategy.setModel(model);
-        scenarioSimulationEditorPresenter.getModelSuccessCallbackMethod(dataManagementStrategy, model);
-        ensureScenarioGridIsSet();
-    }
-
-    protected void onBackgroundTabSelected() {
-        scenarioSimulationEditorPresenter.onBackgroundTabSelected();
-    }
-
-    /**
-     * It shows the <code>ScenarioSimulationKogitoCreationPopup</code> given the file location, used
-     * @param path
-     */
-    protected void showScenarioSimulationCreationPopup(Path path) {
-        scenarioSimulationKogitoCreationPopupPresenter.show(ScenarioSimulationEditorConstants.INSTANCE.addScenarioSimulation(),
-                                                            createNewFileCommand(path));
-    }
-
-    /**
-     * It creates the command launched when a user wants to create a new Scenario Simulation file.
-     * @param scesimPath The part where the scesim file is located
-     * @return A <code>Command</code> which will be launched pressing the 'Create' new scesim file button
-     */
-    protected Command createNewFileCommand(Path scesimPath) {
-        return () -> {
-            final ScenarioSimulationModel.Type selectedType = scenarioSimulationKogitoCreationPopupPresenter.getSelectedType();
-            if (selectedType == null) {
-                scenarioSimulationEditorPresenter.sendNotification(ScenarioSimulationEditorConstants.INSTANCE.missingSelectedType(),
-                                                                   NotificationEvent.NotificationType.ERROR,
-                                                                   false);
-                return;
-            }
-            gotoPath(scesimPath);
-            if (ScenarioSimulationModel.Type.DMN.equals(selectedType)) {
-                String dmnPath = scenarioSimulationKogitoCreationPopupPresenter.getSelectedPath();
-                if (dmnPath == null || dmnPath.isEmpty()) {
-                    scenarioSimulationEditorPresenter.sendNotification(ScenarioSimulationEditorConstants.INSTANCE.missingDmnPath(),
-                                                                       NotificationEvent.NotificationType.ERROR,
-                                                                       false);
-                    return;
-                }
-                scenarioSimulationBuilder.populateScenarioSimulationModelDMN(dmnPath,
-                                                                             this::onModelSuccessCallbackMethod,
-                                                                             getDMNContentErrorCallback(dmnPath));
-            } else {
-                scenarioSimulationBuilder.populateScenarioSimulationModelRULE("",
-                                                                              this::onModelSuccessCallbackMethod);
-            }
-        };
-    }
-
-    private ErrorCallback<Object> getDMNContentErrorCallback(String dmnFilePath) {
-        return (message, throwable) -> {
-            scenarioSimulationEditorPresenter.sendNotification(ScenarioSimulationEditorConstants.INSTANCE.dmnPathErrorDetailedLabel(dmnFilePath,
-                                                                                                                                    message.toString()),
-                                                               NotificationEvent.NotificationType.ERROR,
-                                                               false);
-            return false;
-        };
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/strategies/KogitoDMNDataManagementStrategy.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/strategies/KogitoDMNDataManagementStrategy.java
deleted file mode 100644
index 1201329..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/strategies/KogitoDMNDataManagementStrategy.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.editor.strategies;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationEditorPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.editor.strategies.AbstractDMNDataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.ScenarioSimulationKogitoDMNDataManager;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.model.KogitoDMNModel;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.services.ScenarioSimulationKogitoDMNMarshallerService;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.backend.vfs.PathFactory;
-import org.uberfire.client.callbacks.Callback;
-import org.uberfire.workbench.events.NotificationEvent;
-
-public class KogitoDMNDataManagementStrategy extends AbstractDMNDataManagementStrategy {
-
-    private final ScenarioSimulationKogitoDMNDataManager dmnDataManager;
-    private final ScenarioSimulationKogitoDMNMarshallerService dmnMarshallerService;
-    private final ScenarioSimulationEditorPresenter scenarioSimulationEditorPresenter;
-
-
-    public KogitoDMNDataManagementStrategy(ScenarioSimulationKogitoDMNDataManager dmnDataManager,
-                                           ScenarioSimulationKogitoDMNMarshallerService scenarioSimulationKogitoDMNMarshallerService,
-                                           ScenarioSimulationEditorPresenter scenarioSimulationEditorPresenter) {
-        super(scenarioSimulationEditorPresenter.getEventBus());
-        this.dmnDataManager = dmnDataManager;
-        this.dmnMarshallerService = scenarioSimulationKogitoDMNMarshallerService;
-        this.scenarioSimulationEditorPresenter = scenarioSimulationEditorPresenter;
-    }
-
-    @Override
-    protected void retrieveFactModelTuple(final TestToolsView.Presenter testToolsPresenter,
-                                          final ScenarioSimulationContext context,
-                                          final GridWidget gridWidget) {
-        String dmnFileName = dmnFilePath.substring(dmnFilePath.lastIndexOf('/') + 1);
-        final Path dmnPath = PathFactory.newPath(dmnFileName, dmnFilePath);
-        dmnMarshallerService.getDMNContent(dmnPath,
-                                           getDMNContentCallback(testToolsPresenter, context, gridWidget),
-                                           getDMNContentErrorCallback(dmnFilePath));
-   }
-
-   private Callback<KogitoDMNModel> getDMNContentCallback(final TestToolsView.Presenter testToolsPresenter,
-                                                          final ScenarioSimulationContext context,
-                                                          final GridWidget gridWidget) {
-       return kogitoDMNModel -> {
-           final FactModelTuple factModelTuple = dmnDataManager.getFactModelTuple(kogitoDMNModel);
-           getSuccessCallback(testToolsPresenter, context, gridWidget).callback(factModelTuple);
-       };
-   }
-
-    private ErrorCallback<Object> getDMNContentErrorCallback(String dmnFilePath) {
-        return (message, throwable) -> {
-            scenarioSimulationEditorPresenter.sendNotification(
-                    ScenarioSimulationEditorConstants.INSTANCE.dmnPathErrorDetailedLabel(dmnFilePath, message.toString()),
-                    NotificationEvent.NotificationType.ERROR,
-                    false);
-            scenarioSimulationEditorPresenter.expandSettingsDock();
-            return false;
-        };
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/strategies/KogitoDMODataManagementStrategy.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/strategies/KogitoDMODataManagementStrategy.java
deleted file mode 100644
index 0b12628..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/strategies/KogitoDMODataManagementStrategy.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.editor.strategies;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.editor.strategies.AbstractDMODataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmo.KogitoAsyncPackageDataModelOracle;
-import org.drools.workbench.screens.scenariosimulation.model.dmo.ModelField;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.uberfire.client.callbacks.Callback;
-
-public class KogitoDMODataManagementStrategy extends AbstractDMODataManagementStrategy {
-
-    protected KogitoAsyncPackageDataModelOracle kogitoOracle;
-
-    public KogitoDMODataManagementStrategy(KogitoAsyncPackageDataModelOracle kogitoOracle) {
-        this.kogitoOracle = kogitoOracle;
-    }
-
-    @Override
-    public boolean isADataType(String value) {
-        return kogitoOracle != null && Arrays.asList(kogitoOracle.getFactTypes()).contains(value);
-    }
-
-    @Override
-    protected void manageDataObjects(final List<String> dataObjectsTypes,
-                                     final Map<String, String> superTypeMap,
-                                     final TestToolsView.Presenter testToolsPresenter,
-                                     final int expectedElements,
-                                     final SortedMap<String, FactModelTree> dataObjectsFieldsMap,
-                                     final ScenarioSimulationContext context,
-                                     final List<String> simpleJavaTypes,
-                                     final GridWidget gridWidget) {
-        // Iterate over all dataObjects to retrieve their modelfields
-        dataObjectsTypes.forEach(factType -> {
-            ModelField[] retrieved = kogitoOracle.getFieldCompletions(factType);
-            FactModelTree toSend = getFactModelTree(factType, superTypeMap, retrieved);
-            aggregatorCallbackMethod(testToolsPresenter, expectedElements, dataObjectsFieldsMap, context, toSend, simpleJavaTypes, gridWidget);
-        });
-    }
-
-    @Override
-    protected List<String> getFactTypes() {
-        return Arrays.asList(kogitoOracle.getFactTypes());
-    }
-
-    @Override
-    protected void getSuperType(String factType, Callback<String> callback) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    protected boolean skipPopulateTestTools() {
-        return kogitoOracle == null || kogitoOracle.getFactTypes().length == 0;
-    }
-
-    @Override
-    protected String getFQCNByFactName(String factName) {
-        return kogitoOracle.getFQCNByFactName(factName);
-    }
-
-    @Override
-    protected String getParametricFieldType(String factName, String propertyName) {
-        return kogitoOracle.getParametricFieldType(factName, propertyName);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/handlers/ScenarioSimulationKogitoDocksHandler.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/handlers/ScenarioSimulationKogitoDocksHandler.java
deleted file mode 100644
index 244e7b6..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/handlers/ScenarioSimulationKogitoDocksHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.handlers;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import org.drools.workbench.screens.scenariosimulation.client.handlers.AbstractScenarioSimulationDocksHandler;
-
-/**
- * Docks handler for SCESIM Kogito version. No additional docks are added in Kogito, therefore it uses inherited docks
- * implemented in the Abstract class.
- */
-@ApplicationScoped
-public class ScenarioSimulationKogitoDocksHandler extends AbstractScenarioSimulationDocksHandler {
-
-    /**
-     * Test result dock is not implemented in Kogito version, then an <code>UnsupportedOperationException</code> is
-     * thrown if method is called in this context.
-     */
-    public void expandTestResultsDock() {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/menu/KogitoGridContextMenu.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/menu/KogitoGridContextMenu.java
deleted file mode 100644
index 51ea691..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/menu/KogitoGridContextMenu.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.menu;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.Dependent;
-
-import org.drools.workbench.screens.scenariosimulation.client.editor.menu.GridContextMenu;
-
-@Dependent
-public class KogitoGridContextMenu extends GridContextMenu {
-
-    @PostConstruct
-    @Override
-    public void initMenu() {
-        super.initMenu();
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopup.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopup.java
deleted file mode 100644
index 7d41b25..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopup.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.popup;
-
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.uberfire.mvp.Command;
-
-public interface ScenarioSimulationKogitoCreationPopup {
-
-    /**
-     * Makes the <code>ScenarioKogitoCreationPopup</code> visible with OK/CANCEL.
-     * @param mainTitleText
-     * @param okCommand
-     */
-    void show(final String mainTitleText, Command okCommand);
-
-    /**
-     * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-     * already showing.
-     */
-    void hide();
-
-    ScenarioSimulationModel.Type getSelectedType();
-
-    String getSelectedPath();
-
-    interface Presenter {
-
-        /**
-         * Makes the <code>NewScesimPopup</code> visible with OK/CANCEL.
-         * @param mainTitleText
-         * @param okCommand
-         */
-        void show(final String mainTitleText, Command okCommand);
-
-
-        ScenarioSimulationModel.Type getSelectedType();
-
-        /**
-         * Makes this popup container(and the main content along with it) invisible. Has no effect if the popup is not
-         * already showing.
-         */
-        void hide();
-
-        String getSelectedPath();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupPresenter.java
deleted file mode 100644
index e6c0327..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupPresenter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.popup;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.uberfire.mvp.Command;
-
-@Dependent
-public class ScenarioSimulationKogitoCreationPopupPresenter implements ScenarioSimulationKogitoCreationPopup.Presenter {
-
-    @Inject
-    protected ScenarioSimulationKogitoCreationPopupView scenarioscenarioSimulationCreationPopupView;
-
-    @Override
-    public void show(String mainTitleText, Command okCommand) {
-        scenarioscenarioSimulationCreationPopupView.show(mainTitleText, okCommand);
-    }
-
-    @Override
-    public void hide() {
-        scenarioscenarioSimulationCreationPopupView.hide();
-    }
-
-    @Override
-    public ScenarioSimulationModel.Type getSelectedType() {
-        return scenarioscenarioSimulationCreationPopupView.getSelectedType();
-    }
-
-    @Override
-    public String getSelectedPath() {
-        return scenarioscenarioSimulationCreationPopupView.getSelectedPath();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupView.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupView.html
deleted file mode 100644
index 443dba2..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupView.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
-  ~ 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.      
--->
-<div class="modal fade" data-backdrop="static" data-keyboard="false" id="test-scenario-creation">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title" data-field="main-title"></h4>
-      </div>
-      <div class="modal-body">
-        <div class="form-group" data-field="handlerExtensionsGroup" style="display: block">
-          <div data-field="handlerExtensions">
-            <label class="control-label" data-field="source-type-label"></label>
-            <div>
-              <div class="radio">
-                <label>
-                  <input data-field="rule-button" disabled name="scesimType" type="radio" value="rule" />
-                  <span>RULE</span>
-                  <sup>
-                    <div
-                      class="pficon pficon-info kie-test-tools-info__icon"
-                      data-field="info-rule-icon"
-                      data-placement="left"
-                      data-toggle="tooltip"
-                    ></div>
-                  </sup>
-                </label>
-              </div>
-              <div>
-                <div class="radio">
-                  <label>
-                    <input data-field="dmn-button" name="scesimType" type="radio" value="dmn" />
-                    <span>DMN</span>
-                    <sup>
-                      <div
-                        class="pficon pficon-warning-triangle-o kie-test-tools-info__icon"
-                        data-field="info-dmn-icon"
-                        data-placement="left"
-                        data-toggle="tooltip"
-                      ></div>
-                    </sup>
-                  </label>
-                </div>
-              </div>
-              <div data-field="dmn-assets" hidden></div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button class="btn btn-primary" data-dismiss="modal" data-field="ok-button" type="button">
-          <span class="fa fa-plus"></span>
-        </button>
-        <button class="btn btn-default" data-dismiss="modal" data-field="cancel-button" type="button"></button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupView.java
deleted file mode 100644
index a94c762..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupView.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.popup;
-
-import java.util.Optional;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import com.google.gwt.event.dom.client.ClickEvent;
-import elemental2.dom.HTMLDivElement;
-import elemental2.dom.HTMLInputElement;
-import elemental2.dom.HTMLLabelElement;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.popup.AbstractScenarioPopupView;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dropdown.ScenarioSimulationKogitoCreationAssetsDropdown;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.EventHandler;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.uberfire.mvp.Command;
-
-@Dependent
-@Templated
-public class ScenarioSimulationKogitoCreationPopupView extends AbstractScenarioPopupView implements ScenarioSimulationKogitoCreationPopup {
-
-    @Inject
-    @DataField("rule-button")
-    protected HTMLInputElement ruleButton;
-
-    @Inject
-    @DataField("dmn-button")
-    protected HTMLInputElement dmnButton;
-
-    @Inject
-    @DataField("dmn-assets")
-    protected HTMLDivElement dmnAssetsDivElement;
-
-    @Inject
-    protected HTMLLabelElement dmnAssetsLabelElement;
-
-    @Inject
-    @DataField("source-type-label")
-    protected HTMLLabelElement sourceTypeLabelElement;
-
-    @Inject
-    @DataField("info-rule-icon")
-    protected HTMLDivElement infoRuleIconDivElement;
-
-    @Inject
-    @DataField("info-dmn-icon")
-    protected HTMLDivElement infoDMNIconDivElement;
-
-    protected ScenarioSimulationModel.Type selectedType = null;
-
-    protected String selectedPath = null;
-
-    @Inject
-    protected ScenarioSimulationKogitoCreationAssetsDropdown scenarioSimulationKogitoCreationAssetsDropdown;
-
-    @Override
-    public void show(String mainTitleText, Command okCommand) {
-        initialize();
-        super.show(mainTitleText, ScenarioSimulationEditorConstants.INSTANCE.createButton(), okCommand);
-    }
-
-    protected void initialize() {
-        cancelButton.getElement().remove();
-        okButton.setEnabled(false);
-        cancelButton.setText(ScenarioSimulationEditorConstants.INSTANCE.cancelButton());
-        dmnAssetsDivElement.setAttribute(ConstantHolder.HIDDEN, "");
-        sourceTypeLabelElement.textContent = ScenarioSimulationEditorConstants.INSTANCE.sourceType();
-        ruleButton.checked = false;
-        dmnButton.checked = false;
-        dmnAssetsLabelElement.textContent = ScenarioSimulationEditorConstants.INSTANCE.chooseValidDMNAsset();
-        dmnAssetsDivElement.appendChild(dmnAssetsLabelElement);
-        infoRuleIconDivElement.setAttribute("title", ScenarioSimulationEditorConstants.INSTANCE.currentlyNotAvailable());
-        infoDMNIconDivElement.setAttribute("title", ScenarioSimulationEditorConstants.INSTANCE.supportedDmnVersions());
-        initializeDropdown();
-    }
-
-    @Override
-    public ScenarioSimulationModel.Type getSelectedType() {
-        return selectedType;
-    }
-
-    @Override
-    public String getSelectedPath() {
-        return selectedPath;
-    }
-
-    @EventHandler("dmn-button")
-    public void onDmnClick(final ClickEvent event) {
-        if (dmnButton.checked) {
-            selectedType = ScenarioSimulationModel.Type.DMN;
-            dmnAssetsDivElement.removeAttribute(ConstantHolder.HIDDEN);
-            enableCreateButtonForDMNScenario();
-        }
-    }
-
-    @EventHandler("rule-button")
-    public void onRuleClick(final ClickEvent event) {
-        if (ruleButton.checked) {
-            selectedType = ScenarioSimulationModel.Type.RULE;
-            dmnAssetsDivElement.setAttribute(ConstantHolder.HIDDEN, "");
-            okButton.setEnabled(true);
-        }
-    }
-
-    protected void initializeDropdown() {
-        dmnAssetsDivElement.appendChild(scenarioSimulationKogitoCreationAssetsDropdown.getElement());
-        scenarioSimulationKogitoCreationAssetsDropdown.clear();
-        scenarioSimulationKogitoCreationAssetsDropdown.init();
-        scenarioSimulationKogitoCreationAssetsDropdown.initializeDropdown();
-        scenarioSimulationKogitoCreationAssetsDropdown.registerOnChangeHandler(() -> {
-            final Optional<KieAssetsDropdownItem> value = scenarioSimulationKogitoCreationAssetsDropdown.getValue();
-            selectedPath = value.map(KieAssetsDropdownItem::getValue).orElse(null);
-            enableCreateButtonForDMNScenario();
-        });
-    }
-
-    protected void enableCreateButtonForDMNScenario() {
-        okButton.setEnabled(selectedPath != null && !selectedPath.isEmpty());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/producer/ScenarioSimulationKogitoProducer.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/producer/ScenarioSimulationKogitoProducer.java
deleted file mode 100644
index 260399d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/producer/ScenarioSimulationKogitoProducer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.producer;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import org.drools.workbench.screens.scenariosimulation.client.producers.AbstractScenarioSimulationProducer;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.commands.ScenarioSimulationKogitoStateControlManager;
-
-@Dependent
-public class ScenarioSimulationKogitoProducer extends AbstractScenarioSimulationProducer {
-
-    @Inject
-    protected ScenarioSimulationKogitoStateControlManager scenarioSimulationStateControlManager;
-
-    @Override
-    public void init() {
-        super.init();
-
-        scenarioSimulationStateControlManager.initialize(scenarioCommandRegistryManager,
-                scenarioGridPanelProducer.getScenarioSimulationContext());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/services/ScenarioSimulationKogitoDMNMarshallerService.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/services/ScenarioSimulationKogitoDMNMarshallerService.java
deleted file mode 100644
index f2a05eb..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/services/ScenarioSimulationKogitoDMNMarshallerService.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.services;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-
-import jsinterop.base.Js;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.mapper.JsUtils;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.model.KogitoDMNModel;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.MainJs;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.callbacks.DMN12UnmarshallCallback;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.DMN12;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITDefinitions;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.backend.vfs.PathFactory;
-import org.uberfire.client.callbacks.Callback;
-
-public class ScenarioSimulationKogitoDMNMarshallerService {
-
-    @Inject
-    private ScenarioSimulationKogitoResourceContentService resourceContentService;
-
-    public void getDMNContent(final Path dmnFilePath,
-                              final Callback<KogitoDMNModel> callback,
-                              final ErrorCallback<Object> errorCallback) {
-        resourceContentService.getFileContent(dmnFilePath,
-                getDMNFileContentCallback(dmnFilePath, callback, errorCallback),
-                errorCallback);
-    }
-
-    private RemoteCallback<String> getDMNFileContentCallback(final Path dmnFilePath,
-                                                             final Callback<KogitoDMNModel> callback,
-                                                             final ErrorCallback<Object> errorCallback) {
-        return dmnContent -> {
-            try {
-                unmarshallDMN(dmnContent, getDMN12UnmarshallCallback(dmnFilePath, callback, errorCallback));
-            } catch (Exception e) {
-                String dmnVersion = "higher than 1.2";
-                if (dmnContent.contains("https://www.omg.org/spec/DMN/20191111/MODEL/")) {
-                    dmnVersion = "1.3";
-                } else if (dmnContent.contains("https://www.omg.org/spec/DMN/20211108/MODEL/")) {
-                    dmnVersion = "1.4";
-                } else if (dmnContent.contains("https://www.omg.org/spec/DMN/20230324/MODEL/")) {
-                    dmnVersion = "1.5";
-                }
-
-                errorCallback.error(ScenarioSimulationEditorConstants.INSTANCE.unSupportedDmnVersion(dmnVersion), e);
-            }
-        };
-    }
-
-    protected DMN12UnmarshallCallback getDMN12UnmarshallCallback(final Path dmnFilePath,
-                                                                 final Callback<KogitoDMNModel> callback,
-                                                                 final ErrorCallback<Object> errorCallback) {
-        return dmn12 -> {
-            try {
-                final JSITDefinitions jsitDefinitions = uncheckedCast(dmn12);
-                final Map<String, JSITDefinitions> importedModels = new HashMap<>();
-                final KogitoDMNModel kogitoDMNModel = new KogitoDMNModel(jsitDefinitions, importedModels);
-                final Map<String, Path> includedDMNImportsPaths = new HashMap<>();
-                if (jsitDefinitions.getImport() != null && !jsitDefinitions.getImport().isEmpty()) {
-                    includedDMNImportsPaths.putAll(jsitDefinitions.getImport().stream()
-                            .filter(jsitImport -> jsitImport.getImportType().toUpperCase().contains("DMN"))
-                            .collect(Collectors.toMap(jsitImport -> jsitImport.getName(),
-                                    jsitImport -> PathFactory.newPath(jsitImport.getLocationURI(),
-                                            dmnFilePath.toURI().replace(dmnFilePath.getFileName(),
-                                                    jsitImport.getLocationURI())))));
-                }
-                if (includedDMNImportsPaths.isEmpty()) {
-                    callback.callback(kogitoDMNModel);
-                } else {
-                    for (Map.Entry<String, Path> importPath : includedDMNImportsPaths.entrySet()) {
-                        resourceContentService.getFileContent(importPath.getValue(),
-                                getDMNImportContentRemoteCallback(callback,
-                                        kogitoDMNModel,
-                                        includedDMNImportsPaths.size()),
-                                errorCallback);
-                    }
-                }
-            } catch (Error e) {
-                errorCallback.error("Asada", e);
-            }
-        };
-    }
-
-    protected RemoteCallback<String> getDMNImportContentRemoteCallback(final Callback<KogitoDMNModel> callback,
-                                                                       final KogitoDMNModel kogitoDMNModel,
-                                                                       final int importsNumber) {
-        return dmnContent -> {
-            DMN12UnmarshallCallback dmn12UnmarshallCallback = getDMN12ImportsUnmarshallCallback(callback,
-                                                                                                kogitoDMNModel,
-                                                                                                importsNumber);
-            unmarshallDMN(dmnContent, dmn12UnmarshallCallback);
-        };
-    }
-
-    protected DMN12UnmarshallCallback getDMN12ImportsUnmarshallCallback(final Callback<KogitoDMNModel> callback,
-                                                                        final KogitoDMNModel kogitoDMNModel,
-                                                                        final int importsNumber) {
-        return dmn12 -> {
-            final JSITDefinitions importedDefinition = uncheckedCast(dmn12);
-            kogitoDMNModel.getImportsDefinitions().put(importedDefinition.getNamespace(), importedDefinition);
-
-            if (importsNumber == kogitoDMNModel.getImportsDefinitions().size()) {
-                callback.callback(kogitoDMNModel);
-            }
-        };
-    }
-
-    // Indirection for tests
-    protected void unmarshallDMN(String dmnContent, DMN12UnmarshallCallback dmn12UnmarshallCallback) {
-        MainJs.unmarshall(dmnContent, "", dmn12UnmarshallCallback);
-    }
-
-    // Indirection for tests
-    protected JSITDefinitions uncheckedCast(DMN12 dmn12) {
-        return Js.uncheckedCast(JsUtils.getUnwrappedElement(dmn12));
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/services/ScenarioSimulationKogitoResourceContentService.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/services/ScenarioSimulationKogitoResourceContentService.java
deleted file mode 100644
index 61d0981..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/java/org/drools/workbench/screens/scenariosimulation/kogito/client/services/ScenarioSimulationKogitoResourceContentService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.services;
-
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.uberfire.backend.vfs.Path;
-
-public interface ScenarioSimulationKogitoResourceContentService {
-
-    void getFileContent(final Path path,
-                        final RemoteCallback<String> remoteCallback,
-                        final ErrorCallback<Object> errorCallback);
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/resources/META-INF/ErraiApp.properties b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/resources/META-INF/ErraiApp.properties
deleted file mode 100644
index ac3b5ed..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/resources/META-INF/ErraiApp.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# 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. 
-#
-
-# ErraiApp.properties
-#
-# Do not remove, even if empty!
-#
-
-# This is a marker file. When it is detected inside a JAR or at the
-# top of any classpath, the subdirectories are scanned for deployable
-# components. As such, all Errai application modules in a project
-# should contain an ErraiApp.properties at the root of all classpaths
-# that you wish to be scanned.
-#
-# There are also some configuration options that can be set in this
-# file, although it is rarely necessary. See the documentation at
-# https://docs.jboss.org/author/display/ERRAI/ErraiApp.properties
-# for details.
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/resources/META-INF/beans.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index cd5f032..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" bean-discovery-mode="none">
-  <scan>
-    <exclude name="org.drools.workbench.screens.scenariosimulation.editor.kogito.client.**" />
-  </scan>
-</beans>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/kogito/DroolsWorkbenchScenarioSimulationKogitoEditor.gwt.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/kogito/DroolsWorkbenchScenarioSimulationKogitoEditor.gwt.xml
deleted file mode 100644
index 137444b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/kogito/DroolsWorkbenchScenarioSimulationKogitoEditor.gwt.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  ~ 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.      
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN"
-  "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
-<module>
-  <source path="client" />
-
-  <inherits name="org.drools.workbench.screens.scenariosimulation.DroolsWorkbenchScenarioSimulationEditorAPI" />
-  <inherits name='org.drools.workbench.screens.scenariosimulation.DroolsWorkbenchScenarioSimulationEditorClient' />
-  <!-- MARSHALLING -->
-  <inherits name="org.drools.workbench.scenariosimulation.kogito.marshaller.ScesimMarshaller" />
-  <inherits name="org.kie.workbench.common.dmn.webapp.kogito.marshaller.DMNMarshaller" />
-</module>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/commands/ScenarioSimulationKogitoStateControlManagerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/commands/ScenarioSimulationKogitoStateControlManagerTest.java
deleted file mode 100644
index a832710..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/commands/ScenarioSimulationKogitoStateControlManagerTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.commands;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.appformer.kogito.bridge.client.stateControl.interop.StateControl;
-import org.appformer.kogito.bridge.client.stateControl.interop.StateControlCommand;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioCommandRegistryManager;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationKogitoStateControlManagerTest {
-
-    @Mock
-    private ScenarioSimulationContext scenarioSimulationContextMock;
-    @Mock
-    private ScenarioCommandRegistryManager scenarioCommandRegistryManagerMock;
-    @Captor
-    private ArgumentCaptor<StateControlCommand> stateControlUndoCommandCaptor;
-    @Captor
-    private ArgumentCaptor<StateControlCommand> stateControlRedoCommandCaptor;
-
-    private ScenarioSimulationKogitoStateControlManager scenarioSimulationKogitoStateControlManagerSpy;
-    private boolean envelopeAvailableBoolean;
-    private StateControl stateControlSpy;
-
-    @Before
-    public void setup() {
-        stateControlSpy = spy(new StateControl());
-        envelopeAvailableBoolean = true;
-        scenarioSimulationKogitoStateControlManagerSpy = spy(new ScenarioSimulationKogitoStateControlManager() {
-            {
-                this.envelopeAvailableSupplier = () -> envelopeAvailableBoolean;
-                this.stateControlSupplier = () -> stateControlSpy;
-            }
-        });
-    }
-
-    @Test
-    public void initialize_EnvelopeAvailable() {
-        scenarioSimulationKogitoStateControlManagerSpy.initialize(scenarioCommandRegistryManagerMock, scenarioSimulationContextMock);
-        verify(stateControlSpy, times(1)).setUndoCommand(stateControlUndoCommandCaptor.capture());
-        verify(stateControlSpy, times(1)).setRedoCommand(stateControlRedoCommandCaptor.capture());
-        stateControlUndoCommandCaptor.getValue().execute();
-        verify(scenarioCommandRegistryManagerMock, times(1)).undo(eq(scenarioSimulationContextMock));
-        stateControlRedoCommandCaptor.getValue().execute();
-        verify(scenarioCommandRegistryManagerMock, times(1)).redo(eq(scenarioSimulationContextMock));
-    }
-
-    @Test
-    public void initialize_EnvelopeNotAvailable() {
-        envelopeAvailableBoolean = false;
-        scenarioSimulationKogitoStateControlManagerSpy.initialize(scenarioCommandRegistryManagerMock, scenarioSimulationContextMock);
-        verify(stateControlSpy, never()).setUndoCommand(any());
-        verify(stateControlSpy, never()).setRedoCommand(any());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/converters/JSInteropApiConverterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/converters/JSInteropApiConverterTest.java
deleted file mode 100644
index 4f99bac..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/converters/JSInteropApiConverterTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.converters;
-
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.scenariosimulation.api.model.imports.Import;
-import org.drools.scenariosimulation.api.model.imports.Imports;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIExpressionIdentifierType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIFactIdentifierType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIImportType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSIImportsType;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.model.JSISettingsType;
-import org.junit.Test;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-public class JSInteropApiConverterTest {
-
-    @Test
-    public void getSettings() {
-        JSISettingsType jsiSettingsTypeMock = mock(JSISettingsType.class);
-        when(jsiSettingsTypeMock.getType()).thenReturn(ScenarioSimulationModel.Type.RULE.toString());
-        assertNotNull(JSInteropApiConverter.getSettings(jsiSettingsTypeMock));
-        checkAllRequiredMethodsAreCalled(JSISettingsType.class, Settings.class, jsiSettingsTypeMock);
-    }
-
-    @Test
-    public void getImport() {
-        JSIImportType jsiImportTypeMock = mock(JSIImportType.class);
-        assertNotNull(JSInteropApiConverter.getImport(jsiImportTypeMock));
-        checkAllRequiredMethodsAreCalled(JSIImportType.class, Import.class, jsiImportTypeMock);
-    }
-
-    @Test
-    public void getImports() {
-        JSIImportsType jsiImportsTypeMock = mock(JSIImportsType.class);
-        assertNotNull(JSInteropApiConverter.getImports(jsiImportsTypeMock));
-        checkAllRequiredMethodsAreCalled(JSIImportsType.class, Imports.class, jsiImportsTypeMock);
-    }
-
-    @Test
-    public void getExpressionIdentifier() {
-        JSIExpressionIdentifierType jsiExpressionIdentifierTypeMock = mock(JSIExpressionIdentifierType.class);
-        when(jsiExpressionIdentifierTypeMock.getType()).thenReturn(FactMappingType.OTHER.toString());
-        assertNotNull(JSInteropApiConverter.getExpressionIdentifier(jsiExpressionIdentifierTypeMock));
-        checkAllRequiredMethodsAreCalled(JSIExpressionIdentifierType.class, ExpressionIdentifier.class, jsiExpressionIdentifierTypeMock);
-    }
-
-    @Test
-    public void getFactIdentifier() {
-        JSIFactIdentifierType jsiFactIdentifierTypeMock = mock(JSIFactIdentifierType.class);
-        assertNotNull(JSInteropApiConverter.getFactIdentifier(jsiFactIdentifierTypeMock));
-        checkAllRequiredMethodsAreCalled(JSIFactIdentifierType.class, FactIdentifier.class, jsiFactIdentifierTypeMock);
-    }
-
-    private void checkAllRequiredMethodsAreCalled(Class inputClazz, Class outputClazz, Object mock) {
-        try {
-            PropertyDescriptor[] inputPDs =
-                    Introspector.getBeanInfo(inputClazz, Object.class).getPropertyDescriptors();
-            int inputClassMethodsNumber = inputPDs.length - 1;
-            Set<String> outputFieldNames = retrieveClassFieldNames(outputClazz);
-            int outputClassMethodsNumber = outputFieldNames.size();
-            assertSame("Not all fields are managed in the converter of class " + inputClazz.getSimpleName(),
-                       inputClassMethodsNumber, outputClassMethodsNumber);
-            for (PropertyDescriptor pd : inputPDs) {
-                if ("TYPE_NAME".equals(pd.getName())) {
-                    continue;
-                }
-                assertTrue("Field " + pd.getName() + " isn't correctly managed in the converter!",
-                           outputFieldNames.contains(pd.getName()));
-                Method method = pd.getReadMethod();
-                method.invoke(verify(mock, times(1)));
-            }
-            verifyNoMoreInteractions(mock);
-        } catch (IllegalAccessException | IntrospectionException | InvocationTargetException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * It retrieves all NOT STATIC fields of a class and its superclass
-     * @param clazz
-     * @return
-     */
-    private Set<String> retrieveClassFieldNames(Class clazz) {
-        Set<String> returns = new HashSet<>();
-        for (Field f : clazz.getDeclaredFields()) {
-            if (!Modifier.isStatic(f.getModifiers())) {
-                returns.add(f.getName());
-            }
-        }
-        if (clazz.getSuperclass() != null) {
-            returns.addAll(retrieveClassFieldNames(clazz.getSuperclass()));
-        }
-        return returns;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/KogitoScenarioSimulationBuilderTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/KogitoScenarioSimulationBuilderTest.java
deleted file mode 100644
index 8ba60fa..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/KogitoScenarioSimulationBuilderTest.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dmn;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.scenariosimulation.api.model.ExpressionIdentifier;
-import org.drools.scenariosimulation.api.model.FactIdentifier;
-import org.drools.scenariosimulation.api.model.FactMapping;
-import org.drools.scenariosimulation.api.model.FactMappingType;
-import org.drools.scenariosimulation.api.model.FactMappingValueType;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
-import org.drools.scenariosimulation.api.model.Simulation;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.model.KogitoDMNModel;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.services.ScenarioSimulationKogitoDMNMarshallerService;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITDefinitions;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Spy;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.client.callbacks.Callback;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-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.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class KogitoScenarioSimulationBuilderTest {
-
-    @InjectMocks @Spy
-    private KogitoScenarioSimulationBuilder kogitoScenarioSimulationBuilderSpy;
-    @Mock
-    private Callback<ScenarioSimulationModel> callbackMock;
-    @Mock
-    private ErrorCallback<Object> errorCallbackMock;
-    @Mock
-    private FactModelTuple factModelTupleMock;
-    @Mock
-    private JSITDefinitions jsitDefinitionsMock;
-    @Mock
-    private ScenarioSimulationKogitoDMNDataManager kogitoDMNDataManagerMock;
-    @Mock
-    private ScenarioSimulationKogitoDMNMarshallerService dmnMarshallerServiceMock;
-    @Captor
-    private ArgumentCaptor<Callback<KogitoDMNModel>> callbackArgumentCaptor;
-    @Captor
-    private ArgumentCaptor<Path> pathArgumentCaptor;
-    @Captor
-    private ArgumentCaptor<ScenarioSimulationModel> scenarioSimulationModelArgumentCaptor;
-
-    private KogitoDMNModel kogitoDMNModel;
-
-    @Before
-    public void setup() {
-        kogitoDMNModel = new KogitoDMNModel(jsitDefinitionsMock, Collections.emptyMap());
-        when(kogitoDMNDataManagerMock.getFactModelTuple(kogitoDMNModel)).thenReturn(factModelTupleMock);
-        when(jsitDefinitionsMock.getNamespace()).thenReturn("namespace");
-        when(jsitDefinitionsMock.getName()).thenReturn("name");
-    }
-
-    @Test
-    public void populateRule() {
-        kogitoScenarioSimulationBuilderSpy.populateScenarioSimulationModelRULE("session", callbackMock);
-        verify(kogitoScenarioSimulationBuilderSpy, times(1)).createRULESimulation();
-        verify(kogitoScenarioSimulationBuilderSpy, times(1)).createBackground();
-        verify(kogitoScenarioSimulationBuilderSpy, times(1)).createRULESettings("session");
-        verify(callbackMock, times(1)).callback(scenarioSimulationModelArgumentCaptor.capture());
-        assertNotNull(scenarioSimulationModelArgumentCaptor.getValue());
-        assertNotNull(scenarioSimulationModelArgumentCaptor.getValue().getBackground());
-        assertNotNull(scenarioSimulationModelArgumentCaptor.getValue().getSimulation());
-        assertNotNull(scenarioSimulationModelArgumentCaptor.getValue().getSettings());
-    }
-
-    @Test
-    public void populateDMN() {
-        kogitoScenarioSimulationBuilderSpy.populateScenarioSimulationModelDMN("src/file.dmn", callbackMock, errorCallbackMock);
-        verify(kogitoScenarioSimulationBuilderSpy, times(1)).createBackground();
-        verify(dmnMarshallerServiceMock, times(1)).getDMNContent(pathArgumentCaptor.capture(), callbackArgumentCaptor.capture(), eq(errorCallbackMock));
-        assertEquals("file.dmn", pathArgumentCaptor.getValue().getFileName());
-        assertEquals("src/file.dmn", pathArgumentCaptor.getValue().toURI());
-        callbackArgumentCaptor.getValue().callback(kogitoDMNModel);
-        verify(kogitoDMNDataManagerMock, times(1)).getFactModelTuple(kogitoDMNModel);
-        verify(kogitoScenarioSimulationBuilderSpy, times(1)).createDMNSimulation(factModelTupleMock);
-        verify(kogitoScenarioSimulationBuilderSpy, times(1)).createDMNSettings("name", "namespace", "src/file.dmn");
-        verify(callbackMock, times(1)).callback(scenarioSimulationModelArgumentCaptor.capture());
-        assertNotNull(scenarioSimulationModelArgumentCaptor.getValue());
-        assertNotNull(scenarioSimulationModelArgumentCaptor.getValue().getBackground());
-        assertNotNull(scenarioSimulationModelArgumentCaptor.getValue().getSimulation());
-    }
-
-    @Test
-    public void createRULESimulation() {
-        Simulation simulation = kogitoScenarioSimulationBuilderSpy.createRULESimulation();
-        assertNotNull(simulation);
-        assertEquals(1,simulation.getScenarioWithIndex().size());
-        ScesimModelDescriptor modelDescriptor = simulation.getScesimModelDescriptor();
-        assertNotNull(modelDescriptor);
-        assertEquals(4, modelDescriptor.getFactMappings().size());
-        //First column
-        assertEquals(70, modelDescriptor.getFactMappingByIndex(0).getColumnWidth(), 0);
-        assertEquals(FactIdentifier.INDEX.getName(), modelDescriptor.getFactMappingByIndex(0).getFactAlias());
-        assertEquals(FactIdentifier.INDEX, modelDescriptor.getFactMappingByIndex(0).getFactIdentifier());
-        assertEquals(ExpressionIdentifier.INDEX, modelDescriptor.getFactMappingByIndex(0).getExpressionIdentifier());
-        //Second column
-        assertEquals(300, modelDescriptor.getFactMappingByIndex(1).getColumnWidth(), 0);
-        assertEquals(FactIdentifier.DESCRIPTION.getName(), modelDescriptor.getFactMappingByIndex(1).getFactAlias());
-        assertEquals(FactIdentifier.DESCRIPTION, modelDescriptor.getFactMappingByIndex(1).getFactIdentifier());
-        assertEquals(ExpressionIdentifier.DESCRIPTION, modelDescriptor.getFactMappingByIndex(1).getExpressionIdentifier());
-        assertEquals(FactMappingValueType.NOT_EXPRESSION, modelDescriptor.getFactMappingByIndex(1).getFactMappingValueType());
-        //Third column
-        assertEquals(114, modelDescriptor.getFactMappingByIndex(2).getColumnWidth(), 0);
-        assertEquals("INSTANCE 1", modelDescriptor.getFactMappingByIndex(2).getFactAlias());
-        assertEquals(FactIdentifier.EMPTY, modelDescriptor.getFactMappingByIndex(2).getFactIdentifier());
-        assertEquals(ExpressionIdentifier.create("1|1", FactMappingType.GIVEN), modelDescriptor.getFactMappingByIndex(2).getExpressionIdentifier());
-        assertEquals(FactMappingValueType.NOT_EXPRESSION, modelDescriptor.getFactMappingByIndex(2).getFactMappingValueType());
-        //Fourth column
-        assertEquals(114, modelDescriptor.getFactMappingByIndex(3).getColumnWidth(), 0);
-        assertEquals("INSTANCE 2", modelDescriptor.getFactMappingByIndex(3).getFactAlias());
-        assertEquals(FactIdentifier.EMPTY, modelDescriptor.getFactMappingByIndex(3).getFactIdentifier());
-        assertEquals(ExpressionIdentifier.create("1|2", FactMappingType.EXPECT), modelDescriptor.getFactMappingByIndex(3).getExpressionIdentifier());
-        assertEquals(FactMappingValueType.NOT_EXPRESSION, modelDescriptor.getFactMappingByIndex(3).getFactMappingValueType());
-    }
-
-    @Test
-    public void createDMNSimulationEmptyFactModuleTuple() {
-        FactModelTuple factMappingTuple = new FactModelTuple(Collections.emptySortedMap(), Collections.emptySortedMap());
-        Simulation simulation = kogitoScenarioSimulationBuilderSpy.createDMNSimulation(factMappingTuple);
-        assertNotNull(simulation);
-        assertEquals(1,simulation.getScenarioWithIndex().size());
-        ScesimModelDescriptor modelDescriptor = simulation.getScesimModelDescriptor();
-        assertNotNull(modelDescriptor);
-        assertEquals(4, modelDescriptor.getFactMappings().size());
-        //First column
-        assertEquals(70, modelDescriptor.getFactMappingByIndex(0).getColumnWidth(), 0);
-        assertEquals(FactIdentifier.INDEX.getName(), modelDescriptor.getFactMappingByIndex(0).getFactAlias());
-        assertEquals(FactIdentifier.INDEX, modelDescriptor.getFactMappingByIndex(0).getFactIdentifier());
-        assertEquals(ExpressionIdentifier.INDEX, modelDescriptor.getFactMappingByIndex(0).getExpressionIdentifier());
-        assertEquals(FactMappingValueType.NOT_EXPRESSION, modelDescriptor.getFactMappingByIndex(0).getFactMappingValueType());
-        //Second column
-        assertEquals(300, modelDescriptor.getFactMappingByIndex(1).getColumnWidth(), 0);
-        assertEquals(FactIdentifier.DESCRIPTION.getName(), modelDescriptor.getFactMappingByIndex(1).getFactAlias());
-        assertEquals(FactIdentifier.DESCRIPTION, modelDescriptor.getFactMappingByIndex(1).getFactIdentifier());
-        assertEquals(ExpressionIdentifier.DESCRIPTION, modelDescriptor.getFactMappingByIndex(1).getExpressionIdentifier());
-        assertEquals(FactMappingValueType.NOT_EXPRESSION, modelDescriptor.getFactMappingByIndex(1).getFactMappingValueType());
-        //Third column
-        assertEquals(114, modelDescriptor.getFactMappingByIndex(2).getColumnWidth(), 0);
-        assertEquals("INSTANCE 1", modelDescriptor.getFactMappingByIndex(2).getFactAlias());
-        assertEquals(FactIdentifier.EMPTY, modelDescriptor.getFactMappingByIndex(2).getFactIdentifier());
-        assertEquals(ExpressionIdentifier.create("1|1", FactMappingType.GIVEN), modelDescriptor.getFactMappingByIndex(2).getExpressionIdentifier());
-        assertEquals(FactMappingValueType.NOT_EXPRESSION, modelDescriptor.getFactMappingByIndex(2).getFactMappingValueType());
-        //Fourth column
-        assertEquals(114, modelDescriptor.getFactMappingByIndex(3).getColumnWidth(), 0);
-        assertEquals("INSTANCE 2", modelDescriptor.getFactMappingByIndex(3).getFactAlias());
-        assertEquals(FactIdentifier.EMPTY, modelDescriptor.getFactMappingByIndex(3).getFactIdentifier());
-        assertEquals(ExpressionIdentifier.create("1|2", FactMappingType.EXPECT), modelDescriptor.getFactMappingByIndex(3).getExpressionIdentifier());
-        assertEquals(FactMappingValueType.NOT_EXPRESSION, modelDescriptor.getFactMappingByIndex(3).getFactMappingValueType());
-    }
-
-    @Test
-    public void getColumn() {
-        assertEquals(70, KogitoScenarioSimulationBuilder.getColumnWidth(ExpressionIdentifier.NAME.Index.toString()), 0);
-        assertEquals(300, KogitoScenarioSimulationBuilder.getColumnWidth(ExpressionIdentifier.NAME.Description.toString()), 0);
-        assertEquals(114, KogitoScenarioSimulationBuilder.getColumnWidth(ExpressionIdentifier.NAME.Other.toString()), 0);
-        assertEquals(114, KogitoScenarioSimulationBuilder.getColumnWidth(ExpressionIdentifier.NAME.Expected.toString()), 0);
-        assertEquals(114, KogitoScenarioSimulationBuilder.getColumnWidth(ExpressionIdentifier.NAME.Given.toString()), 0);
-        assertEquals(114, KogitoScenarioSimulationBuilder.getColumnWidth("test"), 0);
-    }
-
-    @Test
-    public void addToScenarioRecursive() {
-        FactMapping factMappingMock = mock(FactMapping.class);
-        KogitoScenarioSimulationBuilder.FactMappingExtractor factMappingExtractorMock = mock(KogitoScenarioSimulationBuilder.FactMappingExtractor.class);
-        when(factMappingExtractorMock.getFactMapping(any(), anyString(), any(), anyString())).thenReturn(factMappingMock);
-
-        Map<String, FactModelTree> hiddenFacts = new HashMap<>();
-
-        FactModelTree factModelTree = new FactModelTree("myFact", "", new HashMap<>(), Collections.emptyMap());
-        factModelTree.addExpandableProperty("recursiveProperty", "recursive");
-        String propertyType = String.class.getCanonicalName();
-        String propertyName = "simpleProperty";
-        factModelTree.addSimpleProperty(propertyName, new FactModelTree.PropertyTypeName(propertyType));
-
-        hiddenFacts.put("recursive", factModelTree);
-
-        kogitoScenarioSimulationBuilderSpy.addFactMapping(factMappingExtractorMock,
-                                                          factModelTree,
-                                                          new ArrayList<>(),
-                                                          hiddenFacts);
-
-        verify(factMappingExtractorMock, times(1))
-                .getFactMapping(
-                        factModelTree,
-                        propertyName,
-                        Arrays.asList("myFact", "recursiveProperty"),
-                        propertyType);
-
-        verify(factMappingExtractorMock, times(2))
-                .getFactMapping(
-                        any(),
-                        any(),
-                        any(),
-                        any());
-    }
-
-    @Test
-    public void addToScenarioMultipleNested() {
-        FactMapping factMappingMock = mock(FactMapping.class);
-        KogitoScenarioSimulationBuilder.FactMappingExtractor factMappingExtractorMock = mock(KogitoScenarioSimulationBuilder.FactMappingExtractor.class);
-        when(factMappingExtractorMock.getFactMapping(any(), anyString(), any(), anyString())).thenReturn(factMappingMock);
-
-        Map<String, FactModelTree> hiddenFacts = new HashMap<>();
-
-        FactModelTree factModelTree = new FactModelTree("myFact", "", new HashMap<>(), Collections.emptyMap());
-        factModelTree.addExpandableProperty("nestedProperty", "tNested");
-        factModelTree.addExpandableProperty("nestedProperty2", "tNested2");
-
-        FactModelTree nested1 = new FactModelTree("tNested1", "", new HashMap<>(), Collections.emptyMap());
-        FactModelTree nested2 = new FactModelTree("tNested2", "", new HashMap<>(), Collections.emptyMap());
-        String propertyType = String.class.getCanonicalName();
-        String propertyName = "stingProperty";
-        nested1.addSimpleProperty(propertyName, new FactModelTree.PropertyTypeName(propertyType));
-        String propertyType2 = Boolean.class.getCanonicalName();
-        String propertyName2 = "booleanProperty";
-        nested2.addSimpleProperty(propertyName2, new FactModelTree.PropertyTypeName(propertyType2));
-
-        hiddenFacts.put("tNested", nested1);
-        hiddenFacts.put("tNested2", nested2);
-
-        kogitoScenarioSimulationBuilderSpy.addFactMapping(factMappingExtractorMock,
-                                                          factModelTree,
-                                                          new ArrayList<>(),
-                                                          hiddenFacts);
-
-        verify(factMappingExtractorMock, times(1))
-                .getFactMapping(
-                        nested1,
-                        propertyName,
-                        Arrays.asList("myFact", "nestedProperty"),
-                        propertyType);
-        verify(factMappingExtractorMock, times(1))
-                .getFactMapping(
-                        nested2,
-                        propertyName2,
-                        Arrays.asList("myFact", "nestedProperty2"),
-                        propertyType2);
-
-        verify(factMappingExtractorMock, times(2))
-                .getFactMapping(
-                        any(),
-                        any(),
-                        any(),
-                        any());
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/ScenarioSimulationKogitoDMNDataManagerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/ScenarioSimulationKogitoDMNDataManagerTest.java
deleted file mode 100644
index 7b3ce4b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/dmn/ScenarioSimulationKogitoDMNDataManagerTest.java
+++ /dev/null
@@ -1,1261 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.dmn;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.xml.namespace.QName;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.feel.BuiltInType;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.model.KogitoDMNModel;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITDRGElement;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITDecision;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITDefinitions;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITImport;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITInformationItem;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITInputData;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITItemDefinition;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITUnaryTests;
-import org.mockito.Mock;
-import org.mockito.Spy;
-
-import static junit.framework.TestCase.assertNotNull;
-import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE;
-import static org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.ScenarioSimulationKogitoDMNDataManager.TYPEREF_QNAME;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationKogitoDMNDataManagerTest {
-
-    private static final String NAMESPACE = "namespace";
-    private static final String IMPORTED_NAMESPACE = "namespace-imported";
-    private static final String TYPE_NAME = "name";
-    private static final String ID = "id";
-    private static final String IMPORT_PREFIX = "import";
-
-    @Spy
-    private ScenarioSimulationKogitoDMNDataManager scenarioSimulationKogitoDMNDataManagerSpy;
-    @Mock
-    private JSITItemDefinition jsitItemDefinitionMock;
-    @Mock
-    private JSITItemDefinition jsitItemDefinitionNestedMock;
-    @Mock
-    private JSITDefinitions jsiITDefinitionsMock;
-    @Mock
-    private JSITDefinitions jsiITDefinitionsMockImportedMock;
-    @Mock
-    private JSITDecision jsiITDecisionMock;
-    @Mock
-    private JSITInputData jsiITInputDataMock;
-    @Mock
-    private JSITInformationItem jsiITInformationItemInputMock;
-    @Mock
-    private JSITInformationItem jsiITInformationItemDecisionMock;
-
-    private List<JSITItemDefinition> jstiItemDefinitions;
-    private List<JSITDRGElement> jsitdrgElements;
-    private List<JSITDRGElement> drgElements;
-    private Map<QName, String> attributesMapInput;
-    private Map<QName, String> attributesMapDecision;
-    private Map<String, JSITItemDefinition> allDefinitions;
-    private KogitoDMNModel kogitoDMNModel;
-
-    @Before
-    public void setup() {
-        jstiItemDefinitions = new ArrayList<>();
-        jsitdrgElements = new ArrayList<>();
-        drgElements = new ArrayList<>();
-        attributesMapInput = new HashMap<>();
-        attributesMapDecision = new HashMap<>();
-        allDefinitions = new HashMap<>();
-        kogitoDMNModel = new KogitoDMNModel(jsiITDefinitionsMock, Collections.EMPTY_MAP);
-
-        doReturn(true).when(scenarioSimulationKogitoDMNDataManagerSpy).isJSITInputData(jsiITInputDataMock);
-        doReturn(true).when(scenarioSimulationKogitoDMNDataManagerSpy).isJSITDecision(jsiITDecisionMock);
-        doReturn(attributesMapInput).when(scenarioSimulationKogitoDMNDataManagerSpy).getOtherAttributesMap(jsiITInformationItemInputMock);
-        doReturn(attributesMapDecision).when(scenarioSimulationKogitoDMNDataManagerSpy).getOtherAttributesMap(jsiITInformationItemDecisionMock);
-        when(jsiITDefinitionsMock.getNamespace()).thenReturn(NAMESPACE);
-        when(jsiITDefinitionsMock.getItemDefinition()).thenReturn(jstiItemDefinitions);
-        when(jsiITDefinitionsMock.getDrgElement()).thenReturn(jsitdrgElements);
-        when(jsiITInputDataMock.getVariable()).thenReturn(jsiITInformationItemInputMock);
-        when(jsiITDecisionMock.getVariable()).thenReturn(jsiITInformationItemDecisionMock);
-        when(jsitItemDefinitionMock.getName()).thenReturn(TYPE_NAME);
-        when(jsitItemDefinitionMock.getId()).thenReturn(ID);
-        when(jsitItemDefinitionMock.getIsCollection()).thenReturn(false);
-    }
-
-    @Test
-    public void getDMNTypeFromMaps() {
-        Map<String, ClientDMNType> dmnTypesMap = scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(jstiItemDefinitions, NAMESPACE);
-        attributesMapInput.put(TYPEREF_QNAME, "number");
-        ClientDMNType clientDMNType = scenarioSimulationKogitoDMNDataManagerSpy.getDMNTypeFromMaps(dmnTypesMap, attributesMapInput);
-        assertNotNull(clientDMNType);
-        assertTrue(BuiltInType.NUMBER.equals(clientDMNType.getFeelType()));
-    }
-
-    @Test
-    public void getDMNTypeFromMaps_NullTypeRef() {
-        Map<String, ClientDMNType> dmnTypesMap = scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(jstiItemDefinitions, NAMESPACE);
-        attributesMapInput.put(TYPEREF_QNAME, null);
-        ClientDMNType clientDMNType = scenarioSimulationKogitoDMNDataManagerSpy.getDMNTypeFromMaps(dmnTypesMap, attributesMapInput);
-        assertNotNull(clientDMNType);
-        assertTrue(BuiltInType.ANY.equals(clientDMNType.getFeelType()));
-    }
-
-    @Test
-    public void testIndexDefinitionsByName() {
-        final JSITItemDefinition definition1 = mock(JSITItemDefinition.class);
-        final JSITItemDefinition definition2 = mock(JSITItemDefinition.class);
-        final JSITItemDefinition definition3 = mock(JSITItemDefinition.class);
-        final String name1 = "name1";
-        final String name2 = "name2";
-        final String name3 = "name3";
-        final List<JSITItemDefinition> list = Arrays.asList(definition1, definition2, definition3);
-
-        when(definition1.getName()).thenReturn(name1);
-        when(definition2.getName()).thenReturn(name2);
-        when(definition3.getName()).thenReturn(name3);
-
-        final Map<String, JSITItemDefinition> index = scenarioSimulationKogitoDMNDataManagerSpy.indexDefinitionsByName(list);
-
-        assertEquals(3, index.size());
-        assertTrue(index.containsKey(name1));
-        assertTrue(index.containsKey(name2));
-        assertTrue(index.containsKey(name3));
-        assertEquals(definition1, index.get(name1));
-        assertEquals(definition2, index.get(name2));
-        assertEquals(definition3, index.get(name3));
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void testIndexDefinitionsUnmodifiable() {
-        final JSITItemDefinition definition1 = mock(JSITItemDefinition.class);
-        final String name1 = "name1";
-        final List<JSITItemDefinition> list = Arrays.asList(definition1);
-
-        when(definition1.getName()).thenReturn(name1);
-
-        final Map<String, JSITItemDefinition> index = scenarioSimulationKogitoDMNDataManagerSpy.indexDefinitionsByName(list);
-
-        index.put("name2", mock(JSITItemDefinition.class));
-    }
-
-    @Test
-    public void testGetOrCreateDMNType() {
-        final String namespace = "namespace";
-        final String typeOneName = "tTypeOne";
-        final String typeTwoName = "tTypeTwo";
-        final String typeThreeName = "tTypeThree";
-        final JSITItemDefinition definition1 = createJSITItemDefinitionMock(typeOneName);
-        final JSITItemDefinition definition2 = createJSITItemDefinitionMock(typeTwoName);
-        final JSITItemDefinition definition3 = createJSITItemDefinitionMock(typeThreeName);
-
-        final Map<String, JSITItemDefinition> indexed = scenarioSimulationKogitoDMNDataManagerSpy.indexDefinitionsByName(Arrays.asList(definition1, definition2, definition3));
-        final Map<String, ClientDMNType> createdTypes = new HashMap<>();
-        final ClientDMNType dmnTypeOne = mock(ClientDMNType.class);
-        final ClientDMNType dmnTypeTwo = mock(ClientDMNType.class);
-        final ClientDMNType dmnTypeThree = mock(ClientDMNType.class);
-
-        doReturn(dmnTypeOne).when(scenarioSimulationKogitoDMNDataManagerSpy).createDMNType(indexed,
-                                                                                           definition1,
-                                                                                           namespace,
-                                                                                           createdTypes);
-
-        doReturn(dmnTypeTwo).when(scenarioSimulationKogitoDMNDataManagerSpy).createDMNType(indexed,
-                                                                                           definition2,
-                                                                                           namespace,
-                                                                                           createdTypes);
-
-        doReturn(dmnTypeThree).when(scenarioSimulationKogitoDMNDataManagerSpy).createDMNType(indexed,
-                                                                                             definition3,
-                                                                                             namespace,
-                                                                                             createdTypes);
-
-        final ClientDMNType actualDmnTypeOne = scenarioSimulationKogitoDMNDataManagerSpy.getOrCreateDMNType(indexed,
-                                                                                                            typeOneName,
-                                                                                                            namespace,
-                                                                                                            createdTypes);
-
-        final ClientDMNType actualDmnTypeTwo = scenarioSimulationKogitoDMNDataManagerSpy.getOrCreateDMNType(indexed,
-                                                                                                            typeTwoName,
-                                                                                                            namespace,
-                                                                                                            createdTypes);
-
-        final ClientDMNType actualDmnTypeThree = scenarioSimulationKogitoDMNDataManagerSpy.getOrCreateDMNType(indexed,
-                                                                                                              typeThreeName,
-                                                                                                              namespace,
-                                                                                                              createdTypes);
-
-        assertEquals(dmnTypeOne, actualDmnTypeOne);
-        assertEquals(dmnTypeTwo, actualDmnTypeTwo);
-        assertEquals(dmnTypeThree, actualDmnTypeThree);
-    }
-
-    @Test
-    public void testGetOrCreateDMNTypeWhenTypeIsAlreadyCreated() {
-        final String namespace = "namespace";
-        final String typeOneName = "tTypeOne";
-        final JSITItemDefinition definition1 = createJSITItemDefinitionMock(typeOneName);
-        final Map<String, JSITItemDefinition> indexed = scenarioSimulationKogitoDMNDataManagerSpy.indexDefinitionsByName(Arrays.asList(definition1));
-        final ClientDMNType dmnTypeOne = mock(ClientDMNType.class);
-        final Map<String, ClientDMNType> createdTypes = new HashMap<>();
-        createdTypes.put(typeOneName, dmnTypeOne);
-
-        final ClientDMNType actualDmnTypeOne = scenarioSimulationKogitoDMNDataManagerSpy.getOrCreateDMNType(indexed,
-                                                                                                            typeOneName,
-                                                                                                            namespace,
-                                                                                                            createdTypes);
-
-        verify(scenarioSimulationKogitoDMNDataManagerSpy, never()).createDMNType(indexed,
-                                                                                 definition1,
-                                                                                 namespace,
-                                                                                 createdTypes);
-        assertEquals(dmnTypeOne, actualDmnTypeOne);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testGetOrCreateDMNTypeWhenTypeIsNotFound() {
-        final String namespace = "namespace";
-        final Map<String, JSITItemDefinition> indexed = new HashMap<>();
-        final Map<String, ClientDMNType> createdTypes = new HashMap<>();
-
-        scenarioSimulationKogitoDMNDataManagerSpy.getOrCreateDMNType(indexed,
-                                                                     "unknownType",
-                                                                     namespace,
-                                                                     createdTypes);
-    }
-
-    private JSITItemDefinition createJSITItemDefinitionMock(final String name) {
-        final JSITItemDefinition mock = mock(JSITItemDefinition.class);
-        when(mock.getName()).thenReturn(name);
-        return mock;
-    }
-
-    @Test
-    public void getDMNTypesMapEmptyItemDefinitions() {
-        Map<String, ClientDMNType> dmnTypesMap = scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(jstiItemDefinitions, NAMESPACE);
-        // It must contains all elements defined in BuiltInType ENUM
-        assertTrue(dmnTypesMap.size() == 14);
-        for (Map.Entry<String, ClientDMNType> entry : dmnTypesMap.entrySet()) {
-            assertNotNull(entry.getValue().getFeelType());
-            assertTrue(Arrays.stream(entry.getValue().getFeelType().getNames()).anyMatch(entry.getKey()::equals));
-        }
-        for (BuiltInType builtInType : BuiltInType.values()) {
-            Arrays.stream(builtInType.getNames()).forEach(name -> assertNotNull(dmnTypesMap.get(name)));
-        }
-    }
-
-    @Test
-    public void getDMNTypesMapWithItemDefinitions() {
-        jstiItemDefinitions.add(jsitItemDefinitionMock);
-        Map<String, ClientDMNType> dmnTypesMap = scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(jstiItemDefinitions, NAMESPACE);
-        // It must contains all elements defined in BuiltInType ENUM + one defined jstiItemDefinitionMock item
-        assertTrue(dmnTypesMap.size() == 15);
-        for (BuiltInType builtInType : BuiltInType.values()) {
-            Arrays.stream(builtInType.getNames()).forEach(name -> assertNotNull(dmnTypesMap.get(name)));
-        }
-        assertNotNull(dmnTypesMap.get(TYPE_NAME));
-        assertNull(dmnTypesMap.get(TYPE_NAME).getFeelType());
-        assertEquals(TYPE_NAME, dmnTypesMap.get(TYPE_NAME).getName());
-        assertEquals(NAMESPACE, dmnTypesMap.get(TYPE_NAME).getNamespace());
-        assertFalse(dmnTypesMap.get(TYPE_NAME).isCollection());
-    }
-
-    @Test
-    public void testGetCustomWithItemComponentDMNTypes() {
-        // tPeople[structure]
-        //    address[structure]
-        //       country[string]
-
-        final JSITItemDefinition tPeople = mock(JSITItemDefinition.class);
-        final String tPeopleType = "tPeopleType";
-        final String addressFieldName = "address";
-        final String countryFieldName = "country";
-
-        when(tPeople.getName()).thenReturn(tPeopleType);
-
-        final JSITItemDefinition address = mock(JSITItemDefinition.class);
-        when(address.getName()).thenReturn(addressFieldName);
-        final List<JSITItemDefinition> tPeopleFields = Arrays.asList(address);
-
-        final JSITItemDefinition country = mock(JSITItemDefinition.class);
-        when(country.getName()).thenReturn(countryFieldName);
-        when(country.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-        final List<JSITItemDefinition> tAddressFields = Arrays.asList(country);
-
-        when(tPeople.getItemComponent()).thenReturn(tPeopleFields);
-        when(address.getItemComponent()).thenReturn(tAddressFields);
-
-        final List<JSITItemDefinition> definitions = Arrays.asList(tPeople);
-
-        final Map<String, ClientDMNType> dmnTypesMap = scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(definitions, "namespace");
-
-        assertTrue(dmnTypesMap.containsKey(tPeopleType));
-
-        final ClientDMNType dmnPeopleType = dmnTypesMap.get(tPeopleType);
-
-        assertEquals(1, dmnPeopleType.getFields().size());
-        assertTrue(dmnPeopleType.getFields().containsKey(addressFieldName));
-        assertNull(dmnPeopleType.getFeelType());
-        assertFalse(dmnPeopleType.isCollection());
-        assertTrue(dmnPeopleType.isComposite());
-
-        ClientDMNType addressType = dmnPeopleType.getFields().get(addressFieldName);
-        assertNotNull(addressType);
-        assertEquals(1, addressType.getFields().size());
-        assertTrue(addressType.getFields().containsKey(countryFieldName));
-        assertNull(addressType.getFeelType());
-        assertFalse(addressType.isCollection());
-        assertTrue(addressType.isComposite());
-
-        ClientDMNType countryType = addressType.getFields().get(countryFieldName);
-        assertEquals(0, countryType.getFields().size());
-        assertEquals(BuiltInType.STRING, countryType.getFeelType());
-        assertFalse(countryType.isCollection());
-        assertFalse(countryType.isComposite());
-
-        // It must contains all elements defined in BuiltInType ENUM
-        assertTrue(dmnTypesMap.size() == 15);
-        for (BuiltInType builtInType : BuiltInType.values()) {
-            Arrays.stream(builtInType.getNames()).forEach(name -> assertNotNull(dmnTypesMap.get(name)));
-        }
-    }
-
-    @Test
-    public void testGetCustomInheritsSimpleCustomDMNTypes() {
-        // tPeople[string]
-        // tMen[tPeople]
-
-        final JSITItemDefinition tPeople = mock(JSITItemDefinition.class);
-        final JSITItemDefinition tMen = mock(JSITItemDefinition.class);
-
-        final String tPeopleType = "tPeopleType";
-        final String tMenType = "tMenType";
-
-        when(tMen.getName()).thenReturn(tMenType);
-        when(tMen.getTypeRef()).thenReturn(tPeopleType);
-
-        when(tPeople.getName()).thenReturn(tPeopleType);
-        when(tPeople.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-
-        final List<JSITItemDefinition> definitions = Arrays.asList(tPeople, tMen);
-
-        final Map<String, ClientDMNType> dmnTypesMap = scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(definitions, "namespace");
-
-        assertTrue(dmnTypesMap.containsKey(tPeopleType));
-
-        final ClientDMNType dmnPeopleType = dmnTypesMap.get(tPeopleType);
-
-        assertTrue(dmnPeopleType.getFields().isEmpty());
-        assertEquals(BuiltInType.STRING, dmnPeopleType.getFeelType());
-        assertFalse(dmnPeopleType.isCollection());
-        assertFalse(dmnPeopleType.isComposite());
-
-        final ClientDMNType dmnMenType = dmnTypesMap.get(tMenType);
-
-        assertTrue(dmnMenType.getFields().isEmpty());
-        assertEquals((BuiltInType.STRING), dmnMenType.getFeelType());
-        assertFalse(dmnMenType.isCollection());
-        assertFalse(dmnMenType.isComposite());
-
-        // It must contains all elements defined in BuiltInType ENUM
-        assertTrue(dmnTypesMap.size() == 16);
-        for (BuiltInType builtInType : BuiltInType.values()) {
-            Arrays.stream(builtInType.getNames()).forEach(name -> assertNotNull(dmnTypesMap.get(name)));
-        }
-    }
-
-    @Test
-    public void testGetCustomInheritsImportedSimpleCustomDMNTypes() {
-        // imported.tPeople[string]
-        // tMen[tPeople]
-
-        final JSITItemDefinition tPeople = mock(JSITItemDefinition.class);
-        final JSITItemDefinition tMen = mock(JSITItemDefinition.class);
-
-        final String tPeopleType = "tPeopleType";
-        final String importedtPeopleType = "imported.tPeopleType";
-
-        final String tMenType = "tMenType";
-
-        when(tMen.getName()).thenReturn(tMenType);
-        when(tMen.getTypeRef()).thenReturn(importedtPeopleType);
-
-        when(tPeople.getName()).thenReturn(tPeopleType);
-        when(tPeople.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-
-        final List<JSITItemDefinition> definitions = Arrays.asList(tPeople, tMen);
-
-        final Map<String, ClientDMNType> dmnTypesMap = scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(definitions, "namespace");
-
-        assertTrue(dmnTypesMap.containsKey(tPeopleType));
-
-        final ClientDMNType dmnPeopleType = dmnTypesMap.get(tPeopleType);
-
-        assertTrue(dmnPeopleType.getFields().isEmpty());
-        assertEquals(BuiltInType.STRING, dmnPeopleType.getFeelType());
-        assertFalse(dmnPeopleType.isCollection());
-        assertFalse(dmnPeopleType.isComposite());
-
-        final ClientDMNType dmnMenType = dmnTypesMap.get(tMenType);
-
-        assertTrue(dmnMenType.getFields().isEmpty());
-        assertEquals((BuiltInType.STRING), dmnMenType.getFeelType());
-        assertFalse(dmnMenType.isCollection());
-        assertFalse(dmnMenType.isComposite());
-
-        // It must contains all elements defined in BuiltInType ENUM
-        assertTrue(dmnTypesMap.size() == 16);
-        for (BuiltInType builtInType : BuiltInType.values()) {
-            Arrays.stream(builtInType.getNames()).forEach(name -> assertNotNull(dmnTypesMap.get(name)));
-        }
-    }
-
-    @Test
-    public void testGetCustomCollectionInheritsSimpleCustomDMNTypes() {
-        // tPeople[string]
-        // tMen[tPeople] isCollection
-
-        final JSITItemDefinition tPeople = mock(JSITItemDefinition.class);
-        final JSITItemDefinition tMen = mock(JSITItemDefinition.class);
-
-        final String tPeopleType = "tPeopleType";
-        final String tMenType = "tMenType";
-
-        when(tMen.getName()).thenReturn(tMenType);
-        when(tMen.getTypeRef()).thenReturn(tPeopleType);
-        when(tMen.getIsCollection()).thenReturn(true);
-
-        when(tPeople.getName()).thenReturn(tPeopleType);
-        when(tPeople.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-
-        final List<JSITItemDefinition> definitions = Arrays.asList(tPeople, tMen);
-
-        final Map<String, ClientDMNType> dmnTypesMap = scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(definitions, "namespace");
-
-        assertTrue(dmnTypesMap.containsKey(tPeopleType));
-
-        final ClientDMNType dmnPeopleType = dmnTypesMap.get(tPeopleType);
-
-        assertTrue(dmnPeopleType.getFields().isEmpty());
-        assertEquals(BuiltInType.STRING, dmnPeopleType.getFeelType());
-        assertFalse(dmnPeopleType.isCollection());
-        assertFalse(dmnPeopleType.isComposite());
-
-        final ClientDMNType dmnMenType = dmnTypesMap.get(tMenType);
-
-        assertTrue(dmnMenType.getFields().isEmpty());
-        assertEquals(BuiltInType.STRING, dmnMenType.getFeelType());
-        assertTrue(dmnMenType.isCollection());
-        assertFalse(dmnMenType.isComposite());
-
-        // It must contains all elements defined in BuiltInType ENUM
-        assertTrue(dmnTypesMap.size() == 16);
-        for (BuiltInType builtInType : BuiltInType.values()) {
-            Arrays.stream(builtInType.getNames()).forEach(name -> assertNotNull(dmnTypesMap.get(name)));
-        }
-    }
-
-    @Test
-    public void testGetCustomInheritsSimpleCustomCollectionDMNTypes() {
-        // tPeople[string] isCollection
-        // tMen[tPeople]
-
-        final JSITItemDefinition tPeople = mock(JSITItemDefinition.class);
-        final JSITItemDefinition tMen = mock(JSITItemDefinition.class);
-
-        final String tPeopleType = "tPeopleType";
-        final String tMenType = "tMenType";
-
-        when(tMen.getName()).thenReturn(tMenType);
-        when(tMen.getTypeRef()).thenReturn(tPeopleType);
-
-        when(tPeople.getName()).thenReturn(tPeopleType);
-        when(tPeople.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-        when(tPeople.getIsCollection()).thenReturn(true);
-
-        final List<JSITItemDefinition> definitions = Arrays.asList(tPeople, tMen);
-
-        final Map<String, ClientDMNType> dmnTypesMap = scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(definitions, "namespace");
-
-        assertTrue(dmnTypesMap.containsKey(tPeopleType));
-
-        final ClientDMNType dmnPeopleType = dmnTypesMap.get(tPeopleType);
-
-        assertTrue(dmnPeopleType.getFields().isEmpty());
-        assertEquals(BuiltInType.STRING, dmnPeopleType.getFeelType());
-        assertTrue(dmnPeopleType.isCollection());
-        assertFalse(dmnPeopleType.isComposite());
-
-        final ClientDMNType dmnMenType = dmnTypesMap.get(tMenType);
-
-        assertTrue(dmnMenType.getFields().isEmpty());
-        assertEquals(BuiltInType.STRING, dmnMenType.getFeelType());
-        assertTrue(dmnMenType.isCollection());
-        assertFalse(dmnMenType.isComposite());
-
-        // It must contains all elements defined in BuiltInType ENUM
-        assertTrue(dmnTypesMap.size() == 16);
-        for (BuiltInType builtInType : BuiltInType.values()) {
-            Arrays.stream(builtInType.getNames()).forEach(name -> assertNotNull(dmnTypesMap.get(name)));
-        }
-    }
-
-    @Test
-    public void testGetRecursiveDMNTypes() {
-        // tAddress contains tCountry which contains tPeople which contains tAddress:
-        // tPeople[structure]
-        //    address[tAddress]
-        // tAddress[structure]
-        //     country[tCountry]
-        // tCountry[structure]
-        //     president[tPeople]
-
-        final JSITItemDefinition tPeople = mock(JSITItemDefinition.class);
-        final JSITItemDefinition tAddress = mock(JSITItemDefinition.class);
-        final JSITItemDefinition tCountry = mock(JSITItemDefinition.class);
-        final String tPeopleType = "tPeopleType";
-        final String tAddressType = "tAddressType";
-        final String tCountryType = "tCountryType";
-        final String addressFieldName = "address";
-        final String countryFieldName = "president";
-        final String peopleFieldName = "people";
-
-        when(tPeople.getName()).thenReturn(tPeopleType);
-        when(tAddress.getName()).thenReturn(tAddressType);
-        when(tCountry.getName()).thenReturn(tCountryType);
-
-        final JSITItemDefinition address = mock(JSITItemDefinition.class);
-        when(address.getTypeRef()).thenReturn(tAddressType);
-        when(address.getName()).thenReturn(addressFieldName);
-        final List<JSITItemDefinition> tPeopleFields = Arrays.asList(address);
-
-        final JSITItemDefinition country = mock(JSITItemDefinition.class);
-        when(country.getName()).thenReturn(countryFieldName);
-        when(country.getTypeRef()).thenReturn(tCountryType);
-        final List<JSITItemDefinition> tAddressFields = Arrays.asList(country);
-
-        final JSITItemDefinition people = mock(JSITItemDefinition.class);
-        when(people.getTypeRef()).thenReturn(tPeopleType);
-        when(people.getName()).thenReturn(peopleFieldName);
-        final List<JSITItemDefinition> tCountryFields = Arrays.asList(people);
-
-        when(tPeople.getItemComponent()).thenReturn(tPeopleFields);
-        when(tAddress.getItemComponent()).thenReturn(tAddressFields);
-        when(tCountry.getItemComponent()).thenReturn(tCountryFields);
-
-        final List<JSITItemDefinition> definitions = Arrays.asList(tPeople, tAddress, tCountry);
-
-        final Map<String, ClientDMNType> dmnTypesMap = scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(definitions, "namespace");
-
-        assertTrue(dmnTypesMap.containsKey(tPeopleType));
-        assertTrue(dmnTypesMap.containsKey(tAddressType));
-        assertTrue(dmnTypesMap.containsKey(tCountryType));
-
-        final ClientDMNType dmnPeopleType = dmnTypesMap.get(tPeopleType);
-        final ClientDMNType dmnAddressType = dmnTypesMap.get(tAddressType);
-        final ClientDMNType dmnCountryType = dmnTypesMap.get(tCountryType);
-
-        assertEquals(1, dmnPeopleType.getFields().size());
-        assertTrue(dmnPeopleType.getFields().containsKey(addressFieldName));
-        assertEquals(dmnAddressType, dmnPeopleType.getFields().get(addressFieldName));
-        assertFalse(dmnPeopleType.isCollection());
-        assertTrue(dmnPeopleType.isComposite());
-
-        assertEquals(1, dmnAddressType.getFields().size());
-        assertTrue(dmnAddressType.getFields().containsKey(countryFieldName));
-        assertEquals(dmnCountryType, dmnAddressType.getFields().get(countryFieldName));
-        assertFalse(dmnAddressType.isCollection());
-        assertTrue(dmnAddressType.isComposite());
-
-        assertEquals(1, dmnCountryType.getFields().size());
-        assertTrue(dmnCountryType.getFields().containsKey(peopleFieldName));
-        assertEquals(dmnPeopleType, dmnCountryType.getFields().get(peopleFieldName));
-        assertFalse(dmnCountryType.isCollection());
-        assertTrue(dmnCountryType.isComposite());
-
-        // It must contains all elements defined in BuiltInType ENUM
-        assertTrue(dmnTypesMap.size() == 17);
-        for (BuiltInType builtInType : BuiltInType.values()) {
-            Arrays.stream(builtInType.getNames()).forEach(name -> assertNotNull(dmnTypesMap.get(name)));
-        }
-    }
-
-    @Test
-    public void testGetRecursiveAndDataTypeCollectionDMNTypes() {
-        // tAddress contains tCountry which contains tPeople which contains tAddress:
-        // tPeople[structure] isCollection TRUE
-        //    address[tAddress]
-        // tAddress[structure]
-        //     country[tCountry]
-        // tCountry[structure]
-        //     president[tPeople]
-
-        final JSITItemDefinition tPeople = mock(JSITItemDefinition.class);
-        final JSITItemDefinition tAddress = mock(JSITItemDefinition.class);
-        final JSITItemDefinition tCountry = mock(JSITItemDefinition.class);
-        final String tPeopleType = "tPeopleType";
-        final String tAddressType = "tAddressType";
-        final String tCountryType = "tCountryType";
-        final String addressFieldName = "address";
-        final String countryFieldName = "president";
-        final String peopleFieldName = "people";
-
-        when(tPeople.getName()).thenReturn(tPeopleType);
-        when(tAddress.getName()).thenReturn(tAddressType);
-        when(tCountry.getName()).thenReturn(tCountryType);
-        when(tPeople.getIsCollection()).thenReturn(true);
-
-        final JSITItemDefinition address = mock(JSITItemDefinition.class);
-        when(address.getTypeRef()).thenReturn(tAddressType);
-        when(address.getName()).thenReturn(addressFieldName);
-        final List<JSITItemDefinition> tPeopleFields = Arrays.asList(address);
-
-        final JSITItemDefinition country = mock(JSITItemDefinition.class);
-        when(country.getName()).thenReturn(countryFieldName);
-        when(country.getTypeRef()).thenReturn(tCountryType);
-        final List<JSITItemDefinition> tAddressFields = Arrays.asList(country);
-
-        final JSITItemDefinition people = mock(JSITItemDefinition.class);
-        when(people.getTypeRef()).thenReturn(tPeopleType);
-        when(people.getName()).thenReturn(peopleFieldName);
-        final List<JSITItemDefinition> tCountryFields = Arrays.asList(people);
-
-        when(tPeople.getItemComponent()).thenReturn(tPeopleFields);
-        when(tAddress.getItemComponent()).thenReturn(tAddressFields);
-        when(tCountry.getItemComponent()).thenReturn(tCountryFields);
-
-        final List<JSITItemDefinition> definitions = Arrays.asList(tPeople, tAddress, tCountry);
-
-        final Map<String, ClientDMNType> dmnTypesMap = scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(definitions, "namespace");
-
-        assertTrue(dmnTypesMap.containsKey(tPeopleType));
-        assertTrue(dmnTypesMap.containsKey(tAddressType));
-        assertTrue(dmnTypesMap.containsKey(tCountryType));
-
-        final ClientDMNType dmnPeopleType = dmnTypesMap.get(tPeopleType);
-        final ClientDMNType dmnAddressType = dmnTypesMap.get(tAddressType);
-        final ClientDMNType dmnCountryType = dmnTypesMap.get(tCountryType);
-
-        assertEquals(1, dmnPeopleType.getFields().size());
-        assertTrue(dmnPeopleType.getFields().containsKey(addressFieldName));
-        assertEquals(dmnAddressType, dmnPeopleType.getFields().get(addressFieldName));
-        assertTrue(dmnPeopleType.isCollection());
-        assertTrue(dmnPeopleType.isComposite());
-
-        assertEquals(1, dmnAddressType.getFields().size());
-        assertTrue(dmnAddressType.getFields().containsKey(countryFieldName));
-        assertEquals(dmnCountryType, dmnAddressType.getFields().get(countryFieldName));
-        assertFalse(dmnAddressType.isCollection());
-        assertTrue(dmnAddressType.isComposite());
-
-        assertEquals(1, dmnCountryType.getFields().size());
-        assertTrue(dmnCountryType.getFields().containsKey(peopleFieldName));
-        assertEquals(dmnPeopleType, dmnCountryType.getFields().get(peopleFieldName));
-        assertFalse(dmnCountryType.isCollection());
-        assertTrue(dmnCountryType.isComposite());
-
-        // It must contains all elements defined in BuiltInType ENUM
-        assertTrue(dmnTypesMap.size() == 17);
-        for (BuiltInType builtInType : BuiltInType.values()) {
-            Arrays.stream(builtInType.getNames()).forEach(name -> assertNotNull(dmnTypesMap.get(name)));
-        }
-    }
-
-    @Test
-    public void testGetRecursiveAndFieldCollectionsDMNTypes() {
-        // tAddress contains tCountry which contains tPeople which contains tAddress:
-        // tPeople[structure]
-        //    address[tAddress]
-        // tAddress[structure]
-        //     country[tCountry]
-        // tCountry[structure]
-        //     president[tPeople] isCollection TRUE
-        //     regions[string] isCollection TRUE
-        //     name[string]
-
-        final JSITItemDefinition tPeople = mock(JSITItemDefinition.class);
-        final JSITItemDefinition tAddress = mock(JSITItemDefinition.class);
-        final JSITItemDefinition tCountry = mock(JSITItemDefinition.class);
-        final String tPeopleType = "tPeopleType";
-        final String tAddressType = "tAddressType";
-        final String tCountryType = "tCountryType";
-        final String addressFieldName = "address";
-        final String countryFieldName = "president";
-        final String peopleFieldName = "people";
-        final String regionsName = "regions";
-        final String nameLabel = "name";
-
-        when(tPeople.getName()).thenReturn(tPeopleType);
-        when(tAddress.getName()).thenReturn(tAddressType);
-        when(tCountry.getName()).thenReturn(tCountryType);
-
-        final JSITItemDefinition address = mock(JSITItemDefinition.class);
-        when(address.getTypeRef()).thenReturn(tAddressType);
-        when(address.getName()).thenReturn(addressFieldName);
-        final List<JSITItemDefinition> tPeopleFields = Arrays.asList(address);
-
-        final JSITItemDefinition country = mock(JSITItemDefinition.class);
-        when(country.getName()).thenReturn(countryFieldName);
-        when(country.getTypeRef()).thenReturn(tCountryType);
-        final List<JSITItemDefinition> tAddressFields = Arrays.asList(country);
-
-        final JSITItemDefinition people = mock(JSITItemDefinition.class);
-        when(people.getTypeRef()).thenReturn(tPeopleType);
-        when(people.getName()).thenReturn(peopleFieldName);
-        when(people.getIsCollection()).thenReturn(true);
-        final JSITItemDefinition regions = mock(JSITItemDefinition.class);
-        when(regions.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-        when(regions.getName()).thenReturn(regionsName);
-        when(regions.getIsCollection()).thenReturn(true);
-        final JSITItemDefinition nameField = mock(JSITItemDefinition.class);
-        when(nameField.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-        when(nameField.getName()).thenReturn(nameLabel);
-        final List<JSITItemDefinition> tCountryFields = Arrays.asList(people, regions, nameField);
-
-        when(tPeople.getItemComponent()).thenReturn(tPeopleFields);
-        when(tAddress.getItemComponent()).thenReturn(tAddressFields);
-        when(tCountry.getItemComponent()).thenReturn(tCountryFields);
-
-        final List<JSITItemDefinition> definitions = Arrays.asList(tPeople, tAddress, tCountry);
-
-        final Map<String, ClientDMNType> dmnTypesMap = scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(definitions, "namespace");
-
-        assertTrue(dmnTypesMap.containsKey(tPeopleType));
-        assertTrue(dmnTypesMap.containsKey(tAddressType));
-        assertTrue(dmnTypesMap.containsKey(tCountryType));
-
-        final ClientDMNType dmnPeopleType = dmnTypesMap.get(tPeopleType);
-        final ClientDMNType dmnAddressType = dmnTypesMap.get(tAddressType);
-        final ClientDMNType dmnCountryType = dmnTypesMap.get(tCountryType);
-        final ClientDMNType stringType = dmnTypesMap.get(BuiltInType.STRING.getName());
-
-        assertEquals(1, dmnPeopleType.getFields().size());
-        assertTrue(dmnPeopleType.getFields().containsKey(addressFieldName));
-        assertEquals(dmnAddressType, dmnPeopleType.getFields().get(addressFieldName));
-        assertNull(dmnPeopleType.getFeelType());
-        assertFalse(dmnPeopleType.isCollection());
-        assertTrue(dmnPeopleType.isComposite());
-
-        assertEquals(1, dmnAddressType.getFields().size());
-        assertTrue(dmnAddressType.getFields().containsKey(countryFieldName));
-        assertEquals(dmnCountryType, dmnAddressType.getFields().get(countryFieldName));
-        assertNull(dmnAddressType.getFeelType());
-        assertFalse(dmnAddressType.isCollection());
-        assertTrue(dmnAddressType.isComposite());
-
-        assertEquals(3, dmnCountryType.getFields().size());
-        assertTrue(dmnCountryType.getFields().containsKey(peopleFieldName));
-        assertNotEquals(dmnPeopleType, dmnCountryType.getFields().get(peopleFieldName));
-        assertTrue(dmnCountryType.getFields().get(peopleFieldName).isCollection());
-        assertTrue(dmnCountryType.getFields().get(peopleFieldName).isComposite());
-        assertEquals(tPeopleType, dmnCountryType.getFields().get(peopleFieldName).getName());
-        assertTrue(dmnCountryType.getFields().containsKey(regionsName));
-        assertNull(dmnCountryType.getFeelType());
-        assertNotEquals(stringType, dmnCountryType.getFields().get(regionsName));
-        assertTrue(dmnCountryType.getFields().get(regionsName).isCollection());
-        assertFalse(dmnCountryType.getFields().get(regionsName).isComposite());
-        assertEquals(BuiltInType.STRING.getName(), dmnCountryType.getFields().get(regionsName).getName());
-        assertTrue(dmnCountryType.getFields().containsKey(nameLabel));
-        assertEquals(stringType, dmnCountryType.getFields().get(nameLabel));
-        assertEquals(BuiltInType.STRING, stringType.getFeelType());
-        assertFalse(stringType.isCollection());
-        assertFalse(stringType.isComposite());
-
-        // It must contains all elements defined in BuiltInType ENUM
-        assertTrue(dmnTypesMap.size() == 17);
-        for (BuiltInType builtInType : BuiltInType.values()) {
-            Arrays.stream(builtInType.getNames()).forEach(name -> assertNotNull(dmnTypesMap.get(name)));
-        }
-    }
-
-    @Test
-    public void createDMNTypeItemDefinitionSimpleTypeRefNoFields() {
-        Map<String, ClientDMNType> defaultTypesMap = new HashMap<>(scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(Collections.emptyList(), NAMESPACE));
-        allDefinitions = scenarioSimulationKogitoDMNDataManagerSpy.indexDefinitionsByName(Arrays.asList(jsitItemDefinitionMock));
-        when(jsitItemDefinitionMock.getItemComponent()).thenReturn(new ArrayList<>());
-        when(jsitItemDefinitionMock.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-        ClientDMNType clientDmnType = scenarioSimulationKogitoDMNDataManagerSpy.createDMNType(allDefinitions,
-                                                                                              jsitItemDefinitionMock,
-                                                                                              NAMESPACE,
-                                                                                              defaultTypesMap);
-        assertEquals(NAMESPACE, clientDmnType.getNamespace());
-        assertEquals(TYPE_NAME, clientDmnType.getName());
-        assertFalse(clientDmnType.isCollection());
-        assertFalse(clientDmnType.isComposite());
-        assertTrue(clientDmnType.getFields().isEmpty());
-        assertEquals(BuiltInType.STRING, clientDmnType.getFeelType());
-        assertNull(clientDmnType.getBaseType());
-        assertTrue(defaultTypesMap.containsKey(TYPE_NAME));
-        assertTrue(defaultTypesMap.containsValue(clientDmnType));
-    }
-
-    @Test
-    public void createDMNTypeItemDefinitionSimpleTypeRefNoFieldsWithAllowedValues() {
-        Map<String, ClientDMNType> defaultTypesMap = new HashMap<>(scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(Collections.emptyList(), NAMESPACE));
-        allDefinitions = scenarioSimulationKogitoDMNDataManagerSpy.indexDefinitionsByName(Arrays.asList(jsitItemDefinitionMock));
-        when(jsitItemDefinitionMock.getItemComponent()).thenReturn(new ArrayList<>());
-        when(jsitItemDefinitionMock.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-        JSITUnaryTests jsitUnaryTestsMock = mock(JSITUnaryTests.class);
-        when(jsitUnaryTestsMock.getText()).thenReturn("value1, value2, value3");
-        when(jsitItemDefinitionMock.getAllowedValues()).thenReturn(jsitUnaryTestsMock);
-        ClientDMNType clientDmnType = scenarioSimulationKogitoDMNDataManagerSpy.createDMNType(allDefinitions,
-                                                                                              jsitItemDefinitionMock,
-                                                                                              NAMESPACE,
-                                                                                              defaultTypesMap);
-        assertEquals(NAMESPACE, clientDmnType.getNamespace());
-        assertEquals(TYPE_NAME, clientDmnType.getName());
-        assertFalse(clientDmnType.isCollection());
-        assertFalse(clientDmnType.isComposite());
-        assertTrue(clientDmnType.getFields().isEmpty());
-        assertEquals(BuiltInType.STRING, clientDmnType.getFeelType());
-        assertEquals("string", clientDmnType.getBaseType().getName());
-        assertTrue(defaultTypesMap.containsKey(TYPE_NAME));
-        assertTrue(defaultTypesMap.containsValue(clientDmnType));
-    }
-
-    @Test
-    public void createDMNTypeSimpleItemComponentSimpleTypeRefNoFields() {
-        Map<String, ClientDMNType> defaultTypesMap = new HashMap<>(scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(Collections.emptyList(), NAMESPACE));
-        when(jsitItemDefinitionMock.getItemComponent()).thenReturn(new ArrayList<>());
-        when(jsitItemDefinitionMock.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-        ClientDMNType clientDmnType = scenarioSimulationKogitoDMNDataManagerSpy.createDMNType(allDefinitions,
-                                                                                              jsitItemDefinitionMock,
-                                                                                              NAMESPACE,
-                                                                                              defaultTypesMap);
-        assertEquals(NAMESPACE, clientDmnType.getNamespace());
-        assertEquals(TYPE_NAME, clientDmnType.getName());
-        assertFalse(clientDmnType.isCollection());
-        assertFalse(clientDmnType.isComposite());
-        assertTrue(clientDmnType.getFields().isEmpty());
-        assertEquals(BuiltInType.STRING, clientDmnType.getFeelType());
-        assertFalse(defaultTypesMap.containsKey(TYPE_NAME));
-        assertFalse(defaultTypesMap.containsValue(clientDmnType));
-    }
-
-    @Test
-    public void createDMNTypeItemDefinitionWithField() {
-        Map<String, ClientDMNType> defaultTypesMap = new HashMap<>(scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(Collections.emptyList(), NAMESPACE));
-        when(jsitItemDefinitionMock.getItemComponent()).thenReturn(Arrays.asList(jsitItemDefinitionNestedMock));
-        when(jsitItemDefinitionNestedMock.getName()).thenReturn("tNested");
-        when(jsitItemDefinitionNestedMock.getId()).thenReturn(ID);
-        when(jsitItemDefinitionNestedMock.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-        allDefinitions = scenarioSimulationKogitoDMNDataManagerSpy.indexDefinitionsByName(Arrays.asList(jsitItemDefinitionMock));
-        ClientDMNType clientDmnType = scenarioSimulationKogitoDMNDataManagerSpy.createDMNType(allDefinitions,
-                                                                                              jsitItemDefinitionMock,
-                                                                                              NAMESPACE,
-                                                                                              defaultTypesMap);
-        assertEquals(NAMESPACE, clientDmnType.getNamespace());
-        assertEquals(TYPE_NAME, clientDmnType.getName());
-        assertFalse(clientDmnType.isCollection());
-        assertTrue(clientDmnType.isComposite());
-        assertNotNull(clientDmnType.getFields());
-        assertTrue(clientDmnType.getFields().size() == 1);
-        assertEquals(BuiltInType.STRING, clientDmnType.getFields().get("tNested").getFeelType());
-        assertFalse(clientDmnType.getFields().get("tNested").isCollection());
-        assertFalse(clientDmnType.getFields().get("tNested").isComposite());
-        assertNull(clientDmnType.getFeelType());
-        assertTrue(defaultTypesMap.containsKey(TYPE_NAME));
-        assertTrue(defaultTypesMap.containsValue(clientDmnType));
-    }
-
-    @Test
-    public void createDMNTypeItemComponentWithField() {
-        Map<String, ClientDMNType> defaultTypesMap = new HashMap<>(scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(Collections.emptyList(), NAMESPACE));
-        when(jsitItemDefinitionMock.getItemComponent()).thenReturn(Arrays.asList(jsitItemDefinitionNestedMock));
-        when(jsitItemDefinitionNestedMock.getName()).thenReturn("tNested");
-        when(jsitItemDefinitionNestedMock.getId()).thenReturn(ID);
-        when(jsitItemDefinitionNestedMock.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-        ClientDMNType clientDmnType = scenarioSimulationKogitoDMNDataManagerSpy.createDMNType(allDefinitions,
-                                                                                              jsitItemDefinitionMock,
-                                                                                              NAMESPACE,
-                                                                                              defaultTypesMap);
-        assertEquals(NAMESPACE, clientDmnType.getNamespace());
-        assertEquals(TYPE_NAME, clientDmnType.getName());
-        assertFalse(clientDmnType.isCollection());
-        assertTrue(clientDmnType.isComposite());
-        assertNotNull(clientDmnType.getFields());
-        assertTrue(clientDmnType.getFields().size() == 1);
-        assertEquals(BuiltInType.STRING, clientDmnType.getFields().get("tNested").getFeelType());
-        assertFalse(clientDmnType.getFields().get("tNested").isCollection());
-        assertFalse(clientDmnType.getFields().get("tNested").isComposite());
-        assertNull(clientDmnType.getFields().get("tNested").getBaseType());
-        assertNull(clientDmnType.getFeelType());
-        assertFalse(defaultTypesMap.containsKey(TYPE_NAME));
-        assertFalse(defaultTypesMap.containsValue(clientDmnType));
-    }
-
-    @Test
-    public void createDMNTypeItemComponentWithFieldWithAllowedValues() {
-        Map<String, ClientDMNType> defaultTypesMap = new HashMap<>(scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(Collections.emptyList(), NAMESPACE));
-        when(jsitItemDefinitionMock.getItemComponent()).thenReturn(Arrays.asList(jsitItemDefinitionNestedMock));
-        when(jsitItemDefinitionNestedMock.getName()).thenReturn("tNested");
-        when(jsitItemDefinitionNestedMock.getId()).thenReturn(ID);
-        when(jsitItemDefinitionNestedMock.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-        JSITUnaryTests jsitUnaryTestsMock = mock(JSITUnaryTests.class);
-        when(jsitUnaryTestsMock.getText()).thenReturn("value1, value2, value3");
-        when(jsitItemDefinitionNestedMock.getAllowedValues()).thenReturn(jsitUnaryTestsMock);
-        ClientDMNType clientDmnType = scenarioSimulationKogitoDMNDataManagerSpy.createDMNType(allDefinitions,
-                                                                                              jsitItemDefinitionMock,
-                                                                                              NAMESPACE,
-                                                                                              defaultTypesMap);
-        assertEquals(NAMESPACE, clientDmnType.getNamespace());
-        assertEquals(TYPE_NAME, clientDmnType.getName());
-        assertFalse(clientDmnType.isCollection());
-        assertTrue(clientDmnType.isComposite());
-        assertNotNull(clientDmnType.getFields());
-        assertTrue(clientDmnType.getFields().size() == 1);
-        assertEquals(BuiltInType.STRING, clientDmnType.getFields().get("tNested").getFeelType());
-        assertFalse(clientDmnType.getFields().get("tNested").isCollection());
-        assertFalse(clientDmnType.getFields().get("tNested").isComposite());
-        assertEquals("string", clientDmnType.getFields().get("tNested").getBaseType().getName());
-        assertNull(clientDmnType.getFeelType());
-        assertFalse(defaultTypesMap.containsKey(TYPE_NAME));
-        assertFalse(defaultTypesMap.containsValue(clientDmnType));
-    }
-
-    @Test
-    public void createDMNTypeItemDefinitionWithCollectionField() {
-        Map<String, ClientDMNType> defaultTypesMap = new HashMap<>(scenarioSimulationKogitoDMNDataManagerSpy.getDMNDataTypesMap(Collections.emptyList(), NAMESPACE));
-        when(jsitItemDefinitionMock.getItemComponent()).thenReturn(Arrays.asList(jsitItemDefinitionNestedMock));
-        when(jsitItemDefinitionNestedMock.getName()).thenReturn("tNested");
-        when(jsitItemDefinitionNestedMock.getId()).thenReturn(ID);
-        when(jsitItemDefinitionNestedMock.getTypeRef()).thenReturn(BuiltInType.STRING.getName());
-        when(jsitItemDefinitionNestedMock.getIsCollection()).thenReturn(true);
-        allDefinitions = scenarioSimulationKogitoDMNDataManagerSpy.indexDefinitionsByName(Arrays.asList(jsitItemDefinitionMock));
-        ClientDMNType clientDmnType = scenarioSimulationKogitoDMNDataManagerSpy.createDMNType(allDefinitions,
-                                                                                              jsitItemDefinitionMock,
-                                                                                              NAMESPACE,
-                                                                                              defaultTypesMap);
-        assertEquals(NAMESPACE, clientDmnType.getNamespace());
-        assertEquals(TYPE_NAME, clientDmnType.getName());
-        assertFalse(clientDmnType.isCollection());
-        assertTrue(clientDmnType.isComposite());
-        assertNotNull(clientDmnType.getFields());
-        assertTrue(clientDmnType.getFields().size() == 1);
-        assertEquals(BuiltInType.STRING, clientDmnType.getFields().get("tNested").getFeelType());
-        assertTrue(clientDmnType.getFields().get("tNested").isCollection());
-        assertFalse(clientDmnType.getFields().get("tNested").isComposite());
-        assertNull(clientDmnType.getFeelType());
-        assertTrue(defaultTypesMap.containsKey(TYPE_NAME));
-        assertTrue(defaultTypesMap.containsValue(clientDmnType));
-    }
-
-    @Test
-    public void getFactModelTupleEmptyElements() {
-        FactModelTuple factModelTuple = scenarioSimulationKogitoDMNDataManagerSpy.getFactModelTuple(kogitoDMNModel);
-        assertTrue(factModelTuple.getVisibleFacts().isEmpty());
-        assertTrue(factModelTuple.getHiddenFacts().isEmpty());
-    }
-
-    @Test
-    public void getFactModelTupleSimpleInputData() {
-        when(jsiITInputDataMock.getName()).thenReturn("inputDataName");
-        drgElements.add(jsiITInputDataMock);
-        when(jsiITDefinitionsMock.getDrgElement()).thenReturn(drgElements);
-        attributesMapInput.put(TYPEREF_QNAME, "number");
-        FactModelTuple factModelTuple = scenarioSimulationKogitoDMNDataManagerSpy.getFactModelTuple(kogitoDMNModel);
-        assertTrue(factModelTuple.getVisibleFacts().size() == 1);
-        FactModelTree inputDataNameFact = factModelTuple.getVisibleFacts().get("inputDataName");
-        assertNotNull(inputDataNameFact);
-        assertTrue(inputDataNameFact.getSimpleProperties().size() == 1);
-        assertEquals("number", inputDataNameFact.getSimpleProperties().get(VALUE).getTypeName());
-        assertEquals("number", inputDataNameFact.getSimpleProperties().get(VALUE).getPropertyTypeNameToVisualize());
-        assertFalse(inputDataNameFact.getSimpleProperties().get(VALUE).getBaseTypeName().isPresent());
-    }
-
-    @Test
-    public void getFactModelTupleSimpleDecisionData() {
-        when(jsiITDecisionMock.getName()).thenReturn("inputDecisionName");
-        drgElements.add(jsiITDecisionMock);
-        when(jsiITDefinitionsMock.getDrgElement()).thenReturn(drgElements);
-        attributesMapDecision.put(TYPEREF_QNAME, "string");
-        FactModelTuple factModelTuple = scenarioSimulationKogitoDMNDataManagerSpy.getFactModelTuple(kogitoDMNModel);
-        assertTrue(factModelTuple.getVisibleFacts().size() == 1);
-        FactModelTree decisionDataNameFact = factModelTuple.getVisibleFacts().get("inputDecisionName");
-        assertNotNull(decisionDataNameFact);
-        assertTrue(decisionDataNameFact.getSimpleProperties().size() == 1);
-        assertEquals("string", decisionDataNameFact.getSimpleProperties().get(VALUE).getTypeName());
-        assertEquals("string", decisionDataNameFact.getSimpleProperties().get(VALUE).getPropertyTypeNameToVisualize());
-        assertFalse(decisionDataNameFact.getSimpleProperties().get(VALUE).getBaseTypeName().isPresent());
-    }
-
-    @Test
-    public void getFactModelTupleSimpleInputAndDecisionData() {
-        when(jsiITInputDataMock.getName()).thenReturn("inputDataName");
-        when(jsiITDecisionMock.getName()).thenReturn("inputDecisionName");
-        drgElements.add(jsiITDecisionMock);
-        drgElements.add(jsiITInputDataMock);
-        when(jsiITDefinitionsMock.getDrgElement()).thenReturn(drgElements);
-        attributesMapInput.put(TYPEREF_QNAME, "number");
-        attributesMapDecision.put(TYPEREF_QNAME, "string");
-        FactModelTuple factModelTuple = scenarioSimulationKogitoDMNDataManagerSpy.getFactModelTuple(kogitoDMNModel);
-        assertTrue(factModelTuple.getVisibleFacts().size() == 2);
-        FactModelTree inputDataNameFact = factModelTuple.getVisibleFacts().get("inputDataName");
-        assertNotNull(inputDataNameFact);
-        assertTrue(inputDataNameFact.getSimpleProperties().size() == 1);
-        assertEquals("number", inputDataNameFact.getSimpleProperties().get(VALUE).getTypeName());
-        assertEquals("number", inputDataNameFact.getSimpleProperties().get(VALUE).getPropertyTypeNameToVisualize());
-        assertFalse(inputDataNameFact.getSimpleProperties().get(VALUE).getBaseTypeName().isPresent());
-        FactModelTree decisionDataNameFact = factModelTuple.getVisibleFacts().get("inputDecisionName");
-        assertNotNull(decisionDataNameFact);
-        assertTrue(decisionDataNameFact.getSimpleProperties().size() == 1);
-        assertEquals("string", decisionDataNameFact.getSimpleProperties().get(VALUE).getTypeName());
-        assertEquals("string", decisionDataNameFact.getSimpleProperties().get(VALUE).getPropertyTypeNameToVisualize());
-        assertFalse(decisionDataNameFact.getSimpleProperties().get(VALUE).getBaseTypeName().isPresent());
-    }
-
-    @Test
-    public void getFactModelTupleSimpleImportedInputAndDecisionData() {
-        Map<String, JSITDefinitions> imports = new HashMap<>();
-        imports.put(IMPORTED_NAMESPACE, jsiITDefinitionsMockImportedMock);
-        kogitoDMNModel = new KogitoDMNModel(jsiITDefinitionsMock, imports);
-        when(jsiITInputDataMock.getName()).thenReturn("inputDataName");
-        when(jsiITDecisionMock.getName()).thenReturn("inputDecisionName");
-        drgElements.add(jsiITDecisionMock);
-        drgElements.add(jsiITInputDataMock);
-        when(jsiITDefinitionsMockImportedMock.getDrgElement()).thenReturn(drgElements);
-        attributesMapInput.put(TYPEREF_QNAME, "number");
-        attributesMapDecision.put(TYPEREF_QNAME, "string");
-        JSITImport jsitImportMock = mock(JSITImport.class);
-        when(jsitImportMock.getNamespace()).thenReturn(IMPORTED_NAMESPACE);
-        when(jsitImportMock.getName()).thenReturn(IMPORT_PREFIX);
-        when(jsiITDefinitionsMock.getImport()).thenReturn(Arrays.asList(jsitImportMock));
-
-        FactModelTuple factModelTuple = scenarioSimulationKogitoDMNDataManagerSpy.getFactModelTuple(kogitoDMNModel);
-        assertTrue(factModelTuple.getVisibleFacts().size() == 2);
-        FactModelTree inputDataNameFact = factModelTuple.getVisibleFacts().get(IMPORT_PREFIX + ".inputDataName");
-        assertNotNull(inputDataNameFact);
-        assertTrue(inputDataNameFact.getSimpleProperties().size() == 1);
-        assertEquals("number", inputDataNameFact.getSimpleProperties().get(VALUE).getTypeName());
-        assertEquals("number", inputDataNameFact.getSimpleProperties().get(VALUE).getPropertyTypeNameToVisualize());
-        assertFalse(inputDataNameFact.getSimpleProperties().get(VALUE).getBaseTypeName().isPresent());
-        assertEquals(IMPORT_PREFIX, inputDataNameFact.getImportPrefix());
-
-        FactModelTree decisionDataNameFact = factModelTuple.getVisibleFacts().get(IMPORT_PREFIX + ".inputDecisionName");
-        assertNotNull(decisionDataNameFact);
-        assertTrue(decisionDataNameFact.getSimpleProperties().size() == 1);
-        assertEquals("string", decisionDataNameFact.getSimpleProperties().get(VALUE).getTypeName());
-        assertEquals("string", decisionDataNameFact.getSimpleProperties().get(VALUE).getPropertyTypeNameToVisualize());
-        assertFalse(decisionDataNameFact.getSimpleProperties().get(VALUE).getBaseTypeName().isPresent());
-        assertEquals(IMPORT_PREFIX, decisionDataNameFact.getImportPrefix());
-    }
-
-    @Test
-    public void createTopLevelFactModelTreeSimpleNoCollection() {
-        // Single property retrieve
-        ClientDMNType simpleString = getSimpleNoCollection();
-        FactModelTree retrieved = scenarioSimulationKogitoDMNDataManagerSpy.createTopLevelFactModelTree("testPath", IMPORT_PREFIX, simpleString, new TreeMap<>(), FactModelTree.Type.INPUT);
-        Assert.assertNotNull(retrieved);
-        assertEquals("testPath", retrieved.getFactName());
-        assertEquals(1, retrieved.getSimpleProperties().size());
-        assertTrue(retrieved.getSimpleProperties().containsKey(VALUE));
-        assertEquals(simpleString.getName(), retrieved.getSimpleProperties().get(VALUE).getTypeName());
-        assertFalse(retrieved.getSimpleProperties().get(VALUE).getBaseTypeName().isPresent());
-        assertEquals(simpleString.getName(), retrieved.getSimpleProperties().get(VALUE).getPropertyTypeNameToVisualize());
-        assertTrue(retrieved.getGenericTypesMap().isEmpty());
-        assertEquals(IMPORT_PREFIX, retrieved.getImportPrefix());
-    }
-
-    @Test
-    public void createTopLevelFactModelTreeSimpleCollection() {
-        // Single property collection retrieve
-        ClientDMNType simpleCollectionString = getSimpleCollection();
-        TreeMap<String, FactModelTree> hiddenFactSimpleCollection = new TreeMap<>();
-        FactModelTree retrieved = scenarioSimulationKogitoDMNDataManagerSpy.createTopLevelFactModelTree("testPath", IMPORT_PREFIX, simpleCollectionString, hiddenFactSimpleCollection, FactModelTree.Type.INPUT);
-        Assert.assertNotNull(retrieved);
-        assertEquals("testPath", retrieved.getFactName());
-        assertEquals(1, retrieved.getSimpleProperties().size());
-        assertTrue(retrieved.getSimpleProperties().containsKey(VALUE));
-        assertEquals("java.util.List", retrieved.getSimpleProperties().get(VALUE).getTypeName());
-        assertFalse(retrieved.getSimpleProperties().get(VALUE).getBaseTypeName().isPresent());
-        assertEquals("java.util.List", retrieved.getSimpleProperties().get(VALUE).getPropertyTypeNameToVisualize());
-        assertTrue(retrieved.getExpandableProperties().isEmpty());
-        assertEquals(1, retrieved.getGenericTypesMap().size());
-        assertTrue(retrieved.getGenericTypesMap().containsKey(VALUE));
-        Assert.assertNotNull(retrieved.getGenericTypesMap().get(VALUE));
-        assertEquals(1, retrieved.getGenericTypesMap().get(VALUE).size());
-        assertEquals(simpleCollectionString.getName(), retrieved.getGenericTypesMap().get(VALUE).get(0));
-        assertEquals(IMPORT_PREFIX, retrieved.getImportPrefix());
-    }
-
-    @Test
-    public void createTopLevelFactModelTreeCompositeNoCollectionBaseType() {
-        // Single property retrieve
-        ClientDMNType composite = getSingleCompositeWithBaseTypeField();
-        FactModelTree retrieved = scenarioSimulationKogitoDMNDataManagerSpy.createTopLevelFactModelTree("testPath", IMPORT_PREFIX, composite, new TreeMap<>(), FactModelTree.Type.INPUT);
-        assertNotNull(retrieved);
-        assertEquals("testPath", retrieved.getFactName());
-        assertEquals(2, retrieved.getSimpleProperties().size());
-        assertTrue(retrieved.getSimpleProperties().containsKey("name"));
-        assertEquals(TYPE_NAME, retrieved.getSimpleProperties().get("name").getTypeName());
-        assertFalse(retrieved.getSimpleProperties().get("name").getBaseTypeName().isPresent());
-        assertEquals(TYPE_NAME, retrieved.getSimpleProperties().get("name").getPropertyTypeNameToVisualize());
-        //
-        assertTrue(retrieved.getSimpleProperties().containsKey("gender"));
-        assertEquals("gender", retrieved.getSimpleProperties().get("gender").getTypeName());
-        assertEquals("string", retrieved.getSimpleProperties().get("gender").getBaseTypeName().get());
-        assertEquals("string", retrieved.getSimpleProperties().get("gender").getPropertyTypeNameToVisualize());
-        assertTrue(retrieved.getExpandableProperties().isEmpty());
-        assertTrue(retrieved.getGenericTypesMap().isEmpty());
-        assertEquals(IMPORT_PREFIX, retrieved.getImportPrefix());
-    }
-
-    @Test
-    public void createTopLevelFactModelTreeCompositeNoCollection() {
-        // Single property retrieve
-        ClientDMNType compositePerson = getSingleCompositeWithSimpleCollection();
-        FactModelTree retrieved = scenarioSimulationKogitoDMNDataManagerSpy.createTopLevelFactModelTree("testPath", IMPORT_PREFIX, compositePerson, new TreeMap<>(), FactModelTree.Type.INPUT);
-        Assert.assertNotNull(retrieved);
-        assertEquals("testPath", retrieved.getFactName());
-        assertEquals(2, retrieved.getSimpleProperties().size());
-        assertTrue(retrieved.getSimpleProperties().containsKey("friends"));
-        assertEquals("java.util.List", retrieved.getSimpleProperties().get("friends").getTypeName());
-        assertFalse(retrieved.getSimpleProperties().get("friends").getBaseTypeName().isPresent());
-        assertEquals("java.util.List", retrieved.getSimpleProperties().get("friends").getPropertyTypeNameToVisualize());
-        assertTrue(retrieved.getSimpleProperties().containsKey("name"));
-        assertEquals(TYPE_NAME, retrieved.getSimpleProperties().get("name").getTypeName());
-        assertFalse(retrieved.getSimpleProperties().get("name").getBaseTypeName().isPresent());
-        assertEquals(TYPE_NAME, retrieved.getSimpleProperties().get("name").getPropertyTypeNameToVisualize());
-        assertEquals(IMPORT_PREFIX, retrieved.getImportPrefix());
-        //
-        assertEquals(1, retrieved.getGenericTypesMap().size());
-        assertTrue(retrieved.getGenericTypesMap().containsKey("friends"));
-        assertEquals(compositePerson.getFields().get("friends").getName(), retrieved.getGenericTypesMap().get("friends").get(0));
-        //
-        assertEquals(2, retrieved.getExpandableProperties().size());
-        assertTrue(retrieved.getExpandableProperties().containsKey("EXPANDABLE_PROPERTY_PHONENUMBERS"));
-        assertEquals("tPhoneNumber", retrieved.getExpandableProperties().get("EXPANDABLE_PROPERTY_PHONENUMBERS"));
-        assertTrue(retrieved.getExpandableProperties().containsKey("EXPANDABLE_PROPERTY_DETAILS"));
-        assertEquals("tDetails", retrieved.getExpandableProperties().get("EXPANDABLE_PROPERTY_DETAILS"));
-    }
-
-    @Test
-    public void createTopLevelFactModelTreeCompositeCollection() {
-        // Single property collection retrieve
-        ClientDMNType compositePerson = getCompositeCollection();
-        TreeMap<String, FactModelTree> hiddenFactSimpleCollection = new TreeMap<>();
-        FactModelTree retrieved = scenarioSimulationKogitoDMNDataManagerSpy.createTopLevelFactModelTree("testPath", IMPORT_PREFIX, compositePerson, hiddenFactSimpleCollection, FactModelTree.Type.INPUT);
-        Assert.assertNotNull(retrieved);
-        assertEquals("testPath", retrieved.getFactName());
-        assertEquals(1, retrieved.getSimpleProperties().size());
-        assertTrue(retrieved.getSimpleProperties().containsKey(VALUE));
-        assertEquals("java.util.List", retrieved.getSimpleProperties().get(VALUE).getTypeName());
-        assertFalse(retrieved.getSimpleProperties().get(VALUE).getBaseTypeName().isPresent());
-        assertEquals("java.util.List", retrieved.getSimpleProperties().get(VALUE).getPropertyTypeNameToVisualize());
-        assertTrue(retrieved.getExpandableProperties().isEmpty());
-        assertEquals(1, retrieved.getGenericTypesMap().size());
-        assertTrue(retrieved.getGenericTypesMap().containsKey(VALUE));
-        Assert.assertNotNull(retrieved.getGenericTypesMap().get(VALUE));
-        assertEquals(1, retrieved.getGenericTypesMap().get(VALUE).size());
-        assertEquals(compositePerson.getName(), retrieved.getGenericTypesMap().get(VALUE).get(0));
-        assertEquals(IMPORT_PREFIX, retrieved.getImportPrefix());
-    }
-
-    private ClientDMNType getSimpleNoCollection() {
-        return new ClientDMNType(NAMESPACE, TYPE_NAME, null, false, false, null, null);
-    }
-
-    private ClientDMNType getSimpleCollection() {
-        return new ClientDMNType(NAMESPACE, TYPE_NAME, null, true, false, null, null);
-    }
-
-    private ClientDMNType getSingleCompositeWithSimpleCollection() {
-        Map<String, ClientDMNType> phoneNumberCompositeFields = new HashMap<>();
-        phoneNumberCompositeFields.put("PHONENUMBER_PREFIX", new ClientDMNType(null, TYPE_NAME, null, false, null));
-        phoneNumberCompositeFields.put("PHONENUMBER_NUMBER", new ClientDMNType(null, TYPE_NAME, null, false, null));
-        ClientDMNType phoneNumberComposite = new ClientDMNType(NAMESPACE, "tPhoneNumber", null, false, true, phoneNumberCompositeFields, null);
-
-        Map<String, ClientDMNType> detailsCompositeFields = new HashMap<>();
-
-        detailsCompositeFields.put("gender", new ClientDMNType(null, TYPE_NAME, null, false, null));
-        detailsCompositeFields.put("weight", new ClientDMNType(null, TYPE_NAME, null, false, null));
-        ClientDMNType detailsComposite = new ClientDMNType(NAMESPACE, "tDetails", "tDetails", false, true, detailsCompositeFields, null);
-
-        ClientDMNType nameSimple = new ClientDMNType(null, TYPE_NAME, null, false, null);
-
-        ClientDMNType friendsSimpleCollection = new ClientDMNType(null, TYPE_NAME, null, true, null);
-
-        Map<String, ClientDMNType> compositePersonField = new HashMap<>();
-        compositePersonField.put("friends", friendsSimpleCollection);
-        compositePersonField.put("EXPANDABLE_PROPERTY_PHONENUMBERS", phoneNumberComposite);
-        compositePersonField.put("EXPANDABLE_PROPERTY_DETAILS", detailsComposite);
-        compositePersonField.put("name", nameSimple);
-        return new ClientDMNType(NAMESPACE, TYPE_NAME, null, false, true, compositePersonField, null);
-    }
-
-    protected ClientDMNType getCompositeCollection() {
-        Map<String, ClientDMNType> phoneNumberCompositeFields = new HashMap<>();
-        phoneNumberCompositeFields.put("PHONENUMBER_PREFIX", new ClientDMNType(null, TYPE_NAME, null, false, null));
-        phoneNumberCompositeFields.put("PHONENUMBER_NUMBER", new ClientDMNType(null, TYPE_NAME, null, false, null));
-        ClientDMNType phoneNumberComposite = new ClientDMNType(NAMESPACE, "tPhoneNumber", null, false, true, phoneNumberCompositeFields, null);
-
-        Map<String, ClientDMNType> detailsCompositeFields = new HashMap<>();
-        detailsCompositeFields.put("gender", new ClientDMNType(null, TYPE_NAME, null, false, null));
-        detailsCompositeFields.put("weight", new ClientDMNType(null, TYPE_NAME, null, false, null));
-        ClientDMNType detailsComposite = new ClientDMNType(NAMESPACE, "tDetails", "tDetails", false, true, detailsCompositeFields, null);
-
-        ClientDMNType nameSimple = new ClientDMNType(null, TYPE_NAME, null, false, null);
-
-        ClientDMNType friendsSimpleCollection = new ClientDMNType(null, TYPE_NAME, null, true, null);
-
-        Map<String, ClientDMNType> compositePersonField = new HashMap<>();
-        compositePersonField.put("friends", friendsSimpleCollection);
-        compositePersonField.put("EXPANDABLE_PROPERTY_PHONENUMBERS", phoneNumberComposite);
-        compositePersonField.put("EXPANDABLE_PROPERTY_DETAILS", detailsComposite);
-        compositePersonField.put("name", nameSimple);
-
-        return new ClientDMNType(NAMESPACE, TYPE_NAME, null, true, true, compositePersonField, null);
-    }
-
-    private ClientDMNType getSingleCompositeWithBaseTypeField() {
-        // Complex object retrieve
-        ClientDMNType toReturn = new ClientDMNType(null, "tComposite", null, false, true);
-        ClientDMNType genderDMNType = new ClientDMNType(null, "gender", null, false, null);
-        genderDMNType.setBaseType(new ClientDMNType(null, "string", null, false, null));
-
-        toReturn.addField("gender", genderDMNType);
-        toReturn.addField("name", new ClientDMNType(null, TYPE_NAME, null, false, null));
-
-        return toReturn;
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/docks/KogitoEditorDockTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/docks/KogitoEditorDockTest.java
deleted file mode 100644
index e4959e8..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/docks/KogitoEditorDockTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.docks;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.jboss.errai.ioc.client.api.ManagedInstance;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.widgets.client.docks.AbstractWorkbenchDocksHandler;
-import org.kie.workbench.common.widgets.client.docks.WorkbenchDocksHandler;
-import org.mockito.Mock;
-import org.uberfire.client.workbench.docks.UberfireDock;
-import org.uberfire.client.workbench.docks.UberfireDockPosition;
-import org.uberfire.client.workbench.docks.UberfireDocks;
-import org.uberfire.mvp.Command;
-import org.uberfire.mvp.PlaceRequest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class KogitoEditorDockTest {
-
-    public static final String AUTHORING_PERSPECTIVE = "authoring";
-
-    @Mock
-    private UberfireDocks uberfireDocks;
-
-    @Mock
-    private PlaceRequest placeRequest;
-
-    @Mock
-    private ManagedInstance<WorkbenchDocksHandler> handlers;
-
-    private KogitoEditorDock kogitoEditorDockSpy;
-
-    private TestWorkbenchDocksHandler handler;
-
-    @Before
-    public void setup() {
-        handler = spy(createNewWorkbenchDocksHandler());
-
-        List<WorkbenchDocksHandler> list = new ArrayList<>();
-        list.add(handler);
-        when(handlers.iterator()).thenReturn(list.iterator());
-
-        kogitoEditorDockSpy = spy(new KogitoEditorDock(uberfireDocks, handlers));
-
-        kogitoEditorDockSpy.initialize();
-
-        verify(handlers).iterator();
-        verify(handler, times(1)).init(isA(Command.class));
-
-        assertFalse(kogitoEditorDockSpy.isSetup());
-
-        kogitoEditorDockSpy.setup(AUTHORING_PERSPECTIVE, placeRequest);
-
-        assertTrue(kogitoEditorDockSpy.isSetup());
-    }
-
-    @Test
-    public void expandAuthoringDockEmpty() {
-        kogitoEditorDockSpy.expandAuthoringDock(null);
-
-        verify(uberfireDocks, times(1)).show(UberfireDockPosition.EAST);
-        verify(uberfireDocks, never()).open(any());
-    }
-
-    @Test
-    public void expandAuthoringDock() {
-        final UberfireDock dockToOpen = mock(UberfireDock.class);
-        kogitoEditorDockSpy.expandAuthoringDock(dockToOpen);
-
-        verify(uberfireDocks, times(1)).show(UberfireDockPosition.EAST);
-        verify(uberfireDocks, times(1)).open(dockToOpen);
-    }
-
-    @Test
-    public void setActiveHandler() {
-        kogitoEditorDockSpy.setActiveHandler(handler);
-        assertSame(kogitoEditorDockSpy.activeHandler, handler);
-        verify(handler, times(1)).provideDocks(AUTHORING_PERSPECTIVE);
-        assertEquals(2, kogitoEditorDockSpy.activeDocks.length);
-        verify(uberfireDocks, never()).remove(any());
-        verify(uberfireDocks, times(1)).add(isA(UberfireDock.class), isA(UberfireDock.class));
-        verify(uberfireDocks, times(1)).show(UberfireDockPosition.EAST);
-    }
-
-    @Test
-    public void setActiveHandlerWithSameActiveHandlerToRefresh() {
-        kogitoEditorDockSpy.activeHandler = handler;
-        handler.refresh(true, false);
-        kogitoEditorDockSpy.setActiveHandler(handler);
-        assertSame(kogitoEditorDockSpy.activeHandler, handler);
-        verify(handler, atLeastOnce()).provideDocks(AUTHORING_PERSPECTIVE);
-        assertEquals(2, kogitoEditorDockSpy.activeDocks.length);
-        verify(uberfireDocks, atLeastOnce()).remove(any());
-        verify(uberfireDocks, atLeastOnce()).add(isA(UberfireDock.class), isA(UberfireDock.class));
-        verify(uberfireDocks, atLeastOnce()).show(UberfireDockPosition.EAST);
-    }
-
-    @Test
-    public void setActiveHandlerWithSameActiveHandlerToNotRefresh() {
-        kogitoEditorDockSpy.activeHandler = handler;
-        handler.refresh(false, false);
-        kogitoEditorDockSpy.setActiveHandler(handler);
-        verify(handler, never()).provideDocks(any());
-        verify(uberfireDocks, never()).remove(any());
-        verify(uberfireDocks, never()).add(any());
-        verify(uberfireDocks, never()).show(any());
-    }
-
-    @Test
-    public void setActiveHandlerWithActiveDock() {
-        UberfireDock activeDock = mock(UberfireDock.class);
-        UberfireDock[] activeDocks = new UberfireDock[]{activeDock};
-        kogitoEditorDockSpy.activeDocks = activeDocks;
-        kogitoEditorDockSpy.setActiveHandler(handler);
-        assertSame(kogitoEditorDockSpy.activeHandler, handler);
-        verify(handler, atLeastOnce()).provideDocks(AUTHORING_PERSPECTIVE);
-        assertEquals(2, kogitoEditorDockSpy.activeDocks.length);
-        verify(uberfireDocks, times(1)).remove(activeDock);
-        verify(uberfireDocks, times(1)).add(isA(UberfireDock.class), isA(UberfireDock.class));
-        verify(uberfireDocks, times(1)).show(UberfireDockPosition.EAST);
-    }
-
-    @Test
-    public void setActiveHandlerShouldDisableDock() {
-        handler.refresh(false, true);
-        kogitoEditorDockSpy.setActiveHandler(handler);
-        assertSame(kogitoEditorDockSpy.activeHandler, handler);
-        verify(handler, never()).provideDocks(any());
-        verify(uberfireDocks, never()).remove(kogitoEditorDockSpy.activeDocks);
-        verify(uberfireDocks, never()).add(any(), any());
-        verify(uberfireDocks, never()).show(any());
-    }
-
-    private TestWorkbenchDocksHandler createNewWorkbenchDocksHandler() {
-        List<UberfireDock> docks = new ArrayList<>();
-
-        docks.add(new UberfireDock(UberfireDockPosition.EAST,
-                                   "RANDOM",
-                                   placeRequest));
-        docks.add(new UberfireDock(UberfireDockPosition.EAST,
-                                   "RANDOM",
-                                   placeRequest));
-
-        return new TestWorkbenchDocksHandler(docks);
-    }
-
-    public class TestWorkbenchDocksHandler extends AbstractWorkbenchDocksHandler {
-
-        private List<UberfireDock> docks;
-
-        public TestWorkbenchDocksHandler(List<UberfireDock> docks) {
-            this.docks = docks;
-        }
-
-        @Override
-        public Collection<UberfireDock> provideDocks(String perspectiveIdentifier) {
-            return docks;
-        }
-
-        public void refresh(boolean shouldRefresh,
-                            boolean shouldDisable) {
-            refreshDocks(shouldRefresh,
-                         shouldDisable);
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/ScenarioSimulationEditorKogitoWrapperTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/ScenarioSimulationEditorKogitoWrapperTest.java
deleted file mode 100644
index c363753..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/ScenarioSimulationEditorKogitoWrapperTest.java
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.editor;
-
-import java.lang.reflect.Field;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import elemental2.promise.Promise;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.scenariosimulation.api.model.Settings;
-import org.drools.workbench.scenariosimulation.kogito.marshaller.js.callbacks.SCESIMMarshallCallback;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationEditorPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationView;
-import org.drools.workbench.screens.scenariosimulation.client.editor.strategies.DataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridPanel;
-import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridWidget;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.KogitoScenarioSimulationBuilder;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.model.KogitoDMNModel;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmo.KogitoAsyncPackageDataModelOracle;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.editor.strategies.KogitoDMNDataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.editor.strategies.KogitoDMODataManagementStrategy;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.handlers.ScenarioSimulationKogitoDocksHandler;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.popup.ScenarioSimulationKogitoCreationPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.services.ScenarioSimulationKogitoDMNMarshallerService;
-import org.gwtbootstrap3.client.ui.NavTabs;
-import org.gwtbootstrap3.client.ui.TabListItem;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.ui.client.local.spi.TranslationService;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.kogito.client.editor.MultiPageEditorContainerPresenter;
-import org.kie.workbench.common.kogito.client.editor.MultiPageEditorContainerView;
-import org.kie.workbench.common.kogito.client.resources.i18n.KogitoClientConstants;
-import org.kie.workbench.common.widgets.client.docks.AuthoringEditorDock;
-import org.kie.workbench.common.widgets.client.errorpage.ErrorPage;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.uberfire.backend.vfs.ObservablePath;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.backend.vfs.PathFactory;
-import org.uberfire.client.callbacks.Callback;
-import org.uberfire.client.promise.Promises;
-import org.uberfire.client.views.pfly.multipage.MultiPageEditorViewImpl;
-import org.uberfire.client.workbench.widgets.multipage.MultiPageEditor;
-import org.uberfire.client.workbench.widgets.multipage.Page;
-import org.uberfire.mvp.Command;
-import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.workbench.events.NotificationEvent;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.BDDMockito.willThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationEditorKogitoWrapperTest {
-
-    private static final String JSON_MODEL = "jsonModel";
-
-    @Mock
-    private Promise.PromiseExecutorCallbackFn.ResolveCallbackFn<String> resolveCallBackMock;
-    @Mock
-    private Promises promisesMock;
-    @Mock
-    private ScenarioSimulationEditorPresenter scenarioSimulationEditorPresenterMock;
-    @Mock
-    private ScenarioSimulationView scenarioSimulationViewMock;
-    @Mock
-    private ErrorPage errorPageMock;
-    @Mock
-    private ScenarioSimulationModel scenarioSimulationModelMock;
-    @Mock
-    private ScenarioSimulationContext scenarioSimulationContextMock;
-    @Mock
-    private Settings settingsMock;
-    @Mock
-    private ScenarioGridPanel simulationGridPanelMock;
-    @Mock
-    private ScenarioGridPanel backgroundGridPanelMock;
-    @Mock
-    private ScenarioGridWidget scenarioGridWidgetMock;
-    @Mock
-    private MultiPageEditorContainerView multiPageEditorContainerViewMock;
-    @Mock
-    private MultiPageEditor multiPageEditorMock;
-    @Mock
-    private MultiPageEditorViewImpl multiPageEditorViewMock;
-    @Mock
-    private TranslationService translationServiceMock;
-    @Mock
-    private NavTabs navBarsMock;
-    @Mock
-    private TabListItem editorItemMock;
-    @Mock
-    private TabListItem backgroundItemMock;
-    @Mock
-    private ScenarioSimulationKogitoCreationPopupPresenter scenarioSimulationKogitoCreationPopupPresenterMock;
-    @Mock
-    private KogitoScenarioSimulationBuilder kogitoScenarioSimulationBuilderMock;
-    @Mock
-    private KogitoAsyncPackageDataModelOracle kogitoAsyncPackageDataModelOracleMock;
-    @Mock
-    private Promise.PromiseExecutorCallbackFn.ResolveCallbackFn<Void> resolveCallbackFnMock;
-    @Mock
-    private Promise.PromiseExecutorCallbackFn.RejectCallbackFn rejectCallbackFnMock;
-    @Mock
-    private PlaceRequest placeRequestMock;
-    @Mock
-    private ScenarioSimulationKogitoDocksHandler scenarioSimulationKogitoDocksHandlerMock;
-    @Mock
-    private AuthoringEditorDock authoringEditorDockMock;
-    @Mock
-    private ScenarioSimulationKogitoDMNMarshallerService scenarioSimulationKogitoDMNMarshallerServiceMock;
-    @Captor
-    private ArgumentCaptor<DataManagementStrategy> dataManagementStrategyCaptor;
-    @Captor
-    private ArgumentCaptor<Page> pageCaptor;
-    @Captor
-    private ArgumentCaptor<Callback<ScenarioSimulationModel>> callbackArgumentCaptor;
-    @Captor
-    private ArgumentCaptor<ErrorCallback<Object>> errorCallbackArgumentCaptor;
-    @Captor
-    private ArgumentCaptor<Path> pathArgumentCaptor;
-    @Captor
-    private ArgumentCaptor<Promise.PromiseExecutorCallbackFn> promiseExecutorCallbackFnArgumentCaptor;
-
-    private ScenarioSimulationEditorKogitoWrapper scenarioSimulationEditorKogitoWrapperSpy;
-    private Path path = PathFactory.newPath("file.scesim", "path/");
-
-    @Before
-    public void setup() {
-        when(scenarioSimulationEditorPresenterMock.getModel()).thenReturn(scenarioSimulationModelMock);
-        when(scenarioSimulationEditorPresenterMock.getView()).thenReturn(scenarioSimulationViewMock);
-        when(scenarioSimulationModelMock.getSettings()).thenReturn(settingsMock);
-        when(scenarioSimulationEditorPresenterMock.getContext()).thenReturn(scenarioSimulationContextMock);
-        when(scenarioSimulationContextMock.getScenarioGridPanelByGridWidget(GridWidget.SIMULATION)).thenReturn(simulationGridPanelMock);
-        when(scenarioSimulationContextMock.getScenarioGridPanelByGridWidget(GridWidget.BACKGROUND)).thenReturn(backgroundGridPanelMock);
-        when(multiPageEditorContainerViewMock.getMultiPage()).thenReturn(multiPageEditorMock);
-        when(multiPageEditorMock.asWidget()).thenReturn(multiPageEditorViewMock);
-        when(multiPageEditorViewMock.getTabBar()).thenReturn(navBarsMock);
-        when(navBarsMock.getWidget(1)).thenReturn(editorItemMock);
-        when(navBarsMock.getWidget(2)).thenReturn(backgroundItemMock);
-        when(scenarioSimulationKogitoCreationPopupPresenterMock.getSelectedPath()).thenReturn("selected");
-        when(translationServiceMock.getTranslation(KogitoClientConstants.KieEditorWrapperView_EditTabTitle)).thenReturn(KogitoClientConstants.KieEditorWrapperView_EditTabTitle);
-        scenarioSimulationEditorKogitoWrapperSpy = spy(new ScenarioSimulationEditorKogitoWrapper() {
-            {
-                this.scenarioSimulationEditorPresenter = scenarioSimulationEditorPresenterMock;
-                this.promises = promisesMock;
-                this.kogitoOracle = kogitoAsyncPackageDataModelOracleMock;
-                this.translationService = translationServiceMock;
-                this.scenarioSimulationKogitoCreationPopupPresenter = scenarioSimulationKogitoCreationPopupPresenterMock;
-                this.scenarioSimulationBuilder = kogitoScenarioSimulationBuilderMock;
-                this.authoringWorkbenchDocks = authoringEditorDockMock;
-                this.scenarioSimulationKogitoDocksHandler = scenarioSimulationKogitoDocksHandlerMock;
-                this.scenarioSimulationKogitoDMNMarshallerService = scenarioSimulationKogitoDMNMarshallerServiceMock;
-                this.errorPage = errorPageMock;
-            }
-
-            @Override
-            public MultiPageEditorContainerView getWidget() {
-                return multiPageEditorContainerViewMock;
-            }
-
-            @Override
-            protected void marshallContent(ScenarioSimulationModel scenarioSimulationModel, Promise.PromiseExecutorCallbackFn.ResolveCallbackFn<String> resolveCallbackFn) {
-                // JSInterops logic, can't be tested
-            }
-
-            @Override
-            protected void resetEditorPages() {
-                //Do nothing
-            }
-        });
-    }
-
-    @Test
-    public void getContent() {
-        scenarioSimulationEditorKogitoWrapperSpy.getContent();
-        verify(promisesMock, times(1)).create(promiseExecutorCallbackFnArgumentCaptor.capture());
-        promiseExecutorCallbackFnArgumentCaptor.getValue().onInvoke(resolveCallBackMock, rejectCallbackFnMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).prepareContent(resolveCallBackMock, rejectCallbackFnMock);
-    }
-
-    @Test
-    public void manageContent() {
-        scenarioSimulationEditorKogitoWrapperSpy.manageContent("path/file.scesim", "value", resolveCallbackFnMock, rejectCallbackFnMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, never()).showScenarioSimulationCreationPopup(any());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).gotoPath(pathArgumentCaptor.capture());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).unmarshallContent("value");
-        assertEquals("file.scesim", pathArgumentCaptor.getValue().getFileName());
-        assertEquals("path/", pathArgumentCaptor.getValue().toURI());
-    }
-
-    @Test
-    public void prepareContent() {
-        scenarioSimulationEditorKogitoWrapperSpy.prepareContent(resolveCallBackMock, rejectCallbackFnMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).synchronizeColumnsDimension(simulationGridPanelMock, backgroundGridPanelMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).marshallContent(scenarioSimulationModelMock, resolveCallBackMock);
-        verify(scenarioSimulationEditorPresenterMock, never()).sendNotification(any(), any());
-    }
-
-    @Test
-    public void prepareContent_Exception() {
-        willThrow(RuntimeException.class).given(scenarioSimulationEditorKogitoWrapperSpy).marshallContent(any(), any());
-        scenarioSimulationEditorKogitoWrapperSpy.prepareContent(resolveCallBackMock, rejectCallbackFnMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).synchronizeColumnsDimension(simulationGridPanelMock, backgroundGridPanelMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).marshallContent(scenarioSimulationModelMock, resolveCallBackMock);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).sendNotification(any(), eq(NotificationEvent.NotificationType.ERROR));
-    }
-
-    @Test
-    public void manageContentFileWithoutPath() {
-        scenarioSimulationEditorKogitoWrapperSpy.manageContent("file.scesim", "value", resolveCallbackFnMock, rejectCallbackFnMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, never()).showScenarioSimulationCreationPopup(any());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).gotoPath(pathArgumentCaptor.capture());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).unmarshallContent("value");
-        assertEquals("file.scesim", pathArgumentCaptor.getValue().getFileName());
-        assertEquals("/", pathArgumentCaptor.getValue().toURI());
-    }
-
-    @Test
-    public void manageContentNullPath() {
-        scenarioSimulationEditorKogitoWrapperSpy.manageContent("", "value", resolveCallbackFnMock, rejectCallbackFnMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, never()).showScenarioSimulationCreationPopup(any());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).gotoPath(pathArgumentCaptor.capture());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).unmarshallContent("value");
-        assertEquals("new-file.scesim", pathArgumentCaptor.getValue().getFileName());
-        assertEquals("/", pathArgumentCaptor.getValue().toURI());
-    }
-
-    @Test
-    public void manageContentNullContentAndPath() {
-        scenarioSimulationEditorKogitoWrapperSpy.manageContent(null, null, resolveCallbackFnMock, rejectCallbackFnMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).showScenarioSimulationCreationPopup(pathArgumentCaptor.capture());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, never()).gotoPath(any());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, never()).unmarshallContent(any());
-        assertEquals("new-file.scesim", pathArgumentCaptor.getValue().getFileName());
-        assertEquals("/", pathArgumentCaptor.getValue().toURI());
-    }
-
-    @Test
-    public void manageContentNullContent() {
-        scenarioSimulationEditorKogitoWrapperSpy.manageContent("path/file.scesim", null, resolveCallbackFnMock, rejectCallbackFnMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).showScenarioSimulationCreationPopup(pathArgumentCaptor.capture());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, never()).gotoPath(any());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, never()).unmarshallContent(any());
-        assertEquals("file.scesim", pathArgumentCaptor.getValue().getFileName());
-        assertEquals("path/", pathArgumentCaptor.getValue().toURI());
-    }
-
-    @Test
-    public void manageContentWithPathAndNullContent() {
-        scenarioSimulationEditorKogitoWrapperSpy.manageContent("path/file.scesim", null, resolveCallbackFnMock, rejectCallbackFnMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).showScenarioSimulationCreationPopup(pathArgumentCaptor.capture());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, never()).gotoPath(any());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, never()).unmarshallContent(any());
-        assertEquals("file.scesim", pathArgumentCaptor.getValue().getFileName());
-        assertEquals("path/", pathArgumentCaptor.getValue().toURI());
-    }
-
-    @Test
-    public void manageContentWithException() {
-        willThrow(new IllegalStateException("Error message")).given(scenarioSimulationEditorKogitoWrapperSpy).unmarshallContent(any());
-        scenarioSimulationEditorKogitoWrapperSpy.manageContent("path/file.scesim", "value", resolveCallbackFnMock, rejectCallbackFnMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, never()).showScenarioSimulationCreationPopup(any());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).gotoPath(pathArgumentCaptor.capture());
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).unmarshallContent("value");
-        verify(errorPageMock).setErrorContent("Error message");
-        verify(errorPageMock).setTitle(ScenarioSimulationEditorConstants.INSTANCE.scenarioParsingError());
-        verify(errorPageMock).setContent(ScenarioSimulationEditorConstants.INSTANCE.scenarioParsingErrorContent());
-        verify(scenarioSimulationViewMock).setContentWidget(errorPageMock);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).hideDocks();
-        verify(scenarioSimulationViewMock, times(1)).setScenarioTabBarVisibility(false);
-        verify(rejectCallbackFnMock, times(1)).onInvoke("Error message");
-    }
-
-    @Test
-    public void onEditTabSelected() {
-        scenarioSimulationEditorKogitoWrapperSpy.onEditTabSelected();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).onEditTabSelected();
-    }
-
-    @Test
-    public void onStartup() throws IllegalAccessException, NoSuchFieldException {
-        final Field field = MultiPageEditorContainerPresenter.class.getDeclaredField("multiPageEditorContainerView");
-        field.setAccessible(true);
-        field.set(scenarioSimulationEditorKogitoWrapperSpy, multiPageEditorContainerViewMock);
-
-        scenarioSimulationEditorKogitoWrapperSpy.onStartup(placeRequestMock);
-        verify(authoringEditorDockMock, times(1)).setup("AuthoringPerspective", placeRequestMock);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).setWrapper(scenarioSimulationEditorKogitoWrapperSpy);
-    }
-
-    @Test
-    public void gotoPath() {
-        scenarioSimulationEditorKogitoWrapperSpy.gotoPath(path);
-        verify(kogitoAsyncPackageDataModelOracleMock, times(1)).init(path);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).setPath(isA(ObservablePath.class));
-        assertEquals(path, scenarioSimulationEditorKogitoWrapperSpy.getCurrentPath());
-    }
-
-    @Test
-    public void getJSInteropMarshallCallback() {
-        SCESIMMarshallCallback callback = scenarioSimulationEditorKogitoWrapperSpy.getJSInteropMarshallCallback(resolveCallBackMock);
-        callback.callEvent("xmlString");
-        verify(resolveCallBackMock, times(1)).onInvoke("xmlString");
-    }
-
-    @Test
-    public void getModelSuccessCallbackMethodRule() {
-        when(settingsMock.getType()).thenReturn(ScenarioSimulationModel.Type.RULE);
-        when(scenarioSimulationEditorPresenterMock.getJsonModel(scenarioSimulationModelMock)).thenReturn(JSON_MODEL);
-        scenarioSimulationEditorKogitoWrapperSpy.onModelSuccessCallbackMethod(scenarioSimulationModelMock);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).sendNotification(ScenarioSimulationEditorConstants.INSTANCE.ruleScenarioNotSupportedNotification(), NotificationEvent.NotificationType.WARNING, false);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).setPackageName(ScenarioSimulationEditorKogitoWrapper.DEFAULT_PACKAGE);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).getModelSuccessCallbackMethod(dataManagementStrategyCaptor.capture(), eq(scenarioSimulationModelMock));
-        assertTrue(dataManagementStrategyCaptor.getValue() instanceof KogitoDMODataManagementStrategy);
-        verify(scenarioSimulationViewMock, times(1)).setScenarioGridWidgetAsContent();
-        verify(scenarioSimulationViewMock, times(1)).setScenarioTabBarVisibility(true);
-    }
-
-    @Test
-    public void getModelSuccessCallbackMethodDMN() {
-        when(settingsMock.getType()).thenReturn(ScenarioSimulationModel.Type.DMN);
-        when(scenarioSimulationEditorPresenterMock.getJsonModel(scenarioSimulationModelMock)).thenReturn(JSON_MODEL);
-        scenarioSimulationEditorKogitoWrapperSpy.onModelSuccessCallbackMethod(scenarioSimulationModelMock);
-        verify(scenarioSimulationEditorPresenterMock, never()).sendNotification(any(), any(), anyBoolean());
-        verify(scenarioSimulationEditorPresenterMock, times(1)).setPackageName(ScenarioSimulationEditorKogitoWrapper.DEFAULT_PACKAGE);
-        verify(scenarioSimulationEditorPresenterMock, times(1)).getModelSuccessCallbackMethod(dataManagementStrategyCaptor.capture(), eq(scenarioSimulationModelMock));
-        assertTrue(dataManagementStrategyCaptor.getValue() instanceof KogitoDMNDataManagementStrategy);
-        verify(scenarioSimulationViewMock, times(1)).setScenarioGridWidgetAsContent();
-        verify(scenarioSimulationViewMock, times(1)).setScenarioTabBarVisibility(true);
-    }
-
-    @Test
-    public void addBackgroundPage() {
-        scenarioSimulationEditorKogitoWrapperSpy.addBackgroundPage(scenarioGridWidgetMock);
-        verify(scenarioSimulationEditorKogitoWrapperSpy.getWidget().getMultiPage(), times(1)).addPage(pageCaptor.capture());
-        pageCaptor.getValue().onFocus();
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).onBackgroundTabSelected();
-        assertEquals(ScenarioSimulationEditorConstants.INSTANCE.backgroundTabTitle(), pageCaptor.getValue().getLabel());
-    }
-
-    @Test
-    public void onBackgroundTabSelected() {
-        scenarioSimulationEditorKogitoWrapperSpy.onBackgroundTabSelected();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).onBackgroundTabSelected();
-    }
-
-    @Test
-    public void showScenarioSimulationCreationPopup() {
-        scenarioSimulationEditorKogitoWrapperSpy.showScenarioSimulationCreationPopup(path);
-        verify(scenarioSimulationKogitoCreationPopupPresenterMock, times(1)).show(eq(ScenarioSimulationEditorConstants.INSTANCE.addScenarioSimulation()),
-                                                                                  isA(Command.class));
-    }
-
-    @Test
-    public void newFileEmptySelectedType() {
-        Command command = scenarioSimulationEditorKogitoWrapperSpy.createNewFileCommand(path);
-        command.execute();
-        verify(scenarioSimulationKogitoCreationPopupPresenterMock, times(1)).getSelectedType();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).sendNotification(ScenarioSimulationEditorConstants.INSTANCE.missingSelectedType(),
-                                                                                 NotificationEvent.NotificationType.ERROR,
-                                                                                 false);
-        verify(kogitoScenarioSimulationBuilderMock, never()).populateScenarioSimulationModelDMN(any(), any(), any());
-        verify(kogitoScenarioSimulationBuilderMock, never()).populateScenarioSimulationModelRULE(any(), any());
-    }
-
-    @Test
-    public void newFileEmptySelectedDMNPath() {
-        when(scenarioSimulationKogitoCreationPopupPresenterMock.getSelectedPath()).thenReturn(null);
-        when(scenarioSimulationKogitoCreationPopupPresenterMock.getSelectedType()).thenReturn(ScenarioSimulationModel.Type.DMN);
-        Command command = scenarioSimulationEditorKogitoWrapperSpy.createNewFileCommand(path);
-        command.execute();
-        verify(scenarioSimulationKogitoCreationPopupPresenterMock, times(1)).getSelectedType();
-        verify(scenarioSimulationEditorPresenterMock, times(1)).sendNotification(ScenarioSimulationEditorConstants.INSTANCE.missingDmnPath(),
-                                                                                 NotificationEvent.NotificationType.ERROR,
-                                                                                 false);
-        verify(kogitoScenarioSimulationBuilderMock, never()).populateScenarioSimulationModelDMN(any(), any(), any());
-        verify(kogitoScenarioSimulationBuilderMock, never()).populateScenarioSimulationModelRULE(any(), any());
-    }
-
-    @Test
-    public void newFileRule() {
-        ScenarioSimulationModel model = mock(ScenarioSimulationModel.class);
-        when(scenarioSimulationKogitoCreationPopupPresenterMock.getSelectedType()).thenReturn(ScenarioSimulationModel.Type.RULE);
-        Mockito.doNothing().when(scenarioSimulationEditorKogitoWrapperSpy).onModelSuccessCallbackMethod(model);
-        Command command = scenarioSimulationEditorKogitoWrapperSpy.createNewFileCommand(path);
-        command.execute();
-        verify(scenarioSimulationKogitoCreationPopupPresenterMock, times(1)).getSelectedType();
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).gotoPath(path);
-        verify(kogitoScenarioSimulationBuilderMock, times(1)).populateScenarioSimulationModelRULE(eq(""),
-                                                                                                  callbackArgumentCaptor.capture());
-        callbackArgumentCaptor.getValue().callback(model);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).onModelSuccessCallbackMethod(model);
-    }
-
-    @Test
-    public void newFileDMN() {
-        ScenarioSimulationModel model = mock(ScenarioSimulationModel.class);
-        when(scenarioSimulationKogitoCreationPopupPresenterMock.getSelectedType()).thenReturn(ScenarioSimulationModel.Type.DMN);
-        Mockito.doNothing().when(scenarioSimulationEditorKogitoWrapperSpy).onModelSuccessCallbackMethod(model);
-        Command command = scenarioSimulationEditorKogitoWrapperSpy.createNewFileCommand(path);
-        command.execute();
-        verify(scenarioSimulationKogitoCreationPopupPresenterMock, times(1)).getSelectedType();
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).gotoPath(path);
-        verify(kogitoScenarioSimulationBuilderMock, times(1)).populateScenarioSimulationModelDMN(eq("selected"),
-                                                                                                 callbackArgumentCaptor.capture(),
-                                                                                                 errorCallbackArgumentCaptor.capture());
-        callbackArgumentCaptor.getValue().callback(model);
-        verify(scenarioSimulationEditorKogitoWrapperSpy, times(1)).onModelSuccessCallbackMethod(model);
-        errorCallbackArgumentCaptor.getValue().error("message", new Exception());
-        verify(scenarioSimulationEditorPresenterMock, times(1)).sendNotification(ScenarioSimulationEditorConstants.INSTANCE.dmnPathErrorDetailedLabel("selected", "message"),
-                                                                                 NotificationEvent.NotificationType.ERROR,
-                                                                                 false);
-    }
-
-    @Test
-    public void getScenarioSimulationDocksHandler() {
-        assertEquals(scenarioSimulationKogitoDocksHandlerMock,
-                     scenarioSimulationEditorKogitoWrapperSpy.getScenarioSimulationDocksHandler());
-    }
-
-    @Test
-    public void getScenarioSimulationEditorPresenter() {
-        assertEquals(scenarioSimulationEditorPresenterMock,
-                     scenarioSimulationEditorKogitoWrapperSpy.getScenarioSimulationEditorPresenter());
-    }
-
-    @Test
-    public void getDMNMetadata() {
-        when(settingsMock.getDmnFilePath()).thenReturn("src/test.dmn");
-        ArgumentCaptor<Path> pathArgumentCaptor = ArgumentCaptor.forClass(Path.class);
-        ArgumentCaptor<Callback> callbackArgumentCaptor = ArgumentCaptor.forClass(Callback.class);
-        scenarioSimulationEditorKogitoWrapperSpy.getDMNMetadata();
-        verify(scenarioSimulationKogitoDMNMarshallerServiceMock, times(1)).getDMNContent(pathArgumentCaptor.capture(),
-                                                                                         callbackArgumentCaptor.capture(),
-                                                                                         isA(ErrorCallback.class));
-        assertEquals("src/test.dmn", pathArgumentCaptor.getValue().toURI());
-        assertEquals("test.dmn", pathArgumentCaptor.getValue().getFileName());
-        KogitoDMNModel returnCallback = mock(KogitoDMNModel.class);
-        when(returnCallback.getNamespace()).thenReturn("DMN-NAMESPACE");
-        when(returnCallback.getName()).thenReturn("DMN-Name");
-        callbackArgumentCaptor.getValue().callback(returnCallback);
-        verify(settingsMock, times(1)).setDmnNamespace("DMN-NAMESPACE");
-        verify(settingsMock, times(1)).setDmnName("DMN-Name");
-        verify(scenarioSimulationEditorPresenterMock, times(1)).reloadSettingsDock();
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/strategies/KogitoDMNDataManagementStrategyTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/strategies/KogitoDMNDataManagementStrategyTest.java
deleted file mode 100644
index 5da30f7..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/strategies/KogitoDMNDataManagementStrategyTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.editor.strategies;
-
-import java.util.Collections;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.editor.ScenarioSimulationEditorPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsPresenter;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.ScenarioSimulationKogitoDMNDataManager;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.model.KogitoDMNModel;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.services.ScenarioSimulationKogitoDMNMarshallerService;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTuple;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITDefinitions;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.backend.vfs.PathFactory;
-import org.uberfire.client.callbacks.Callback;
-import org.uberfire.workbench.events.NotificationEvent;
-
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class KogitoDMNDataManagementStrategyTest {
-
-    @Mock
-    private EventBus eventBusMock;
-    @Mock
-    private ScenarioSimulationEditorPresenter scenarioSimulationEditorPresenterMock;
-    @Mock
-    private ScenarioSimulationKogitoDMNDataManager kogitoDMNDataManagerMock;
-    @Mock
-    private ScenarioSimulationKogitoDMNMarshallerService dmnMarshallerServiceMock;
-    @Mock
-    private ScenarioSimulationContext scenarioSimulationContextMock;
-    @Mock
-    private TestToolsPresenter testToolsPresenterMock;
-    @Mock
-    private GridWidget gridWidgetMock;
-    @Mock
-    private JSITDefinitions jsitDefinitionsMock;
-    @Mock
-    private FactModelTuple factModelTupleMock;
-    @Mock
-    private RemoteCallback<FactModelTuple> factModelTupleRemoteCallbackMock;
-    @Captor
-    private ArgumentCaptor<Callback<KogitoDMNModel>> callbackArgumentCaptor;
-    @Captor
-    private ArgumentCaptor<ErrorCallback<Object>> errorCallbackArgumentCaptor;
-
-    private KogitoDMNModel kogitoDMNModel;
-    private KogitoDMNDataManagementStrategy kogitoDMNDataManagementStrategySpy;
-
-    @Before
-    public void setup() {
-        kogitoDMNModel = new KogitoDMNModel(jsitDefinitionsMock, Collections.emptyMap());
-        kogitoDMNDataManagementStrategySpy = spy(new KogitoDMNDataManagementStrategy(kogitoDMNDataManagerMock, dmnMarshallerServiceMock, scenarioSimulationEditorPresenterMock) {
-            {
-                this.dmnFilePath = "path/dmnFile.dmn";
-            }
-        });
-        when(kogitoDMNDataManagementStrategySpy.getSuccessCallback(testToolsPresenterMock, scenarioSimulationContextMock, gridWidgetMock)).thenReturn(factModelTupleRemoteCallbackMock);
-        when(kogitoDMNDataManagerMock.getFactModelTuple(kogitoDMNModel)).thenReturn(factModelTupleMock);
-        when(scenarioSimulationEditorPresenterMock.getEventBus()).thenReturn(eventBusMock);
-    }
-
-    @Test
-    public void retrieveFactModelTuple() {
-        kogitoDMNDataManagementStrategySpy.retrieveFactModelTuple(testToolsPresenterMock, scenarioSimulationContextMock, gridWidgetMock);
-        Path expectedPath = new PathFactory.PathImpl("dmnFile.dmn", "path/dmnFile.dmn");
-        verify(dmnMarshallerServiceMock, times(1)).getDMNContent(eq(expectedPath), callbackArgumentCaptor.capture(), errorCallbackArgumentCaptor.capture());
-
-        callbackArgumentCaptor.getValue().callback(kogitoDMNModel);
-        verify(kogitoDMNDataManagerMock, times(1)).getFactModelTuple(kogitoDMNModel);
-        verify(kogitoDMNDataManagementStrategySpy, times(1)).getSuccessCallback(testToolsPresenterMock, scenarioSimulationContextMock, gridWidgetMock);
-        verify(factModelTupleRemoteCallbackMock, times(1)).callback(factModelTupleMock);
-
-        errorCallbackArgumentCaptor.getValue().error("Error Message", new Exception());
-        verify(scenarioSimulationEditorPresenterMock, times(1)).sendNotification(anyString(), eq(NotificationEvent.NotificationType.ERROR), eq(false));
-        verify(scenarioSimulationEditorPresenterMock, times(1)).expandSettingsDock();
-   }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/strategies/KogitoDMODataManagementStrategyTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/strategies/KogitoDMODataManagementStrategyTest.java
deleted file mode 100644
index 01ec1e9..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/editor/strategies/KogitoDMODataManagementStrategyTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.editor.strategies;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.enums.GridWidget;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.rightpanel.TestToolsView;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmo.KogitoAsyncPackageDataModelOracle;
-import org.drools.workbench.screens.scenariosimulation.model.dmo.ModelField;
-import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class KogitoDMODataManagementStrategyTest {
-
-    private static final String FACT_NAME = "factName";
-
-    @Mock
-    private KogitoAsyncPackageDataModelOracle oracleMock;
-    @Mock
-    private ScenarioSimulationContext scenarioSimulationContextMock;
-    @Mock
-    private TestToolsPresenter testToolsPresenterMock;
-    @Mock
-    private FactModelTree factModelTreeMock;
-    @Mock
-    private GridWidget gridWidgetMock;
-
-    private KogitoDMODataManagementStrategy kogitoDMODataManagementStrategySpy;
-
-    @Before
-    public void setup() {
-        kogitoDMODataManagementStrategySpy = spy(new KogitoDMODataManagementStrategy(oracleMock) {
-            @Override
-            public FactModelTree getFactModelTree(String factName, Map<String, String> superTypeMap, ModelField[] modelFields) {
-                return factModelTreeMock;
-            }
-            @Override
-            public void aggregatorCallbackMethod(TestToolsView.Presenter testToolsPresenter, int expectedElements, SortedMap<String, FactModelTree> factTypeFieldsMap, ScenarioSimulationContext context, FactModelTree result, List<String> simpleJavaTypes, GridWidget gridWidget) {
-                // DO nothing
-            }
-        });
-    }
-
-    @Test
-    public void isADataTypeEmpty() {
-        when(oracleMock.getFactTypes()).thenReturn(new String[0]);
-        assertFalse(kogitoDMODataManagementStrategySpy.isADataType("Test"));
-    }
-
-    @Test
-    public void isADataTypeTrue() {
-        String[] array = {"Test"};
-        when(oracleMock.getFactTypes()).thenReturn(array);
-        assertTrue(kogitoDMODataManagementStrategySpy.isADataType("Test"));
-    }
-
-    @Test
-    public void isADataTypeFalse() {
-        String[] array = {"Est"};
-        when(oracleMock.getFactTypes()).thenReturn(array);
-        assertFalse(kogitoDMODataManagementStrategySpy.isADataType("Test"));
-    }
-
-    @Test
-    public void retrieveFactModelTuple() {
-        String factType = "factType";
-        ModelField[] modelFields = new ModelField[1];
-        when(oracleMock.getFieldCompletions(factType)).thenReturn(modelFields);
-        List<String> dataObjectsType = Arrays.asList(factType);
-        SortedMap<String, FactModelTree> dataObjectsFieldMap = new TreeMap<>();
-        Map<String, String> superTypesMap = Collections.emptyMap();
-        List<String> javaSimpleType = new ArrayList<>();
-        kogitoDMODataManagementStrategySpy.manageDataObjects(dataObjectsType, superTypesMap, testToolsPresenterMock, 1, dataObjectsFieldMap, scenarioSimulationContextMock, javaSimpleType, gridWidgetMock);
-        verify(oracleMock, times(1)).getFieldCompletions(factType);
-        verify(kogitoDMODataManagementStrategySpy, times(1)).getFactModelTree(factType, superTypesMap, modelFields);
-        verify(kogitoDMODataManagementStrategySpy, times(1)).aggregatorCallbackMethod(testToolsPresenterMock, 1, dataObjectsFieldMap, scenarioSimulationContextMock, factModelTreeMock, javaSimpleType, gridWidgetMock);
-    }
-
-    @Test
-    public void getFactTypesEmpty() {
-        when(oracleMock.getFactTypes()).thenReturn(new String[0]);
-        List<String> facts = kogitoDMODataManagementStrategySpy.getFactTypes();
-        assertTrue(facts.isEmpty());
-    }
-
-    @Test
-    public void getFactTypes() {
-        String[] array = {"Test"};
-        when(oracleMock.getFactTypes()).thenReturn(array);
-        List<String> facts = kogitoDMODataManagementStrategySpy.getFactTypes();
-        assertEquals(1, facts.size());
-        assertEquals("Test", facts.get(0));
-    }
-
-    @Test
-    public void skipPopulateTestToolsEmptyArray() {
-        when(oracleMock.getFactTypes()).thenReturn(new String[0]);
-        assertTrue(kogitoDMODataManagementStrategySpy.skipPopulateTestTools());
-    }
-
-    @Test
-    public void skipPopulateTestToolsArrayPopulated() {
-        String[] array = {"Test"};
-        when(oracleMock.getFactTypes()).thenReturn(array);
-        assertFalse(kogitoDMODataManagementStrategySpy.skipPopulateTestTools());
-    }
-
-    @Test
-    public void getFQCNByFactName() {
-        kogitoDMODataManagementStrategySpy.getFQCNByFactName(FACT_NAME);
-        verify(oracleMock, times(1)).getFQCNByFactName(FACT_NAME);
-    }
-
-    @Test
-    public void getParametricFieldType() {
-        kogitoDMODataManagementStrategySpy.getParametricFieldType(FACT_NAME, "propertyName");
-        verify(oracleMock, times(1)).getParametricFieldType(FACT_NAME, "propertyName");
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void getSuperType() {
-        kogitoDMODataManagementStrategySpy.getSuperType("", null);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/handler/ScenarioSimulationKogitoDocksHandlerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/handler/ScenarioSimulationKogitoDocksHandlerTest.java
deleted file mode 100644
index 5f5fa4f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/handler/ScenarioSimulationKogitoDocksHandlerTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.handler;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.handlers.ScenarioSimulationKogitoDocksHandler;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationKogitoDocksHandlerTest {
-
-    private ScenarioSimulationKogitoDocksHandler scenarioSimulationKogitoDocksHandlerSpy;
-
-    @Before
-    public void setup() {
-        scenarioSimulationKogitoDocksHandlerSpy = new ScenarioSimulationKogitoDocksHandler();
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void expandTestResultsDock() {
-        scenarioSimulationKogitoDocksHandlerSpy.expandTestResultsDock();
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupPresenterTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupPresenterTest.java
deleted file mode 100644
index 93cff4b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupPresenterTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.popup;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.uberfire.mvp.Command;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.internal.verification.VerificationModeFactory.times;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationKogitoCreationPopupPresenterTest {
-
-    @Mock
-    private Command okCommandMock;
-    @Mock
-    private ScenarioSimulationKogitoCreationPopupView scenarioSimulationKogitoCreationPopupViewMock;
-
-    private ScenarioSimulationKogitoCreationPopupPresenter scenarioSimulationKogitoCreationPopupPresenterSpy;
-
-    @Before
-    public void setup() {
-        scenarioSimulationKogitoCreationPopupPresenterSpy = spy(new ScenarioSimulationKogitoCreationPopupPresenter() {
-            {
-                scenarioscenarioSimulationCreationPopupView = scenarioSimulationKogitoCreationPopupViewMock;
-            }
-        });
-    }
-
-    @Test
-    public void show() {
-        scenarioSimulationKogitoCreationPopupPresenterSpy.show("title", okCommandMock);
-        verify(scenarioSimulationKogitoCreationPopupViewMock, times(1)).show(eq("title"), eq(okCommandMock));
-    }
-
-    @Test
-    public void hide() {
-        scenarioSimulationKogitoCreationPopupPresenterSpy.hide();
-        verify(scenarioSimulationKogitoCreationPopupViewMock, times(1)).hide();
-    }
-
-    @Test
-    public void getSelectedType() {
-        scenarioSimulationKogitoCreationPopupPresenterSpy.getSelectedType();
-        verify(scenarioSimulationKogitoCreationPopupViewMock, times(1)).getSelectedType();
-    }
-
-    @Test
-    public void getSelectedPath() {
-        scenarioSimulationKogitoCreationPopupPresenterSpy.getSelectedPath();
-        verify(scenarioSimulationKogitoCreationPopupViewMock, times(1)).getSelectedPath();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupViewTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupViewTest.java
deleted file mode 100644
index c5181c4..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/popup/ScenarioSimulationKogitoCreationPopupViewTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.popup;
-
-import java.util.Collections;
-import java.util.Optional;
-
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import elemental2.dom.HTMLDivElement;
-import elemental2.dom.HTMLElement;
-import elemental2.dom.HTMLInputElement;
-import elemental2.dom.HTMLLabelElement;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dropdown.ScenarioSimulationKogitoCreationAssetsDropdown;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.uberfire.client.views.pfly.widgets.Button;
-import org.uberfire.client.views.pfly.widgets.Modal;
-import org.uberfire.mvp.Command;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationKogitoCreationPopupViewTest {
-
-    @Mock
-    private HTMLInputElement dmnButtonMock;
-    @Mock
-    private HTMLInputElement ruleButtonMock;
-    @Mock
-    private HTMLDivElement dmnAssetsDivElementMock;
-    @Mock
-    private Button okButtonMock;
-    @Mock
-    private Button cancelButtonMock;
-    @Mock
-    private HTMLElement cancelButtonElementMock;
-    @Mock
-    private Command okCommandMock;
-    @Mock
-    private ClickEvent clickEventMock;
-    @Mock
-    private ScenarioSimulationKogitoCreationAssetsDropdown scenarioSimulationKogitoCreationAssetsDropdownMock;
-    @Mock
-    private Modal modalMock;
-    @Mock
-    private HTMLElement htmlElementMock;
-    @Mock
-    private HTMLDivElement infoRuleIconDivElementMock;
-    @Mock
-    private HTMLDivElement infoDMNIconDivElementMock;
-    @Mock
-    private HTMLLabelElement sourceTypeLabelElementMock;
-    @Mock
-    private HTMLLabelElement dmnAssetsLabelElementMock;
-    @Captor
-    private ArgumentCaptor<Command> commandArgumentCaptor;
-
-    private ScenarioSimulationKogitoCreationPopupView scenarioSimulationCreationPopupViewSpy;
-
-    @Before
-    public void setup() {
-        scenarioSimulationCreationPopupViewSpy = spy(new ScenarioSimulationKogitoCreationPopupView() {
-            {
-                scenarioSimulationKogitoCreationAssetsDropdown = scenarioSimulationKogitoCreationAssetsDropdownMock;
-                dmnButton = dmnButtonMock;
-                ruleButton = ruleButtonMock;
-                okButton = okButtonMock;
-                cancelButton = cancelButtonMock;
-                dmnAssetsDivElement = dmnAssetsDivElementMock;
-                dmnAssetsLabelElement = dmnAssetsLabelElementMock;
-                sourceTypeLabelElement = sourceTypeLabelElementMock;
-                modal = modalMock;
-                infoRuleIconDivElement = infoRuleIconDivElementMock;
-                infoDMNIconDivElement = infoDMNIconDivElementMock;
-                selectedPath = "";
-            }
-        });
-        when(scenarioSimulationKogitoCreationAssetsDropdownMock.getElement()).thenReturn(htmlElementMock);
-        when(cancelButtonMock.getElement()).thenReturn(cancelButtonElementMock);
-    }
-
-    @Test
-    public void show() {
-        scenarioSimulationCreationPopupViewSpy.show(ScenarioSimulationEditorConstants.INSTANCE.createButton(), okCommandMock);
-        verify(scenarioSimulationCreationPopupViewSpy, times(1)).initialize();
-    }
-
-    @Test
-    public void initialize() {
-        scenarioSimulationCreationPopupViewSpy.initialize();
-        verify(cancelButtonElementMock, times(1)).remove();
-        verify(okButtonMock, times(1)).setEnabled(eq(false));
-        verify(cancelButtonMock, times(1)).setText(eq(ScenarioSimulationEditorConstants.INSTANCE.cancelButton()));
-        verify(dmnAssetsDivElementMock, times(1)).setAttribute(eq(ConstantHolder.HIDDEN), eq(""));
-        verify(dmnAssetsDivElementMock, times(1)).appendChild(eq(dmnAssetsLabelElementMock));
-        verify(infoRuleIconDivElementMock, times(1)).setAttribute(eq("title"), eq(ScenarioSimulationEditorConstants.INSTANCE.currentlyNotAvailable()));
-        verify(infoDMNIconDivElementMock, times(1)).setAttribute(eq("title"), eq(ScenarioSimulationEditorConstants.INSTANCE.supportedDmnVersions()));
-        verify(scenarioSimulationCreationPopupViewSpy, times(1)).initializeDropdown();
-    }
-
-    @Test
-    public void initializeDropdown() {
-        when(scenarioSimulationKogitoCreationAssetsDropdownMock.getValue()).thenReturn(Optional.of(new KieAssetsDropdownItem("text", "subtext", "path/file.dmn", Collections.emptyMap())));
-        scenarioSimulationCreationPopupViewSpy.initializeDropdown();
-        verify(dmnAssetsDivElementMock, times(1)).appendChild(eq(htmlElementMock));
-        verify(scenarioSimulationKogitoCreationAssetsDropdownMock, times(1)).clear();
-        verify(scenarioSimulationKogitoCreationAssetsDropdownMock, times(1)).init();
-        verify(scenarioSimulationKogitoCreationAssetsDropdownMock, times(1)).initializeDropdown();
-        verify(scenarioSimulationKogitoCreationAssetsDropdownMock, times(1)).registerOnChangeHandler(commandArgumentCaptor.capture());
-        commandArgumentCaptor.getValue().execute();
-        verify(scenarioSimulationCreationPopupViewSpy, times(1)).enableCreateButtonForDMNScenario();
-        assertEquals("path/file.dmn", scenarioSimulationCreationPopupViewSpy.selectedPath);
-    }
-
-    @Test
-    public void onDmnClick() {
-        dmnButtonMock.checked = true;
-        scenarioSimulationCreationPopupViewSpy.onDmnClick(clickEventMock);
-        verify(dmnAssetsDivElementMock, times(1)).removeAttribute(eq(ConstantHolder.HIDDEN));
-        verify(scenarioSimulationCreationPopupViewSpy, times(1)).enableCreateButtonForDMNScenario();
-        assertEquals(ScenarioSimulationModel.Type.DMN, scenarioSimulationCreationPopupViewSpy.getSelectedType());
-    }
-
-    @Test
-    public void onRuleClick() {
-        ruleButtonMock.checked = true;
-        scenarioSimulationCreationPopupViewSpy.onRuleClick(clickEventMock);
-        verify(dmnAssetsDivElementMock, times(1)).setAttribute(eq(ConstantHolder.HIDDEN), eq(""));
-        verify(okButtonMock, times(1)).setEnabled(eq(true));
-        assertEquals(ScenarioSimulationModel.Type.RULE, scenarioSimulationCreationPopupViewSpy.getSelectedType());
-    }
-
-    @Test
-    public void enableCreateButtonForDMNScenarioNullPath() {
-        scenarioSimulationCreationPopupViewSpy.enableCreateButtonForDMNScenario();
-        verify(okButtonMock, times(1)).setEnabled(eq(false));
-    }
-
-    @Test
-    public void enableCreateButtonForDMNScenarioEmptyPath() {
-        scenarioSimulationCreationPopupViewSpy.selectedPath = "";
-        scenarioSimulationCreationPopupViewSpy.enableCreateButtonForDMNScenario();
-        verify(okButtonMock, times(1)).setEnabled(eq(false));
-    }
-
-    @Test
-    public void enableCreateButtonForDMNScenarioWithPath() {
-        scenarioSimulationCreationPopupViewSpy.selectedPath = "Path";
-        scenarioSimulationCreationPopupViewSpy.enableCreateButtonForDMNScenario();
-        verify(okButtonMock, times(1)).setEnabled(eq(true));
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/producer/ScenarioSimulationKogitoProducerTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/producer/ScenarioSimulationKogitoProducerTest.java
deleted file mode 100644
index 7ce0182..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/producer/ScenarioSimulationKogitoProducerTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.producer;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioCommandRegistryManager;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext;
-import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationEventHandler;
-import org.drools.workbench.screens.scenariosimulation.client.menu.ScenarioContextMenuRegistry;
-import org.drools.workbench.screens.scenariosimulation.client.producers.EventBusProducer;
-import org.drools.workbench.screens.scenariosimulation.client.producers.ScenarioGridPanelProducer;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.commands.ScenarioSimulationKogitoStateControlManager;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationKogitoProducerTest {
-
-    @Mock
-    private ScenarioSimulationEventHandler scenarioSimulationEventHandlerMock;
-    @Mock
-    private ScenarioSimulationKogitoStateControlManager scenarioSimulationKogitoStateControlManagerMock;
-    @Mock
-    private ScenarioCommandRegistryManager scenarioCommandRegistryManagerMock;
-    @Mock
-    private ScenarioGridPanelProducer scenarioGridPanelProducerMock;
-    @Mock
-    private EventBusProducer eventBusProducerMock;
-    @Mock
-    private ScenarioSimulationContext scenarioSimulationContextMock;
-    @Mock
-    private ScenarioContextMenuRegistry scenarioContextMenuRegistryMock;
-
-    private ScenarioSimulationKogitoProducer scenarioSimulationKogitoProducerSpy;
-
-    @Before
-    public void setup() {
-        scenarioSimulationKogitoProducerSpy = spy(new ScenarioSimulationKogitoProducer() {
-            {
-                this.scenarioSimulationStateControlManager = scenarioSimulationKogitoStateControlManagerMock;
-                this.scenarioCommandRegistryManager = scenarioCommandRegistryManagerMock;
-                this.scenarioGridPanelProducer = scenarioGridPanelProducerMock;
-                this.eventBusProducer = eventBusProducerMock;
-                this.scenarioSimulationEventHandler = scenarioSimulationEventHandlerMock;
-            }
-        });
-        when(scenarioGridPanelProducerMock.getScenarioSimulationContext()).thenReturn(scenarioSimulationContextMock);
-        when(scenarioGridPanelProducerMock.getScenarioContextMenuRegistry()).thenReturn(scenarioContextMenuRegistryMock);
-    }
-
-    @Test
-    public void init() {
-        scenarioSimulationKogitoProducerSpy.init();
-        verify(scenarioSimulationKogitoStateControlManagerMock, times(1)).initialize(eq(scenarioCommandRegistryManagerMock), eq(scenarioSimulationContextMock));
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/services/ScenarioSimulationKogitoDMNMarshallerServiceTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/services/ScenarioSimulationKogitoDMNMarshallerServiceTest.java
deleted file mode 100644
index 7668ac9..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-client/src/test/java/org/drools/workbench/screens/scenariosimulation/kogito/client/services/ScenarioSimulationKogitoDMNMarshallerServiceTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.kogito.client.services;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmn.model.KogitoDMNModel;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.callbacks.DMN12UnmarshallCallback;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.DMN12;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITDefinitions;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITImport;
-import org.kie.workbench.common.dmn.webapp.kogito.marshaller.js.model.dmn12.JSITItemDefinition;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Spy;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.backend.vfs.PathFactory;
-import org.uberfire.client.callbacks.Callback;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationKogitoDMNMarshallerServiceTest {
-
-    private final static String NAMESPACE1 = "Namespace-1";
-    private final static String NAMESPACE2 = "Namespace-2";
-
-    @InjectMocks @Spy
-    private ScenarioSimulationKogitoDMNMarshallerService dmnMarshallerServiceSpy;
-    @Mock
-    private Callback<KogitoDMNModel> kogitoDMNModelCallback;
-    @Mock
-    private DMN12 dmn12Mock;
-    @Mock
-    private DMN12 importedDmn12Mock;
-    @Mock
-    private DMN12 importedDmn12Mock2;
-    @Mock
-    private ErrorCallback<Object> errorCallbackMock;
-    @Mock
-    private JSITDefinitions jsitDefinitionsMock;
-    @Mock
-    private JSITDefinitions jsitImportedDefinitionsMock;
-    @Mock
-    private JSITDefinitions jsitImportedDefinitionsMock2;
-    @Mock
-    private JSITItemDefinition importedItemDefinitionMock;
-    @Mock
-    private JSITItemDefinition importedItemDefinitionMock2;
-    @Mock
-    private ScenarioSimulationKogitoResourceContentService resourceContentServiceMock;
-    @Captor
-    private ArgumentCaptor<DMN12UnmarshallCallback> dmn12UnmarshallCallbackArgumentCaptor;
-    @Captor
-    private ArgumentCaptor<DMN12UnmarshallCallback> dmn12UnmarshallImportedCallbackArgumentCaptor;
-    @Captor
-    private ArgumentCaptor<DMN12UnmarshallCallback> dmn12UnmarshallImportedCallbackArgumentCaptor2;
-    @Captor
-    private ArgumentCaptor<RemoteCallback<String>> remoteCallbackArgumentCaptor;
-    @Captor
-    private ArgumentCaptor<RemoteCallback<String>> remoteCallbackImportedArgumentCaptor;
-    @Captor
-    private ArgumentCaptor<RemoteCallback<String>> remoteCallbackImportedArgumentCaptor2;
-    @Captor
-    private ArgumentCaptor<KogitoDMNModel> kogitoDMNModelCaptor;
-
-    @Before
-    public void setup() {
-        doReturn(jsitDefinitionsMock).when(dmnMarshallerServiceSpy).uncheckedCast(dmn12Mock);
-        doReturn(jsitImportedDefinitionsMock).when(dmnMarshallerServiceSpy).uncheckedCast(importedDmn12Mock);
-        doReturn(jsitImportedDefinitionsMock2).when(dmnMarshallerServiceSpy).uncheckedCast(importedDmn12Mock2);
-        doReturn(Arrays.asList(importedItemDefinitionMock)).when(jsitImportedDefinitionsMock).getItemDefinition();
-        doReturn(Arrays.asList(importedItemDefinitionMock2)).when(jsitImportedDefinitionsMock2).getItemDefinition();
-        doReturn(NAMESPACE1).when(jsitImportedDefinitionsMock).getNamespace();
-        doReturn(NAMESPACE2).when(jsitImportedDefinitionsMock2).getNamespace();
-    }
-
-    @Test
-    public void getDMNContentNullImports() {
-        doReturn(null).when(jsitDefinitionsMock).getImport();
-        commonPreCallbackProcess();
-        verify(kogitoDMNModelCallback, times(1)).callback(kogitoDMNModelCaptor.capture());
-        assertTrue(kogitoDMNModelCaptor.getValue().getImportsDefinitions().isEmpty());
-        assertEquals(jsitDefinitionsMock, kogitoDMNModelCaptor.getValue().getJsitDefinitions());
-        verify(dmnMarshallerServiceSpy, never()).getDMNImportContentRemoteCallback(any(), any(), anyInt());
-    }
-
-    @Test
-    public void getDMNContentEmptyImports() {
-        doReturn(Collections.emptyList()).when(jsitDefinitionsMock).getImport();
-        commonPreCallbackProcess();
-        verify(dmnMarshallerServiceSpy, times(1)).uncheckedCast(dmn12Mock);
-        verify(kogitoDMNModelCallback, times(1)).callback(kogitoDMNModelCaptor.capture());
-        assertTrue(kogitoDMNModelCaptor.getValue().getImportsDefinitions().isEmpty());
-        assertEquals(jsitDefinitionsMock, kogitoDMNModelCaptor.getValue().getJsitDefinitions());
-        verify(dmnMarshallerServiceSpy, never()).getDMNImportContentRemoteCallback(any(), any(), anyInt());
-    }
-
-    @Test
-    public void getDMNContentWithImport() {
-        JSITImport jsitDMNImport = mock(JSITImport.class);
-        when(jsitDMNImport.getName()).thenReturn("testA");
-        when(jsitDMNImport.getLocationURI()).thenReturn("import.dmn");
-        when(jsitDMNImport.getImportType()).thenReturn("http://www.omg.org/spec/DMN/20180521/MODEL/");
-        JSITImport jsitPMMLImport = mock(JSITImport.class);
-        when(jsitPMMLImport.getName()).thenReturn("testB");
-        when(jsitPMMLImport.getLocationURI()).thenReturn("import.pmml");
-        when(jsitPMMLImport.getImportType()).thenReturn("http://www.dmg.org/PMML-4_3)");
-        List<JSITImport> imports = new ArrayList<>();
-        imports.add(jsitDMNImport);
-        imports.add(jsitPMMLImport);
-        doReturn(imports).when(jsitDefinitionsMock).getImport();
-        commonPreCallbackProcess();
-        verify(dmnMarshallerServiceSpy, times(1)).uncheckedCast(dmn12Mock);
-        verify(dmnMarshallerServiceSpy, times(1)).getDMNImportContentRemoteCallback(eq(kogitoDMNModelCallback), kogitoDMNModelCaptor.capture(), eq(1));
-        verify(resourceContentServiceMock, times(1)).getFileContent(eq(PathFactory.newPath("import.dmn", "src/import.dmn")), remoteCallbackImportedArgumentCaptor.capture(), eq(errorCallbackMock));
-        assertEquals(0, kogitoDMNModelCaptor.getValue().getImportsDefinitions().size());
-        remoteCallbackImportedArgumentCaptor.getValue().callback("<xml>imported content</xml>");
-        verify(dmnMarshallerServiceSpy, times(1)).getDMN12ImportsUnmarshallCallback(kogitoDMNModelCallback, kogitoDMNModelCaptor.getValue(), 1);
-        verify(dmnMarshallerServiceSpy, times(1)).unmarshallDMN(eq("<xml>imported content</xml>"), dmn12UnmarshallImportedCallbackArgumentCaptor.capture());
-        assertEquals(0, kogitoDMNModelCaptor.getValue().getImportsDefinitions().size());
-        dmn12UnmarshallImportedCallbackArgumentCaptor.getValue().callEvent(importedDmn12Mock);
-        verify(dmnMarshallerServiceSpy, times(1)).uncheckedCast(importedDmn12Mock);
-        verify(kogitoDMNModelCallback, times(1)).callback(kogitoDMNModelCaptor.getValue());
-        assertEquals(jsitDefinitionsMock, kogitoDMNModelCaptor.getValue().getJsitDefinitions());
-        assertEquals(1, kogitoDMNModelCaptor.getValue().getImportsDefinitions().size());
-        assertEquals(jsitImportedDefinitionsMock, kogitoDMNModelCaptor.getValue().getImportsDefinitions().get(NAMESPACE1));
-    }
-
-    @Test
-    public void getDMNContentWithMultipleImport() {
-        JSITImport jsitDMNImport = mock(JSITImport.class);
-        when(jsitDMNImport.getName()).thenReturn("testA");
-        when(jsitDMNImport.getLocationURI()).thenReturn("import.dmn");
-        when(jsitDMNImport.getImportType()).thenReturn("http://www.omg.org/spec/DMN/20180521/MODEL/");
-        JSITImport jsitDMN2Import = mock(JSITImport.class);
-        when(jsitDMN2Import.getName()).thenReturn("testB");
-        when(jsitDMN2Import.getLocationURI()).thenReturn("import2.dmn");
-        when(jsitDMN2Import.getImportType()).thenReturn("http://www.omg.org/spec/dmn/20180521/MODEL/");
-        List<JSITImport> imports = new ArrayList<>();
-        imports.add(jsitDMNImport);
-        imports.add(jsitDMN2Import);
-        doReturn(imports).when(jsitDefinitionsMock).getImport();
-        commonPreCallbackProcess();
-        verify(dmnMarshallerServiceSpy, times(1)).uncheckedCast(dmn12Mock);
-        verify(dmnMarshallerServiceSpy, times(2)).getDMNImportContentRemoteCallback(eq(kogitoDMNModelCallback), kogitoDMNModelCaptor.capture(), eq(2));
-        verify(resourceContentServiceMock, times(1)).getFileContent(eq(PathFactory.newPath("import.dmn", "src/import.dmn")), remoteCallbackImportedArgumentCaptor.capture(), eq(errorCallbackMock));
-        remoteCallbackImportedArgumentCaptor.getValue().callback("<xml>imported content</xml>");
-        verify(dmnMarshallerServiceSpy, times(1)).getDMN12ImportsUnmarshallCallback(kogitoDMNModelCallback, kogitoDMNModelCaptor.getValue(), 2);
-        verify(dmnMarshallerServiceSpy, times(1)).unmarshallDMN(eq("<xml>imported content</xml>"), dmn12UnmarshallImportedCallbackArgumentCaptor.capture());
-        assertEquals(0, kogitoDMNModelCaptor.getValue().getImportsDefinitions().size());
-        dmn12UnmarshallImportedCallbackArgumentCaptor.getValue().callEvent(importedDmn12Mock);
-        verify(dmnMarshallerServiceSpy, times(1)).uncheckedCast(importedDmn12Mock);
-
-        verify(resourceContentServiceMock, times(1)).getFileContent(eq(PathFactory.newPath("import2.dmn", "src/import2.dmn")), remoteCallbackImportedArgumentCaptor2.capture(), eq(errorCallbackMock));
-        remoteCallbackImportedArgumentCaptor2.getValue().callback("<xml>imported content 2</xml>");
-        verify(dmnMarshallerServiceSpy, times(2)).getDMN12ImportsUnmarshallCallback(kogitoDMNModelCallback, kogitoDMNModelCaptor.getValue(), 2);
-        verify(dmnMarshallerServiceSpy, times(1)).unmarshallDMN(eq("<xml>imported content 2</xml>"), dmn12UnmarshallImportedCallbackArgumentCaptor2.capture());
-        assertEquals(1, kogitoDMNModelCaptor.getValue().getImportsDefinitions().size());
-        dmn12UnmarshallImportedCallbackArgumentCaptor2.getValue().callEvent(importedDmn12Mock2);
-        verify(dmnMarshallerServiceSpy, times(1)).uncheckedCast(importedDmn12Mock2);
-        verify(kogitoDMNModelCallback, times(1)).callback(kogitoDMNModelCaptor.getValue());
-        assertEquals(jsitDefinitionsMock, kogitoDMNModelCaptor.getValue().getJsitDefinitions());
-        assertEquals(2, kogitoDMNModelCaptor.getValue().getImportsDefinitions().size());
-        assertEquals(jsitImportedDefinitionsMock, kogitoDMNModelCaptor.getValue().getImportsDefinitions().get(NAMESPACE1));
-        assertEquals(jsitImportedDefinitionsMock2, kogitoDMNModelCaptor.getValue().getImportsDefinitions().get(NAMESPACE2));
-    }
-
-    @Test
-    public void getDMNContentWithImportsNotDMN() {
-        JSITImport jsitPMMLImport = mock(JSITImport.class);
-        when(jsitPMMLImport.getName()).thenReturn("testA");
-        when(jsitPMMLImport.getLocationURI()).thenReturn("import1.pmml");
-        when(jsitPMMLImport.getImportType()).thenReturn("http://www.dmg.org/PMML-4_3)");
-        JSITImport jsitPMMLImport2 = mock(JSITImport.class);
-        when(jsitPMMLImport2.getName()).thenReturn("testB");
-        when(jsitPMMLImport2.getLocationURI()).thenReturn("import2.pmml");
-        when(jsitPMMLImport2.getImportType()).thenReturn("http://www.dmg.org/PMML-4_3)");
-
-        List<JSITImport> imports = new ArrayList<>();
-        imports.add(jsitPMMLImport);
-        imports.add(jsitPMMLImport2);
-        doReturn(imports).when(jsitDefinitionsMock).getImport();
-        commonPreCallbackProcess();
-        verify(dmnMarshallerServiceSpy, times(1)).uncheckedCast(dmn12Mock);
-        verify(kogitoDMNModelCallback, times(1)).callback(kogitoDMNModelCaptor.capture());
-        verify(dmnMarshallerServiceSpy, never()).getDMNImportContentRemoteCallback(any(), any(), anyInt());
-        assertEquals(jsitDefinitionsMock, kogitoDMNModelCaptor.getValue().getJsitDefinitions());
-        assertEquals(0, kogitoDMNModelCaptor.getValue().getImportsDefinitions().size());
-    }
-
-    private void commonPreCallbackProcess() {
-        Path path = PathFactory.newPath("file.dmn", "src/file.dmn");
-        dmnMarshallerServiceSpy.getDMNContent(path, kogitoDMNModelCallback, errorCallbackMock);
-        verify(resourceContentServiceMock, times(1)).getFileContent(eq(path), remoteCallbackArgumentCaptor.capture(), eq(errorCallbackMock));
-        remoteCallbackArgumentCaptor.getValue().callback("<xml>content<xml>");
-        verify(dmnMarshallerServiceSpy, times(1)).unmarshallDMN(eq("<xml>content<xml>"), dmn12UnmarshallCallbackArgumentCaptor.capture());
-        verify(dmnMarshallerServiceSpy, times(1)).getDMN12UnmarshallCallback(path, kogitoDMNModelCallback, errorCallbackMock);
-        dmn12UnmarshallCallbackArgumentCaptor.getValue().callEvent(dmn12Mock);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/README.md b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/README.md
deleted file mode 100644
index ac449f3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/README.md
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-   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.
--->
-
-# Kogito SCESIM Marshaller
-
-This module manages **marshalling** (i.e. converting from a XML file to a JSInterop file)
-and **unmarshalling** (i.e. converting from JSInterop file to a XML file) operation for Scenario Simulation
-Kogito project.
-
-Basically, the module uses jaxb _maven-jaxb2-plugin_ plugin and its sub plugin _gwt-jsonix-schema-compiler_
-to generate all required classes to support the marshall and unmarshall processes. The inputs of the process are
-_bindings.xjb_ and _scesim.xsd_ files, which represent the schema of a current \*.scesim
-
-In details, the modules provides:
-
-Under **java** package
-
-- **Model JSInterp classes**: The model JSInterop classes a for a which are automatically generated by
-  _maven-jaxb2-plugin_ plugin in _js/model_ package
-- **Callbacks**: Callbacks to be called during a marshall/unmarshall call. Automatically generated by
-  _maven-jaxb2-plugin_ plugin in _js/callbacks_ package
-- **SCESIMMainJS**: JSInterop adapter to use for marshalling/unmarshalling, which refers to _SCESIMMainJS.js_,
-  its javascript representation. Basically, this automatically generated java class is the entrypoint
-  for marshalling/unmarshalling processes.
-- **Mapper**: It contains automatically generated Utils classes _JsUtils_ and _JSIName_
-
-Under **resources** package
-
-- **Jsonix-all.js** automatically generated JS file which represents Jsonix engine. Do not contains specific
-  SCESIM files. Required to be imported in the HTML page which wants to use this marshaller.
-- **SCESIM.js** automatically generated JS file which represents the SCESIM "schema" in JSON format.
-- **SCESIMMainJs.js** It wraps the Jsonix engine into SCESIM context.
-  Required to be imported in the HTML page which wants to use this marshaller.
-- **jre folder**: It's a container for GWT "super source" files where GWT does not provide an emulation of JRE classes.
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/pom.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/pom.xml
deleted file mode 100644
index 51f778a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/pom.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.kie.kogito.stunner.editors</groupId>
-    <artifactId>drools-wb-scenario-simulation-editor</artifactId>
-    <version>${revision}</version>
-  </parent>
-
-  <artifactId>drools-wb-scenario-simulation-editor-kogito-marshaller</artifactId>
-  <packaging>jar</packaging>
-
-  <name>Drools Workbench - Scenario Simulation Editor - Kogito - Marshaller</name>
-  <description>Drools Workbench - Scenario Simulation Editor - Kogito - Marshaller</description>
-
-  <properties>
-    <js.destination
-    >${project.basedir}/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/js</js.destination>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.gwtproject</groupId>
-      <artifactId>gwt-user</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>base</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>jsinterop-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <failOnError>false</failOnError>
-          <filesets>
-            <fileset>
-              <directory>src/main/java/org/drools/workbench/scenariosimulation/kogito/marshaller/js</directory>
-              <includes>
-                <include>**</include>
-              </includes>
-            </fileset>
-            <fileset>
-              <directory>src/main/java/org/drools/workbench/scenariosimulation/kogito/marshaller/mapper</directory>
-              <includes>
-                <include>JsUtils.java</include>
-                <include>JSIName.java</include>
-              </includes>
-            </fileset>
-            <fileset>
-              <directory>${js.destination}</directory>
-              <includes>
-                <include>SCESIM.js</include>
-                <include>Jsonix-all.js</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-javascript</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <extension>true</extension>
-              <addCompileSourceRoot>false</addCompileSourceRoot>
-              <debug>false</debug>
-              <verbose>false</verbose>
-              <args>
-                <arg>-Xgwtjsonix</arg>
-                <arg>-Xinheritance</arg>
-                <arg>-jsid=${project.build.sourceDirectory}</arg>
-                <arg>-jsmpkg=org.drools.workbench.scenariosimulation.kogito.marshaller.mapper</arg>
-                <arg>-jsmn=SCESIMMainJs</arg>
-              </args>
-              <plugins>
-                <plugin>
-                  <groupId>org.kogito</groupId>
-                  <artifactId>gwt-jsonix-schema-compiler</artifactId>
-                </plugin>
-              </plugins>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-javascript</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.hisrc.jsonix</groupId>
-                  <artifactId>jsonix-scripts</artifactId>
-                  <type>js</type>
-                  <classifier>all</classifier>
-                  <outputDirectory>${js.destination}</outputDirectory>
-                  <destFileName>Jsonix-all.js</destFileName>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>move-generated-sources</id>
-            <phase>process-sources</phase>
-            <configuration>
-              <target>
-                <copy
-                  file="${project.build.directory}/generated-sources/xjc/SCESIM.js"
-                  tofile="${js.destination}/SCESIM.js"
-                />
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Exclude generated code from checkstyle validation -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <excludes>
-            org/drools/workbench/scenariosimulation/kogito/marshaller/js/**/*,
-            org/drools/workbench/scenariosimulation/kogito/marshaller/mapper/**/*
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.jvnet.jaxb2.maven2</groupId>
-          <artifactId>maven-jaxb2-plugin</artifactId>
-          <version>${version.org.jvnet.jaxb2.maven2.maven-jaxb2-plugin}</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/java/.gitkeep b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/java/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/java/.gitkeep
+++ /dev/null
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/bindings.xjb b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/bindings.xjb
deleted file mode 100644
index e1af4a6..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/bindings.xjb
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<jaxb:bindings
-    version="2.1"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    xmlns:jsonix="http://jsonix.highsource.org/customizations"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    jaxb:extensionBindingPrefixes="jsonix">
-
-  <jaxb:bindings schemaLocation="scesim.xsd" node="/xs:schema">
-    <jaxb:schemaBindings>
-      <jaxb:package name="org.drools.workbench.scenariosimulation.kogito.marshaller.js.model"/>
-    </jaxb:schemaBindings>
-
-    <jsonix:packageMapping
-        packageName="org.drools.workbench.scenariosimulation.kogito.marshaller.js.model"
-        spaceName="SCESIM"/>
-  </jaxb:bindings>
-
-</jaxb:bindings>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/ScesimMarshaller.gwt.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/ScesimMarshaller.gwt.xml
deleted file mode 100644
index 17a3823..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/ScesimMarshaller.gwt.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN"
-  "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
-<module>
-  <inherits name="jsinterop.base.Base" />
-
-  <!-- We don't need to support IE10 or older -->
-  <!-- There is no "ie11" permutation. IE11 uses the Firefox one (gecko1_8) -->
-  <set-property name="user.agent" value="gecko1_8,safari" />
-
-  <!-- Specify the paths for translatable code -->
-  <source path="js" />
-  <source path="mapper" />
-
-  <super-source path="jre" />
-</module>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/jre/javax/xml/XMLConstants.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/jre/javax/xml/XMLConstants.java
deleted file mode 100644
index 82956de..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/jre/javax/xml/XMLConstants.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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 javax.xml;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-/**
- * GWT Super-source version of javax.xml.XMLConstants.
- */
-@JsType(namespace = JsPackage.GLOBAL)
-public final class XMLConstants {
-
-    /**
-     * <p>Private constructor to prevent instantiation.</p>
-     */
-    private XMLConstants() {
-    }
-
-    public static final String NULL_NS_URI = "";
-
-    public static final String DEFAULT_NS_PREFIX = "";
-
-    public static final String XML_NS_URI = "http://www.w3.org/XML/1998/namespace";
-
-    public static final String XML_NS_PREFIX = "xml";
-
-    public static final String XMLNS_ATTRIBUTE_NS_URI = "http://www.w3.org/2000/xmlns/";
-
-    public static final String XMLNS_ATTRIBUTE = "xmlns";
-
-    public static final String W3C_XML_SCHEMA_NS_URI = "http://www.w3.org/2001/XMLSchema";
-
-    public static final String W3C_XML_SCHEMA_INSTANCE_NS_URI = "http://www.w3.org/2001/XMLSchema-instance";
-
-    public static final String W3C_XPATH_DATATYPE_NS_URI = "http://www.w3.org/2003/11/xpath-datatypes";
-
-    public static final String XML_DTD_NS_URI = "http://www.w3.org/TR/REC-xml";
-
-    public static final String RELAXNG_NS_URI = "http://relaxng.org/ns/structure/1.0";
-
-    public static final String FEATURE_SECURE_PROCESSING = "http://javax.xml.XMLConstants/feature/secure-processing";
-
-    public static final String ACCESS_EXTERNAL_DTD = "http://javax.xml.XMLConstants/property/accessExternalDTD";
-
-    public static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema";
-
-    public static final String ACCESS_EXTERNAL_STYLESHEET = "http://javax.xml.XMLConstants/property/accessExternalStylesheet";
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/jre/javax/xml/namespace/QName.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/jre/javax/xml/namespace/QName.java
deleted file mode 100644
index f191222..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/jre/javax/xml/namespace/QName.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * 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 javax.xml.namespace;
-
-import java.util.Objects;
-
-import javax.xml.XMLConstants;
-
-import jsinterop.annotations.JsConstructor;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsProperty;
-import jsinterop.annotations.JsType;
-
-/**
- * GWT Super-source version of javax.xml.namespace.QName.
- */
-@JsType(namespace = JsPackage.GLOBAL)
-public class QName {
-
-    @JsProperty(name = "namespaceURI")
-    public final native String getNamespaceURI();
-
-    @JsProperty(name = "namespaceURI")
-    public final native void setNamespaceURI(final String namespaceURI);
-
-    @JsProperty(name = "localPart")
-    public final native String getLocalPart();
-
-    @JsProperty(name = "localPart")
-    public final native void setLocalPart(final String localPart);
-
-    @JsProperty(name = "prefix")
-    public final native String getPrefix();
-
-    @JsProperty(name = "prefix")
-    public final native void setPrefix(final String prefix);
-
-    @JsProperty(name = "key")
-    public final native String getKey();
-
-    @JsProperty(name = "key")
-    public final native void setKey(String key);
-
-    @JsProperty(name = "string")
-    public final native String getString();
-
-    @JsProperty(name = "string")
-    public final native void setString(String string);
-
-    @JsConstructor
-    public QName(final String namespaceURI,
-                 final String localPart,
-                 final String prefix) {
-        if (Objects.isNull(namespaceURI)) {
-            setNamespaceURI(XMLConstants.NULL_NS_URI);
-        } else {
-            setNamespaceURI(namespaceURI);
-        }
-
-        if (Objects.isNull(localPart)) {
-            throw new IllegalArgumentException("local part cannot be \"null\" when creating a QName");
-        }
-        setLocalPart(localPart);
-
-        if (Objects.isNull(prefix)) {
-            throw new IllegalArgumentException("prefix cannot be \"null\" when creating a QName");
-        }
-        setPrefix(prefix);
-
-        //jsonix JSON properties
-        setKey(toString());
-        String retrievedPrefix = getPrefix();
-        final String usedPrefix = (retrievedPrefix == null || retrievedPrefix.isEmpty()) ?  "" : retrievedPrefix + ":";
-        final String string = "{" + getNamespaceURI() + "}" + usedPrefix + getLocalPart();
-        setString(string);
-    }
-
-    @Override
-    public String toString() {
-        if (Objects.equals(getNamespaceURI(), XMLConstants.NULL_NS_URI)) {
-            return getLocalPart();
-        } else {
-            return "{" + getNamespaceURI() + "}" + getLocalPart();
-        }
-    }
-
-    /**
-     * See {@link QName#equals(Object)}
-     */
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        final QName qName = (QName) o;
-
-        return Objects.equals(getNamespaceURI(), qName.getNamespaceURI()) &&
-                Objects.equals(getLocalPart(), qName.getLocalPart());
-    }
-
-    /**
-     * See {@link QName#hashCode()}
-     */
-    @Override
-    public int hashCode() {
-        return Objects.hash(getNamespaceURI(), getLocalPart());
-    }
-
-    public static QName valueOf(final String qNameAsString) {
-
-        // null is not valid
-        if (Objects.isNull(qNameAsString)) {
-            throw new IllegalArgumentException("cannot create QName from \"null\"");
-        }
-
-        // "" local part is valid to preserve compatible behavior with QName 1.0
-        if (qNameAsString.length() == 0) {
-            return new QName(XMLConstants.NULL_NS_URI,
-                             qNameAsString,
-                             XMLConstants.DEFAULT_NS_PREFIX);
-        }
-
-        // local part only?
-        if (qNameAsString.charAt(0) != '{') {
-            return new QName(XMLConstants.NULL_NS_URI,
-                             qNameAsString,
-                             XMLConstants.DEFAULT_NS_PREFIX);
-        }
-
-        // Namespace URI improperly specified?
-        if (qNameAsString.startsWith("{" + XMLConstants.NULL_NS_URI + "}")) {
-            throw new IllegalArgumentException("Namespace URI .equals(XMLConstants.NULL_NS_URI), "
-                                                       + ".equals(\"" + XMLConstants.NULL_NS_URI + "\"), "
-                                                       + "only the local part, "
-                                                       + "\""
-                                                       + qNameAsString.substring(2 + XMLConstants.NULL_NS_URI.length())
-                                                       + "\", "
-                                                       + "should be provided.");
-        }
-
-        // Namespace URI and local part specified
-        final int endOfNamespaceURI = qNameAsString.indexOf('}');
-        if (endOfNamespaceURI == -1) {
-            throw new IllegalArgumentException("cannot create QName from \""
-                                                       + qNameAsString
-                                                       + "\", missing closing \"}\"");
-        }
-        return new QName(qNameAsString.substring(1, endOfNamespaceURI),
-                         qNameAsString.substring(endOfNamespaceURI + 1),
-                         XMLConstants.DEFAULT_NS_PREFIX);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/jre/package-info.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/jre/package-info.java
deleted file mode 100644
index d4f9caf..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/jre/package-info.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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. 
- */
-
-
-/**
- * Container for GWT "super source" files where GWT does not provide an emulation of JRE classes.
- * See http://www.gwtproject.org/doc/latest/DevGuideOrganizingProjects.html
- */
-
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/js/SCESIMMainJs.js b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/js/SCESIMMainJs.js
deleted file mode 100644
index 03c5017..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/js/SCESIMMainJs.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * @type {{marshall: MainJs.marshall, unmarshall: MainJs.unmarshall}}
- */
-SCESIMMainJs = {
-  mappings: [SCESIM],
-
-  initializeJsInteropConstructors: function (constructorsMap) {
-    var extraTypes = [{ typeName: "Name", namespace: null }];
-
-    function createFunction(typeName) {
-      return new Function('return { "TYPE_NAME" : "' + typeName + '" }');
-    }
-
-    function createNoTypedFunction() {
-      return new Function("return { }");
-    }
-
-    function createConstructor(value) {
-      console.log("Create createConstructor " + value);
-      const parsedJson = JSON.parse(value);
-      const name = parsedJson["name"];
-      const nameSpace = parsedJson["nameSpace"];
-      const typeName = parsedJson["typeName"];
-      console.log("parsedJson " + parsedJson);
-      console.log("name " + name);
-      console.log("nameSpace " + nameSpace);
-      console.log("typeName " + typeName);
-      if (nameSpace != null) {
-        if (typeName != null) {
-          window[nameSpace][name] = createFunction(typeName);
-        } else {
-          window[nameSpace][name] = createNoTypedFunction();
-        }
-      } else {
-        if (typeName != null) {
-          window[name] = createFunction(typeName);
-        } else {
-          window[name] = createNoTypedFunction();
-        }
-      }
-    }
-
-    function hasNameSpace(value) {
-      return JSON.parse(value)["nameSpace"] != null;
-    }
-
-    function hasNotNameSpace(value) {
-      return JSON.parse(value)["nameSpace"] == null;
-    }
-
-    function iterateValueEntry(values) {
-      console.log("iterateValueEntry " + values);
-      const baseTypes = values.filter(hasNotNameSpace);
-      const innerTypes = values.filter(hasNameSpace);
-      baseTypes.forEach(createConstructor);
-      innerTypes.forEach(createConstructor);
-    }
-
-    function iterateKeyValueEntry(key, values) {
-      console.log("iterateKeyValueEntry " + key + "  " + values);
-      iterateValueEntry(values);
-    }
-
-    console.log("Generating JsInterop constructors.");
-
-    for (const property in constructorsMap) {
-      if (constructorsMap.hasOwnProperty(property)) {
-        iterateKeyValueEntry(property, constructorsMap[property]);
-      }
-    }
-  },
-
-  unmarshall: function (text, dynamicNamespace, callback) {
-    // Create Jsonix context
-    var context = new Jsonix.Context(this.mappings);
-
-    // Create unmarshaller
-    var unmarshaller = context.createUnmarshaller();
-    var toReturn = unmarshaller.unmarshalString(text);
-    callback(toReturn);
-  },
-
-  marshall: function (value, defaultNamespace, callback) {
-    // Create Jsonix context
-    var namespaces = {};
-    var context = new Jsonix.Context(this.mappings, {
-      namespacePrefixes: namespaces,
-    });
-
-    // Create unmarshaller
-    var marshaller = context.createMarshaller();
-
-    var xmlDocument = marshaller.marshalDocument(value);
-    var s = new XMLSerializer();
-    var toReturn = s.serializeToString(xmlDocument);
-    callback(toReturn);
-  },
-};
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/scesim.xsd b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/scesim.xsd
deleted file mode 100644
index 619df27..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/scesim.xsd
+++ /dev/null
@@ -1,148 +0,0 @@
-<xs:schema
-  attributeFormDefault="unqualified"
-  elementFormDefault="qualified"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
->
-  <xs:element name="ScenarioSimulationModel" type="ScenarioSimulationModelType" />
-  <xs:complexType name="ExpressionElementType">
-    <xs:sequence>
-      <xs:element type="xs:string" name="step" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="expressionElementsType">
-    <xs:sequence>
-      <xs:element type="ExpressionElementType" name="ExpressionElement" maxOccurs="unbounded" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="expressionIdentifierType">
-    <xs:sequence>
-      <xs:element type="xs:string" name="name" minOccurs="0" />
-      <xs:element type="xs:string" name="type" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="factIdentifierType">
-    <xs:sequence>
-      <xs:element type="xs:string" name="name" minOccurs="0" />
-      <xs:element type="xs:string" name="className" minOccurs="0" />
-    </xs:sequence>
-    <xs:attribute name="importPrefix" type="xs:string" />
-  </xs:complexType>
-  <xs:complexType name="genericTypes">
-    <xs:sequence>
-      <xs:element type="xs:string" name="string" minOccurs="0" maxOccurs="unbounded" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="FactMappingType">
-    <xs:sequence>
-      <xs:element type="expressionElementsType" name="expressionElements" />
-      <xs:element type="expressionIdentifierType" name="expressionIdentifier" />
-      <xs:element type="factIdentifierType" name="factIdentifier" />
-      <xs:element type="xs:string" name="className" />
-      <xs:element type="xs:string" name="factAlias" />
-      <xs:element type="xs:string" name="expressionAlias" minOccurs="0" />
-      <xs:element type="genericTypes" name="genericTypes" />
-      <xs:element type="xs:double" name="columnWidth" />
-      <xs:element type="xs:string" name="factMappingValueType" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="factMappingsType">
-    <xs:sequence>
-      <xs:element type="FactMappingType" name="FactMapping" maxOccurs="unbounded" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="scesimModelDescriptorType">
-    <xs:sequence>
-      <xs:element type="factMappingsType" name="factMappings" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="settingsType">
-    <xs:sequence>
-      <xs:element type="xs:string" name="dmoSession" minOccurs="0" />
-      <xs:element type="xs:string" name="dmnFilePath" minOccurs="0" />
-      <xs:element type="xs:string" name="type" minOccurs="0" />
-      <xs:element type="xs:string" name="fileName" minOccurs="0" />
-      <xs:element type="xs:string" name="kieSession" minOccurs="0" />
-      <xs:element type="xs:string" name="kieBase" minOccurs="0" />
-      <xs:element type="xs:string" name="ruleFlowGroup" minOccurs="0" />
-      <xs:element type="xs:string" name="dmnNamespace" minOccurs="0" />
-      <xs:element type="xs:string" name="dmnName" minOccurs="0" />
-      <xs:element type="xs:boolean" name="skipFromBuild" minOccurs="0" />
-      <xs:element type="xs:boolean" name="stateless" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="rawValueType">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute type="xs:string" name="class" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="FactMappingValueType">
-    <xs:sequence>
-      <xs:element type="factIdentifierType" name="factIdentifier" />
-      <xs:element type="expressionIdentifierType" name="expressionIdentifier" />
-      <xs:element type="rawValueType" name="rawValue" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="factMappingValuesType">
-    <xs:sequence>
-      <xs:element type="FactMappingValueType" name="FactMappingValue" maxOccurs="unbounded" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="ScenarioType">
-    <xs:sequence>
-      <xs:element type="factMappingValuesType" name="factMappingValues" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="BackgroundDataType">
-    <xs:sequence>
-      <xs:element type="factMappingValuesType" name="factMappingValues" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="scenariosType">
-    <xs:sequence>
-      <xs:element type="ScenarioType" name="Scenario" maxOccurs="unbounded" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="backgroundDatasType">
-    <xs:sequence>
-      <xs:element type="BackgroundDataType" name="BackgroundData" maxOccurs="unbounded" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="simulationType">
-    <xs:sequence>
-      <xs:element type="scesimModelDescriptorType" name="scesimModelDescriptor" />
-      <xs:element type="scenariosType" name="scesimData" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="backgroundType">
-    <xs:sequence>
-      <xs:element type="scesimModelDescriptorType" name="scesimModelDescriptor" />
-      <xs:element type="backgroundDatasType" name="scesimData" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="ImportType">
-    <xs:sequence>
-      <xs:element type="xs:string" name="type" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="wrappedImportsType">
-    <xs:sequence>
-      <xs:element type="ImportType" name="Import" maxOccurs="unbounded" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="importsType">
-    <xs:sequence>
-      <xs:element type="wrappedImportsType" name="imports" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="ScenarioSimulationModelType">
-    <xs:sequence>
-      <xs:element type="simulationType" name="simulation" />
-      <xs:element type="backgroundType" name="background" />
-      <xs:element type="settingsType" name="settings" />
-      <xs:element type="importsType" name="imports" />
-    </xs:sequence>
-    <xs:attribute type="xs:string" name="version" />
-  </xs:complexType>
-</xs:schema>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/test/java/org/drools/workbench/scenariosimulation/kogito/marshaller/ScesimGwtJsonixTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/test/java/org/drools/workbench/scenariosimulation/kogito/marshaller/ScesimGwtJsonixTest.java
deleted file mode 100644
index ab8fc26..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/test/java/org/drools/workbench/scenariosimulation/kogito/marshaller/ScesimGwtJsonixTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.workbench.scenariosimulation.kogito.marshaller;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-
-public class ScesimGwtJsonixTest {
-
-    private static final String MODEL_PATH =
-            "target/classes/org/drools/workbench/scenariosimulation/kogito/marshaller/js/model/";
-
-    @Test
-    public void testModelJsInteropClassesWereGenerated() throws Exception {
-        final Path path = Paths.get(MODEL_PATH);
-        Assertions.assertThat(Files.find(path,
-                                         1,
-                                         (filePath, fileAttribute) -> filePath.toString().endsWith(".class")).count())
-                .as("Number of generated classes should be equal to number of those in scesim.xsd + SCESIM.class")
-                .isEqualTo(23L);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/README.md b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/README.md
deleted file mode 100644
index 98ff9b0..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-   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.
--->
-
-# Kogito Runtime Webapp
-
-This webapp is meant as runtime environment. It **does not provides** methods and functions (ex. file retrieval) that should be provided by running environment (ex. vs code).
-
-## Chrome testing
-
-Some minimal tests may be done in the following way:
-
-1. full compilation (i.e. included GWT compilation) of the runtime module
-2. open the `drools-wb/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/target/drools-wb-scenario-simulation-editor-kogito-runtime/index.html` file inside Chrome
-3. inside the Chrome dev console, issue the command `$wnd.gwtEditorBeans.get("ScenarioSimulationEditor").get().setContent("", "")`; this will create a new - empty - scesim file.
-4. Some tricks: to avoid CORS and other policy-related issues:
-   - enable chrome://flags/#temporary-unexpire-flags-m118 flag
-   - set chrome://flags/#allow-insecure-localhost for invalid certificates error
-   - start chrome from cli with the command `chrome --allow-file-access-from-files` to allow loading from file.
-   - Open index.html file:///(path_to_file)/index.html and get no dev compilation error.
-5. $wnd.gwtEditorBeans.get("ScenarioSimulationEditor").get().setContent("") inside dev console
-6. edit the asset
-7. invoke $wnd.gwtEditorBeans.get("ScenarioSimulationEditor").get().getContent() inside dev console and store the returned xml
-8. invoke $wnd.gwtEditorBeans.get("ScenarioSimulationEditor").get().setContent("","") method with the stored xml
-
-## VSCODE Integration
-
-1. clone https://github.com/apache/incubator-kie-tools
-2. Launch pnpm bootstrap on incubator-kie-tools directory
-3. Launch pnpm -r build:dev
-4. Launch VS Code (you can find it in a path similar to: `kie-tools/packages/kie-editors-dev-vscode-extension/.vscode-test/vscode-1.43.0/VSCode-linux-x64/bin/code` ) with `--enable-proposed-api kiegroup.kie-editors-dev-vscode-extension` parameter
-5. In VS Code, open kie-tools/packages/kie-editors-dev-vscode-extension/ folder
-6. Launch DEBUG MODE (F5)
-7. Try to open a SCESIM file or to create a new one
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/pom.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/pom.xml
deleted file mode 100644
index 0cd0886..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/pom.xml
+++ /dev/null
@@ -1,568 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
-  <parent>
-    <artifactId>drools-wb-scenario-simulation-editor</artifactId>
-    <groupId>org.kie.kogito.stunner.editors</groupId>
-    <version>${revision}</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>drools-wb-scenario-simulation-editor-kogito-runtime</artifactId>
-  <packaging>war</packaging>
-
-  <name>Drools Workbench - Scenario Simulation Editor - Kogito - Runtime Webapp</name>
-  <description>Drools Workbench - Scenario Simulation Editor - Kogito - Runtime Webapp</description>
-
-  <properties>
-    <gwt.helper.includes>Client,Marshaller,KogitoEditor,WebappBase</gwt.helper.includes>
-    <gwt.helper.rootDirectories>${project.parent.basedir}/</gwt.helper.rootDirectories>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Errai -->
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-ioc</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.spec.javax.annotation</groupId>
-          <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-ui</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-data-binding</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-cdi-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-cdi-shared</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-codegen-gwt</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- GWT/Errai Bean Validation - JSR303 -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-validation</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-validator</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-validator</artifactId>
-      <scope>provided</scope>
-      <classifier>sources</classifier>
-    </dependency>
-
-    <!-- Core UberFire dependencies -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>appformer-client-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>appformer-kogito-bridge</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-client-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-simple-docks-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-workbench-processors</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-workbench-client-views-patternfly</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-commons-editor-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- UberFire Kogito dependencies -->
-    <dependency>
-      <groupId>com.google.elemental2</groupId>
-      <artifactId>elemental2-promise</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Generic ui components -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-widgets-commons</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-widgets-table</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-ui</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- GWT and extensions -->
-    <dependency>
-      <groupId>org.gwtproject</groupId>
-      <artifactId>gwt-user</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.gwtproject</groupId>
-      <artifactId>gwt-dev</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-codec</groupId>
-          <artifactId>commons-codec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.gwtbootstrap3</groupId>
-      <artifactId>gwtbootstrap3</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.gwtbootstrap3</groupId>
-      <artifactId>gwtbootstrap3-extras</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.elemental2</groupId>
-      <artifactId>elemental2-dom</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Kogito -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-kogito-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-kogito-webapp-base</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.spec.javax.annotation</groupId>
-          <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-kogito-webapp-base</artifactId>
-      <scope>provided</scope>
-      <classifier>sources</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.spec.javax.annotation</groupId>
-          <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-dmn-webapp-kogito-marshaller</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>com.google.gwt.gwtmockito</groupId>
-      <artifactId>gwtmockito</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Transient dependencies -->
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>base</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>jsinterop-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-workbench-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-commons-editor-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Scenario Simulation -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>drools-wb-scenario-simulation-editor-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>appformer-kogito-bridge</artifactId>
-      <classifier>sources</classifier>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <!-- Add for enforcer -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>lienzo-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-scenario-simulation-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>drools-wb-scenario-simulation-editor-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>drools-wb-scenario-simulation-editor-kogito-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-wires-core-grids</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- MARSHALLING -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>drools-wb-scenario-simulation-editor-kogito-marshaller</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- END MARSHALLING -->
-  </dependencies>
-
-  <build>
-    <finalName>${project.artifactId}</finalName>
-    <outputDirectory>src/main/webapp/WEB-INF/classes</outputDirectory>
-
-    <plugins>
-      <!-- Include additional sources path for hot reload -->
-      <plugin>
-        <groupId>org.kie</groupId>
-        <artifactId>kie-gwthelper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <includes>${gwt.helper.includes}</includes>
-              <!-- will include all GWT module whose configuration file name match that pattern -->
-              <rootDirectories>${gwt.helper.rootDirectories}</rootDirectories>
-              <!-- will search inside those directories -->
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}</directory>
-              <includes>
-                <include
-                >src/main/webapp/org.drools.workbench.screens.scenariosimulation.webapp.DroolsWorkbenchScenarioSimulationKogitoRuntime/</include>
-                <include>src/main/webapp/WEB-INF/deploy/</include>
-                <include>src/main/webapp/WEB-INF/classes/</include>
-                <include>src/main/webapp/WEB-INF/lib/</include>
-                <include>src/main/webapp/model/</include>
-                <include>src/main/gwt-unitCache</include>
-                <include>**/gwt-unitCache/**</include>
-                <include>.gwt/**</include>
-                <include>.errai/</include>
-                <include>.index/**</include>
-                <include>**/*.JUnit/**</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-marshaller-js</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}/src/main/webapp/model</outputDirectory>
-              <resources>
-                <resource>
-                  <directory
-                  >${project.parent.basedir}/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/js/</directory>
-                  <includes>
-                    <include>**/*.js</include>
-                  </includes>
-                </resource>
-                <resource>
-                  <directory
-                  >${project.build.directory}/Marshaller/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js</directory>
-                  <includes>
-                    <include>**/*.js</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <configuration>
-          <deploy>${project.build.directory}/gwt-symbols-deploy</deploy>
-          <localWorkers>4</localWorkers>
-          <module
-          >org.drools.workbench.screens.scenariosimulation.webapp.DroolsWorkbenchScenarioSimulationKogitoRuntime</module>
-          <extraJvmArgs
-          >-Xmx3G -Xms512m -Xss1M -XX:CompileThreshold=7000 -XX:+UseSerialGC -Derrai.dynamic_validation.enabled=true</extraJvmArgs>
-          <optimizationLevel>9</optimizationLevel>
-          <style>OBFUSCATED</style>
-          <logLevel>INFO</logLevel>
-          <noServer>false</noServer>
-          <runTarget>index.html</runTarget>
-          <strict>true</strict>
-          <printJavaCommandOnError>false</printJavaCommandOnError>
-          <productionMode>true</productionMode>
-          <hostedWebapp>src/main/webapp</hostedWebapp>
-          <generateJsInteropExports>true</generateJsInteropExports>
-
-          <compileSourcesArtifacts>
-            <!-- UberFire -->
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-client-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-workbench-client</compileSourcesArtifact>
-            <compileSourcesArtifact
-            >org.kie.kogito.stunner.editors:uberfire-workbench-client-views-patternfly</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-simple-docks-client</compileSourcesArtifact>
-
-            <!-- Errai, Drools etc -->
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:errai-data-binding</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:kie-wb-common-ui</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:kie-wb-common-kogito-client</compileSourcesArtifact>
-
-            <!-- UF-ext -->
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-commons-editor-api</compileSourcesArtifact>
-            <compileSourcesArtifact
-            >org.kie.kogito.stunner.editors:uberfire-commons-editor-client</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-widgets-commons</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-widgets-table</compileSourcesArtifact>
-
-            <!-- Uberfire Experimentals -->
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-wires-core-grids</compileSourcesArtifact>
-            <compileSourcesArtifact
-            >org.kie.kogito.stunner.editors:drools-wb-scenario-simulation-editor-client</compileSourcesArtifact>
-            <compileSourcesArtifact
-            >org.kie.kogito.stunner.editors:drools-wb-scenario-simulation-editor-api</compileSourcesArtifact>
-
-            <!-- Appformer -->
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:appformer-client-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:appformer-kogito-bridge</compileSourcesArtifact>
-
-            <!-- drools-wb -->
-            <compileSourcesArtifact
-            >org.kie.kogito.stunner.editors:drools-wb-scenario-simulation-editor-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.drools:drools-scenario-simulation-api</compileSourcesArtifact>
-            <!-- DMN Marshaller -->
-            <compileSourcesArtifact
-            >org.kie.kogito.stunner.editors:kie-wb-common-dmn-webapp-kogito-marshaller</compileSourcesArtifact>
-          </compileSourcesArtifacts>
-        </configuration>
-        <executions>
-          <execution>
-            <id>gwt-clean</id>
-            <phase>clean</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>gwt-compile</id>
-            <goals>
-              <!-- Do not use 'resources' goal as it does not play well with filtered resources. -->
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <!-- Removing unused inherited modules like ace and monaco-editor-->
-          <packagingExcludes>
-            **/javax/**/*.*,
-            **/client/**/*.class,
-            **/*.symbolMap,
-            WEB-INF/classes/**,
-            **/ace/**,
-            **/monaco-editor/dev/vs/*.*,
-            **/monaco-editor/dev/vs/base/**,
-            **/monaco-editor/dev/vs/basic-languages/**,
-            **/monaco-editor/dev/vs/editor/*.js,
-            **/monaco-editor/dev/vs/language/**,
-          </packagingExcludes>
-          <archive>
-            <addMavenDescriptor>false</addMavenDescriptor>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>Unpack External Marshaller JS from dependency</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.kie.kogito.stunner.editors</groupId>
-                  <artifactId>kie-wb-common-dmn-webapp-kogito-marshaller</artifactId>
-                  <type>jar</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/Marshaller</outputDirectory>
-                  <includes>**/*.js</includes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImpl.java
deleted file mode 100644
index 54d409d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImpl.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.dropdown;
-
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dropdown.ScenarioSimulationKogitoCreationAssetsDropdownProvider;
-import org.drools.workbench.screens.scenariosimulation.webapp.client.popup.ErrorPopupPresenter;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.kie.workbench.common.kogito.webapp.base.client.workarounds.KogitoResourceContentService;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-
-@Dependent
-public class ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImpl implements ScenarioSimulationKogitoCreationAssetsDropdownProvider {
-
-    protected static final String DMN_FILE_SEARCH_PATTERN = "**/*.dmn";
-    protected static final String TARGET_FOLDER = "target/";
-    protected static final String TARGET_FOLDER_NOT_ROOT = "/" + TARGET_FOLDER;
-
-
-    @Inject
-    protected KogitoResourceContentService resourceContentService;
-    @Inject
-    protected ErrorPopupPresenter errorPopupPresenter;
-
-    @Override
-    public void getItems(Consumer<List<KieAssetsDropdownItem>> assetListConsumer) {
-        resourceContentService.getFilteredItems(DMN_FILE_SEARCH_PATTERN,
-                                                getRemoteCallback(assetListConsumer),
-                                                getErrorCallback());
-    }
-
-    protected RemoteCallback<List<String>> getRemoteCallback(Consumer<List<KieAssetsDropdownItem>> assetListConsumer) {
-        return response -> {
-            List<KieAssetsDropdownItem> toAccept = response.stream()
-                    .filter(item -> !isInTargetFolder(item))
-                    .map(this::getKieAssetsDropdownItem)
-                    .sorted(Comparator.comparing(KieAssetsDropdownItem::getText, String.CASE_INSENSITIVE_ORDER))
-                    .collect(Collectors.toList());
-            assetListConsumer.accept(toAccept);
-        };
-    }
-
-    protected ErrorCallback<Object> getErrorCallback() {
-        return (message, throwable) -> {
-            errorPopupPresenter.showMessage(message + ": " + throwable.getMessage());
-            return false;
-        };
-    }
-
-    protected KieAssetsDropdownItem getKieAssetsDropdownItem(final String fullPath) {
-        int idx = fullPath.replaceAll("\\\\", "/").lastIndexOf('/');
-        final String fileName = idx >= 0 ? fullPath.substring(idx + 1) : fullPath;
-        return new KieAssetsDropdownItem(fileName, fullPath, fullPath, new HashMap<>());
-    }
-
-    private boolean isInTargetFolder(String path) {
-        return path.toLowerCase().startsWith(TARGET_FOLDER) || path.toLowerCase().contains(TARGET_FOLDER_NOT_ROOT);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/editor/ScenarioSimulationEditorActivity.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/editor/ScenarioSimulationEditorActivity.java
deleted file mode 100644
index 5f4e0fc..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/editor/ScenarioSimulationEditorActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.editor;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import com.google.gwt.user.client.ui.IsWidget;
-import elemental2.promise.Promise;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.editor.ScenarioSimulationEditorKogitoWrapper;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.backend.vfs.PathFactory;
-import org.uberfire.client.mvp.AbstractActivity;
-import org.uberfire.client.mvp.EditorActivity;
-import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.security.ResourceType;
-import org.uberfire.workbench.model.ActivityResourceType;
-import org.uberfire.workbench.model.bridge.Notification;
-
-@ApplicationScoped
-@Named(ScenarioSimulationEditorActivity.ID)
-public class ScenarioSimulationEditorActivity extends AbstractActivity implements EditorActivity {
-    public static final String ID = "ScenarioSimulationEditor";
-
-    private static final String BASE_URI = "/asserts/";
-    public static final String BASE_DMN_URI = BASE_URI + "dmn/";
-    public static final Path DMN_PATH = PathFactory.newPath("DMN", BASE_DMN_URI);
-
-    @Inject
-    protected ScenarioSimulationEditorKogitoWrapper scenarioSimulationEditorKogitoWrapper;
-
-    @Override
-    public void onStartup(final PlaceRequest place) {
-        super.onStartup(place);
-        scenarioSimulationEditorKogitoWrapper.onStartup(place);
-    }
-
-    @Override
-    public void onOpen() {
-        super.onOpen();
-    }
-
-    @Override
-    public void onClose() {
-        super.onClose();
-    }
-
-    @Override
-    public IsWidget getWidget() {
-        return scenarioSimulationEditorKogitoWrapper.getWidget();
-    }
-
-    @Override
-    public Promise<Void> setContent(String path, String value) {
-        return scenarioSimulationEditorKogitoWrapper.setContent(path, value);
-    }
-
-    @Override
-    public Promise<String> getContent() {
-        return scenarioSimulationEditorKogitoWrapper.getContent();
-    }
-
-    @Override
-    public Promise<String> getPreview() {
-        return null;
-    }
-
-    @Override
-    public Promise<List<Notification>> validate() {
-        return Promise.resolve(Collections.emptyList());
-    }
-
-    @Override
-    public String getIdentifier() {
-        return ID;
-    }
-
-    @Override
-    public ResourceType getResourceType() {
-        return ActivityResourceType.EDITOR;
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/Bs3Modal.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/Bs3Modal.java
deleted file mode 100644
index 7b4b38d..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/Bs3Modal.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.popup;
-
-import java.util.Objects;
-
-import javax.enterprise.context.Dependent;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.safehtml.shared.SafeHtmlUtils;
-import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.ui.IsWidget;
-import org.gwtbootstrap3.client.ui.Button;
-import org.gwtbootstrap3.client.ui.Modal;
-import org.gwtbootstrap3.client.ui.ModalBody;
-import org.gwtbootstrap3.client.ui.ModalFooter;
-import org.gwtbootstrap3.client.ui.constants.Attributes;
-import org.gwtbootstrap3.client.ui.constants.ButtonDismiss;
-import org.gwtbootstrap3.client.ui.constants.ButtonType;
-import org.gwtbootstrap3.client.ui.constants.ModalBackdrop;
-import org.uberfire.mvp.Command;
-
-/**
- * A modal dialog that floats above the workbench. Each instance can only be shown once.
- */
-@Dependent
-public class Bs3Modal extends Modal {
-
-    private final ModalBody body = GWT.create(ModalBody.class);
-
-    /**
-     * Used for enforcing the "only show one time" rule.
-     */
-    boolean hasBeenShown;
-
-    public Bs3Modal() {
-        setup();
-    }
-
-    protected void setup() {
-        this.add(body);
-        this.setDataBackdrop(ModalBackdrop.STATIC);
-        this.setFade(true);
-        this.setRemoveOnHide(true);
-        this.getElement().setAttribute(Attributes.ROLE,
-                                       "dialog");
-        this.getElement().setAttribute(Attributes.TABINDEX,
-                                       "-1");
-        this.setId(DOM.createUniqueId());
-    }
-
-    @Override
-    protected void onAttach() {
-        super.onAttach();
-        initFooter(this.getId());
-    }
-
-    private native void initFooter(final String id) /*-{
-        var footer = $wnd.jQuery('#' + id + ' .modal-footer');
-        if (footer.length == 0) {
-            this.@org.drools.workbench.screens.scenariosimulation.webapp.client.popup.Bs3Modal::addDefaultFooter()();
-        }
-    }-*/;
-
-    /**
-     * Shows this modal dialog above the current workbench.
-     *
-     * @param afterShown  the action to perform once the dialog has been shown. Not null. Use { Commands#DO_NOTHING} if you don't have an "after show" action.
-     * @param afterClosed the action to perform once the dialog has been dismissed. Not null. Use { Commands#DO_NOTHING} if you don't have an "after close" action.
-     */
-    public void show(final Command afterShown,
-                     final Command afterClosed) {
-
-        checkNotNull("afterShown", afterShown);
-        checkNotNull("afterClosed", afterClosed);
-        this.addShownHandler(showEvent -> {
-            if (afterShown != null) {
-                afterShown.execute();
-            }
-        });
-        this.addHiddenHandler(hiddenEvent -> {
-            if (afterClosed != null) {
-                afterClosed.execute();
-            }
-        });
-        this.show();
-    }
-
-    @Override
-    public void show() {
-        if (hasBeenShown) {
-            throw new IllegalStateException("This modal has already been shown. Create a new instance if you want to show another modal.");
-        }
-        super.show();
-    }
-
-    /**
-     * Replaces the contents within the main body area of the modal. By default, the main body area is empty.
-     *
-     * @param content the new content for the main body area.
-     */
-    public void setContent(IsWidget content) {
-        body.clear();
-        body.add(content);
-    }
-
-    protected void addDefaultFooter() {
-        final Button close = GWT.create(Button.class);
-        close.setText("OK");
-        close.setDataDismiss(ButtonDismiss.MODAL);
-        close.setType(ButtonType.PRIMARY);
-        setFooterContent(close);
-    }
-
-    public void setModalTitle(final String title) {
-        this.setTitle(SafeHtmlUtils.htmlEscape(title));
-    }
-
-    /**
-     * Replaces the current contents of the footer area with the given widget. By default (if you do not call this
-     * method), the footer contains an OK button that dismisses the dialog when clicked.
-     *
-     * @param content the new content for the footer area.
-     */
-    public void setFooterContent(IsWidget content) {
-        final ModalFooter footer = GWT.create(ModalFooter.class);
-        this.add(footer);
-        footer.add(content);
-    }
-
-    /**
-     * Sets the pixel height of the main content container.
-     */
-    public void setBodyHeight(int height) {
-        body.setHeight(height + "px");
-    }
-
-    private static <T> T checkNotNull(String objName, T obj) {
-        return Objects.requireNonNull(obj, "Parameter named '" + objName + "' should be not null!");
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ErrorPopupPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ErrorPopupPresenter.java
deleted file mode 100644
index 8e607aa..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ErrorPopupPresenter.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.popup;
-
-import java.util.Objects;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import org.uberfire.mvp.Command;
-
-/**
- * Shows simple text-only error messages in a modal popup dialog that sits above the workbench.
- * This is designed to be used only for reporting error conditions; to make a full-featured popup UI.
- */
-@ApplicationScoped
-public class ErrorPopupPresenter {
-
-    private final View view;
-
-    @Inject
-    public ErrorPopupPresenter(View view) {
-        this.view = view;
-    }
-
-    /**
-     * Shows the given message in a modal popup that appears above all other workbench contents.
-     *
-     * @param msg        The message to display as plain text. HTML tags are not interpreted, and newlines are rendered as newlines.
-     * @param afterShow  The command to invoke once the dialog has been displayed. Must not be null.
-     * @param afterClose The command to invoke once the dialog has been closed. Must not be null.
-     */
-    public void showMessage(final String msg,
-                            final Command afterShow,
-                            final Command afterClose) {
-        view.showMessage(msg,
-                         checkNotNull("afterShow", afterShow),
-                         checkNotNull("afterClose", afterClose));
-    }
-
-    /**
-     * Shows the given message in a modal popup that appears above all other workbench contents.
-     *
-     * @param msg The message to display as plain text. HTML tags are not interpreted, and newlines are rendered as newlines.
-     */
-    public void showMessage(final String msg) {
-        view.showMessage(msg,
-                         Commands.DO_NOTHING,
-                         Commands.DO_NOTHING);
-    }
-
-    private static <T> T checkNotNull(String objName, T obj) {
-        return Objects.requireNonNull(obj, "Parameter named '" + objName + "' should be not null!");
-    }
-
-    /**
-     * The interface that popup views implement. There should be exactly one implementation of this interface on the
-     * classpath at compile time, and it will usually come from a module that provides all such views.
-     */
-    public interface View {
-
-        /**
-         * Displays the given message in a modal dialog that sits above all other workbench components. The dialog
-         * should include some sort of user interface controls for dismissing itself.
-         *
-         * @param msg        The message to display as plain text. Not HTML; newlines should be rendered as newlines.
-         * @param afterShow  The command to invoke once the dialog has been displayed. Never null.
-         * @param afterClose The command to invoke once the dialog has been closed. Never null.
-         */
-        void showMessage(final String msg,
-                         final Command afterShow,
-                         final Command afterClose);
-    }
-
-    public static class Commands {
-        public static final Command DO_NOTHING = () -> {};
-
-        public Commands() {
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ErrorPopupView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ErrorPopupView.java
deleted file mode 100644
index 4aae3e0..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ErrorPopupView.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.popup;
-
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-
-import com.google.gwt.safehtml.shared.SafeHtmlUtils;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.HTML;
-import org.uberfire.mvp.Command;
-
-/**
- * A popup that shows an error message
- */
-@Dependent
-public class ErrorPopupView extends Composite implements ErrorPopupPresenter.View {
-
-    @Inject
-    private Instance<Bs3Modal> modalFactory;
-
-    @Override
-    public void showMessage(final String msg,
-                            final Command afterShow,
-                            final Command afterClose) {
-
-        final Bs3Modal modal = modalFactory.get();
-        modal.setModalTitle("Error");
-        modal.setContent(new HTML(SafeHtmlUtils.fromString(msg)));
-        modal.show(afterShow,
-                   afterClose);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/ScenarioSimulationKogitoRuntimeResourceContentService.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/ScenarioSimulationKogitoRuntimeResourceContentService.java
deleted file mode 100644
index fd098b6..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/ScenarioSimulationKogitoRuntimeResourceContentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.services;
-
-import javax.inject.Inject;
-
-import org.drools.workbench.screens.scenariosimulation.kogito.client.services.ScenarioSimulationKogitoResourceContentService;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.kie.workbench.common.kogito.webapp.base.client.workarounds.KogitoResourceContentService;
-import org.uberfire.backend.vfs.Path;
-
-public class ScenarioSimulationKogitoRuntimeResourceContentService implements ScenarioSimulationKogitoResourceContentService {
-
-    @Inject
-    private KogitoResourceContentService resourceContentService;
-
-    @Override
-    public void getFileContent(final Path path,
-                               final RemoteCallback<String> remoteCallback,
-                               final ErrorCallback<Object> errorCallback) {
-        resourceContentService.loadFile(path.toURI(), remoteCallback, errorCallback);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/workarounds/KogitoRuntimeAsyncPackageDataModelOracle.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/workarounds/KogitoRuntimeAsyncPackageDataModelOracle.java
deleted file mode 100644
index b970b2b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/workarounds/KogitoRuntimeAsyncPackageDataModelOracle.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.workarounds;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmo.KogitoAsyncPackageDataModelOracle;
-import org.drools.workbench.screens.scenariosimulation.model.dmo.ModelField;
-
-@ApplicationScoped
-public class KogitoRuntimeAsyncPackageDataModelOracle extends KogitoAsyncPackageDataModelOracle {
-
-    @Override
-    protected Map<String, String> retrieveParametricFieldMap() {
-        return new HashMap<>();
-    }
-
-    @Override
-    protected List<String> retrievePackageNames() {
-        return new ArrayList<>();
-    }
-
-    @Override
-    protected String[] retrieveFactTypes() {
-        return new String[0];
-    }
-
-    @Override
-    protected String[] retrieveFqcnNames() {
-        return fqcnNames;
-    }
-
-    @Override
-    protected Map<String, String> retrieveFqcnNamesMap() {
-        return new HashMap<>();
-    }
-
-    @Override
-    protected Map<String, Boolean> retrieveCollectionTypes() {
-        return new HashMap<>();
-    }
-
-    @Override
-    protected Map<String, ModelField[]> retrieveModelFieldsMap() {
-        return new HashMap<>();
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/resources/META-INF/ErraiApp.properties b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/resources/META-INF/ErraiApp.properties
deleted file mode 100644
index a2c5417..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/resources/META-INF/ErraiApp.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# 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. 
-#
-
-#
-# ErraiApp.properties
-#
-# Do not remove, even if empty!
-#
-# This is a marker file. When it is detected inside a JAR or at the
-# top of any classpath, the subdirectories are scanned for deployable
-# components. As such, all Errai application modules in a project
-# should contain an ErraiApp.properties at the root of all classpaths
-# that you wish to be scanned.
-#
-# There are also some configuration options that can be set in this
-# file, although it is rarely necessary. See the documentation at
-# https://docs.jboss.org/author/display/ERRAI/ErraiApp.properties
-# for details.
-errai.ioc.enabled.alternatives=org.uberfire.client.plugin.RuntimePluginsServiceProxyClientImpl \
-                               org.uberfire.client.workbench.VFSServiceProxyClientImpl \
-                               org.uberfire.client.workbench.VFSLockServiceProxyClientImpl \
-                               org.uberfire.client.workbench.WorkbenchServicesProxyClientImpl \ 
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/resources/logback.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/resources/logback.xml
deleted file mode 100644
index 0f2dddc..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/resources/logback.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<configuration>
-  <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <!-- %l lowers performance -->
-      <!--<pattern>%d [%t] %-5p %l%n  %m%n</pattern>-->
-      <pattern>%d [%t] %-5p %m%n</pattern>
-    </encoder>
-  </appender>
-
-  <logger name="org.drools" level="info" />
-
-  <root level="warn">
-    <appender-ref ref="consoleAppender" />
-  </root>
-</configuration>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/resources/org/drools/workbench/screens/scenariosimulation/webapp/DroolsWorkbenchScenarioSimulationKogitoRuntime.gwt.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/resources/org/drools/workbench/screens/scenariosimulation/webapp/DroolsWorkbenchScenarioSimulationKogitoRuntime.gwt.xml
deleted file mode 100644
index 39731e1..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/resources/org/drools/workbench/screens/scenariosimulation/webapp/DroolsWorkbenchScenarioSimulationKogitoRuntime.gwt.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  ~ 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.      
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN"
-  "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
-<module>
-  <inherits name="org.uberfire.UberfireAPI" />
-
-  <inherits name="org.uberfire.client.views.PatternFlyTheme" />
-
-  <!-- Errai, Drools etc -->
-  <inherits name="org.kie.workbench.common.kogito.KogitoClient" />
-  <inherits name="org.kie.workbench.common.widgets.KieWorkbenchWidgetsCommon" />
-
-  <inherits name="org.kie.workbench.common.kogito.webapp.base.KogitoWebappBase" />
-  <inherits
-    name='org.drools.workbench.screens.scenariosimulation.kogito.DroolsWorkbenchScenarioSimulationKogitoEditor'
-  />
-
-  <inherits name="org.guvnor.common.services.GuvnorCommonServices" />
-  <inherits name="org.drools.workbench.screens.scenariosimulation.DroolsWorkbenchScenarioSimulationEditorAPI" />
-  <inherits name='org.drools.workbench.screens.scenariosimulation.DroolsWorkbenchScenarioSimulationEditorClient' />
-
-  <inherits name="org.kie.workbench.common.command.KieWorkbenchCommonCommand" />
-  <inherits name="org.kie.workbench.common.KieWorkbenchCommonWidgets" />
-
-  <!-- We only need Chrome -->
-  <set-property name="user.agent" value="safari" />
-
-  <!-- To change the default logLevel -->
-  <set-property name="gwt.logging.logLevel" value="SEVERE" />
-
-  <!-- To enable logging -->
-  <set-property name="gwt.logging.enabled" value="TRUE" />
-
-  <!-- Configure Errai to return default values for missing i18n keys -->
-  <set-property name="errai.i18n.default_per_key" value="true" />
-
-  <!-- Specify the paths for translatable code -->
-  <source path="client" />
-
-  <replace-with class="org.uberfire.client.workbench.WorkbenchCloseHandlerImplFallback">
-    <when-type-is class="org.uberfire.client.workbench.WorkbenchCloseHandler" />
-  </replace-with>
-
-  <!-- Temporary workaround for ClassCastExceptions happening on DMN Marshaller models -->
-  <set-property name="jre.checks.type" value="DISABLED" />
-  <set-property name="jre.checkedMode" value="DISABLED" />
-</module>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/webapp/WEB-INF/web.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 2fb7c85..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<web-app
-  version="2.5"
-  xmlns="http://java.sun.com/xml/ns/javaee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
->
-  <welcome-file-list>
-    <welcome-file>test.html</welcome-file>
-  </welcome-file-list>
-</web-app>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/webapp/favicon.ico b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/webapp/favicon.ico
deleted file mode 100644
index cefe23f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/webapp/favicon.ico
+++ /dev/null
Binary files differ
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/webapp/index.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/webapp/index.html
deleted file mode 100644
index 90cb9bb..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/main/webapp/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!doctype html>
-<!--
-  ~ 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.      
--->
-
-<html>
-  <head>
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
-    <title>Scenario Simulation Kogito Runtime</title>
-    <link
-      href="org.drools.workbench.screens.scenariosimulation.webapp.DroolsWorkbenchScenarioSimulationKogitoRuntime/css/patternfly.min.css"
-      rel="stylesheet"
-    />
-
-    <!-- Marshalling required scripts -->
-    <!-- SCESIM-->
-    <script src="model/SCESIM.js" type="text/javascript"></script>
-    <script src="model/SCESIMMainJs.js" type="text/javascript"></script>
-    <!-- DMN-->
-    <script src="model/DC.js" type="text/javascript"></script>
-    <script src="model/DI.js" type="text/javascript"></script>
-    <script src="model/DMN12.js" type="text/javascript"></script>
-    <script src="model/DMNDI12.js" type="text/javascript"></script>
-    <script src="model/KIE.js" type="text/javascript"></script>
-    <script src="model/MainJs.js" type="text/javascript"></script>
-    <!-- COMMON -->
-    <script src="model/Jsonix-all.js" type="text/javascript"></script>
-    <!-- End Marshalling requirements -->
-  </head>
-  <body>
-    <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe>
-
-    <!-- To turn off/on remote communication in the client bus -->
-    <script type="text/javascript">
-      erraiBusRemoteCommunicationEnabled = false;
-    </script>
-    <!-- loading indicator. the js app hides this once it's loaded. -->
-    <!-- The GWT js file generated at run time -->
-    <script
-      src="org.drools.workbench.screens.scenariosimulation.webapp.DroolsWorkbenchScenarioSimulationKogitoRuntime/org.drools.workbench.screens.scenariosimulation.webapp.DroolsWorkbenchScenarioSimulationKogitoRuntime.nocache.js"
-      type="text/javascript"
-    ></script>
-  </body>
-</html>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/test/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/test/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplTest.java
deleted file mode 100644
index 4c6e7f3..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/test/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplTest.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.dropdown;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-import com.google.gwtmockito.GwtMockitoTestRunner;
-import org.drools.workbench.screens.scenariosimulation.webapp.client.popup.ErrorPopupPresenter;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.kogito.webapp.base.client.workarounds.KogitoResourceContentService;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(GwtMockitoTestRunner.class)
-public class ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplTest {
-    
-    @Mock
-    private KogitoResourceContentService kogitoResourceContentServiceMock;
-    @Mock
-    private ErrorPopupPresenter errorPopupPresenterMock;
-    @Mock
-    private Consumer<List<KieAssetsDropdownItem>> assetConsumer;
-    @Captor
-    private ArgumentCaptor<List<KieAssetsDropdownItem>> dropDownListCaptor;
-
-    private ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImpl scenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplSpy;
-
-
-    @Before
-    public void setup() {
-        scenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplSpy = spy(new ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImpl() {
-            {
-                this.resourceContentService = kogitoResourceContentServiceMock;
-                this.errorPopupPresenter = errorPopupPresenterMock;
-            }
-        });
-    }
-
-    @Test
-    public void getItems() {
-        scenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplSpy.getItems(assetConsumer);
-        verify(kogitoResourceContentServiceMock, times(1)).getFilteredItems(eq(ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImpl.DMN_FILE_SEARCH_PATTERN),
-                                                                                                 isA(RemoteCallback.class),
-                                                                                                 isA(ErrorCallback.class));
-    }
-
-    @Test
-    public void getRemoteCallBack() {
-        RemoteCallback<List<String>> remoteCallBack = scenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplSpy.getRemoteCallback(assetConsumer);
-        remoteCallBack.callback(Arrays.asList("path/B", "a", "target/a", "TARGET/a", "/target/a", "/TARGET/a", "a/target/b", "a/TARGET/b", "mytarget/C", "q/mytarget/D"));
-        verify(assetConsumer, times(1)).accept(dropDownListCaptor.capture());
-        assertEquals(4, dropDownListCaptor.getValue().size());
-        assertEquals("a", dropDownListCaptor.getValue().get(0).getText());
-        assertEquals("a", dropDownListCaptor.getValue().get(0).getSubText());
-        assertEquals("a", dropDownListCaptor.getValue().get(0).getValue());
-        assertEquals("B", dropDownListCaptor.getValue().get(1).getText());
-        assertEquals("path/B", dropDownListCaptor.getValue().get(1).getSubText());
-        assertEquals("path/B", dropDownListCaptor.getValue().get(1).getValue());
-        assertEquals("C", dropDownListCaptor.getValue().get(2).getText());
-        assertEquals("mytarget/C", dropDownListCaptor.getValue().get(2).getSubText());
-        assertEquals("mytarget/C", dropDownListCaptor.getValue().get(2).getValue());
-        assertEquals("D", dropDownListCaptor.getValue().get(3).getText());
-        assertEquals("q/mytarget/D", dropDownListCaptor.getValue().get(3).getSubText());
-        assertEquals("q/mytarget/D", dropDownListCaptor.getValue().get(3).getValue());
-    }
-
-    @Test
-    public void remoteCallBackSortedIgnoreCase(){
-        RemoteCallback<List<String>> remoteCallBack = scenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplSpy.getRemoteCallback(assetConsumer);
-        List<String> dmnFiles = Arrays.asList("AS", "Ap");
-        remoteCallBack.callback(dmnFiles);
-        verify(assetConsumer, times(1)).accept(dropDownListCaptor.capture());
-        Collections.sort(dmnFiles, String::compareToIgnoreCase);
-        assertEquals(dmnFiles,
-                     dropDownListCaptor.getValue().stream().map(KieAssetsDropdownItem::getValue).collect(Collectors.toList()));
-    }
-
-    @Test
-    public void getErrorCallback() {
-        ErrorCallback<Object> errorCallback = scenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplSpy.getErrorCallback();
-        assertFalse(errorCallback.error("message", new Throwable("ex")));
-        verify(errorPopupPresenterMock, times(1)).showMessage(eq("message: ex"));
-    }
-
-    @Test
-    public void getKieAssetsDropdownItemFileWithoutPath() {
-        String fullPath = "filename.etc";
-        KieAssetsDropdownItem item = scenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplSpy.getKieAssetsDropdownItem(fullPath);
-        assertNotNull(item);
-        assertEquals(fullPath, item.getValue());
-        assertEquals(fullPath, item.getSubText());
-        assertEquals(fullPath, item.getText());
-    }
-
-    @Test
-    public void getKieAssetsDropdownItemFileWithPath() {
-        String path = "path/";
-        String fileName = "filename.etc";
-        String fullPath = path + fileName;
-        KieAssetsDropdownItem item = scenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplSpy.getKieAssetsDropdownItem(fullPath);
-        assertNotNull(item);
-        assertEquals(fullPath, item.getValue());
-        assertEquals(fullPath, item.getSubText());
-        assertEquals(fileName, item.getText());
-    }
-
-    @Test
-    public void getKieAssetsDropdownItemFileWithLongPath() {
-        String path = "long/path/";
-        String fileName = "filename.etc";
-        String fullPath = path + fileName;
-        KieAssetsDropdownItem item = scenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplSpy.getKieAssetsDropdownItem(fullPath);
-        assertNotNull(item);
-        assertEquals(fullPath, item.getValue());
-        assertEquals(fullPath, item.getSubText());
-        assertEquals(fileName, item.getText());
-    }
-
-    @Test
-    public void getKieAssetsDropdownItemFileWithPathWindows() {
-        String path = "path\\";
-        String fileName = "filename.etc";
-        String fullPath = path + fileName;
-        KieAssetsDropdownItem item = scenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplSpy.getKieAssetsDropdownItem(fullPath);
-        assertNotNull(item);
-        assertEquals(fullPath, item.getValue());
-        assertEquals(fullPath, item.getSubText());
-        assertEquals(fileName, item.getText());
-    }
-
-    @Test
-    public void getKieAssetsDropdownItemFileWithLongPathWindows() {
-        String path = "long\\pat\\";
-        String fileName = "filename.etc";
-        String fullPath = path + fileName;
-        KieAssetsDropdownItem item = scenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImplSpy.getKieAssetsDropdownItem(fullPath);
-        assertNotNull(item);
-        assertEquals(fullPath, item.getValue());
-        assertEquals(fullPath, item.getSubText());
-        assertEquals(fileName, item.getText());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/test/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/ScenarioSimulationKogitoRuntimeResourceContentServiceTest.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/test/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/ScenarioSimulationKogitoRuntimeResourceContentServiceTest.java
deleted file mode 100644
index 70a5352..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/src/test/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/ScenarioSimulationKogitoRuntimeResourceContentServiceTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.services;
-
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.workbench.common.kogito.webapp.base.client.workarounds.KogitoResourceContentService;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.backend.vfs.PathFactory;
-
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ScenarioSimulationKogitoRuntimeResourceContentServiceTest {
-
-    @InjectMocks
-    private ScenarioSimulationKogitoRuntimeResourceContentService scenarioSimulationKogitoRuntimeResourceContentService;
-    @Mock
-    private KogitoResourceContentService kogitoResourceContentService;
-    @Mock
-    private RemoteCallback<String> callbackMock;
-    @Mock
-    private ErrorCallback<Object> errorCallBackMock;
-
-    @Test
-    public void getFileContent() {
-        Path path = PathFactory.newPath("fileName.dmn", "/home/project");
-        scenarioSimulationKogitoRuntimeResourceContentService.getFileContent(path, callbackMock, errorCallBackMock);
-        verify(kogitoResourceContentService, times(1)).loadFile("/home/project", callbackMock, errorCallBackMock);
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/README.md b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/README.md
deleted file mode 100644
index 46ed0ef..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-   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.
--->
-
-# Kogito Runtime Webapp
-
-This webapp is meant as runtime environment. It **does not provides** methods and functions (ex. file retrieval) that should be provided by running environment (ex. vs code).
-
-## Chrome testing
-
-Some minimal tests may be done in the following way:
-
-1. full compilation (i.e. included GWT compilation) of the runtime module
-2. open the `drools-wb/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/target/drools-wb-scenario-simulation-editor-kogito-runtime/index.html` file inside Chrome
-3. inside the Chrome dev console, issue the command `$wnd.gwtEditorBeans.get("ScenarioSimulationEditor").get().setContent("", "")`; this will create a new - empty - scesim file.
-4. Some tricks: to avoid CORS and other policy-related issues:
-   - enable chrome://flags/#temporary-unexpire-flags-m118 flag
-   - set chrome://flags/#allow-insecure-localhost for invalid certificates error
-   - start chrome from cli with the command `chrome --allow-file-access-from-files` to allow loading from file.
-   - Open index.html file:///(path_to_file)/index.html and get no dev compilation error.
-5. $wnd.gwtEditorBeans.get("ScenarioSimulationEditor").get().setContent("") inside dev console
-6. edit the asset
-7. invoke $wnd.gwtEditorBeans.get("ScenarioSimulationEditor").get().getContent() inside dev console and store the returned xml
-8. invoke $wnd.gwtEditorBeans.get("ScenarioSimulationEditor").get().setContent("","") method with the stored xml
-
-## VSCODE Integration
-
-1. clone https://github.com/apache/incubator-kie-tools
-2. Launch pnpm init on kie-tools directory
-3. Launch pnpm build:prod (pnpm build:fast to skip tests)
-4. Launch VS Code (you can find it in a path similar to: `kie-tools/packages/kie-editors-dev-vscode-extension/.vscode-test/vscode-1.43.0/VSCode-linux-x64/bin/code` ) with `--enable-proposed-api kiegroup.kie-editors-dev-vscode-extension` parameter
-5. In VS Code, open kie-tools/packages/kie-editors-dev-vscode-extension/ folder
-6. Launch DEBUG MODE (F5)
-7. Try to open a SCESIM file or to create a new one
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/pom.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/pom.xml
deleted file mode 100644
index 4be3fd5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/pom.xml
+++ /dev/null
@@ -1,579 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
-  <parent>
-    <artifactId>drools-wb-scenario-simulation-editor</artifactId>
-    <groupId>org.kie.kogito.stunner.editors</groupId>
-    <version>${revision}</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>drools-wb-scenario-simulation-editor-kogito-testing</artifactId>
-  <packaging>war</packaging>
-
-  <name>Drools Workbench - Scenario Simulation Editor - Kogito - Testing Webapp</name>
-  <description>Drools Workbench - Scenario Simulation Editor - Kogito - Testing Webapp</description>
-
-  <properties>
-    <gwt.helper.includes>Client,Marshaller,KogitoEditor,WebappBase</gwt.helper.includes>
-    <gwt.helper.rootDirectories>${project.parent.basedir}/</gwt.helper.rootDirectories>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Errai -->
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-ioc</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.spec.javax.annotation</groupId>
-          <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-ui</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-data-binding</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-cdi-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-cdi-shared</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-codegen-gwt</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- GWT/Errai Bean Validation - JSR303 -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>errai-validation</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-validator</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-validator</artifactId>
-      <scope>provided</scope>
-      <classifier>sources</classifier>
-    </dependency>
-
-    <!-- Core UberFire dependencies -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>appformer-client-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>appformer-kogito-bridge</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-client-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-simple-docks-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-workbench-processors</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-workbench-client-views-patternfly</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-commons-editor-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- UberFire Kogito dependencies -->
-    <dependency>
-      <groupId>com.google.elemental2</groupId>
-      <artifactId>elemental2-promise</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Generic ui components -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-widgets-commons</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-widgets-table</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-ui</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- GWT and extensions -->
-    <dependency>
-      <groupId>org.gwtproject</groupId>
-      <artifactId>gwt-user</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.gwtproject</groupId>
-      <artifactId>gwt-dev</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-codec</groupId>
-          <artifactId>commons-codec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.gwtbootstrap3</groupId>
-      <artifactId>gwtbootstrap3</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.gwtbootstrap3</groupId>
-      <artifactId>gwtbootstrap3-extras</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.elemental2</groupId>
-      <artifactId>elemental2-dom</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Kogito -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-kogito-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-kogito-webapp-base</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.spec.javax.annotation</groupId>
-          <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-kogito-webapp-base</artifactId>
-      <scope>provided</scope>
-      <classifier>sources</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.spec.javax.annotation</groupId>
-          <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>kie-wb-common-dmn-webapp-kogito-marshaller</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>com.google.gwt.gwtmockito</groupId>
-      <artifactId>gwtmockito</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Transient dependencies -->
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>base</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>jsinterop-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-workbench-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-commons-editor-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Scenario Simulation -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>drools-wb-scenario-simulation-editor-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>appformer-kogito-bridge</artifactId>
-      <classifier>sources</classifier>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Add for enforcer -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>lienzo-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-scenario-simulation-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>drools-wb-scenario-simulation-editor-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>drools-wb-scenario-simulation-editor-kogito-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>uberfire-wires-core-grids</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.elemental2</groupId>
-      <artifactId>elemental2-webstorage</artifactId>
-    </dependency>
-
-    <!-- MARSHALLING -->
-    <dependency>
-      <groupId>org.kie.kogito.stunner.editors</groupId>
-      <artifactId>drools-wb-scenario-simulation-editor-kogito-marshaller</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- END MARSHALLING -->
-  </dependencies>
-
-  <build>
-    <finalName>${project.artifactId}</finalName>
-    <outputDirectory>src/main/webapp/WEB-INF/classes</outputDirectory>
-
-    <plugins>
-      <!-- Include additional sources path for hot reload -->
-      <plugin>
-        <groupId>org.kie</groupId>
-        <artifactId>kie-gwthelper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <includes>${gwt.helper.includes}</includes>
-              <!-- will include all GWT module whose configuration file name match that pattern -->
-              <rootDirectories>${gwt.helper.rootDirectories}</rootDirectories>
-              <!-- will search inside those directories -->
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}</directory>
-              <includes>
-                <include
-                >src/main/webapp/org.drools.workbench.screens.scenariosimulation.webapp.DroolsWorkbenchScenarioSimulationKogitoTesting/</include>
-                <include>src/main/webapp/WEB-INF/deploy/</include>
-                <include>src/main/webapp/WEB-INF/classes/</include>
-                <include>src/main/webapp/WEB-INF/lib/</include>
-                <include>src/main/webapp/model/</include>
-                <include>src/main/gwt-unitCache</include>
-                <include>**/gwt-unitCache/**</include>
-                <include>.gwt/**</include>
-                <include>.errai/</include>
-                <include>.index/**</include>
-                <include>**/*.JUnit/**</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-marshaller-js</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}/src/main/webapp/model</outputDirectory>
-              <resources>
-                <resource>
-                  <directory
-                  >${project.parent.basedir}/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/js/</directory>
-                  <includes>
-                    <include>**/*.js</include>
-                  </includes>
-                </resource>
-                <resource>
-                  <directory
-                  >${project.build.directory}/Marshaller/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js</directory>
-                  <includes>
-                    <include>**/*.js</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <configuration>
-          <deploy>${project.build.directory}/gwt-symbols-deploy</deploy>
-          <localWorkers>4</localWorkers>
-          <module
-          >org.drools.workbench.screens.scenariosimulation.webapp.DroolsWorkbenchScenarioSimulationKogitoTesting</module>
-          <extraJvmArgs
-          >-Xmx3G -Xms512m -Xss1M -XX:CompileThreshold=7000 -XX:+UseSerialGC -Derrai.dynamic_validation.enabled=true</extraJvmArgs>
-          <optimizationLevel>9</optimizationLevel>
-          <style>OBFUSCATED</style>
-          <logLevel>INFO</logLevel>
-          <noServer>false</noServer>
-          <runTarget>test.html</runTarget>
-          <strict>true</strict>
-          <printJavaCommandOnError>false</printJavaCommandOnError>
-          <productionMode>true</productionMode>
-          <hostedWebapp>src/main/webapp</hostedWebapp>
-          <generateJsInteropExports>true</generateJsInteropExports>
-
-          <compileSourcesArtifacts>
-            <!-- UberFire -->
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-client-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-workbench-client</compileSourcesArtifact>
-            <compileSourcesArtifact
-            >org.kie.kogito.stunner.editors:uberfire-workbench-client-views-patternfly</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-simple-docks-client</compileSourcesArtifact>
-
-            <!-- Errai, Drools etc -->
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors::errai-data-binding</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:kie-wb-common-ui</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:kie-wb-common-kogito-client</compileSourcesArtifact>
-
-            <!-- UF-ext -->
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-commons-editor-api</compileSourcesArtifact>
-            <compileSourcesArtifact
-            >org.kie.kogito.stunner.editors:uberfire-commons-editor-client</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-widgets-commons</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-widgets-table</compileSourcesArtifact>
-
-            <!-- Uberfire Experimentals -->
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-wires-core-grids</compileSourcesArtifact>
-            <compileSourcesArtifact
-            >org.kie.kogito.stunner.editors:drools-wb-scenario-simulation-editor-client</compileSourcesArtifact>
-            <compileSourcesArtifact
-            >org.kie.kogito.stunner.editors:drools-wb-scenario-simulation-editor-api</compileSourcesArtifact>
-
-            <!-- Appformer -->
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:uberfire-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:appformer-client-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.kie.kogito.stunner.editors:appformer-kogito-bridge</compileSourcesArtifact>
-
-            <!-- drools-wb -->
-            <compileSourcesArtifact
-            >org.kie.kogito.stunner.editors:drools-wb-scenario-simulation-editor-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.drools:drools-scenario-simulation-api</compileSourcesArtifact>
-            <!-- DMN Marshaller -->
-            <compileSourcesArtifact
-            >org.kie.kogito.stunner.editors:kie-wb-common-dmn-webapp-kogito-marshaller</compileSourcesArtifact>
-          </compileSourcesArtifacts>
-        </configuration>
-        <executions>
-          <execution>
-            <id>gwt-clean</id>
-            <phase>clean</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>gwt-compile</id>
-            <goals>
-              <!-- Do not use 'resources' goal as it does not play well with filtered resources. -->
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <!-- Removing unused inherited modules like ace and monaco-editor-->
-          <packagingExcludes>
-            **/javax/**/*.*,
-            **/client/**/*.class,
-            **/*.symbolMap,
-            WEB-INF/classes/**,
-            **/ace/**,
-            **/monaco-editor/dev/vs/*.*,
-            **/monaco-editor/dev/vs/base/**,
-            **/monaco-editor/dev/vs/basic-languages/**,
-            **/monaco-editor/dev/vs/editor/*.js,
-            **/monaco-editor/dev/vs/language/**,
-          </packagingExcludes>
-          <archive>
-            <addMavenDescriptor>false</addMavenDescriptor>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>Unpack External Marshaller JS from dependency</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.kie.kogito.stunner.editors</groupId>
-                  <artifactId>kie-wb-common-dmn-webapp-kogito-marshaller</artifactId>
-                  <type>jar</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/Marshaller</outputDirectory>
-                  <includes>**/*.js</includes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <!-- Profile to disable GWT compilation of showcase (useful in full downstream builds) -->
-    <profile>
-      <id>no-showcase</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>gwt-maven-plugin</artifactId>
-            <configuration>
-              <skip>true</skip>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoLoadingScesimAssetsDropdownProviderImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoLoadingScesimAssetsDropdownProviderImpl.java
deleted file mode 100644
index 54c2578..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoLoadingScesimAssetsDropdownProviderImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.dropdown;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import com.google.gwt.core.client.GWT;
-import org.drools.workbench.screens.scenariosimulation.webapp.client.services.TestingVFSService;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItemsProvider;
-import org.uberfire.backend.vfs.Path;
-
-@Dependent
-public class ScenarioSimulationKogitoLoadingScesimAssetsDropdownProviderImpl implements KieAssetsDropdownItemsProvider {
-
-    private static final String FILE_SUFFIX = "scesim";
-
-    @Inject
-    private TestingVFSService testingVFSService;
-
-    @Override
-    public void getItems(Consumer<List<KieAssetsDropdownItem>> assetListConsumer) {
-        getItems(response -> {
-            List<KieAssetsDropdownItem> toAccept = response.stream()
-                    .map(this::getKieAssetsDropdownItem)
-                    .collect(Collectors.toList());
-            assetListConsumer.accept(toAccept);
-        }, (message, throwable) -> {
-            GWT.log(message.toString(), throwable);
-            return false;
-        });
-    }
-
-    public void getItems(final RemoteCallback<List<Path>> callback, final ErrorCallback<Object> errorCallback) {
-    }
-
-    KieAssetsDropdownItem getKieAssetsDropdownItem(final Path asset) {
-        return new KieAssetsDropdownItem(asset.getFileName(), "", asset.toURI(), new HashMap<>());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoLoadingScesimDropdown.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoLoadingScesimDropdown.java
deleted file mode 100644
index 6f265a7..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoLoadingScesimDropdown.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.dropdown;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.drools.workbench.screens.scenariosimulation.client.dropdown.ScenarioSimulationDropdownView;
-import org.kie.workbench.common.widgets.client.assets.dropdown.AbstractKieAssetsDropdown;
-
-@Dependent
-public class ScenarioSimulationKogitoLoadingScesimDropdown extends AbstractKieAssetsDropdown {
-
-    @Inject
-    public ScenarioSimulationKogitoLoadingScesimDropdown(@Named(ScenarioSimulationDropdownView.BEAN_NAME) ScenarioSimulationDropdownView view, ScenarioSimulationKogitoLoadingScesimAssetsDropdownProviderImpl dataProvider) {
-        super(view, dataProvider);
-    }
-}
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImpl.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImpl.java
deleted file mode 100644
index 8391cf5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/dropdown/ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.dropdown;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import com.google.gwt.core.client.GWT;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dropdown.ScenarioSimulationKogitoCreationAssetsDropdownProvider;
-import org.drools.workbench.screens.scenariosimulation.webapp.client.services.TestingVFSService;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.uberfire.backend.vfs.Path;
-
-import static org.drools.workbench.screens.scenariosimulation.webapp.client.editor.ScenarioSimulationEditorActivity.DMN_PATH;
-
-@Dependent
-public class ScenarioSimulationKogitoRuntimeCreationAssetsDropdownProviderImpl implements ScenarioSimulationKogitoCreationAssetsDropdownProvider {
-
-    private static final String FILE_SUFFIX = "dmn";
-
-    @Inject
-    private TestingVFSService testingVFSService;
-
-    @Override
-    public void getItems(Consumer<List<KieAssetsDropdownItem>> assetListConsumer) {
-        getItems(response -> {
-            List<KieAssetsDropdownItem> toAccept = response.stream()
-                    .map(this::getKieAssetsDropdownItem)
-                    .collect(Collectors.toList());
-            assetListConsumer.accept(toAccept);
-        }, (message, throwable) -> {
-            GWT.log(message.toString() + " " + message.toString(), throwable);
-            return false;
-        });
-    }
-
-    protected void getItems(final RemoteCallback<List<Path>> callback, final ErrorCallback<Object> errorCallback) {
-        testingVFSService.getItemsByPath(DMN_PATH, FILE_SUFFIX, callback, errorCallback);
-    }
-
-    protected KieAssetsDropdownItem getKieAssetsDropdownItem(final Path asset) {
-        return new KieAssetsDropdownItem(asset.getFileName(), "", asset.toURI(), new HashMap<>());
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/editor/ScenarioSimulationEditorActivity.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/editor/ScenarioSimulationEditorActivity.java
deleted file mode 100644
index 926fa89..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/editor/ScenarioSimulationEditorActivity.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.editor;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.IsWidget;
-import elemental2.dom.DomGlobal;
-import elemental2.promise.Promise;
-import jsinterop.annotations.JsFunction;
-import jsinterop.base.Js;
-import org.drools.workbench.screens.scenariosimulation.client.popup.FileUploadPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.editor.ScenarioSimulationEditorKogitoWrapper;
-import org.drools.workbench.screens.scenariosimulation.webapp.client.popup.ScenarioSimulationKogitoLoadingScesimPopupPresenter;
-import org.drools.workbench.screens.scenariosimulation.webapp.client.services.TestingVFSService;
-import org.gwtbootstrap3.client.ui.Popover;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.backend.vfs.PathFactory;
-import org.uberfire.client.mvp.AbstractActivity;
-import org.uberfire.client.mvp.EditorActivity;
-import org.uberfire.mvp.Command;
-import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.security.ResourceType;
-import org.uberfire.workbench.model.ActivityResourceType;
-import org.uberfire.workbench.model.bridge.Notification;
-
-@ApplicationScoped
-@Named(ScenarioSimulationEditorActivity.ID)
-public class ScenarioSimulationEditorActivity extends AbstractActivity implements EditorActivity {
-    public static final String ID = "ScenarioSimulationEditor";
-
-    private static final String BASE_URI = "/asserts/";
-    public static final String BASE_DMN_URI = BASE_URI + "dmn/";
-    public static final String BASE_SCESIM_URI = BASE_URI + "scesim/";
-    public static final Path DMN_PATH = PathFactory.newPath("DMN", BASE_DMN_URI);
-    public static final Path SCESIM_PATH = PathFactory.newPath("SCESIM", BASE_SCESIM_URI);
-
-    @Inject
-    protected TestingVFSService testingVFSService;
-
-    @Inject
-    protected FileUploadPopupPresenter fileUploadPopupPresenter;
-
-    @Inject
-    protected ScenarioSimulationEditorKogitoWrapper scenarioSimulationEditorKogitoWrapper;
-
-    @Inject
-    protected ScenarioSimulationKogitoLoadingScesimPopupPresenter loadScesimPopupPresenter;
-
-    @Override
-    public void onStartup(final PlaceRequest place) {
-        super.onStartup(place);
-        scenarioSimulationEditorKogitoWrapper.onStartup(place);
-    }
-
-    @Override
-    public void onOpen() {
-        super.onOpen();
-    }
-
-    @Override
-    public void onClose() {
-        super.onClose();
-    }
-
-    @Override
-    public IsWidget getWidget() {
-        return scenarioSimulationEditorKogitoWrapper.getWidget();
-    }
-
-    @Override
-    public Promise<Void> setContent(String path, String value) {
-        return scenarioSimulationEditorKogitoWrapper.setContent(path, value);
-    }
-
-    @Override
-    public Promise<String> getContent() {
-        return scenarioSimulationEditorKogitoWrapper.getContent();
-    }
-
-    @Override
-    public Promise<String> getPreview() {
-        return null;
-    }
-
-    @Override
-    public Promise<List<Notification>> validate() {
-        return Promise.resolve(Collections.emptyList());
-    }
-
-    @Override
-    public String getIdentifier() {
-        return ID;
-    }
-
-    @Override
-    public ResourceType getResourceType() {
-        return ActivityResourceType.EDITOR;
-    }
-
-    @PostConstruct
-    public void init() {
-        Js.asPropertyMap(DomGlobal.window).set("importDMN", (DoAction) () -> {
-            importDMN();
-        });
-
-        Js.asPropertyMap(DomGlobal.window).set("importSCESIM", (DoAction) () -> {
-            importSCESIM();
-        });
-
-        Js.asPropertyMap(DomGlobal.window).set("loadFile", (DoAction) () -> {
-            loadFile();
-        });
-    }
-
-    protected void importDMN() {
-        createImportCommand("dmn", BASE_DMN_URI, "Choose a DMN file");
-    }
-
-    protected void importSCESIM() {
-        createImportCommand("scesim", BASE_SCESIM_URI, "Choose a SCESIM file");
-    }
-
-    protected void loadFile() {
-        Command loadCommand = () -> {
-            String fullUri = loadScesimPopupPresenter.getSelectedPath();
-            String fileName = fullUri.substring(fullUri.lastIndexOf('/') + 1);
-            final Path path = PathFactory.newPath(fileName, fullUri);
-            testingVFSService.loadFile(path, content -> {
-                scenarioSimulationEditorKogitoWrapper.gotoPath(path);
-                scenarioSimulationEditorKogitoWrapper.setContent(null, content);
-            }, getErrorCallback("Failed to load"));
-        };
-        loadScesimPopupPresenter.show("Choose SCESIM", loadCommand);
-    }
-
-    protected ErrorCallback<String> getErrorCallback(String prependMessage) {
-        return (message, throwable) -> {
-            GWT.log(prependMessage + ": " + message, throwable);
-            return false;
-        };
-    }
-
-    protected void showPopover(String title, String content) {
-        new Popover(title, content).show();
-    }
-
-    protected void saveFile(final Path path, final String content) {
-        testingVFSService.saveFile(path, content,
-                                   item -> GWT.log("Saved " + item),
-                                   getErrorCallback("Failed to save"));
-    }
-
-    protected void createImportCommand(String extension, String uri, String mainTitleText) {
-        Command okImportCommand = () -> {
-            String fileName = fileUploadPopupPresenter.getFileName();
-            if (fileName == null || fileName.isEmpty()) {
-                showPopover("ERROR", "Missing file name");
-                return;
-            }
-            fileName = fileName.replaceAll("\\s+", "_");
-            String content = fileUploadPopupPresenter.getFileContents();
-            final Path path = PathFactory.newPath(fileName, uri + fileName);
-            saveFile(path, content);
-        };
-        fileUploadPopupPresenter.show(Collections.singletonList(extension),
-                                      mainTitleText,
-                                      ScenarioSimulationEditorConstants.INSTANCE.importLabel(),
-                                      okImportCommand);
-    }
-
-    @FunctionalInterface
-    @JsFunction
-    public interface DoAction {
-
-        void onInvoke();
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ScenarioSimulationKogitoLoadingScesimPopupPresenter.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ScenarioSimulationKogitoLoadingScesimPopupPresenter.java
deleted file mode 100644
index 54cd061..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ScenarioSimulationKogitoLoadingScesimPopupPresenter.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.popup;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.popup.ScenarioSimulationKogitoCreationPopup;
-import org.uberfire.mvp.Command;
-
-@Dependent
-public class ScenarioSimulationKogitoLoadingScesimPopupPresenter implements ScenarioSimulationKogitoCreationPopup.Presenter {
-
-    @Inject
-    protected ScenarioSimulationKogitoLoadingScesimPopupView loadScesimPopupView;
-
-    @Override
-    public void show(String mainTitleText, Command okCommand) {
-        loadScesimPopupView.show(mainTitleText, okCommand);
-    }
-
-    @Override
-    public void hide() {
-        loadScesimPopupView.hide();
-    }
-
-    @Override
-    public ScenarioSimulationModel.Type getSelectedType() {
-        return loadScesimPopupView.getSelectedType();
-    }
-
-    @Override
-    public String getSelectedPath() {
-        return loadScesimPopupView.getSelectedPath();
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ScenarioSimulationKogitoLoadingScesimPopupView.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ScenarioSimulationKogitoLoadingScesimPopupView.html
deleted file mode 100644
index 5fe5853..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ScenarioSimulationKogitoLoadingScesimPopupView.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-  ~ 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.      
--->
-<div class="modal fade" id="loadscesim">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-          <span class="pficon pficon-close"></span>
-        </button>
-        <h4 class="modal-title" data-field="main-title"></h4>
-      </div>
-      <div class="modal-body">
-        <div data-field="assets"></div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal" data-field="cancel-button"></button>
-          <button type="button" class="btn btn-danger" data-dismiss="modal" data-field="ok-button"></button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ScenarioSimulationKogitoLoadingScesimPopupView.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ScenarioSimulationKogitoLoadingScesimPopupView.java
deleted file mode 100644
index 7097bf8..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/popup/ScenarioSimulationKogitoLoadingScesimPopupView.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.popup;
-
-import java.util.Optional;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import elemental2.dom.HTMLDivElement;
-import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
-import org.drools.workbench.screens.scenariosimulation.client.popup.AbstractScenarioPopupView;
-import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants;
-import org.drools.workbench.screens.scenariosimulation.kogito.client.popup.ScenarioSimulationKogitoCreationPopup;
-import org.drools.workbench.screens.scenariosimulation.webapp.client.dropdown.ScenarioSimulationKogitoLoadingScesimDropdown;
-import org.jboss.errai.ui.shared.api.annotations.DataField;
-import org.jboss.errai.ui.shared.api.annotations.Templated;
-import org.kie.workbench.common.widgets.client.assets.dropdown.KieAssetsDropdownItem;
-import org.uberfire.mvp.Command;
-
-@Dependent
-@Templated
-public class ScenarioSimulationKogitoLoadingScesimPopupView extends AbstractScenarioPopupView implements ScenarioSimulationKogitoCreationPopup {
-
-    @Inject
-    @DataField("assets")
-    protected HTMLDivElement divElement;
-
-    protected ScenarioSimulationModel.Type selectedType = null;
-
-    protected String selectedPath = null;
-
-    @Inject
-    protected ScenarioSimulationKogitoLoadingScesimDropdown scenarioSimulationKogitoLoadingScesimDropdown;
-
-    @Override
-    public void show(String mainTitleText, Command okCommand) {
-        cancelButton.setText(ScenarioSimulationEditorConstants.INSTANCE.cancelButton());
-        divElement.appendChild(scenarioSimulationKogitoLoadingScesimDropdown.getElement());
-        scenarioSimulationKogitoLoadingScesimDropdown.clear();
-        scenarioSimulationKogitoLoadingScesimDropdown.init();
-        scenarioSimulationKogitoLoadingScesimDropdown.initializeDropdown();
-        scenarioSimulationKogitoLoadingScesimDropdown.registerOnChangeHandler(() -> {
-            final Optional<KieAssetsDropdownItem> value = scenarioSimulationKogitoLoadingScesimDropdown.getValue();
-            selectedPath = value.map(KieAssetsDropdownItem::getValue).orElse(null);
-        });
-        super.show(mainTitleText, ScenarioSimulationEditorConstants.INSTANCE.importLabel(), okCommand);
-    }
-
-    @Override
-    public ScenarioSimulationModel.Type getSelectedType() {
-        return selectedType;
-    }
-
-    @Override
-    public String getSelectedPath() {
-        return selectedPath;
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/ScenarioSimulationKogitoRuntimeResourceContentService.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/ScenarioSimulationKogitoRuntimeResourceContentService.java
deleted file mode 100644
index d30ee3b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/ScenarioSimulationKogitoRuntimeResourceContentService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.services;
-
-import javax.inject.Inject;
-
-import org.drools.workbench.screens.scenariosimulation.kogito.client.services.ScenarioSimulationKogitoResourceContentService;
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.uberfire.backend.vfs.Path;
-
-public class ScenarioSimulationKogitoRuntimeResourceContentService implements ScenarioSimulationKogitoResourceContentService {
-
-    @Inject
-    private VFSServiceFake vfsServiceFake;
-
-    @Override
-    public void getFileContent(final Path path,
-                               final RemoteCallback<String> remoteCallback,
-                               final ErrorCallback<Object> errorCallback) {
-        String result = vfsServiceFake.readAllString(path);
-        if (result == null || result.isEmpty()) {
-            String error = "Unable to open file: " + path;
-            errorCallback.error(error, new Exception(error));
-        } else {
-            remoteCallback.callback(result);
-        }
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/TestingVFSService.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/TestingVFSService.java
deleted file mode 100644
index 4294b7a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/TestingVFSService.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.services;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import org.jboss.errai.common.client.api.ErrorCallback;
-import org.jboss.errai.common.client.api.RemoteCallback;
-import org.uberfire.backend.vfs.DirectoryStream;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.mvp.impl.DefaultPlaceRequest;
-
-/**
- * Class used to provide <i>virtual file system</i> access to <i>kogito testing editors</i>
- */
-@ApplicationScoped
-public class TestingVFSService {
-
-    public static final String CONTENT_PARAMETER_NAME = "content";
-    public static final String FILE_NAME_PARAMETER_NAME = "fileName";
-    private VFSServiceFake vfsServiceCaller;
-
-    public TestingVFSService() {
-        //CDI proxy
-    }
-
-    @Inject
-    public TestingVFSService(final VFSServiceFake vfsServiceCaller) {
-        this.vfsServiceCaller = vfsServiceCaller;
-    }
-
-    /**
-     * Create a directory at the given <code>Path</code>
-     * @param dir
-     * @return
-     */
-    public Path createDirectory(final Path dir) {
-        return vfsServiceCaller.createDirectory(dir);
-    }
-
-    /**
-     * Create a new file
-     * @param editorId The <b>id</b> of the editor to open by the <code>PlaceRequest</code>
-     * @param fileName
-     */
-    public void newFile(final String editorId,
-                        final String fileName) {
-        final PlaceRequest placeRequest = new DefaultPlaceRequest(editorId);
-        placeRequest.addParameter(FILE_NAME_PARAMETER_NAME, fileName);
-        //placeManager.goTo(placeRequest);
-    }
-
-    /**
-     * Open a file at given <code>Path</code> inside an <b>editor</b>
-     * @param path the <code>Path</code> to the file
-     * @param editorId The <b>id</b> of the editor to open by the <code>PlaceRequest</code>
-     */
-    public void openFile(final Path path,
-                         final String editorId) {
-        String xml = vfsServiceCaller.readAllString(path);
-        final PlaceRequest placeRequest = new DefaultPlaceRequest(editorId);
-        placeRequest.addParameter(FILE_NAME_PARAMETER_NAME, path.getFileName());
-        placeRequest.addParameter(CONTENT_PARAMETER_NAME, xml);
-    }
-
-    /**
-     * Load the file at given <code>Path</code> and returns content inside a callback
-     * @param path
-     * @param callback
-     * @param <T>
-     */
-    public <T> void loadFile(final Path path,
-                             final RemoteCallback<String> callback,
-                             final ErrorCallback<T> errorCallback) {
-        String xml = vfsServiceCaller.readAllString(path);
-        callback.callback(xml);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> void saveFile(final Path path,
-                             final String xml,
-                             final RemoteCallback<String> callback,
-                             final ErrorCallback<T> errorCallback) {
-        vfsServiceCaller.write(path, xml);
-        callback.callback(xml);
-    }
-
-    /**
-     * Get the <code>List&lt;Path&gt;</code> contained in the given <b>root</b>
-     * @param root
-     * @param callback
-     * @param errorCallback
-     * @param <T>
-     */
-    public <T> void getItemsByPath(final Path root,
-                                   final RemoteCallback<List<Path>> callback,
-                                   final ErrorCallback<T> errorCallback) {
-        DirectoryStream<Path> paths = vfsServiceCaller.newDirectoryStream(root);
-        List<Path> files = paths != null ? StreamSupport.stream(paths.spliterator(), false)
-                .collect(Collectors.toList()) : Collections.emptyList();
-        callback.callback(files);
-    }
-
-    /**
-     * Get <b>filtered</b> <code>List&lt;Path&gt;</code>  contained in the given <b>root</b>
-     * @param root
-     * @param fileSuffix
-     * @param callback
-     * @param errorCallback
-     * @param <T>
-     */
-    public <T> void getItemsByPath(final Path root,
-                                   final String fileSuffix,
-                                   final RemoteCallback<List<Path>> callback,
-                                   final ErrorCallback<T> errorCallback) {
-        DirectoryStream<Path> paths = vfsServiceCaller.newDirectoryStream(root);
-        List<Path> files = paths != null ? StreamSupport.stream(paths.spliterator(), false)
-                .collect(Collectors.toList()) : Collections.emptyList();
-        callback.callback(files);
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/VFSServiceFake.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/VFSServiceFake.java
deleted file mode 100644
index b7691bd..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/services/VFSServiceFake.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.services;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-
-import elemental2.dom.DomGlobal;
-import elemental2.webstorage.Storage;
-import elemental2.webstorage.WebStorageWindow;
-import org.uberfire.backend.vfs.DirectoryStream;
-import org.uberfire.backend.vfs.Path;
-import org.uberfire.backend.vfs.PathFactory;
-import org.uberfire.backend.vfs.VFSService;
-import org.uberfire.backend.vfs.impl.DirectoryStreamImpl;
-
-@ApplicationScoped
-public class VFSServiceFake implements VFSService {
-
-    private static Storage localStorage;
-
-    @PostConstruct
-    public void init() {
-        localStorage = WebStorageWindow.of(DomGlobal.window).sessionStorage;
-    }
-
-    @Override
-    public Path get(String uri) {
-        return null;
-    }
-
-    @Override
-    public DirectoryStream<Path> newDirectoryStream(Path dir) throws IllegalArgumentException {
-        List<Path> result = new LinkedList<>();
-        for (int i = 0; i < localStorage.getLength(); i++) {
-            String key = localStorage.key(i);
-            if (key.startsWith(dir.toURI())) {
-                Path path = new PathFactory.PathImpl(key.replaceAll(dir.toURI(),""), key);
-                result.add(path);
-            }
-        }
-
-        return new DirectoryStreamImpl(result);
-    }
-
-    @Override
-    public DirectoryStream<Path> newDirectoryStream(Path dir, DirectoryStream.Filter<Path> filter) throws IllegalArgumentException {
-        return null;
-    }
-
-    @Override
-    public Path createDirectory(Path dir) throws IllegalArgumentException, UnsupportedOperationException {
-        return null;
-    }
-
-    @Override
-    public Path createDirectories(Path dir) throws UnsupportedOperationException {
-        return null;
-    }
-
-    @Override
-    public Path createDirectory(Path dir, Map<String, ?> attrs) throws IllegalArgumentException, UnsupportedOperationException {
-        return null;
-    }
-
-    @Override
-    public Path createDirectories(Path dir, Map<String, ?> attrs) throws UnsupportedOperationException {
-        return null;
-    }
-
-    @Override
-    public Map<String, Object> readAttributes(Path path) throws UnsupportedOperationException, IllegalArgumentException {
-        return null;
-    }
-
-    @Override
-    public void setAttributes(Path path, Map<String, Object> attrs) throws IllegalArgumentException {
-    }
-
-    @Override
-    public void delete(Path path) throws IllegalArgumentException {
-    }
-
-    @Override
-    public boolean deleteIfExists(Path path) throws IllegalArgumentException {
-        return false;
-    }
-
-    @Override
-    public Path copy(Path source, Path target) throws UnsupportedOperationException {
-        return null;
-    }
-
-    @Override
-    public Path move(Path source, Path target) throws UnsupportedOperationException {
-        return null;
-    }
-
-    @Override
-    public String readAllString(Path path) throws IllegalArgumentException {
-        return localStorage.getItem(path.toURI());
-    }
-
-    @Override
-    public Path write(Path path, String content) throws IllegalArgumentException, UnsupportedOperationException {
-        localStorage.setItem(path.toURI(), content);
-        return path;
-    }
-
-    @Override
-    public Path write(Path path, String content, Map<String, ?> attrs) throws IllegalArgumentException, UnsupportedOperationException {
-        return null;
-    }
-
-    @Override
-    public boolean isRegularFile(String uri) {
-        return false;
-    }
-
-    @Override
-    public boolean isRegularFile(Path path) {
-        return false;
-    }
-
-    @Override
-    public boolean isDirectory(String uri) {
-        return false;
-    }
-
-    @Override
-    public boolean isDirectory(Path path) {
-        return false;
-    }
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/workarounds/KogitoRuntimeAsyncPackageDataModelOracle.java b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/workarounds/KogitoRuntimeAsyncPackageDataModelOracle.java
deleted file mode 100644
index b970b2b..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/java/org/drools/workbench/screens/scenariosimulation/webapp/client/workarounds/KogitoRuntimeAsyncPackageDataModelOracle.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.workbench.screens.scenariosimulation.webapp.client.workarounds;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import org.drools.workbench.screens.scenariosimulation.kogito.client.dmo.KogitoAsyncPackageDataModelOracle;
-import org.drools.workbench.screens.scenariosimulation.model.dmo.ModelField;
-
-@ApplicationScoped
-public class KogitoRuntimeAsyncPackageDataModelOracle extends KogitoAsyncPackageDataModelOracle {
-
-    @Override
-    protected Map<String, String> retrieveParametricFieldMap() {
-        return new HashMap<>();
-    }
-
-    @Override
-    protected List<String> retrievePackageNames() {
-        return new ArrayList<>();
-    }
-
-    @Override
-    protected String[] retrieveFactTypes() {
-        return new String[0];
-    }
-
-    @Override
-    protected String[] retrieveFqcnNames() {
-        return fqcnNames;
-    }
-
-    @Override
-    protected Map<String, String> retrieveFqcnNamesMap() {
-        return new HashMap<>();
-    }
-
-    @Override
-    protected Map<String, Boolean> retrieveCollectionTypes() {
-        return new HashMap<>();
-    }
-
-    @Override
-    protected Map<String, ModelField[]> retrieveModelFieldsMap() {
-        return new HashMap<>();
-    }
-
-}
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/resources/META-INF/ErraiApp.properties b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/resources/META-INF/ErraiApp.properties
deleted file mode 100644
index a2c5417..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/resources/META-INF/ErraiApp.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# 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. 
-#
-
-#
-# ErraiApp.properties
-#
-# Do not remove, even if empty!
-#
-# This is a marker file. When it is detected inside a JAR or at the
-# top of any classpath, the subdirectories are scanned for deployable
-# components. As such, all Errai application modules in a project
-# should contain an ErraiApp.properties at the root of all classpaths
-# that you wish to be scanned.
-#
-# There are also some configuration options that can be set in this
-# file, although it is rarely necessary. See the documentation at
-# https://docs.jboss.org/author/display/ERRAI/ErraiApp.properties
-# for details.
-errai.ioc.enabled.alternatives=org.uberfire.client.plugin.RuntimePluginsServiceProxyClientImpl \
-                               org.uberfire.client.workbench.VFSServiceProxyClientImpl \
-                               org.uberfire.client.workbench.VFSLockServiceProxyClientImpl \
-                               org.uberfire.client.workbench.WorkbenchServicesProxyClientImpl \ 
\ No newline at end of file
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/resources/logback.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/resources/logback.xml
deleted file mode 100644
index 0f2dddc..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/resources/logback.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<configuration>
-  <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <!-- %l lowers performance -->
-      <!--<pattern>%d [%t] %-5p %l%n  %m%n</pattern>-->
-      <pattern>%d [%t] %-5p %m%n</pattern>
-    </encoder>
-  </appender>
-
-  <logger name="org.drools" level="info" />
-
-  <root level="warn">
-    <appender-ref ref="consoleAppender" />
-  </root>
-</configuration>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/resources/org/drools/workbench/screens/scenariosimulation/webapp/DroolsWorkbenchScenarioSimulationKogitoTesting.gwt.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/resources/org/drools/workbench/screens/scenariosimulation/webapp/DroolsWorkbenchScenarioSimulationKogitoTesting.gwt.xml
deleted file mode 100644
index 4c2970a..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/resources/org/drools/workbench/screens/scenariosimulation/webapp/DroolsWorkbenchScenarioSimulationKogitoTesting.gwt.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  ~ 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.      
--->
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN"
-  "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
-<module>
-  <inherits name="org.uberfire.UberfireAPI" />
-
-  <inherits name="elemental2.webstorage.WebStorage" />
-
-  <!-- Errai, Drools etc -->
-  <inherits name="org.kie.workbench.common.kogito.KogitoClient" />
-  <inherits name="org.kie.workbench.common.widgets.KieWorkbenchWidgetsCommon" />
-
-  <inherits name="org.kie.workbench.common.kogito.webapp.base.KogitoWebappBase" />
-  <inherits
-    name='org.drools.workbench.screens.scenariosimulation.kogito.DroolsWorkbenchScenarioSimulationKogitoEditor'
-  />
-
-  <inherits name="org.guvnor.common.services.GuvnorCommonServices" />
-  <inherits name="org.drools.workbench.screens.scenariosimulation.DroolsWorkbenchScenarioSimulationEditorAPI" />
-  <inherits name='org.drools.workbench.screens.scenariosimulation.DroolsWorkbenchScenarioSimulationEditorClient' />
-
-  <inherits name="org.kie.workbench.common.command.KieWorkbenchCommonCommand" />
-  <inherits name="org.kie.workbench.common.KieWorkbenchCommonWidgets" />
-
-  <!-- We only need Chrome -->
-  <set-property name="user.agent" value="safari" />
-
-  <!-- To change the default logLevel -->
-  <set-property name="gwt.logging.logLevel" value="SEVERE" />
-
-  <!-- To enable logging -->
-  <set-property name="gwt.logging.enabled" value="TRUE" />
-
-  <!-- Configure Errai to return default values for missing i18n keys -->
-  <set-property name="errai.i18n.default_per_key" value="true" />
-
-  <!-- Specify the paths for translatable code -->
-  <source path="client" />
-
-  <replace-with class="org.uberfire.client.workbench.WorkbenchCloseHandlerImplFallback">
-    <when-type-is class="org.uberfire.client.workbench.WorkbenchCloseHandler" />
-  </replace-with>
-
-  <!-- Temporary workaround for ClassCastExceptions happening on DMN Marshaller models -->
-  <set-property name="jre.checks.type" value="DISABLED" />
-  <set-property name="jre.checkedMode" value="DISABLED" />
-</module>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/webapp/WEB-INF/web.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 9accb87..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<web-app
-  version="2.5"
-  xmlns="http://java.sun.com/xml/ns/javaee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
->
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-  </welcome-file-list>
-</web-app>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/webapp/favicon.ico b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/webapp/favicon.ico
deleted file mode 100644
index cefe23f..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/webapp/favicon.ico
+++ /dev/null
Binary files differ
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/webapp/index.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/webapp/index.html
deleted file mode 100644
index 2eb49c5..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/webapp/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!doctype html>
-<!--
-  ~ 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.      
--->
-
-<html>
-  <head>
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
-    <title>Scenario Simulation Kogito Runtime</title>
-    <link
-      href="org.drools.workbench.screens.scenariosimulation.webapp.DroolsWorkbenchScenarioSimulationKogitoTesting/css/patternfly.min.css"
-      rel="stylesheet"
-    />
-
-    <!-- Marshalling required scripts -->
-    <!-- SCESIM-->
-    <script src="model/SCESIM.js" type="text/javascript"></script>
-    <script src="model/SCESIMMainJs.js" type="text/javascript"></script>
-    <!-- DMN-->
-    <script src="model/DC.js" type="text/javascript"></script>
-    <script src="model/DI.js" type="text/javascript"></script>
-    <script src="model/DMN12.js" type="text/javascript"></script>
-    <script src="model/DMNDI12.js" type="text/javascript"></script>
-    <script src="model/KIE.js" type="text/javascript"></script>
-    <script src="model/MainJs.js" type="text/javascript"></script>
-    <!-- COMMON -->
-    <script src="model/Jsonix-all.js" type="text/javascript"></script>
-    <!-- End Marshalling requirements -->
-  </head>
-  <body>
-    <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe>
-
-    <!-- To turn off/on remote communication in the client bus -->
-    <script type="text/javascript">
-      erraiBusRemoteCommunicationEnabled = false;
-    </script>
-    <!-- loading indicator. the js app hides this once it's loaded. -->
-    <!-- The GWT js file generated at run time -->
-    <script
-      src="org.drools.workbench.screens.scenariosimulation.webapp.DroolsWorkbenchScenarioSimulationKogitoTesting/org.drools.workbench.screens.scenariosimulation.webapp.DroolsWorkbenchScenarioSimulationKogitoTesting.nocache.js"
-      type="text/javascript"
-    ></script>
-  </body>
-</html>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/webapp/test.html b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/webapp/test.html
deleted file mode 100644
index d5717dc..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-testing/src/main/webapp/test.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--
-  ~ 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.      
--->
-
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <title>SCESIM Editor Test</title>
-
-    <script>
-      function newDiagram() {
-        window.frames.editorFrame.contentWindow.gwtEditorBeans.get("ScenarioSimulationEditor").get().setContent("", "");
-      }
-
-      function loadDiagram(diagram) {
-        console.log("loadDiagram " + diagram);
-        window.frames.editorFrame.contentWindow.gwtEditorBeans
-          .get("ScenarioSimulationEditor")
-          .get()
-          .setContent("", diagram);
-
-        //window.frames.editorFrame.contentWindow.loadFile();
-        //document.getElementById("download_btn").disabled = false;
-      }
-
-      function importDMN() {
-        window.frames.editorFrame.contentWindow.importDMN();
-        document.getElementById("download_btn").disabled = false;
-      }
-
-      function download() {
-        window.frames.editorFrame.contentWindow.gwtEditorBeans
-          .get("ScenarioSimulationEditor")
-          .get()
-          .getContent()
-          .then(function (p) {
-            var d = document.createElement("a");
-            d.setAttribute("href", "data:text/xml;charset=utf-8," + encodeURIComponent(p));
-            d.setAttribute("download", "diagram.scesim");
-            d.style.display = "none";
-
-            document.body.appendChild(d);
-            d.click();
-            document.body.removeChild(d);
-          });
-      }
-
-      var openFile = function (event) {
-        var input = event.target;
-        var reader = new FileReader();
-        reader.onload = function () {
-          var diagram = reader.result;
-          loadDiagram(diagram);
-        };
-
-        reader.readAsText(input.files[0]);
-      };
-    </script>
-  </head>
-  <body>
-    <div id="editor">
-      Wait until the editor is loaded to open a SCESIM file:<br />
-      Create new diagram
-      <input type="button" id="new_diag_btn" value="Create new diagram" onclick="newDiagram()" /> Import SCESIM
-      <input type="file" onchange="openFile(event)" value="Choose SCESIM file" accept="scesim,txt" /> Import DMN
-      <input type="button" onclick="importDMN()" value="Choose DMN file" />
-      When you are ready you can
-      <input type="button" id="download_btn" value="Download the diagram" onclick="download()" />
-    </div>
-
-    <iframe id="editorFrame" src="index.html" width="100%" height="880px" frameborder="0" scrolling="no"></iframe>
-  </body>
-</html>
diff --git a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/pom.xml b/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/pom.xml
deleted file mode 100644
index b1fcbbb..0000000
--- a/packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
->
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.kie.kogito.stunner.editors</groupId>
-    <artifactId>drools-wb-screens</artifactId>
-    <version>${revision}</version>
-  </parent>
-
-  <artifactId>drools-wb-scenario-simulation-editor</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Drools Workbench - Scenario Simulation Editor</name>
-  <description>Drools Workbench - Scenario Simulation Editor</description>
-
-  <modules>
-    <module>drools-wb-scenario-simulation-editor-api</module>
-    <module>drools-wb-scenario-simulation-editor-client</module>
-    <module>drools-wb-scenario-simulation-editor-kogito-marshaller</module>
-    <module>drools-wb-scenario-simulation-editor-kogito-client</module>
-    <module>drools-wb-scenario-simulation-editor-kogito-runtime</module>
-    <module>drools-wb-scenario-simulation-editor-kogito-testing</module>
-  </modules>
-</project>
diff --git a/packages/stunner-editors/drools-wb-screens/pom.xml b/packages/stunner-editors/drools-wb-screens/pom.xml
deleted file mode 100644
index ed2fa53..0000000
--- a/packages/stunner-editors/drools-wb-screens/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ 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.      
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
-  <parent>
-    <artifactId>stunner-editors-parent</artifactId>
-    <groupId>org.kie.kogito.stunner.editors</groupId>
-    <version>${revision}</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>drools-wb-screens</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Drools Workbench - Screens</name>
-  <description>Drools Workbench - Screens</description>
-
-  <modules>
-    <module>drools-wb-scenario-simulation-editor</module>
-  </modules>
-</project>
diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml
index 1146ffa..aa8fa0d 100644
--- a/packages/stunner-editors/pom.xml
+++ b/packages/stunner-editors/pom.xml
@@ -94,10 +94,6 @@
     <module>kie-wb-common-dmn</module>
     <module>kie-wb-common-kogito</module>
 
-    <!-- DROOLS-WB -->
-    <module>drools-wb-bom</module>
-    <module>drools-wb-screens</module>
-
     <!-- LIENZO -->
     <module>lienzo-core</module>
     <module>lienzo-tests</module>
@@ -333,15 +329,6 @@
         <scope>import</scope>
       </dependency>
 
-      <!-- All drools-wb's modules and third-party versions are defined in this POM -->
-      <dependency>
-        <groupId>org.kie.kogito.stunner.editors</groupId>
-        <artifactId>drools-wb-bom</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
       <!-- Lienzo artifacts for kogito stream -->
       <dependency>
         <groupId>org.kie.kogito.stunner.editors</groupId>