diff --git a/ttool/src/test/java/test/AbstractTest.java b/ttool/src/test/java/test/AbstractTest.java
index da7eaaf01f8589071efe683ef38378f042d39196..6ff90397795e540ae7843ff817a6998d5bf8dfeb 100644
--- a/ttool/src/test/java/test/AbstractTest.java
+++ b/ttool/src/test/java/test/AbstractTest.java
@@ -122,4 +122,24 @@ public abstract class AbstractTest {
 
 
 	}
+
+	protected void monitorError(Process proc) {
+		BufferedReader proc_err = new BufferedReader(new InputStreamReader(proc.getErrorStream()));
+		new Thread() {
+			@Override public void run() {
+				String line;
+				try {
+					while ((line = proc_err.readLine()) != null) {
+						System.out.println("NOC executing err: " + line);
+					}
+				} catch (Exception e) {
+					//System.out.println("FAILED reading errors");
+					return;
+				}
+
+			}
+		}.start();
+	}
+
+
 }
diff --git a/ttool/src/test/java/tmltranslator/CompareTMLTests.java b/ttool/src/test/java/tmltranslator/CompareTMLTests.java
index 2dff6799669b66f648953200d748eab0fcb65615..79520bf4e63bf723f887ae0ff96faa293e4d40fb 100644
--- a/ttool/src/test/java/tmltranslator/CompareTMLTests.java
+++ b/ttool/src/test/java/tmltranslator/CompareTMLTests.java
@@ -4,7 +4,6 @@ import test.AbstractTest;
 import tmltranslator.compareTMLTest.CompareTML;
 import org.junit.Before;
 import org.junit.Test;
-import ui.AbstractUITest;
 
 import java.io.File;
 import java.nio.file.Files;
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyEnableTests.java b/ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyEnableTests.java
index 69343bf7788a1791dccfabf1d4e31862c88adc9b..db48a506ea9f88725f0006b545bf2d2eac584162 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyEnableTests.java
+++ b/ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyEnableTests.java
@@ -9,6 +9,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
 import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
 import tmltranslator.tomappingsystemc2.Penalties;
@@ -22,7 +23,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class DiplodocusDelayPenaltyEnableTests extends AbstractUITest {
+public class DiplodocusDelayPenaltyEnableTests extends AbstractTest {
 
     final String DIR_GEN = "test_diplo_simulator/";
 
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusFPGAReconfigurationTests.java b/ttool/src/test/java/tmltranslator/DiplodocusFPGAReconfigurationTests.java
index 9f63ce47b547ba378c5622b69860273e4e38f53a..a06471734f9fdf4a408de54b758fe4be9bf8ab97 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusFPGAReconfigurationTests.java
+++ b/ttool/src/test/java/tmltranslator/DiplodocusFPGAReconfigurationTests.java
@@ -9,6 +9,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
 import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
 import tmltranslator.tomappingsystemc2.Penalties;
@@ -22,7 +23,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class DiplodocusFPGAReconfigurationTests extends AbstractUITest {
+public class DiplodocusFPGAReconfigurationTests extends AbstractTest {
 
     private static final String DIR_GEN = "test_diplo_simulator/";
     // test for reconfiguration of FPGA
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusInsertSignalTest.java b/ttool/src/test/java/tmltranslator/DiplodocusInsertSignalTest.java
index 8e1691d079f542be439642165ba33e73c4d12546..e4e77b0e4c817ad3ac5180933339b3df88c1076b 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusInsertSignalTest.java
+++ b/ttool/src/test/java/tmltranslator/DiplodocusInsertSignalTest.java
@@ -9,6 +9,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
 import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
 import tmltranslator.tomappingsystemc2.Penalties;
@@ -22,7 +23,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class DiplodocusInsertSignalTest extends AbstractUITest {
+public class DiplodocusInsertSignalTest extends AbstractTest {
 
     final String DIR_GEN = "test_diplo_simulator/";
     // test for inserting signals
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusNoCTest.java b/ttool/src/test/java/tmltranslator/DiplodocusNoCTest.java
index f60e14f067aceb367b9f259850e4f4af4a0be7f2..22e6eb47df79afa51e076b5d661b9f76a90bdf50 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusNoCTest.java
+++ b/ttool/src/test/java/tmltranslator/DiplodocusNoCTest.java
@@ -9,6 +9,7 @@ import org.junit.Test;
 import org.junit.runners.model.TestTimedOutException;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
 import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
 import tmltranslator.tomappingsystemc2.Penalties;
@@ -25,7 +26,7 @@ import static org.junit.Assert.*;
 
 
 
-public class DiplodocusNoCTest extends AbstractUITest {
+public class DiplodocusNoCTest extends AbstractTest {
 
 
     final String MODEL = "spec";
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java b/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java
index d119b5f9025ad533ca69759e86a6a91c0617044a..518c3e3344f094ea99e364ff5290c197f272d615 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java
+++ b/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java
@@ -11,6 +11,7 @@ import remotesimulation.RemoteConnection;
 import remotesimulation.RemoteConnectionException;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLMappingTextSpecification;
 import tmltranslator.TMLSyntaxChecking;
@@ -27,7 +28,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
+public class DiplodocusSimulatorTerminationTest extends AbstractTest {
     final String DIR_GEN = "test_diplo_simulator/";
     final String [] MODELS_TERMINATE = {"terminatedTest"};
     private String SIM_DIR;
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTest.java b/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTest.java
index a6ce73734ce58ff7f646c59463cd8d010891ca71..b46acfdcc474f498115a47ac37363295e5fd2353 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTest.java
+++ b/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTest.java
@@ -9,6 +9,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLMappingTextSpecification;
 import tmltranslator.TMLSyntaxChecking;
@@ -27,7 +28,7 @@ import java.util.List;
 
 import static org.junit.Assert.*;
 
-public class DiplodocusSimulatorTest extends AbstractUITest {
+public class DiplodocusSimulatorTest extends AbstractTest {
 
     //final String [] MODELS = {"scp"};
     final String [] MODELS = {"scp", "ssdf"};
diff --git a/ttool/src/test/java/tmltranslator/FpgaClockDividerTest.java b/ttool/src/test/java/tmltranslator/FpgaClockDividerTest.java
index 3398e36b0c109e5643553235c8b4dfdfe9c31043..1c3edf5c5d132038a4e20175e8540e930f46d95c 100644
--- a/ttool/src/test/java/tmltranslator/FpgaClockDividerTest.java
+++ b/ttool/src/test/java/tmltranslator/FpgaClockDividerTest.java
@@ -9,6 +9,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLMappingTextSpecification;
 import tmltranslator.TMLSyntaxChecking;
@@ -28,7 +29,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class FpgaClockDividerTest extends AbstractUITest {
+public class FpgaClockDividerTest extends AbstractTest {
 
     private final String DIR_GEN = "test_diplo_simulator/";
     private final String [] MODELS_FPGA_CLOCK_DIVIDER = {"fpga_clock_divider"};
diff --git a/ttool/src/test/java/tmltranslator/HTMLParseTest.java b/ttool/src/test/java/tmltranslator/HTMLParseTest.java
index f6c22fe2de9bc63802a4a15cc7da0a46f2de5d54..2b44870c4ea245cabb596cea50fb78bafa58dd3f 100644
--- a/ttool/src/test/java/tmltranslator/HTMLParseTest.java
+++ b/ttool/src/test/java/tmltranslator/HTMLParseTest.java
@@ -13,6 +13,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLMappingTextSpecification;
 import tmltranslator.TMLSyntaxChecking;
@@ -31,7 +32,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class HTMLParseTest extends AbstractUITest {
+public class HTMLParseTest extends AbstractTest {
     final String DIR_GEN = "test_diplo_simulator/";
     final String [] MODELS_PARSE_HTML = {"parseFPGA_HTML", "parseCPU1_HTML","parseCPU2_HTML"};
     final String [] PARSE_FPGA = {"<- idle 468 ->","", "", "", ""};
diff --git a/ttool/src/test/java/tmltranslator/HelpSeverTest.java b/ttool/src/test/java/tmltranslator/HelpServerTest.java
similarity index 98%
rename from ttool/src/test/java/tmltranslator/HelpSeverTest.java
rename to ttool/src/test/java/tmltranslator/HelpServerTest.java
index c8f1c7815244fbaa7cbb70ca0c457ebc3dff3b70..dbe0d4b93a1c19cba67d3ef8731c541e472560cb 100644
--- a/ttool/src/test/java/tmltranslator/HelpSeverTest.java
+++ b/ttool/src/test/java/tmltranslator/HelpServerTest.java
@@ -8,6 +8,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
 import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
 import tmltranslator.tomappingsystemc2.Penalties;
@@ -21,7 +22,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class HelpSeverTest extends AbstractUITest {
+public class HelpServerTest extends AbstractTest {
 
     private final String DIR_GEN = "test_diplo_simulator/";
     private final String [] MODELS_HELP_SERVER = {"fpga_clock_divider"};
@@ -42,7 +43,7 @@ public class HelpSeverTest extends AbstractUITest {
         RESOURCES_DIR = getBaseResourcesDir() + "/tmltranslator/simulator/";
     }
 
-    public HelpSeverTest() {
+    public HelpServerTest() {
         super();
     }
 
diff --git a/ttool/src/test/java/tmltranslator/MemoryLeakTest.java b/ttool/src/test/java/tmltranslator/MemoryLeakTest.java
index 0fd6eefa07603af7df4eb3444c808711d292a190..67ce0b24f621ad662c67bee7798034951e5b1002 100644
--- a/ttool/src/test/java/tmltranslator/MemoryLeakTest.java
+++ b/ttool/src/test/java/tmltranslator/MemoryLeakTest.java
@@ -9,6 +9,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLMappingTextSpecification;
 import tmltranslator.TMLSyntaxChecking;
@@ -30,7 +31,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class MemoryLeakTest extends AbstractUITest {
+public class MemoryLeakTest extends AbstractTest {
     final String DIR_GEN = "test_diplo_simulator/";
     final String [] MODELS_MEMORY_LEAK = {"fpga_reconfig5", "fpga_reconfig6"};
     private String SIM_DIR;
diff --git a/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java b/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java
index 36dbc7f4152104812e99fa31f74499dad748d3ac..5f4c4385936b2417a42ae375a090b04546cf8d23 100644
--- a/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java
+++ b/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java
@@ -9,6 +9,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLMappingTextSpecification;
 import tmltranslator.TMLSyntaxChecking;
@@ -28,7 +29,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class MulticoreCrossCpuSchedulingTest extends AbstractUITest {
+public class MulticoreCrossCpuSchedulingTest extends AbstractTest {
     final String DIR_GEN = "test_diplo_simulator/";
     final String [] MODELS_CPU_CROSS = {"testMultiCoreRRPB", "testMultiCoreRR"};
     private String SIM_DIR;
diff --git a/ttool/src/test/java/tmltranslator/MulticoreHangingTest.java b/ttool/src/test/java/tmltranslator/MulticoreHangingTest.java
index 201e26f2f42864404eb1bfca84677782c1ef4ddc..b26f59ecc6d9c58bab9366ae6a8977ac2dc855d4 100644
--- a/ttool/src/test/java/tmltranslator/MulticoreHangingTest.java
+++ b/ttool/src/test/java/tmltranslator/MulticoreHangingTest.java
@@ -9,6 +9,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLMappingTextSpecification;
 import tmltranslator.TMLSyntaxChecking;
@@ -26,7 +27,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class MulticoreHangingTest extends AbstractUITest {
+public class MulticoreHangingTest extends AbstractTest {
     final String DIR_GEN = "test_diplo_simulator/";
     final String [] MODELS_CPU_SHOWTRACE = {"multicore_trace"};
     private String SIM_DIR;
diff --git a/ttool/src/test/java/tmltranslator/RemoveAllTransactionsTests.java b/ttool/src/test/java/tmltranslator/RemoveAllTransactionsTests.java
index f27a71f18afabe87993861bfdaf707ee2e19aabc..73f52bec52224bb9494d6ec8d1c0544873b4f043 100644
--- a/ttool/src/test/java/tmltranslator/RemoveAllTransactionsTests.java
+++ b/ttool/src/test/java/tmltranslator/RemoveAllTransactionsTests.java
@@ -9,6 +9,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLMappingTextSpecification;
 import tmltranslator.TMLSyntaxChecking;
@@ -27,7 +28,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class RemoveAllTransactionsTests extends AbstractUITest {
+public class RemoveAllTransactionsTests extends AbstractTest {
     final String DIR_GEN = "test_diplo_simulator/";
     final String [] MODELS_PARSE_HTML = {"parseFPGA_HTML"};
     final static String EXPECTED_FILE_REMOVE_ALL_TRANS = getBaseResourcesDir() + "tmltranslator/expected/expected_remove_all_trans.txt";
diff --git a/ttool/src/test/java/tmltranslator/RunToNextBreakpointMaxTransTest.java b/ttool/src/test/java/tmltranslator/RunToNextBreakpointMaxTransTest.java
index aceed3ee475b8514e952e4795f3755fcdc7beec9..87592d7cc0d92eb2a93f1bce75759be521b1d092 100644
--- a/ttool/src/test/java/tmltranslator/RunToNextBreakpointMaxTransTest.java
+++ b/ttool/src/test/java/tmltranslator/RunToNextBreakpointMaxTransTest.java
@@ -9,6 +9,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLMappingTextSpecification;
 import tmltranslator.TMLSyntaxChecking;
@@ -28,7 +29,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class RunToNextBreakpointMaxTransTest extends AbstractUITest {
+public class RunToNextBreakpointMaxTransTest extends AbstractTest {
     final String DIR_GEN = "test_diplo_simulator/";
     final String [] MODELS_RTNBP_MAX_TRANS = {"rtnbmt"};
     private String SIM_DIR;
diff --git a/ttool/src/test/java/tmltranslator/RunUntilChannelAccessTest.java b/ttool/src/test/java/tmltranslator/RunUntilChannelAccessTest.java
index d1bc79cfb93813b82d8cbb404c3a62e04e22b9a2..57b4c0a85d08c5cdcaf298ab199dd7bb34adf37f 100644
--- a/ttool/src/test/java/tmltranslator/RunUntilChannelAccessTest.java
+++ b/ttool/src/test/java/tmltranslator/RunUntilChannelAccessTest.java
@@ -8,6 +8,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLMappingTextSpecification;
 import tmltranslator.TMLSyntaxChecking;
@@ -26,7 +27,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class RunUntilChannelAccessTest extends AbstractUITest {
+public class RunUntilChannelAccessTest extends AbstractTest {
     final String DIR_GEN = "test_diplo_simulator/";
     final String [] MODELS_RUCA = {"ruca"};
     final static String EXPECTED_FILE_RUCA = getBaseResourcesDir() + "tmltranslator/expected/expected_ruca.txt";
diff --git a/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java b/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java
index 31012a5617e814f5fd184a70e43c839337d0a91b..313c1994195885e674664747862029faf02269c0 100644
--- a/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java
+++ b/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java
@@ -41,6 +41,7 @@ package tmltranslator;
 
 import org.junit.Before;
 import org.junit.Test;
+import test.AbstractTest;
 import ui.AbstractUITest;
 
 import java.util.*;
@@ -55,7 +56,7 @@ import static org.junit.Assert.*;
  * @author Minh Hiep PHAM
  */
 
-public class TMLComparingMethodTest extends AbstractUITest {
+public class TMLComparingMethodTest extends AbstractTest {
 
     private TMLComparingMethod comparing;
 
diff --git a/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java b/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java
index fb75dfd09a337f9f230ff37c6de42bd61bf96241..5946afad938f8ffa81046f4bb2d2a2f0c140b723 100644
--- a/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java
+++ b/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java
@@ -11,6 +11,7 @@ import remotesimulation.RemoteConnection;
 import remotesimulation.RemoteConnectionException;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLMappingTextSpecification;
 import tmltranslator.TMLSyntaxChecking;
@@ -31,7 +32,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class TimelineDiagramTest extends AbstractUITest {
+public class TimelineDiagramTest extends AbstractTest {
     final String DIR_GEN = "test_diplo_simulator/";
     final String [] MODELS_TIMELINE = {"timelineDiagram"};
     private String SIM_DIR;
diff --git a/ttool/src/test/java/ui/AbstractUITest.java b/ttool/src/test/java/ui/AbstractUITest.java
index b678c4a80245235be18639590d569bc9bc1ed01c..9b37645d8d96fc23eee3dc104ab8832d8fadefcd 100644
--- a/ttool/src/test/java/ui/AbstractUITest.java
+++ b/ttool/src/test/java/ui/AbstractUITest.java
@@ -77,21 +77,4 @@ public abstract class AbstractUITest extends AbstractTest {
         return null;
 	}
 
-	protected void monitorError(Process proc) {
-        BufferedReader proc_err = new BufferedReader(new InputStreamReader(proc.getErrorStream()));
-        new Thread() {
-            @Override public void run() {
-                String line;
-                try {
-                    while ((line = proc_err.readLine()) != null) {
-                        System.out.println("NOC executing err: " + line);
-                    }
-                } catch (Exception e) {
-                    //System.out.println("FAILED reading errors");
-                    return;
-                }
-
-            }
-        }.start();
-	}
 }
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyDisableTests.java b/ttool/src/test/java/ui/DiplodocusDelayPenaltyDisableTests.java
similarity index 99%
rename from ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyDisableTests.java
rename to ttool/src/test/java/ui/DiplodocusDelayPenaltyDisableTests.java
index eb21bc183e812885d341016509b6330e6f7ddb27..9821d1a20eb8169ad93557f15f00dbabb274ac20 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusDelayPenaltyDisableTests.java
+++ b/ttool/src/test/java/ui/DiplodocusDelayPenaltyDisableTests.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui;
 
 import common.ConfigurationTTool;
 import common.SpecConfigTTool;
@@ -9,6 +9,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
+import test.AbstractTest;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLMappingTextSpecification;
 import tmltranslator.TMLSyntaxChecking;