diff --git a/regression_test/all_from/Makefile b/regression_test/all_from/Makefile
index 5fd4c2befcc1afb4f472c2d1c159c02021e8aff1..d206531c19abe5280ffc12db654403ec94f902c9 100644
--- a/regression_test/all_from/Makefile
+++ b/regression_test/all_from/Makefile
@@ -53,7 +53,7 @@ TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX)
 #
 
 # TTCN-3 modules of this project:
-TTCN3_MODULES = $(wildcard all_from*.ttcn) types.ttcn  sapc.ttcn functions.ttcn imported_templates.ttcn
+TTCN3_MODULES = $(wildcard all_from*.ttcn) types.ttcn  sapc.ttcn functions.ttcn
 #TTCN3_MODULES = everything.ttcn
 
 
diff --git a/regression_test/all_from/all_from.ttcn b/regression_test/all_from/all_from.ttcn
index b69f0f82d1afd60875318f6c1aeaabcd7f7696d0..042aacb214c3c89a2bad204797b125764260ca4d 100644
--- a/regression_test/all_from/all_from.ttcn
+++ b/regression_test/all_from/all_from.ttcn
@@ -14,7 +14,20 @@
 module all_from { // ETSI CR 6088
 import from types all;
 import from functions all;
-import from imported_templates all;
+
+template RoI t_imported_RoI1 := {1, 2, (6..9)};
+template RoI t_imported_RoI2 := {1, *, 3};
+template RoI t_imported_RoI3 := {20,21,22};
+template RoI t_imported_RoI4 := {1, ?, 3};
+//for permutation:
+template RoI t_imported_RoI1_P := {1, 2, *};
+template RoI t_imported_RoI3_P := {1, 2, 3};
+template RoI t_imported_RoI7_P := {1, 2, ?};
+
+//===========Set of Integer================================
+template SoI t_imported_SoI1 := {1,2,(6..9)};
+template SoI t_imported_SoI2 := {1, *, 3};
+template SoI t_imported_SoI3 := {20,21,22};
 
 //just to test these types as well:
 modulepar RoI tsp_RoI3 := {20,21,22};
diff --git a/regression_test/all_from/all_from_complement.ttcn b/regression_test/all_from/all_from_complement.ttcn
index 139047d03153feae9000fd8ffb4c938ed8264473..0917caf7d667427ac3cd83d3200097de17c62132 100644
--- a/regression_test/all_from/all_from_complement.ttcn
+++ b/regression_test/all_from/all_from_complement.ttcn
@@ -13,7 +13,20 @@
 module all_from_complement { // ETSI CR 6088
 import from types all;
 import from functions all;
-import from imported_templates all;
+
+template RoI t_imported_RoI1 := {1, 2, (6..9)};
+template RoI t_imported_RoI2 := {1, *, 3};
+template RoI t_imported_RoI3 := {20,21,22};
+template RoI t_imported_RoI4 := {1, ?, 3};
+//for permutation:
+template RoI t_imported_RoI1_P := {1, 2, *};
+template RoI t_imported_RoI3_P := {1, 2, 3};
+template RoI t_imported_RoI7_P := {1, 2, ?};
+
+//===========Set of Integer================================
+template SoI t_imported_SoI1 := {1,2,(6..9)};
+template SoI t_imported_SoI2 := {1, *, 3};
+template SoI t_imported_SoI3 := {20,21,22};
 
 // B 1.2.1 Template List
 // "It can be used on values of all types"
diff --git a/regression_test/all_from/all_from_permutation.ttcn b/regression_test/all_from/all_from_permutation.ttcn
index 1f84e0c61254c2a2024519a38e918bb9ab264d77..4aade0543e9e79a3185b74f726b1ec517992d902 100644
--- a/regression_test/all_from/all_from_permutation.ttcn
+++ b/regression_test/all_from/all_from_permutation.ttcn
@@ -16,7 +16,20 @@ module all_from_permutation
 {
 import from types all;
 import from functions all;
-import from imported_templates all;
+
+template RoI t_imported_RoI1 := {1, 2, (6..9)};
+template RoI t_imported_RoI2 := {1, *, 3};
+template RoI t_imported_RoI3 := {20,21,22};
+template RoI t_imported_RoI4 := {1, ?, 3};
+//for permutation:
+template RoI t_imported_RoI1_P := {1, 2, *};
+template RoI t_imported_RoI3_P := {1, 2, 3};
+template RoI t_imported_RoI7_P := {1, 2, ?};
+
+//===========Set of Integer================================
+template SoI t_imported_SoI1 := {1,2,(6..9)};
+template SoI t_imported_SoI2 := {1, *, 3};
+template SoI t_imported_SoI3 := {20,21,22};
 
 // Test Target:
 // B.1.3.3    Permutation
diff --git a/regression_test/all_from/all_from_subset.ttcn b/regression_test/all_from/all_from_subset.ttcn
index 30ef6752b4022b94f028e907e5a729269e41fba3..45f976f7fa991f0424cd7067ab4b854b9e26dde8 100644
--- a/regression_test/all_from/all_from_subset.ttcn
+++ b/regression_test/all_from/all_from_subset.ttcn
@@ -14,7 +14,20 @@ module all_from_subset
 {
 import from types all;
 import from functions all;
-import from imported_templates all;
+
+template RoI t_imported_RoI1 := {1, 2, (6..9)};
+template RoI t_imported_RoI2 := {1, *, 3};
+template RoI t_imported_RoI3 := {20,21,22};
+template RoI t_imported_RoI4 := {1, ?, 3};
+//for permutation:
+template RoI t_imported_RoI1_P := {1, 2, *};
+template RoI t_imported_RoI3_P := {1, 2, 3};
+template RoI t_imported_RoI7_P := {1, 2, ?};
+
+//===========Set of Integer================================
+template SoI t_imported_SoI1 := {1,2,(6..9)};
+template SoI t_imported_SoI2 := {1, *, 3};
+template SoI t_imported_SoI3 := {20,21,22};
 
 // Test Target:
 // ETSI ES 201 873-1 v?.?
diff --git a/regression_test/all_from/all_from_subtype.ttcn b/regression_test/all_from/all_from_subtype.ttcn
index a251f9b361c44855bfc792068320ebdb8f55e8a9..f1c2ffb69418b1f4ae77add14a1131f680e83906 100644
--- a/regression_test/all_from/all_from_subtype.ttcn
+++ b/regression_test/all_from/all_from_subtype.ttcn
@@ -15,7 +15,7 @@
 module all_from_subtype {
 
 import from types all;
-import from functions all;
+
 
 /* * * * integer * * * */
 template RoI t_RoI1 := { 1, 2, (6..9) };
diff --git a/regression_test/all_from/all_from_superset.ttcn b/regression_test/all_from/all_from_superset.ttcn
index 796560f24b017407786ef8ce0e2fbcb7f4fb7efe..069918aebb9ad870338eba3f664feeccd1fa6506 100644
--- a/regression_test/all_from/all_from_superset.ttcn
+++ b/regression_test/all_from/all_from_superset.ttcn
@@ -14,7 +14,21 @@ module all_from_superset
 {
 import from types all;
 import from functions all;
-import from imported_templates all;
+
+template RoI t_imported_RoI1 := {1, 2, (6..9)};
+template RoI t_imported_RoI2 := {1, *, 3};
+template RoI t_imported_RoI3 := {20,21,22};
+template RoI t_imported_RoI4 := {1, ?, 3};
+//for permutation:
+template RoI t_imported_RoI1_P := {1, 2, *};
+template RoI t_imported_RoI3_P := {1, 2, 3};
+template RoI t_imported_RoI7_P := {1, 2, ?};
+
+//===========Set of Integer================================
+template SoI t_imported_SoI1 := {1,2,(6..9)};
+template SoI t_imported_SoI2 := {1, *, 3};
+template SoI t_imported_SoI3 := {20,21,22};
+
 template RoI t_RoI1 := {1, 2, (6..9)};
 template RoI t_RoI2 := {1, *, 3};
 
diff --git a/regression_test/all_from/imported_templates.ttcn b/regression_test/all_from/imported_templates.ttcn
deleted file mode 100644
index e51e479ca504397476ea720a1427f207a6e5112e..0000000000000000000000000000000000000000
--- a/regression_test/all_from/imported_templates.ttcn
+++ /dev/null
@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000-2019 Ericsson Telecom AB
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
- *
- * Contributors:
- *   Balasko, Jeno
- *
- ******************************************************************************/
-module imported_templates {
-
-import from types all;
-//===== Templates for use by all_from from another module
-
-//============Record of Integer============================
-//for value list and for complement:
-template RoI t_imported_RoI1 := {1, 2, (6..9)};
-template RoI t_imported_RoI2 := {1, *, 3};
-template RoI t_imported_RoI3 := {20,21,22};
-template RoI t_imported_RoI4 := {1, ?, 3};
-//for permutation:
-template RoI t_imported_RoI1_P := {1, 2, *};
-template RoI t_imported_RoI3_P := {1, 2, 3};
-template RoI t_imported_RoI7_P := {1, 2, ?};
-
-//===========Set of Integer================================
-template SoI t_imported_SoI1 := {1,2,(6..9)};
-template SoI t_imported_SoI2 := {1, *, 3};
-template SoI t_imported_SoI3 := {20,21,22};
-}