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
deleted file mode 100644
index e83711138051d50c6b4f1aed48dcb0759df17aaf..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-arrow-assignment-expression-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-arrow-assignment-expression.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-let f = () => import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-  assert.sameValue(imported.x, 1);
-
-  // This function is exposed on the global scope (instead of as an imported
-  // binding) in order to avoid possible false positives from assuming correct
-  // behavior of the semantics under test.
-  fnGlobalObject().test262update();
-
-  assert.sameValue(imported.x, 2);
-
-});
-
-
-f().then($DONE, $DONE).catch($DONE);
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
deleted file mode 100644
index 530d236dbfa838355e058cbd27ee384fbd82f3ac..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-arrow-import-then-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-arrow.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-let f = () => {
-  return import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-};
-
-f();
-
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
deleted file mode 100644
index 5b038ac270bc02f41630cf9c159f2462bda35dd5..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-async-function-await-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-async-function-await.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-async function f() {
-  await import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-}
-
-f();
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
deleted file mode 100644
index c9f8c6ba11c67c483b4530a3358fd8c3d4053a94..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-async-function-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-async-function.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-async function f() {
-  import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-}
-
-f();
-
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
deleted file mode 100644
index a328c782668c2e40cc5698d50a4885632aaed975..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-async-function-return-await-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-async-function-return-await.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-async function f() {
-  return await import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-}
-
-f();
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
deleted file mode 100644
index 3666da9ed93d7c9ffef49ec4babd2cf568a091e0..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-block-import-then-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-block.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-{
-  import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-};
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
deleted file mode 100644
index 90155657318ee6d5d5cbcb395e024ebbb2a834d3..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-do-import-then-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-do.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-let x = 0;
-do {
-  x++;
-  import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-} while (!x);
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
deleted file mode 100644
index e70a9d5aed1f773e88ac79240d54657509e6d7db..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-do-while-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-do-while.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-do {
-  import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-} while (false);
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
deleted file mode 100644
index d6512c68f8a7c4c2c9b4d1d5b8b15126f45506c2..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-else-import-then-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-else.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-if (false) {
-
-} else {
-  import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-}
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
deleted file mode 100644
index 9dc56495ca5fbf487aff37993038698eab10d144..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-function-import-then-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-function.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-function f() {
-  import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-}
-f();
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
deleted file mode 100644
index 869eae575e1145916f3d4d4d19c5a8334300188e..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-if-braceless-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-if-braceless.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-if (true) import('./eval-gtbndng-indirect-update-as_FIXTURE.js');
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
deleted file mode 100644
index 41e55ed67cde6e1c58b4a3ea01f5bcdbc87dcce5..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-if-import-then-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-if.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-if (true) {
-  import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-}
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
deleted file mode 100644
index 15ed605fab83391312f05fb1c234ef98cc891d38..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-labeled-block-import-then-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-labeled-block.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-{
-  import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-};
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
deleted file mode 100644
index b1e5a94dca16566e5d3139d05c0c363e5c67bd96..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/nested-while-import-then-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-while.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-let x = 0;
-while (!x) {
-  x++;
-  import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-};
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
deleted file mode 100644
index 867858bfc911e0f03ce12787429a1454b90d8d24..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/syntax-nested-block-labeled-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/nested-block-labeled.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-label: {
-  import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-    assert.sameValue(imported.x, 1);
-
-    // This function is exposed on the global scope (instead of as an imported
-    // binding) in order to avoid possible false positives from assuming correct
-    // behavior of the semantics under test.
-    fnGlobalObject().test262update();
-
-    assert.sameValue(imported.x, 2);
-
-  }).then($DONE, $DONE).catch($DONE);
-};
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
deleted file mode 100644
index 379620382501e0a2c22cde3daaa9ca93153a9771..0000000000000000000000000000000000000000
--- a/test/language/module-code/dynamic-import/top-level-import-then-eval-gtbdng-indirect-update-as.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/dynamic-import/eval-gtbdng-indirect-update-as.case
-// - src/dynamic-import/default/top-level.template
-/*---
-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]
-includes: [fnGlobalObject.js]
-info: |
-    ImportCall :
-        import( AssignmentExpression )
-
-    1. Let referencingScriptOrModule be ! GetActiveScriptOrModule().
-    2. Assert: referencingScriptOrModule is a Script Record or Module Record (i.e. is not null).
-    3. Let argRef be the result of evaluating AssignmentExpression.
-    4. Let specifier be ? GetValue(argRef).
-    5. Let promiseCapability be ! NewPromiseCapability(%Promise%).
-    6. Let specifierString be ToString(specifier).
-    7. IfAbruptRejectPromise(specifierString, promiseCapability).
-    8. Perform ! HostImportModuleDynamically(referencingScriptOrModule, specifierString, promiseCapability).
-    9. Return promiseCapability.[[Promise]].
-
-
-    GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-
----*/
-
-import('./eval-gtbndng-indirect-update-as_FIXTURE.js').then(imported => {
-
-  assert.sameValue(imported.x, 1);
-
-  // This function is exposed on the global scope (instead of as an imported
-  // binding) in order to avoid possible false positives from assuming correct
-  // behavior of the semantics under test.
-  fnGlobalObject().test262update();
-
-  assert.sameValue(imported.x, 2);
-
-}).then($DONE, $DONE).catch($DONE);