From 6150f24d25a02b655e02d600cbe29f3002bcd414 Mon Sep 17 00:00:00 2001
From: Leo Balter <leonardo.balter@gmail.com>
Date: Tue, 2 Oct 2018 14:59:07 -0400
Subject: [PATCH] Regenerate tests

---
 ...h-nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js | 2 +-
 ...ch-nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js | 2 +-
 ...ested-arrow-import-catch-instn-iee-err-ambiguous-import.js | 2 +-
 .../catch-nested-arrow-import-catch-instn-iee-err-circular.js | 2 +-
 ...catch-nested-arrow-import-catch-instn-iee-err-not-found.js | 2 +-
 ...nested-async-function-await-eval-rqstd-abrupt-typeerror.js | 2 +-
 ...-nested-async-function-await-eval-rqstd-abrupt-urierror.js | 2 +-
 ...ted-async-function-await-instn-iee-err-ambiguous-import.js | 2 +-
 ...atch-nested-async-function-await-instn-iee-err-circular.js | 2 +-
 ...tch-nested-async-function-await-instn-iee-err-not-found.js | 2 +-
 ...catch-nested-async-function-eval-rqstd-abrupt-typeerror.js | 2 +-
 .../catch-nested-async-function-eval-rqstd-abrupt-urierror.js | 2 +-
 ...ch-nested-async-function-instn-iee-err-ambiguous-import.js | 2 +-
 .../catch-nested-async-function-instn-iee-err-circular.js     | 2 +-
 .../catch-nested-async-function-instn-iee-err-not-found.js    | 2 +-
 ...async-function-return-await-eval-rqstd-abrupt-typeerror.js | 2 +-
 ...-async-function-return-await-eval-rqstd-abrupt-urierror.js | 2 +-
 ...nc-function-return-await-instn-iee-err-ambiguous-import.js | 2 +-
 ...sted-async-function-return-await-instn-iee-err-circular.js | 2 +-
 ...ted-async-function-return-await-instn-iee-err-not-found.js | 2 +-
 ...h-nested-block-import-catch-eval-rqstd-abrupt-typeerror.js | 2 +-
 ...ch-nested-block-import-catch-eval-rqstd-abrupt-urierror.js | 2 +-
 ...ested-block-import-catch-instn-iee-err-ambiguous-import.js | 2 +-
 .../catch-nested-block-import-catch-instn-iee-err-circular.js | 2 +-
 ...catch-nested-block-import-catch-instn-iee-err-not-found.js | 2 +-
 .../catch-nested-block-labeled-eval-rqstd-abrupt-typeerror.js | 2 +-
 .../catch-nested-block-labeled-eval-rqstd-abrupt-urierror.js  | 2 +-
 ...tch-nested-block-labeled-instn-iee-err-ambiguous-import.js | 2 +-
 .../catch-nested-block-labeled-instn-iee-err-circular.js      | 2 +-
 .../catch-nested-block-labeled-instn-iee-err-not-found.js     | 2 +-
 ...atch-nested-do-import-catch-eval-rqstd-abrupt-typeerror.js | 2 +-
 ...catch-nested-do-import-catch-eval-rqstd-abrupt-urierror.js | 2 +-
 ...h-nested-do-import-catch-instn-iee-err-ambiguous-import.js | 2 +-
 .../catch-nested-do-import-catch-instn-iee-err-circular.js    | 2 +-
 .../catch-nested-do-import-catch-instn-iee-err-not-found.js   | 2 +-
 .../catch-nested-do-while-eval-rqstd-abrupt-typeerror.js      | 2 +-
 .../catch-nested-do-while-eval-rqstd-abrupt-urierror.js       | 2 +-
 .../catch-nested-do-while-instn-iee-err-ambiguous-import.js   | 2 +-
 .../catch-nested-do-while-instn-iee-err-circular.js           | 2 +-
 .../catch-nested-do-while-instn-iee-err-not-found.js          | 2 +-
 ...ch-nested-else-import-catch-eval-rqstd-abrupt-typeerror.js | 2 +-
 ...tch-nested-else-import-catch-eval-rqstd-abrupt-urierror.js | 2 +-
 ...nested-else-import-catch-instn-iee-err-ambiguous-import.js | 2 +-
 .../catch-nested-else-import-catch-instn-iee-err-circular.js  | 2 +-
 .../catch-nested-else-import-catch-instn-iee-err-not-found.js | 2 +-
 ...ested-function-import-catch-eval-rqstd-abrupt-typeerror.js | 2 +-
 ...nested-function-import-catch-eval-rqstd-abrupt-urierror.js | 2 +-
 ...ed-function-import-catch-instn-iee-err-ambiguous-import.js | 2 +-
 ...tch-nested-function-import-catch-instn-iee-err-circular.js | 2 +-
 ...ch-nested-function-import-catch-instn-iee-err-not-found.js | 2 +-
 ...atch-nested-if-import-catch-eval-rqstd-abrupt-typeerror.js | 2 +-
 ...catch-nested-if-import-catch-eval-rqstd-abrupt-urierror.js | 2 +-
 ...h-nested-if-import-catch-instn-iee-err-ambiguous-import.js | 2 +-
 .../catch-nested-if-import-catch-instn-iee-err-circular.js    | 2 +-
 .../catch-nested-if-import-catch-instn-iee-err-not-found.js   | 2 +-
 ...-labeled-block-import-catch-eval-rqstd-abrupt-typeerror.js | 2 +-
 ...d-labeled-block-import-catch-eval-rqstd-abrupt-urierror.js | 2 +-
 ...beled-block-import-catch-instn-iee-err-ambiguous-import.js | 2 +-
 ...ested-labeled-block-import-catch-instn-iee-err-circular.js | 2 +-
 ...sted-labeled-block-import-catch-instn-iee-err-not-found.js | 2 +-
 ...h-nested-while-import-catch-eval-rqstd-abrupt-typeerror.js | 2 +-
 ...ch-nested-while-import-catch-eval-rqstd-abrupt-urierror.js | 2 +-
 ...ested-while-import-catch-instn-iee-err-ambiguous-import.js | 2 +-
 .../catch-nested-while-import-catch-instn-iee-err-circular.js | 2 +-
 ...catch-nested-while-import-catch-instn-iee-err-not-found.js | 2 +-
 ...atch-top-level-import-catch-eval-rqstd-abrupt-typeerror.js | 2 +-
 ...catch-top-level-import-catch-eval-rqstd-abrupt-urierror.js | 2 +-
 ...h-top-level-import-catch-instn-iee-err-ambiguous-import.js | 2 +-
 .../catch-top-level-import-catch-instn-iee-err-circular.js    | 2 +-
 .../catch-top-level-import-catch-instn-iee-err-not-found.js   | 2 +-
 ...ow-assignment-expression-eval-gtbdng-indirect-update-as.js | 2 +-
 ...-assignment-expression-eval-gtbdng-indirect-update-dflt.js | 2 +-
 ...rrow-assignment-expression-eval-gtbndng-indirect-update.js | 2 +-
 .../nested-arrow-assignment-expression-returns-promise.js     | 2 +-
 ...nested-arrow-import-then-eval-gtbdng-indirect-update-as.js | 2 +-
 ...sted-arrow-import-then-eval-gtbdng-indirect-update-dflt.js | 2 +-
 .../nested-arrow-import-then-eval-gtbndng-indirect-update.js  | 2 +-
 .../nested-arrow-import-then-returns-promise.js               | 2 +-
 ...ted-async-function-await-eval-gtbdng-indirect-update-as.js | 2 +-
 ...d-async-function-await-eval-gtbdng-indirect-update-dflt.js | 2 +-
 ...ested-async-function-await-eval-gtbndng-indirect-update.js | 2 +-
 .../nested-async-function-await-returns-promise.js            | 2 +-
 .../nested-async-function-eval-gtbdng-indirect-update-as.js   | 2 +-
 .../nested-async-function-eval-gtbdng-indirect-update-dflt.js | 2 +-
 .../nested-async-function-eval-gtbndng-indirect-update.js     | 2 +-
 ...nc-function-return-await-eval-gtbdng-indirect-update-as.js | 2 +-
 ...-function-return-await-eval-gtbdng-indirect-update-dflt.js | 2 +-
 ...sync-function-return-await-eval-gtbndng-indirect-update.js | 2 +-
 .../nested-async-function-return-await-returns-promise.js     | 2 +-
 .../dynamic-import/nested-async-function-returns-promise.js   | 2 +-
 ...nested-block-import-then-eval-gtbdng-indirect-update-as.js | 2 +-
 ...sted-block-import-then-eval-gtbdng-indirect-update-dflt.js | 2 +-
 .../nested-block-import-then-eval-gtbndng-indirect-update.js  | 2 +-
 .../nested-block-import-then-returns-promise.js               | 2 +-
 .../nested-do-import-then-eval-gtbdng-indirect-update-as.js   | 2 +-
 .../nested-do-import-then-eval-gtbdng-indirect-update-dflt.js | 2 +-
 .../nested-do-import-then-eval-gtbndng-indirect-update.js     | 2 +-
 .../dynamic-import/nested-do-import-then-returns-promise.js   | 2 +-
 .../nested-do-while-eval-gtbdng-indirect-update-as.js         | 2 +-
 .../nested-do-while-eval-gtbdng-indirect-update-dflt.js       | 2 +-
 .../nested-do-while-eval-gtbndng-indirect-update.js           | 2 +-
 .../dynamic-import/nested-do-while-returns-promise.js         | 2 +-
 .../nested-else-import-then-eval-gtbdng-indirect-update-as.js | 2 +-
 ...ested-else-import-then-eval-gtbdng-indirect-update-dflt.js | 2 +-
 .../nested-else-import-then-eval-gtbndng-indirect-update.js   | 2 +-
 .../dynamic-import/nested-else-import-then-returns-promise.js | 2 +-
 ...ted-function-import-then-eval-gtbdng-indirect-update-as.js | 2 +-
 ...d-function-import-then-eval-gtbdng-indirect-update-dflt.js | 2 +-
 ...ested-function-import-then-eval-gtbndng-indirect-update.js | 2 +-
 .../nested-function-import-then-returns-promise.js            | 2 +-
 .../nested-if-braceless-eval-gtbdng-indirect-update-as.js     | 2 +-
 .../nested-if-braceless-eval-gtbdng-indirect-update-dflt.js   | 2 +-
 .../nested-if-braceless-eval-gtbndng-indirect-update.js       | 2 +-
 .../dynamic-import/nested-if-braceless-returns-promise.js     | 2 +-
 .../nested-if-import-then-eval-gtbdng-indirect-update-as.js   | 2 +-
 .../nested-if-import-then-eval-gtbdng-indirect-update-dflt.js | 2 +-
 .../nested-if-import-then-eval-gtbndng-indirect-update.js     | 2 +-
 .../dynamic-import/nested-if-import-then-returns-promise.js   | 2 +-
 ...abeled-block-import-then-eval-gtbdng-indirect-update-as.js | 2 +-
 ...eled-block-import-then-eval-gtbdng-indirect-update-dflt.js | 2 +-
 ...-labeled-block-import-then-eval-gtbndng-indirect-update.js | 2 +-
 .../nested-labeled-block-import-then-returns-promise.js       | 2 +-
 ...nested-while-import-then-eval-gtbdng-indirect-update-as.js | 2 +-
 ...sted-while-import-then-eval-gtbdng-indirect-update-dflt.js | 2 +-
 .../nested-while-import-then-eval-gtbndng-indirect-update.js  | 2 +-
 .../nested-while-import-then-returns-promise.js               | 2 +-
 ...tax-nested-block-labeled-eval-gtbdng-indirect-update-as.js | 2 +-
 ...x-nested-block-labeled-eval-gtbdng-indirect-update-dflt.js | 2 +-
 ...yntax-nested-block-labeled-eval-gtbndng-indirect-update.js | 2 +-
 .../syntax-nested-block-labeled-returns-promise.js            | 2 +-
 ...ted-arrow-assignment-expression-empty-args-early-error.js} | 3 ++-
 .../invalid/nested-arrow-empty-args-early-error.js}           | 3 ++-
 .../invalid/nested-block-empty-args-early-error.js}           | 3 ++-
 .../invalid/nested-block-labeled-empty-args-early-error.js}   | 3 ++-
 .../invalid/nested-do-empty-args-early-error.js}              | 3 ++-
 .../invalid/nested-do-while-empty-args-early-error.js}        | 3 ++-
 .../invalid/nested-else-braceless-empty-args-early-error.js}  | 3 ++-
 .../invalid/nested-else-empty-args-early-error.js}            | 3 ++-
 .../invalid/nested-function-empty-args-early-error.js}        | 3 ++-
 .../invalid/nested-function-return-empty-args-early-error.js} | 3 ++-
 .../invalid/nested-if-braceless-empty-args-early-error.js}    | 3 ++-
 .../invalid/nested-if-empty-args-early-error.js}              | 3 ++-
 .../invalid/nested-labeled-block-empty-args-early-error.js}   | 3 ++-
 .../invalid/nested-while-empty-args-early-error.js}           | 3 ++-
 .../invalid/top-level-empty-args-early-error.js}              | 3 ++-
 .../nested-arrow-assignment-expression-empty-str-arg.js}      | 2 +-
 .../valid/nested-arrow-empty-str-arg.js}                      | 4 ++--
 .../valid/nested-block-empty-str-arg.js}                      | 4 ++--
 .../valid/nested-block-labeled-empty-str-arg.js}              | 4 ++--
 .../valid/nested-do-empty-str-arg.js}                         | 4 ++--
 .../valid/nested-do-while-empty-str-arg.js}                   | 4 ++--
 .../valid/nested-else-braceless-empty-str-arg.js}             | 4 ++--
 .../valid/nested-else-empty-str-arg.js}                       | 4 ++--
 .../valid/nested-function-empty-str-arg.js}                   | 2 +-
 .../valid/nested-function-return-empty-str-arg.js}            | 2 +-
 .../valid/nested-if-braceless-empty-str-arg.js}               | 4 ++--
 .../valid/nested-if-empty-str-arg.js}                         | 4 ++--
 .../valid/nested-labeled-block-empty-str-arg.js}              | 4 ++--
 .../valid/nested-while-empty-str-arg.js}                      | 2 +-
 .../valid/top-level-empty-str-arg.js}                         | 2 +-
 .../top-level-import-then-eval-gtbdng-indirect-update-as.js   | 2 +-
 .../top-level-import-then-eval-gtbdng-indirect-update-dflt.js | 2 +-
 .../top-level-import-then-eval-gtbndng-indirect-update.js     | 2 +-
 .../dynamic-import/top-level-import-then-returns-promise.js   | 2 +-
 164 files changed, 189 insertions(+), 174 deletions(-)
 rename test/language/module-code/dynamic-import/{syntax-nested-arrow-assignment-expression-empty-args-early-error.js => syntax/invalid/nested-arrow-assignment-expression-empty-args-early-error.js} (93%)
 rename test/language/module-code/dynamic-import/{syntax-nested-arrow-empty-args-early-error.js => syntax/invalid/nested-arrow-empty-args-early-error.js} (95%)
 rename test/language/module-code/dynamic-import/{syntax-nested-block-empty-args-early-error.js => syntax/invalid/nested-block-empty-args-early-error.js} (95%)
 rename test/language/module-code/dynamic-import/{syntax-nested-block-labeled-empty-args-early-error.js => syntax/invalid/nested-block-labeled-empty-args-early-error.js} (94%)
 rename test/language/module-code/dynamic-import/{syntax-nested-do-empty-args-early-error.js => syntax/invalid/nested-do-empty-args-early-error.js} (95%)
 rename test/language/module-code/dynamic-import/{syntax-nested-do-while-empty-args-early-error.js => syntax/invalid/nested-do-while-empty-args-early-error.js} (94%)
 rename test/language/module-code/dynamic-import/{syntax-nested-else-braceless-empty-args-early-error.js => syntax/invalid/nested-else-braceless-empty-args-early-error.js} (94%)
 rename test/language/module-code/dynamic-import/{syntax-nested-else-empty-args-early-error.js => syntax/invalid/nested-else-empty-args-early-error.js} (95%)
 rename test/language/module-code/dynamic-import/{syntax-nested-function-empty-args-early-error.js => syntax/invalid/nested-function-empty-args-early-error.js} (94%)
 rename test/language/module-code/dynamic-import/{syntax-nested-function-return-empty-args-early-error.js => syntax/invalid/nested-function-return-empty-args-early-error.js} (94%)
 rename test/language/module-code/dynamic-import/{syntax-nested-if-braceless-empty-args-early-error.js => syntax/invalid/nested-if-braceless-empty-args-early-error.js} (94%)
 rename test/language/module-code/dynamic-import/{syntax-nested-if-empty-args-early-error.js => syntax/invalid/nested-if-empty-args-early-error.js} (95%)
 rename test/language/module-code/dynamic-import/{syntax-nested-labeled-block-empty-args-early-error.js => syntax/invalid/nested-labeled-block-empty-args-early-error.js} (94%)
 rename test/language/module-code/dynamic-import/{syntax-nested-while-empty-args-early-error.js => syntax/invalid/nested-while-empty-args-early-error.js} (95%)
 rename test/language/module-code/dynamic-import/{syntax-top-level-empty-args-early-error.js => syntax/invalid/top-level-empty-args-early-error.js} (90%)
 rename test/language/module-code/dynamic-import/{syntax-nested-arrow-assignment-expression-empty-str-arg.js => syntax/valid/nested-arrow-assignment-expression-empty-str-arg.js} (92%)
 rename test/language/module-code/dynamic-import/{syntax-nested-arrow-empty-str-arg.js => syntax/valid/nested-arrow-empty-str-arg.js} (92%)
 rename test/language/module-code/dynamic-import/{syntax-nested-block-empty-str-arg.js => syntax/valid/nested-block-empty-str-arg.js} (92%)
 rename test/language/module-code/dynamic-import/{syntax-nested-block-labeled-empty-str-arg.js => syntax/valid/nested-block-labeled-empty-str-arg.js} (91%)
 rename test/language/module-code/dynamic-import/{syntax-nested-do-empty-str-arg.js => syntax/valid/nested-do-empty-str-arg.js} (92%)
 rename test/language/module-code/dynamic-import/{syntax-nested-do-while-empty-str-arg.js => syntax/valid/nested-do-while-empty-str-arg.js} (92%)
 rename test/language/module-code/dynamic-import/{syntax-nested-else-braceless-empty-str-arg.js => syntax/valid/nested-else-braceless-empty-str-arg.js} (91%)
 rename test/language/module-code/dynamic-import/{syntax-nested-else-empty-str-arg.js => syntax/valid/nested-else-empty-str-arg.js} (92%)
 rename test/language/module-code/dynamic-import/{syntax-nested-function-empty-str-arg.js => syntax/valid/nested-function-empty-str-arg.js} (94%)
 rename test/language/module-code/dynamic-import/{syntax-nested-function-return-empty-str-arg.js => syntax/valid/nested-function-return-empty-str-arg.js} (93%)
 rename test/language/module-code/dynamic-import/{syntax-nested-if-braceless-empty-str-arg.js => syntax/valid/nested-if-braceless-empty-str-arg.js} (91%)
 rename test/language/module-code/dynamic-import/{syntax-nested-if-empty-str-arg.js => syntax/valid/nested-if-empty-str-arg.js} (92%)
 rename test/language/module-code/dynamic-import/{syntax-nested-labeled-block-empty-str-arg.js => syntax/valid/nested-labeled-block-empty-str-arg.js} (92%)
 rename test/language/module-code/dynamic-import/{syntax-nested-while-empty-str-arg.js => syntax/valid/nested-while-empty-str-arg.js} (94%)
 rename test/language/module-code/dynamic-import/{syntax-top-level-empty-str-arg.js => syntax/valid/top-level-empty-str-arg.js} (86%)

diff --git a/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js
index d3dd8e2c18..0f7bac9778 100644
--- a/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js
index fee78c1ceb..3bdc99e8b0 100644
--- a/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-instn-iee-err-ambiguous-import.js
index da618ae27d..3024b48a1c 100644
--- a/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-instn-iee-err-circular.js
index 7430e694eb..e5e65ef185 100644
--- a/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-arrow-import-catch-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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
index 610b63ea89..f20cc4bfb0 100644
--- 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
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-async-function-await-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-async-function-await-eval-rqstd-abrupt-typeerror.js
index 4dcec7ce67..91f8f81a3c 100644
--- a/test/language/module-code/dynamic-import/catch-nested-async-function-await-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-async-function-await-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested in async function, awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-async-function-await-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-async-function-await-eval-rqstd-abrupt-urierror.js
index 356f1e4065..e9daf07b5e 100644
--- a/test/language/module-code/dynamic-import/catch-nested-async-function-await-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-async-function-await-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested in async function, awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-async-function-await-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-async-function-await-instn-iee-err-ambiguous-import.js
index e55ce63b7b..18f27dad86 100644
--- a/test/language/module-code/dynamic-import/catch-nested-async-function-await-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-async-function-await-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested in async function, awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-async-function-await-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-async-function-await-instn-iee-err-circular.js
index e78815a8a4..83fdcad17d 100644
--- a/test/language/module-code/dynamic-import/catch-nested-async-function-await-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-async-function-await-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested in async function, awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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
index a90a98d3e5..82f6ea7ef6 100644
--- 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
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (nested in async function, awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-async-function-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-async-function-eval-rqstd-abrupt-typeerror.js
index f2241b0f48..308d152f79 100644
--- a/test/language/module-code/dynamic-import/catch-nested-async-function-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-async-function-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested in async function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-async-function-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-async-function-eval-rqstd-abrupt-urierror.js
index 542922c561..6d0ce6732a 100644
--- a/test/language/module-code/dynamic-import/catch-nested-async-function-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-async-function-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested in async function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-async-function-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-async-function-instn-iee-err-ambiguous-import.js
index f538caa95d..4d9182b732 100644
--- a/test/language/module-code/dynamic-import/catch-nested-async-function-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-async-function-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested in async function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-async-function-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-async-function-instn-iee-err-circular.js
index 503aa178ef..91066c830f 100644
--- a/test/language/module-code/dynamic-import/catch-nested-async-function-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-async-function-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested in async function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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
index 0a0448db7c..8dec1e098f 100644
--- 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
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (nested in async function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-eval-rqstd-abrupt-typeerror.js
index cd30196830..2fb6935ac1 100644
--- a/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested in async function, returns awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-eval-rqstd-abrupt-urierror.js
index 36070045dd..d6aa8e5f78 100644
--- a/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested in async function, returns awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-instn-iee-err-ambiguous-import.js
index 83ccba5bc5..d0227fe56c 100644
--- a/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested in async function, returns awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-instn-iee-err-circular.js
index a466241050..c50b30d539 100644
--- a/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-async-function-return-await-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested in async function, returns awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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
index 305ba0b1fb..54cc96d4ac 100644
--- 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
@@ -5,7 +5,7 @@
 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, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-block-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-block-import-catch-eval-rqstd-abrupt-typeerror.js
index 2b52f97d36..b95c6ef39d 100644
--- a/test/language/module-code/dynamic-import/catch-nested-block-import-catch-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-block-import-catch-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-block-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-block-import-catch-eval-rqstd-abrupt-urierror.js
index f589833cbc..e3940ea7ef 100644
--- a/test/language/module-code/dynamic-import/catch-nested-block-import-catch-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-block-import-catch-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-block-import-catch-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-block-import-catch-instn-iee-err-ambiguous-import.js
index 010f8f864d..94fbb51e8f 100644
--- a/test/language/module-code/dynamic-import/catch-nested-block-import-catch-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-block-import-catch-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-block-import-catch-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-block-import-catch-instn-iee-err-circular.js
index 0925b34163..ecfea070dc 100644
--- a/test/language/module-code/dynamic-import/catch-nested-block-import-catch-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-block-import-catch-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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
index 28f5d28798..3e4415b2bc 100644
--- 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
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-block-labeled-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-block-labeled-eval-rqstd-abrupt-typeerror.js
index cf864c22b9..f683c024c1 100644
--- a/test/language/module-code/dynamic-import/catch-nested-block-labeled-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-block-labeled-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-block-labeled-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-block-labeled-eval-rqstd-abrupt-urierror.js
index c797b0cb96..52587bd07a 100644
--- a/test/language/module-code/dynamic-import/catch-nested-block-labeled-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-block-labeled-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-block-labeled-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-block-labeled-instn-iee-err-ambiguous-import.js
index 1241fc4ce6..fc3d971f91 100644
--- a/test/language/module-code/dynamic-import/catch-nested-block-labeled-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-block-labeled-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-block-labeled-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-block-labeled-instn-iee-err-circular.js
index 6e78144ba0..81fc211d7c 100644
--- a/test/language/module-code/dynamic-import/catch-nested-block-labeled-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-block-labeled-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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
index f5bc0d63b5..55fd7acf0a 100644
--- 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
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-do-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-do-import-catch-eval-rqstd-abrupt-typeerror.js
index 69b87face8..ab70de8b07 100644
--- a/test/language/module-code/dynamic-import/catch-nested-do-import-catch-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-do-import-catch-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested do)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-do-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-do-import-catch-eval-rqstd-abrupt-urierror.js
index 82f5aff7fa..f5a6bef0bf 100644
--- a/test/language/module-code/dynamic-import/catch-nested-do-import-catch-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-do-import-catch-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested do)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-do-import-catch-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-do-import-catch-instn-iee-err-ambiguous-import.js
index 14be5f0626..4c883d3b69 100644
--- a/test/language/module-code/dynamic-import/catch-nested-do-import-catch-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-do-import-catch-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested do)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-do-import-catch-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-do-import-catch-instn-iee-err-circular.js
index d25f0e304c..10f8d95268 100644
--- a/test/language/module-code/dynamic-import/catch-nested-do-import-catch-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-do-import-catch-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested do)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-do-import-catch-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch-nested-do-import-catch-instn-iee-err-not-found.js
index d516db8f5d..6d12fb6738 100644
--- a/test/language/module-code/dynamic-import/catch-nested-do-import-catch-instn-iee-err-not-found.js
+++ b/test/language/module-code/dynamic-import/catch-nested-do-import-catch-instn-iee-err-not-found.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (nested do)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-do-while-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-do-while-eval-rqstd-abrupt-typeerror.js
index 20cc8cc346..59cff22cd0 100644
--- a/test/language/module-code/dynamic-import/catch-nested-do-while-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-do-while-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-do-while-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-do-while-eval-rqstd-abrupt-urierror.js
index f1925e4051..15625a6c89 100644
--- a/test/language/module-code/dynamic-import/catch-nested-do-while-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-do-while-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-do-while-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-do-while-instn-iee-err-ambiguous-import.js
index 691e76ea83..8f96eecaa7 100644
--- a/test/language/module-code/dynamic-import/catch-nested-do-while-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-do-while-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-do-while-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-do-while-instn-iee-err-circular.js
index 5ed7dee8ee..24616f24c5 100644
--- a/test/language/module-code/dynamic-import/catch-nested-do-while-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-do-while-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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
index cf1d999409..1b9e554fe3 100644
--- 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
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-else-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-else-import-catch-eval-rqstd-abrupt-typeerror.js
index 8d7410255d..8932da5334 100644
--- a/test/language/module-code/dynamic-import/catch-nested-else-import-catch-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-else-import-catch-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested else)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-else-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-else-import-catch-eval-rqstd-abrupt-urierror.js
index 0d8ef65125..94389102df 100644
--- a/test/language/module-code/dynamic-import/catch-nested-else-import-catch-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-else-import-catch-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested else)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-else-import-catch-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-else-import-catch-instn-iee-err-ambiguous-import.js
index 0f0995465e..ba05c3fa5e 100644
--- a/test/language/module-code/dynamic-import/catch-nested-else-import-catch-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-else-import-catch-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested else)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-else-import-catch-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-else-import-catch-instn-iee-err-circular.js
index 398905eb5a..5027242a88 100644
--- a/test/language/module-code/dynamic-import/catch-nested-else-import-catch-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-else-import-catch-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested else)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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
index 497f53b92b..aa21c0b104 100644
--- 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
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (nested else)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-function-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-function-import-catch-eval-rqstd-abrupt-typeerror.js
index b2d9039a18..b54ced6c00 100644
--- a/test/language/module-code/dynamic-import/catch-nested-function-import-catch-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-function-import-catch-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-function-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-function-import-catch-eval-rqstd-abrupt-urierror.js
index 049c6a848f..1b6661ea71 100644
--- a/test/language/module-code/dynamic-import/catch-nested-function-import-catch-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-function-import-catch-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-function-import-catch-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-function-import-catch-instn-iee-err-ambiguous-import.js
index 4b95b46ef2..f2ad9d692a 100644
--- a/test/language/module-code/dynamic-import/catch-nested-function-import-catch-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-function-import-catch-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-function-import-catch-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-function-import-catch-instn-iee-err-circular.js
index 9ac9e48458..3fbd784093 100644
--- a/test/language/module-code/dynamic-import/catch-nested-function-import-catch-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-function-import-catch-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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
index cac01e5775..61291a992e 100644
--- 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
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (nested function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-if-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-if-import-catch-eval-rqstd-abrupt-typeerror.js
index 1d5c5cff95..b7a79ce849 100644
--- a/test/language/module-code/dynamic-import/catch-nested-if-import-catch-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-if-import-catch-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested if)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-if-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-if-import-catch-eval-rqstd-abrupt-urierror.js
index c8129cd835..49cb759b7c 100644
--- a/test/language/module-code/dynamic-import/catch-nested-if-import-catch-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-if-import-catch-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested if)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-if-import-catch-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-if-import-catch-instn-iee-err-ambiguous-import.js
index 806234f20e..4bbbd57c35 100644
--- a/test/language/module-code/dynamic-import/catch-nested-if-import-catch-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-if-import-catch-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested if)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-if-import-catch-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-if-import-catch-instn-iee-err-circular.js
index c05a1bfbb3..fdc419257f 100644
--- a/test/language/module-code/dynamic-import/catch-nested-if-import-catch-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-if-import-catch-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested if)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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
index 38f0a23a9c..368500c622 100644
--- 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
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (nested if)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-eval-rqstd-abrupt-typeerror.js
index def11447ed..e2a7ff0d9a 100644
--- a/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested labeled block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-eval-rqstd-abrupt-urierror.js
index 0c80635125..dd94cb1bd9 100644
--- a/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested labeled block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-instn-iee-err-ambiguous-import.js
index 62fac9d811..3e724f8655 100644
--- a/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested labeled block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-instn-iee-err-circular.js
index b05107a793..b03308b74c 100644
--- a/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested labeled block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-instn-iee-err-not-found.js b/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-instn-iee-err-not-found.js
index 2d0b57272a..6531f8894a 100644
--- a/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-instn-iee-err-not-found.js
+++ b/test/language/module-code/dynamic-import/catch-nested-labeled-block-import-catch-instn-iee-err-not-found.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (nested labeled block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-while-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-nested-while-import-catch-eval-rqstd-abrupt-typeerror.js
index 804e0de637..0fd5bc9c78 100644
--- a/test/language/module-code/dynamic-import/catch-nested-while-import-catch-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-while-import-catch-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested while)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-while-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-nested-while-import-catch-eval-rqstd-abrupt-urierror.js
index 7d81ffe055..87efb2aef4 100644
--- a/test/language/module-code/dynamic-import/catch-nested-while-import-catch-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-nested-while-import-catch-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (nested while)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-while-import-catch-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-nested-while-import-catch-instn-iee-err-ambiguous-import.js
index 425ee8abec..26f2614f83 100644
--- a/test/language/module-code/dynamic-import/catch-nested-while-import-catch-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-nested-while-import-catch-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (nested while)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-nested-while-import-catch-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-nested-while-import-catch-instn-iee-err-circular.js
index ddabf88a5f..d40425dcd4 100644
--- a/test/language/module-code/dynamic-import/catch-nested-while-import-catch-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-nested-while-import-catch-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (nested while)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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
index 5af4559a2f..abe4ad5595 100644
--- 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
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (nested while)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-top-level-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/module-code/dynamic-import/catch-top-level-import-catch-eval-rqstd-abrupt-typeerror.js
index 2ba7b3d398..e3202fa549 100644
--- a/test/language/module-code/dynamic-import/catch-top-level-import-catch-eval-rqstd-abrupt-typeerror.js
+++ b/test/language/module-code/dynamic-import/catch-top-level-import-catch-eval-rqstd-abrupt-typeerror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (top level)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-top-level-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/module-code/dynamic-import/catch-top-level-import-catch-eval-rqstd-abrupt-urierror.js
index ee7e0324b1..e67df2a4c2 100644
--- a/test/language/module-code/dynamic-import/catch-top-level-import-catch-eval-rqstd-abrupt-urierror.js
+++ b/test/language/module-code/dynamic-import/catch-top-level-import-catch-eval-rqstd-abrupt-urierror.js
@@ -5,7 +5,7 @@
 description: Abrupt completion during module evaluation precludes further evaluation (top level)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-top-level-import-catch-instn-iee-err-ambiguous-import.js b/test/language/module-code/dynamic-import/catch-top-level-import-catch-instn-iee-err-ambiguous-import.js
index fd005b2a7e..664936fd23 100644
--- a/test/language/module-code/dynamic-import/catch-top-level-import-catch-instn-iee-err-ambiguous-import.js
+++ b/test/language/module-code/dynamic-import/catch-top-level-import-catch-instn-iee-err-ambiguous-import.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - ambiguous imported bindings (top level)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/catch-top-level-import-catch-instn-iee-err-circular.js b/test/language/module-code/dynamic-import/catch-top-level-import-catch-instn-iee-err-circular.js
index b49b91aa79..f49b06629f 100644
--- a/test/language/module-code/dynamic-import/catch-top-level-import-catch-instn-iee-err-circular.js
+++ b/test/language/module-code/dynamic-import/catch-top-level-import-catch-instn-iee-err-circular.js
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - circular imported bindings (top level)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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
index 3b2687a4ad..0f37bc1a05 100644
--- 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
@@ -5,7 +5,7 @@
 description: IndirectExportEntries validation - undefined imported bindings (top level)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-eval-gtbdng-indirect-update-as.js
index 545e981884..e837111380 100644
--- a/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/nested-arrow-assignment-expression-eval-gtbdng-indirect-update-dflt.js
index c9f6e65b04..ecd22dec0e 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/nested-arrow-assignment-expression-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js
index cb20f04e07..4982ba52ce 100644
--- a/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-returns-promise.js b/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-returns-promise.js
index eda3df1e63..12da4c5b63 100644
--- a/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-arrow-import-then-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-arrow-import-then-eval-gtbdng-indirect-update-as.js
index b7003ab322..530d236dbf 100644
--- a/test/language/module-code/dynamic-import/nested-arrow-import-then-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-arrow-import-then-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/nested-arrow-import-then-eval-gtbdng-indirect-update-dflt.js
index a0bc4f6118..0c570d28c2 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/nested-arrow-import-then-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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/nested-arrow-import-then-eval-gtbndng-indirect-update.js
index a628f0fe23..c1635683d5 100644
--- a/test/language/module-code/dynamic-import/nested-arrow-import-then-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-arrow-import-then-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-arrow-import-then-returns-promise.js b/test/language/module-code/dynamic-import/nested-arrow-import-then-returns-promise.js
index c493f161ec..0a5edbe9bc 100644
--- a/test/language/module-code/dynamic-import/nested-arrow-import-then-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-arrow-import-then-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested arrow)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-async-function-await-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-async-function-await-eval-gtbdng-indirect-update-as.js
index 7bd542f035..5b038ac270 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-await-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-async-function-await-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested in async function, awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/nested-async-function-await-eval-gtbdng-indirect-update-dflt.js
index 221652668d..b05617ab97 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/nested-async-function-await-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested in async function, awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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/nested-async-function-await-eval-gtbndng-indirect-update.js
index 29ba474181..08b33e5219 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-await-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-async-function-await-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested in async function, awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-async-function-await-returns-promise.js b/test/language/module-code/dynamic-import/nested-async-function-await-returns-promise.js
index f33fe9e1c3..5540b6ac75 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-await-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-async-function-await-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested in async function, awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-async-function-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-async-function-eval-gtbdng-indirect-update-as.js
index 2e1aee6414..c9f8c6ba11 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-async-function-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested in async function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/nested-async-function-eval-gtbdng-indirect-update-dflt.js
index c630118a38..510a62533d 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/nested-async-function-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested in async function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-async-function-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/nested-async-function-eval-gtbndng-indirect-update.js
index 7ae650320d..f23ca5c1ae 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-async-function-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested in async function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-async-function-return-await-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-async-function-return-await-eval-gtbdng-indirect-update-as.js
index 13eaf7fcad..a328c78266 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-return-await-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-async-function-return-await-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested in async function, returns awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/nested-async-function-return-await-eval-gtbdng-indirect-update-dflt.js
index 59a9c9f9c2..4545fd0ceb 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/nested-async-function-return-await-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested in async function, returns awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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/nested-async-function-return-await-eval-gtbndng-indirect-update.js
index bc5a0a2492..86128cbf8e 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-return-await-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-async-function-return-await-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested in async function, returns awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-async-function-return-await-returns-promise.js b/test/language/module-code/dynamic-import/nested-async-function-return-await-returns-promise.js
index e45fa91f82..2c950986a0 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-return-await-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-async-function-return-await-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested in async function, returns awaited)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-async-function-returns-promise.js b/test/language/module-code/dynamic-import/nested-async-function-returns-promise.js
index 82e89546b8..14a97dfab3 100644
--- a/test/language/module-code/dynamic-import/nested-async-function-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-async-function-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested in async function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-block-import-then-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-block-import-then-eval-gtbdng-indirect-update-as.js
index c6c01eee0b..3666da9ed9 100644
--- a/test/language/module-code/dynamic-import/nested-block-import-then-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-block-import-then-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/nested-block-import-then-eval-gtbdng-indirect-update-dflt.js
index 44c507e253..2604f3c6c8 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/nested-block-import-then-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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/nested-block-import-then-eval-gtbndng-indirect-update.js
index 1af6e52282..9e91b0f93a 100644
--- a/test/language/module-code/dynamic-import/nested-block-import-then-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-block-import-then-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-block-import-then-returns-promise.js b/test/language/module-code/dynamic-import/nested-block-import-then-returns-promise.js
index 1f8a6d5acc..997722f966 100644
--- a/test/language/module-code/dynamic-import/nested-block-import-then-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-block-import-then-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbdng-indirect-update-as.js
index 927946f27e..9015565731 100644
--- a/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested do)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbdng-indirect-update-dflt.js
index 2c1f465f1e..3948afe3d9 100644
--- a/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested do)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbndng-indirect-update.js
index 688af7d713..a02175e900 100644
--- a/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested do)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-do-import-then-returns-promise.js b/test/language/module-code/dynamic-import/nested-do-import-then-returns-promise.js
index 29de981dc1..337655e7eb 100644
--- a/test/language/module-code/dynamic-import/nested-do-import-then-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-do-import-then-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested do)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-do-while-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-do-while-eval-gtbdng-indirect-update-as.js
index 7c49a9ca28..e70a9d5aed 100644
--- a/test/language/module-code/dynamic-import/nested-do-while-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-do-while-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/nested-do-while-eval-gtbdng-indirect-update-dflt.js
index 5621b275ae..4070bf203a 100644
--- a/test/language/module-code/dynamic-import/nested-do-while-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/nested-do-while-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-do-while-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/nested-do-while-eval-gtbndng-indirect-update.js
index be36ad03c2..ccad263d52 100644
--- a/test/language/module-code/dynamic-import/nested-do-while-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-do-while-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-do-while-returns-promise.js b/test/language/module-code/dynamic-import/nested-do-while-returns-promise.js
index ea2e9f4751..ddd1c1cc6e 100644
--- a/test/language/module-code/dynamic-import/nested-do-while-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-do-while-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-else-import-then-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-else-import-then-eval-gtbdng-indirect-update-as.js
index 352c027354..d6512c68f8 100644
--- a/test/language/module-code/dynamic-import/nested-else-import-then-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-else-import-then-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested else)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/nested-else-import-then-eval-gtbdng-indirect-update-dflt.js
index 9e6e6f35fb..8bc4c1648c 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/nested-else-import-then-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested else)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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/nested-else-import-then-eval-gtbndng-indirect-update.js
index e6e717cbd6..76881bbd68 100644
--- a/test/language/module-code/dynamic-import/nested-else-import-then-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-else-import-then-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested else)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-else-import-then-returns-promise.js b/test/language/module-code/dynamic-import/nested-else-import-then-returns-promise.js
index e075b80da8..afde7ff219 100644
--- a/test/language/module-code/dynamic-import/nested-else-import-then-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-else-import-then-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested else)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-function-import-then-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-function-import-then-eval-gtbdng-indirect-update-as.js
index 059dd785ea..9dc56495ca 100644
--- a/test/language/module-code/dynamic-import/nested-function-import-then-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-function-import-then-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/nested-function-import-then-eval-gtbdng-indirect-update-dflt.js
index 0620c5a58b..0375ead608 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/nested-function-import-then-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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/nested-function-import-then-eval-gtbndng-indirect-update.js
index 7c87e1c5d9..2b0717cc51 100644
--- a/test/language/module-code/dynamic-import/nested-function-import-then-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-function-import-then-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-function-import-then-returns-promise.js b/test/language/module-code/dynamic-import/nested-function-import-then-returns-promise.js
index 4f4812175e..ab2ff9bfa3 100644
--- a/test/language/module-code/dynamic-import/nested-function-import-then-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-function-import-then-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested function)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbdng-indirect-update-as.js
index 99e03782de..869eae575e 100644
--- a/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested if syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/nested-if-braceless-eval-gtbdng-indirect-update-dflt.js
index e874558a68..f01922c3ec 100644
--- a/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested if syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbndng-indirect-update.js
index 8954567c94..be923cd678 100644
--- a/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested if syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-if-braceless-returns-promise.js b/test/language/module-code/dynamic-import/nested-if-braceless-returns-promise.js
index 96ba15ffda..d4f9f98f5c 100644
--- a/test/language/module-code/dynamic-import/nested-if-braceless-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-if-braceless-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested if syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-if-import-then-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-if-import-then-eval-gtbdng-indirect-update-as.js
index b81e32fc01..41e55ed67c 100644
--- a/test/language/module-code/dynamic-import/nested-if-import-then-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-if-import-then-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested if)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/nested-if-import-then-eval-gtbdng-indirect-update-dflt.js
index bcd0e6785e..edfcb709dd 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/nested-if-import-then-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested if)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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/nested-if-import-then-eval-gtbndng-indirect-update.js
index 4e12e893e8..42c3fbf79f 100644
--- a/test/language/module-code/dynamic-import/nested-if-import-then-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-if-import-then-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested if)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-if-import-then-returns-promise.js b/test/language/module-code/dynamic-import/nested-if-import-then-returns-promise.js
index 1e645800f6..57f9e7dc83 100644
--- a/test/language/module-code/dynamic-import/nested-if-import-then-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-if-import-then-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested if)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbdng-indirect-update-as.js
index 355e4b14f2..15ed605fab 100644
--- a/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbdng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbdng-indirect-update-dflt.js
index 290cb94175..7f0313a530 100644
--- a/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbdng-indirect-update-dflt.js
+++ b/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbndng-indirect-update.js
index f63f23bc37..8a398830c7 100644
--- a/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-labeled-block-import-then-returns-promise.js b/test/language/module-code/dynamic-import/nested-labeled-block-import-then-returns-promise.js
index b8a8900ff8..bdb6313a08 100644
--- a/test/language/module-code/dynamic-import/nested-labeled-block-import-then-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-labeled-block-import-then-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested block)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/nested-while-import-then-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/nested-while-import-then-eval-gtbdng-indirect-update-as.js
index ede671bde4..b1e5a94dca 100644
--- a/test/language/module-code/dynamic-import/nested-while-import-then-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/nested-while-import-then-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested while)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/nested-while-import-then-eval-gtbdng-indirect-update-dflt.js
index 1f8199b850..38842f769e 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/nested-while-import-then-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested while)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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/nested-while-import-then-eval-gtbndng-indirect-update.js
index 5c3cc2f883..d2e757df6a 100644
--- a/test/language/module-code/dynamic-import/nested-while-import-then-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/nested-while-import-then-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested while)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/nested-while-import-then-returns-promise.js b/test/language/module-code/dynamic-import/nested-while-import-then-returns-promise.js
index 3450da3be0..f4bef3e87b 100644
--- a/test/language/module-code/dynamic-import/nested-while-import-then-returns-promise.js
+++ b/test/language/module-code/dynamic-import/nested-while-import-then-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested while)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/syntax-nested-block-labeled-eval-gtbdng-indirect-update-as.js
index dd5670458e..867858bfc9 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/syntax-nested-block-labeled-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/syntax-nested-block-labeled-eval-gtbdng-indirect-update-dflt.js
index f005fa354a..a9cef69afb 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/syntax-nested-block-labeled-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js
index 5120fee1ef..e0c0154087 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-returns-promise.js b/test/language/module-code/dynamic-import/syntax-nested-block-labeled-returns-promise.js
index d71e8bdabc..877e77c22e 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-returns-promise.js
+++ b/test/language/module-code/dynamic-import/syntax-nested-block-labeled-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/syntax-nested-arrow-assignment-expression-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-empty-args-early-error.js
similarity index 93%
rename from test/language/module-code/dynamic-import/syntax-nested-arrow-assignment-expression-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-empty-args-early-error.js
index 5c06738522..cb0d53404e 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-arrow-assignment-expression-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-arrow-assignment-expression.template
+// - src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested arrow syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 let f = () => import();
diff --git a/test/language/module-code/dynamic-import/syntax-nested-arrow-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-empty-args-early-error.js
similarity index 95%
rename from test/language/module-code/dynamic-import/syntax-nested-arrow-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-empty-args-early-error.js
index fbc44c0d83..41a4c52296 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-arrow-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-arrow.template
+// - src/dynamic-import/syntax/invalid/nested-arrow.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested arrow syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 let f = () => {
diff --git a/test/language/module-code/dynamic-import/syntax-nested-block-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-block-empty-args-early-error.js
similarity index 95%
rename from test/language/module-code/dynamic-import/syntax-nested-block-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-block-empty-args-early-error.js
index 60aba8f023..759b1dde47 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-block-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-block-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-block.template
+// - src/dynamic-import/syntax/invalid/nested-block.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 {
diff --git a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-empty-args-early-error.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax-nested-block-labeled-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-empty-args-early-error.js
index 256e77e20e..91b26736ef 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-block-labeled.template
+// - src/dynamic-import/syntax/invalid/nested-block-labeled.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 label: {
diff --git a/test/language/module-code/dynamic-import/syntax-nested-do-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-do-empty-args-early-error.js
similarity index 95%
rename from test/language/module-code/dynamic-import/syntax-nested-do-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-do-empty-args-early-error.js
index 1e8786cb39..5fe6255bc0 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-do-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-do-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-do.template
+// - src/dynamic-import/syntax/invalid/nested-do.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 let x = 0;
diff --git a/test/language/module-code/dynamic-import/syntax-nested-do-while-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-empty-args-early-error.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax-nested-do-while-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-empty-args-early-error.js
index c5fdf1e304..9748868703 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-do-while-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-do-while.template
+// - src/dynamic-import/syntax/invalid/nested-do-while.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 do {
diff --git a/test/language/module-code/dynamic-import/syntax-nested-else-braceless-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-empty-args-early-error.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax-nested-else-braceless-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-empty-args-early-error.js
index c8836d6e2f..f3281dcad6 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-else-braceless-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-else-braceless.template
+// - src/dynamic-import/syntax/invalid/nested-else-braceless.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested else syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 if (false) {
diff --git a/test/language/module-code/dynamic-import/syntax-nested-else-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-else-empty-args-early-error.js
similarity index 95%
rename from test/language/module-code/dynamic-import/syntax-nested-else-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-else-empty-args-early-error.js
index 7873b82c6e..d597e2bdbc 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-else-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-else-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-else.template
+// - src/dynamic-import/syntax/invalid/nested-else.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested else syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 if (false) {
diff --git a/test/language/module-code/dynamic-import/syntax-nested-function-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-function-empty-args-early-error.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax-nested-function-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-function-empty-args-early-error.js
index 56fcf6eaa6..80b501268e 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-function-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-function-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-function.template
+// - src/dynamic-import/syntax/invalid/nested-function.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested function syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 function fn() {
diff --git a/test/language/module-code/dynamic-import/syntax-nested-function-return-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-empty-args-early-error.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax-nested-function-return-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-empty-args-early-error.js
index 3bec664567..0d2eab83f9 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-function-return-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-function-return.template
+// - src/dynamic-import/syntax/invalid/nested-function-return.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested function syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 function fn() {
diff --git a/test/language/module-code/dynamic-import/syntax-nested-if-braceless-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-empty-args-early-error.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax-nested-if-braceless-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-empty-args-early-error.js
index 05f23a2ab0..cf7b356ed4 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-if-braceless-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-if-braceless.template
+// - src/dynamic-import/syntax/invalid/nested-if-braceless.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested if syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 if (true) import();
diff --git a/test/language/module-code/dynamic-import/syntax-nested-if-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-if-empty-args-early-error.js
similarity index 95%
rename from test/language/module-code/dynamic-import/syntax-nested-if-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-if-empty-args-early-error.js
index 3b8389b0cd..352813c866 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-if-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-if-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-if.template
+// - src/dynamic-import/syntax/invalid/nested-if.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested if syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 if (true) {
diff --git a/test/language/module-code/dynamic-import/syntax-nested-labeled-block-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-labeled-block-empty-args-early-error.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax-nested-labeled-block-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-labeled-block-empty-args-early-error.js
index f857a4bbfb..2bd53c18af 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-labeled-block-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-labeled-block-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-labeled.template
+// - src/dynamic-import/syntax/invalid/nested-labeled.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 {
diff --git a/test/language/module-code/dynamic-import/syntax-nested-while-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/nested-while-empty-args-early-error.js
similarity index 95%
rename from test/language/module-code/dynamic-import/syntax-nested-while-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/nested-while-empty-args-early-error.js
index e85863b54c..e34b8be274 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-while-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/nested-while-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/nested-while.template
+// - src/dynamic-import/syntax/invalid/nested-while.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (nested while syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -28,6 +28,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 let x = 0;
diff --git a/test/language/module-code/dynamic-import/syntax-top-level-empty-args-early-error.js b/test/language/module-code/dynamic-import/syntax/invalid/top-level-empty-args-early-error.js
similarity index 90%
rename from test/language/module-code/dynamic-import/syntax-top-level-empty-args-early-error.js
rename to test/language/module-code/dynamic-import/syntax/invalid/top-level-empty-args-early-error.js
index a7b1e70277..3a912622f6 100644
--- a/test/language/module-code/dynamic-import/syntax-top-level-empty-args-early-error.js
+++ b/test/language/module-code/dynamic-import/syntax/invalid/top-level-empty-args-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-args-early-error.case
-// - src/dynamic-import/syntax/top-level.template
+// - src/dynamic-import/syntax/invalid/top-level.template
 /*---
 description: It's a SyntaxError if AssignmentExpression is omitted (top level syntax)
 esid: sec-import-call-runtime-semantics-evaluation
@@ -18,6 +18,7 @@ info: |
         import()
 
 ---*/
+
 throw "Test262: This statement should not be evaluated.";
 
 import();
diff --git a/test/language/module-code/dynamic-import/syntax-nested-arrow-assignment-expression-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-arg.js
similarity index 92%
rename from test/language/module-code/dynamic-import/syntax-nested-arrow-assignment-expression-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-arg.js
index ce0b581a7a..45fc0aa286 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-arrow-assignment-expression-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-arg.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-arrow-assignment-expression.template
+// - src/dynamic-import/syntax/valid/nested-arrow-assignment-expression.template
 /*---
 description: Calling import('') (nested arrow syntax)
 esid: sec-import-call-runtime-semantics-evaluation
diff --git a/test/language/module-code/dynamic-import/syntax-nested-arrow-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-arg.js
similarity index 92%
rename from test/language/module-code/dynamic-import/syntax-nested-arrow-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-arg.js
index 8c5e9602ce..1f65a25f68 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-arrow-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-arg.js
@@ -1,11 +1,11 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-arrow.template
+// - src/dynamic-import/syntax/valid/nested-arrow.template
 /*---
 description: Calling import('') (nested arrow syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, module]
+flags: [generated]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/syntax-nested-block-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-arg.js
similarity index 92%
rename from test/language/module-code/dynamic-import/syntax-nested-block-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-arg.js
index 2a705227c7..beda362eb2 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-block-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-arg.js
@@ -1,11 +1,11 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-block.template
+// - src/dynamic-import/syntax/valid/nested-block.template
 /*---
 description: Calling import('') (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, module]
+flags: [generated]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-arg.js
similarity index 91%
rename from test/language/module-code/dynamic-import/syntax-nested-block-labeled-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-arg.js
index 804da47269..b31e240430 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-arg.js
@@ -1,11 +1,11 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-block-labeled.template
+// - src/dynamic-import/syntax/valid/nested-block-labeled.template
 /*---
 description: Calling import('') (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, module]
+flags: [generated]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/syntax-nested-do-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-do-empty-str-arg.js
similarity index 92%
rename from test/language/module-code/dynamic-import/syntax-nested-do-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-do-empty-str-arg.js
index aba87ff9c3..508bc173d2 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-do-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-do-empty-str-arg.js
@@ -1,11 +1,11 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-do.template
+// - src/dynamic-import/syntax/valid/nested-do.template
 /*---
 description: Calling import('') (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, module]
+flags: [generated]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/syntax-nested-do-while-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-arg.js
similarity index 92%
rename from test/language/module-code/dynamic-import/syntax-nested-do-while-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-arg.js
index 20302c073f..327864826d 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-do-while-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-arg.js
@@ -1,11 +1,11 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-do-while.template
+// - src/dynamic-import/syntax/valid/nested-do-while.template
 /*---
 description: Calling import('') (nested do syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, module]
+flags: [generated]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/syntax-nested-else-braceless-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-arg.js
similarity index 91%
rename from test/language/module-code/dynamic-import/syntax-nested-else-braceless-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-arg.js
index 07ffca60ec..11fa42054e 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-else-braceless-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-arg.js
@@ -1,11 +1,11 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-else-braceless.template
+// - src/dynamic-import/syntax/valid/nested-else-braceless.template
 /*---
 description: Calling import('') (nested else syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, module]
+flags: [generated]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/syntax-nested-else-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-arg.js
similarity index 92%
rename from test/language/module-code/dynamic-import/syntax-nested-else-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-arg.js
index 3345d993d2..9a3574fc5a 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-else-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-arg.js
@@ -1,11 +1,11 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-else.template
+// - src/dynamic-import/syntax/valid/nested-else.template
 /*---
 description: Calling import('') (nested else syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, module]
+flags: [generated]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/syntax-nested-function-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-arg.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax-nested-function-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-arg.js
index 9d87e7be3c..5aa70d9045 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-function-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-arg.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-function.template
+// - src/dynamic-import/syntax/valid/nested-function.template
 /*---
 description: Calling import('') (nested function syntax)
 esid: sec-import-call-runtime-semantics-evaluation
diff --git a/test/language/module-code/dynamic-import/syntax-nested-function-return-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-arg.js
similarity index 93%
rename from test/language/module-code/dynamic-import/syntax-nested-function-return-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-arg.js
index 113adbc955..789ad786a8 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-function-return-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-arg.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-function-return.template
+// - src/dynamic-import/syntax/valid/nested-function-return.template
 /*---
 description: Calling import('') (nested function syntax)
 esid: sec-import-call-runtime-semantics-evaluation
diff --git a/test/language/module-code/dynamic-import/syntax-nested-if-braceless-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-arg.js
similarity index 91%
rename from test/language/module-code/dynamic-import/syntax-nested-if-braceless-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-arg.js
index f8ce09ce0d..bdb36e84fe 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-if-braceless-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-arg.js
@@ -1,11 +1,11 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-if-braceless.template
+// - src/dynamic-import/syntax/valid/nested-if-braceless.template
 /*---
 description: Calling import('') (nested if syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, module]
+flags: [generated]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/syntax-nested-if-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-arg.js
similarity index 92%
rename from test/language/module-code/dynamic-import/syntax-nested-if-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-arg.js
index f6845b9ebf..700f990b83 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-if-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-arg.js
@@ -1,11 +1,11 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-if.template
+// - src/dynamic-import/syntax/valid/nested-if.template
 /*---
 description: Calling import('') (nested if syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, module]
+flags: [generated]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/syntax-nested-labeled-block-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-labeled-block-empty-str-arg.js
similarity index 92%
rename from test/language/module-code/dynamic-import/syntax-nested-labeled-block-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-labeled-block-empty-str-arg.js
index 6487baceea..ee922977bd 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-labeled-block-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-labeled-block-empty-str-arg.js
@@ -1,11 +1,11 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-labeled.template
+// - src/dynamic-import/syntax/valid/nested-labeled.template
 /*---
 description: Calling import('') (nested block syntax)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, module]
+flags: [generated]
 info: |
     ImportCall :
         import( AssignmentExpression )
diff --git a/test/language/module-code/dynamic-import/syntax-nested-while-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-arg.js
similarity index 94%
rename from test/language/module-code/dynamic-import/syntax-nested-while-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-arg.js
index e4794eadea..7392e38aa1 100644
--- a/test/language/module-code/dynamic-import/syntax-nested-while-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-arg.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/nested-while.template
+// - src/dynamic-import/syntax/valid/nested-while.template
 /*---
 description: Calling import('') (nested while syntax)
 esid: sec-import-call-runtime-semantics-evaluation
diff --git a/test/language/module-code/dynamic-import/syntax-top-level-empty-str-arg.js b/test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-arg.js
similarity index 86%
rename from test/language/module-code/dynamic-import/syntax-top-level-empty-str-arg.js
rename to test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-arg.js
index b0e798aeef..f1e3ea22c8 100644
--- a/test/language/module-code/dynamic-import/syntax-top-level-empty-str-arg.js
+++ b/test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-arg.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
 // - src/dynamic-import/empty-str-arg.case
-// - src/dynamic-import/syntax/top-level.template
+// - src/dynamic-import/syntax/valid/top-level.template
 /*---
 description: Calling import('') (top level syntax)
 esid: sec-import-call-runtime-semantics-evaluation
diff --git a/test/language/module-code/dynamic-import/top-level-import-then-eval-gtbdng-indirect-update-as.js b/test/language/module-code/dynamic-import/top-level-import-then-eval-gtbdng-indirect-update-as.js
index 5cd4e27f8a..3796203825 100644
--- a/test/language/module-code/dynamic-import/top-level-import-then-eval-gtbdng-indirect-update-as.js
+++ b/test/language/module-code/dynamic-import/top-level-import-then-eval-gtbdng-indirect-update-as.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (top level)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
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/top-level-import-then-eval-gtbdng-indirect-update-dflt.js
index 7bbc280022..90fd82bbfd 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/top-level-import-then-eval-gtbdng-indirect-update-dflt.js
@@ -5,7 +5,7 @@
 description: Modifications to default binding that occur after dependency has been evaluated are reflected in local binding (top level)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
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/top-level-import-then-eval-gtbndng-indirect-update.js
index 7835b16df8..2a476f804f 100644
--- a/test/language/module-code/dynamic-import/top-level-import-then-eval-gtbndng-indirect-update.js
+++ b/test/language/module-code/dynamic-import/top-level-import-then-eval-gtbndng-indirect-update.js
@@ -5,7 +5,7 @@
 description: Modifications to named bindings that occur after dependency has been evaluated are reflected in local binding (top level)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 includes: [fnGlobalObject.js]
 info: |
     ImportCall :
diff --git a/test/language/module-code/dynamic-import/top-level-import-then-returns-promise.js b/test/language/module-code/dynamic-import/top-level-import-then-returns-promise.js
index e97e89baec..626bc97eda 100644
--- a/test/language/module-code/dynamic-import/top-level-import-then-returns-promise.js
+++ b/test/language/module-code/dynamic-import/top-level-import-then-returns-promise.js
@@ -5,7 +5,7 @@
 description: Dynamic import() returns a Promise object. (top level)
 esid: sec-import-call-runtime-semantics-evaluation
 features: [dynamic-import]
-flags: [generated, async, module]
+flags: [generated, async]
 info: |
     ImportCall :
         import( AssignmentExpression )
-- 
GitLab