diff --git a/src/dynamic-import/checklist.md b/src/dynamic-import/checklist.md
index e26f8e1af1a2ad764815a9969f13db903258bb4b..a58b056d6bf3699c72c71daf8e844faaa056e540 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 f20cc4bfb047ba3e86b9ee0800cf819a5550da43..0000000000000000000000000000000000000000
--- 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 82f6ea7ef6c58248fd4907ed608d59011cc7bb57..0000000000000000000000000000000000000000
--- 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 8dec1e098fa3f9b933c85743a9dbfc7b6371ef2a..0000000000000000000000000000000000000000
--- 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 54cc96d4ac494a6c742f445580a1691d4a2abcf0..0000000000000000000000000000000000000000
--- 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 3e4415b2bc65ff5874a26adfe59a9c246144d65a..0000000000000000000000000000000000000000
--- 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 55fd7acf0a49bee9c6a3fbd8ac321e46318da4cb..0000000000000000000000000000000000000000
--- 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 1a8917f490c8fe78d88b90bc700b808df16c5ba8..0000000000000000000000000000000000000000
--- 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 aa21c0b104e03414e509a1f548bf9ca6ce682590..0000000000000000000000000000000000000000
--- 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 61291a992efb6400353baf2b6d52d7205d393ffe..0000000000000000000000000000000000000000
--- 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 368500c6222a5e040acf91b37d24b08c819d38e7..0000000000000000000000000000000000000000
--- 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 abe4ad5595ec7f71ff3b6a8a8a56d47b61432f8e..0000000000000000000000000000000000000000
--- 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 0f37bc1a05095a21f93539668ec893cc421e973a..0000000000000000000000000000000000000000
--- 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 45fc0aa286206cc340429d1caaef51ceb2dbcaf0..7273a33e6c12a18acccd7949e5e1b920d878990d 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 1f65a25f6809687e8a774cffac65a033a920be49..ee7b9aacec609fb1d4b97489863c95223a6c56cd 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 beda362eb2a6e30887377b3eb49cee22c48f3ae5..a378d1e5c9bd0236dcbed9cea67dccbdb6f59ae1 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 b31e24043016e7f4b4f09c58be3c7d532fe40e7d..9ffbdcc966c4391200bbaec0447dbdb3d1102dae 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 ffc8debed7f66685fdfc97425ca085045f656cc7..06f4dcb7ff21c989e19ce3774d183d8d50e0e789 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 11fa42054eefcbae5344ca3937a36617d74b95ef..28ceeff271ee2a4ce21a6036005dcce7bae642b4 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 9a3574fc5aefcb81172e564b189ebacf40eb7684..aebecfe1cf64889efe584633e0dbaee58d1d1c1c 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 5aa70d9045593179edf7774f30f4a097553494a2..d6358b05fa59a50b2aa912207acc412755cae564 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 789ad786a864342b1f5e198571dbb38de3896b6c..e1238bcfdb05e15ec239af45ce009e5f7ab0f1b3 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 bdb36e84fe2c32c00820065402685b34439573fd..b78fe6fb513864648623a1d88d00876d1611460e 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 700f990b83ac886490b3c1ad4162031cf847902b..cd72980e4913e3edad4d5dd332fd9c84115b9e8b 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 7392e38aa12769f525cf87dcfa53fc70b882c421..06ed77a9dfb63520d4fb5a3d4ebc7015451d4e16 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 f1e3ea22c8eb9c67e49af0332a69c66ae88a3074..ed13876b70ec0052db4c3b3c994ed588eb43c5c5 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 ecd22dec0e704d561a1a85fa8a50f12c6f75e791..638ea708636a0be2d0267d09b81197559de385ec 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 0c570d28c2a30a209be4a0f2c8e4d31fd0b36728..a0bf48a3171556a978b4ab2c98cbd7fd47234bc5 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 dc3ae7cf15d49c317130e36e52da69bcf6284d5b..b8c3d616c2520169efbc35a4f91e53cbc50e1b2d 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 86a1d4bc4b703083ee43bc365a6f17dc45d339b1..1ef68166f6f8eb586bd774ff5f281adc6312bf28 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 67533783dc5e45d7c4e7967c76b2835474062d24..c93c23756e2e265e2a0c3f79bc446419ed548ca8 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 2604f3c6c81115dddb2962b194d1f6386b7cec76..53df067f508ee4dc430ee31bbdb6d9405f762ee1 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 e0e379308bc84f31d46b03f7d65cd1517ecd3aef..05280a20cb3e3a0cc717364028e3415a4d7f8e04 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 8bc4c1648c5d13b81526807c129b7ff9fcc3f7ca..8d720dfcdd870ccc582b43a4dc729231158fec32 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 0375ead60883492b2624fee6f2714e5385e9134f..1569bca4ef79de545810715c19babafa42e6da99 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 f01922c3ecd45f35ac8cbac768234aec6f511d98..fca96dd993e95321c6896009ca59f482e068c689 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 edfcb709dd9e88ade8be377892c6945eaa569198..d895ed03eedf3a57deeb38cb553940071b381ede 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 38842f769eaa3dd0cce226390ee0ed4a36b382e2..5cb4e56d166769b130fa6b272e4e16eae47aff98 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 a9cef69afb8b7446f48e8bc505ab06fd91b9d064..baf1bf0076f8ab2d8b9c4771d5204ffe60111d38 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 90fd82bbfd7f71686cbb01bbfa044a7ebe0084ac..261bd82510c1feee0ea831d2d9e8c4c7f9ffe786 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