diff --git a/harness/testBigIntTypedArray.js b/harness/testBigIntTypedArray.js
index dc6d50f93b90b175bd68b1afc687f09b45c02a69..f071e5515b02f281b78cadaf951d71c7b9626027 100644
--- a/harness/testBigIntTypedArray.js
+++ b/harness/testBigIntTypedArray.js
@@ -5,34 +5,26 @@ description: |
     Collection of functions used to assert the correctness of BigInt TypedArray objects.
 ---*/
 
-/**
- * Array containing every typed array constructor.
- */
-var BigIntTypedArrayConstructors = [
-  BigInt64Array,
-  BigUint64Array
-];
-
 /**
  * The %TypedArray% intrinsic constructor function.
  */
 var TypedArray = Object.getPrototypeOf(Int8Array);
 
-/**
- * Callback for testing a typed array constructor.
- *
- * @callback typedArrayConstructorCallback
- * @param {Function} Constructor the constructor object to test with.
- */
-
 /**
  * Calls the provided function for every typed array constructor.
  *
  * @param {typedArrayConstructorCallback} f - the function to call for each typed array constructor.
  * @param {Array} selected - An optional Array with filtered typed arrays
  */
-function testWithBigIntTypedArrayConstructors(f, selected) {
-  var constructors = selected || BigIntTypedArrayConstructors;
+function testWithBigIntTypedArrayConstructors(f) {
+  /**
+   * Array containing every BigInt typed array constructor.
+   */
+  var constructors = [
+    BigInt64Array,
+    BigUint64Array
+  ];
+
   for (var i = 0; i < constructors.length; ++i) {
     var constructor = constructors[i];
     try {
@@ -43,30 +35,3 @@ function testWithBigIntTypedArrayConstructors(f, selected) {
     }
   }
 }
-
-/**
- * Helper for conversion operations on TypedArrays, the expected values
- * properties are indexed in order to match the respective value for each
- * TypedArray constructor
- * @param  {Function} fn - the function to call for each constructor and value.
- *                         will be called with the constructor, value, expected
- *                         value, and a initial value that can be used to avoid
- *                         a false positive with an equivalent expected value.
- */
-function testBigIntTypedArrayConversions(byteConversionValues, fn) {
-  var values = byteConversionValues.values;
-  var expected = byteConversionValues.expected;
-
-  testWithBigIntTypedArrayConstructors(function(TA) {
-    var name = TA.name.slice(0, -5);
-
-    return values.forEach(function(value, index) {
-      var exp = expected[name][index];
-      var initial = 0;
-      if (exp === 0) {
-        initial = 1;
-      }
-      fn(TA, value, exp, initial);
-    });
-  });
-}
diff --git a/test/built-ins/TypedArray/prototype/fill/BigInt/fill-values-conversion-operations-consistent-nan.js b/test/built-ins/TypedArray/prototype/fill/BigInt/fill-values-conversion-operations-consistent-nan.js
deleted file mode 100644
index 5db1cfcae3f54edf6abb203b9b2f6af7518d7bbd..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArray/prototype/fill/BigInt/fill-values-conversion-operations-consistent-nan.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-%typedarray%.prototype.fill
-description: Consistent canonicalization of NaN values
-info: |
-  22.2.3.8 %TypedArray%.prototype.fill (value [ , start [ , end ] ] )
-
-  %TypedArray%.prototype.fill is a distinct function that implements the same
-  algorithm as Array.prototype.fill as defined in 22.1.3.6 except that the this
-  object's [[ArrayLength]] internal slot is accessed in place of performing a
-  [[Get]] of "length". The implementation of the algorithm may be optimized with
-  the knowledge that the this value is an object that has a fixed length and
-  whose integer indexed properties are not sparse. However, such optimization
-  must not introduce any observable changes in the specified behaviour of the
-  algorithm.
-
-  ...
-
-  22.1.3.6 Array.prototype.fill (value [ , start [ , end ] ] )
-
-  ...
-  7. Repeat, while k < final
-    a. Let Pk be ! ToString(k).
-    b. Perform ? Set(O, Pk, value, true).
-  ...
-
-  24.1.1.6 SetValueInBuffer ( arrayBuffer, byteIndex, type, value [ ,
-  isLittleEndian ] )
-
-  ...
-  8. If type is "Float32", then
-     a. Set rawBytes to a List containing the 4 bytes that are the result
-        of converting value to IEEE 754-2008 binary32 format using “Round to
-        nearest, ties to even” rounding mode. If isLittleEndian is false, the
-        bytes are arranged in big endian order. Otherwise, the bytes are
-        arranged in little endian order. If value is NaN, rawValue may be set
-        to any implementation chosen IEEE 754-2008 binary64 format Not-a-Number
-        encoding. An implementation must always choose the same encoding for
-        each implementation distinguishable NaN value.
-  9. Else, if type is "Float64", then
-     a. Set rawBytes to a List containing the 8 bytes that are the IEEE
-        754-2008 binary64 format encoding of value. If isLittleEndian is false,
-        the bytes are arranged in big endian order. Otherwise, the bytes are
-        arranged in little endian order. If value is NaN, rawValue may be set
-        to any implementation chosen IEEE 754-2008 binary32 format Not-a-Number
-        encoding. An implementation must always choose the same encoding for
-        each implementation distinguishable NaN value.
-  ...
-includes: [nans.js, testBigIntTypedArray.js, compareArray.js]
-features: [BigInt, TypedArray]
----*/
-
-function body(FloatArray) {
-  var sample = new FloatArray(3);
-  var control, idx, someNaN, sampleBytes, controlBytes;
-
-  for (idx = 0; idx < distinctNaNs.length; ++idx) {
-    someNaN = distinctNaNs[idx];
-    control = new FloatArray([someNaN, someNaN, someNaN]);
-
-    sample.fill(someNaN);
-
-    sampleBytes = new Uint8Array(sample.buffer);
-    controlBytes = new Uint8Array(control.buffer);
-    assert(compareArray(sampleBytes, controlBytes), 'NaN value #' + idx);
-  }
-}
-
-testWithBigIntTypedArrayConstructors(body, [Float32Array, Float64Array]);
diff --git a/test/built-ins/TypedArray/prototype/fill/BigInt/fill-values-conversion-operations.js b/test/built-ins/TypedArray/prototype/fill/BigInt/fill-values-conversion-operations.js
deleted file mode 100644
index 676d18f86c685d61241aa54b7b07511a605461b1..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArray/prototype/fill/BigInt/fill-values-conversion-operations.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-%typedarray%.prototype.fill
-description: >
-  Fills all the elements with non numeric values values.
-info: |
-  22.2.3.8 %TypedArray%.prototype.fill (value [ , start [ , end ] ] )
-
-  %TypedArray%.prototype.fill is a distinct function that implements the same
-  algorithm as Array.prototype.fill as defined in 22.1.3.6 except that the this
-  object's [[ArrayLength]] internal slot is accessed in place of performing a
-  [[Get]] of "length". The implementation of the algorithm may be optimized with
-  the knowledge that the this value is an object that has a fixed length and
-  whose integer indexed properties are not sparse. However, such optimization
-  must not introduce any observable changes in the specified behaviour of the
-  algorithm.
-
-  ...
-
-  22.1.3.6 Array.prototype.fill (value [ , start [ , end ] ] )
-
-  ...
-  7. Repeat, while k < final
-    a. Let Pk be ! ToString(k).
-    b. Perform ? Set(O, Pk, value, true).
-  ...
-
-  24.1.1.6 SetValueInBuffer ( arrayBuffer, byteIndex, type, value [ ,
-  isLittleEndian ] )
-
-  ...
-  8. If type is "Float32", then
-    ...
-  9. Else, if type is "Float64", then
-    ...
-  10. Else,
-    ...
-    b. Let convOp be the abstract operation named in the Conversion Operation
-    column in Table 50 for Element Type type.
-    c. Let intValue be convOp(value).
-    d. If intValue ≥ 0, then
-      ...
-    e. Else,
-      ...
-includes: [byteConversionValues.js, testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-testTypedArrayConversions(byteConversionValues, function(TA, value, expected, initial) {
-  var sample = new TA([initial]);
-
-  sample.fill(value);
-
-  assert.sameValue(sample[0], expected, value + " converts to " + expected);
-});
diff --git a/test/built-ins/TypedArray/prototype/filter/BigInt/speciesctor-get-species-custom-ctor-returns-another-instance.js b/test/built-ins/TypedArray/prototype/filter/BigInt/speciesctor-get-species-custom-ctor-returns-another-instance.js
index 8ad970667d481d32cd26cbb7a1b8fc3e0fd89d7e..fe301ac8f634b16c7e21ba50596a4687275af34e 100644
--- a/test/built-ins/TypedArray/prototype/filter/BigInt/speciesctor-get-species-custom-ctor-returns-another-instance.js
+++ b/test/built-ins/TypedArray/prototype/filter/BigInt/speciesctor-get-species-custom-ctor-returns-another-instance.js
@@ -38,8 +38,8 @@ features: [BigInt, Symbol.species, TypedArray]
 
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA([40n]);
-  var otherTA = TA === Int8Array ? Int16Array : Int8Array;
-  var other = new otherTA([1, 0, 1]);
+  var otherTA = TA === BigInt64Array ? BigUint64Array : BigInt64Array;
+  var other = new otherTA([1n, 0n, 1n]);
   var result;
 
   sample.constructor = {};
@@ -50,5 +50,5 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   result = sample.filter(function() {});
 
   assert.sameValue(result, other, "returned another typedarray");
-  assert(compareArray(result, [1, 0, 1]), "the returned object is preserved");
+  assert(compareArray(result, [1n, 0n, 1n]), "the returned object is preserved");
 });
diff --git a/test/built-ins/TypedArray/prototype/map/BigInt/return-new-typedarray-conversion-operation-consistent-nan.js b/test/built-ins/TypedArray/prototype/map/BigInt/return-new-typedarray-conversion-operation-consistent-nan.js
deleted file mode 100644
index 1b9534f1aabd33f9dbb5f5c5df00effa117f0b4f..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArray/prototype/map/BigInt/return-new-typedarray-conversion-operation-consistent-nan.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-%typedarray%.prototype.map
-description: Consistent canonicalization of NaN values
-info: |
-  22.2.3.19 %TypedArray%.prototype.map ( callbackfn [ , thisArg ] )
-
-  ...
-  8. Repeat, while k < len
-    ...
-    d. Perform ? Set(A, Pk, mappedValue, true).
-  ...
-
-  9.4.5.9 IntegerIndexedElementSet ( O, index, value )
-
-  ...
-  15. Perform SetValueInBuffer(buffer, indexedPosition, elementType, numValue).
-  ...
-
-  24.1.1.6 SetValueInBuffer ( arrayBuffer, byteIndex, type, value [ ,
-  isLittleEndian ] )
-
-  ...
-  8. If type is "Float32", then
-     a. Set rawBytes to a List containing the 4 bytes that are the result
-        of converting value to IEEE 754-2008 binary32 format using “Round to
-        nearest, ties to even” rounding mode. If isLittleEndian is false, the
-        bytes are arranged in big endian order. Otherwise, the bytes are
-        arranged in little endian order. If value is NaN, rawValue may be set
-        to any implementation chosen IEEE 754-2008 binary64 format Not-a-Number
-        encoding. An implementation must always choose the same encoding for
-        each implementation distinguishable NaN value.
-  9. Else, if type is "Float64", then
-     a. Set rawBytes to a List containing the 8 bytes that are the IEEE
-        754-2008 binary64 format encoding of value. If isLittleEndian is false,
-        the bytes are arranged in big endian order. Otherwise, the bytes are
-        arranged in little endian order. If value is NaN, rawValue may be set
-        to any implementation chosen IEEE 754-2008 binary32 format Not-a-Number
-        encoding. An implementation must always choose the same encoding for
-        each implementation distinguishable NaN value.
-  ...
-includes: [nans.js, testBigIntTypedArray.js, compareArray.js]
-features: [BigInt, TypedArray]
----*/
-
-function body(FloatArray) {
-  var sample = new FloatArray(distinctNaNs);
-  var sampleBytes, resultBytes;
-  var i = 0;
-
-  var result = sample.map(function() {
-    return distinctNaNs[i++];
-  });
-
-  sampleBytes = new Uint8Array(sample.buffer);
-  resultBytes = new Uint8Array(result.buffer);
-
-  assert(compareArray(sampleBytes, resultBytes));
-}
-
-testWithBigIntTypedArrayConstructors(body, [Float32Array, Float64Array]);
diff --git a/test/built-ins/TypedArray/prototype/map/BigInt/return-new-typedarray-conversion-operation.js b/test/built-ins/TypedArray/prototype/map/BigInt/return-new-typedarray-conversion-operation.js
deleted file mode 100644
index 6f2b83a63751f25bdd4a5a74fea03b5db8a7d19c..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArray/prototype/map/BigInt/return-new-typedarray-conversion-operation.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-%typedarray%.prototype.map
-description: >
-  Verify conversion values on returned instance
-info: |
-  22.2.3.19 %TypedArray%.prototype.map ( callbackfn [ , thisArg ] )
-
-  ...
-  8. Repeat, while k < len
-    ...
-    d. Perform ? Set(A, Pk, mappedValue, true).
-  ...
-
-  9.4.5.9 IntegerIndexedElementSet ( O, index, value )
-
-  ...
-  15. Perform SetValueInBuffer(buffer, indexedPosition, elementType, numValue).
-  ...
-
-  24.1.1.6 SetValueInBuffer ( arrayBuffer, byteIndex, type, value [ ,
-  isLittleEndian ] )
-
-  ...
-  8. If type is "Float32", then
-    ...
-  9. Else, if type is "Float64", then
-    ...
-  10. Else,
-    ...
-    b. Let convOp be the abstract operation named in the Conversion Operation
-    column in Table 50 for Element Type type.
-    c. Let intValue be convOp(value).
-    d. If intValue ≥ 0, then
-      ...
-    e. Else,
-      ...
-includes: [byteConversionValues.js, testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-testTypedArrayConversions(byteConversionValues, function(TA, value, expected, initial) {
-  var sample = new TA([initial]);
-
-  var result = sample.map(function() {
-    return value;
-  });
-
-  assert.sameValue(result[0], expected, value + " converts to " + expected);
-});
diff --git a/test/built-ins/TypedArray/prototype/set/BigInt/array-arg-src-tonumber-value-conversions.js b/test/built-ins/TypedArray/prototype/set/BigInt/array-arg-src-tonumber-value-conversions.js
deleted file mode 100644
index 78fd9dcbb168eb381af9a78e01cae86d77a3d4ae..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArray/prototype/set/BigInt/array-arg-src-tonumber-value-conversions.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-%typedarray%.prototype.set-array-offset
-description: >
-  Values conversions on ToNumber(src property value)
-info: |
-  22.2.3.23.1 %TypedArray%.prototype.set (array [ , offset ] )
-
-  1. Assert: array is any ECMAScript language value other than an Object with a
-  [[TypedArrayName]] internal slot. If it is such an Object, the definition in
-  22.2.3.23.2 applies.
-  ...
-  21. Repeat, while targetByteIndex < limit
-    a. Let Pk be ! ToString(k).
-    b. Let kNumber be ? ToNumber(? Get(src, Pk)).
-    c. If IsDetachedBuffer(targetBuffer) is true, throw a TypeError exception.
-    d. Perform SetValueInBuffer(targetBuffer, targetByteIndex, targetType,
-    kNumber).
-  ...
-includes: [byteConversionValues.js, testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-testTypedArrayConversions(byteConversionValues, function(TA, value, expected, initial) {
-  var sample = new TA([initial]);
-
-  sample.set([value]);
-
-  assert.sameValue(sample[0], expected, "["+value+"] => ["+expected +"]");
-});
diff --git a/test/built-ins/TypedArray/prototype/set/BigInt/bit-precision.js b/test/built-ins/TypedArray/prototype/set/BigInt/bit-precision.js
deleted file mode 100644
index 979b0b384f0644350a542edef0d034419535ec88..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArray/prototype/set/BigInt/bit-precision.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-%typedarray%.prototype.set.2
-description: Preservation of bit-level encoding
-info: |
-  [...]
-  28. Else,
-      a. NOTE: If srcType and targetType are the same, the transfer must be
-         performed in a manner that preserves the bit-level encoding of the
-         source data.
-      b. Repeat, while targetByteIndex < limit
-         i. Let value be GetValueFromBuffer(srcBuffer, srcByteIndex, "Uint8").
-         ii. Perform SetValueInBuffer(targetBuffer, targetByteIndex, "Uint8",
-             value).
-         iii. Set srcByteIndex to srcByteIndex + 1.
-         iv. Set targetByteIndex to targetByteIndex + 1.
-includes: [nans.js, compareArray.js, testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-function body(FloatArray) {
-  var source = new FloatArray(distinctNaNs);
-  var target = new FloatArray(distinctNaNs.length);
-  var sourceBytes, targetBytes;
-
-  target.set(source);
-
-  sourceBytes = new Uint8Array(source.buffer);
-  targetBytes = new Uint8Array(target.buffer);
-
-  assert(compareArray(sourceBytes, targetBytes))
-}
-
-testWithBigIntTypedArrayConstructors(body, [Float32Array, Float64Array]);
diff --git a/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-conversions-sab.js b/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-conversions-sab.js
deleted file mode 100644
index 7cf6f1111189f1ff43569eee83d2a6414f31604c..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-conversions-sab.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// Copyright (C) 2017 Mozilla Corporation. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-%typedarray%.prototype.set-typedarray-offset
-description: >
-  Set converted values from different buffer of different types and different type instances
-includes: [byteConversionValues.js, testBigIntTypedArray.js]
-features: [BigInt, SharedArrayBuffer]
----*/
-
-testTypedArrayConversions(byteConversionValues, function(TA, value, expected, initial) {
-  if (TA === Float64Array || TA === Float32Array || TA === Uint8ClampedArray) {
-    return;
-  }
-  if (TA === Int32Array) {
-    return;
-  }
-
-  var sab, src, target;
-
-  sab = new SharedArrayBuffer(4);
-  src = new Int32Array(sab);
-  src[0] = value;
-  target = new TA([initial]);
-
-  target.set(src);
-
-  assert.sameValue(target[0], expected, "src is SAB-backed");
-
-  sab = new SharedArrayBuffer(4);
-  src = new Int32Array([value]);
-  target = new TA(sab);
-  target[0] = initial;
-
-  target.set(src);
-
-  assert.sameValue(target[0], expected, "target is SAB-backed");
-
-  var sab1 = new SharedArrayBuffer(4);
-  var sab2 = new SharedArrayBuffer(4);
-  src = new Int32Array(sab1);
-  src[0] = value;
-  target = new TA(sab2);
-  target[0] = initial;
-
-  target.set(src);
-
-  assert.sameValue(target[0], expected, "src and target are SAB-backed");
-});
diff --git a/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-conversions.js b/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-conversions.js
deleted file mode 100644
index fbb323f97d802dfe0da249f563c6e28000e4e74f..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-conversions.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-%typedarray%.prototype.set-typedarray-offset
-description: >
-  Set converted values from different buffer and different type instances
-info: |
-  22.2.3.23.2 %TypedArray%.prototype.set(typedArray [ , offset ] )
-
-  1. Assert: typedArray has a [[TypedArrayName]] internal slot. If it does not,
-  the definition in 22.2.3.23.1 applies.
-  ...
-  23. If SameValue(srcBuffer, targetBuffer) is true, then
-    ...
-  24. Else, let srcByteIndex be srcByteOffset.
-  ...
-  27. If SameValue(srcType, targetType) is true, then,
-    ...
-  28. Else,
-    a. Repeat, while targetByteIndex < limit
-      i. Let value be GetValueFromBuffer(srcBuffer, srcByteIndex, srcType).
-      ii. Perform SetValueInBuffer(targetBuffer, targetByteIndex, targetType,
-      value).
-includes: [byteConversionValues.js, testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-testTypedArrayConversions(byteConversionValues, function(TA, value, expected, initial) {
-  if (TA === Float64Array) {
-    return;
-  }
-  var src = new Float64Array([value]);
-  var target = new TA([initial]);
-
-  target.set(src);
-
-  assert.sameValue(target[0], expected);
-});
diff --git a/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-sab.js b/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-sab.js
index 408633ced394c9b7eb25ea3a876a008ad2f634c7..344aceeda0be62efe2df1fff152b98792a8e5214 100644
--- a/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-sab.js
+++ b/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-sab.js
@@ -11,97 +11,93 @@ includes: [testBigIntTypedArray.js, compareArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
-
 testWithBigIntTypedArrayConstructors(function(TA) {
-  var other = Int32Array;
-  var sab = new SharedArrayBuffer(2 * other.BYTES_PER_ELEMENT);
-  var src = new other(sab);
-  src[0] = 42;
-  src[1] = 43;
+  var sab = new SharedArrayBuffer(2 * BigInt64Array.BYTES_PER_ELEMENT);
+  var src = new BigInt64Array(sab);
+  src[0] = 42n;
+  src[1] = 43n;
   var sample, result;
 
-  sample = new TA([1, 2, 3, 4]);
+  sample = new TA([1n, 2n, 3n, 4n]);
   result = sample.set(src, 0);
-  assert(compareArray(sample, [42, 43, 3, 4]), "src is SAB-backed, offset: 0, result: " + sample);
+  assert(compareArray(sample, [42n, 43n, 3n, 4n]), "src is SAB-backed, offset: 0, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
-  sample = new TA([1, 2, 3, 4]);
+  sample = new TA([1n, 2n, 3n, 4n]);
   result = sample.set(src, 1);
-  assert(compareArray(sample, [1, 42, 43, 4]), "src is SAB-backed, offset: 1, result: " + sample);
+  assert(compareArray(sample, [1n, 42n, 43n, 4n]), "src is SAB-backed, offset: 1, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
-  sample = new TA([1, 2, 3, 4]);
+  sample = new TA([1n, 2n, 3n, 4n]);
   result = sample.set(src, 2);
-  assert(compareArray(sample, [1, 2, 42, 43]), "src is SAB-backed, offset: 2, result: " + sample);
+  assert(compareArray(sample, [1n, 2n, 42n, 43n]), "src is SAB-backed, offset: 2, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
-
-  src = new other([42, 43]);
+  src = new BigInt64Array([42n, 43n]);
 
   sab = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   result = sample.set(src, 0);
-  assert(compareArray(sample, [42, 43, 3, 4]), "sample is SAB-backed, offset: 0, result: " + sample);
+  assert(compareArray(sample, [42n, 43n, 3n, 4n]), "sample is SAB-backed, offset: 0, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
   sab = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   result = sample.set(src, 1);
-  assert(compareArray(sample, [1, 42, 43, 4]), "sample is SAB-backed, offset: 1, result: " + sample);
+  assert(compareArray(sample, [1n, 42n, 43n, 4n]), "sample is SAB-backed, offset: 1, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
   sab = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   result = sample.set(src, 2);
-  assert(compareArray(sample, [1, 2, 42, 43]), "sample is SAB-backed, offset: 2, result: " + sample);
+  assert(compareArray(sample, [1n, 2n, 42n, 43n]), "sample is SAB-backed, offset: 2, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
-  var sab1 = new SharedArrayBuffer(2 * other.BYTES_PER_ELEMENT);
-  src = new other(sab1);
-  src[0] = 42;
-  src[1] = 43;
+  var sab1 = new SharedArrayBuffer(2 * BigInt64Array.BYTES_PER_ELEMENT);
+  src = new BigInt64Array(sab1);
+  src[0] = 42n;
+  src[1] = 43n;
 
   var sab2;
   sab2 = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab2);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   result = sample.set(src, 0);
-  assert(compareArray(sample, [42, 43, 3, 4]), "src and sample are SAB-backed, offset: 0, result: " + sample);
+  assert(compareArray(sample, [42n, 43n, 3n, 4n]), "src and sample are SAB-backed, offset: 0, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
   sab2 = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab2);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   result = sample.set(src, 1);
-  assert(compareArray(sample, [1, 42, 43, 4]), "src and sample are SAB-backed, offset: 1, result: " + sample);
+  assert(compareArray(sample, [1n, 42n, 43n, 4n]), "src and sample are SAB-backed, offset: 1, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
   sab2 = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab2);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   result = sample.set(src, 2);
-  assert(compareArray(sample, [1, 2, 42, 43]), "src and sample are SAB-backed, offset: 2, result: " + sample);
+  assert(compareArray(sample, [1n, 2n, 42n, 43n]), "src and sample are SAB-backed, offset: 2, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
-}, int_views);
+});
diff --git a/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-same-type-sab.js b/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-same-type-sab.js
index 6e1279ea4c26d4ca1ee5b23646bb70bc3cdd51e0..f179ba052cd8c6d7f823158bc48109699f202b56 100644
--- a/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-same-type-sab.js
+++ b/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-same-type-sab.js
@@ -10,98 +10,95 @@ includes: [testBigIntTypedArray.js, compareArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
-
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sample, result;
 
   var sab = new SharedArrayBuffer(2 * TA.BYTES_PER_ELEMENT);
   var src = new TA(sab);
-  src[0] = 42;
-  src[1] = 43;
+  src[0] = 42n;
+  src[1] = 43n;
 
-  sample = new TA([1, 2, 3, 4]);
+  sample = new TA([1n, 2n, 3n, 4n]);
   result = sample.set(src, 1);
-  assert(compareArray(sample, [1, 42, 43, 4]), "src is SAB-backed, offset: 1, result: " + sample);
+  assert(compareArray(sample, [1n, 42n, 43n, 4n]), "src is SAB-backed, offset: 1, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
-  sample = new TA([1, 2, 3, 4]);
+  sample = new TA([1n, 2n, 3n, 4n]);
   result = sample.set(src, 0);
-  assert(compareArray(sample, [42, 43, 3, 4]), "src is SAB-backed, offset: 0, result: " + sample);
+  assert(compareArray(sample, [42n, 43n, 3n, 4n]), "src is SAB-backed, offset: 0, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
-  sample = new TA([1, 2, 3, 4]);
+  sample = new TA([1n, 2n, 3n, 4n]);
   result = sample.set(src, 2);
-  assert(compareArray(sample, [1, 2, 42, 43]), "src is SAB-backed, offset: 2, result: " + sample);
+  assert(compareArray(sample, [1n, 2n, 42n, 43n]), "src is SAB-backed, offset: 2, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
-
-  src = new TA([42, 43]);
+  src = new TA([42n, 43n]);
 
   sab = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   result = sample.set(src, 1);
-  assert(compareArray(sample, [1, 42, 43, 4]), "sample is SAB-backed, offset: 1, result: " + sample);
+  assert(compareArray(sample, [1n, 42n, 43n, 4n]), "sample is SAB-backed, offset: 1, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
   sab = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   result = sample.set(src, 0);
-  assert(compareArray(sample, [42, 43, 3, 4]), "sample is SAB-backed, offset: 0, result: " + sample);
+  assert(compareArray(sample, [42n, 43n, 3n, 4n]), "sample is SAB-backed, offset: 0, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
   sab = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   result = sample.set(src, 2);
-  assert(compareArray(sample, [1, 2, 42, 43]), "sample is SAB-backed, offset: 2, result: " + sample);
+  assert(compareArray(sample, [1n, 2n, 42n, 43n]), "sample is SAB-backed, offset: 2, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
 
   var sab1 = new SharedArrayBuffer(2 * TA.BYTES_PER_ELEMENT);
   src = new TA(sab1);
-  src[0] = 42;
-  src[1] = 43;
+  src[0] = 42n;
+  src[1] = 43n;
 
   var sab2;
   sab2 = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab2);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   result = sample.set(src, 1);
-  assert(compareArray(sample, [1, 42, 43, 4]), "src and sample are SAB-backed, offset: 1, result: " + sample);
+  assert(compareArray(sample, [1n, 42n, 43n, 4n]), "src and sample are SAB-backed, offset: 1, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
   sab2 = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab2);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   result = sample.set(src, 0);
-  assert(compareArray(sample, [42, 43, 3, 4]), "src and sample are SAB-backed, offset: 0, result: " + sample);
+  assert(compareArray(sample, [42n, 43n, 3n, 4n]), "src and sample are SAB-backed, offset: 0, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
   sab2 = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab2);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   result = sample.set(src, 2);
-  assert(compareArray(sample, [1, 2, 42, 43]), "src and sample are SAB-backed, offset: 2, result: " + sample);
+  assert(compareArray(sample, [1n, 2n, 42n, 43n]), "src and sample are SAB-backed, offset: 2, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
-}, int_views);
+});
diff --git a/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-same-buffer-same-type-sab.js b/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-same-buffer-same-type-sab.js
index 86c686e3b2d55b9d074f42d633782205ed7cc8c7..7e60fba13934b32249b25d8bd806cdf5cd6a4ca9 100644
--- a/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-same-buffer-same-type-sab.js
+++ b/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-same-buffer-same-type-sab.js
@@ -11,41 +11,39 @@ includes: [testBigIntTypedArray.js, compareArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
-
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sample, src, result, sab;
 
   sab = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   src = new TA(sample.buffer, 0, 2);
   result = sample.set(src, 0);
-  assert(compareArray(sample, [1, 2, 3, 4]), "offset: 0, result: " + sample);
+  assert(compareArray(sample, [1n, 2n, 3n, 4n]), "offset: 0, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
   sab = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   src = new TA(sample.buffer, 0, 2);
   result = sample.set(src, 1);
-  assert(compareArray(sample, [1, 1, 2, 4]), "offset: 1, result: " + sample);
+  assert(compareArray(sample, [1n, 1n, 2n, 4n]), "offset: 1, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
 
   sab = new SharedArrayBuffer(4 * TA.BYTES_PER_ELEMENT);
   sample = new TA(sab);
-  sample[0] = 1;
-  sample[1] = 2;
-  sample[2] = 3;
-  sample[3] = 4;
+  sample[0] = 1n;
+  sample[1] = 2n;
+  sample[2] = 3n;
+  sample[3] = 4n;
   src = new TA(sample.buffer, 0, 2);
   result = sample.set(src, 2);
-  assert(compareArray(sample, [1, 2, 1, 2]), "offset: 2, result: " + sample);
+  assert(compareArray(sample, [1n, 2n, 1n, 2n]), "offset: 2, result: " + sample);
   assert.sameValue(result, undefined, "returns undefined");
-}, int_views);
+});
diff --git a/test/built-ins/TypedArray/prototype/slice/BigInt/bit-precision.js b/test/built-ins/TypedArray/prototype/slice/BigInt/bit-precision.js
deleted file mode 100644
index e27565331780d98b2fccb20dd8d74d678eda5d9f..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArray/prototype/slice/BigInt/bit-precision.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-%typedarray%.prototype.slice
-description: Preservation of bit-level encoding
-info: |
-  [...]
-  15. Else if count > 0, then
-      [...]
-      e. NOTE: If srcType and targetType are the same, the transfer must be
-         performed in a manner that preserves the bit-level encoding of the
-         source data.
-      f. Let srcByteOffet be the value of O's [[ByteOffset]] internal slot.
-      g. Let targetByteIndex be A's [[ByteOffset]] internal slot.
-      h. Let srcByteIndex be (k × elementSize) + srcByteOffet.
-      i. Let limit be targetByteIndex + count × elementSize.
-      j. Repeat, while targetByteIndex < limit
-         i. Let value be GetValueFromBuffer(srcBuffer, srcByteIndex, "Uint8").
-         ii. Perform SetValueInBuffer(targetBuffer, targetByteIndex, "Uint8",
-             value).
-         iii. Increase srcByteIndex by 1.
-         iv. Increase targetByteIndex by 1.
-includes: [nans.js, compareArray.js, testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-function body(FloatArray) {
-  var subject = new FloatArray(distinctNaNs);
-  var sliced, subjectBytes, slicedBytes;
-
-  sliced = subject.slice();
-
-  subjectBytes = new Uint8Array(subject.buffer);
-  slicedBytes = new Uint8Array(sliced.buffer);
-
-  assert(compareArray(subjectBytes, slicedBytes));
-}
-
-testWithBigIntTypedArrayConstructors(body, [Float32Array, Float64Array]);
diff --git a/test/built-ins/TypedArray/prototype/slice/BigInt/detached-buffer-custom-ctor-other-targettype.js b/test/built-ins/TypedArray/prototype/slice/BigInt/detached-buffer-custom-ctor-other-targettype.js
index 5dee0faf73c2d05e1daa8a42c2faf77457077e84..c81ad9ab89853a6d9e1761782d90c5663bbaaaf6 100644
--- a/test/built-ins/TypedArray/prototype/slice/BigInt/detached-buffer-custom-ctor-other-targettype.js
+++ b/test/built-ins/TypedArray/prototype/slice/BigInt/detached-buffer-custom-ctor-other-targettype.js
@@ -27,7 +27,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   sample.constructor = {};
   sample.constructor[Symbol.species] = function(count) {
-    var other = TA === Int8Array ? Int16Array : Int8Array;
+    var other = TA === BigInt64Array ? BigUint64Array : BigInt64Array;
     $DETACHBUFFER(sample.buffer);
     return new other(count);
   };
diff --git a/test/built-ins/TypedArray/prototype/slice/BigInt/detached-buffer-zero-count-custom-ctor-other-targettype.js b/test/built-ins/TypedArray/prototype/slice/BigInt/detached-buffer-zero-count-custom-ctor-other-targettype.js
index adcd18b71e1c442edcbb25f17f5a1af96179d1e7..851468f93fae59929974d3b4c0da2dab1fe554b1 100644
--- a/test/built-ins/TypedArray/prototype/slice/BigInt/detached-buffer-zero-count-custom-ctor-other-targettype.js
+++ b/test/built-ins/TypedArray/prototype/slice/BigInt/detached-buffer-zero-count-custom-ctor-other-targettype.js
@@ -27,7 +27,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   var sample, result, other;
   var ctor = {};
   ctor[Symbol.species] = function(count) {
-    other = TA === Int8Array ? Int16Array : Int8Array;
+    other = TA === BigInt64Array ? BigUint64Array : BigInt64Array;
     $DETACHBUFFER(sample.buffer);
     return new other(count);
   };
diff --git a/test/built-ins/TypedArray/prototype/slice/BigInt/speciesctor-get-species-custom-ctor-returns-another-instance.js b/test/built-ins/TypedArray/prototype/slice/BigInt/speciesctor-get-species-custom-ctor-returns-another-instance.js
index 81be8cd76dd7a95e31df948acad9d2175c158344..bfd0fff4f315f544e02583b693ee643d395ff8bb 100644
--- a/test/built-ins/TypedArray/prototype/slice/BigInt/speciesctor-get-species-custom-ctor-returns-another-instance.js
+++ b/test/built-ins/TypedArray/prototype/slice/BigInt/speciesctor-get-species-custom-ctor-returns-another-instance.js
@@ -38,7 +38,7 @@ features: [BigInt, Symbol.species, TypedArray]
 
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA([40n]);
-  var other = new Int8Array([1, 0, 1]);
+  var other = new BigInt64Array([1n, 0n, 1n]);
   var result;
 
   sample.constructor = {};
@@ -49,5 +49,5 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   result = sample.slice(0, 0);
 
   assert.sameValue(result, other, "returned another typedarray");
-  assert(compareArray(result, [1, 0, 1]), "the returned object is preserved");
+  assert(compareArray(result, [1n, 0n, 1n]), "the returned object is preserved");
 });
diff --git a/test/built-ins/TypedArray/prototype/sort/BigInt/sorted-values-nan.js b/test/built-ins/TypedArray/prototype/sort/BigInt/sorted-values-nan.js
deleted file mode 100644
index 7a553b13ee32a8140696cacbcc72e80935a6b16b..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArray/prototype/sort/BigInt/sorted-values-nan.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-%typedarray%.prototype.sort
-description: Sort values to numeric ascending order
-info: |
-  22.2.3.26 %TypedArray%.prototype.sort ( comparefn )
-
-  When the TypedArray SortCompare abstract operation is called with two
-  arguments x and y, the following steps are taken:
-
-  ...
-
-  NOTE: Because NaN always compares greater than any other value, NaN property
-  values always sort to the end of the result when comparefn is not provided.
-includes: [testBigIntTypedArray.js, compareArray.js]
-features: [BigInt, TypedArray]
----*/
-
-testWithBigIntTypedArrayConstructors(function(TA) {
-  var sample;
-
-  sample = new TA([2, NaN, NaN, 0, 1]).sort();
-  assert.sameValue(sample[0], 0, "#1 [0]");
-  assert.sameValue(sample[1], 1, "#1 [1]");
-  assert.sameValue(sample[2], 2, "#1 [2]");
-  assert.sameValue(sample[3], NaN, "#1 [3]");
-  assert.sameValue(sample[4], NaN, "#1 [4]");
-
-  sample = new TA([3, NaN, NaN, Infinity, 0, -Infinity, 2]).sort();
-  assert.sameValue(sample[0], -Infinity, "#2 [0]");
-  assert.sameValue(sample[1], 0, "#2 [1]");
-  assert.sameValue(sample[2], 2, "#2 [2]");
-  assert.sameValue(sample[3], 3, "#2 [3]");
-  assert.sameValue(sample[4], Infinity, "#2 [4]");
-  assert.sameValue(sample[5], NaN, "#2 [5]");
-  assert.sameValue(sample[6], NaN, "#2 [6]");
-}, [Float64Array, Float32Array]);
diff --git a/test/built-ins/TypedArray/prototype/sort/BigInt/sorted-values.js b/test/built-ins/TypedArray/prototype/sort/BigInt/sorted-values.js
index 57b49155182bb9b89fef3c5841ffc5a02c9a69f7..79b7e54691d53666b3f16699017a6e617ebb8fb7 100644
--- a/test/built-ins/TypedArray/prototype/sort/BigInt/sorted-values.js
+++ b/test/built-ins/TypedArray/prototype/sort/BigInt/sorted-values.js
@@ -25,29 +25,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   sample = new TA([3n, 4n, 3n, 1n, 0n, 1n, 2n]).sort();
   assert(compareArray(sample, [0n, 1n, 1n, 2n, 3n, 3n, 4n]), "repeating numbers");
-
-  sample = new TA([1n, 0n, -0n, 2n]).sort();
-  assert(compareArray(sample, [0n, 0n, 1n, 2n]), "0s");
 });
 
-testWithBigIntTypedArrayConstructors(function(TA) {
-  var sample = new TA([-4, 3, 4, -3, 2, -2, 1, 0]).sort();
-  assert(compareArray(sample, [-4, -3, -2, 0, 1, 2, 3, 4]), "negative values");
-}, [Float64Array, Float32Array, Int8Array, Int16Array, Int32Array]);
-
-testWithBigIntTypedArrayConstructors(function(TA) {
-  var sample;
-
-  sample = new TA([0.5, 0, 1.5, 1]).sort();
-  assert(compareArray(sample, [0, 0.5, 1, 1.5]), "non integers");
-
-  sample = new TA([0.5, 0, 1.5, -0.5, -1, -1.5, 1]).sort();
-  assert(compareArray(sample, [-1.5, -1, -0.5, 0, 0.5, 1, 1.5]), "non integers + negatives");
-
-  sample = new TA([1, 0, -0, 2]).sort();
-  assert(compareArray(sample, [0, 0, 1, 2]), "0 and -0");
-
-  sample = new TA([3, 4, Infinity, -Infinity, 1, 2]).sort();
-  assert(compareArray(sample, [-Infinity, 1, 2, 3, 4, Infinity]), "infinities");
-
-}, [Float64Array, Float32Array]);
+var sample = new BigInt64Array([-4n, 3n, 4n, -3n, 2n, -2n, 1n, 0n]).sort();
+assert(compareArray(sample, [-4n, -3n, -2n, 0n, 1n, 2n, 3n, 4n]), "negative values");
diff --git a/test/built-ins/TypedArray/prototype/subarray/BigInt/speciesctor-get-species-custom-ctor-returns-another-instance.js b/test/built-ins/TypedArray/prototype/subarray/BigInt/speciesctor-get-species-custom-ctor-returns-another-instance.js
index ee537263ac348e178ec99beb94d78c458dc6061a..0aa28e822ad8043a78817c4a040b9ff475883de9 100644
--- a/test/built-ins/TypedArray/prototype/subarray/BigInt/speciesctor-get-species-custom-ctor-returns-another-instance.js
+++ b/test/built-ins/TypedArray/prototype/subarray/BigInt/speciesctor-get-species-custom-ctor-returns-another-instance.js
@@ -37,7 +37,7 @@ features: [BigInt, Symbol.species, TypedArray]
 
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA([40n]);
-  var other = new Int8Array([1, 0, 1]);
+  var other = new BigInt64Array([1n, 0n, 1n]);
   var result;
 
   sample.constructor = {};
@@ -48,5 +48,5 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   result = sample.subarray(0, 0);
 
   assert.sameValue(result, other, "returned another typedarray");
-  assert(compareArray(result, [1, 0, 1]), "the returned object is preserved");
+  assert(compareArray(result, [1n, 0n, 1n]), "the returned object is preserved");
 });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/bufferbyteoffset-throws-from-modulo-element-size-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/bufferbyteoffset-throws-from-modulo-element-size-sab.js
index 2f86cd9c28ea101352542f1b9fc467374d7bafee..932cfb3c97096b3b90e53575a017814023286f1d 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/bufferbyteoffset-throws-from-modulo-element-size-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/bufferbyteoffset-throws-from-modulo-element-size-sab.js
@@ -22,7 +22,7 @@ features: [BigInt, SharedArrayBuffer, TypedArray]
 
 var buffer = new SharedArrayBuffer(1);
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   if (TA.BYTES_PER_ELEMENT === 1) {
     // Impossible to trigger this step here.
     return;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/bufferbyteoffset-throws-from-modulo-element-size.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/bufferbyteoffset-throws-from-modulo-element-size.js
index 67f3f887170dc93adc55e9531fd47fa5cca79fa3..f5f71f3d2a88e94d77dccc76e32cc0e831e637e0 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/bufferbyteoffset-throws-from-modulo-element-size.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/bufferbyteoffset-throws-from-modulo-element-size.js
@@ -21,7 +21,7 @@ features: [BigInt, TypedArray]
 
 var buffer = new ArrayBuffer(1);
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   if (TA.BYTES_PER_ELEMENT === 1) {
     // Impossible to trigger this step here.
     return;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-throws-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-throws-sab.js
index 9c590f8595aa376309969577c8eae3c0bf63dd70..bd376cb79ce6e319e6a987e24070d7b3dc4ba279 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-throws-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-throws-sab.js
@@ -22,7 +22,7 @@ features: [BigInt, SharedArrayBuffer, TypedArray]
 
 var buffer = new SharedArrayBuffer(8);
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(RangeError, function() {
     new TA(buffer, -1);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-throws.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-throws.js
index d0c70d6690e9c58a6b9853962efa56abaa71a895..dfd6c4bc8735ce4184dfc766acc03919bc47b2bf 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-throws.js
@@ -21,7 +21,7 @@ features: [BigInt, TypedArray]
 
 var buffer = new ArrayBuffer(8);
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(RangeError, function() {
     new TA(buffer, -1);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-zero-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-zero-sab.js
index bfae5fa4c12b544cc946778ad3552f03f4cacbca..777a933f07d1992c355ada40d3506486645e0d94 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-zero-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-zero-sab.js
@@ -17,7 +17,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TAConstructor) {
+testWithBigIntTypedArrayConstructors(function(TAConstructor) {
   var typedArray = new TAConstructor(new SharedArrayBuffer(8), -0);
   assert.sameValue(typedArray.byteOffset, +0);
 });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-zero.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-zero.js
index 14cca25849328226488eed83a36e5aa446e1b967..4daa6aee12cfbbcc84187e15feb061cfb13cce96 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-zero.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-negative-zero.js
@@ -17,7 +17,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TAConstructor) {
+testWithBigIntTypedArrayConstructors(function(TAConstructor) {
   var typedArray = new TAConstructor(new ArrayBuffer(8), -0);
   assert.sameValue(typedArray.byteOffset, +0);
 });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-symbol-throws-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-symbol-throws-sab.js
index cef10b698485e0effb82c002e9d968ff45aed9dd..82cbc1ab9450d93b5031407aa7efce7b5f7c8269 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-symbol-throws-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-symbol-throws-sab.js
@@ -22,7 +22,7 @@ features: [BigInt, Symbol, SharedArrayBuffer, TypedArray]
 var byteOffset = Symbol("1");
 var buffer = new SharedArrayBuffer(8);
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     new TA(buffer, byteOffset);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-symbol-throws.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-symbol-throws.js
index a3c12fd016e7e6e564bc72f4836296aece344a8b..cda2f9ae2846922b09c5f6baf3aba414af3b215c 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-symbol-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-is-symbol-throws.js
@@ -21,7 +21,7 @@ features: [BigInt, Symbol, TypedArray]
 var byteOffset = Symbol("1");
 var buffer = new ArrayBuffer(8);
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     new TA(buffer, byteOffset);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-throws-from-modulo-element-size-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-throws-from-modulo-element-size-sab.js
index b70167e3b78eeacf296aac38472065676ddc0280..7e9b40e66a3a32eb34d292048f87c66a3408b712 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-throws-from-modulo-element-size-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-throws-from-modulo-element-size-sab.js
@@ -21,7 +21,7 @@ features: [BigInt, SharedArrayBuffer, TypedArray]
 
 var buffer = new SharedArrayBuffer(8);
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   if (TA.BYTES_PER_ELEMENT === 1) {
     // Impossible to trigger this step here.
     return;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-throws-from-modulo-element-size.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-throws-from-modulo-element-size.js
index 2a3a79303c55e87fa2b5625b5791b5e48047a391..e511bc394578a567c770835ee13d1ac648cd5cd4 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-throws-from-modulo-element-size.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-throws-from-modulo-element-size.js
@@ -20,7 +20,7 @@ features: [BigInt, TypedArray]
 
 var buffer = new ArrayBuffer(8);
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   if (TA.BYTES_PER_ELEMENT === 1) {
     // Impossible to trigger this step here.
     return;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-to-number-detachbuffer.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-to-number-detachbuffer.js
index 89430e6ab071136005f7a21909c02c557b3cfb58..7c44a5389c49627fcae7ff1581a54ea19e9dd8d4 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-to-number-detachbuffer.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-to-number-detachbuffer.js
@@ -13,7 +13,7 @@ includes: [testBigIntTypedArray.js, detachArrayBuffer.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var offset = TA.BYTES_PER_ELEMENT;
   var buffer = new ArrayBuffer(3 * offset);
   var byteOffset = { valueOf() { $DETACHBUFFER(buffer); return offset; } };
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-to-number-throws-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-to-number-throws-sab.js
index a80143c266eb1ee027c6b120f714571250c7b071..a79626847f303a3d62a44f73d8b1c0a562eae373 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-to-number-throws-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-to-number-throws-sab.js
@@ -26,7 +26,7 @@ var byteOffset = {
   }
 };
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(Test262Error, function() {
     new TA(buffer, byteOffset);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-to-number-throws.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-to-number-throws.js
index f30cc25843964529cb95e7e7b39f6e8ed2134b41..19a6095cb3de63556d3e2c6c0db76b05c713856a 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-to-number-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/byteoffset-to-number-throws.js
@@ -25,7 +25,7 @@ var byteOffset = {
   }
 };
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(Test262Error, function() {
     new TA(buffer, byteOffset);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/custom-proto-access-throws-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/custom-proto-access-throws-sab.js
index fbb038d25797159f8279e9057ffedd55ea7288fa..f6ce2fdbcb3158d10527d66631b691f38295afd9 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/custom-proto-access-throws-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/custom-proto-access-throws-sab.js
@@ -41,7 +41,7 @@ Object.defineProperty(newTarget, "prototype", {
   }
 });
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(Test262Error, function() {
     Reflect.construct(TA, [buffer], newTarget);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/custom-proto-access-throws.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/custom-proto-access-throws.js
index 88c98eebf2d17c815048e40a25555b4b8c377192..e30dc82f973cdc54a5e7df829989d351166d1b4c 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/custom-proto-access-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/custom-proto-access-throws.js
@@ -40,7 +40,7 @@ Object.defineProperty(newTarget, "prototype", {
   }
 });
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(Test262Error, function() {
     Reflect.construct(TA, [buffer], newTarget);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length-and-offset-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length-and-offset-sab.js
index 2f153de63d1dd02318052d2da26798db75061ea9..0c86ffd725cd3b4fa757b81e6ed0ff8264cc62fa 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length-and-offset-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length-and-offset-sab.js
@@ -15,7 +15,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var offset = TA.BYTES_PER_ELEMENT;
   var buffer = new SharedArrayBuffer(3 * offset);
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length-and-offset.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length-and-offset.js
index 7e27248f8121af4d816dd5e3f8a141c2174f43a6..eb2b421877dec4225a50e1879a8492e1604a034b 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length-and-offset.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length-and-offset.js
@@ -14,7 +14,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var offset = TA.BYTES_PER_ELEMENT;
   var buffer = new ArrayBuffer(3 * offset);
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length-sab.js
index 9168589393ff5ffc781d7b82925ae42416af964b..a47347e67f1f83102d069a70a95ab38247aefbd3 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length-sab.js
@@ -16,7 +16,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var bpe = TA.BYTES_PER_ELEMENT;
   var length = 4;
   var buffer = new SharedArrayBuffer(bpe * length * 4);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length.js
index 711aeb53a3f292ce113a3463dab637dc2983c03b..038c3e0baf14bade8f5f8f5d524fc37a319ec347 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-length.js
@@ -15,7 +15,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var bpe = TA.BYTES_PER_ELEMENT;
   var length = 4;
   var buffer = new ArrayBuffer(bpe * length * 4);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-negative-length-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-negative-length-sab.js
index 2138f4a81939c23d8e576cf669633b4bc2817f90..0a87ac33360c6be2bbe23d4f642e748f2c74aeaf 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-negative-length-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-negative-length-sab.js
@@ -18,7 +18,7 @@ features: [BigInt, SharedArrayBuffer, TypedArray]
 
 var buffer = new SharedArrayBuffer(16);
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(RangeError, function() {
     new TA(buffer, 0, -1);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-negative-length.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-negative-length.js
index f422a54d55e3d028c2c572ff41324648a83bea1c..c4773ccaa2835a57b7584beef3a830cdaa04a656 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-negative-length.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-negative-length.js
@@ -17,7 +17,7 @@ features: [BigInt, TypedArray]
 
 var buffer = new ArrayBuffer(16);
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(RangeError, function() {
     new TA(buffer, 0, -1);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-offset-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-offset-sab.js
index 8cf9c14fe33e39904fd80379595e1e843a9e592b..28fa1938ef9229f93e53969c72b54fbf2eee9b7d 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-offset-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-offset-sab.js
@@ -15,7 +15,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var bpe = TA.BYTES_PER_ELEMENT;
   var buffer = new SharedArrayBuffer(bpe * 4);
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-offset.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-offset.js
index a8005eb0bb20b8b31b9a1bc378161a2aa25803ce..1dc932cb4adc8da9b13d17b14499738bc5e0cecb 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-offset.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/defined-offset.js
@@ -14,7 +14,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var bpe = TA.BYTES_PER_ELEMENT;
   var buffer = new ArrayBuffer(bpe * 4);
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/detachedbuffer.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/detachedbuffer.js
index 26cf08ae9c0389b6ccb077f9435564705a54ef40..3e01105b36e18d12f3b4385dfff4aeaed0bc5612 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/detachedbuffer.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/detachedbuffer.js
@@ -13,7 +13,7 @@ includes: [testBigIntTypedArray.js, detachArrayBuffer.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var offset = TA.BYTES_PER_ELEMENT;
   var buffer = new ArrayBuffer(3 * offset);
   $DETACHBUFFER(buffer);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-length-throws-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-length-throws-sab.js
index 64d72646694981eb03997b01f1c30f0c1ee27270..a324f6feb3bb9c461f8b2fcd683b964598a1e7ed 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-length-throws-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-length-throws-sab.js
@@ -22,7 +22,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var bpe = TA.BYTES_PER_ELEMENT;
   var buffer = new SharedArrayBuffer(bpe);
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-length-throws.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-length-throws.js
index 1f2378625c4e53e5d1e59e3f48cffdd89d758f6c..ed156f400f689b94050ba89fb8514d767e9ba82e 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-length-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-length-throws.js
@@ -21,7 +21,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var bpe = TA.BYTES_PER_ELEMENT;
   var buffer = new ArrayBuffer(bpe);
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-offset-throws-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-offset-throws-sab.js
index 2b78d7926569d08815fe504af35563be04746c12..090afac5a0b6e0b9403cd0cbe7f2942c0e22e5af 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-offset-throws-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-offset-throws-sab.js
@@ -22,7 +22,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var bpe = TA.BYTES_PER_ELEMENT;
   var buffer = new SharedArrayBuffer(bpe);
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-offset-throws.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-offset-throws.js
index 81454fba77fc557e025e505c53a8d194f5906751..6e09a341b3355b0866687475c5c801dcc237dd29 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-offset-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/excessive-offset-throws.js
@@ -21,7 +21,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var bpe = TA.BYTES_PER_ELEMENT;
   var buffer = new ArrayBuffer(bpe);
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget-sab.js
index 7b3b9c9e21938a1524832b99233d7c8c420cc0d3..10f1c12faf7ad0d514d4a0427b9e20ddc955082e 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget-sab.js
@@ -19,7 +19,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var buffer = new SharedArrayBuffer(4);
   assert.throws(TypeError, function() {
     TA(buffer);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget.js
index 0301136c0b59feff9e87be116924d1a4c6167969..c746dc188930d4cacf4f3bb101f5dc83b860749d 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget.js
@@ -18,7 +18,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var buffer = new ArrayBuffer(4);
   assert.throws(TypeError, function() {
     TA(buffer);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/is-referenced-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/is-referenced-sab.js
index bdff85d0264255e5587e124fe0b33f370f4b5666..34efb070f77b60dcff24606d3a7b14a9f898d8ac 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/is-referenced-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/is-referenced-sab.js
@@ -19,7 +19,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var bpe = TA.BYTES_PER_ELEMENT;
 
   var buffer = new SharedArrayBuffer(bpe);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/is-referenced.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/is-referenced.js
index 1b609117f238d30bd377fd96bfa1308c87db8fd9..720e8719144bdc6d2f056c29b1052a8bba0227d2 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/is-referenced.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/is-referenced.js
@@ -18,7 +18,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var bpe = TA.BYTES_PER_ELEMENT;
 
   var buffer = new ArrayBuffer(bpe);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-access-throws-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-access-throws-sab.js
index 7921015663a7a40be17e2ae80e4741fad35cfeaa..1e38324b347d23ffe065ba10cfb4676565018aa3 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-access-throws-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-access-throws-sab.js
@@ -27,7 +27,7 @@ var len = {
   }
 };
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(Test262Error, function() {
     new TA(buffer, 0, len);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-access-throws.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-access-throws.js
index 373311d0c942f71e796575852bff08904e9ea7ec..a618946fceedc84bf89360cd8a29930f8869a62d 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-access-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-access-throws.js
@@ -26,7 +26,7 @@ var len = {
   }
 };
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(Test262Error, function() {
     new TA(buffer, 0, len);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-is-symbol-throws-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-is-symbol-throws-sab.js
index d0619a3f892cbf484216015a34adca4764e20a7f..10518511c55cce2c14575ad69f82f1661cb32d8d 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-is-symbol-throws-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-is-symbol-throws-sab.js
@@ -23,7 +23,7 @@ features: [BigInt, Symbol, SharedArrayBuffer, TypedArray]
 var buffer = new SharedArrayBuffer(8);
 var s = Symbol("1");
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     new TA(buffer, 0, s);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-is-symbol-throws.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-is-symbol-throws.js
index 978e01e7d8c4109ac8fff8d3edc2ac0947c18a04..a1d1e1340f25495726302c27d1364eb6ace70292 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-is-symbol-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-is-symbol-throws.js
@@ -22,7 +22,7 @@ features: [BigInt, Symbol, TypedArray]
 var buffer = new ArrayBuffer(8);
 var s = Symbol("1");
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     new TA(buffer, 0, s);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-to-number-detachbuffer.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-to-number-detachbuffer.js
index 9bf8105f0e7388de18023933bdd3531cf06576e3..e7bc719de03b03e55ea0030cd77c3e4d83ca3c32 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-to-number-detachbuffer.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/length-to-number-detachbuffer.js
@@ -13,7 +13,7 @@ includes: [testBigIntTypedArray.js, detachArrayBuffer.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var offset = TA.BYTES_PER_ELEMENT;
   var buffer = new ArrayBuffer(3 * offset);
   var length = { valueOf() { $DETACHBUFFER(buffer); return 1; } };
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/new-instance-extensibility-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/new-instance-extensibility-sab.js
index 5d5976424346edbb60af568f5e06fdad96bee068..b918f788f5d80d194a325c4417d9862269e4f0a3 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/new-instance-extensibility-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/new-instance-extensibility-sab.js
@@ -30,7 +30,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var buffer = new SharedArrayBuffer(8);
   var sample = new TA(buffer);
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/new-instance-extensibility.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/new-instance-extensibility.js
index 6f7c8b7f48a7e76f47b235ecb33a2482b80d723a..8ffd2d7e7a8d8aa59c93ef40a3dcd92a89bd975f 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/new-instance-extensibility.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/new-instance-extensibility.js
@@ -29,7 +29,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var buffer = new ArrayBuffer(8);
   var sample = new TA(buffer);
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/proto-from-ctor-realm-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/proto-from-ctor-realm-sab.js
index 86374357e33a18d7e935937590cfe4248d264be8..f1394f92290f23480b9fd0ad603edb54d484d57b 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/proto-from-ctor-realm-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/proto-from-ctor-realm-sab.js
@@ -31,7 +31,7 @@ var other = $262.createRealm().global;
 var C = new other.Function();
 C.prototype = null;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [new SharedArrayBuffer(8)], C);
 
   assert.sameValue(Object.getPrototypeOf(ta), other[TA.name].prototype);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/proto-from-ctor-realm.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/proto-from-ctor-realm.js
index 8e5f4b12f23db788601f6b4a49c7461dc0df67e7..787a8cc7f90e9370f9ef1b38d4fc18f2930bfa35 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/proto-from-ctor-realm.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/proto-from-ctor-realm.js
@@ -30,7 +30,7 @@ var other = $262.createRealm().global;
 var C = new other.Function();
 C.prototype = null;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [new ArrayBuffer(8)], C);
 
   assert.sameValue(Object.getPrototypeOf(ta), other[TA.name].prototype);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/returns-new-instance-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/returns-new-instance-sab.js
index 4067b836f3d6df2d5ab305d3dabb7e74f4188228..5b8d3e710f3705d624e63a3d052c0fe0abd7f0b5 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/returns-new-instance-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/returns-new-instance-sab.js
@@ -15,7 +15,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var bpe = TA.BYTES_PER_ELEMENT;
 
   var buffer1 = new SharedArrayBuffer(bpe * 4);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/returns-new-instance.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/returns-new-instance.js
index d6fb802b93b5af4051f29c3049b2e9643fa49d38..902aa2f23f1493f7f214ff35a927794e6e179228 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/returns-new-instance.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/returns-new-instance.js
@@ -14,7 +14,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var bpe = TA.BYTES_PER_ELEMENT;
 
   var buffer1 = new ArrayBuffer(bpe * 4);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-bytelength-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-bytelength-sab.js
index 3a9d2490ef82854ab825558983ab14b6d02be3b8..af55dd163e9d4b885c1f7929e342a03332bc9a15 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-bytelength-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-bytelength-sab.js
@@ -55,7 +55,7 @@ var items = [
   [-0.99999, 0, "-0.99999"]
 ];
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   items.forEach(function(item) {
     var len = item[0];
     var expected = item[1];
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-bytelength.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-bytelength.js
index 8155a44795fa2d59b1d39deed9b740e6ddd8967f..589570da1c7dc25edccf24961b736b48ac714481 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-bytelength.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-bytelength.js
@@ -54,7 +54,7 @@ var items = [
   [-0.99999, 0, "-0.99999"]
 ];
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   items.forEach(function(item) {
     var len = item[0];
     var expected = item[1];
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-byteoffset-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-byteoffset-sab.js
index e6085da48007d9f86b55ca93f2112fd6b6fa1c23..fa65ca0da1f9e5be86ca02c3d29f1e539ebdb677 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-byteoffset-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-byteoffset-sab.js
@@ -53,7 +53,7 @@ var items = [
   [-0.99999, 0, "-0.99999"]
 ];
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   items.forEach(function(item) {
     var offset = item[0];
     var expected = item[1];
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-byteoffset.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-byteoffset.js
index 216f9cfdbaade6b47246efaffaf5634b99067dec..2832f78e9f69713a5ccb9645f85516e2ab4b02b5 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-byteoffset.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/toindex-byteoffset.js
@@ -52,7 +52,7 @@ var items = [
   [-0.99999, 0, "-0.99999"]
 ];
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   items.forEach(function(item) {
     var offset = item[0];
     var expected = item[1];
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/typedarray-backed-by-sharedarraybuffer.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/typedarray-backed-by-sharedarraybuffer.js
index 6a25a0aa97dacc68789238c8573999106b52a292..50ba4d0a96af0cf5a4a8dc2b9b62c77da62f9fc1 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/typedarray-backed-by-sharedarraybuffer.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/typedarray-backed-by-sharedarraybuffer.js
@@ -10,14 +10,16 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-var sab = new SharedArrayBuffer(4);
-var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
+var sab = new SharedArrayBuffer(8);
 
-testWithTypedArrayConstructors(function(View1) {
+testWithBigIntTypedArrayConstructors(function(View1) {
   var ta1 = new View1(sab);
-  testWithTypedArrayConstructors(function(View2) {
+  testWithBigIntTypedArrayConstructors(function(View2) {
     var ta2 = new View2(ta1);
-    assert.sameValue(ta2.buffer.constructor, ArrayBuffer,
-                     "TypedArray of SharedArrayBuffer-backed TypedArray is ArrayBuffer-backed");
-  }, int_views);
-}, int_views);
+    assert.sameValue(
+      ta2.buffer.constructor,
+      ArrayBuffer,
+      "TypedArray of SharedArrayBuffer-backed TypedArray is ArrayBuffer-backed"
+    );
+  });
+});
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-custom-proto-if-object-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-custom-proto-if-object-sab.js
index b14fd3c4fb159099a44a0d4593bf55ef2660e9f1..fca8656cd47c288b533a8a425485abb34fed4ad0 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-custom-proto-if-object-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-custom-proto-if-object-sab.js
@@ -41,7 +41,7 @@ function newTarget() {}
 var proto = {};
 newTarget.prototype = proto;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [buffer], newTarget);
 
   assert.sameValue(ta.constructor, Object);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-custom-proto-if-object.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-custom-proto-if-object.js
index 0cbbb87f6b4b12be4ad998972656904e4d56fa34..6988535fd8c2f53d473a505379dd8f23b6c8c6e2 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-custom-proto-if-object.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-custom-proto-if-object.js
@@ -40,7 +40,7 @@ function newTarget() {}
 var proto = {};
 newTarget.prototype = proto;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [buffer], newTarget);
 
   assert.sameValue(ta.constructor, Object);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-default-proto-if-custom-proto-is-not-object-sab.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-default-proto-if-custom-proto-is-not-object-sab.js
index 9e7a519015b333cffe8419542e758944794af4ac..830edce72ebdd06796df9253ba590a1c212ed3d8 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-default-proto-if-custom-proto-is-not-object-sab.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-default-proto-if-custom-proto-is-not-object-sab.js
@@ -40,7 +40,7 @@ var buffer = new SharedArrayBuffer(8);
 function newTarget() {}
 newTarget.prototype = null;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [buffer], newTarget);
 
   assert.sameValue(ta.constructor, TA);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-default-proto-if-custom-proto-is-not-object.js b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-default-proto-if-custom-proto-is-not-object.js
index 7e8a5770abb5cf94e7253d8f94512de2b1cc4c15..88b6e23cfce0ac5e22b1964248e6c5653f918d4d 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-default-proto-if-custom-proto-is-not-object.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/buffer-arg/use-default-proto-if-custom-proto-is-not-object.js
@@ -39,7 +39,7 @@ var buffer = new ArrayBuffer(8);
 function newTarget() {}
 newTarget.prototype = null;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [buffer], newTarget);
 
   assert.sameValue(ta.constructor, TA);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/length-arg/custom-proto-access-throws.js b/test/built-ins/TypedArrays/ctors-bigint/length-arg/custom-proto-access-throws.js
index 3cc746cd1aa98b1f2c2ecc8c4674a50cbe43bf90..ba557d010edd9a3ddb3795c232f0526a12825d55 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/length-arg/custom-proto-access-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/length-arg/custom-proto-access-throws.js
@@ -36,7 +36,7 @@ Object.defineProperty(newTarget, "prototype", {
   }
 });
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(Test262Error, function() {
     Reflect.construct(TA, [1], newTarget);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/length-arg/init-zeros.js b/test/built-ins/TypedArrays/ctors-bigint/length-arg/init-zeros.js
index 78d52f9aec7beb99e06424e8f0e96608a29ff74d..cb627ba2efb296acf2d92b3fcf3c054bf5c8faeb 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/length-arg/init-zeros.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/length-arg/init-zeros.js
@@ -40,7 +40,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var subject = new TA(9);
 
   assert.sameValue(subject[0], 0n, 'index 0');
diff --git a/test/built-ins/TypedArrays/ctors-bigint/length-arg/is-infinity-throws-rangeerror.js b/test/built-ins/TypedArrays/ctors-bigint/length-arg/is-infinity-throws-rangeerror.js
index 4e1b50f26cf885115a906698fdd53a6ef83ca474..f42ee337e6175635cbd5fc67cf87674ebea6908d 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/length-arg/is-infinity-throws-rangeerror.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/length-arg/is-infinity-throws-rangeerror.js
@@ -20,7 +20,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(RangeError, function() {
     new TA(Infinity);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/length-arg/is-negative-integer-throws-rangeerror.js b/test/built-ins/TypedArrays/ctors-bigint/length-arg/is-negative-integer-throws-rangeerror.js
index 8c634fd7bab7af053c075756c478b07c6485840b..eca3f8627bc29da3daa64acafd7e8fe816d04baf 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/length-arg/is-negative-integer-throws-rangeerror.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/length-arg/is-negative-integer-throws-rangeerror.js
@@ -26,7 +26,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(RangeError, function() {
     new TA(-1);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/length-arg/is-symbol-throws.js b/test/built-ins/TypedArrays/ctors-bigint/length-arg/is-symbol-throws.js
index fd3767781483f37217f4f9be7ada77bbdacea066..2c59839d1fcc08b2ad8b6c4a79b1362a6548294e 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/length-arg/is-symbol-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/length-arg/is-symbol-throws.js
@@ -19,7 +19,7 @@ features: [BigInt, Symbol, TypedArray]
 
 var s = Symbol('1');
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     new TA(s);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/length-arg/new-instance-extensibility.js b/test/built-ins/TypedArrays/ctors-bigint/length-arg/new-instance-extensibility.js
index 740dff1f3a6ce79db3528279ff2176cf87f75742..094653dab8c3ca9d0c9314aeb3cc8d9c8b2951ca 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/length-arg/new-instance-extensibility.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/length-arg/new-instance-extensibility.js
@@ -31,7 +31,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA(4);
 
   assert(Object.isExtensible(sample));
diff --git a/test/built-ins/TypedArrays/ctors-bigint/length-arg/proto-from-ctor-realm.js b/test/built-ins/TypedArrays/ctors-bigint/length-arg/proto-from-ctor-realm.js
index 7df2943579ddfd39a868d3fa84296bc2b9fbbe9e..52c6aef32c1a8e1f1626778ba8018fdce94208d9 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/length-arg/proto-from-ctor-realm.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/length-arg/proto-from-ctor-realm.js
@@ -29,7 +29,7 @@ var other = $262.createRealm().global;
 var C = new other.Function();
 C.prototype = null;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [0], C);
 
   assert.sameValue(Object.getPrototypeOf(ta), other[TA.name].prototype);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/length-arg/returns-object.js b/test/built-ins/TypedArrays/ctors-bigint/length-arg/returns-object.js
index 09aa6d7d620febde08e1d74df8630bd24305e739..f5839c568ee8983986fc1cc8744b4f19500c99a3 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/length-arg/returns-object.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/length-arg/returns-object.js
@@ -23,7 +23,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var typedArray = new TA(4);
   var length = typedArray.length;
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/length-arg/toindex-length.js b/test/built-ins/TypedArrays/ctors-bigint/length-arg/toindex-length.js
index 22c1bba4d428c61877706e8a0d0599a5fcfd6c1d..cfdadc0b61ac177ef014909a1f594df91fb4fdd5 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/length-arg/toindex-length.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/length-arg/toindex-length.js
@@ -35,7 +35,7 @@ var items = [
   [-0.99999, 0, "-0.99999"]
 ];
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   items.forEach(function(item) {
     var len = item[0];
     var expected = item[1];
diff --git a/test/built-ins/TypedArrays/ctors-bigint/length-arg/undefined-newtarget-throws.js b/test/built-ins/TypedArrays/ctors-bigint/length-arg/undefined-newtarget-throws.js
index 347b0deb8269e98e538367a4f842896aef1bd6ba..678e0f9cae609330bcbe2e5aaa4ba1558e3b87de 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/length-arg/undefined-newtarget-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/length-arg/undefined-newtarget-throws.js
@@ -17,7 +17,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     TA(0);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/length-arg/use-custom-proto-if-object.js b/test/built-ins/TypedArrays/ctors-bigint/length-arg/use-custom-proto-if-object.js
index 3386725594a9471b93fa087f03caec3aa65605f4..5c1503217a9db9dff7757a7a49bbf2d628abe87e 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/length-arg/use-custom-proto-if-object.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/length-arg/use-custom-proto-if-object.js
@@ -36,7 +36,7 @@ function newTarget() {}
 var proto = {};
 newTarget.prototype = proto;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [1], newTarget);
 
   assert.sameValue(ta.constructor, Object);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/length-arg/use-default-proto-if-custom-proto-is-not-object.js b/test/built-ins/TypedArrays/ctors-bigint/length-arg/use-default-proto-if-custom-proto-is-not-object.js
index b5651d31f7eca679f98d50f36ff303e25b06b3bb..e8526816879f85dce183c2a650bf2eff7240d5d8 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/length-arg/use-default-proto-if-custom-proto-is-not-object.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/length-arg/use-default-proto-if-custom-proto-is-not-object.js
@@ -35,7 +35,7 @@ features: [BigInt, TypedArray]
 function newTarget() {}
 newTarget.prototype = null;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [1], newTarget);
 
   assert.sameValue(ta.constructor, TA);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/no-args/custom-proto-access-throws.js b/test/built-ins/TypedArrays/ctors-bigint/no-args/custom-proto-access-throws.js
index 20325c97c239340afd640596961ff91f44db9fcf..03987c5da678b58a2652445389b04c13c97daf09 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/no-args/custom-proto-access-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/no-args/custom-proto-access-throws.js
@@ -36,7 +36,7 @@ Object.defineProperty(newTarget, "prototype", {
   }
 });
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(Test262Error, function() {
     Reflect.construct(TA, [], newTarget);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/no-args/new-instance-extensibility.js b/test/built-ins/TypedArrays/ctors-bigint/no-args/new-instance-extensibility.js
index 6fe9d475720e23dd8e5284dd1078b3d18ae86af2..bc22f47eab0899c1d7617a878b59cbea85ce1472 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/no-args/new-instance-extensibility.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/no-args/new-instance-extensibility.js
@@ -31,7 +31,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA();
 
   assert(Object.isExtensible(sample));
diff --git a/test/built-ins/TypedArrays/ctors-bigint/no-args/proto-from-ctor-realm.js b/test/built-ins/TypedArrays/ctors-bigint/no-args/proto-from-ctor-realm.js
index 80460f1d418b772ad7335365554c9fc4b2b65000..a05f153950a11e98448ae32d63fa5230d2b313f5 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/no-args/proto-from-ctor-realm.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/no-args/proto-from-ctor-realm.js
@@ -29,7 +29,7 @@ var other = $262.createRealm().global;
 var C = new other.Function();
 C.prototype = null;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [], C);
 
   assert.sameValue(Object.getPrototypeOf(ta), other[TA.name].prototype);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/no-args/returns-object.js b/test/built-ins/TypedArrays/ctors-bigint/no-args/returns-object.js
index 4751a27b178e78f4ce84c0c9f95e4aba646a16db..01a6d57ca9e7388d80f4a1dfbcd159cba0ff354f 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/no-args/returns-object.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/no-args/returns-object.js
@@ -23,7 +23,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var typedArray = new TA();
 
   assert.sameValue(typedArray.length, 0);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/no-args/undefined-newtarget-throws.js b/test/built-ins/TypedArrays/ctors-bigint/no-args/undefined-newtarget-throws.js
index c26e881c8a1fd547ccd6814680a742586ee3223b..15d70a0a602ecfd6d111f59fea923696a380c2d7 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/no-args/undefined-newtarget-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/no-args/undefined-newtarget-throws.js
@@ -16,7 +16,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     TA();
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/no-args/use-custom-proto-if-object.js b/test/built-ins/TypedArrays/ctors-bigint/no-args/use-custom-proto-if-object.js
index 9d44c612552b685aba3569b2ad8b72cdefdbe212..27e5626918cad1c26a76417358ee6a1a28517d16 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/no-args/use-custom-proto-if-object.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/no-args/use-custom-proto-if-object.js
@@ -36,7 +36,7 @@ function newTarget() {}
 var proto = {};
 newTarget.prototype = proto;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [], newTarget);
 
   assert.sameValue(ta.constructor, Object);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/no-args/use-default-proto-if-custom-proto-is-not-object.js b/test/built-ins/TypedArrays/ctors-bigint/no-args/use-default-proto-if-custom-proto-is-not-object.js
index 339a4a757fb882c8bdefba7320a930b597b8a156..48e8e3004ebdab00fd0da3dd45b2dd000f1f4d53 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/no-args/use-default-proto-if-custom-proto-is-not-object.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/no-args/use-default-proto-if-custom-proto-is-not-object.js
@@ -35,7 +35,7 @@ features: [BigInt, TypedArray]
 function newTarget() {}
 newTarget.prototype = null;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [], newTarget);
 
   assert.sameValue(ta.constructor, TA);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-as-array-returns.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-as-array-returns.js
index c9a6b065260296d5d42426bd7fe3701f38f1157c..48cfaf7f2a5fe3583f76e9e400c9c526085dbc31 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-as-array-returns.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-as-array-returns.js
@@ -16,7 +16,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var typedArray = new TA([7n, 42n]);
   assert.sameValue(typedArray.length, 2);
   assert.sameValue(typedArray[0], 7n);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-as-generator-iterable-returns.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-as-generator-iterable-returns.js
index c7236d4ad72d3b5e715de9a4959ebce588e600e3..b5df7bc98334be732806f297ccdaa3d46c264c92 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-as-generator-iterable-returns.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-as-generator-iterable-returns.js
@@ -16,7 +16,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var obj = (function *() {
     yield 7n; yield 42n;
   })();
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-conversion-operation-consistent-nan.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-conversion-operation-consistent-nan.js
deleted file mode 100644
index 8d94c090a8a9e5bd838736085d3ef122936cdf07..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-conversion-operation-consistent-nan.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-typedarray-object
-description: Consistent canonicalization of NaN values
-info: |
-  22.2.4.4 TypedArray ( object )
-
-  This description applies only if the TypedArray function is called with at
-  least one argument and the Type of the first argument is Object and that
-  object does not have either a [[TypedArrayName]] or an [[ArrayBufferData]]
-  internal slot.
-
-  ...
-  9. Repeat, while k < len
-    ...
-    c. Perform ? Set(O, Pk, kValue, true).
-  ...
-
-  9.4.5.9 IntegerIndexedElementSet ( O, index, value )
-
-  ...
-  15. Perform SetValueInBuffer(buffer, indexedPosition, elementType, numValue).
-  ...
-
-  24.1.1.6 SetValueInBuffer ( arrayBuffer, byteIndex, type, value [ ,
-  isLittleEndian ] )
-
-  ...
-  8. If type is "Float32", then
-     a. Set rawBytes to a List containing the 4 bytes that are the result
-        of converting value to IEEE 754-2008 binary32 format using “Round to
-        nearest, ties to even” rounding mode. If isLittleEndian is false, the
-        bytes are arranged in big endian order. Otherwise, the bytes are
-        arranged in little endian order. If value is NaN, rawValue may be set
-        to any implementation chosen IEEE 754-2008 binary64 format Not-a-Number
-        encoding. An implementation must always choose the same encoding for
-        each implementation distinguishable NaN value.
-  9. Else, if type is "Float64", then
-     a. Set rawBytes to a List containing the 8 bytes that are the IEEE
-        754-2008 binary64 format encoding of value. If isLittleEndian is false,
-        the bytes are arranged in big endian order. Otherwise, the bytes are
-        arranged in little endian order. If value is NaN, rawValue may be set
-        to any implementation chosen IEEE 754-2008 binary32 format Not-a-Number
-        encoding. An implementation must always choose the same encoding for
-        each implementation distinguishable NaN value.
-  ...
-includes: [nans.js, testBigIntTypedArray.js, compareArray.js]
-features: [BigInt, TypedArray]
----*/
-
-function body(FloatArray) {
-  var first = new FloatArray(distinctNaNs);
-  var second = new FloatArray(distinctNaNs);
-  var firstBytes = new Uint8Array(first.buffer);
-  var secondBytes = new Uint8Array(second.buffer);
-
-  assert(compareArray(firstBytes, secondBytes));
-}
-
-testWithTypedArrayConstructors(body, [Float32Array, Float64Array]);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-conversion-operation.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-conversion-operation.js
deleted file mode 100644
index f6cef9bc847c323261022c5e89b0f175591540f7..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-conversion-operation.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-typedarray-object
-description: >
-  Verify conversion values on returned instance
-info: |
-  22.2.4.4 TypedArray ( object )
-
-  This description applies only if the TypedArray function is called with at
-  least one argument and the Type of the first argument is Object and that
-  object does not have either a [[TypedArrayName]] or an [[ArrayBufferData]]
-  internal slot.
-
-  ...
-  9. Repeat, while k < len
-    ...
-    c. Perform ? Set(O, Pk, kValue, true).
-  ...
-
-  9.4.5.9 IntegerIndexedElementSet ( O, index, value )
-
-  ...
-  15. Perform SetValueInBuffer(buffer, indexedPosition, elementType, numValue).
-  ...
-
-  24.1.1.6 SetValueInBuffer ( arrayBuffer, byteIndex, type, value [ ,
-  isLittleEndian ] )
-
-  ...
-  8. If type is "Float32", then
-    ...
-  9. Else, if type is "Float64", then
-    ...
-  10. Else,
-    ...
-    b. Let convOp be the abstract operation named in the Conversion Operation
-    column in Table 50 for Element Type type.
-    c. Let intValue be convOp(value).
-    d. If intValue ≥ 0, then
-      ...
-    e. Else,
-      ...
-includes: [byteConversionValues.js, testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-testTypedArrayConversions(byteConversionValues, function(TA, value, expected) {
-  var sample = new TA([value]);
-
-  assert.sameValue(sample[0], expected, value + " converts to " + expected);
-});
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-custom-proto-access-throws.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-custom-proto-access-throws.js
index 750e65dabbc7bbf089db1cd306eb7f79227cd257..ef668514d9734e42841e57794c117df6f00848b9 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-custom-proto-access-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-custom-proto-access-throws.js
@@ -41,7 +41,7 @@ Object.defineProperty(newTarget, "prototype", {
 
 var o = {};
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(Test262Error, function() {
     Reflect.construct(TA, [o], newTarget);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-iterating-throws.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-iterating-throws.js
index 0575a9901b70cf4d0d135a3c68140cfa81e001df..bf3e5e369740532ca6b42255c482b6b36ba587fa 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-iterating-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-iterating-throws.js
@@ -19,7 +19,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var obj = (function *() {
     yield 0;
     throw new Test262Error();
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-iterator-not-callable-throws.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-iterator-not-callable-throws.js
index f51d37e49acbafa3c025f9a8aff9c8a6c69dfb45..18d988ef1ec8ddd517b61ee07116a9c47072dc95 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-iterator-not-callable-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-iterator-not-callable-throws.js
@@ -21,7 +21,7 @@ features: [BigInt, Symbol.iterator, TypedArray]
 
 var obj = function () {};
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   obj[Symbol.iterator] = {};
   assert.throws(TypeError, function() {
     new TA(obj);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-iterator-throws.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-iterator-throws.js
index 03e08ee2466c51cbdb2ca731d16e6cd435e0cc1b..7db332def67cc4283c52336f8568728185b33a29 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-iterator-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-iterator-throws.js
@@ -27,7 +27,7 @@ Object.defineProperty(obj, Symbol.iterator, {
   }
 });
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(Test262Error, function() {
     new TA(obj);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-length-excessive-throws.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-length-excessive-throws.js
index a0ff4e705cc07111ab1059163ccccfd92f1aae1b..d7fb7216eb114529a993b69e6d99259acb6ed6db 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-length-excessive-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-length-excessive-throws.js
@@ -23,7 +23,7 @@ var obj = {
   length: Math.pow(2, 53)
 };
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(RangeError, function() {
     new TA(obj);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-length-is-symbol-throws.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-length-is-symbol-throws.js
index 53976243e431eb76fb27d8d8eb779c6d4f5975f0..a41f8a01b533c3501ef72c6008d5a459736587a3 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-length-is-symbol-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-length-is-symbol-throws.js
@@ -23,7 +23,7 @@ var obj = {
   length: Symbol("1")
 };
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     new TA(obj);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-length-throws.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-length-throws.js
index d3147dc4c0c7dcd91f96033e2fe863c654e69bc8..6272147d491219c24ec16b66cea65b342dc09e99 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-length-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-length-throws.js
@@ -27,7 +27,7 @@ Object.defineProperty(obj, "length", {
   }
 });
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(Test262Error, function() {
     new TA(obj);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-new-instance-extensibility.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-new-instance-extensibility.js
index 55371427796b748e70eba3f5f42a3d71a7a84a05..7332f854da61f1bb696a538b78d93d6f002f2045 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-new-instance-extensibility.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-new-instance-extensibility.js
@@ -29,7 +29,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var obj = {
     "0": 0n,
     "1": 1n,
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-proto-from-ctor-realm.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-proto-from-ctor-realm.js
index 3b3c5cb868e2dada4271d540710ef55b6e825ba5..19315f593fd03dacde221c0612cef53f7f2862b7 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-proto-from-ctor-realm.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-proto-from-ctor-realm.js
@@ -30,7 +30,7 @@ var other = $262.createRealm().global;
 var C = new other.Function();
 C.prototype = null;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [{}], C);
 
   assert.sameValue(Object.getPrototypeOf(ta), other[TA.name].prototype);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-from-property.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-from-property.js
index 340d5da44197f8ac8a1a20b13256246514493995..758bf286d5c3a347f0f8a44203ef12c10261272c 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-from-property.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-from-property.js
@@ -31,7 +31,7 @@ Object.defineProperty(obj, "2", {
   }
 });
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   obj[0] = 0n;
   obj[1] = 0n;
   assert.throws(Test262Error, function() {
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-to-primitive-typeerror.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-to-primitive-typeerror.js
index 68d8c0f6399e402365cad90062f02d5e1d7f6125..027ad4ba666b197c56abd0ab14c16987fc049e0c 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-to-primitive-typeerror.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-to-primitive-typeerror.js
@@ -54,7 +54,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol.toPrimitive, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new Int8Array(1);
   var toPrimitive = 0;
   var valueOf = 0;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-to-primitive.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-to-primitive.js
index f8fc44562a7cd928bd72be1b8beaf5b68969872b..9d84bee67ec879e284cb97268858bf040c2e222c 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-to-primitive.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-to-primitive.js
@@ -52,7 +52,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol.toPrimitive, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new Int8Array(1);
   var toPrimitive = 0;
   var valueOf = 0;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-tostring.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-tostring.js
index 6ce9f8ca5c0ed575c83b40328772108feb90b9d7..58801c0b035ec7028b0d93385eb389cd3fa70f57 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-tostring.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-tostring.js
@@ -64,7 +64,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new Int8Array(1);
   var valueOf = 0;
   var toString = 0;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-valueof-typeerror.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-valueof-typeerror.js
index c0f9e72699ffb749bb96b492cd1e0595ce8c5879..90a587af7d0d9f13b29312598e02c50139818dca 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-valueof-typeerror.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-valueof-typeerror.js
@@ -65,7 +65,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new Int8Array(1);
   var valueOf = 0;
   var toString = 0;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-valueof.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-valueof.js
index 6919d931a10bda6e20c80c05cff23cdcac1d19f0..d5138d56ebf7252b278f852dc4cd7a8a21a42a77 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-valueof.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-obj-valueof.js
@@ -65,7 +65,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new Int8Array(1);
   var valueOf = 0;
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-property.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-property.js
index b752780da9d53ce5157880c7d99f087b99e069e0..626472c9027601bfdc1419603711f0866e647853 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-property.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-property.js
@@ -31,7 +31,7 @@ var obj = {
   length: 4
 };
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   obj[0] = 0n;
   obj[1] = 0n;
   assert.throws(Test262Error, function() {
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-symbol-property.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-symbol-property.js
index 64de7b8c6dee69c5a7a4e7448a3ab29787828027..0ca0cd65577da294f34e0a1ffb3e308e3626f818 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-symbol-property.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-throws-setting-symbol-property.js
@@ -27,7 +27,7 @@ var obj = {
   length: 4
 };
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     new TA(obj);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-undefined-newtarget-throws.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-undefined-newtarget-throws.js
index df5996746dc27c6360668d0abd8b088724add0c4..7892e3b8679b2e5482922c56d05b211c83c286a7 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-undefined-newtarget-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-undefined-newtarget-throws.js
@@ -19,7 +19,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     TA({});
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-use-custom-proto-if-object.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-use-custom-proto-if-object.js
index 1d688fac980138040d037c67fabc3dcf75260a9a..1a2ae7ccb79bd982434c11e6fd3ab4024011bdc2 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-use-custom-proto-if-object.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-use-custom-proto-if-object.js
@@ -39,7 +39,7 @@ function newTarget() {}
 var proto = {};
 newTarget.prototype = proto;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [], newTarget);
 
   assert.sameValue(ta.constructor, Object);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-use-default-proto-if-custom-proto-is-not-object.js b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-use-default-proto-if-custom-proto-is-not-object.js
index 5f8355d12aafa99511e01aff93acc534d2e47119..a6f3a362eec1525704bc9c4b48b6586c6de849ea 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-use-default-proto-if-custom-proto-is-not-object.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/object-arg/object-arg-use-default-proto-if-custom-proto-is-not-object.js
@@ -39,7 +39,7 @@ function newTarget() {}
 newTarget.prototype = null;
 var o = [];
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [o], newTarget);
 
   assert.sameValue(ta.constructor, TA);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-custom-proto-access-throws.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-custom-proto-access-throws.js
index e77230e44ba652d4b1c55320572ef347922766bf..ab89da072853bbc7b1e566cdd859d4e0bcc484dd 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-custom-proto-access-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-custom-proto-access-throws.js
@@ -40,7 +40,7 @@ Object.defineProperty(newTarget, "prototype", {
 
 var sample = new Int8Array();
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(Test262Error, function() {
     Reflect.construct(TA, [sample], newTarget);
   });
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-detached-when-species-retrieved-different-type.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-detached-when-species-retrieved-different-type.js
index a3c275ef16ac76e87d6452e1f7749dab730f2180..c5de19602e878dc05d896a3c402c1b087fd3165b 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-detached-when-species-retrieved-different-type.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-detached-when-species-retrieved-different-type.js
@@ -30,7 +30,7 @@ includes: [testBigIntTypedArray.js, detachArrayBuffer.js]
 features: [BigInt, TypedArray, Symbol.species]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
     var speciesCallCount = 0;
     var bufferConstructor = Object.defineProperty({}, Symbol.species, {
         get: function() {
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-detached-when-species-retrieved-same-type.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-detached-when-species-retrieved-same-type.js
index 6a24fae75f917ee06e49916057999e5dbfdeead3..c4f45c49c7cb2be064b0ce06e89fd0ded4b1faa5 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-detached-when-species-retrieved-same-type.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-detached-when-species-retrieved-same-type.js
@@ -34,7 +34,7 @@ includes: [testBigIntTypedArray.js, detachArrayBuffer.js]
 features: [BigInt, TypedArray, Symbol.species]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
     var speciesCallCount = 0;
     var bufferConstructor = Object.defineProperty({}, Symbol.species, {
         get: function() {
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-new-instance-extensibility.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-new-instance-extensibility.js
index 4483d6f3b7b82df92da6f3452695a7f00efa20b7..5fbd869d62caf883b578340aca453bb8445f861c 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-new-instance-extensibility.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-new-instance-extensibility.js
@@ -29,11 +29,11 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-var typedArraySample1 = new Int8Array();
-var typedArraySample2 = new Int8Array();
+var typedArraySample1 = new BigInt64Array();
+var typedArraySample2 = new BigInt64Array();
 Object.preventExtensions(typedArraySample2);
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample1 = new TA(typedArraySample1);
 
   assert(Object.isExtensible(sample1), "new instance is extensible");
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-access-throws.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-access-throws.js
index 776a5671387973d4bf4baa58f1b1d5587978b268..686c020080cb40feb5b5a2b039e3da12f06401de 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-access-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-access-throws.js
@@ -25,7 +25,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var OtherCtor = TA === Int8Array ? Int16Array : Int8Array;
   var sample = new OtherCtor();
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-custom-species-proto-from-ctor-realm.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-custom-species-proto-from-ctor-realm.js
index 279dbf34b61b2f24daec8b696ddd87dcf90af9da..5a5d7ee0ab7f42abca9675a0bbccf66648334a29 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-custom-species-proto-from-ctor-realm.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-custom-species-proto-from-ctor-realm.js
@@ -37,15 +37,14 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, cross-realm, Symbol.species, TypedArray]
 ---*/
 
-var sample1 = new Int8Array();
-var sample2 = new Int16Array();
+var sample1 = new BigInt64Array();
+var sample2 = new BigUint64Array();
 var other = $262.createRealm().global;
 var C = new other.Function();
 C.prototype = null;
 
-
-testWithTypedArrayConstructors(function(TA) {
-  var sample = TA === Int8Array ? sample2 : sample1;
+testWithBigIntTypedArrayConstructors(function(TA) {
+  var sample = TA === BigInt64Array ? sample2 : sample1;
   var ctor = {};
 
   sample.buffer.constructor = ctor;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-custom-species.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-custom-species.js
index f31427329ef24d1136d13def91ebe02a58ffb16d..1ff1e5db5335c52b7377cebf23013b0d64600526 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-custom-species.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-custom-species.js
@@ -29,11 +29,11 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol.species, TypedArray]
 ---*/
 
-var sample1 = new Int8Array();
-var sample2 = new Int16Array();
+var sample1 = new BigInt64Array();
+var sample2 = new BigUint64Array();
 
-testWithTypedArrayConstructors(function(TA) {
-  var sample = TA === Int8Array ? sample2 : sample1;
+testWithBigIntTypedArrayConstructors(function(TA) {
+  var sample = TA === BigInt64Array ? sample2 : sample1;
   var ctor = {};
   var called = 0;
   var custom = {};
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-not-object-throws.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-not-object-throws.js
index d538503a39fe0cbcdcfa8bd9f77325c4e49a512e..435136a08a7fce2d600cbccb1a56486b5d341ca6 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-not-object-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-not-object-throws.js
@@ -30,7 +30,7 @@ features: [BigInt, Symbol, TypedArray]
 var sample1 = new Int8Array();
 var sample2 = new Int16Array();
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = TA === Int8Array ? sample2 : sample1;
 
   sample.buffer.constructor = 1;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-access-throws.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-access-throws.js
index 0cf6e2965d8177f8d80baa78cf4fd4a78f3e0b0f..8b02063619e0752de5ee40b3d29d4e0dc5bed7ef 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-access-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-access-throws.js
@@ -28,7 +28,7 @@ features: [BigInt, Symbol.species, TypedArray]
 var sample1 = new Int8Array();
 var sample2 = new Int16Array();
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = TA === Int8Array ? sample2 : sample1;
   var ctor = {};
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-not-ctor-throws.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-not-ctor-throws.js
index 4419406c6de5a99dd528f2ad33631b6bfca5e75d..338a63b20ad4c0b501104b07e5ef1f27c50512e5 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-not-ctor-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-not-ctor-throws.js
@@ -36,7 +36,7 @@ var ctor = function() {
 var m = { m() {} }.m;
 ctor[Symbol.species] = m;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = TA === Int8Array ? sample2 : sample1;
 
   sample.buffer.constructor = ctor;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-null.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-null.js
index 34b3a12dfbc67a1b6aa3409507a26f8097797e74..2eeb50e38bb822414cb0367f0a366d4de5607b1b 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-null.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-null.js
@@ -26,8 +26,8 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol.species, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
-  var OtherCtor = TA === Int8Array ? Int16Array : Int8Array;
+testWithBigIntTypedArrayConstructors(function(TA) {
+  var OtherCtor = TA === BigInt64Array ? BigUint64Array : BigInt64Array;
   var sample = new OtherCtor();
   var ctor = {};
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-prototype-throws.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-prototype-throws.js
index 16bfe8d874f8b56c4932ff6f8de1dabb2868e2c8..dea4919af1384d630b1d75a8f82c844429e5e269 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-prototype-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-prototype-throws.js
@@ -38,7 +38,7 @@ features: [BigInt, Symbol.species, TypedArray]
 var sample1 = new Int8Array();
 var sample2 = new Int16Array();
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = TA === Int8Array ? sample2 : sample1;
   var ctor = {};
   var called = 0;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-undefined.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-undefined.js
index a6cfd230fb807c4b3e574ddfe6f47b3bcf9bb055..9a265f1248f4801d6d680e21e58633fc91c62b30 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-undefined.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-buffer-ctor-species-undefined.js
@@ -26,8 +26,8 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol.species, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
-  var OtherCtor = TA === Int8Array ? Int16Array : Int8Array;
+testWithBigIntTypedArrayConstructors(function(TA) {
+  var OtherCtor = TA === BigInt64Array ? BigUint64Array : BigInt64Array;
   var sample = new OtherCtor();
   var ctor = {};
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-returns-new-typedarray.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-returns-new-typedarray.js
index abbabc666e0c94d6df8936f51624c5b9df832ebb..2c87901fd244b289062d6b589a5a0a6bdd423615 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-returns-new-typedarray.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-other-ctor-returns-new-typedarray.js
@@ -19,7 +19,7 @@ var sample2 = new Int16Array(7);
 var sample3 = new BigInt64Array(7);
 var sample4 = new BigUint64Array(7);
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = TA === Int8Array ? sample2 :
                TA === BigInt64Array ? sample4 :
                TA === BigUint64Array ? sample3 : sample1;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-proto-from-ctor-realm.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-proto-from-ctor-realm.js
index 45acca5948db09004828b741673dba55cd3d474d..7e9498549118ab54f52499ddc5e6950ddd109b4c 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-proto-from-ctor-realm.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-proto-from-ctor-realm.js
@@ -30,7 +30,7 @@ var other = $262.createRealm().global;
 var C = new other.Function();
 C.prototype = null;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ta = Reflect.construct(TA, [new TA()], C);
 
   assert.sameValue(Object.getPrototypeOf(ta), other[TA.name].prototype);
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-access-throws.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-access-throws.js
index c5d66390975df508a59ff0dc8e000838c8e828be..51fa9a8358f43252ca1a045f3ab90e6e9ab884a9 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-access-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-access-throws.js
@@ -32,7 +32,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA();
   Object.defineProperty(sample.buffer, "constructor", {
     get: function() {
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-custom-proto-from-ctor-realm.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-custom-proto-from-ctor-realm.js
index ae21a381b447f419452c6fd652683ec5c736d1d9..90de96428058656899fc9d6d4c421f4e202deede 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-custom-proto-from-ctor-realm.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-custom-proto-from-ctor-realm.js
@@ -53,7 +53,7 @@ var other = $262.createRealm().global;
 var C = new other.Function();
 C.prototype = null;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA();
   var ctor = {};
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-custom.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-custom.js
index cac5edc53b9106e3f0fadcdefe92d8433e3ad98a..743b03e3f4bf0f15161cf3203deb828c5b56f8ec 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-custom.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-custom.js
@@ -40,7 +40,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol.species, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA();
   var ctor = {};
   var called = 0;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-not-ctor.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-not-ctor.js
index f8487280ccffe1d3285cf1639b3020540841e5fa..32cbc01bc3f56012b55e7eedf5072c0812dccc15 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-not-ctor.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-not-ctor.js
@@ -34,7 +34,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol.species, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA();
   var ctor = {};
   var m = { m() {} };
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-null.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-null.js
index ff86f04d64aeb84b0473a6f858ba82de07152c5f..842ccd3d13b09cdb40fcf2925148de66d324511a 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-null.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-null.js
@@ -33,7 +33,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol.species, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA(4);
   var ctor = {};
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-prototype-throws.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-prototype-throws.js
index 9de4e9b3bbd18dae2f6be8a6f72193f871dc953a..042d4213db8fdc19fbd107c051e8df82ceb5f905 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-prototype-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-prototype-throws.js
@@ -43,7 +43,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol.species, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA();
   var ctor = {};
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-throws.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-throws.js
index 36fdbe8daf2da4be51bb8739ea6b990427c88e8d..0aa7517b802ccfa46c3a2d8e58a384462b23aa76 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-throws.js
@@ -32,7 +32,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol.species, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA();
   var ctor = {};
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-undefined.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-undefined.js
index f040fe16eec729a339603d62968ecfdd5a9fbac0..251a396e8520afac943ade8213c3b7b94f1d7e87 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-undefined.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-species-undefined.js
@@ -33,7 +33,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol.species, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA(4);
   var ctor = {};
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-value-not-obj-throws.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-value-not-obj-throws.js
index 758eef5c0bc3e96fda45329ee201d33b36fc10e8..a3ca9a041b395955d5f126fec9617804a459da7b 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-value-not-obj-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-buffer-ctor-value-not-obj-throws.js
@@ -34,7 +34,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA();
 
   sample.buffer.constructor = 1;
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-returns-new-cloned-typedarray.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-returns-new-cloned-typedarray.js
index 3321aa5b44e3baf1a93c3b7df1f4c8e9000b36c4..2176cebdb41838e208fc24bcbaa2c988a71c91f3 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-returns-new-cloned-typedarray.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-same-ctor-returns-new-cloned-typedarray.js
@@ -20,7 +20,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA(7);
   var typedArray = new TA(sample);
 
diff --git a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-undefined-newtarget-throws.js b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-undefined-newtarget-throws.js
index de0e9fdc2c21a0153e37b26283beeb72120328c1..82fd5c823a4535acd2cb03a4bc2daf83b914b719 100644
--- a/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-undefined-newtarget-throws.js
+++ b/test/built-ins/TypedArrays/ctors-bigint/typedarray-arg/typedarray-arg-undefined-newtarget-throws.js
@@ -18,7 +18,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var typedArray = new TA(4);
 
   assert.throws(TypeError, function() {
diff --git a/test/built-ins/TypedArrays/from/BigInt/nan-conversion.js b/test/built-ins/TypedArrays/from/BigInt/nan-conversion.js
deleted file mode 100644
index a318c055a3141ddbeb7c980748814bf1d60a9c04..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArrays/from/BigInt/nan-conversion.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-%typedarray%.from
-description: >
-  Test NaN conversions
-info: |
-  9.4.5.9 IntegerIndexedElementSet ( O, index, value )
-
-  ...
-  3. Let numValue be ? ToNumber(value).
-  ...
-
-  24.1.1.6 SetValueInBuffer ( arrayBuffer, byteIndex, type, value [ ,
-  isLittleEndian ] )
-includes: [testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-testWithBigIntTypedArrayConstructors(function(TA) {
-  var result = TA.from([NaN, undefined]);
-  assert.sameValue(result.length, 2);
-  assert.sameValue(result[0], NaN);
-  assert.sameValue(result[1], NaN);
-  assert.sameValue(result.constructor, TA);
-  assert.sameValue(Object.getPrototypeOf(result), TA.prototype);
-},
-[
-  Float32Array,
-  Float64Array
-]);
-
-testWithBigIntTypedArrayConstructors(function(TA) {
-  var result = TA.from([NaN, undefined]);
-  assert.sameValue(result.length, 2);
-  assert.sameValue(result[0], 0);
-  assert.sameValue(result[1], 0);
-  assert.sameValue(result.constructor, TA);
-  assert.sameValue(Object.getPrototypeOf(result), TA.prototype);
-},
-[
-  Int8Array,
-  Int32Array,
-  Int16Array,
-  Int8Array,
-  Uint32Array,
-  Uint16Array,
-  Uint8Array,
-  Uint8ClampedArray
-]);
\ No newline at end of file
diff --git a/test/built-ins/TypedArrays/from/BigInt/new-instance-from-ordinary-object.js b/test/built-ins/TypedArrays/from/BigInt/new-instance-from-ordinary-object.js
index 22eff2856c879f7a960602d6a4685af6c6cdd006..9573521b0873038462c0073e5080542719aa1a12 100644
--- a/test/built-ins/TypedArrays/from/BigInt/new-instance-from-ordinary-object.js
+++ b/test/built-ins/TypedArrays/from/BigInt/new-instance-from-ordinary-object.js
@@ -9,45 +9,17 @@ features: [BigInt, Array.prototype.values, TypedArray]
 ---*/
 
 var source = {
-  "0": 42,
-  "2": 44,
-  length: 4
+  "0": 42n,
+  "1": 44n,
+  length: 2
 };
 
 testWithBigIntTypedArrayConstructors(function(TA) {
   var result = TA.from(source);
 
-  assert.sameValue(result.length, 4);
-  assert.sameValue(result[0], 42);
-  assert.sameValue(result[1], NaN);
-  assert.sameValue(result[2], 44);
-  assert.sameValue(result[3], NaN);
+  assert.sameValue(result.length, 2);
+  assert.sameValue(result[0], 42n);
+  assert.sameValue(result[1], 44n);
   assert.sameValue(result.constructor, TA);
   assert.sameValue(Object.getPrototypeOf(result), TA.prototype);
-},
-[
-  Float32Array,
-  Float64Array
-]);
-
-testWithBigIntTypedArrayConstructors(function(TA) {
-  var result = TA.from(source);
-
-  assert.sameValue(result.length, 4);
-  assert.sameValue(result[0], 42);
-  assert.sameValue(result[1], 0);
-  assert.sameValue(result[2], 44);
-  assert.sameValue(result[3], 0);
-  assert.sameValue(result.constructor, TA);
-  assert.sameValue(Object.getPrototypeOf(result), TA.prototype);
-},
-[
-  Int8Array,
-  Int32Array,
-  Int16Array,
-  Int8Array,
-  Uint32Array,
-  Uint16Array,
-  Uint8Array,
-  Uint8ClampedArray
-]);
+});
diff --git a/test/built-ins/TypedArrays/from/BigInt/new-instance-from-sparse-array.js b/test/built-ins/TypedArrays/from/BigInt/new-instance-from-sparse-array.js
index 361edb9d623f8bbd469fd394a379f68a655a9146..71e7d1c294ee56102b4c65c3a163d6733083f96e 100644
--- a/test/built-ins/TypedArrays/from/BigInt/new-instance-from-sparse-array.js
+++ b/test/built-ins/TypedArrays/from/BigInt/new-instance-from-sparse-array.js
@@ -3,51 +3,15 @@
 /*---
 esid: sec-%typedarray%.from
 description: >
-  Return a new TypedArray from a sparse array
+  Throws a TypeError casting undefined value from sparse array to BigInt
 includes: [testBigIntTypedArray.js]
-features: [BigInt, Array.prototype.values, TypedArray]
+features: [BigInt, TypedArray]
 ---*/
 
-var source = [,,42,,44,,];
+var source = [,42n];
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  var result = TA.from(source);
-
-  assert.sameValue(result.length, 6);
-  assert.sameValue(result[0], NaN);
-  assert.sameValue(result[1], NaN);
-  assert.sameValue(result[2], 42);
-  assert.sameValue(result[3], NaN);
-  assert.sameValue(result[4], 44);
-  assert.sameValue(result[5], NaN);
-  assert.sameValue(result.constructor, TA);
-  assert.sameValue(Object.getPrototypeOf(result), TA.prototype);
-},
-[
-  Float32Array,
-  Float64Array
-]);
-
-testWithBigIntTypedArrayConstructors(function(TA) {
-  var result = TA.from(source);
-
-  assert.sameValue(result.length, 6);
-  assert.sameValue(result[0], 0);
-  assert.sameValue(result[1], 0);
-  assert.sameValue(result[2], 42);
-  assert.sameValue(result[3], 0);
-  assert.sameValue(result[4], 44);
-  assert.sameValue(result[5], 0);
-  assert.sameValue(result.constructor, TA);
-  assert.sameValue(Object.getPrototypeOf(result), TA.prototype);
-},
-[
-  Int8Array,
-  Int32Array,
-  Int16Array,
-  Int8Array,
-  Uint32Array,
-  Uint16Array,
-  Uint8Array,
-  Uint8ClampedArray
-]);
+  assert.throws(TypeError, function() {
+    TA.from(source);
+  });
+});
diff --git a/test/built-ins/TypedArrays/from/BigInt/new-instance-from-zero.js b/test/built-ins/TypedArrays/from/BigInt/new-instance-from-zero.js
deleted file mode 100644
index cbca4484d98a2e71cd9fed8c68e177755b1ea39b..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArrays/from/BigInt/new-instance-from-zero.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-%typedarray%.from
-description: >
-  Return a new TypedArray using -0 and +0
-includes: [testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-testWithBigIntTypedArrayConstructors(function(TA) {
-  var result = TA.from([-0, +0]);
-  assert.sameValue(result.length, 2);
-  assert.sameValue(result[0], -0, "-0 => -0");
-  assert.sameValue(result[1], 0, "+0 => 0");
-  assert.sameValue(result.constructor, TA);
-  assert.sameValue(Object.getPrototypeOf(result), TA.prototype);
-},
-[
-  Float32Array,
-  Float64Array
-]);
-
-testWithBigIntTypedArrayConstructors(function(TA) {
-  var result = TA.from([-0, +0]);
-  assert.sameValue(result.length, 2);
-  assert.sameValue(result[0], 0, "-0 => 0");
-  assert.sameValue(result[1], 0, "+0 => 0");
-  assert.sameValue(result.constructor, TA);
-  assert.sameValue(Object.getPrototypeOf(result), TA.prototype);
-},
-[
-  Int16Array,
-  Int32Array,
-  Int8Array,
-  Uint16Array,
-  Uint32Array,
-  Uint8Array,
-  Uint8ClampedArray
-]);
\ No newline at end of file
diff --git a/test/built-ins/TypedArrays/internals/DefineOwnProperty/BigInt/conversion-operation.js b/test/built-ins/TypedArrays/internals/DefineOwnProperty/BigInt/conversion-operation.js
deleted file mode 100644
index 9fe931cfa467eabaecd6b7fe789de17f8b10a248..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArrays/internals/DefineOwnProperty/BigInt/conversion-operation.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-integer-indexed-exotic-objects-defineownproperty-p-desc
-description: >
-  Verify conversion after defining value
-info: |
-  9.4.5.3 [[DefineOwnProperty]] ( P, Desc)
-
-  ...
-  3. If Type(P) is String, then
-    ...
-    b. If numericIndex is not undefined, then
-      ...
-      xi. If Desc has a [[Value]] field, then
-        1. Let value be Desc.[[Value]].
-        2. Return ? IntegerIndexedElementSet(O, intIndex, value).
-  ...
-
-  9.4.5.9 IntegerIndexedElementSet ( O, index, value )
-
-  ...
-  15. Perform SetValueInBuffer(buffer, indexedPosition, elementType, numValue).
-  ...
-
-  24.1.1.6 SetValueInBuffer ( arrayBuffer, byteIndex, type, value [ ,
-  isLittleEndian ] )
-
-  ...
-  8. If type is "Float32", then
-    ...
-  9. Else, if type is "Float64", then
-    ...
-  10. Else,
-    ...
-    b. Let convOp be the abstract operation named in the Conversion Operation
-    column in Table 50 for Element Type type.
-    c. Let intValue be convOp(value).
-    d. If intValue ≥ 0, then
-      ...
-    e. Else,
-      ...
-includes: [byteConversionValues.js, testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-testTypedArrayConversions(byteConversionValues, function(TA, value, expected, initial) {
-  var sample = new TA([initial]);
-
-  Object.defineProperty(sample, "0", {value: value});
-
-  assert.sameValue(sample[0], expected, value + " converts to " + expected);
-});
diff --git a/test/built-ins/TypedArrays/internals/DefineOwnProperty/BigInt/tonumber-value-detached-buffer.js b/test/built-ins/TypedArrays/internals/DefineOwnProperty/BigInt/tonumber-value-detached-buffer.js
index 26eb3526b2f1d7653770a30a5112794a90061089..d8f720d0452cd9910e8e99e345e16e2073aa9c27 100644
--- a/test/built-ins/TypedArrays/internals/DefineOwnProperty/BigInt/tonumber-value-detached-buffer.js
+++ b/test/built-ins/TypedArrays/internals/DefineOwnProperty/BigInt/tonumber-value-detached-buffer.js
@@ -30,14 +30,14 @@ features: [BigInt, Reflect, TypedArray]
 ---*/
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  var ta = new TA([17]);
+  var ta = new TA([17n]);
 
   var desc =
     {
       value: {
         valueOf: function() {
           $262.detachArrayBuffer(ta.buffer);
-          return 42;
+          return 42n;
         }
       }
     };
diff --git a/test/built-ins/TypedArrays/internals/Set/BigInt/conversion-operation.js b/test/built-ins/TypedArrays/internals/Set/BigInt/conversion-operation.js
deleted file mode 100644
index 8f30a59a42022cc26ab8c04bc5bd7b3602d8e434..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArrays/internals/Set/BigInt/conversion-operation.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-integer-indexed-exotic-objects-set-p-v-receiver
-description: >
-  Verify conversion after setting value
-info: |
-  9.4.5.5 [[Set]] ( P, V, Receiver)
-
-  ...
-  2. If Type(P) is String, then
-    ...
-    b. If numericIndex is not undefined, then
-      i. Return ? IntegerIndexedElementSet(O, numericIndex, V).
-  ...
-
-  9.4.5.9 IntegerIndexedElementSet ( O, index, value )
-
-  ...
-  15. Perform SetValueInBuffer(buffer, indexedPosition, elementType, numValue).
-  ...
-
-  24.1.1.6 SetValueInBuffer ( arrayBuffer, byteIndex, type, value [ ,
-  isLittleEndian ] )
-
-  ...
-  8. If type is "Float32", then
-    ...
-  9. Else, if type is "Float64", then
-    ...
-  10. Else,
-    ...
-    b. Let convOp be the abstract operation named in the Conversion Operation
-    column in Table 50 for Element Type type.
-    c. Let intValue be convOp(value).
-    d. If intValue ≥ 0, then
-      ...
-    e. Else,
-      ...
-includes: [byteConversionValues.js, testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-testTypedArrayConversions(byteConversionValues, function(TA, value, expected, initial) {
-  var sample = new TA([initial]);
-
-  sample[0] = value;
-
-  assert.sameValue(sample[0], expected, value + " converts to " + expected);
-});
diff --git a/test/built-ins/TypedArrays/internals/Set/BigInt/key-is-minus-zero.js b/test/built-ins/TypedArrays/internals/Set/BigInt/key-is-minus-zero.js
index e937c4d2810365f8e0fe8224cb519d52d64c1499..ad504569259e5fa8d2994567c7c81cbc17fd60e0 100644
--- a/test/built-ins/TypedArrays/internals/Set/BigInt/key-is-minus-zero.js
+++ b/test/built-ins/TypedArrays/internals/Set/BigInt/key-is-minus-zero.js
@@ -5,7 +5,7 @@ esid: sec-integer-indexed-exotic-objects-set-p-v-receiver
 description: >
   Returns false if index is -0
 info: |
-  9.4.5.5 [[Set]] ( P, V, Receiver)
+  [[Set]] ( P, V, Receiver)
 
   ...
   2. If Type(P) is String, then
@@ -14,11 +14,11 @@ info: |
       i. Return ? IntegerIndexedElementSet(O, numericIndex, V).
   ...
 
-  9.4.5.9 IntegerIndexedElementSet ( O, index, value )
+  IntegerIndexedElementSet ( O, index, value )
 
+  5. If arrayTypeName is "BigUint64Array" or "BigInt64Array", let numValue be ? ToBigInt(value).
   ...
-  7. If index = -0, return false.
-  ...
+  10. If index = -0, return false.
 includes: [testBigIntTypedArray.js]
 features: [BigInt, Reflect, TypedArray]
 ---*/
@@ -26,6 +26,6 @@ features: [BigInt, Reflect, TypedArray]
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA([42n]);
 
-  assert.sameValue(Reflect.set(sample, "-0", 1), false, "-0");
+  assert.sameValue(Reflect.set(sample, "-0", 1n), false, "-0");
   assert.sameValue(sample.hasOwnProperty("-0"), false, "has no property [-0]");
 });
diff --git a/test/built-ins/TypedArrays/internals/Set/BigInt/key-is-not-integer.js b/test/built-ins/TypedArrays/internals/Set/BigInt/key-is-not-integer.js
index 1d8e72b14576a3a02952fdd966d7a84c165ac978..ef9723d345496e9e6a0bd4626cbf769670e1ecc8 100644
--- a/test/built-ins/TypedArrays/internals/Set/BigInt/key-is-not-integer.js
+++ b/test/built-ins/TypedArrays/internals/Set/BigInt/key-is-not-integer.js
@@ -26,8 +26,8 @@ features: [BigInt, Reflect, TypedArray]
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA([42n]);
 
-  assert.sameValue(Reflect.set(sample, "1.1", 1), false, "1.1");
-  assert.sameValue(Reflect.set(sample, "0.0001", 1), false, "0.0001");
+  assert.sameValue(Reflect.set(sample, "1.1", 1n), false, "1.1");
+  assert.sameValue(Reflect.set(sample, "0.0001", 1n), false, "0.0001");
 
   assert.sameValue(sample.hasOwnProperty("1.1"), false, "has no property [1.1]");
   assert.sameValue(
diff --git a/test/built-ins/TypedArrays/internals/Set/BigInt/key-is-out-of-bounds.js b/test/built-ins/TypedArrays/internals/Set/BigInt/key-is-out-of-bounds.js
index a9a4d8b0ab193bd1ab184dfbb50a2292737e9e28..4de4518908254e40ee02e9466cbb0fc9b4959dbc 100644
--- a/test/built-ins/TypedArrays/internals/Set/BigInt/key-is-out-of-bounds.js
+++ b/test/built-ins/TypedArrays/internals/Set/BigInt/key-is-out-of-bounds.js
@@ -27,9 +27,9 @@ features: [BigInt, Reflect, TypedArray]
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA([42n]);
 
-  assert.sameValue(Reflect.set(sample, "-1", 1), false, "-1");
-  assert.sameValue(Reflect.set(sample, "1", 1), false, "1");
-  assert.sameValue(Reflect.set(sample, "2", 1), false, "2");
+  assert.sameValue(Reflect.set(sample, "-1", 1n), false, "-1");
+  assert.sameValue(Reflect.set(sample, "1", 1n), false, "1");
+  assert.sameValue(Reflect.set(sample, "2", 1n), false, "2");
 
   assert.sameValue(sample.hasOwnProperty("-1"), false, "has no property [-1]");
   assert.sameValue(sample.hasOwnProperty("1"), false, "has no property [1]");
diff --git a/test/built-ins/TypedArrays/internals/Set/BigInt/tonumber-value-detached-buffer.js b/test/built-ins/TypedArrays/internals/Set/BigInt/tonumber-value-detached-buffer.js
index 2111ef6458f0b2c07bc10261610472ba1b115103..5794dfbc483a1561f7b3292352bc07407f5de519 100644
--- a/test/built-ins/TypedArrays/internals/Set/BigInt/tonumber-value-detached-buffer.js
+++ b/test/built-ins/TypedArrays/internals/Set/BigInt/tonumber-value-detached-buffer.js
@@ -27,13 +27,13 @@ features: [BigInt, Reflect, TypedArray]
 ---*/
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  var ta = new TA([17]);
+  var ta = new TA([17n]);
 
   assert.throws(TypeError, function() {
     Reflect.set(ta, 0, {
       valueOf: function() {
         $262.detachArrayBuffer(ta.buffer);
-        return 42;
+        return 42n;
       }
     });
   },
diff --git a/test/built-ins/TypedArrays/of/BigInt/argument-is-symbol-throws.js b/test/built-ins/TypedArrays/of/BigInt/argument-is-symbol-throws.js
index b5931184957d39db0485d06aeeb0875069cf3581..70a7fb782a8f7c6c9036550d761604c19798c5c8 100644
--- a/test/built-ins/TypedArrays/of/BigInt/argument-is-symbol-throws.js
+++ b/test/built-ins/TypedArrays/of/BigInt/argument-is-symbol-throws.js
@@ -16,7 +16,7 @@ features: [BigInt, Symbol, TypedArray]
 
 var s = Symbol("1");
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     TA.of(s);
   });
diff --git a/test/built-ins/TypedArrays/of/BigInt/argument-number-value-throws.js b/test/built-ins/TypedArrays/of/BigInt/argument-number-value-throws.js
index 16c8a9104a24ee6ce58c77afb840828180ca1909..01bf097b6af32f5eda52fe8786a78c59346d8701 100644
--- a/test/built-ins/TypedArrays/of/BigInt/argument-number-value-throws.js
+++ b/test/built-ins/TypedArrays/of/BigInt/argument-number-value-throws.js
@@ -16,7 +16,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var lastValue = false;
 
   var obj1 = {
diff --git a/test/built-ins/TypedArrays/of/BigInt/custom-ctor-does-not-instantiate-ta-throws.js b/test/built-ins/TypedArrays/of/BigInt/custom-ctor-does-not-instantiate-ta-throws.js
index ca17d437ed177eddafc86a20b6392854886452a9..9e7b97b73b13a35b097e1045771af6402bb68c3b 100644
--- a/test/built-ins/TypedArrays/of/BigInt/custom-ctor-does-not-instantiate-ta-throws.js
+++ b/test/built-ins/TypedArrays/of/BigInt/custom-ctor-does-not-instantiate-ta-throws.js
@@ -20,10 +20,10 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ctor = function() {};
 
   assert.throws(TypeError, function() {
-    TA.of.call(ctor, 42);
+    TA.of.call(ctor, 42n);
   });
 });
diff --git a/test/built-ins/TypedArrays/of/BigInt/custom-ctor-returns-other-instance.js b/test/built-ins/TypedArrays/of/BigInt/custom-ctor-returns-other-instance.js
index 1454ab1c8733fd36180ecf42be322999d6f901a8..a2a61ce629c477af336dddfac67e92558a61bf4f 100644
--- a/test/built-ins/TypedArrays/of/BigInt/custom-ctor-returns-other-instance.js
+++ b/test/built-ins/TypedArrays/of/BigInt/custom-ctor-returns-other-instance.js
@@ -18,7 +18,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var result;
   var custom = new TA(3);
   var ctor = function() {
diff --git a/test/built-ins/TypedArrays/of/BigInt/custom-ctor-returns-smaller-instance-throws.js b/test/built-ins/TypedArrays/of/BigInt/custom-ctor-returns-smaller-instance-throws.js
index cddf2c4cf6c9b39338c9991662883df8a7053d19..f174540ef049ad3f400dfeeca985c7d5a6a4bf35 100644
--- a/test/built-ins/TypedArrays/of/BigInt/custom-ctor-returns-smaller-instance-throws.js
+++ b/test/built-ins/TypedArrays/of/BigInt/custom-ctor-returns-smaller-instance-throws.js
@@ -17,12 +17,12 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var ctor = function() {
     return new TA(1);
   };
 
   assert.throws(TypeError, function() {
-    TypedArray.of.call(ctor, 1, 2);
+    TypedArray.of.call(ctor, 1n, 2n);
   });
 });
diff --git a/test/built-ins/TypedArrays/of/BigInt/custom-ctor.js b/test/built-ins/TypedArrays/of/BigInt/custom-ctor.js
index e087cada3b7a73d564b123fa7b3d88a00467183a..cb770d55fea91351ef873a320cfed580fa151f7c 100644
--- a/test/built-ins/TypedArrays/of/BigInt/custom-ctor.js
+++ b/test/built-ins/TypedArrays/of/BigInt/custom-ctor.js
@@ -20,7 +20,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var called = 0;
   var ctor = function() {
     called++;
@@ -28,7 +28,7 @@ testWithTypedArrayConstructors(function(TA) {
   };
 
   assert.throws(Test262Error, function() {
-    TA.of.call(ctor, 42);
+    TA.of.call(ctor, 42n);
   });
 
   assert.sameValue(called, 1);
diff --git a/test/built-ins/TypedArrays/of/BigInt/inherited.js b/test/built-ins/TypedArrays/of/BigInt/inherited.js
index 677cb59fb42e53dbc41cc9e0563a3e9c3d2be0fa..71a3dc3d6cde1c55b82a9da8bf0f63f2f40fe79f 100644
--- a/test/built-ins/TypedArrays/of/BigInt/inherited.js
+++ b/test/built-ins/TypedArrays/of/BigInt/inherited.js
@@ -13,7 +13,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.sameValue(
     TA.of, TypedArray.of,
     "method is inherited %TypedArray%.of"
diff --git a/test/built-ins/TypedArrays/of/BigInt/invoked-as-func.js b/test/built-ins/TypedArrays/of/BigInt/invoked-as-func.js
index 7becb0d7dc13e3a5fc25a77d7a550e16c18363a2..98f60268367a7f8cb09f837efac84e6442127f95 100644
--- a/test/built-ins/TypedArrays/of/BigInt/invoked-as-func.js
+++ b/test/built-ins/TypedArrays/of/BigInt/invoked-as-func.js
@@ -16,7 +16,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var of = TA.of;
 
   assert.throws(TypeError, function() {
diff --git a/test/built-ins/TypedArrays/of/BigInt/nan-conversion.js b/test/built-ins/TypedArrays/of/BigInt/nan-conversion.js
deleted file mode 100644
index 4158c3709095f0f780e6a40437fae633a80eaab5..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArrays/of/BigInt/nan-conversion.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-%typedarray%.of
-description: >
-  Test NaN conversions
-info: |
-  9.4.5.9 IntegerIndexedElementSet ( O, index, value )
-
-  ...
-  3. Let numValue be ? ToNumber(value).
-  ...
-
-  24.1.1.6 SetValueInBuffer ( arrayBuffer, byteIndex, type, value [ ,
-  isLittleEndian ] )
-includes: [testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-testWithTypedArrayConstructors(function(TA) {
-  var result = TA.of(NaN, undefined);
-  assert.sameValue(result.length, 2);
-  assert.sameValue(result[0], NaN);
-  assert.sameValue(result[1], NaN);
-  assert.sameValue(result.constructor, TA);
-  assert.sameValue(Object.getPrototypeOf(result), TA.prototype);
-},
-[
-  Float32Array,
-  Float64Array
-]);
-
-testWithTypedArrayConstructors(function(TA) {
-  var result = TA.of(NaN, undefined);
-  assert.sameValue(result.length, 2);
-  assert.sameValue(result[0], 0);
-  assert.sameValue(result[1], 0);
-  assert.sameValue(result.constructor, TA);
-  assert.sameValue(Object.getPrototypeOf(result), TA.prototype);
-},
-[
-  Int8Array,
-  Int32Array,
-  Int16Array,
-  Int8Array,
-  Uint32Array,
-  Uint16Array,
-  Uint8Array,
-  Uint8ClampedArray
-]);
diff --git a/test/built-ins/TypedArrays/of/BigInt/new-instance-empty.js b/test/built-ins/TypedArrays/of/BigInt/new-instance-empty.js
index 1891ae19993fbb08418301cbabf2006b1464ac9b..592f3ced355f6a99e490b4d14438ed552c03e44b 100644
--- a/test/built-ins/TypedArrays/of/BigInt/new-instance-empty.js
+++ b/test/built-ins/TypedArrays/of/BigInt/new-instance-empty.js
@@ -8,7 +8,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var result = TA.of();
   assert.sameValue(result.length, 0);
   assert.sameValue(result.constructor, TA);
diff --git a/test/built-ins/TypedArrays/of/BigInt/new-instance-from-zero.js b/test/built-ins/TypedArrays/of/BigInt/new-instance-from-zero.js
deleted file mode 100644
index 973753857f27e5e2d85df21d51c4acf215947ddf..0000000000000000000000000000000000000000
--- a/test/built-ins/TypedArrays/of/BigInt/new-instance-from-zero.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-%typedarray%.of
-description: >
-  Return a new TypedArray using -0 and +0 values
-includes: [testBigIntTypedArray.js]
-features: [BigInt, TypedArray]
----*/
-
-testWithTypedArrayConstructors(function(TA) {
-  var result = TA.of(-0, +0);
-  assert.sameValue(result.length, 2);
-  assert.sameValue(result[0], -0, "-0 => 0");
-  assert.sameValue(result[1], 0, "+0 => 0");
-  assert.sameValue(result.constructor, TA);
-  assert.sameValue(Object.getPrototypeOf(result), TA.prototype);
-},
-[
-  Float32Array,
-  Float64Array
-]);
-
-testWithTypedArrayConstructors(function(TA) {
-  var result = TA.of(-0, +0);
-  assert.sameValue(result.length, 2);
-  assert.sameValue(result[0], 0, "-0 => 0");
-  assert.sameValue(result[1], 0, "+0 => 0");
-  assert.sameValue(result.constructor, TA);
-  assert.sameValue(Object.getPrototypeOf(result), TA.prototype);
-},
-[
-  Int16Array,
-  Int32Array,
-  Int8Array,
-  Uint16Array,
-  Uint32Array,
-  Uint8Array,
-  Uint8ClampedArray
-]);
diff --git a/test/built-ins/TypedArrays/of/BigInt/new-instance-using-custom-ctor.js b/test/built-ins/TypedArrays/of/BigInt/new-instance-using-custom-ctor.js
index ec64f6fc64c1549007013a3b21631715f493e706..ff9b68a7ad3ae02c94f90f8e10df1e487a0cdcb9 100644
--- a/test/built-ins/TypedArrays/of/BigInt/new-instance-using-custom-ctor.js
+++ b/test/built-ins/TypedArrays/of/BigInt/new-instance-using-custom-ctor.js
@@ -8,7 +8,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var called = 0;
 
   var ctor = function(len) {
diff --git a/test/built-ins/TypedArrays/of/BigInt/new-instance.js b/test/built-ins/TypedArrays/of/BigInt/new-instance.js
index e71afc1b08c02bece9f82e87f0f24f23fbace400..0e32755cf84079dbe8c3389d47b86953302096c1 100644
--- a/test/built-ins/TypedArrays/of/BigInt/new-instance.js
+++ b/test/built-ins/TypedArrays/of/BigInt/new-instance.js
@@ -23,7 +23,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   var result = TA.of(42n, 43n, 0n);
   assert.sameValue(result.length, 3);
   assert.sameValue(result[0], 42n);
diff --git a/test/built-ins/TypedArrays/of/BigInt/this-is-not-constructor.js b/test/built-ins/TypedArrays/of/BigInt/this-is-not-constructor.js
index 006b674047a68ab4aba573be40faf6199f4fda9f..1811c1a750904eaead20d792e7be59d1a8a3565c 100644
--- a/test/built-ins/TypedArrays/of/BigInt/this-is-not-constructor.js
+++ b/test/built-ins/TypedArrays/of/BigInt/this-is-not-constructor.js
@@ -17,8 +17,8 @@ features: [BigInt, TypedArray]
 
 var m = { m() {} }.m;
 
-testWithTypedArrayConstructors(function(TA) {
+testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
-    TA.of.call(m, []);
+    TA.of.call(m, 0n);
   });
 });
diff --git a/test/harness/testTypedArray.js b/test/harness/testTypedArray.js
index bb00168573c706abd0f0a36a051339a115c10205..9c99a05a1ee086ab799590aeb3e6a480602e5e14 100644
--- a/test/harness/testTypedArray.js
+++ b/test/harness/testTypedArray.js
@@ -25,11 +25,6 @@ var TAConstructors = [
   Uint8ClampedArray
 ];
 
-if (typeof BigInt !== "undefined") {
-  TAConstructors.push(BigInt64Array);
-  TAConstructors.push(BigUint64Array);
-}
-
 var length = TAConstructors.length;
 
 assert(