diff --git a/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.jsonp b/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.1.jsonp
similarity index 97%
rename from test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.jsonp
rename to test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.1.jsonp
index 8d0b47e5..e40798c1 100644
--- a/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.jsonp
+++ b/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.1.jsonp
@@ -13,5 +13,5 @@
 //  limitations under the License.
 //**************************************************************************
 {
-   "level" : "DD"
+   "level" : "DD.1"
 }
diff --git a/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.2.jsonp b/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.2.jsonp
new file mode 100644
index 00000000..b3bb9d15
--- /dev/null
+++ b/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.2.jsonp
@@ -0,0 +1,17 @@
+//  Copyright 2020-2024 Robert Bosch GmbH
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//**************************************************************************
+{
+   "level" : "DD.2"
+}
diff --git a/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.3.jsonp b/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.3.jsonp
new file mode 100644
index 00000000..269d9236
--- /dev/null
+++ b/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.3.jsonp
@@ -0,0 +1,17 @@
+//  Copyright 2020-2024 Robert Bosch GmbH
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//**************************************************************************
+{
+   "level" : "DD.3"
+}
diff --git a/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.AA.jsonp b/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.AA.jsonp
new file mode 100644
index 00000000..b6dc5c99
--- /dev/null
+++ b/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.AA.jsonp
@@ -0,0 +1,17 @@
+//  Copyright 2020-2024 Robert Bosch GmbH
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//**************************************************************************
+{
+   "origin" : "DD.AA"
+}
diff --git a/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.BB.jsonp b/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.BB.jsonp
new file mode 100644
index 00000000..adb1f3c1
--- /dev/null
+++ b/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.BB.jsonp
@@ -0,0 +1,17 @@
+//  Copyright 2020-2024 Robert Bosch GmbH
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//**************************************************************************
+{
+   "origin" : "DD.BB"
+}
diff --git a/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.CC.jsonp b/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.CC.jsonp
new file mode 100644
index 00000000..03de8e30
--- /dev/null
+++ b/test/testfiles/dynamic_imports/AA/BB/CC/DD/imported.DD.CC.jsonp
@@ -0,0 +1,17 @@
+//  Copyright 2020-2024 Robert Bosch GmbH
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//**************************************************************************
+{
+   "origin" : "DD.CC"
+}
diff --git a/test/testfiles/dynamic_imports/AA/BB/CC/imported.CC.M.jsonp b/test/testfiles/dynamic_imports/AA/BB/CC/imported.CC.M.jsonp
new file mode 100644
index 00000000..068f5e11
--- /dev/null
+++ b/test/testfiles/dynamic_imports/AA/BB/CC/imported.CC.M.jsonp
@@ -0,0 +1,18 @@
+//  Copyright 2020-2024 Robert Bosch GmbH
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//**************************************************************************
+{
+   "level"    : "CC",
+   "[import]" : "./DD/imported.DD.3.jsonp",
+}
diff --git a/test/testfiles/dynamic_imports/AA/BB/CC/imported.CC.R.D.jsonp b/test/testfiles/dynamic_imports/AA/BB/CC/imported.CC.R.D.jsonp
index 83c82691..4c3cadf9 100644
--- a/test/testfiles/dynamic_imports/AA/BB/CC/imported.CC.R.D.jsonp
+++ b/test/testfiles/dynamic_imports/AA/BB/CC/imported.CC.R.D.jsonp
@@ -14,5 +14,6 @@
 //**************************************************************************
 {
    "level"    : "CC",
-   "[import]" : "./${DD}/imported.${DD}.jsonp"
+   "[import]" : "./${DD}/imported.${DD}.2.jsonp",
+   "[import]" : "./DD/imported.DD.CC.jsonp"
 }
diff --git a/test/testfiles/dynamic_imports/AA/BB/CC/imported.CC.R.F.jsonp b/test/testfiles/dynamic_imports/AA/BB/CC/imported.CC.R.F.jsonp
index 2a653876..51c85a10 100644
--- a/test/testfiles/dynamic_imports/AA/BB/CC/imported.CC.R.F.jsonp
+++ b/test/testfiles/dynamic_imports/AA/BB/CC/imported.CC.R.F.jsonp
@@ -14,5 +14,6 @@
 //**************************************************************************
 {
    "level"    : "CC",
-   "[import]" : "./DD/imported.DD.jsonp"
+   "[import]" : "./DD/imported.DD.1.jsonp",
+   "[import]" : "./DD/imported.DD.CC.jsonp"
 }
diff --git a/test/testfiles/dynamic_imports/AA/BB/imported.BB.M.jsonp b/test/testfiles/dynamic_imports/AA/BB/imported.BB.M.jsonp
new file mode 100644
index 00000000..83715ada
--- /dev/null
+++ b/test/testfiles/dynamic_imports/AA/BB/imported.BB.M.jsonp
@@ -0,0 +1,18 @@
+//  Copyright 2020-2024 Robert Bosch GmbH
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//**************************************************************************
+{
+   "level"    : "BB",
+   "[import]" : "./${CC}/imported.${CC}.M.jsonp"
+}
diff --git a/test/testfiles/dynamic_imports/AA/BB/imported.BB.R.D.jsonp b/test/testfiles/dynamic_imports/AA/BB/imported.BB.R.D.jsonp
index 2e7c1487..be74862a 100644
--- a/test/testfiles/dynamic_imports/AA/BB/imported.BB.R.D.jsonp
+++ b/test/testfiles/dynamic_imports/AA/BB/imported.BB.R.D.jsonp
@@ -14,5 +14,6 @@
 //**************************************************************************
 {
    "level"    : "BB",
-   "[import]" : "./${CC}/imported.${CC}.R.D.jsonp"
+   "[import]" : "./${CC}/imported.${CC}.R.D.jsonp",
+   "[import]" : "./CC/DD/imported.DD.BB.jsonp"
 }
diff --git a/test/testfiles/dynamic_imports/AA/BB/imported.BB.R.F.jsonp b/test/testfiles/dynamic_imports/AA/BB/imported.BB.R.F.jsonp
index a4454d40..94c82a59 100644
--- a/test/testfiles/dynamic_imports/AA/BB/imported.BB.R.F.jsonp
+++ b/test/testfiles/dynamic_imports/AA/BB/imported.BB.R.F.jsonp
@@ -14,5 +14,6 @@
 //**************************************************************************
 {
    "level"    : "BB",
-   "[import]" : "./CC/imported.CC.R.F.jsonp"
+   "[import]" : "./CC/imported.CC.R.F.jsonp",
+   "[import]" : "./CC/DD/imported.DD.BB.jsonp"
 }
diff --git a/test/testfiles/dynamic_imports/AA/imported.AA.M.jsonp b/test/testfiles/dynamic_imports/AA/imported.AA.M.jsonp
new file mode 100644
index 00000000..5b612165
--- /dev/null
+++ b/test/testfiles/dynamic_imports/AA/imported.AA.M.jsonp
@@ -0,0 +1,18 @@
+//  Copyright 2020-2024 Robert Bosch GmbH
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//**************************************************************************
+{
+   "level"    : "AA",
+   "[import]" : "./BB/imported.BB.M.jsonp"
+}
diff --git a/test/testfiles/dynamic_imports/AA/imported.AA.R.D.jsonp b/test/testfiles/dynamic_imports/AA/imported.AA.R.D.jsonp
index 33f2a4d4..3755214c 100644
--- a/test/testfiles/dynamic_imports/AA/imported.AA.R.D.jsonp
+++ b/test/testfiles/dynamic_imports/AA/imported.AA.R.D.jsonp
@@ -14,5 +14,6 @@
 //**************************************************************************
 {
    "level"    : "AA",
-   "[import]" : "./${BB}/imported.${BB}.R.D.jsonp"
+   "[import]" : "./${BB}/imported.${BB}.R.D.jsonp",
+   "[import]" : "./BB/CC/DD/imported.DD.AA.jsonp"
 }
diff --git a/test/testfiles/dynamic_imports/AA/imported.AA.R.F.jsonp b/test/testfiles/dynamic_imports/AA/imported.AA.R.F.jsonp
index 438669b6..335da120 100644
--- a/test/testfiles/dynamic_imports/AA/imported.AA.R.F.jsonp
+++ b/test/testfiles/dynamic_imports/AA/imported.AA.R.F.jsonp
@@ -14,5 +14,6 @@
 //**************************************************************************
 {
    "level"    : "AA",
-   "[import]" : "./BB/imported.BB.R.F.jsonp"
+   "[import]" : "./BB/imported.BB.R.F.jsonp",
+   "[import]" : "./BB/CC/DD/imported.DD.AA.jsonp"
 }
diff --git a/test/testfiles/dynamic_imports/mixed_import.jsonp b/test/testfiles/dynamic_imports/mixed_import.jsonp
new file mode 100644
index 00000000..01d0d89c
--- /dev/null
+++ b/test/testfiles/dynamic_imports/mixed_import.jsonp
@@ -0,0 +1,21 @@
+//  Copyright 2020-2024 Robert Bosch GmbH
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//**************************************************************************
+{
+    "AA" : "AA",
+    "BB" : "BB",
+    "CC" : "CC",
+    "DD" : "DD",
+   "[import]" : "./${AA}/imported.${AA}.M.jsonp"
+}