diff --git a/test/built-ins/DataView/prototype/getFloat32/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/getFloat32/detached-buffer-after-toindex-byteoffset.js
similarity index 75%
rename from test/built-ins/DataView/prototype/getFloat32/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/getFloat32/detached-buffer-after-toindex-byteoffset.js
index ef2440d1a22ab168b3fe501982012fb188602f72..9170345f790bea8ff3bc723886a8497956a38401 100644
--- a/test/built-ins/DataView/prototype/getFloat32/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getFloat32/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.getfloat32
-es6id: 24.2.4.5
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0,
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.5 DataView.prototype.getFloat32 ( byteOffset [ , littleEndian ] )
 
@@ -19,8 +17,8 @@ info: |
   ...
   4. Let getIndex be ? ToIndex(requestIndex).
   ...
-  7. Let buffer be view.[[ViewedArrayBuffer]].
-  8. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -33,3 +31,7 @@ $DETACHBUFFER(buffer);
 assert.throws(RangeError, function() {
   sample.getFloat32(-1);
 });
+
+assert.throws(RangeError, function() {
+  sample.getFloat32(Infinity);
+}, "Infinity");
diff --git a/test/built-ins/DataView/prototype/getFloat32/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/getFloat32/detached-buffer-before-outofrange-byteoffset.js
index 3ed97901cfd4f964419cb46ef4c4f0b520681d25..cf9293dba9ab477ee781cff8ccbf1dd5c8181c7b 100644
--- a/test/built-ins/DataView/prototype/getFloat32/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getFloat32/detached-buffer-before-outofrange-byteoffset.js
@@ -16,10 +16,10 @@ info: |
   24.2.1.1 GetViewValue ( view, requestIndex, isLittleEndian, type )
 
   ...
-  8. Let buffer be the value of view's [[ViewedArrayBuffer]] internal slot.
-  9. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
-  13. If getIndex + elementSize > viewSize, throw a RangeError exception.
+  11. If getIndex + elementSize > viewSize, throw a RangeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -31,10 +31,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.getFloat32(Infinity);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.getFloat32(13);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/getFloat64/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/getFloat64/detached-buffer-after-toindex-byteoffset.js
similarity index 75%
rename from test/built-ins/DataView/prototype/getFloat64/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/getFloat64/detached-buffer-after-toindex-byteoffset.js
index 32947925e28097545de879c4051c444a19cac878..a322e1a11f8a6981fcb695888746db804378261b 100644
--- a/test/built-ins/DataView/prototype/getFloat64/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getFloat64/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.getfloat64
-es6id: 24.2.4.6
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0,
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.6 DataView.prototype.getFloat64 ( byteOffset [ , littleEndian ] )
 
@@ -19,8 +17,8 @@ info: |
   ...
   4. Let getIndex be ? ToIndex(requestIndex).
   ...
-  7. Let buffer be view.[[ViewedArrayBuffer]].
-  8. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -33,3 +31,7 @@ $DETACHBUFFER(buffer);
 assert.throws(RangeError, function() {
   sample.getFloat64(-1);
 });
+
+assert.throws(RangeError, function() {
+  sample.getFloat64(Infinity);
+}, "Infinity");
diff --git a/test/built-ins/DataView/prototype/getFloat64/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/getFloat64/detached-buffer-before-outofrange-byteoffset.js
index 81d349941bc7f9b1838c96372ff6bf4a45eb415a..6fc2c78c1ea82b710f19ef53d13564576be23a7a 100644
--- a/test/built-ins/DataView/prototype/getFloat64/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getFloat64/detached-buffer-before-outofrange-byteoffset.js
@@ -16,10 +16,10 @@ info: |
   24.2.1.1 GetViewValue ( view, requestIndex, isLittleEndian, type )
 
   ...
-  8. Let buffer be the value of view's [[ViewedArrayBuffer]] internal slot.
-  9. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
-  13. If getIndex + elementSize > viewSize, throw a RangeError exception.
+  11. If getIndex + elementSize > viewSize, throw a RangeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -31,10 +31,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.getFloat64(Infinity);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.getFloat64(13);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/getInt16/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/getInt16/detached-buffer-after-toindex-byteoffset.js
similarity index 75%
rename from test/built-ins/DataView/prototype/getInt16/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/getInt16/detached-buffer-after-toindex-byteoffset.js
index 5d7007553d2329cbc9f77ae86389527c8ddcb9c2..2427379e78485fb6543c00d9a949ebc3a615962a 100644
--- a/test/built-ins/DataView/prototype/getInt16/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getInt16/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.getint16
-es6id: 24.2.4.8
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0,
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.8 DataView.prototype.getInt16 ( byteOffset [ , littleEndian ] )
 
@@ -19,8 +17,8 @@ info: |
   ...
   4. Let getIndex be ? ToIndex(requestIndex).
   ...
-  7. Let buffer be view.[[ViewedArrayBuffer]].
-  8. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -30,6 +28,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(RangeError, function() {
+  sample.getInt16(Infinity);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.getInt16(-1);
 });
diff --git a/test/built-ins/DataView/prototype/getInt16/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/getInt16/detached-buffer-before-outofrange-byteoffset.js
index 2763fb9db3adcf4d7f44888528d0455a9855c40d..1432f1c176ef09f17ca5cf6d473e5a239525eb6b 100644
--- a/test/built-ins/DataView/prototype/getInt16/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getInt16/detached-buffer-before-outofrange-byteoffset.js
@@ -16,10 +16,10 @@ info: |
   24.2.1.1 GetViewValue ( view, requestIndex, isLittleEndian, type )
 
   ...
-  8. Let buffer be the value of view's [[ViewedArrayBuffer]] internal slot.
-  9. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
-  13. If getIndex + elementSize > viewSize, throw a RangeError exception.
+  11. If getIndex + elementSize > viewSize, throw a RangeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -31,10 +31,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.getInt16(Infinity);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.getInt16(13);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/getInt32/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/getInt32/detached-buffer-after-toindex-byteoffset.js
similarity index 75%
rename from test/built-ins/DataView/prototype/getInt32/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/getInt32/detached-buffer-after-toindex-byteoffset.js
index 777c6a6226d3d6b5e64b56f9eff4e378f02ae7b8..c82d6711c7ee77370066182a173677356056d77b 100644
--- a/test/built-ins/DataView/prototype/getInt32/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getInt32/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.getint32
-es6id: 24.2.4.9
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0,
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.9 DataView.prototype.getInt32 ( byteOffset [ , littleEndian ] )
 
@@ -19,8 +17,8 @@ info: |
   ...
   4. Let getIndex be ? ToIndex(requestIndex).
   ...
-  7. Let buffer be view.[[ViewedArrayBuffer]].
-  8. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -30,6 +28,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(RangeError, function() {
+  sample.getInt32(Infinity);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.getInt32(-1);
 });
diff --git a/test/built-ins/DataView/prototype/getInt32/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/getInt32/detached-buffer-before-outofrange-byteoffset.js
index 5f707284c07ec5f4293749f2c3f99da804af73fc..75bd40c4f7a2476cf5b72a2d2540f8ccade8bd09 100644
--- a/test/built-ins/DataView/prototype/getInt32/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getInt32/detached-buffer-before-outofrange-byteoffset.js
@@ -16,10 +16,10 @@ info: |
   24.2.1.1 GetViewValue ( view, requestIndex, isLittleEndian, type )
 
   ...
-  8. Let buffer be the value of view's [[ViewedArrayBuffer]] internal slot.
-  9. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
-  13. If getIndex + elementSize > viewSize, throw a RangeError exception.
+  11. If getIndex + elementSize > viewSize, throw a RangeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -31,10 +31,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.getInt32(Infinity);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.getInt32(13);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/getInt8/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/getInt8/detached-buffer-after-toindex-byteoffset.js
similarity index 72%
rename from test/built-ins/DataView/prototype/getInt8/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/getInt8/detached-buffer-after-toindex-byteoffset.js
index 175359727d09cd57746937ddee69c72b00967d78..2d25f84ae66cb76bd7925d2985ba9ab2a7cb3708 100644
--- a/test/built-ins/DataView/prototype/getInt8/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getInt8/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.getint8
-es6id: 24.2.4.7
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0,
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.7 DataView.prototype.getInt8 ( byteOffset )
 
@@ -18,8 +16,8 @@ info: |
   ...
   4. Let getIndex be ? ToIndex(requestIndex).
   ...
-  7. Let buffer be view.[[ViewedArrayBuffer]].
-  8. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -29,6 +27,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(RangeError, function() {
+  sample.getInt8(Infinity);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.getInt8(-1);
 });
diff --git a/test/built-ins/DataView/prototype/getInt8/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/getInt8/detached-buffer-before-outofrange-byteoffset.js
index 48f03e7fc78ab6ebc5671f1aa31d33001b590029..c168243e98871ea783ee8b29eaff6a4d5ebf892e 100644
--- a/test/built-ins/DataView/prototype/getInt8/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getInt8/detached-buffer-before-outofrange-byteoffset.js
@@ -15,10 +15,10 @@ info: |
   24.2.1.1 GetViewValue ( view, requestIndex, isLittleEndian, type )
 
   ...
-  8. Let buffer be the value of view's [[ViewedArrayBuffer]] internal slot.
-  9. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
-  13. If getIndex + elementSize > viewSize, throw a RangeError exception.
+  11. If getIndex + elementSize > viewSize, throw a RangeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -30,10 +30,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.getInt8(Infinity);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.getInt8(13);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/getUint16/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/getUint16/detached-buffer-after-toindex-byteoffset.js
similarity index 75%
rename from test/built-ins/DataView/prototype/getUint16/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/getUint16/detached-buffer-after-toindex-byteoffset.js
index 874c54ad435c0c2e38b4e795a2a785168039f12b..5181c146e1574cc1597d483b7e9a6b3b0bb7b0b7 100644
--- a/test/built-ins/DataView/prototype/getUint16/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getUint16/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.getuint16
-es6id: 24.2.4.11
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0,
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.11 DataView.prototype.getUint16 ( byteOffset [ , littleEndian ] )
 
@@ -19,8 +17,8 @@ info: |
   ...
   4. Let getIndex be ? ToIndex(requestIndex).
   ...
-  7. Let buffer be view.[[ViewedArrayBuffer]].
-  8. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -30,6 +28,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(RangeError, function() {
+  sample.getUint16(Infinity);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.getUint16(-1);
 });
diff --git a/test/built-ins/DataView/prototype/getUint16/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/getUint16/detached-buffer-before-outofrange-byteoffset.js
index 91ee8e72e21b15bb3329eca8533561f457edc1e5..01a4d13ee0624fb1932ed4c3a96662b4179908cc 100644
--- a/test/built-ins/DataView/prototype/getUint16/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getUint16/detached-buffer-before-outofrange-byteoffset.js
@@ -16,10 +16,10 @@ info: |
   24.2.1.1 GetViewValue ( view, requestIndex, isLittleEndian, type )
 
   ...
-  8. Let buffer be the value of view's [[ViewedArrayBuffer]] internal slot.
-  9. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
-  13. If getIndex + elementSize > viewSize, throw a RangeError exception.
+  11. If getIndex + elementSize > viewSize, throw a RangeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -31,10 +31,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.getUint16(Infinity);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.getUint16(13);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/getUint32/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/getUint32/detached-buffer-after-toindex-byteoffset.js
similarity index 75%
rename from test/built-ins/DataView/prototype/getUint32/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/getUint32/detached-buffer-after-toindex-byteoffset.js
index 748a578c03a20ea0562bbeed7bd308de3f890a8a..09067c897f95f8648c1dfa47dc5cad9b045fa05a 100644
--- a/test/built-ins/DataView/prototype/getUint32/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getUint32/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.getuint32
-es6id: 24.2.4.12
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0,
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.12 DataView.prototype.getUint32 ( byteOffset [ , littleEndian ] )
 
@@ -19,8 +17,8 @@ info: |
   ...
   4. Let getIndex be ? ToIndex(requestIndex).
   ...
-  7. Let buffer be view.[[ViewedArrayBuffer]].
-  8. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -30,6 +28,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(RangeError, function() {
+  sample.getUint32(Infinity);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.getUint32(-1);
 });
diff --git a/test/built-ins/DataView/prototype/getUint32/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/getUint32/detached-buffer-before-outofrange-byteoffset.js
index 3829c5e92dc4de798d27079f109eee37ad2d32ab..be88a8b23910f438db131b914cc3385cea2df015 100644
--- a/test/built-ins/DataView/prototype/getUint32/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getUint32/detached-buffer-before-outofrange-byteoffset.js
@@ -16,10 +16,10 @@ info: |
   24.2.1.1 GetViewValue ( view, requestIndex, isLittleEndian, type )
 
   ...
-  8. Let buffer be the value of view's [[ViewedArrayBuffer]] internal slot.
-  9. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
-  13. If getIndex + elementSize > viewSize, throw a RangeError exception.
+  11. If getIndex + elementSize > viewSize, throw a RangeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -31,10 +31,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.getUint32(Infinity);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.getUint32(13);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/getUint8/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/getUint8/detached-buffer-after-toindex-byteoffset.js
similarity index 72%
rename from test/built-ins/DataView/prototype/getUint8/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/getUint8/detached-buffer-after-toindex-byteoffset.js
index 16581aaed9214d7aa2349194838fa8cec9d4e5f5..363a60ba70242275b95bad1ca084d4cbfee78f12 100644
--- a/test/built-ins/DataView/prototype/getUint8/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getUint8/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.getuint8
-es6id: 24.2.4.10
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0,
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.10 DataView.prototype.getUint8 ( byteOffset )
 
@@ -18,8 +16,8 @@ info: |
   ...
   4. Let getIndex be ? ToIndex(requestIndex).
   ...
-  7. Let buffer be view.[[ViewedArrayBuffer]].
-  8. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -29,6 +27,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(RangeError, function() {
+  sample.getUint8(Infinity);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.getUint8(-1);
 });
diff --git a/test/built-ins/DataView/prototype/getUint8/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/getUint8/detached-buffer-before-outofrange-byteoffset.js
index 18149bd2f5cb16c2d44b588e9800198a409cd709..98c8f0a67c3161eb65fb8348dfa48c9a44896aed 100644
--- a/test/built-ins/DataView/prototype/getUint8/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/getUint8/detached-buffer-before-outofrange-byteoffset.js
@@ -15,10 +15,10 @@ info: |
   24.2.1.1 GetViewValue ( view, requestIndex, isLittleEndian, type )
 
   ...
-  8. Let buffer be the value of view's [[ViewedArrayBuffer]] internal slot.
-  9. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
+  6. Let buffer be view.[[ViewedArrayBuffer]].
+  7. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
   ...
-  13. If getIndex + elementSize > viewSize, throw a RangeError exception.
+  11. If getIndex + elementSize > viewSize, throw a RangeError exception.
   ...
 includes: [detachArrayBuffer.js]
 ---*/
@@ -30,10 +30,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.getUint8(Infinity);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.getUint8(13);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/setFloat32/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/setFloat32/detached-buffer-after-toindex-byteoffset.js
similarity index 85%
rename from test/built-ins/DataView/prototype/setFloat32/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/setFloat32/detached-buffer-after-toindex-byteoffset.js
index 4e101c3bc79dd2c7cf182e22271894bb4b355b26..c0d1d6d50c7f5824f91369c46b94e923dafb0518 100644
--- a/test/built-ins/DataView/prototype/setFloat32/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setFloat32/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.setfloat32
-es6id: 24.2.4.13
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.13 DataView.prototype.setFloat32 ( byteOffset, value [ , littleEndian ] )
 
@@ -30,6 +28,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(RangeError, function() {
+  sample.setFloat32(Infinity, 0);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.setFloat32(-1, 0);
 });
diff --git a/test/built-ins/DataView/prototype/setFloat32/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/setFloat32/detached-buffer-before-outofrange-byteoffset.js
index 7bdfdc5c2f900c46cbb8f7d12ee3c1bc43b11077..260a282a8f9c77baeb770814c52484ff86652327 100644
--- a/test/built-ins/DataView/prototype/setFloat32/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setFloat32/detached-buffer-before-outofrange-byteoffset.js
@@ -31,10 +31,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.setFloat32(Infinity, 0);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.setFloat32(13, 0);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/setFloat64/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/setFloat64/detached-buffer-after-toindex-byteoffset.js
similarity index 86%
rename from test/built-ins/DataView/prototype/setFloat64/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/setFloat64/detached-buffer-after-toindex-byteoffset.js
index 5a80f5641dcfcdac64b650b9e234160aec823fd3..367c749def6d665136cf1a31a9ea27437d6e0c5a 100644
--- a/test/built-ins/DataView/prototype/setFloat64/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setFloat64/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.setfloat64
-es6id: 24.2.4.14
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.14 DataView.prototype.setFloat64 ( byteOffset, value [ , littleEndian ] )
 
@@ -30,6 +28,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(TypeError, function() {
+  sample.setFloat64(Infinity, 0);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.setFloat64(-1, 0);
 });
diff --git a/test/built-ins/DataView/prototype/setFloat64/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/setFloat64/detached-buffer-before-outofrange-byteoffset.js
index dcbfa85211852ed784bca800d0d5302588ea2e17..841821d172d4a25c57f6e15629456243e3fbc4d6 100644
--- a/test/built-ins/DataView/prototype/setFloat64/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setFloat64/detached-buffer-before-outofrange-byteoffset.js
@@ -31,10 +31,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.setFloat64(Infinity, 0);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.setFloat64(13, 0);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/setInt16/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/setInt16/detached-buffer-after-toindex-byteoffset.js
similarity index 86%
rename from test/built-ins/DataView/prototype/setInt16/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/setInt16/detached-buffer-after-toindex-byteoffset.js
index 765fd8b3e8d73cc359d2536d48ba604f1261bdfa..f193bde4fe80cf1b9128cce5ac7d93520aa05512 100644
--- a/test/built-ins/DataView/prototype/setInt16/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setInt16/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.setint16
-es6id: 24.2.4.16
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.16 DataView.prototype.setInt16 ( byteOffset, value [ , littleEndian ] )
 
@@ -30,6 +28,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(TypeError, function() {
+  sample.setInt16(Infinity, 0);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.setInt16(-1, 0);
 });
diff --git a/test/built-ins/DataView/prototype/setInt16/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/setInt16/detached-buffer-before-outofrange-byteoffset.js
index bb47762117907eb5e473c7c5a61da2ecf1080c33..04c3c53fa084d37258089be83fc839680031c9ab 100644
--- a/test/built-ins/DataView/prototype/setInt16/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setInt16/detached-buffer-before-outofrange-byteoffset.js
@@ -31,10 +31,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.setInt16(Infinity, 0);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.setInt16(13, 0);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/setInt32/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/setInt32/detached-buffer-after-toindex-byteoffset.js
similarity index 85%
rename from test/built-ins/DataView/prototype/setInt32/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/setInt32/detached-buffer-after-toindex-byteoffset.js
index 128e66b0db2ef66b0e1159e66f904902d8c40d4f..9e9ca06027aeb1c6ccc84c4b091e1a249bfad1a6 100644
--- a/test/built-ins/DataView/prototype/setInt32/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setInt32/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.setint32
-es6id: 24.2.4.17
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.17 DataView.prototype.setInt32 ( byteOffset, value [ , littleEndian ] )
 
@@ -30,6 +28,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(RangeError, function() {
+  sample.setInt32(Infinity, 0);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.setInt32(-1, 0);
 });
diff --git a/test/built-ins/DataView/prototype/setInt32/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/setInt32/detached-buffer-before-outofrange-byteoffset.js
index 8a74c2a3743a5c1904863d9e1269a698c247b5af..6fa4663dd5280546c31adf266706bd959d32d575 100644
--- a/test/built-ins/DataView/prototype/setInt32/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setInt32/detached-buffer-before-outofrange-byteoffset.js
@@ -31,10 +31,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.setInt32(Infinity, 0);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.setInt32(13, 0);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/setInt8/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/setInt8/detached-buffer-after-toindex-byteoffset.js
similarity index 84%
rename from test/built-ins/DataView/prototype/setInt8/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/setInt8/detached-buffer-after-toindex-byteoffset.js
index 55eddc992a76416754c348d93017cca1f45240d7..9f04182efad613943fc91f4b1c438827b7c800ba 100644
--- a/test/built-ins/DataView/prototype/setInt8/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setInt8/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.setint8
-es6id: 24.2.4.15
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.15 DataView.prototype.setInt8 ( byteOffset, value )
 
@@ -29,6 +27,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(RangeError, function() {
+  sample.setInt8(Infinity, 0);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.setInt8(-1, 0);
 });
diff --git a/test/built-ins/DataView/prototype/setInt8/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/setInt8/detached-buffer-before-outofrange-byteoffset.js
index a1ff142587288e154eb92163428976dbd93bd6e4..6fe8abf4c2a1041075fb6a363122d99f477eec0f 100644
--- a/test/built-ins/DataView/prototype/setInt8/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setInt8/detached-buffer-before-outofrange-byteoffset.js
@@ -30,10 +30,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.setInt8(Infinity, 0);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.setInt8(13, 0);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/setUint16/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/setUint16/detached-buffer-after-toindex-byteoffset.js
similarity index 85%
rename from test/built-ins/DataView/prototype/setUint16/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/setUint16/detached-buffer-after-toindex-byteoffset.js
index 86f4be4bd9dabd328deec3eeb617ef67f876b207..07348e275cb40e27c696687ee2093de274063a6c 100644
--- a/test/built-ins/DataView/prototype/setUint16/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setUint16/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.setuint16
-es6id: 24.2.4.19
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.19 DataView.prototype.setUint16 ( byteOffset, value [ , littleEndian ] )
 
@@ -30,6 +28,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(RangeError, function() {
+  sample.setUint16(Infinity, 0);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.setUint16(-1, 0);
 });
diff --git a/test/built-ins/DataView/prototype/setUint16/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/setUint16/detached-buffer-before-outofrange-byteoffset.js
index eaf3581edcb32be85e4c29a8b55038407299297e..203c619d77424e17d12cbf41e685fb32f06de78a 100644
--- a/test/built-ins/DataView/prototype/setUint16/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setUint16/detached-buffer-before-outofrange-byteoffset.js
@@ -31,10 +31,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.setUint16(Infinity, 0);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.setUint16(13, 0);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/setUint32/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/setUint32/detached-buffer-after-toindex-byteoffset.js
similarity index 85%
rename from test/built-ins/DataView/prototype/setUint32/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/setUint32/detached-buffer-after-toindex-byteoffset.js
index 7c9472078a2770ae77709e4223c221ab8f603ac9..47043e6bbc1d76a198b81d8cf73743908bc81532 100644
--- a/test/built-ins/DataView/prototype/setUint32/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setUint32/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.setuint32
-es6id: 24.2.4.20
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.20 DataView.prototype.setUint32 ( byteOffset, value [ , littleEndian ] )
 
@@ -30,6 +28,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(RangeError, function() {
+  sample.setUint32(Infinity, 0);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.setUint32(-1, 0);
 });
diff --git a/test/built-ins/DataView/prototype/setUint32/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/setUint32/detached-buffer-before-outofrange-byteoffset.js
index 7c488936673e61ce4d8fdd5b185cd7d497a698d2..a54d239559b5f576e5867a0e11c1af2b698422dc 100644
--- a/test/built-ins/DataView/prototype/setUint32/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setUint32/detached-buffer-before-outofrange-byteoffset.js
@@ -31,10 +31,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.setUint32(Infinity, 0);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.setUint32(13, 0);
 }, "13");
diff --git a/test/built-ins/DataView/prototype/setUint8/detached-buffer-after-integer-byteoffset.js b/test/built-ins/DataView/prototype/setUint8/detached-buffer-after-toindex-byteoffset.js
similarity index 84%
rename from test/built-ins/DataView/prototype/setUint8/detached-buffer-after-integer-byteoffset.js
rename to test/built-ins/DataView/prototype/setUint8/detached-buffer-after-toindex-byteoffset.js
index 952947f45f0adf37b6408f4d9ca4bf7b998a0980..acdc80f2503e8d6cb76820ca6d6af481dd1eff03 100644
--- a/test/built-ins/DataView/prototype/setUint8/detached-buffer-after-integer-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setUint8/detached-buffer-after-toindex-byteoffset.js
@@ -3,10 +3,8 @@
 
 /*---
 esid: sec-dataview.prototype.setuint8
-es6id: 24.2.4.18
 description: >
-  Detached buffer is checked after checking If numberIndex ≠ getIndex or
-  getIndex < 0
+  Detached buffer is only checked after ToIndex(requestIndex)
 info: |
   24.2.4.18 DataView.prototype.setUint8 ( byteOffset, value )
 
@@ -29,6 +27,10 @@ var sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
+assert.throws(RangeError, function() {
+  sample.setUint8(Infinity, 0);
+}, "Infinity");
+
 assert.throws(RangeError, function() {
   sample.setUint8(-1, 0);
 });
diff --git a/test/built-ins/DataView/prototype/setUint8/detached-buffer-before-outofrange-byteoffset.js b/test/built-ins/DataView/prototype/setUint8/detached-buffer-before-outofrange-byteoffset.js
index 99fb2687b075a343499c8d3f92e1e13c47fca968..05cd2a91a14e1a4eccb920a075567d04d5aa365d 100644
--- a/test/built-ins/DataView/prototype/setUint8/detached-buffer-before-outofrange-byteoffset.js
+++ b/test/built-ins/DataView/prototype/setUint8/detached-buffer-before-outofrange-byteoffset.js
@@ -30,10 +30,6 @@ sample = new DataView(buffer, 0);
 
 $DETACHBUFFER(buffer);
 
-assert.throws(TypeError, function() {
-  sample.setUint8(Infinity, 0);
-}, "Infinity");
-
 assert.throws(TypeError, function() {
   sample.setUint8(13, 0);
 }, "13");