diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-backend/src/test/java/org/drools/workbench/screens/scenariosimulation/backend/server/ScenarioSimulationServiceImplTest.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-backend/src/test/java/org/drools/workbench/screens/scenariosimulation/backend/server/ScenarioSimulationServiceImplTest.java
index e9b7bf7c1eb..6f4a958f3ec 100644
--- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-backend/src/test/java/org/drools/workbench/screens/scenariosimulation/backend/server/ScenarioSimulationServiceImplTest.java
+++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-backend/src/test/java/org/drools/workbench/screens/scenariosimulation/backend/server/ScenarioSimulationServiceImplTest.java
@@ -271,7 +271,7 @@ public void createRULEScenario() throws Exception {
                                                model,
                                                "Commit comment",
                                                Type.RULE,
-                                               "default");
+                                               null);
 
         assertNotNull(returnPath);
         assertNotNull(model.getSimulation());
diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/NewScenarioSimulationHandler.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/NewScenarioSimulationHandler.java
index cc49f1b3a48..7da92d7af44 100644
--- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/NewScenarioSimulationHandler.java
+++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/handlers/NewScenarioSimulationHandler.java
@@ -132,7 +132,7 @@ public void create(final Package pkg,
                 break;
             case RULE:
             default:
-                value = "default";
+                value = null;
         }
         busyIndicatorView.showBusyIndicator(CommonConstants.INSTANCE.Saving());
         CustomBusyPopup.showMessage(CommonConstants.INSTANCE.Saving());
diff --git a/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/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
index 84c96f661b2..75f3775602b 100644
--- a/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/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
@@ -111,7 +111,7 @@ public void setup() {
         when(gridContextMenuMock.getView()).thenReturn(gridContextMenuViewMock);
         when(headerGivenContextMenuMock.getView()).thenReturn(headerContextMenuViewMock);
         this.modelLocal = new ScenarioSimulationModel();
-        modelLocal.setSimulation(getSimulation(ScenarioSimulationModel.Type.RULE, "default"));
+        modelLocal.setSimulation(getSimulation(ScenarioSimulationModel.Type.RULE, null));
         this.content = new ScenarioSimulationModelContent(modelLocal,
                                                           overviewMock,
                                                           mock(PackageDataModelOracleBaselinePayload.class));
diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/NewScenarioSimulationHandlerTest.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/NewScenarioSimulationHandlerTest.java
index be6e1c397f7..111dec23dfc 100644
--- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/NewScenarioSimulationHandlerTest.java
+++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/handlers/NewScenarioSimulationHandlerTest.java
@@ -47,6 +47,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -173,7 +174,7 @@ private void createCommon(ScenarioSimulationModel.Type type, boolean validate, b
         handler.create(mock(Package.class), "BASEFILENAME", mock(NewResourcePresenter.class));
         if (called) {
             verify(busyIndicatorViewMock, times(1)).showBusyIndicator(eq(CommonConstants.INSTANCE.Saving()));
-            verify(scenarioSimulationServiceMock, times(1)).create(any(), any(), any(), any(), any(), any());
+            verify(scenarioSimulationServiceMock, times(1)).create(any(), any(), any(), any(), any(), isNull(String.class));
         }
     }