From 1846d33c29d2ffc9764f009d65806ffa1353b433 Mon Sep 17 00:00:00 2001
From: Leo Balter <leonardo.balter@gmail.com>
Date: Wed, 3 Oct 2018 14:41:55 -0400
Subject: [PATCH] Regenerate tests

---
 src/dynamic-import/checklist.md               |  2 +-
 ...ow-import-catch-instn-iee-err-not-found.js | 49 ------------------
 ...-function-await-instn-iee-err-not-found.js | 49 ------------------
 ...-async-function-instn-iee-err-not-found.js | 50 -------------------
 ...on-return-await-instn-iee-err-not-found.js | 49 ------------------
 ...ck-import-catch-instn-iee-err-not-found.js | 47 -----------------
 ...d-block-labeled-instn-iee-err-not-found.js | 47 -----------------
 ...nested-do-while-instn-iee-err-not-found.js | 47 -----------------
 ...se-import-catch-instn-iee-err-not-found.js | 49 ------------------
 ...on-import-catch-instn-iee-err-not-found.js | 48 ------------------
 ...if-import-catch-instn-iee-err-not-found.js | 47 -----------------
 ...le-import-catch-instn-iee-err-not-found.js | 49 ------------------
 ...el-import-catch-instn-iee-err-not-found.js | 45 -----------------
 ...ression-empty-str-is-valid-assign-expr.js} |  2 +-
 ...d-arrow-empty-str-is-valid-assign-expr.js} |  2 +-
 ...d-block-empty-str-is-valid-assign-expr.js} |  2 +-
 ...labeled-empty-str-is-valid-assign-expr.js} |  2 +-
 ...o-while-empty-str-is-valid-assign-expr.js} |  2 +-
 ...aceless-empty-str-is-valid-assign-expr.js} |  2 +-
 ...ed-else-empty-str-is-valid-assign-expr.js} |  2 +-
 ...unction-empty-str-is-valid-assign-expr.js} |  2 +-
 ...-return-empty-str-is-valid-assign-expr.js} |  2 +-
 ...aceless-empty-str-is-valid-assign-expr.js} |  2 +-
 ...sted-if-empty-str-is-valid-assign-expr.js} |  2 +-
 ...d-while-empty-str-is-valid-assign-expr.js} |  2 +-
 ...p-level-empty-str-is-valid-assign-expr.js} |  2 +-
 ...sion-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...expression-eval-gtbndng-indirect-update.js |  0
 ...w-assignment-expression-returns-promise.js |  0
 ...then-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...mport-then-eval-gtbndng-indirect-update.js |  0
 ...ested-arrow-import-then-returns-promise.js |  0
 ...wait-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...tion-await-eval-gtbndng-indirect-update.js |  0
 ...ed-async-function-await-returns-promise.js |  0
 ...tion-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...c-function-eval-gtbndng-indirect-update.js |  0
 ...wait-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...turn-await-eval-gtbndng-indirect-update.js |  0
 ...c-function-return-await-returns-promise.js |  0
 .../nested-async-function-returns-promise.js  |  0
 ...then-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...mport-then-eval-gtbndng-indirect-update.js |  0
 ...ested-block-import-then-returns-promise.js |  0
 ...hile-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...d-do-while-eval-gtbndng-indirect-update.js |  0
 .../nested-do-while-returns-promise.js        |  0
 ...then-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...mport-then-eval-gtbndng-indirect-update.js |  0
 ...nested-else-import-then-returns-promise.js |  0
 ...then-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...mport-then-eval-gtbndng-indirect-update.js |  0
 ...ed-function-import-then-returns-promise.js |  0
 ...less-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...-braceless-eval-gtbndng-indirect-update.js |  0
 .../nested-if-braceless-returns-promise.js    |  0
 ...then-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...mport-then-eval-gtbndng-indirect-update.js |  0
 .../nested-if-import-then-returns-promise.js  |  0
 ...then-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...mport-then-eval-gtbndng-indirect-update.js |  0
 ...ested-while-import-then-returns-promise.js |  0
 ...eled-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...ck-labeled-eval-gtbndng-indirect-update.js |  0
 ...ax-nested-block-labeled-returns-promise.js |  0
 ...then-eval-gtbndng-indirect-update-dflt.js} |  2 +-
 ...mport-then-eval-gtbndng-indirect-update.js |  0
 .../top-level-import-then-returns-promise.js  |  0
 68 files changed, 28 insertions(+), 604 deletions(-)
 delete mode 100644 test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-not-found.js
 delete mode 100644 test/language/module-code/dynamic-import/catch/nested-async-function-await-instn-iee-err-not-found.js
 delete mode 100644 test/language/module-code/dynamic-import/catch/nested-async-function-instn-iee-err-not-found.js
 delete mode 100644 test/language/module-code/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-not-found.js
 delete mode 100644 test/language/module-code/dynamic-import/catch/nested-block-import-catch-instn-iee-err-not-found.js
 delete mode 100644 test/language/module-code/dynamic-import/catch/nested-block-labeled-instn-iee-err-not-found.js
 delete mode 100644 test/language/module-code/dynamic-import/catch/nested-do-while-instn-iee-err-not-found.js
 delete mode 100644 test/language/module-code/dynamic-import/catch/nested-else-import-catch-instn-iee-err-not-found.js
 delete mode 100644 test/language/module-code/dynamic-import/catch/nested-function-import-catch-instn-iee-err-not-found.js
 delete mode 100644 test/language/module-code/dynamic-import/catch/nested-if-import-catch-instn-iee-err-not-found.js
 delete mode 100644 test/language/module-code/dynamic-import/catch/nested-while-import-catch-instn-iee-err-not-found.js
 delete mode 100644 test/language/module-code/dynamic-import/catch/top-level-import-catch-instn-iee-err-not-found.js
 rename test/language/module-code/dynamic-import/syntax/valid/{nested-arrow-assignment-expression-empty-str-arg.js => nested-arrow-assignment-expression-empty-str-is-valid-assign-expr.js} (94%)
 rename test/language/module-code/dynamic-import/syntax/valid/{nested-arrow-empty-str-arg.js => nested-arrow-empty-str-is-valid-assign-expr.js} (94%)
 rename test/language/module-code/dynamic-import/syntax/valid/{nested-block-empty-str-arg.js => nested-block-empty-str-is-valid-assign-expr.js} (94%)
 rename test/language/module-code/dynamic-import/syntax/valid/{nested-block-labeled-empty-str-arg.js => nested-block-labeled-empty-str-is-valid-assign-expr.js} (94%)
 rename test/language/module-code/dynamic-import/syntax/valid/{nested-do-while-empty-str-arg.js => nested-do-while-empty-str-is-valid-assign-expr.js} (94%)
 rename test/language/module-code/dynamic-import/syntax/valid/{nested-else-braceless-empty-str-arg.js => nested-else-braceless-empty-str-is-valid-assign-expr.js} (94%)
 rename test/language/module-code/dynamic-import/syntax/valid/{nested-else-empty-str-arg.js => nested-else-empty-str-is-valid-assign-expr.js} (94%)
 rename test/language/module-code/dynamic-import/syntax/valid/{nested-function-empty-str-arg.js => nested-function-empty-str-is-valid-assign-expr.js} (94%)
 rename test/language/module-code/dynamic-import/syntax/valid/{nested-function-return-empty-str-arg.js => nested-function-return-empty-str-is-valid-assign-expr.js} (94%)
 rename test/language/module-code/dynamic-import/syntax/valid/{nested-if-braceless-empty-str-arg.js => nested-if-braceless-empty-str-is-valid-assign-expr.js} (94%)
 rename test/language/module-code/dynamic-import/syntax/valid/{nested-if-empty-str-arg.js => nested-if-empty-str-is-valid-assign-expr.js} (94%)
 rename test/language/module-code/dynamic-import/syntax/valid/{nested-while-empty-str-arg.js => nested-while-empty-str-is-valid-assign-expr.js} (94%)
 rename test/language/module-code/dynamic-import/syntax/valid/{top-level-empty-str-arg.js => top-level-empty-str-is-valid-assign-expr.js} (86%)
 rename test/language/module-code/dynamic-import/{nested-arrow-assignment-expression-eval-gtbdng-indirect-update-dflt.js => usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-arrow-assignment-expression-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{nested-arrow-import-then-eval-gtbdng-indirect-update-dflt.js => usage/nested-arrow-import-then-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-arrow-import-then-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-arrow-import-then-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{nested-async-function-await-eval-gtbdng-indirect-update-dflt.js => usage/nested-async-function-await-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-async-function-await-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-async-function-await-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{nested-async-function-eval-gtbdng-indirect-update-dflt.js => usage/nested-async-function-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-async-function-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{nested-async-function-return-await-eval-gtbdng-indirect-update-dflt.js => usage/nested-async-function-return-await-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-async-function-return-await-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-async-function-return-await-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-async-function-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{nested-block-import-then-eval-gtbdng-indirect-update-dflt.js => usage/nested-block-import-then-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-block-import-then-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-block-import-then-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{nested-do-while-eval-gtbdng-indirect-update-dflt.js => usage/nested-do-while-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-do-while-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-do-while-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{nested-else-import-then-eval-gtbdng-indirect-update-dflt.js => usage/nested-else-import-then-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-else-import-then-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-else-import-then-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{nested-function-import-then-eval-gtbdng-indirect-update-dflt.js => usage/nested-function-import-then-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-function-import-then-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-function-import-then-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{nested-if-braceless-eval-gtbdng-indirect-update-dflt.js => usage/nested-if-braceless-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-if-braceless-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-if-braceless-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{nested-if-import-then-eval-gtbdng-indirect-update-dflt.js => usage/nested-if-import-then-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-if-import-then-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-if-import-then-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{nested-while-import-then-eval-gtbdng-indirect-update-dflt.js => usage/nested-while-import-then-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-while-import-then-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/nested-while-import-then-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{syntax-nested-block-labeled-eval-gtbdng-indirect-update-dflt.js => usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/syntax-nested-block-labeled-returns-promise.js (100%)
 rename test/language/module-code/dynamic-import/{top-level-import-then-eval-gtbdng-indirect-update-dflt.js => usage/top-level-import-then-eval-gtbndng-indirect-update-dflt.js} (96%)
 rename test/language/module-code/dynamic-import/{ => usage}/top-level-import-then-eval-gtbndng-indirect-update.js (100%)
 rename test/language/module-code/dynamic-import/{ => usage}/top-level-import-then-returns-promise.js (100%)

diff --git a/src/dynamic-import/checklist.md b/src/dynamic-import/checklist.md
index e26f8e1af1..a58b056d6b 100644
--- a/src/dynamic-import/checklist.md
+++ b/src/dynamic-import/checklist.md
@@ -16,7 +16,7 @@ _general places it can be found as a CallExpression_
 - [x] labeled blocks
 - [x] blocks
 - [x] do while
-- [ ] else braceless
+- [x] else braceless
 - [x] else block
 - [x] if braceless
 - [x] if block
diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-not-found.js
deleted file mode 100644
index f20cc4bfb0..0000000000
--- a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-not-found.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/instn-iee-err-not-found.case
-// - src/dynamic-import/catch/nested-arrow.template
-/*---
-description: IndirectExportEntries validation - undefined imported bindings (nested arrow)
-esid: sec-import-call-runtime-semantics-evaluation
-features: [dynamic-import]
-flags: [generated, async]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    [...]
-    9. For each ExportEntry Record e in module.[[IndirectExportEntries]], do
-       a. Let resolution be ? module.ResolveExport(e.[[ExportName]], « », « »).
-       b. If resolution is null or resolution is "ambiguous", throw a
-          SyntaxError exception.
-    [...]
-
-    15.2.1.16.3 ResolveExport
-
-    [...]
-    9. Let starResolution be null.
-    10. For each ExportEntry Record e in module.[[StarExportEntries]], do
-        [...]
-    11. Return starResolution.
-
----*/
-
-let f = () => {
-  import('./instn-iee-err-not-found-empty_FIXTURE.js').catch(error => {
-
-    assert.sameValue(error.name, 'SyntaxError');
-
-  }).then($DONE, $DONE);
-};
-
-f();
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch/nested-async-function-await-instn-iee-err-not-found.js
deleted file mode 100644
index 82f6ea7ef6..0000000000
--- a/test/language/module-code/dynamic-import/catch/nested-async-function-await-instn-iee-err-not-found.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/instn-iee-err-not-found.case
-// - src/dynamic-import/catch/nested-async-function-await.template
-/*---
-description: IndirectExportEntries validation - undefined imported bindings (nested in async function, awaited)
-esid: sec-import-call-runtime-semantics-evaluation
-features: [dynamic-import]
-flags: [generated, async]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    [...]
-    9. For each ExportEntry Record e in module.[[IndirectExportEntries]], do
-       a. Let resolution be ? module.ResolveExport(e.[[ExportName]], « », « »).
-       b. If resolution is null or resolution is "ambiguous", throw a
-          SyntaxError exception.
-    [...]
-
-    15.2.1.16.3 ResolveExport
-
-    [...]
-    9. Let starResolution be null.
-    10. For each ExportEntry Record e in module.[[StarExportEntries]], do
-        [...]
-    11. Return starResolution.
-
----*/
-
-async function f() {
-  await import('./instn-iee-err-not-found-empty_FIXTURE.js').catch(error => {
-
-    assert.sameValue(error.name, 'SyntaxError');
-
-  }).then($DONE, $DONE);
-}
-
-f();
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch/nested-async-function-instn-iee-err-not-found.js
deleted file mode 100644
index 8dec1e098f..0000000000
--- a/test/language/module-code/dynamic-import/catch/nested-async-function-instn-iee-err-not-found.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/instn-iee-err-not-found.case
-// - src/dynamic-import/catch/nested-async-function.template
-/*---
-description: IndirectExportEntries validation - undefined imported bindings (nested in async function)
-esid: sec-import-call-runtime-semantics-evaluation
-features: [dynamic-import]
-flags: [generated, async]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    [...]
-    9. For each ExportEntry Record e in module.[[IndirectExportEntries]], do
-       a. Let resolution be ? module.ResolveExport(e.[[ExportName]], « », « »).
-       b. If resolution is null or resolution is "ambiguous", throw a
-          SyntaxError exception.
-    [...]
-
-    15.2.1.16.3 ResolveExport
-
-    [...]
-    9. Let starResolution be null.
-    10. For each ExportEntry Record e in module.[[StarExportEntries]], do
-        [...]
-    11. Return starResolution.
-
----*/
-
-async function f() {
-  import('./instn-iee-err-not-found-empty_FIXTURE.js').catch(error => {
-
-    assert.sameValue(error.name, 'SyntaxError');
-
-  }).then($DONE, $DONE);
-}
-
-f();
-
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-not-found.js
deleted file mode 100644
index 54cc96d4ac..0000000000
--- a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-not-found.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/instn-iee-err-not-found.case
-// - src/dynamic-import/catch/nested-async-function-return-await.template
-/*---
-description: IndirectExportEntries validation - undefined imported bindings (nested in async function, returns awaited)
-esid: sec-import-call-runtime-semantics-evaluation
-features: [dynamic-import]
-flags: [generated, async]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    [...]
-    9. For each ExportEntry Record e in module.[[IndirectExportEntries]], do
-       a. Let resolution be ? module.ResolveExport(e.[[ExportName]], « », « »).
-       b. If resolution is null or resolution is "ambiguous", throw a
-          SyntaxError exception.
-    [...]
-
-    15.2.1.16.3 ResolveExport
-
-    [...]
-    9. Let starResolution be null.
-    10. For each ExportEntry Record e in module.[[StarExportEntries]], do
-        [...]
-    11. Return starResolution.
-
----*/
-
-async function f() {
-  return await import('./instn-iee-err-not-found-empty_FIXTURE.js').catch(error => {
-
-    assert.sameValue(error.name, 'SyntaxError');
-
-  }).then($DONE, $DONE);
-}
-
-f();
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch/nested-block-import-catch-instn-iee-err-not-found.js
deleted file mode 100644
index 3e4415b2bc..0000000000
--- a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-instn-iee-err-not-found.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/instn-iee-err-not-found.case
-// - src/dynamic-import/catch/nested-block.template
-/*---
-description: IndirectExportEntries validation - undefined imported bindings (nested block)
-esid: sec-import-call-runtime-semantics-evaluation
-features: [dynamic-import]
-flags: [generated, async]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    [...]
-    9. For each ExportEntry Record e in module.[[IndirectExportEntries]], do
-       a. Let resolution be ? module.ResolveExport(e.[[ExportName]], « », « »).
-       b. If resolution is null or resolution is "ambiguous", throw a
-          SyntaxError exception.
-    [...]
-
-    15.2.1.16.3 ResolveExport
-
-    [...]
-    9. Let starResolution be null.
-    10. For each ExportEntry Record e in module.[[StarExportEntries]], do
-        [...]
-    11. Return starResolution.
-
----*/
-
-{
-  import('./instn-iee-err-not-found-empty_FIXTURE.js').catch(error => {
-
-    assert.sameValue(error.name, 'SyntaxError');
-
-  }).then($DONE, $DONE);
-};
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch/nested-block-labeled-instn-iee-err-not-found.js
deleted file mode 100644
index 55fd7acf0a..0000000000
--- a/test/language/module-code/dynamic-import/catch/nested-block-labeled-instn-iee-err-not-found.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/instn-iee-err-not-found.case
-// - src/dynamic-import/catch/nested-block-labeled.template
-/*---
-description: IndirectExportEntries validation - undefined imported bindings (nested block syntax)
-esid: sec-import-call-runtime-semantics-evaluation
-features: [dynamic-import]
-flags: [generated, async]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    [...]
-    9. For each ExportEntry Record e in module.[[IndirectExportEntries]], do
-       a. Let resolution be ? module.ResolveExport(e.[[ExportName]], « », « »).
-       b. If resolution is null or resolution is "ambiguous", throw a
-          SyntaxError exception.
-    [...]
-
-    15.2.1.16.3 ResolveExport
-
-    [...]
-    9. Let starResolution be null.
-    10. For each ExportEntry Record e in module.[[StarExportEntries]], do
-        [...]
-    11. Return starResolution.
-
----*/
-
-label: {
-  import('./instn-iee-err-not-found-empty_FIXTURE.js').catch(error => {
-
-    assert.sameValue(error.name, 'SyntaxError');
-
-  }).then($DONE, $DONE);
-};
diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch/nested-do-while-instn-iee-err-not-found.js
deleted file mode 100644
index 1a8917f490..0000000000
--- a/test/language/module-code/dynamic-import/catch/nested-do-while-instn-iee-err-not-found.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/instn-iee-err-not-found.case
-// - src/dynamic-import/catch/nested-do-while.template
-/*---
-description: IndirectExportEntries validation - undefined imported bindings (nested do while syntax)
-esid: sec-import-call-runtime-semantics-evaluation
-features: [dynamic-import]
-flags: [generated, async]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    [...]
-    9. For each ExportEntry Record e in module.[[IndirectExportEntries]], do
-       a. Let resolution be ? module.ResolveExport(e.[[ExportName]], « », « »).
-       b. If resolution is null or resolution is "ambiguous", throw a
-          SyntaxError exception.
-    [...]
-
-    15.2.1.16.3 ResolveExport
-
-    [...]
-    9. Let starResolution be null.
-    10. For each ExportEntry Record e in module.[[StarExportEntries]], do
-        [...]
-    11. Return starResolution.
-
----*/
-
-do {
-  import('./instn-iee-err-not-found-empty_FIXTURE.js').catch(error => {
-
-    assert.sameValue(error.name, 'SyntaxError');
-
-  }).then($DONE, $DONE);
-} while (false);
diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch/nested-else-import-catch-instn-iee-err-not-found.js
deleted file mode 100644
index aa21c0b104..0000000000
--- a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-instn-iee-err-not-found.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/instn-iee-err-not-found.case
-// - src/dynamic-import/catch/nested-else.template
-/*---
-description: IndirectExportEntries validation - undefined imported bindings (nested else)
-esid: sec-import-call-runtime-semantics-evaluation
-features: [dynamic-import]
-flags: [generated, async]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    [...]
-    9. For each ExportEntry Record e in module.[[IndirectExportEntries]], do
-       a. Let resolution be ? module.ResolveExport(e.[[ExportName]], « », « »).
-       b. If resolution is null or resolution is "ambiguous", throw a
-          SyntaxError exception.
-    [...]
-
-    15.2.1.16.3 ResolveExport
-
-    [...]
-    9. Let starResolution be null.
-    10. For each ExportEntry Record e in module.[[StarExportEntries]], do
-        [...]
-    11. Return starResolution.
-
----*/
-
-if (false) {
-
-} else {
-  import('./instn-iee-err-not-found-empty_FIXTURE.js').catch(error => {
-
-    assert.sameValue(error.name, 'SyntaxError');
-
-  }).then($DONE, $DONE);
-}
diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch/nested-function-import-catch-instn-iee-err-not-found.js
deleted file mode 100644
index 61291a992e..0000000000
--- a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-instn-iee-err-not-found.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/instn-iee-err-not-found.case
-// - src/dynamic-import/catch/nested-function.template
-/*---
-description: IndirectExportEntries validation - undefined imported bindings (nested function)
-esid: sec-import-call-runtime-semantics-evaluation
-features: [dynamic-import]
-flags: [generated, async]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    [...]
-    9. For each ExportEntry Record e in module.[[IndirectExportEntries]], do
-       a. Let resolution be ? module.ResolveExport(e.[[ExportName]], « », « »).
-       b. If resolution is null or resolution is "ambiguous", throw a
-          SyntaxError exception.
-    [...]
-
-    15.2.1.16.3 ResolveExport
-
-    [...]
-    9. Let starResolution be null.
-    10. For each ExportEntry Record e in module.[[StarExportEntries]], do
-        [...]
-    11. Return starResolution.
-
----*/
-
-function f() {
-  import('./instn-iee-err-not-found-empty_FIXTURE.js').catch(error => {
-
-    assert.sameValue(error.name, 'SyntaxError');
-
-  }).then($DONE, $DONE);
-}
-f();
diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch/nested-if-import-catch-instn-iee-err-not-found.js
deleted file mode 100644
index 368500c622..0000000000
--- a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-instn-iee-err-not-found.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/instn-iee-err-not-found.case
-// - src/dynamic-import/catch/nested-if.template
-/*---
-description: IndirectExportEntries validation - undefined imported bindings (nested if)
-esid: sec-import-call-runtime-semantics-evaluation
-features: [dynamic-import]
-flags: [generated, async]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    [...]
-    9. For each ExportEntry Record e in module.[[IndirectExportEntries]], do
-       a. Let resolution be ? module.ResolveExport(e.[[ExportName]], « », « »).
-       b. If resolution is null or resolution is "ambiguous", throw a
-          SyntaxError exception.
-    [...]
-
-    15.2.1.16.3 ResolveExport
-
-    [...]
-    9. Let starResolution be null.
-    10. For each ExportEntry Record e in module.[[StarExportEntries]], do
-        [...]
-    11. Return starResolution.
-
----*/
-
-if (true) {
-  import('./instn-iee-err-not-found-empty_FIXTURE.js').catch(error => {
-
-    assert.sameValue(error.name, 'SyntaxError');
-
-  }).then($DONE, $DONE);
-}
diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch/nested-while-import-catch-instn-iee-err-not-found.js
deleted file mode 100644
index abe4ad5595..0000000000
--- a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-instn-iee-err-not-found.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/instn-iee-err-not-found.case
-// - src/dynamic-import/catch/nested-while.template
-/*---
-description: IndirectExportEntries validation - undefined imported bindings (nested while)
-esid: sec-import-call-runtime-semantics-evaluation
-features: [dynamic-import]
-flags: [generated, async]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    [...]
-    9. For each ExportEntry Record e in module.[[IndirectExportEntries]], do
-       a. Let resolution be ? module.ResolveExport(e.[[ExportName]], « », « »).
-       b. If resolution is null or resolution is "ambiguous", throw a
-          SyntaxError exception.
-    [...]
-
-    15.2.1.16.3 ResolveExport
-
-    [...]
-    9. Let starResolution be null.
-    10. For each ExportEntry Record e in module.[[StarExportEntries]], do
-        [...]
-    11. Return starResolution.
-
----*/
-
-let x = 0;
-while (!x) {
-  x++;
-  import('./instn-iee-err-not-found-empty_FIXTURE.js').catch(error => {
-
-    assert.sameValue(error.name, 'SyntaxError');
-
-  }).then($DONE, $DONE);
-};
diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch/top-level-import-catch-instn-iee-err-not-found.js
deleted file mode 100644
index 0f37bc1a05..0000000000
--- a/test/language/module-code/dynamic-import/catch/top-level-import-catch-instn-iee-err-not-found.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/instn-iee-err-not-found.case
-// - src/dynamic-import/catch/top-level.template
-/*---
-description: IndirectExportEntries validation - undefined imported bindings (top level)
-esid: sec-import-call-runtime-semantics-evaluation
-features: [dynamic-import]
-flags: [generated, async]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    [...]
-    9. For each ExportEntry Record e in module.[[IndirectExportEntries]], do
-       a. Let resolution be ? module.ResolveExport(e.[[ExportName]], « », « »).
-       b. If resolution is null or resolution is "ambiguous", throw a
-          SyntaxError exception.
-    [...]
-
-    15.2.1.16.3 ResolveExport
-
-    [...]
-    9. Let starResolution be null.
-    10. For each ExportEntry Record e in module.[[StarExportEntries]], do
-        [...]
-    11. Return starResolution.
-
----*/
-
-import('./instn-iee-err-not-found-empty_FIXTURE.js').catch(error => {
-
-  assert.sameValue(error.name, 'SyntaxError');
-
-}).then($DONE, $DONE);
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-is-valid-assign-expr.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-is-valid-assign-expr.js
index 45fc0aa286..7273a33e6c 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/nested-arrow-assignment-expression.template
 /*---
 description: Calling import('') (nested arrow syntax)
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-is-valid-assign-expr.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-is-valid-assign-expr.js
index 1f65a25f68..ee7b9aacec 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/nested-arrow.template
 /*---
 description: Calling import('') (nested arrow syntax)
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-is-valid-assign-expr.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-is-valid-assign-expr.js
index beda362eb2..a378d1e5c9 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/nested-block.template
 /*---
 description: Calling import('') (nested block syntax)
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-is-valid-assign-expr.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-is-valid-assign-expr.js
index b31e240430..9ffbdcc966 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/nested-block-labeled.template
 /*---
 description: Calling import('') (nested block syntax)
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-is-valid-assign-expr.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-is-valid-assign-expr.js
index ffc8debed7..06f4dcb7ff 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/nested-do-while.template
 /*---
 description: Calling import('') (nested do while syntax)
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-is-valid-assign-expr.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-is-valid-assign-expr.js
index 11fa42054e..28ceeff271 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/nested-else-braceless.template
 /*---
 description: Calling import('') (nested else syntax)
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-is-valid-assign-expr.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-is-valid-assign-expr.js
index 9a3574fc5a..aebecfe1cf 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/nested-else.template
 /*---
 description: Calling import('') (nested else syntax)
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-is-valid-assign-expr.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-is-valid-assign-expr.js
index 5aa70d9045..d6358b05fa 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/nested-function.template
 /*---
 description: Calling import('') (nested function syntax)
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-is-valid-assign-expr.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-is-valid-assign-expr.js
index 789ad786a8..e1238bcfdb 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/nested-function-return.template
 /*---
 description: Calling import('') (nested function syntax)
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-is-valid-assign-expr.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-is-valid-assign-expr.js
index bdb36e84fe..b78fe6fb51 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/nested-if-braceless.template
 /*---
 description: Calling import('') (nested if syntax)
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-is-valid-assign-expr.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-is-valid-assign-expr.js
index 700f990b83..cd72980e49 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/nested-if.template
 /*---
 description: Calling import('') (nested if syntax)
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-is-valid-assign-expr.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-is-valid-assign-expr.js
index 7392e38aa1..06ed77a9df 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/nested-while.template
 /*---
 description: Calling import('') (nested while syntax)
diff --git a/test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-is-valid-assign-expr.js
similarity index 86%
rename from test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-is-valid-assign-expr.js
index f1e3ea22c8..ed13876b70 100644
--- a/test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-is-valid-assign-expr.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/empty-str-arg.case
+// - src/dynamic-import/empty-str-is-valid-assign-expr.case
 // - src/dynamic-import/syntax/valid/top-level.template
 /*---
 description: Calling import('') (top level syntax)
diff --git a/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/nested-arrow-assignment-expression-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update-dflt.js
index ecd22dec0e..638ea70863 100644
--- a/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-arrow-assignment-expression.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested arrow)
diff --git a/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-returns-promise.js b/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-arrow-assignment-expression-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/nested-arrow-import-then-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/nested-arrow-import-then-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update-dflt.js
index 0c570d28c2..a0bf48a317 100644
--- a/test/language/module-code/dynamic-import/nested-arrow-import-then-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-arrow.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested arrow)
diff --git a/test/language/module-code/dynamic-import/nested-arrow-import-then-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-arrow-import-then-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/nested-arrow-import-then-returns-promise.js b/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-arrow-import-then-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/nested-arrow-import-then-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/nested-async-function-await-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/nested-async-function-await-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update-dflt.js
index dc3ae7cf15..b8c3d616c2 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-await-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-async-function-await.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested in async function, awaited)
diff --git a/test/language/module-code/dynamic-import/nested-async-function-await-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-async-function-await-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/nested-async-function-await-returns-promise.js b/test/language/module-code/dynamic-import/usage/nested-async-function-await-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-async-function-await-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/nested-async-function-await-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/nested-async-function-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/nested-async-function-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update-dflt.js
index 86a1d4bc4b..1ef68166f6 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-async-function.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested in async function)
diff --git a/test/language/module-code/dynamic-import/nested-async-function-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-async-function-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/nested-async-function-return-await-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/nested-async-function-return-await-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update-dflt.js
index 67533783dc..c93c23756e 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-return-await-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-async-function-return-await.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested in async function, returns awaited)
diff --git a/test/language/module-code/dynamic-import/nested-async-function-return-await-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-async-function-return-await-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/nested-async-function-return-await-returns-promise.js b/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-async-function-return-await-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/nested-async-function-return-await-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/nested-async-function-returns-promise.js b/test/language/module-code/dynamic-import/usage/nested-async-function-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-async-function-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/nested-async-function-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/nested-block-import-then-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/nested-block-import-then-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update-dflt.js
index 2604f3c6c8..53df067f50 100644
--- a/test/language/module-code/dynamic-import/nested-block-import-then-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-block.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested block)
diff --git a/test/language/module-code/dynamic-import/nested-block-import-then-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-block-import-then-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/nested-block-import-then-returns-promise.js b/test/language/module-code/dynamic-import/usage/nested-block-import-then-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-block-import-then-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/nested-block-import-then-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/nested-do-while-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/nested-do-while-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update-dflt.js
index e0e379308b..05280a20cb 100644
--- a/test/language/module-code/dynamic-import/nested-do-while-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-do-while.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested do while syntax)
diff --git a/test/language/module-code/dynamic-import/nested-do-while-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-do-while-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/nested-do-while-returns-promise.js b/test/language/module-code/dynamic-import/usage/nested-do-while-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-do-while-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/nested-do-while-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/nested-else-import-then-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/nested-else-import-then-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update-dflt.js
index 8bc4c1648c..8d720dfcdd 100644
--- a/test/language/module-code/dynamic-import/nested-else-import-then-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-else.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested else)
diff --git a/test/language/module-code/dynamic-import/nested-else-import-then-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-else-import-then-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/nested-else-import-then-returns-promise.js b/test/language/module-code/dynamic-import/usage/nested-else-import-then-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-else-import-then-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/nested-else-import-then-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/nested-function-import-then-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/nested-function-import-then-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update-dflt.js
index 0375ead608..1569bca4ef 100644
--- a/test/language/module-code/dynamic-import/nested-function-import-then-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-function.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested function)
diff --git a/test/language/module-code/dynamic-import/nested-function-import-then-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-function-import-then-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/nested-function-import-then-returns-promise.js b/test/language/module-code/dynamic-import/usage/nested-function-import-then-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-function-import-then-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/nested-function-import-then-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update-dflt.js
index f01922c3ec..fca96dd993 100644
--- a/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-if-braceless.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested if syntax)
diff --git a/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/nested-if-braceless-returns-promise.js b/test/language/module-code/dynamic-import/usage/nested-if-braceless-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-if-braceless-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/nested-if-braceless-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/nested-if-import-then-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/nested-if-import-then-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update-dflt.js
index edfcb709dd..d895ed03ee 100644
--- a/test/language/module-code/dynamic-import/nested-if-import-then-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-if.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested if)
diff --git a/test/language/module-code/dynamic-import/nested-if-import-then-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-if-import-then-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/nested-if-import-then-returns-promise.js b/test/language/module-code/dynamic-import/usage/nested-if-import-then-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-if-import-then-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/nested-if-import-then-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/nested-while-import-then-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/nested-while-import-then-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update-dflt.js
index 38842f769e..5cb4e56d16 100644
--- a/test/language/module-code/dynamic-import/nested-while-import-then-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-while.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested while)
diff --git a/test/language/module-code/dynamic-import/nested-while-import-then-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-while-import-then-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/nested-while-import-then-returns-promise.js b/test/language/module-code/dynamic-import/usage/nested-while-import-then-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/nested-while-import-then-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/nested-while-import-then-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/syntax-nested-block-labeled-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update-dflt.js
index a9cef69afb..baf1bf0076 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/nested-block-labeled.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested block syntax)
diff --git a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-returns-promise.js b/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax-nested-block-labeled-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-returns-promise.js
diff --git a/test/language/module-code/dynamic-import/top-level-import-then-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 96%
rename from test/language/module-code/dynamic-import/top-level-import-then-eval-gtbdng-indirect-update-dflt.js
rename to test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update-dflt.js
index 90fd82bbfd..261bd82510 100644
--- a/test/language/module-code/dynamic-import/top-level-import-then-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update-dflt.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+// - src/dynamic-import/eval-gtbndng-indirect-update-dflt.case
 // - src/dynamic-import/default/top-level.template
 /*---
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (top level)
diff --git a/test/language/module-code/dynamic-import/top-level-import-then-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/top-level-import-then-eval-gtbndng-indirect-update.js
rename to test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/top-level-import-then-returns-promise.js b/test/language/module-code/dynamic-import/usage/top-level-import-then-returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/top-level-import-then-returns-promise.js
rename to test/language/module-code/dynamic-import/usage/top-level-import-then-returns-promise.js
-- 
GitLab