diff --git a/tests/TFN/TFN_4a_002/host.c b/tests/TFN/TFN_4a_002/host.c
index cb0daf4..6881918 100644
--- a/tests/TFN/TFN_4a_002/host.c
+++ b/tests/TFN/TFN_4a_002/host.c
@@ -83,9 +83,8 @@
 
 int destroy_queue_buffer(struct mars_context *mars_ctx, struct mars_task_queue_t *internal_queue)
 {
-	free(mars_ea_to_ptr(internal_queue->buffer_ea));
+	mars_ea_free(mars_ea_to_ptr(internal_queue->buffer_ea));
 	return 0;
-
 }
 
 
diff --git a/tests/TPF/TPF_10_001/Makefile b/tests/TPF/TPF_10_001/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TPF/TPF_10_001/Makefile
+++ b/tests/TPF/TPF_10_001/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_10_002/Makefile b/tests/TPF/TPF_10_002/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TPF/TPF_10_002/Makefile
+++ b/tests/TPF/TPF_10_002/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_10_003/Makefile b/tests/TPF/TPF_10_003/Makefile
index 82e6036..3ab2b85 100644
--- a/tests/TPF/TPF_10_003/Makefile
+++ b/tests/TPF/TPF_10_003/Makefile
@@ -23,7 +23,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_10_004/Makefile b/tests/TPF/TPF_10_004/Makefile
index 82e6036..3ab2b85 100644
--- a/tests/TPF/TPF_10_004/Makefile
+++ b/tests/TPF/TPF_10_004/Makefile
@@ -23,7 +23,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_20_001/Makefile b/tests/TPF/TPF_20_001/Makefile
index f92da3b..8e6adea 100644
--- a/tests/TPF/TPF_20_001/Makefile
+++ b/tests/TPF/TPF_20_001/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 240
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_20_002/Makefile b/tests/TPF/TPF_20_002/Makefile
index f92da3b..8e6adea 100644
--- a/tests/TPF/TPF_20_002/Makefile
+++ b/tests/TPF/TPF_20_002/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 240
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_30_001/Makefile b/tests/TPF/TPF_30_001/Makefile
index 50d3be3..be474d3 100644
--- a/tests/TPF/TPF_30_001/Makefile
+++ b/tests/TPF/TPF_30_001/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo
-timeout = 300 
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_30_002/Makefile b/tests/TPF/TPF_30_002/Makefile
index 07f4922..be474d3 100644
--- a/tests/TPF/TPF_30_002/Makefile
+++ b/tests/TPF/TPF_30_002/Makefile
@@ -27,8 +27,7 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo
-timeout = 360 
- 
+
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
 include $(top_srcdir)/scripts/rules_tpf.mk
diff --git a/tests/TPF/TPF_30_003/Makefile b/tests/TPF/TPF_30_003/Makefile
index 975edc1..8be185a 100644
--- a/tests/TPF/TPF_30_003/Makefile
+++ b/tests/TPF/TPF_30_003/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 240
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_30_004/Makefile b/tests/TPF/TPF_30_004/Makefile
index 975edc1..8be185a 100644
--- a/tests/TPF/TPF_30_004/Makefile
+++ b/tests/TPF/TPF_30_004/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 240
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_001/Makefile b/tests/TPF/TPF_40_001/Makefile
index e498594..c9b5589 100644
--- a/tests/TPF/TPF_40_001/Makefile
+++ b/tests/TPF/TPF_40_001/Makefile
@@ -25,7 +25,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_002/Makefile b/tests/TPF/TPF_40_002/Makefile
index e498594..c9b5589 100644
--- a/tests/TPF/TPF_40_002/Makefile
+++ b/tests/TPF/TPF_40_002/Makefile
@@ -25,7 +25,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_003/Makefile b/tests/TPF/TPF_40_003/Makefile
index 5888f26..c773fc6 100644
--- a/tests/TPF/TPF_40_003/Makefile
+++ b/tests/TPF/TPF_40_003/Makefile
@@ -25,7 +25,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_004/Makefile b/tests/TPF/TPF_40_004/Makefile
index e498594..c9b5589 100644
--- a/tests/TPF/TPF_40_004/Makefile
+++ b/tests/TPF/TPF_40_004/Makefile
@@ -25,7 +25,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_005/Makefile b/tests/TPF/TPF_40_005/Makefile
index e498594..c9b5589 100644
--- a/tests/TPF/TPF_40_005/Makefile
+++ b/tests/TPF/TPF_40_005/Makefile
@@ -25,7 +25,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_006/Makefile b/tests/TPF/TPF_40_006/Makefile
index 5888f26..c773fc6 100644
--- a/tests/TPF/TPF_40_006/Makefile
+++ b/tests/TPF/TPF_40_006/Makefile
@@ -25,7 +25,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_007/Makefile b/tests/TPF/TPF_40_007/Makefile
index dc68b86..8be185a 100644
--- a/tests/TPF/TPF_40_007/Makefile
+++ b/tests/TPF/TPF_40_007/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_008/Makefile b/tests/TPF/TPF_40_008/Makefile
index dc68b86..8be185a 100644
--- a/tests/TPF/TPF_40_008/Makefile
+++ b/tests/TPF/TPF_40_008/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_009/Makefile b/tests/TPF/TPF_40_009/Makefile
index dc68b86..8be185a 100644
--- a/tests/TPF/TPF_40_009/Makefile
+++ b/tests/TPF/TPF_40_009/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_010/Makefile b/tests/TPF/TPF_40_010/Makefile
index b590ac2..98aa09e 100644
--- a/tests/TPF/TPF_40_010/Makefile
+++ b/tests/TPF/TPF_40_010/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_011/Makefile b/tests/TPF/TPF_40_011/Makefile
index b590ac2..98aa09e 100644
--- a/tests/TPF/TPF_40_011/Makefile
+++ b/tests/TPF/TPF_40_011/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_012/Makefile b/tests/TPF/TPF_40_012/Makefile
index 97b0752..1a8548f 100644
--- a/tests/TPF/TPF_40_012/Makefile
+++ b/tests/TPF/TPF_40_012/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_013/Makefile b/tests/TPF/TPF_40_013/Makefile
index b590ac2..98aa09e 100644
--- a/tests/TPF/TPF_40_013/Makefile
+++ b/tests/TPF/TPF_40_013/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_014/Makefile b/tests/TPF/TPF_40_014/Makefile
index b590ac2..98aa09e 100644
--- a/tests/TPF/TPF_40_014/Makefile
+++ b/tests/TPF/TPF_40_014/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_015/Makefile b/tests/TPF/TPF_40_015/Makefile
index 97b0752..1a8548f 100644
--- a/tests/TPF/TPF_40_015/Makefile
+++ b/tests/TPF/TPF_40_015/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_016/Makefile b/tests/TPF/TPF_40_016/Makefile
index c7f5caa..8be185a 100644
--- a/tests/TPF/TPF_40_016/Makefile
+++ b/tests/TPF/TPF_40_016/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 240 
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_017/Makefile b/tests/TPF/TPF_40_017/Makefile
index c7f5caa..8be185a 100644
--- a/tests/TPF/TPF_40_017/Makefile
+++ b/tests/TPF/TPF_40_017/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 240 
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_018/Makefile b/tests/TPF/TPF_40_018/Makefile
index dc68b86..8be185a 100644
--- a/tests/TPF/TPF_40_018/Makefile
+++ b/tests/TPF/TPF_40_018/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_019/Makefile b/tests/TPF/TPF_40_019/Makefile
index 96a8390..98aa09e 100644
--- a/tests/TPF/TPF_40_019/Makefile
+++ b/tests/TPF/TPF_40_019/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 240
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_020/Makefile b/tests/TPF/TPF_40_020/Makefile
index b590ac2..98aa09e 100644
--- a/tests/TPF/TPF_40_020/Makefile
+++ b/tests/TPF/TPF_40_020/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_021/Makefile b/tests/TPF/TPF_40_021/Makefile
index 52f5df8..77f51da 100644
--- a/tests/TPF/TPF_40_021/Makefile
+++ b/tests/TPF/TPF_40_021/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_022/Makefile b/tests/TPF/TPF_40_022/Makefile
index 6e24f56..98aa09e 100644
--- a/tests/TPF/TPF_40_022/Makefile
+++ b/tests/TPF/TPF_40_022/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 300
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_023/Makefile b/tests/TPF/TPF_40_023/Makefile
index f5a7d7d..6467ca4 100644
--- a/tests/TPF/TPF_40_023/Makefile
+++ b/tests/TPF/TPF_40_023/Makefile
@@ -27,7 +27,7 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 900 
+timeout = 1200 
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_024/Makefile b/tests/TPF/TPF_40_024/Makefile
index 526b3d2..77f51da 100644
--- a/tests/TPF/TPF_40_024/Makefile
+++ b/tests/TPF/TPF_40_024/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo
-timeout = 120 
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_025/Makefile b/tests/TPF/TPF_40_025/Makefile
index 975edc1..8be185a 100644
--- a/tests/TPF/TPF_40_025/Makefile
+++ b/tests/TPF/TPF_40_025/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 240
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_026/Makefile b/tests/TPF/TPF_40_026/Makefile
index 975edc1..8be185a 100644
--- a/tests/TPF/TPF_40_026/Makefile
+++ b/tests/TPF/TPF_40_026/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 240
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_027/Makefile b/tests/TPF/TPF_40_027/Makefile
index dc68b86..8be185a 100644
--- a/tests/TPF/TPF_40_027/Makefile
+++ b/tests/TPF/TPF_40_027/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_028/Makefile b/tests/TPF/TPF_40_028/Makefile
index 211cb9f..54b4a7c 100644
--- a/tests/TPF/TPF_40_028/Makefile
+++ b/tests/TPF/TPF_40_028/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_029/Makefile b/tests/TPF/TPF_40_029/Makefile
index b590ac2..98aa09e 100644
--- a/tests/TPF/TPF_40_029/Makefile
+++ b/tests/TPF/TPF_40_029/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_030/Makefile b/tests/TPF/TPF_40_030/Makefile
index fe85af5..98aa09e 100644
--- a/tests/TPF/TPF_40_030/Makefile
+++ b/tests/TPF/TPF_40_030/Makefile
@@ -25,10 +25,8 @@
 INCLUDE_CFLAGS+= -I./
 MPU_INCLUDE_CFLAGS+= -I./
 
-
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_031/Makefile b/tests/TPF/TPF_40_031/Makefile
index fe85af5..98aa09e 100644
--- a/tests/TPF/TPF_40_031/Makefile
+++ b/tests/TPF/TPF_40_031/Makefile
@@ -25,10 +25,8 @@
 INCLUDE_CFLAGS+= -I./
 MPU_INCLUDE_CFLAGS+= -I./
 
-
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_032/Makefile b/tests/TPF/TPF_40_032/Makefile
index fe85af5..98aa09e 100644
--- a/tests/TPF/TPF_40_032/Makefile
+++ b/tests/TPF/TPF_40_032/Makefile
@@ -25,10 +25,8 @@
 INCLUDE_CFLAGS+= -I./
 MPU_INCLUDE_CFLAGS+= -I./
 
-
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_033/Makefile b/tests/TPF/TPF_40_033/Makefile
index fe85af5..98aa09e 100644
--- a/tests/TPF/TPF_40_033/Makefile
+++ b/tests/TPF/TPF_40_033/Makefile
@@ -25,10 +25,8 @@
 INCLUDE_CFLAGS+= -I./
 MPU_INCLUDE_CFLAGS+= -I./
 
-
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_034/Makefile b/tests/TPF/TPF_40_034/Makefile
index 1498fa4..cf50ffe 100644
--- a/tests/TPF/TPF_40_034/Makefile
+++ b/tests/TPF/TPF_40_034/Makefile
@@ -28,7 +28,6 @@
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo \
                    mpu4.task_eo mpu5.task_eo mpu6.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_035/Makefile b/tests/TPF/TPF_40_035/Makefile
index 1de70d4..b0a5ab3 100644
--- a/tests/TPF/TPF_40_035/Makefile
+++ b/tests/TPF/TPF_40_035/Makefile
@@ -28,7 +28,6 @@
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo \
                    mpu4.task_eo mpu5.task_eo mpu6.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_036/Makefile b/tests/TPF/TPF_40_036/Makefile
index 1de70d4..b0a5ab3 100644
--- a/tests/TPF/TPF_40_036/Makefile
+++ b/tests/TPF/TPF_40_036/Makefile
@@ -28,7 +28,6 @@
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo \
                    mpu4.task_eo mpu5.task_eo mpu6.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_037/Makefile b/tests/TPF/TPF_40_037/Makefile
index 1de70d4..b0a5ab3 100644
--- a/tests/TPF/TPF_40_037/Makefile
+++ b/tests/TPF/TPF_40_037/Makefile
@@ -28,7 +28,6 @@
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo \
                    mpu4.task_eo mpu5.task_eo mpu6.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_038/Makefile b/tests/TPF/TPF_40_038/Makefile
index 1de70d4..b0a5ab3 100644
--- a/tests/TPF/TPF_40_038/Makefile
+++ b/tests/TPF/TPF_40_038/Makefile
@@ -28,7 +28,6 @@
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo \
                    mpu4.task_eo mpu5.task_eo mpu6.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_039/Makefile b/tests/TPF/TPF_40_039/Makefile
index 1de70d4..b0a5ab3 100644
--- a/tests/TPF/TPF_40_039/Makefile
+++ b/tests/TPF/TPF_40_039/Makefile
@@ -28,7 +28,6 @@
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo \
                    mpu4.task_eo mpu5.task_eo mpu6.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_040/Makefile b/tests/TPF/TPF_40_040/Makefile
index 1de70d4..b0a5ab3 100644
--- a/tests/TPF/TPF_40_040/Makefile
+++ b/tests/TPF/TPF_40_040/Makefile
@@ -28,7 +28,6 @@
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo \
                    mpu4.task_eo mpu5.task_eo mpu6.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_041/Makefile b/tests/TPF/TPF_40_041/Makefile
index 1de70d4..b0a5ab3 100644
--- a/tests/TPF/TPF_40_041/Makefile
+++ b/tests/TPF/TPF_40_041/Makefile
@@ -28,7 +28,6 @@
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo \
                    mpu4.task_eo mpu5.task_eo mpu6.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_042/Makefile b/tests/TPF/TPF_40_042/Makefile
index 1de70d4..b0a5ab3 100644
--- a/tests/TPF/TPF_40_042/Makefile
+++ b/tests/TPF/TPF_40_042/Makefile
@@ -28,7 +28,6 @@
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo \
                    mpu4.task_eo mpu5.task_eo mpu6.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_043/Makefile b/tests/TPF/TPF_40_043/Makefile
index 1de70d4..b0a5ab3 100644
--- a/tests/TPF/TPF_40_043/Makefile
+++ b/tests/TPF/TPF_40_043/Makefile
@@ -28,7 +28,6 @@
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo \
                    mpu4.task_eo mpu5.task_eo mpu6.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_044/Makefile b/tests/TPF/TPF_40_044/Makefile
index 1de70d4..b0a5ab3 100644
--- a/tests/TPF/TPF_40_044/Makefile
+++ b/tests/TPF/TPF_40_044/Makefile
@@ -28,7 +28,6 @@
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo \
                    mpu4.task_eo mpu5.task_eo mpu6.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_045/Makefile b/tests/TPF/TPF_40_045/Makefile
index 1de70d4..b0a5ab3 100644
--- a/tests/TPF/TPF_40_045/Makefile
+++ b/tests/TPF/TPF_40_045/Makefile
@@ -28,7 +28,6 @@
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo \
                    mpu4.task_eo mpu5.task_eo mpu6.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_50_002/Makefile b/tests/TPF/TPF_50_002/Makefile
index 975edc1..8be185a 100644
--- a/tests/TPF/TPF_50_002/Makefile
+++ b/tests/TPF/TPF_50_002/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 240
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_50_003/Makefile b/tests/TPF/TPF_50_003/Makefile
index 975edc1..8be185a 100644
--- a/tests/TPF/TPF_50_003/Makefile
+++ b/tests/TPF/TPF_50_003/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 240
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_50_004/Makefile b/tests/TPF/TPF_50_004/Makefile
index d1671fa..8be185a 100644
--- a/tests/TPF/TPF_50_004/Makefile
+++ b/tests/TPF/TPF_50_004/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 360 
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_50_005/Makefile b/tests/TPF/TPF_50_005/Makefile
index b60ef73..8be185a 100644
--- a/tests/TPF/TPF_50_005/Makefile
+++ b/tests/TPF/TPF_50_005/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 360
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_60_001/Makefile b/tests/TPF/TPF_60_001/Makefile
index 0bad622..be474d3 100644
--- a/tests/TPF/TPF_60_001/Makefile
+++ b/tests/TPF/TPF_60_001/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_60_002/Makefile b/tests/TPF/TPF_60_002/Makefile
index 50d3be3..be474d3 100644
--- a/tests/TPF/TPF_60_002/Makefile
+++ b/tests/TPF/TPF_60_002/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo
-timeout = 300 
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_60_003/Makefile b/tests/TPF/TPF_60_003/Makefile
index e939af1..8aca921 100644
--- a/tests/TPF/TPF_60_003/Makefile
+++ b/tests/TPF/TPF_60_003/Makefile
@@ -27,7 +27,7 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo
-timeout = 960
+timeout = 1200
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_60_004/Makefile b/tests/TPF/TPF_60_004/Makefile
index e0b72a1..8be185a 100644
--- a/tests/TPF/TPF_60_004/Makefile
+++ b/tests/TPF/TPF_60_004/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 600
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_60_005/Makefile b/tests/TPF/TPF_60_005/Makefile
index 9d7407b..8be185a 100644
--- a/tests/TPF/TPF_60_005/Makefile
+++ b/tests/TPF/TPF_60_005/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 300
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_60_006/Makefile b/tests/TPF/TPF_60_006/Makefile
index 9eeb382..8be185a 100644
--- a/tests/TPF/TPF_60_006/Makefile
+++ b/tests/TPF/TPF_60_006/Makefile
@@ -27,7 +27,6 @@
 
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 180
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_01_001/Makefile b/tests/TST/TST_01_001/Makefile
index 6c93f02..e88011f 100644
--- a/tests/TST/TST_01_001/Makefile
+++ b/tests/TST/TST_01_001/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_01_002/Makefile b/tests/TST/TST_01_002/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_01_002/Makefile
+++ b/tests/TST/TST_01_002/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_01_003/Makefile b/tests/TST/TST_01_003/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_01_003/Makefile
+++ b/tests/TST/TST_01_003/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_01_004/Makefile b/tests/TST/TST_01_004/Makefile
index 6c93f02..e88011f 100644
--- a/tests/TST/TST_01_004/Makefile
+++ b/tests/TST/TST_01_004/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_01_005/Makefile b/tests/TST/TST_01_005/Makefile
index 6c93f02..e88011f 100644
--- a/tests/TST/TST_01_005/Makefile
+++ b/tests/TST/TST_01_005/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_02_001/Makefile b/tests/TST/TST_02_001/Makefile
index 6c93f02..e88011f 100644
--- a/tests/TST/TST_02_001/Makefile
+++ b/tests/TST/TST_02_001/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_02_002/Makefile b/tests/TST/TST_02_002/Makefile
index 6c93f02..e88011f 100644
--- a/tests/TST/TST_02_002/Makefile
+++ b/tests/TST/TST_02_002/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_02_003/Makefile b/tests/TST/TST_02_003/Makefile
index 6c93f02..e88011f 100644
--- a/tests/TST/TST_02_003/Makefile
+++ b/tests/TST/TST_02_003/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_02_004/Makefile b/tests/TST/TST_02_004/Makefile
index 6584a11..e4de6fa 100644
--- a/tests/TST/TST_02_004/Makefile
+++ b/tests/TST/TST_02_004/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.wm_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_02_005/Makefile b/tests/TST/TST_02_005/Makefile
index 6584a11..e4de6fa 100644
--- a/tests/TST/TST_02_005/Makefile
+++ b/tests/TST/TST_02_005/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.wm_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_03_001/Makefile b/tests/TST/TST_03_001/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_03_001/Makefile
+++ b/tests/TST/TST_03_001/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_03_002/Makefile b/tests/TST/TST_03_002/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_03_002/Makefile
+++ b/tests/TST/TST_03_002/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_03_003/Makefile b/tests/TST/TST_03_003/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_03_003/Makefile
+++ b/tests/TST/TST_03_003/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_03_004/Makefile b/tests/TST/TST_03_004/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_03_004/Makefile
+++ b/tests/TST/TST_03_004/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_03_005/Makefile b/tests/TST/TST_03_005/Makefile
index d2df2d1..c2c7d09 100644
--- a/tests/TST/TST_03_005/Makefile
+++ b/tests/TST/TST_03_005/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 180
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_03_006/Makefile b/tests/TST/TST_03_006/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_03_006/Makefile
+++ b/tests/TST/TST_03_006/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_03_007/Makefile b/tests/TST/TST_03_007/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_03_007/Makefile
+++ b/tests/TST/TST_03_007/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_03_008/Makefile b/tests/TST/TST_03_008/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_03_008/Makefile
+++ b/tests/TST/TST_03_008/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_03_009/Makefile b/tests/TST/TST_03_009/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_03_009/Makefile
+++ b/tests/TST/TST_03_009/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_03_010/Makefile b/tests/TST/TST_03_010/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_03_010/Makefile
+++ b/tests/TST/TST_03_010/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_03_011/Makefile b/tests/TST/TST_03_011/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_03_011/Makefile
+++ b/tests/TST/TST_03_011/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_04_001/Makefile b/tests/TST/TST_04_001/Makefile
index 6c93f02..e88011f 100644
--- a/tests/TST/TST_04_001/Makefile
+++ b/tests/TST/TST_04_001/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_04_002/Makefile b/tests/TST/TST_04_002/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_04_002/Makefile
+++ b/tests/TST/TST_04_002/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_05_001/Makefile b/tests/TST/TST_05_001/Makefile
index 6c93f02..e88011f 100644
--- a/tests/TST/TST_05_001/Makefile
+++ b/tests/TST/TST_05_001/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_05_002/Makefile b/tests/TST/TST_05_002/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_05_002/Makefile
+++ b/tests/TST/TST_05_002/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_05_003/Makefile b/tests/TST/TST_05_003/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_05_003/Makefile
+++ b/tests/TST/TST_05_003/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_05_004/Makefile b/tests/TST/TST_05_004/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_05_004/Makefile
+++ b/tests/TST/TST_05_004/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_05_005/Makefile b/tests/TST/TST_05_005/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_05_005/Makefile
+++ b/tests/TST/TST_05_005/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_05_006/Makefile b/tests/TST/TST_05_006/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_05_006/Makefile
+++ b/tests/TST/TST_05_006/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_05_007/Makefile b/tests/TST/TST_05_007/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_05_007/Makefile
+++ b/tests/TST/TST_05_007/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_05_008/Makefile b/tests/TST/TST_05_008/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_05_008/Makefile
+++ b/tests/TST/TST_05_008/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_05_009/Makefile b/tests/TST/TST_05_009/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_05_009/Makefile
+++ b/tests/TST/TST_05_009/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_05_010/Makefile b/tests/TST/TST_05_010/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_05_010/Makefile
+++ b/tests/TST/TST_05_010/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_001/Makefile b/tests/TST/TST_06_001/Makefile
index 6c93f02..e88011f 100644
--- a/tests/TST/TST_06_001/Makefile
+++ b/tests/TST/TST_06_001/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_002/Makefile b/tests/TST/TST_06_002/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_06_002/Makefile
+++ b/tests/TST/TST_06_002/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_003/Makefile b/tests/TST/TST_06_003/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_06_003/Makefile
+++ b/tests/TST/TST_06_003/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_004/Makefile b/tests/TST/TST_06_004/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_06_004/Makefile
+++ b/tests/TST/TST_06_004/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_005/Makefile b/tests/TST/TST_06_005/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_06_005/Makefile
+++ b/tests/TST/TST_06_005/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_006/Makefile b/tests/TST/TST_06_006/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_06_006/Makefile
+++ b/tests/TST/TST_06_006/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_007/Makefile b/tests/TST/TST_06_007/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_06_007/Makefile
+++ b/tests/TST/TST_06_007/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_008/Makefile b/tests/TST/TST_06_008/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_06_008/Makefile
+++ b/tests/TST/TST_06_008/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_009/Makefile b/tests/TST/TST_06_009/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_06_009/Makefile
+++ b/tests/TST/TST_06_009/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_010/Makefile b/tests/TST/TST_06_010/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_06_010/Makefile
+++ b/tests/TST/TST_06_010/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_011/Makefile b/tests/TST/TST_06_011/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_06_011/Makefile
+++ b/tests/TST/TST_06_011/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_012/Makefile b/tests/TST/TST_06_012/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_06_012/Makefile
+++ b/tests/TST/TST_06_012/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_06_013/Makefile b/tests/TST/TST_06_013/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_06_013/Makefile
+++ b/tests/TST/TST_06_013/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_07_001/Makefile b/tests/TST/TST_07_001/Makefile
index 6c93f02..e88011f 100644
--- a/tests/TST/TST_07_001/Makefile
+++ b/tests/TST/TST_07_001/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_07_002/Makefile b/tests/TST/TST_07_002/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_07_002/Makefile
+++ b/tests/TST/TST_07_002/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_07_003/Makefile b/tests/TST/TST_07_003/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_07_003/Makefile
+++ b/tests/TST/TST_07_003/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_07_004/Makefile b/tests/TST/TST_07_004/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_07_004/Makefile
+++ b/tests/TST/TST_07_004/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_08_001/Makefile b/tests/TST/TST_08_001/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_08_001/Makefile
+++ b/tests/TST/TST_08_001/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_08_002/Makefile b/tests/TST/TST_08_002/Makefile
index b605c75..c2c7d09 100644
--- a/tests/TST/TST_08_002/Makefile
+++ b/tests/TST/TST_08_002/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_08_003/Makefile b/tests/TST/TST_08_003/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_08_003/Makefile
+++ b/tests/TST/TST_08_003/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_08_004/Makefile b/tests/TST/TST_08_004/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_08_004/Makefile
+++ b/tests/TST/TST_08_004/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_08_005/Makefile b/tests/TST/TST_08_005/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_08_005/Makefile
+++ b/tests/TST/TST_08_005/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TST/TST_08_006/Makefile b/tests/TST/TST_08_006/Makefile
index 5787e3b..be30511 100644
--- a/tests/TST/TST_08_006/Makefile
+++ b/tests/TST/TST_08_006/Makefile
@@ -24,7 +24,6 @@
 EXTRA_LDFLAGS=-lm
 top_srcdir = ../..
 test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
 
 include $(top_srcdir)/scripts/config.mk
 include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/scripts/run.sh b/tests/scripts/run.sh
index 8246eb2..6b594b0 100755
--- a/tests/scripts/run.sh
+++ b/tests/scripts/run.sh
@@ -24,7 +24,7 @@
 # Usage: <NAME> <COMMAND> [<COMMAND-ARGS>]
 #
 
-TIMEOUT=${TIMEOUT:-120}
+TIMEOUT=${TIMEOUT:-600}
 
 scripts_dir="`dirname $0`"