--- a/gwt-client/src/test/java/test/sinfo/SinfoRunnerCreatorHelper.java	Mon Nov 05 10:19:12 2018 +0100
+++ b/gwt-client/src/test/java/test/sinfo/SinfoRunnerCreatorHelper.java	Mon Nov 05 13:21:57 2018 +0100
@@ -14,7 +14,6 @@
 
 import test.AbstractBerechnungsartenTester.River;
 import test.AbstractModuleRunner;
-import test.IFilenameMapper;
 import test.SimpleRecommendation;
 import test.sinfo.SinfoBerechnungsartenTester.CalcMode;
 import test.sinfo.SinfoFloodDurationRiversideChoice.RiversideChoiceKey;
@@ -31,67 +30,70 @@
 
     // HELPER-Methods:
 
-    public final static AbstractModuleRunner createSinfoFlowdepthMinMaxTest(final IFilenameMapper file, final double from, final double to,
-            final River beispielfluss, final SimpleRecommendation rec0, final SimpleRecommendation rec1) throws ConnectionException, ServerException {
+    public final static AbstractModuleRunner createSinfoFlowdepthMinMaxTest(final double from, final double to, final River river,
+            final SimpleRecommendation rec0, final SimpleRecommendation rec1) throws ConnectionException, ServerException {
         // TODO: make recommendationPair to method parameter if needed
-        final SinfoFlowdepthMinMaxRunner proof = new SinfoFlowdepthMinMaxRunner(CalcMode.sinfo_calc_flow_depth_minmax, file, from, to, beispielfluss);
-        proof.addRecommendationPair(rec0, rec1);
-
-        return proof;
-    }
-
-    public static AbstractModuleRunner createSinfoFlowdepthMinMaxTest(final IFilenameMapper file, final int from, final int to, final River river,
-            final SimpleRecommendation simpleRecommendation0, final SimpleRecommendation simpleRecommendation1,
-            final SimpleRecommendation simpleRecommendation2, final SimpleRecommendation simpleRecommendation3) throws ConnectionException, ServerException {
-        final SinfoFlowdepthMinMaxRunner proof = (SinfoFlowdepthMinMaxRunner) createSinfoFlowdepthMinMaxTest(file, from, to, river, simpleRecommendation0,
-                simpleRecommendation1);
-        proof.addRecommendationPair(simpleRecommendation2, simpleRecommendation3);
-        return proof;
-    }
-
-    public final static AbstractModuleRunner createSinfoFlowdepthTest(final IFilenameMapper file, final double from, final double to, final River river,
-            final boolean useTkh, final SimpleRecommendation rec0, final SimpleRecommendation rec1) throws ConnectionException, ServerException {
-        final SinfoFlowdepthRunner proof = new SinfoFlowdepthRunner(CalcMode.sinfo_calc_flow_depth, file, from, to, river, useTkh);
+        final SinfoFlowdepthMinMaxRunner proof = new SinfoFlowdepthMinMaxRunner(CalcMode.sinfo_calc_flow_depth_minmax, from, to, river);
         proof.addRecommendationPair(rec0, rec1);
 
         return proof;
     }
 
-    public final static AbstractModuleRunner createSinfoFlowdepthDevelopmentTest(final IFilenameMapper file, final double from, final double to,
-            final River river, final SimpleRecommendation rec0_curr, final SimpleRecommendation rec1_curr, final SimpleRecommendation rec0_hist,
+    public static AbstractModuleRunner createSinfoFlowdepthMinMaxTest(final int from, final int to, final River river,
+            final SimpleRecommendation simpleRecommendation0, final SimpleRecommendation simpleRecommendation1,
+            final SimpleRecommendation simpleRecommendation2, final SimpleRecommendation simpleRecommendation3) throws ConnectionException, ServerException {
+        final SinfoFlowdepthMinMaxRunner proof = (SinfoFlowdepthMinMaxRunner) createSinfoFlowdepthMinMaxTest(from, to, river, simpleRecommendation0,
+                simpleRecommendation1);
+        proof.addRecommendationPair(simpleRecommendation2, simpleRecommendation3);
+        return proof;
+    }
+
+    public final static AbstractModuleRunner createSinfoFlowdepthTest(final double from, final double to, final River river, final boolean useTkh,
+            final SimpleRecommendation rec0, final SimpleRecommendation rec1) throws ConnectionException, ServerException {
+        final SinfoFlowdepthRunner proof = new SinfoFlowdepthRunner(CalcMode.sinfo_calc_flow_depth, from, to, river, useTkh);
+        proof.addRecommendationPair(rec0, rec1);
+
+        return proof;
+    }
+
+    public final static AbstractModuleRunner createSinfoFlowdepthDevelopmentTest(final double from, final double to, final River river,
+            final SimpleRecommendation rec0_curr, final SimpleRecommendation rec1_curr, final SimpleRecommendation rec0_hist,
             final SimpleRecommendation rec1_hist) throws ConnectionException, ServerException {
-        final SinfoFlowdepthDevelopmentRunner proof = new SinfoFlowdepthDevelopmentRunner(CalcMode.sinfo_calc_flow_depth_development, file, from, to, river);
+        final SinfoFlowdepthDevelopmentRunner proof = new SinfoFlowdepthDevelopmentRunner(CalcMode.sinfo_calc_flow_depth_development, from, to, river);
         proof.addCurrentRecommendationPair(rec0_curr, rec1_curr);
         proof.addHistoricalRecommendationPair(rec0_hist, rec1_hist);
         return proof;
     }
 
-    public final static AbstractModuleRunner createSinfoTkhTest(final IFilenameMapper file, final double from, final double to, final River river,
+    public final static AbstractModuleRunner createSinfoTkhTest(final double from, final double to, final River river,
             // final boolean useTkh,
             final double[] wasserspiegellage) throws ConnectionException, ServerException {
-        final SinfoTkhRunner proof = new SinfoTkhRunner(CalcMode.sinfo_calc_transport_bodies_heights, file, from, to, river, wasserspiegellage);
-
-        return proof;
-    }
-
-    public final static AbstractModuleRunner createSinfoCollisionYearsTest(final IFilenameMapper file, final double from, final double to, final River river,
-            final int[] years) throws ConnectionException, ServerException {
-        final SinfoCollisionRunner proof = new SinfoCollisionRunner(file, from, to, river, years, null);
+        final SinfoTkhRunner proof = new SinfoTkhRunner(CalcMode.sinfo_calc_transport_bodies_heights, from, to, river, wasserspiegellage);
 
         return proof;
     }
 
-    public final static AbstractModuleRunner createSinfoCollisionEpochsTest(final IFilenameMapper file, final double from, final double to, final River river,
-            final String epochs) throws ConnectionException, ServerException {
-        final SinfoCollisionRunner proof = new SinfoCollisionRunner(file, from, to, river, null, epochs);
+    public final static AbstractModuleRunner createSinfoCollisionYearsTest(final double from, final double to, final River river, final int[] years)
+            throws ConnectionException, ServerException {
+        final SinfoCollisionRunner proof = new SinfoCollisionRunner(from, to, river, years, null)
+        // .addOutputTest(file, outputModeName, overideWriteToDisk,
+        // params)
+        ;
 
         return proof;
     }
 
-    public final static AbstractModuleRunner createSinfoFloodDurationTest(final IFilenameMapper file, final double from, final double to, final River river,
+    public final static AbstractModuleRunner createSinfoCollisionEpochsTest(final double from, final double to, final River river, final String epochs)
+            throws ConnectionException, ServerException {
+        final SinfoCollisionRunner proof = new SinfoCollisionRunner(from, to, river, null, epochs);
+
+        return proof;
+    }
+
+    public final static AbstractModuleRunner createSinfoFloodDurationTest(final double from, final double to, final River river,
             final double[] wasserspiegellage, final boolean showWspl, final RiversideChoiceKey riverside) throws ConnectionException, ServerException {
-        final SinfoFloodDurationRunner proof = new SinfoFloodDurationRunner(CalcMode.sinfo_calc_flood_duration, file, from, to, river, wasserspiegellage,
-                riverside, showWspl);
+        final SinfoFloodDurationRunner proof = new SinfoFloodDurationRunner(CalcMode.sinfo_calc_flood_duration, from, to, river, wasserspiegellage, riverside,
+                showWspl);
 
         return proof;
     }