--- a/gwt-client/src/test/java/test/uinfo/UinfoSalixRunner.java	Fri Aug 17 11:45:34 2018 +0200
+++ b/gwt-client/src/test/java/test/uinfo/UinfoSalixRunner.java	Fri Aug 17 14:29:05 2018 +0200
@@ -27,7 +27,7 @@
  * @author Domenico Nardi Tironi
  *
  */
-final class UinfoSalixRunner extends AbstractModuleRunner {
+class UinfoSalixRunner extends AbstractModuleRunner {
 
     private final String scenarioChoice;
     private boolean isUseScenario;
@@ -53,38 +53,28 @@
         /* Select Range */
         super.selectRange();
 
-        final String useScenario = String.valueOf(this.isUseScenario);
-        final Data yearEpochSelect = new StringOptionsData("use_scenario", "use_scenario",
-                new DataItem[] { new DefaultDataItem(useScenario, useScenario, useScenario) });
-        feedAndGo(new Data[] { yearEpochSelect }, 0);
+        /* use scenario */
+        final String key = "use_scenario";
+        final String value = String.valueOf(this.isUseScenario);
+
+        super.feedSimpleTextInput(key, value);
 
         if (this.isUseScenario) {
             // TODO: make regional, supraregional, historical
-
-            // /* Year or Epoch? eigentlich vermutlich überflüssig */
-            // final String yeSelectStr = this.isYears ? "state.sinfo.year" : "state.sinfo.epoch";
-            // final Data yearEpochSelect = new StringOptionsData("ye_select", "ye_select",
-            // new DataItem[] { new DefaultDataItem(yeSelectStr, yeSelectStr, yeSelectStr) });
-            // feedAndGo(new Data[] { yearEpochSelect }, 0);
-            //
-            // if (this.years != null) {
-            // final StringBuilder sb = new StringBuilder();
-            // for (final int value : this.years) {
-            // sb.append(String.valueOf(value));
-            // sb.append(" ");
-            // }
-            // final Data yearsData = new StringOptionsData("years", "years", new DataItem[] { new DefaultDataItem("years", "years",
-            // sb.toString()) });
-            // feedAndGo(new Data[] { yearsData }, 0);
-            // } else if (this.epochs != null) {
-            // final Data data = new StringOptionsData("epochs", "epochs", new DataItem[] { new DefaultDataItem("epochs", "epochs",
-            // this.epochs) });
-            // feedAndGo(new Data[] { data }, 0);
-            // }
+            makeScenario();
         }
 
         describeCollection();
 
         super.export(exportToFile);
     }
+
+    protected void makeScenario() throws ConnectionException, ServerException {
+        // Override in subs
+    }
+
+    protected final String getScenarioChoice() {
+
+        return this.scenarioChoice;
+    }
 }