diff --git a/features.txt b/features.txt
index deafacba9b682f411969fe7c0a66f49c9058ed26..160fe784a422ac8aecfa73c3e0a1711f82f6d684 100644
--- a/features.txt
+++ b/features.txt
@@ -154,4 +154,3 @@ WeakSet
 # object, go here.
 
 IsHTMLDDA
-CannotSuspendMainAgent
diff --git a/test/language/eval-code/direct/block-decl-nostrict.js b/test/annexB/language/eval-code/direct/block-decl-nostrict.js
similarity index 100%
rename from test/language/eval-code/direct/block-decl-nostrict.js
rename to test/annexB/language/eval-code/direct/block-decl-nostrict.js
diff --git a/test/language/eval-code/direct/switch-case-decl-nostrict.js b/test/annexB/language/eval-code/direct/switch-case-decl-nostrict.js
similarity index 100%
rename from test/language/eval-code/direct/switch-case-decl-nostrict.js
rename to test/annexB/language/eval-code/direct/switch-case-decl-nostrict.js
diff --git a/test/language/eval-code/direct/switch-dflt-decl-nostrict.js b/test/annexB/language/eval-code/direct/switch-dflt-decl-nostrict.js
similarity index 100%
rename from test/language/eval-code/direct/switch-dflt-decl-nostrict.js
rename to test/annexB/language/eval-code/direct/switch-dflt-decl-nostrict.js
diff --git a/test/language/function-code/block-decl-nostrict.js b/test/annexB/language/function-code/block-decl-nostrict.js
similarity index 100%
rename from test/language/function-code/block-decl-nostrict.js
rename to test/annexB/language/function-code/block-decl-nostrict.js
diff --git a/test/language/function-code/switch-case-decl-nostrict.js b/test/annexB/language/function-code/switch-case-decl-nostrict.js
similarity index 100%
rename from test/language/function-code/switch-case-decl-nostrict.js
rename to test/annexB/language/function-code/switch-case-decl-nostrict.js
diff --git a/test/language/function-code/switch-dflt-decl-nostrict.js b/test/annexB/language/function-code/switch-dflt-decl-nostrict.js
similarity index 100%
rename from test/language/function-code/switch-dflt-decl-nostrict.js
rename to test/annexB/language/function-code/switch-dflt-decl-nostrict.js
diff --git a/test/built-ins/Atomics/store/nonshared-int-views.js b/test/built-ins/Atomics/store/nonshared-int-views.js
index d6bda379c1742d0c82d57c49d1517aec9a4ca591..2f0d698bb4174272aef921156cc8a56c7a616951 100644
--- a/test/built-ins/Atomics/store/nonshared-int-views.js
+++ b/test/built-ins/Atomics/store/nonshared-int-views.js
@@ -18,5 +18,5 @@ if (typeof BigInt !== "undefined") {
 }
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.store(new TA(ab), 0, 0)));
+  assert.throws(TypeError, (() => Atomics.store(new TA(buffer), 0, 0)));
 }, views);
diff --git a/test/built-ins/Atomics/sub/nonshared-int-views.js b/test/built-ins/Atomics/sub/nonshared-int-views.js
index 8644c98e531c6f1bf2e88cad21fd73f25a46d67d..3352ad9453134d9d7f3eb6efa3e21b1ddd027580 100644
--- a/test/built-ins/Atomics/sub/nonshared-int-views.js
+++ b/test/built-ins/Atomics/sub/nonshared-int-views.js
@@ -18,5 +18,5 @@ if (typeof BigInt !== "undefined") {
 }
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.sub(new TA(ab), 0, 0)));
+  assert.throws(TypeError, (() => Atomics.sub(new TA(buffer), 0, 0)));
 }, views);
diff --git a/test/built-ins/Atomics/wait/nan-for-timeout.js b/test/built-ins/Atomics/wait/nan-for-timeout.js
index bfc3bd4825689590a9295485d573b620f4a72536..a9026163bc31333f413ec344da79feefb67331d0 100644
--- a/test/built-ins/Atomics/wait/nan-for-timeout.js
+++ b/test/built-ins/Atomics/wait/nan-for-timeout.js
@@ -38,5 +38,5 @@ var int32Array = new Int32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEME
 $262.agent.broadcast(int32Array.buffer);
 $262.agent.sleep(500); // Ample time
 
-assert.sameValue(getReport(), null);
 assert.sameValue(Atomics.wake(int32Array, 0), 1);
+assert.sameValue(getReport(), "ok");
diff --git a/test/built-ins/BigInt/constructor-integer.js b/test/built-ins/BigInt/constructor-integer.js
index b416e43ecc1eb3d566251d34a9fb1638bfd846e8..a54d84b7a435b92215d0fadb44ceb2f6e1813ec7 100644
--- a/test/built-ins/BigInt/constructor-integer.js
+++ b/test/built-ins/BigInt/constructor-integer.js
@@ -27,10 +27,32 @@ assert.sameValue(
   "BigInt(-Number.MAX_SAFE_INTEGER) === -9007199254740991n"
 );
 
-assert.throws(RangeError, function() {
-  BigInt(Number.MAX_SAFE_INTEGER + 1);
-}, "BigInt(Number.MAX_SAFE_INTEGER + 1) throws RangeError");
+assert.sameValue(
+  BigInt(Number.MAX_SAFE_INTEGER + 1), 9007199254740992n,
+  "BigInt(Number.MAX_SAFE_INTEGER + 1) === 9007199254740992n"
+);
+
+assert.sameValue(
+  BigInt(-Number.MAX_SAFE_INTEGER - 1), -9007199254740992n,
+  "BigInt(-Number.MAX_SAFE_INTEGER - 1) === -9007199254740992n"
+);
+
+assert.sameValue(
+  BigInt(Number.MAX_SAFE_INTEGER + 2), 9007199254740992n,
+  "BigInt(Number.MAX_SAFE_INTEGER + 2) === 9007199254740992n"
+);
 
-assert.throws(RangeError, function() {
-  BigInt(-Number.MAX_SAFE_INTEGER - 1);
-}, "BigInt(-Number.MAX_SAFE_INTEGER - 1) throws RangeError");
+assert.sameValue(
+  BigInt(-Number.MAX_SAFE_INTEGER - 2), -9007199254740992n,
+  "BigInt(-Number.MAX_SAFE_INTEGER - 2) === -9007199254740992n"
+);
+
+assert.sameValue(
+  BigInt(Number.MAX_SAFE_INTEGER + 3), 9007199254740994n,
+  "BigInt(Number.MAX_SAFE_INTEGER + 3) === 9007199254740994n"
+);
+
+assert.sameValue(
+  BigInt(-Number.MAX_SAFE_INTEGER - 3), -9007199254740994n,
+  "BigInt(-Number.MAX_SAFE_INTEGER - 3) === -9007199254740994n"
+);